Zlatá rytířka jde po všech Habiťanech s problémy. Nesplnil jsi všechny své denní úkoly? Odškrtl jsi zvyk mínuskem? Využije to jako důvod aby tě začala otravovat s tím, že máš následovat jejího příkladu. Je zářným příkladem perfektního Habiťana a ty jsi jen zklamáním. No to ale není vůbec pěkné! Každý děláme chyby. Určitě bys za to neměl čelit takové negativitě. Možná je na čase posbírat svědectví od ublížených Habiťanů a pořádné zlaté rytířce promluvit do duše!
", "questGoldenknight1CollectTestimony": "Svědectví", - "questGoldenknight1DropGoldenknight2Quest": "Zlatá rytířka, část 2: Zašlé zlato (svitek)", + "questGoldenknight1DropGoldenknight2Quest": "Zlatá rytířka, část 2: Železný rytíř (svitek)", "questGoldenknight2Text": "Zlatá rytířka, část 2: Zašlé zlato", "questGoldenknight2Notes": "Vyzbrojen stovkami svědectví Habiťanů se konečně postavíš zlaté rytířce. Začneš jí předčítat námitky Habiťanů jednu po druhé. \"A @Pfeffernusse říká, že tvé neustálé vychloubání-\" Rytířka zvedne ruku, aby tě umlčela a vysmívá se \"Prosím, tihle lidé jsou pouze žárliví. Místo stěžování si by prostě měli pilně pracovat jako já! Možná ti ukážu sílu, kterou získáš za píli jako je ta moje!\" Pozvedne svůj řemdih a chce tě napadnout!
", "questGoldenknight2Boss": "Zlatá rytířka", @@ -268,10 +268,16 @@ "questFrogBoss": "Nepořádný žabák", "questFrogDropFrogEgg": "Žabák (vejce)", "questFrogUnlockText": "Odemyká vejce žabáka na Trhu", - "questSnakeText": "The Serpent of Distraction", - "questSnakeNotes": "It takes a hardy soul to live in the Sand Dunes of Distraction. The arid desert is hardly a productive place, and the shimmering dunes have led many a traveler astray. However, something has even the locals spooked. The sands have been shifting and upturning entire villages. Residents claim a monster with an enormous serpentine body lies in wait under the sands, and they have all pooled together a reward for whomever will help them find and stop it. The much-lauded snake charmers @EmeraldOx and @PainterProphet have agreed to help you summon the beast. Can you stop the Serpent of Distraction?", - "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", - "questSnakeBoss": "Serpent of Distraction", - "questSnakeDropSnakeEgg": "Snake (Egg)", - "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market" + "questSnakeText": "Had Rozptýlení", + "questSnakeNotes": "Jen houževnatá duše může žít v Písečných dunách Rozptýlení. Vyprahlá poušť je stěží dobrým místem pro produktivitu a mystický třpyt dun již svedl spoustu poutníků na scestí. Avšak, jedna věc děsí i místní. poslední dobou se písek hýbe a obrací vesnice vzhůru nohama. Obyvatelé se dušují, že v písku žije hadovitá příšera a všichni se složili na odměnu, kterou nabízejí každému, kdo jim pomůže příšeru zastavit. Legendární zaříkávači hadů, @EmeraldOx a @PainterProphet, souhlasili, že ti pomůžou příšeru vypátrat. Dokážeš zastavit Hada Rozptýlení?", + "questSnakeCompletion": "S pomocí zaříkávačů se vám povede Hada Rozptýlení zahnat. I když jste rádi, že jste pomohli obyvatelům Dun, trochu cítíš s padlým nepřítelem. Když se zamyšleně díváš v dál, přistoupí k tobě @LordDarkly. \"Děkujeme vám! Není to moc, ale doufáme, že tohle bude jako díky stačit.\" Podá vám nějaké zlaťáky a... pár hadích vajec! Tak přeci jen to majestátné zvíře uvidíš znovu.", + "questSnakeBoss": "Had Rozptýlení", + "questSnakeDropSnakeEgg": "Had (vejce)", + "questSnakeUnlockText": "Odemyká vejce hada na Trhu", + "questUnicornText": "Přesvědčování královny jednorožců", + "questUnicornNotes": "Potok Dobytí se zabahnil a zničil tak jediný zdroj pitné vody pro Habit City! Naštěstí @Lukreja zná starou legendu, ve které se vypráví, že roh jednorožce dokáže vyčistit i tu nejzakalenější vodu. Společně se se svým neohroženým průvodcem, @UncommonCriminal, vydáváte na túru přes zamrzlé vršky Meandrujících hor. Nakonec najdete mezi třpytícími se sněhy na ledovém sumitu hory Habitica královnu jendorožců. \"Vaše prosby jsou přesvědčivé,\" říká vám. \"Ale nejdřív musíte prokázat, že jste hodni mé pomoci!\"", + "questUnicornCompletion": "Ohromena vaší vytrvalostí, královna jednorožců souhlasí, že vám pomůže, protože vaše poslání je vznešené. Dovolí vám jet na jejím hřbetě po cestě k pramenu potoka Dobytí. Jakmile skloní svůj zlatý roh ke zkalené vodě, vytryskne z ní modré světlo. Je tak oslepující, že musíte zavřít oči. Když je po chvilce otevřete, jednorožec je pryč. Avšak, @rosiesully se zaraduje: voda je zase čistá a na břehu potoka se lesknou tři vejce jednorožce.", + "questUnicornBoss": "Královna jednorožců", + "questUnicornDropUnicornEgg": "Jednorožec (vejce)", + "questUnicornUnlockText": "Odemyká vejce jednorožce na Trhu" } \ No newline at end of file diff --git a/common/locales/cs/rebirth.json b/common/locales/cs/rebirth.json index 507e5bb119..5aab781877 100644 --- a/common/locales/cs/rebirth.json +++ b/common/locales/cs/rebirth.json @@ -16,12 +16,13 @@ "rebirthEarnAchievement": "Také dostaneš ocenění za začátek nového dobrodružství.", "beReborn": "Buď znovuzrozen", "rebirthAchievement": "Začal jsi nové dobrodružství! Tohle je Znovuzrození číslo <%= number %> a nejvyšší úroveň, které jsi dosáhl je <%= level %>. K dosažení dalšího ocenění začni nové dobrodružství až dosáhneš ještě vyšší úrovně!", - "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!", + "rebirthAchievement100": "Začal jsi nové dobrodružství! Toto je tvé <%= number %>. Znovuzrození. Dosáhl jsi úrovně 100 nebo vyšší. Aby sis udržel toto ocenění, začni další dobrodružství po dosažení nejméně sté úrovně!", "rebirthBegan": "Začal nové dobrodružství", "rebirthText": "Začal <%= rebirths %> nových dobrodružství", "rebirthOrb": "Použil Kouli znovuzrození, aby začal odznovu po dosažení úrovně", - "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher", + "rebirthOrb100": "Použil Kouli znovuzrození, aby začal znovu po dosažení úrovně 100 a výš", "rebirthPop": "Začni s novou postavou na úrovni 1 a přitom si zachovej ocenění, sběratelské předměty a úkoly s historií.", "rebirthName": "Koule znovuzrození", - "reborn": "Znovuzrozen, maximální úroveň <%= reLevel %>" + "reborn": "Znovuzrozen, maximální úroveň <%= reLevel %>", + "confirmReborn": "Jsi si jistý?" } \ No newline at end of file diff --git a/common/locales/cs/settings.json b/common/locales/cs/settings.json index 4bac2fa03d..26794a9923 100644 --- a/common/locales/cs/settings.json +++ b/common/locales/cs/settings.json @@ -14,11 +14,11 @@ "startCollapsedPop": "Pokud je tato volba nastavena, seznam štítků bude skryt, když poprvé otevřeš úkol pro úpravu.", "startAdvCollapsed": "Pokročilé možnosti se v úkolu zobrazí zabalené.", "startAdvCollapsedPop": "Pokud je tato volba nastavena, pokročilé možnosti budou skryté, když poprvé otevřeš úkol pro úpravu.", - "dontShowAgain": "Don't show this again", - "suppressLevelUpModal": "Don't show popup when gaining a level", - "suppressHatchPetModal": "Don't show popup when hatching a pet", - "suppressRaisePetModal": "Don't show popup when raising a pet into a mount", - "suppressStreakModal": "Don't show popup when attaining a Streak achievement", + "dontShowAgain": "Znovu neukazovat", + "suppressLevelUpModal": "Neukazovat dialogové okno při postupu na vyšší úroveň", + "suppressHatchPetModal": "Neotvírat dialogové okno při vylíhnutí mazlíčka", + "suppressRaisePetModal": "Neotvírat dialogové okno při vykrmení mazlíčka ve zvíře", + "suppressStreakModal": "Neotvírat dialogové okno při získání ocenění za sérii", "showTour": "Zobrazit průvodce", "restartTour": "Restartovat instruktážního průvodce od bodu, kdy jsi se do země Habitica vydal.", "showBailey": "Zobraz Baileyho", @@ -93,7 +93,7 @@ "loginNameDescription2": "Uživatel -> Profil", "loginNameDescription3": "aby sis změnil jméno, které se objevuje u tvého avataru a zpráv v chatu.", "emailNotifications": "Emailová upozornění", - "wonChallenge": "You won a Challenge!", + "wonChallenge": "Vyhrál jsi výzvu!", "newPM": "Obdržena soukromá zpráva", "giftedGems": "Darované drahokamy", "giftedGemsInfo": "<%= amount %> Drahokamů - od <%= name %>", @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "Zaškrtni, aby ses odhlásil z emailů", "unsubscribeAllEmailsText": "Zaškrtnutím toho políčka potvrzuji, že rozumím tomu, že kvůli odhlášení se z emailů mě nebude moci nikdy nikdo kontaktovat emailem o důležitých změnách na stránce nebo v mém účtu ze země Habitica.", "correctlyUnsubscribedEmailType": "Úspěšně ses odhlásil z \"<%= emailType %>\" emailů.", - "subscriptionRateText": "Opakovaně $<%= price %> každé <%= months %> měsíce", + "subscriptionRateText": "Opakovaně $<%= price %> každý/é <%= months %> měsíc(e)", "benefits": "Benefity", "coupon": "Kupón", "couponPlaceholder": "Zadej kód z kupónu", @@ -136,7 +136,7 @@ "buyGemsGoldCap": "Strop zvýšen na <%= amount %>", "mysticHourglass": "<%= amount %> Mystických přesýpacích hodin", "mysticHourglassText": "Mystické přesýpací hodiny ti umožní koupit si záhadné sety předmětů z předchozích měsíců.", - "purchasedPlanId": "Opakovaně $<%= price %> každý/é <%= months %> měsíc(e) (<%= plan %>)", + "purchasedPlanId": "Opakovaně $<%= price %> každé <%= months %> měsíce (<%= plan %>)", "purchasedPlanExtraMonths": "Máš <%= months %> měsíců kreditu předplatného.", "consecutiveSubscription": "Nepřetržité předplatné", "consecutiveMonths": "Počet po sobě jdoucích měsíců:", @@ -144,7 +144,7 @@ "mysticHourglasses": "Mystické přesýpací hodiny:", "paypal": "PayPal", "amazonPayments": "Amazon platby", - "timezone": "Time Zone", - "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <%= utc %>", - "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.Den Gyldne Ridder har været efter de stakkels Habitikanere. Har du ikke fuldført alle dine Daglige? Har du udført en minus-vane? Hun vil finde enhver grund til at fortælle dig hvordan du bør følge hendes eksempel. Hun er et skinnende eksempel på en perfekt Habitikaner, og du er ikke andet end en fiasko. Det er faktisk ikke særlig sødt gjort! Alle laver fejl. De skal ikke møde sådan en negativ attitude på grund af det. Måske er det på tide, at du samler nogle vidneudsagn fra sårede Habitikanere og tager et alvorsord med Den Gyldne Ridder!
", "questGoldenknight1CollectTestimony": "Vidneudsagn", - "questGoldenknight1DropGoldenknight2Quest": "Den Gyldne Ridders Kæde, del 2: Anløbent Guld (Skriftrulle)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "Den Gyldne Ridder, Del 2: Gylden Ridder", "questGoldenknight2Notes": "Bevæbnet med hundredevis af udtalelser fra Habitikanere konfronterer du endelig Den Gyldne Ridder. En efter en begynder du at læse Habitikanernes klager op for hende. \"Og @Pfeffernusse siger, at din konstante pralen-\" Ridderen løfter hånden for at få dig til at tie stille og fnyser, \"Disse folk er bare misundelige over min succes. I stedet for at klage skulle de tage at arbejde ligeså hårdt som mig! Måske skal jeg vise jer den magt, man kan opnå gennem at være som mig!\" Hun løfter sin morgenstjerne og gør klar til at angribe dig!
", "questGoldenknight2Boss": "Gylden Ridder", @@ -273,5 +273,11 @@ "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", "questSnakeBoss": "Serpent of Distraction", "questSnakeDropSnakeEgg": "Snake (Egg)", - "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market" + "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market", + "questUnicornText": "Convincing the Unicorn Queen", + "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", + "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", + "questUnicornBoss": "The Unicorn Queen", + "questUnicornDropUnicornEgg": "Unicorn (Egg)", + "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market" } \ No newline at end of file diff --git a/common/locales/da/rebirth.json b/common/locales/da/rebirth.json index 6669c9aab5..104de89e4e 100644 --- a/common/locales/da/rebirth.json +++ b/common/locales/da/rebirth.json @@ -23,5 +23,6 @@ "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher", "rebirthPop": "Begynd en ny karakter på Niveau 1 mens du beholder præstationer, samlerobjekter, og opgaver med historik.", "rebirthName": "Genfødselskugle", - "reborn": "Genfødt, højeste Niveau <%= reLevel %>" + "reborn": "Genfødt, højeste Niveau <%= reLevel %>", + "confirmReborn": "Are you sure?" } \ No newline at end of file diff --git a/common/locales/da/settings.json b/common/locales/da/settings.json index 17487f05e8..86a2d79a28 100644 --- a/common/locales/da/settings.json +++ b/common/locales/da/settings.json @@ -14,7 +14,7 @@ "startCollapsedPop": "Hvis valgt vil listen af opgavetags være skjult når du åbner en opgave for at rette den.", "startAdvCollapsed": "Avancerede Indstillinger i opgaver starter lukket", "startAdvCollapsedPop": "Hvis valgt vil Avancerede Indstillinger være skjult når du åbner en opgave for at rette den.", - "dontShowAgain": "Don't show this again", + "dontShowAgain": "Vis ikke igen", "suppressLevelUpModal": "Don't show popup when gaining a level", "suppressHatchPetModal": "Don't show popup when hatching a pet", "suppressRaisePetModal": "Don't show popup when raising a pet into a mount", @@ -93,7 +93,7 @@ "loginNameDescription2": "Bruger->Profil", "loginNameDescription3": "for at ændre det navn, der vises på din avatar og i dine chatbeskeder.", "emailNotifications": "Mail-notifikationer", - "wonChallenge": "You won a Challenge!", + "wonChallenge": "Du har vundet en Udfordring!", "newPM": "Modtaget Privatbesked", "giftedGems": "Ædelstensgave", "giftedGemsInfo": "<%= amount %> Ædelsten - af <%= name %>", @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "Markér for at afmelde emails", "unsubscribeAllEmailsText": "Ved at markere denne boks er jeg indforstået med, at ved at afmelde alle emails vil Habitica aldrig være i stand til at informere mig via email om vigtige ændringer på siden eller min konto.", "correctlyUnsubscribedEmailType": "Succesfuldt afmeldt \"<%= emailType %>\" emails.", - "subscriptionRateText": "Løbende $<%= price %> hver <%= months %>. måned", + "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", "benefits": "Fordele", "coupon": "Kupon", "couponPlaceholder": "Indtast Kuponkode", @@ -124,27 +124,27 @@ "promoPlaceholder": "Indtast Promo-kode", "displayInviteToPartyWhenPartyIs1": "Vis Invitér til Gruppe-knap når gruppen har 1 medlem.", "saveCustomDayStart": "Save Custom Day Start", - "registration": "Registration", + "registration": "Registrering", "addLocalAuth": "Add local authentication:", "generateCodes": "Generate Codes", - "generate": "Generate", + "generate": "Generér", "getCodes": "Get Codes", "webhooks": "Webhooks", "enabled": "Enabled", "webhookURL": "Webhook URL", - "add": "Add", + "add": "Tilføj", "buyGemsGoldCap": "Cap raised to <%= amount %>", "mysticHourglass": "<%= amount %> Mystic Hourglass", "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.", - "purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)", + "purchasedPlanId": "Recurring $<%= price %> USD each <%= months %> Month(s) (<%= plan %>)", "purchasedPlanExtraMonths": "You have <%= months %> months of subscription credit.", "consecutiveSubscription": "Consecutive Subscription", "consecutiveMonths": "Consecutive Months:", "gemCapExtra": "Gem Cap Extra:", - "mysticHourglasses": "Mystic Hourglasses:", + "mysticHourglasses": "Mystiske Timeglas:", "paypal": "PayPal", "amazonPayments": "Amazon Payments", - "timezone": "Time Zone", + "timezone": "Tidszone", "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <%= utc %>", "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.Die Goldene Ritterin ist Habiticanern mit ihrer Kritik ganz schön auf die Nerven gegangen. Nicht alle täglichen Aufgaben erledigt? Eine negative Gewohnheit angeklickt? Sie nimmt dies als Anlass dich zu bedrängen, dass du doch ihrem Beispiel folgen sollst. Sie ist das leuchtende Beispiel eines perfekten Habiticaners und Du bist nichts als ein Versager. Das ist ja mal gar nicht nett! Jeder macht Fehler. Man sollte deshalb nicht mit solcher Kritik drangsaliert werden. Vielleicht solltest du einige Zeugenaussagen von verletzten Habiticanern zusammentragen und die Goldene Ritterin mal ordentlich zurechtweisen!
", "questGoldenknight1CollectTestimony": "Zeugenaussagen", - "questGoldenknight1DropGoldenknight2Quest": "Die Goldene Ritterin-Kette Teil 2: Stumpfes Gold (Rolle)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "Der goldene Ritter, Teil 2: Gold Ritter", "questGoldenknight2Notes": "Mit hunderten Zeugenaussagen von Habiticanern bewaffnet, konfrontierst du die Goldene Ritterin. Du fängst an, ihr die Beschwerden der Habiticaner eine nach der anderen vorzulesen. \"Und @Pfeffernusse sagt, dass deine ständige Prahlerei-\" Die Ritterin hebt ihre Hand, um dich zum Schweigen zu bringen und spottet \"Ich bitte Dich, diese Leute sind einfach nur neidisch auf meinen Erfolg. Statt sich zu beschweren, sollten sie einfach so hart arbeiten wie ich! Vielleicht zeige ich Dir mal, wie stark Du werden kannst, wenn Du so fleißig bist wie ich!\" Sie hebt ihren Morgenstern und setzt zum Angriff an!
", "questGoldenknight2Boss": "Goldene Ritterin", @@ -252,16 +252,16 @@ "questHorseUnlockText": "Ermöglicht den Kauf von Hengsteier auf dem Marktplatz", "questBurnoutText": "Burnout und die Geister der Erschöpfung", "questBurnoutNotes": "Es ist weit nach Mitternacht, still und erstickend heiß als Redphoenix und Späheranführer Kiwibot plötzlich durch die Stadttore platzen. \"Wir müssen sämtliche Holzgebäude evakuieren!\", schreit Redphoenix. \"Beeilung!\"The Golden Knight has been getting on poor Habiticans' cases. Didn't do all of your Dailies? Checked off a negative Habit? She will use this as a reason to harass you about how you should follow her example. She is the shining example of a perfect Habitican, and you are naught but a failure. Well, that is not nice at all! Everyone makes mistakes. They should not have to be met with such negativity for it. Perhaps it is time you gather some testimonies from hurt Habiticans and give the Golden Knight a stern talking-to!
", "questGoldenknight1CollectTestimony": "Testimonies", - "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Tarnished Gold (Scroll)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "The Golden Knight, Part 2: Gold Knight", "questGoldenknight2Notes": "Armed with hundreds of Habitican's testimonies, you finally confront the Golden Knight. You begin to recite the Habitcan's complaints to her, one by one. \"And @Pfeffernusse says that your constant bragging-\" The knight raises her hand to silence you and scoffs, \"Please, these people are merely jealous of my success. Instead of complaining, they should simply work as hard as I! Perhaps I shall show you the power you can attain through diligence such as mine!\" She raises her morningstar and prepares to attack you!
", @@ -318,5 +318,12 @@ "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", "questSnakeBoss": "Serpent of Distraction", "questSnakeDropSnakeEgg": "Snake (Egg)", - "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market" + "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market", + + "questUnicornText": "Convincing the Unicorn Queen", + "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", + "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", + "questUnicornBoss": "The Unicorn Queen", + "questUnicornDropUnicornEgg": "Unicorn (Egg)", + "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market" } diff --git a/common/locales/en/rebirth.json b/common/locales/en/rebirth.json index 9e450f78f4..7ff4b9c349 100644 --- a/common/locales/en/rebirth.json +++ b/common/locales/en/rebirth.json @@ -23,5 +23,6 @@ "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher", "rebirthPop": "Begin a new character at Level 1 while retaining achievements, collectibles, and tasks with history.", "rebirthName": "Orb of Rebirth", - "reborn": "Reborn, max level <%= reLevel %>" + "reborn": "Reborn, max level <%= reLevel %>", + "confirmReborn": "Are you sure?" } diff --git a/common/locales/en/subscriber.json b/common/locales/en/subscriber.json index 7d585c0531..bcbf347519 100644 --- a/common/locales/en/subscriber.json +++ b/common/locales/en/subscriber.json @@ -63,6 +63,35 @@ "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "timeTravelersAlreadyOwned": "Congratulations! You already own everything the Time Travelers currently offer. Thanks for supporting the site!", "mysticHourglassPopover": "A Mystic Hourglass allows you to purchase certain limited-time items, such as monthly Mystery Item Sets and awards from world bosses, from the past!", + + "mysterySet201402": "Winged Messenger Set", + "mysterySet201403": "Forest Walker Set", + "mysterySet201404": "Twilight Butterfly Set", + "mysterySet201405": "Flame Wielder Set", + "mysterySet201406": "Octomage Set", + "mysterySet201407": "Undersea Explorer Set", + "mysterySet201408": "Sun Sorcerer Set", + "mysterySet201409": "Autumn Strider Set", + "mysterySet201410": "Winged Goblin Set", + "mysterySet201411": "Feast and Fun Set", + "mysterySet201412": "Penguin Set", + "mysterySet201501": "Starry Knight Set", + "mysterySet201502": "Winged Enchanter Set", + "mysterySet201503": "Aquamarine Set", + "mysterySet201504": "Busy Bee Set", + "mysterySet201505": "Green Knight Set", + "mysterySet201506": "Neon Snorkeler Set", + "mysterySet201507": "Rad Surfer Set", + "mysterySet201508": "Cheetah Costume Set", + "mysterySet201509": "Werewolf Set", + "mysterySet201510": "Horned Goblin Set", + "mysterySet201511": "Wood Warrior Set", + "mysterySet201512": "Winter Flame Set", + "mysterySet301404": "Steampunk Standard Set", + "mysterySet301405": "Steampunk Accessories Set", + + "mysterySetwondercon": "Wondercon", + "subUpdateCard": "Update Card", "subUpdateTitle": "Update", "subUpdateDescription": "Update the card to be charged.", diff --git a/common/locales/en/tasks.json b/common/locales/en/tasks.json index 66cca5774f..a8e2fed982 100644 --- a/common/locales/en/tasks.json +++ b/common/locales/en/tasks.json @@ -5,6 +5,7 @@ "beeminderDeleteWarning": "Beeminder users: First read Deleting Completed To-Dos Without Confusing Beeminder!", "addmultiple": "Add Multiple", "addsingle": "Add Single", + "habit": "Habit", "habits": "Habits", "newHabit": "New Habit", "newHabitBulk": "New Habits (one per line)", @@ -32,6 +33,7 @@ "mental": "Mental", "otherExamples": "Eg, professional pursuits, hobbies, financial, etc.", "progress": "Progress", + "daily": "Daily", "dailies": "Dailies", "newDaily": "New Daily", "newDailyBulk": "New Dailies (one per line)", @@ -46,6 +48,7 @@ "day": "Day", "days": "Days", "restoreStreak": "Restore Streak", + "todo": "To-Do", "todos": "To-Dos", "newTodo": "New To-Do", "newTodoBulk": "New To-Dos (one per line)", @@ -57,6 +60,7 @@ "notDue": "Not Due", "grey": "Grey", "score": "Score", + "reward": "Reward", "rewards": "Rewards", "ingamerewards": "Equipment & Skills", "gold": "Gold", @@ -86,7 +90,8 @@ "fortifyPop": "Return all tasks to neutral value (yellow color), and restore all lost Health.", "fortify": "Fortify", "fortifyText": "Fortify will return all your tasks to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", - "sureDelete": "Are you sure you want to delete this task?", + "confirmFortify": "Are you sure?", + "sureDelete": "Are you sure you want to delete the <%= taskType %> with the text \"<%= taskText %>\"?", "streakCoins": "Streak Bonus!", "pushTaskToTop": "Push task to top. Hold ctrl or cmd to push to bottom.", "emptyTask": "Enter the task's title first.", diff --git a/common/locales/en@pirate/backgrounds.json b/common/locales/en@pirate/backgrounds.json index c677633e9c..6db08110fb 100644 --- a/common/locales/en@pirate/backgrounds.json +++ b/common/locales/en@pirate/backgrounds.json @@ -117,20 +117,20 @@ "backgroundHarvestMoonNotes": "Laugh ya head off below the 'Arvest Moon", "backgroundSlimySwampText": "Sticky Swamp", "backgroundSlimySwampNotes": "Be wadin' through a Sticky Swamp", - "backgroundSwarmingDarknessText": "Swarming Darkness", - "backgroundSwarmingDarknessNotes": "Shiver in the Swarming Darkness.", + "backgroundSwarmingDarknessText": "Swarmin' Darkness", + "backgroundSwarmingDarknessNotes": "Shiver in th' Swarmin' Darkness.", "backgrounds112015": "SET 18: Released November 2015", - "backgroundFloatingIslandsText": "Floating Islands", - "backgroundFloatingIslandsNotes": "Hop across the Floating Islands.", + "backgroundFloatingIslandsText": "Floatin' Isles", + "backgroundFloatingIslandsNotes": "Hop 'cross th' Floatin' Isles.", "backgroundNightDunesText": "Night Dunes", - "backgroundNightDunesNotes": "Walk peacefully through the Night Dunes.", + "backgroundNightDunesNotes": "Walk peacefully through th' Night Dunes.", "backgroundSunsetOasisText": "Sunset Oasis", - "backgroundSunsetOasisNotes": "Bask in the Sunset Oasis.", + "backgroundSunsetOasisNotes": "Bask in th' Sunset Oasis.", "backgrounds122015": "SET 19: Released December 2015", "backgroundAlpineSlopesText": "Alpine Slopes", - "backgroundAlpineSlopesNotes": "Ski on the Alpine Slopes.", + "backgroundAlpineSlopesNotes": "Ski on th' Alpine Slopes.", "backgroundSnowySunriseText": "Snowy Sunrise", - "backgroundSnowySunriseNotes": "Gaze at the Snowy Sunrise.", + "backgroundSnowySunriseNotes": "Gaze at th' Snowy Sunrise.", "backgroundWinterTownText": "Winter Town", "backgroundWinterTownNotes": "Bustle through a Winter Town." } \ No newline at end of file diff --git a/common/locales/en@pirate/challenge.json b/common/locales/en@pirate/challenge.json index 28d12939fd..7cd6cf90da 100644 --- a/common/locales/en@pirate/challenge.json +++ b/common/locales/en@pirate/challenge.json @@ -57,11 +57,11 @@ "prizeValue": "<%= gemcount %> <%= gemicon %> Prize", "clone": "Clone", "challengeNotEnoughGems": "Ye do not have enough sapphires to post this challenge.", - "noPermissionEditChallenge": "You don't have permissions to edit this challenge", - "noPermissionDeleteChallenge": "You don't have permissions to delete this challenge", - "noPermissionCloseChallenge": "You don't have permissions to close this challenge", + "noPermissionEditChallenge": "Ye don't have permissions t' edit this challenge", + "noPermissionDeleteChallenge": "Ye don't have permissions t' delete this challenge", + "noPermissionCloseChallenge": "Ye don't have permissions t' close this challenge", "congratulations": "Congratulations!", "hurray": "Hurray!", "noChallengeOwner": "no owner", - "noChallengeOwnerPopover": "This challenge does not have an owner because the person who created the challenge deleted their account." + "noChallengeOwnerPopover": "This challenge does not have an owner because th' person who created th' challenge deleted their account." } \ No newline at end of file diff --git a/common/locales/en@pirate/character.json b/common/locales/en@pirate/character.json index 232d2697ad..6d548a325a 100644 --- a/common/locales/en@pirate/character.json +++ b/common/locales/en@pirate/character.json @@ -65,10 +65,10 @@ "ultimGearText": "Has upgraded to th' maximum weapon 'n armor set for yee followin' classes", "level": "Level", "levelUp": "Level Up!", - "gainedLevel": "You gained a level!", - "leveledUp": "By accomplishing your real-life goals, you've grown to Level <%= level %>!", - "fullyHealed": "You have been fully healed!", - "huzzah": "Huzzah!", + "gainedLevel": "Ye gained a level!", + "leveledUp": "By accomplishin' yer real-life goals, ye've grown t' Level <%= level %>!", + "fullyHealed": "Ye have been fully healed!", + "huzzah": "Ahoy!", "mana": "Mana", "hp": "HP", "mp": "MP", diff --git a/common/locales/en@pirate/content.json b/common/locales/en@pirate/content.json index 42294ea9ee..1b46c030d2 100644 --- a/common/locales/en@pirate/content.json +++ b/common/locales/en@pirate/content.json @@ -101,6 +101,9 @@ "questEggSnakeText": "Snake", "questEggSnakeMountText": "Snake", "questEggSnakeAdjective": "a slithering", + "questEggUnicornText": "Unicorn", + "questEggUnicornMountText": "Winged Unicorn", + "questEggUnicornAdjective": "a magical", "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Base", "hatchingPotionWhite": "White", @@ -113,6 +116,7 @@ "hatchingPotionCottonCandyBlue": "Cotton Candy Blue", "hatchingPotionGolden": "Golden", "hatchingPotionSpooky": "Spooky", + "hatchingPotionPeppermint": "Peppermint", "hatchingPotionNotes": "Pour 'tis on an egg, 'n it gunna hatch as a <%= potText(locale) %> pet.", "premiumPotionAddlNotes": "Not usable on quest pet eggs.", "foodMeat": "Meat", diff --git a/common/locales/en@pirate/death.json b/common/locales/en@pirate/death.json index 82eb18c423..035344a9be 100644 --- a/common/locales/en@pirate/death.json +++ b/common/locales/en@pirate/death.json @@ -4,13 +4,13 @@ "deathPenaltyDetails": "Ye lost a Level, yer Gold, an' a piece o' Equipment, but ye can get 'em all back with hard work! Good luck--ye'll do great.", "refillHealthTryAgain": "Refill Health & Try Again", "dyingOftenTips": "Do this be happenin' often? Here be some tips!", - "losingHealthWarning": "Careful - You're Losing Health!", - "losingHealthWarning2": "Don't let your Health drop to zero! If you do, you'll lose a level, your Gold, and a piece of equipment.", + "losingHealthWarning": "Careful - Yer Losin' Health!", + "losingHealthWarning2": "Don't be lettin'\u001d yer Health drop t' naught! If ye do, ye'll lose a level, your Doubloons, an' a piece o' equipment.", "toRegainHealth": "T' regain Health:", - "lowHealthTips1": "Level up to fully heal!", - "lowHealthTips2": "Buy a Health Potion from the Rewards column to restore 15 Health Points.", + "lowHealthTips1": "Level up t' fully heal!", + "lowHealthTips2": "Buy a Health Potion from th' Rewards column t' restore 15 Health Points.", "losingHealthQuickly": "Losin' Health quickly?", - "lowHealthTips3": "Incomplete Dailies hurt you overnight, so be careful not to add too many at first!", - "lowHealthTips4": "If a Daily isn't due on a certain day, you can disable it by clicking the pencil icon.", + "lowHealthTips3": "Incomplete Dailies hurt ye overnight, so be careful not t' add too many at first!", + "lowHealthTips4": "If a Daily isn't due on a certain day, ye can disable it by clickin' th' pencil icon.", "goodLuck": "Best o' luck!" } \ No newline at end of file diff --git a/common/locales/en@pirate/front.json b/common/locales/en@pirate/front.json index 582f68f9df..5602b87077 100644 --- a/common/locales/en@pirate/front.json +++ b/common/locales/en@pirate/front.json @@ -18,6 +18,7 @@ "choreSample4": "Swab the decks", "choreSample5": "Wash an' Dry a Load o' Clothes", "chores": "Chores", + "clearBrowserData": "Clear Browser Data", "communityBug": "Submit Bug", "communityExtensions": "Add-ons & Extensions", "communityFacebook": "Facebook", @@ -74,7 +75,7 @@ "infhQuote": "[Habitica] has really helped me impart structure to my life in graduate school.", "invalidEmail": "Arr, we need yer email before we can reset yer password, matey!", "irishfeet123Quote": "I've had horrible habits with clearing my place completely after meals and leaving cups all over the place. [Habitica] has cured that!", - "joinOthers": "Join <%= userCount %> people making it fun to achieve goals!", + "joinOthers": "Join <%= userCount %> people makin' it fun t'\u001c achieve goals!", "kazuiQuote": "Before [Habitica], I was stuck with my thesis, as well as dissatisfied with my personal discipline regarding housework and things like learning vocabulary and studying Go theory. It turns out breaking down these tasks into smaller manageable checklists is quite the thing to keep me motivated and constantly working.", "landingadminlink": "administrative packages", "landingend": "Haven't reeled ye in yet?", @@ -164,6 +165,12 @@ "teams": "Teams", "terms": "Terms an' Conditions", "testimonialHeading": "What folks be sayin'...", + "localStorageTryFirst": "If you are experiencing problems with Habitica, click the button below to clear cookies and local storage for this website (other websites will not be affected). You will need to log in again after doing this, so first be sure that you know your log-in details, which can be found at Settings -> <%= linkStart %>Site<%= linkEnd %>.", + "localStorageTryNext": "If the problem persists, please <%= linkStart %>Report a Bug<%= linkEnd %> if you haven't already.", + "localStorageClearing": "Clearing Local Storage", + "localStorageClearingExplanation": "Your browser's local storage is being cleared. You will be logged out and redirected to the home page. Please wait.", + "localStorageClear": "Clear Local Storage", + "localStorageClearExplanation": "This button will clear local storage and log you out", "tutorials": "Tutorials", "unlockByline1": "Achieve yer goals an' level up.", "unlockByline2": "Unlock new motivational tools, such as pet collecting, random rewards, spell-casting, an' more!", @@ -181,12 +188,11 @@ "marketingInquiries": "Marketing/Social Media Inquiries", "tweet": "Tweet", "apps": "Apps", - "notifyAndroidApp": "Want us to notify you when the Android app is ready? Sign up for this mailing list!", - "checkOutIOSApp": "Check out our new iOS App!", - "imagine1": "Imagine if improving your life were as fun as playing a game.", - "landingCopy1": "Advance in the game by completing your real-life tasks.", - "landingCopy2": "Battle monsters with friends to stay accountable to your goals.", - "landingCopy3": "Join over <%= userCount %> people having fun as they improve their lives.", + "checkOutMobileApps": "Check out our mobile apps!", + "imagine1": "Imagine if improvin' yer life were as fun as playin' a game.", + "landingCopy1": "Advance in th' game by completin' yer real-life tasks.", + "landingCopy2": "Battle monsters wit' mates t' stay accountable t' yer goals.", + "landingCopy3": "Join over <%= userCount %> people havin' fun as they improve their lives.", "alreadyHaveAccount": "I already have an account!", "getStartedNow": "Get Started Now!" } \ No newline at end of file diff --git a/common/locales/en@pirate/gear.json b/common/locales/en@pirate/gear.json index bab74dbed0..2b8cdc566b 100644 --- a/common/locales/en@pirate/gear.json +++ b/common/locales/en@pirate/gear.json @@ -134,6 +134,14 @@ "weaponSpecialFall2015MageNotes": "A powerful Stitch Witch can control this enchanted thread without even touching it! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Autumn Gear.", "weaponSpecialFall2015HealerText": "Swamp-Slime Potion", "weaponSpecialFall2015HealerNotes": "Brewed to perfection! Now you just have to convince yourself to drink it. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.", + "weaponSpecialWinter2016RogueText": "Cocoa Mug", + "weaponSpecialWinter2016RogueNotes": "Warming drink, or boiling projectile? You decide... Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "weaponSpecialWinter2016WarriorText": "Sturdy Shovel", + "weaponSpecialWinter2016WarriorNotes": "Shovel overdue tasks out of the way! Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "weaponSpecialWinter2016MageText": "Sorcerous Snowboard", + "weaponSpecialWinter2016MageNotes": "Your moves are so sick, they must be magic! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "weaponSpecialWinter2016HealerText": "Confetti Cannon", + "weaponSpecialWinter2016HealerNotes": "WHEEEEEEEEEE!!!!!!! HAPPY WINTER WONDERLAND!!!!!!!! Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.", "weaponMystery201411Text": "Pitchfork o' Feasting", "weaponMystery201411Notes": "Stab yer enemies or dig in to yer favorite vittles - this here versatile pitchfork does it all! It don't benefit ye.\nNovember 2014 Subscriberrr Item", "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth", @@ -283,6 +291,14 @@ "armorSpecialFall2015MageNotes": "Every stitch in this armor shimmers with enchantment. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.", "armorSpecialFall2015HealerText": "Potioner Robes", "armorSpecialFall2015HealerNotes": "What? Of course that was a potion of constitution. No, you are definitely not turning into a frog! Don't be ribbiticulous. Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.", + "armorSpecialWinter2016RogueText": "Cocoa Armor", + "armorSpecialWinter2016RogueNotes": "This leather armor keeps you nice and toasty. Is it actually made from cocoa? You'll never tell. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "armorSpecialWinter2016WarriorText": "Snowman Suit", + "armorSpecialWinter2016WarriorNotes": "Brr! This padded armor is truly powerful... until it melts. Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", + "armorSpecialWinter2016MageText": "Snowboarder Parka", + "armorSpecialWinter2016MageNotes": "The wisest wizard keeps well-bundled in the winter wind. Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.", + "armorSpecialWinter2016HealerText": "Festive Fairy Cloak", + "armorSpecialWinter2016HealerNotes": "Festive Fairies wrap their body wings around themselves for protection as they use their head wings to catch headwinds and fly around Habitica at speeds of up to 100 mph, delivering gifts and spraying everyone with confetti. How droll. Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", "armorMystery201402Text": "Messenger Robes", "armorMystery201402Notes": "Shimmering an' strong, these robes have many pockets t' carry letters. Don't benefit ye. February 2014 Subscriber Item.", "armorMystery201403Text": "Forest Walker Armor", @@ -315,6 +331,8 @@ "armorMystery201509Notes": "This IS a costume, right? Confers no benefit. September 2015 Subscriber Item.", "armorMystery201511Text": "Wooden Armor", "armorMystery201511Notes": "Considering this armor was carved directly from a magical log, it's surprisingly comfortable. Confers no benefit. November 2015 Subscriber Item.", + "armorMystery201512Text": "Cold Fire Armor", + "armorMystery201512Notes": "Summon the icy flames of winter! Confers no benefit. December 2015 Subscriber Item.", "armorMystery301404Text": "Steampunk Suit", "armorMystery301404Notes": "Dapper an' dashing, wot! Don't benefit ye. February 3015 Subscriber Item.", "armorArmoireLunarArmorText": "Soothin' Lunar Armor", @@ -454,6 +472,16 @@ "headSpecialFall2015MageNotes": "Every stitch in this hat augments its power. Increases Perception by <%= per %>. Limited Edition 2015 Autumn Gear.", "headSpecialFall2015HealerText": "Hat of Frog", "headSpecialFall2015HealerNotes": "This is an extremely serious hat that is worthy of only the most advanced potioners. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.", + "headSpecialNye2015Text": "Ridiculous Party Hat", + "headSpecialNye2015Notes": "You've received a Ridiculous Party Hat! Wear it with pride while ringing in the New Year! Confers no benefit.", + "headSpecialWinter2016RogueText": "Cocoa Helm", + "headSpecialWinter2016RogueNotes": "The protective scarf on this cozy helm is only removed to sip warm winter beverages. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "headSpecialWinter2016WarriorText": "Snowman Cap", + "headSpecialWinter2016WarriorNotes": "Brr! This mighty helm is truly powerful... until it melts. Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "headSpecialWinter2016MageText": "Snowboarder Hood", + "headSpecialWinter2016MageNotes": "Keeps the snow out of your eyes while you're casting spells. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "headSpecialWinter2016HealerText": "Fairy Wing Helm", + "headSpecialWinter2016HealerNotes": "Thesewingsfluttersoquicklythattheyblur! Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.", "headSpecialGaymerxText": "Rainbow Warrior Helm", "headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.", "headMystery201402Text": "Winged Helm", @@ -480,6 +508,8 @@ "headMystery201509Notes": "This IS a mask, right? Confers no benefit. September 2015 Subscriber Item.", "headMystery201511Text": "Log Crown", "headMystery201511Notes": "Count the number of rings to learn how old this crown is. Confers no benefit. November 2015 Subscriber Item.", + "headMystery201512Text": "Winter Flame", + "headMystery201512Notes": "These flames burn cold with pure intellect. Confers no benefit. December 2015 Subscriber Item.", "headMystery301404Text": "Fancy Top Hat", "headMystery301404Notes": "A fancy top hat fer th' finest o' gentlefolk! January 3015 Subscriber Item. Don't benefit ye.", "headMystery301405Text": "Basic Top Hat", @@ -595,6 +625,12 @@ "shieldSpecialFall2015WarriorNotes": "It's true that you're supposed to be SCARING the crows, but there's nothing wrong with making friends! Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.", "shieldSpecialFall2015HealerText": "Stirring Stick", "shieldSpecialFall2015HealerNotes": "This stick can stir anything without melting, dissolving, or bursting into flame! It can also be used to fiercely poke enemy tasks. Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.", + "shieldSpecialWinter2016RogueText": "Cocoa Mug", + "shieldSpecialWinter2016RogueNotes": "Warming drink, or boiling projectile? You decide... Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "shieldSpecialWinter2016WarriorText": "Sled Shield", + "shieldSpecialWinter2016WarriorNotes": "Use this sled to block attacks, or ride it triumphantly into battle! Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", + "shieldSpecialWinter2016HealerText": "Pixie Present", + "shieldSpecialWinter2016HealerNotes": "Open it open it open it open it open it open it!!!!!!!!! Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", "shieldMystery301405Text": "Clock Shield", "shieldMystery301405Notes": "Time be on yer side wit' this towering clock shield! Don't benefit ye. June 3015 Subscriber Item.", "shieldArmoireGladiatorShieldText": "Gladiator Shield", diff --git a/common/locales/en@pirate/generic.json b/common/locales/en@pirate/generic.json index 17a6aa3836..a3ec958d19 100644 --- a/common/locales/en@pirate/generic.json +++ b/common/locales/en@pirate/generic.json @@ -3,6 +3,26 @@ "stringNotFound": "String '<%= string %>' not found.", "titleIndex": "Habitica | Yer Life Th' Role Playing Game", "habitica": "Habitica", + "titleTasks": "Tasks", + "titleAvatar": "Avatar", + "titleBackgrounds": "Backgrounds", + "titleStats": "Stats & Achievements", + "titleProfile": "Profile", + "titleInbox": "Inbox", + "titleTavern": "Tavern", + "titleParty": "Party", + "titleHeroes": "Hall of Heroes", + "titlePatrons": "Hall of Patrons", + "titleGuilds": "Guilds", + "titleChallenges": "Challenges", + "titleDrops": "Market", + "titleQuests": "Quests", + "titlePets": "Pets", + "titleMounts": "Mounts", + "titleEquipment": "Equipment", + "titleTimeTravelers": "Time Travelers", + "titleSeasonalShop": "Seasonal Shop", + "titleSettings": "Settings", "expandToolbar": "Expand Toolbar", "collapseToolbar": "Collapse Toolbar", "markdownBlurb": "Habitica uses markdown fer message formattin'. See thi' Markdown Cheat Sheet fer morrre info.", diff --git a/common/locales/en@pirate/groups.json b/common/locales/en@pirate/groups.json index c53eecffd5..f039f17900 100644 --- a/common/locales/en@pirate/groups.json +++ b/common/locales/en@pirate/groups.json @@ -131,7 +131,7 @@ "sendGiftFromBalance": "From Balance", "sendGiftPurchase": "Purchase", "sendGiftMessagePlaceholder": "Personal message (optional)", - "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>", + "sendGiftSubscription": "<%= months %> Month(s): $<%= price %> USD", "battleWithFriends": "Battle Beasts Wit' Mates", "startPartyWithFriends": "Start a Party with your friends!", "startAParty": "Form a Crew", diff --git a/common/locales/en@pirate/limited.json b/common/locales/en@pirate/limited.json index c06e09fabe..5970d73ef5 100644 --- a/common/locales/en@pirate/limited.json +++ b/common/locales/en@pirate/limited.json @@ -30,13 +30,18 @@ "seasonalShopClosedText": "The Seasonal Shop currently be closed!! I don't know where th' Seasonal Sorceress be now, but I bet she'll be back during th' next Grand Gala!", "seasonalShopText": "Welcome t' th' Seasonal Shop!! We're stockin' springtime Seasonal Edition goodies at th' moment. Everything here will be available t' purchase durin' th' Spring Fling event each year, but we're only open until April 30th, so be sure t' stock up now, or you'll have t' wait a year t' buy these items again!", "seasonalShopSummerText": "Welcome t' th' Seasonal Shop!! We be stockin' summertime Seasonal Edition goodies at th' moment. Everything here will be available t' purchase during th' Summer Splash event each year, but we're only open until July 31st, so be sure t' stock up now, or you'll have t' wait a year t' buy these items again!", - "seasonalShopFallText": "Welcome to the Seasonal Shop!! We're stocking autumn Seasonal Edition goodies at the moment. Everything here will be available to purchase during the Fall Festival event each year, but we're only open until October 31, so be sure to stock up now, or you'll have to wait a year to buy these items again!", - "seasonalShopFallTextBroken": "Oh.... Welcome to the Seasonal Shop... We're stocking autumn Seasonal Edition goodies, or something... Everything here will be available to purchase during the Fall Festival event each year, but we're only open until October 31... I guess you should to stock up now, or you'll have to wait... and wait... and wait... *sigh*", - "seasonalShopRebirth": "If you've used the Orb of Rebirth, you can repurchase this equipment in the Rewards Column. Initially, you'll only be able to purchase the items for your current class (Warrior by default), but fear not, the other class-specific items will become available if you switch to that class.", + "seasonalShopFallText": "Welcome t' th' Seasonal Shop!! We be stockin' autumn Seasonal Edition goodies a' th' moment. Everything here 'll be available t' purchase durin' th' Fall Festival even' each year, but we only be open 'til October 31, so be sure t' stock up now, or ye'll have t' wait a year t' buy these items again!", + "seasonalShopWinterText": "Welcome to the Seasonal Shop!! We're stocking winter Seasonal Edition goodies at the moment. Everything here will be available to purchase during the Winter Wonderland event each year, but we're only open until January 31, so be sure to stock up now, or you'll have to wait a year to buy these items again!", + "seasonalShopFallTextBroken": "Oh.... Welcome t' th' Seasonal Shop... We be stockin' autumn Seasonal Edition goodies, 'r somethin'... Everything here will be available t' purchase durin' th' Fall Festival even' each year, but we only be open 'til October 31... I guess ye should be stockin' up now, or ye'll be havin' t' wait... an' wait... an' wait... *sigh*", + "seasonalShopRebirth": "If ye've used th' Orb o' Rebirth, ye can repurchase this gear in th' Loot Column. At first, ye'll only be able to buy the items fer yer current class (Mercenary by default), but remain stout o' heart, ye can have the other classes' stuff if ye switch to that class.", "candycaneSet": "Candy Cane (Mage)", "skiSet": "Ski-sassin (Scallywag)", "snowflakeSet": "Snowflake (Doc)", "yetiSet": "Albatross Tamer (Warrior)", + "northMageSet": "Mage of the North (Mage)", + "icicleDrakeSet": "Icicle Drake (Rogue)", + "soothingSkaterSet": "Soothing Skater (Healer)", + "gingerbreadSet": "Gingerbread Warrior (Warrior)", "toAndFromCard": "T': <%= toName %>, From: <%= fromName %>", "nyeCard": "New Year's Card", "nyeCardExplanation": "Fer celebratin' th' new year together, ye both receive th' \"Auld Acquaintance\" badge!", @@ -58,9 +63,10 @@ "emeraldMermageSet": "Emerald Mermage (Mage)", "reefSeahealerSet": "Reef Seahealer (Doc)", "roguishPirateSet": "Roguish Pirate (Rogue)", - "monsterOfScienceSet": "Monster of Science (Warrior)", - "witchyWizardSet": "Witchy Wizard (Mage)", - "mummyMedicSet": "Mummy Medic (Healer)", - "vampireSmiterSet": "Vampire Smiter (Rogue)", - "fallEventAvailability": "Available until October 31" + "monsterOfScienceSet": "Monster o' Science (Mercenary)", + "witchyWizardSet": "Witchy Wizard (Magician)", + "mummyMedicSet": "Mummy Medic (Doc)", + "vampireSmiterSet": "Vampire Smiter (Scallywag)", + "fallEventAvailability": "Available 'til October 31", + "winterEventAvailability": "Available until December 31" } \ No newline at end of file diff --git a/common/locales/en@pirate/messages.json b/common/locales/en@pirate/messages.json index 5abbbe2aff..321a56dcd6 100644 --- a/common/locales/en@pirate/messages.json +++ b/common/locales/en@pirate/messages.json @@ -13,13 +13,14 @@ "messageDontEnjoyFood": "<%= egg %> eats th' <%= foodText %> but doesn't seem t' enjoy it.", "messageBought": "Bought <%= itemText %>", "messageEquipped": "<%= itemText %> equipped.", - "messageUnEquipped": "<%= itemText %> un-equipped.", + "messageUnEquipped": "<%= itemText %> unequipped.", "messageMissingEggPotion": "Yer missin' either that egg er that potion", "messageInvalidEggPotionCombo": "Ye can't hatch Adventure Pet Eggs wi' Magic Hatching Potions! Try a different egg.", "messageAlreadyPet": "Ye already 'ave that pet. Try yer hand in hatchin' a different combination!", "messageHatched": "Yer egg hatched! Visit yer stable t' equip yer pet.", "messageNotEnoughGold": "Not Enough Doubloons", - "messageTwoHandled": "<%= gearText %> be two handed", + "messageTwoHandedEquip": "Wielding <%= twoHandedText %> takes two hands, so <%= offHandedText %> has been unequipped.", + "messageTwoHandedUnequip": "Wielding <%= twoHandedText %> takes two hands, so it was unequipped when you armed yourself with <%= offHandedText %>.", "messageDropFood": "Ye 'ave found <%= dropArticle %><%= dropText %>! <%= dropNotes %>", "messageDropEgg": "Ye 'ave found a <%= dropText %> Egg! <%= dropNotes %>", "messageDropPotion": "Ye 'ave found a <%= dropText %> Hatchin' Potion! <%= dropNotes %>", diff --git a/common/locales/en@pirate/noscript.json b/common/locales/en@pirate/noscript.json index 6057268ef2..25d7923c6d 100644 --- a/common/locales/en@pirate/noscript.json +++ b/common/locales/en@pirate/noscript.json @@ -1,6 +1,6 @@ { - "jsDisabledHeading": "Alas! Your browser doesn't have JavaScript enabled", - "jsDisabledHeadingFull": "Alas! Your browser doesn't have JavaScript enabled and without it, Habitica can't work properly", - "jsDisabledText": "Habitica can't properly display the site without it!", - "jsDisabledLink": "Please enable JavaScript to continue!" + "jsDisabledHeading": "Alas! Yer browser don't have JavaScript enabled", + "jsDisabledHeadingFull": "Alas! Yer browser don't have JavaScript enabled an' wi'out it, Habitica can't be workin' properly", + "jsDisabledText": "Habitica can't be properly displayin' th' site wi'out it!", + "jsDisabledLink": "Please enable JavaScript t' continue!" } \ No newline at end of file diff --git a/common/locales/en@pirate/pets.json b/common/locales/en@pirate/pets.json index 906aca2f7c..e9ee0432d6 100644 --- a/common/locales/en@pirate/pets.json +++ b/common/locales/en@pirate/pets.json @@ -27,15 +27,15 @@ "eggSingular": "egg", "noEggs": "Ye don't 'ave any eggs.", "hatchingPotions": "Hatchin' Potions", - "magicHatchingPotions": "Magic Hatching Potions", + "magicHatchingPotions": "Magic Hatchin' Potions", "hatchingPotion": "hatching potion", "noHatchingPotions": "Ye don't 'ave any hatchin' potions.", "inventoryText": "Click an egg t' spy wit' ye eye usable potions highlighted in green 'n then click one 'o th' highlighted potions t' hatch ye pet. If no potions be highlighted, click that egg again t' deselect it, 'n instead click a potion first t' have th' usable eggs highlighted. Ye can also sell unwanted loot t' Alexander th' Sutler.", "foodText": "food", "food": "Vittles an' Saddles", "noFood": "Ye don't 'ave any vittles 'r saddles.", - "dropsExplanation": "Get these items faster with Gems if you don't want to wait for them to drop when completing a task. Learn more about the drop system.", - "premiumPotionNoDropExplanation": "Magic Hatching Potions cannot be used on eggs received from Quests. The only way to get Magic Hatching Potions is by buying them below, not from random drops.", + "dropsExplanation": "Get these items faster with Sapphires if ye don't want t' wait for 'em t' drop when completin' a task. Learn more about th' drop system.", + "premiumPotionNoDropExplanation": "Magic Hatchin' Potions cannot be used on eggs received from Quests. Th' only way t' get Magic Hatching Potions is by buyin' 'em below, not from random drops.", "beastMasterProgress": "Beast Master Progress", "stableBeastMasterProgress": "Beast Master Progress: <%= number %> Pets Found", "beastAchievement": "Ye've earned th' \"Beast Master\" Achievement fer collectin' all th' pets!", @@ -58,14 +58,14 @@ "firstDrop": "Ye've unlocked th' Drop System! Now when ye complete tasks, ye have a small chance o' findin' an item, includin' eggs, potions, an' food! Ye just found a <%= eggText %> Egg! <%= eggNotes %>", "useGems": "If ye've got yer eye on a pet, but can't wait any longer fer it t' drop, use Sapphires in Inventory > Market t' buy one!", "hatchAPot": "Hatch a <%= potion %> <%= egg %>?", - "hatchedPet": "You hatched a <%= potion %> <%= egg %>!", + "hatchedPet": "Ye hatched a <%= potion %> <%= egg %>!", "displayNow": "Display Now", "displayLater": "Display Later", - "earnedCompanion": "With all your productivity, you've earned a new companion. Feed it to make it grow!", + "earnedCompanion": "Wit' all yer productivity, ye've earned a new companion. Feed it t' make it grow!", "feedPet": "Feed <%= article %><%= text %> t' yer <%= name %>?", "useSaddle": "Saddle <%= pet %>?", - "raisedPet": "You grew a <%= pet %>!", - "earnedSteed": "By completing your tasks, you've earned a faithful steed!", + "raisedPet": "Ye grew a <%= pet %>!", + "earnedSteed": "By completin' yer tasks, ye've earned a faithful steed!", "rideNow": "Ride Now", "rideLater": "Ride Later", "petName": "<%= potion %> <%= egg %>", @@ -80,6 +80,7 @@ "petKeyPets": "Release Me Pets", "petKeyMounts": "Release Me Mounts", "petKeyBoth": "Release Both", + "confirmPetKey": "Are you sure?", "petKeyNeverMind": "Not Yet", "gemsEach": "sapphires each" } \ No newline at end of file diff --git a/common/locales/en@pirate/questscontent.json b/common/locales/en@pirate/questscontent.json index 9cb4dc2fdb..9735f3d2fc 100644 --- a/common/locales/en@pirate/questscontent.json +++ b/common/locales/en@pirate/questscontent.json @@ -1,6 +1,6 @@ { "questEvilSantaText": "Trapper Santa", - "questEvilSantaNotes": "Ye hear bemoaned roars deep in th' icefields. ye follow th' roars 'n growls - punctuated by another voice's cacklin' - to a clearin' in th' woods whar ye spy wit' ye eye a fully-grown polar bear. She's caged 'n shackled, roarin' fer life. Dancin' atop th' cage be a malicious wee imp wearin' castaway Christmas costumes. Vanquish Trapper Santa, 'n save th' beast!", + "questEvilSantaNotes": "You hear moaning roars deep in the icefields. You follow the roars and growls - punctuated by another voice's cackling - to a clearing in the woods where you see a fully-grown polar bear. She's caged and shackled, roaring for life. Dancing atop the cage is a malicious little imp wearing castaway Christmas costumes. Vanquish Trapper Santa, and save the beast!", "questEvilSantaCompletion": "Trapper Santa squeals in anger, 'n bounces off into th' nightfall. A grateful she-bear, through roars 'n growls, tries to be tellin' ye somethin'. ye take her back to th' stables, whar Matt Boch th' whisperer listens to her tale wit' a gasp 'o horror. She has a cub! He ran off into th' icefields when mama bear was captured. Help her find her baby!", "questEvilSantaBoss": "Trapper Santa", "questEvilSantaDropBearCubPolarMount": "Polar Bear (Mount)", @@ -90,7 +90,7 @@ "questGoldenknight1Text": "Th' Golden Knight, Part 1: A Stern Talkin'-To", "questGoldenknight1Notes": "Th' Golden Knight has been getting on poor Habiticans' cases. Didn't do all o' yer Dailies? Checked off a negative Habit? She will use this as a reason t' harass ye about how ye should follow her example. She be th' shinin' example o' a perfect Habitican, and ye be naught but a failure. Well, that not be nice at all! Everyone makes mistakes. They should not have t' be met with such negativity for it. Perhaps it be time ye gather some testimonies from hurt Habiticans an' give th' Golden Knight a stern talkin'-to!
", "questGoldenknight1CollectTestimony": "Testimonies", - "questGoldenknight1DropGoldenknight2Quest": "Th' Golden Knight Chain Part 2: Tarnished Gold (Scroll)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "Th' Golden Knight, Part 2: Gold Knight", "questGoldenknight2Notes": "Armed with hundreds o' Habitican's testimonies, ye finally confront th' Golden Knight. Ye begin t' recite th' Habitcan's complaints t' her, one by one. \"And @Pfeffernusse says that yer constant bragging-\" The knight raises her hand t' silence you an' scoffs, \"Please, these people are merely jealous of my success. Instead of complaining, they should simply work as hard as I! Perhaps I shall show you the power you can attain through diligence such as mine!\" She raises her morningstar an' prepares t' attack ye!
", "questGoldenknight2Boss": "Gold Knight", @@ -273,5 +273,11 @@ "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", "questSnakeBoss": "Serpent of Distraction", "questSnakeDropSnakeEgg": "Snake (Egg)", - "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market" + "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market", + "questUnicornText": "Convincing the Unicorn Queen", + "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", + "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", + "questUnicornBoss": "The Unicorn Queen", + "questUnicornDropUnicornEgg": "Unicorn (Egg)", + "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market" } \ No newline at end of file diff --git a/common/locales/en@pirate/rebirth.json b/common/locales/en@pirate/rebirth.json index 3b2e4fd40c..cd9dba49d3 100644 --- a/common/locales/en@pirate/rebirth.json +++ b/common/locales/en@pirate/rebirth.json @@ -16,12 +16,13 @@ "rebirthEarnAchievement": "Ye also earn an Achievement fer embarkin' on a new adventure!", "beReborn": "Be Reborn", "rebirthAchievement": "Ye've begun a new adventure! 'tis be Rebirth <%= number %> fer ye, 'n th' highest Level ye've attained be <%= level %>. To stack 'tis Achievement, begin ye next new adventure when ye've reached an even higher Level!", - "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!", + "rebirthAchievement100": "Ye've begun a new voyage! This be Rebirth <%= number %> fer ye, an' th' highest Level ye've attained be 100 or higher. T' stack this Achievement, begin yer nex' new voyage when ye've reached at least 100!", "rebirthBegan": "Embarked on a New Adventure", "rebirthText": "Embarked on <%= rebirths %> New Adventures", "rebirthOrb": "Used an Orb o' Rebirth to start ov'r after attainin' Level", - "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher", + "rebirthOrb100": "Used an Orb o' Rebirth t' start over after attainin' Level 100 or higher", "rebirthPop": "Begin a new character at Level 1 whilst retainin' achievements, collectibles, an' tasks with history.", "rebirthName": "Orb o' Rebirth", - "reborn": "Reborn, max level <%= reLevel %>" + "reborn": "Reborn, max level <%= reLevel %>", + "confirmReborn": "Are you sure?" } \ No newline at end of file diff --git a/common/locales/en@pirate/settings.json b/common/locales/en@pirate/settings.json index e1d7c6f984..f37d3bf313 100644 --- a/common/locales/en@pirate/settings.json +++ b/common/locales/en@pirate/settings.json @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "Check t' Unsubscribe from Emails", "unsubscribeAllEmailsText": "By checkin' this box, I certify that I understand that by unsubscribing from all emails, Habitica will never be able t' notify me via email about important changes t' th' site or my account.", "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.", - "subscriptionRateText": "Recurring $<%= price %> every <%= months %> months", + "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", "benefits": "Benefits", "coupon": "Coupon", "couponPlaceholder": "Enter Coupon Code", @@ -136,7 +136,7 @@ "buyGemsGoldCap": "Cap raised to <%= amount %>", "mysticHourglass": "<%= amount %> Mystic Hourglass", "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.", - "purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)", + "purchasedPlanId": "Recurring $<%= price %> USD each <%= months %> Month(s) (<%= plan %>)", "purchasedPlanExtraMonths": "You have <%= months %> months of subscription credit.", "consecutiveSubscription": "Consecutive Subscription", "consecutiveMonths": "Consecutive Months:", diff --git a/common/locales/en@pirate/subscriber.json b/common/locales/en@pirate/subscriber.json index c72d2cc6a7..9f24166a63 100644 --- a/common/locales/en@pirate/subscriber.json +++ b/common/locales/en@pirate/subscriber.json @@ -59,10 +59,36 @@ "timeTravelers": "Time Travelers", "timeTravelersTitleNoSub": "<%= linkStartTyler %>Tyler<%= linkEnd %> and <%= linkStartVicky %>Vicky<%= linkEnd %>", "timeTravelersTitle": "Mysterious Time Travelers", - "timeTravelersPopoverNoSub": "You'll need a Mystic Hourglass to summon the mysterious Time Travelers! <%= linkStart %>Subscribers<%= linkEnd %> earn one Mystic Hourglass for every three months of consecutive subscribing. Come back when you have a Mystic Hourglass, and the Time Travelers will fetch you a rare pet, mount, or Subscriber Item Set from the past... or maybe even the future.", + "timeTravelersPopoverNoSub": "Ye'll need a Mystic Hourglass t' summon th' mysterious Time Travelers! <%= linkStart %>Subscribers<%= linkEnd %> earn one Mystic Hourglass fer every three months o' consecutive subscribin'. Come back when ye have a Mystic Hourglass, an' th' Time Travelers will fetch ye a rare pet, mount, or Subscriber Item Set from th' past... or maybe even th' future.", "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "timeTravelersAlreadyOwned": "Congratulations! You already own everything the Time Travelers currently offer. Thanks for supporting the site!", "mysticHourglassPopover": "A Mystic Hourglass allows you to purchase certain limited-time items, such as monthly Mystery Item Sets and awards from world bosses, from the past!", + "mysterySet201402": "Winged Messenger Set", + "mysterySet201403": "Forest Walker Set", + "mysterySet201404": "Twilight Butterfly Set", + "mysterySet201405": "Flame Wielder Set", + "mysterySet201406": "Octomage Set", + "mysterySet201407": "Undersea Explorer Set", + "mysterySet201408": "Sun Sorcerer Set", + "mysterySet201409": "Autumn Strider Set", + "mysterySet201410": "Winged Goblin Set", + "mysterySet201411": "Feast and Fun Set", + "mysterySet201412": "Penguin Set", + "mysterySet201501": "Starry Knight Set", + "mysterySet201502": "Winged Enchanter Set", + "mysterySet201503": "Aquamarine Set", + "mysterySet201504": "Busy Bee Set", + "mysterySet201505": "Green Knight Set", + "mysterySet201506": "Neon Snorkeler Set", + "mysterySet201507": "Rad Surfer Set", + "mysterySet201508": "Cheetah Costume Set", + "mysterySet201509": "Werewolf Set", + "mysterySet201510": "Horned Goblin Set", + "mysterySet201511": "Wood Warrior Set", + "mysterySet201512": "Winter Flame Set", + "mysterySet301404": "Steampunk Standard Set", + "mysterySet301405": "Steampunk Accessories Set", + "mysterySetwondercon": "Wondercon", "subUpdateCard": "Update Card", "subUpdateTitle": "Update", "subUpdateDescription": "Update the card to be charged.", diff --git a/common/locales/en@pirate/tasks.json b/common/locales/en@pirate/tasks.json index 8435059711..e1cd4d0919 100644 --- a/common/locales/en@pirate/tasks.json +++ b/common/locales/en@pirate/tasks.json @@ -5,6 +5,7 @@ "beeminderDeleteWarning": "Beeminder users: First read Deletin' Completed T'-Dos Without Confusin' Beeminder!", "addmultiple": "Ard' Multiple", "addsingle": "Ard' Single", + "habit": "Habit", "habits": "Habits", "newHabit": "New Habit", "newHabitBulk": "New Habits (one a line)", @@ -32,6 +33,7 @@ "mental": "Mental", "otherExamples": "Eg, treasure huntin', parrot-trainin', plunderin', etc.", "progress": "Progress", + "daily": "Daily", "dailies": "Dailies", "newDaily": "New Daily", "newDailyBulk": "New Dailies (one per line)", @@ -46,6 +48,7 @@ "day": "Day", "days": "Days", "restoreStreak": "Restore Streak", + "todo": "To-Do", "todos": "T'-Dos", "newTodo": "New T'-Do", "newTodoBulk": "New T'-Dos (one per line)", @@ -57,6 +60,7 @@ "notDue": "Not Due", "grey": "Grey", "score": "Score", + "reward": "Reward", "rewards": "Loot", "ingamerewards": "Gear & Skills", "gold": "Doubloons", @@ -86,9 +90,10 @@ "fortifyPop": "Return all tasks t' neutral value (yellow color), 'n restore all lost Health.", "fortify": "Fortify", "fortifyText": "Fortify will return all yer tasks t' a neutral (yellow) state, as if ye'd jus' added 'em, an' top yer Health off t' full. This is great if all yer red tasks be makin' th' game too hard, or all yer blue tasks be making th' game too easy. If startin' fresh sounds much more motivatin', spend th' Gems an' catch a reprieve!", - "sureDelete": "Arrr ye sure ye want t' delete this task?", + "confirmFortify": "Are you sure?", + "sureDelete": "Are you sure you want to delete the <%= taskType %> with the text \"<%= taskText %>\"?", "streakCoins": "Streak Bonus!", - "pushTaskToTop": "Push task to top. Hold ctrl or cmd to push to bottom.", + "pushTaskToTop": "Push task t' top. Hold ctrl or cmd t' push down t' Davey Jones' locker.", "emptyTask": "Enter t' task's title first.", "dailiesRestingInInn": "Yo'rg Restin' in t' Inn! Your Dailies will NOT hurt you tonight, but they WILL still refresh every day. If yo'rge in a quest, you won't deal damage/collect items until you check out o' t' Inn, but you can still be injured by a Boss if your Party lads skip their own Dailies.", "habitHelp1": "Good Habits are things that ye do often. They award Gold an' Experience every time ye click th' <%= plusIcon %>.", diff --git a/common/locales/en_GB/content.json b/common/locales/en_GB/content.json index 0477c48046..9fc3fdf02a 100644 --- a/common/locales/en_GB/content.json +++ b/common/locales/en_GB/content.json @@ -101,6 +101,9 @@ "questEggSnakeText": "Snake", "questEggSnakeMountText": "Snake", "questEggSnakeAdjective": "a slithering", + "questEggUnicornText": "Unicorn", + "questEggUnicornMountText": "Winged Unicorn", + "questEggUnicornAdjective": "a magical", "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Base", "hatchingPotionWhite": "White", @@ -113,6 +116,7 @@ "hatchingPotionCottonCandyBlue": "Candyfloss Blue", "hatchingPotionGolden": "Golden", "hatchingPotionSpooky": "Spooky", + "hatchingPotionPeppermint": "Peppermint", "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.", "premiumPotionAddlNotes": "Not usable on quest pet eggs.", "foodMeat": "Meat", diff --git a/common/locales/en_GB/front.json b/common/locales/en_GB/front.json index 6f3d143fa4..1529442d93 100644 --- a/common/locales/en_GB/front.json +++ b/common/locales/en_GB/front.json @@ -18,6 +18,7 @@ "choreSample4": "Tidy One Room", "choreSample5": "Wash and Dry a Load of Clothes", "chores": "Chores", + "clearBrowserData": "Clear Browser Data", "communityBug": "Submit Bug", "communityExtensions": "Add-ons & Extensions", "communityFacebook": "Facebook", @@ -164,6 +165,12 @@ "teams": "Teams", "terms": "Terms and Conditions", "testimonialHeading": "What people say...", + "localStorageTryFirst": "If you are experiencing problems with Habitica, click the button below to clear cookies and local storage for this website (other websites will not be affected). You will need to log in again after doing this, so first be sure that you know your log-in details, which can be found at Settings -> <%= linkStart %>Site<%= linkEnd %>.", + "localStorageTryNext": "If the problem persists, please <%= linkStart %>Report a Bug<%= linkEnd %> if you haven't already.", + "localStorageClearing": "Clearing Local Storage", + "localStorageClearingExplanation": "Your browser's local storage is being cleared. You will be logged out and redirected to the home page. Please wait.", + "localStorageClear": "Clear Local Storage", + "localStorageClearExplanation": "This button will clear local storage and log you out", "tutorials": "Tutorials", "unlockByline1": "Achieve your goals and level up.", "unlockByline2": "Unlock new motivational tools such as pet collecting, random rewards, spell-casting, and more!", @@ -181,8 +188,7 @@ "marketingInquiries": "Marketing/Social Media Inquiries", "tweet": "Tweet", "apps": "Apps", - "notifyAndroidApp": "Want us to notify you when the Android app is ready? Sign up for this mailing list!", - "checkOutIOSApp": "Check out our new iOS App!", + "checkOutMobileApps": "Check out our mobile apps!", "imagine1": "Imagine if improving your life were as fun as playing a game.", "landingCopy1": "Advance in the game by completing your real-life tasks.", "landingCopy2": "Battle monsters with friends to stay accountable to your goals.", diff --git a/common/locales/en_GB/gear.json b/common/locales/en_GB/gear.json index 8ffa7bf4cf..3d613a172a 100644 --- a/common/locales/en_GB/gear.json +++ b/common/locales/en_GB/gear.json @@ -134,6 +134,14 @@ "weaponSpecialFall2015MageNotes": "A powerful Stitch Witch can control this enchanted thread without even touching it! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Autumn Gear.", "weaponSpecialFall2015HealerText": "Swamp-Slime Potion", "weaponSpecialFall2015HealerNotes": "Brewed to perfection! Now you just have to convince yourself to drink it. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.", + "weaponSpecialWinter2016RogueText": "Cocoa Mug", + "weaponSpecialWinter2016RogueNotes": "Warming drink, or boiling projectile? You decide... Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "weaponSpecialWinter2016WarriorText": "Sturdy Shovel", + "weaponSpecialWinter2016WarriorNotes": "Shovel overdue tasks out of the way! Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "weaponSpecialWinter2016MageText": "Sorcerous Snowboard", + "weaponSpecialWinter2016MageNotes": "Your moves are so sick, they must be magic! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "weaponSpecialWinter2016HealerText": "Confetti Cannon", + "weaponSpecialWinter2016HealerNotes": "WHEEEEEEEEEE!!!!!!! HAPPY WINTER WONDERLAND!!!!!!!! Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.", "weaponMystery201411Text": "Pitchfork of Feasting", "weaponMystery201411Notes": "Stab your enemies or dig in to your favourite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.", "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth", @@ -226,7 +234,7 @@ "armorSpecialBirthday2015Text": "Silly Party Robes", "armorSpecialBirthday2015Notes": "Happy Birthday, Habitica! Wear these Silly Party Robes to celebrate this wonderful day. Confers no benefit.", "armorSpecialGaymerxText": "Rainbow Warrior Armour", - "armorSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special armor is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.", + "armorSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special armour is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.", "armorSpecialSpringRogueText": "Sleek Cat Suit", "armorSpecialSpringRogueNotes": "Impeccably groomed. Increases Perception by <%= per %>. Limited Edition 2014 Spring Gear.", "armorSpecialSpringWarriorText": "Clover-steel Armour", @@ -283,6 +291,14 @@ "armorSpecialFall2015MageNotes": "Every stitch in this armour shimmers with enchantment. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.", "armorSpecialFall2015HealerText": "Potioner Robes", "armorSpecialFall2015HealerNotes": "What? Of course that was a potion of constitution. No, you are definitely not turning into a frog! Don't be ribbiticulous. Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.", + "armorSpecialWinter2016RogueText": "Cocoa Armor", + "armorSpecialWinter2016RogueNotes": "This leather armor keeps you nice and toasty. Is it actually made from cocoa? You'll never tell. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "armorSpecialWinter2016WarriorText": "Snowman Suit", + "armorSpecialWinter2016WarriorNotes": "Brr! This padded armor is truly powerful... until it melts. Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", + "armorSpecialWinter2016MageText": "Snowboarder Parka", + "armorSpecialWinter2016MageNotes": "The wisest wizard keeps well-bundled in the winter wind. Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.", + "armorSpecialWinter2016HealerText": "Festive Fairy Cloak", + "armorSpecialWinter2016HealerNotes": "Festive Fairies wrap their body wings around themselves for protection as they use their head wings to catch headwinds and fly around Habitica at speeds of up to 100 mph, delivering gifts and spraying everyone with confetti. How droll. Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", "armorMystery201402Text": "Messenger Robes", "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.", "armorMystery201403Text": "Forest Walker Armour", @@ -313,8 +329,10 @@ "armorMystery201508Notes": "Run fast as a flash in the fluffy Cheetah Costume! Confers no benefit. August 2015 Subscriber Item.", "armorMystery201509Text": "Werewolf Costume", "armorMystery201509Notes": "This IS a costume, right? Confers no benefit. September 2015 Subscriber Item.", - "armorMystery201511Text": "Wooden Armor", - "armorMystery201511Notes": "Considering this armor was carved directly from a magical log, it's surprisingly comfortable. Confers no benefit. November 2015 Subscriber Item.", + "armorMystery201511Text": "Wooden Armour", + "armorMystery201511Notes": "Considering this armour was carved directly from a magical log, it's surprisingly comfortable. Confers no benefit. November 2015 Subscriber Item.", + "armorMystery201512Text": "Cold Fire Armor", + "armorMystery201512Notes": "Summon the icy flames of winter! Confers no benefit. December 2015 Subscriber Item.", "armorMystery301404Text": "Steampunk Suit", "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.", "armorArmoireLunarArmorText": "Soothing Lunar Armour", @@ -454,6 +472,16 @@ "headSpecialFall2015MageNotes": "Every stitch in this hat augments its power. Increases Perception by <%= per %>. Limited Edition 2015 Autumn Gear.", "headSpecialFall2015HealerText": "Hat of Frog", "headSpecialFall2015HealerNotes": "This is an extremely serious hat that is worthy of only the most advanced potioners. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.", + "headSpecialNye2015Text": "Ridiculous Party Hat", + "headSpecialNye2015Notes": "You've received a Ridiculous Party Hat! Wear it with pride while ringing in the New Year! Confers no benefit.", + "headSpecialWinter2016RogueText": "Cocoa Helm", + "headSpecialWinter2016RogueNotes": "The protective scarf on this cozy helm is only removed to sip warm winter beverages. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "headSpecialWinter2016WarriorText": "Snowman Cap", + "headSpecialWinter2016WarriorNotes": "Brr! This mighty helm is truly powerful... until it melts. Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "headSpecialWinter2016MageText": "Snowboarder Hood", + "headSpecialWinter2016MageNotes": "Keeps the snow out of your eyes while you're casting spells. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "headSpecialWinter2016HealerText": "Fairy Wing Helm", + "headSpecialWinter2016HealerNotes": "Thesewingsfluttersoquicklythattheyblur! Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.", "headSpecialGaymerxText": "Rainbow Warrior Helm", "headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.", "headMystery201402Text": "Winged Helm", @@ -480,6 +508,8 @@ "headMystery201509Notes": "This IS a mask, right? Confers no benefit. September 2015 Subscriber Item.", "headMystery201511Text": "Log Crown", "headMystery201511Notes": "Count the number of rings to learn how old this crown is. Confers no benefit. November 2015 Subscriber Item.", + "headMystery201512Text": "Winter Flame", + "headMystery201512Notes": "These flames burn cold with pure intellect. Confers no benefit. December 2015 Subscriber Item.", "headMystery301404Text": "Fancy Top Hat", "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.", "headMystery301405Text": "Basic Top Hat", @@ -595,6 +625,12 @@ "shieldSpecialFall2015WarriorNotes": "It's true that you're supposed to be SCARING the crows, but there's nothing wrong with making friends! Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.", "shieldSpecialFall2015HealerText": "Stirring Stick", "shieldSpecialFall2015HealerNotes": "This stick can stir anything without melting, dissolving, or bursting into flame! It can also be used to fiercely poke enemy tasks. Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.", + "shieldSpecialWinter2016RogueText": "Cocoa Mug", + "shieldSpecialWinter2016RogueNotes": "Warming drink, or boiling projectile? You decide... Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "shieldSpecialWinter2016WarriorText": "Sled Shield", + "shieldSpecialWinter2016WarriorNotes": "Use this sled to block attacks, or ride it triumphantly into battle! Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", + "shieldSpecialWinter2016HealerText": "Pixie Present", + "shieldSpecialWinter2016HealerNotes": "Open it open it open it open it open it open it!!!!!!!!! Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", "shieldMystery301405Text": "Clock Shield", "shieldMystery301405Notes": "Time is on your side with this towering clock shield! Confers no benefit. June 3015 Subscriber Item.", "shieldArmoireGladiatorShieldText": "Gladiator Shield", diff --git a/common/locales/en_GB/generic.json b/common/locales/en_GB/generic.json index 89d84892af..1d12fd61b7 100644 --- a/common/locales/en_GB/generic.json +++ b/common/locales/en_GB/generic.json @@ -3,6 +3,26 @@ "stringNotFound": "String '<%= string %>' not found.", "titleIndex": "Habitica | Your Life The Role Playing Game", "habitica": "Habitica", + "titleTasks": "Tasks", + "titleAvatar": "Avatar", + "titleBackgrounds": "Backgrounds", + "titleStats": "Stats & Achievements", + "titleProfile": "Profile", + "titleInbox": "Inbox", + "titleTavern": "Tavern", + "titleParty": "Party", + "titleHeroes": "Hall of Heroes", + "titlePatrons": "Hall of Patrons", + "titleGuilds": "Guilds", + "titleChallenges": "Challenges", + "titleDrops": "Market", + "titleQuests": "Quests", + "titlePets": "Pets", + "titleMounts": "Mounts", + "titleEquipment": "Equipment", + "titleTimeTravelers": "Time Travelers", + "titleSeasonalShop": "Seasonal Shop", + "titleSettings": "Settings", "expandToolbar": "Expand Toolbar", "collapseToolbar": "Collapse Toolbar", "markdownBlurb": "Habitica uses markdown for message formatting. See the Markdown Cheat Sheet for more info.", diff --git a/common/locales/en_GB/groups.json b/common/locales/en_GB/groups.json index 014da6ceba..5f0c6a4603 100644 --- a/common/locales/en_GB/groups.json +++ b/common/locales/en_GB/groups.json @@ -131,7 +131,7 @@ "sendGiftFromBalance": "From Balance", "sendGiftPurchase": "Purchase", "sendGiftMessagePlaceholder": "Personal message (optional)", - "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>", + "sendGiftSubscription": "<%= months %> Month(s): $<%= price %> USD", "battleWithFriends": "Battle Monsters With Friends", "startPartyWithFriends": "Start a Party with your friends!", "startAParty": "Start a Party", diff --git a/common/locales/en_GB/limited.json b/common/locales/en_GB/limited.json index 93bd65a79a..ff4e85c43c 100644 --- a/common/locales/en_GB/limited.json +++ b/common/locales/en_GB/limited.json @@ -31,12 +31,17 @@ "seasonalShopText": "Welcome to the Seasonal Shop!! We're stocking springtime Seasonal Edition goodies at the moment. Everything here will be available to purchase during the Spring Fling event each year, but we're only open until 30 April, so be sure to stock up now or you'll have to wait a year to buy these items again!", "seasonalShopSummerText": "Welcome to the Seasonal Shop!! We're stocking summertime Seasonal Edition goodies at the moment. Everything here will be available to purchase during the Summer Splash event each year, but we're only open until 31 July, so be sure to stock up now, or you'll have to wait a year to buy these items again!", "seasonalShopFallText": "Welcome to the Seasonal Shop!! We're stocking autumn Seasonal Edition goodies at the moment. Everything here will be available to purchase during the Fall Festival event each year, but we're only open until 31 October, so be sure to stock up now, or you'll have to wait a year to buy these items again!", + "seasonalShopWinterText": "Welcome to the Seasonal Shop!! We're stocking winter Seasonal Edition goodies at the moment. Everything here will be available to purchase during the Winter Wonderland event each year, but we're only open until January 31, so be sure to stock up now, or you'll have to wait a year to buy these items again!", "seasonalShopFallTextBroken": "Oh.... Welcome to the Seasonal Shop... We're stocking autumn Seasonal Edition goodies, or something... Everything here will be available to purchase during the Fall Festival event each year, but we're only open until 31 October... I guess you should to stock up now, or you'll have to wait... and wait... and wait... *sigh*", "seasonalShopRebirth": "If you've used the Orb of Rebirth, you can repurchase this equipment in the Rewards Column. Initially, you'll only be able to purchase the items for your current class (Warrior by default), but fear not, the other class-specific items will become available if you switch to that class.", "candycaneSet": "Candy Cane (Mage)", "skiSet": "Ski-sassin (Rogue)", "snowflakeSet": "Snowflake (Healer)", "yetiSet": "Yeti Tamer (Warrior)", + "northMageSet": "Mage of the North (Mage)", + "icicleDrakeSet": "Icicle Drake (Rogue)", + "soothingSkaterSet": "Soothing Skater (Healer)", + "gingerbreadSet": "Gingerbread Warrior (Warrior)", "toAndFromCard": "To: <%= toName %>, From: <%= fromName %>", "nyeCard": "New Year's Card", "nyeCardExplanation": "For celebrating the new year together, you both receive the \"Auld Acquaintance\" badge!", @@ -62,5 +67,6 @@ "witchyWizardSet": "Witchy Wizard (Mage)", "mummyMedicSet": "Mummy Medic (Healer)", "vampireSmiterSet": "Vampire Smiter (Rogue)", - "fallEventAvailability": "Available until 31 October" + "fallEventAvailability": "Available until 31 October", + "winterEventAvailability": "Available until December 31" } \ No newline at end of file diff --git a/common/locales/en_GB/messages.json b/common/locales/en_GB/messages.json index b02f6f6761..7c4ea0c03c 100644 --- a/common/locales/en_GB/messages.json +++ b/common/locales/en_GB/messages.json @@ -13,13 +13,14 @@ "messageDontEnjoyFood": "<%= egg %> eats the <%= foodText %> but doesn't seem to enjoy it.", "messageBought": "Bought <%= itemText %>", "messageEquipped": "<%= itemText %> equipped.", - "messageUnEquipped": "<%= itemText %> un-equipped.", + "messageUnEquipped": "<%= itemText %> unequipped.", "messageMissingEggPotion": "You're missing either that egg or that potion", "messageInvalidEggPotionCombo": "You can't hatch Quest Pet Eggs with Magic Hatching Potions! Try a different egg.", "messageAlreadyPet": "You already have that pet. Try hatching a different combination!", "messageHatched": "Your egg hatched! Visit your stable to equip your pet.", "messageNotEnoughGold": "Not Enough Gold", - "messageTwoHandled": "<%= gearText %> is two handed", + "messageTwoHandedEquip": "Wielding <%= twoHandedText %> takes two hands, so <%= offHandedText %> has been unequipped.", + "messageTwoHandedUnequip": "Wielding <%= twoHandedText %> takes two hands, so it was unequipped when you armed yourself with <%= offHandedText %>.", "messageDropFood": "You've found <%= dropArticle %><%= dropText %>! <%= dropNotes %>", "messageDropEgg": "You've found a <%= dropText %> Egg! <%= dropNotes %>", "messageDropPotion": "You've found a <%= dropText %> Hatching Potion! <%= dropNotes %>", diff --git a/common/locales/en_GB/pets.json b/common/locales/en_GB/pets.json index 7c49cba987..29c4862f49 100644 --- a/common/locales/en_GB/pets.json +++ b/common/locales/en_GB/pets.json @@ -80,6 +80,7 @@ "petKeyPets": "Release My Pets", "petKeyMounts": "Release My Mounts", "petKeyBoth": "Release Both", + "confirmPetKey": "Are you sure?", "petKeyNeverMind": "Not Yet", "gemsEach": "gems each" } \ No newline at end of file diff --git a/common/locales/en_GB/questscontent.json b/common/locales/en_GB/questscontent.json index 808ebe1f52..0d0479e409 100644 --- a/common/locales/en_GB/questscontent.json +++ b/common/locales/en_GB/questscontent.json @@ -1,6 +1,6 @@ { "questEvilSantaText": "Trapper Santa", - "questEvilSantaNotes": "You hear bemoaned roars deep in the icefields. You follow the roars and growls—punctuated by another voice's cackling—to a clearing in the woods where you see a fully-grown polar bear. She's caged and shackled, roaring for life. Dancing atop the cage is a malicious little imp wearing castaway Christmas costumes. Vanquish Trapper Santa, and save the beast!", + "questEvilSantaNotes": "You hear moaning roars deep in the icefields. You follow the roars and growls - punctuated by another voice's cackling - to a clearing in the woods where you see a fully-grown polar bear. She's caged and shackled, roaring for life. Dancing atop the cage is a malicious little imp wearing castaway Christmas costumes. Vanquish Trapper Santa, and save the beast!", "questEvilSantaCompletion": "Trapper Santa squeals in anger, and bounces off into the night. A grateful she-bear, through roars and growls, tries to tell you something. You take her back to the stables, where Matt Boch the whisperer listens to her tale with a gasp of horror. She has a cub! He ran off into the icefields when mama bear was captured. Help her find her baby!", "questEvilSantaBoss": "Trapper Santa", "questEvilSantaDropBearCubPolarMount": "Polar Bear (Mount)", @@ -90,7 +90,7 @@ "questGoldenknight1Text": "The Golden Knight, Part 1: A Stern Talking-To", "questGoldenknight1Notes": "The Golden Knight has been getting on poor Habiticans' cases. Didn't do all of your Dailies? Ticked off a negative Habit? She will use this as a reason to harass you about how you should follow her example. She is the shining example of a perfect Habitican, and you are naught but a failure. Well, that is not nice at all! Everyone makes mistakes. They should not have to be met with such negativity for it. Perhaps it is time you gather some testimonies from hurt Habiticans and give the Golden Knight a stern talking-to!
", "questGoldenknight1CollectTestimony": "Testimonies", - "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Tarnished Gold (Scroll)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "The Golden Knight, Part 2: Gold Knight", "questGoldenknight2Notes": "Armed with hundreds of Habitican's testimonies, you finally confront the Golden Knight. You begin to recite the Habitican's complaints to her, one by one. \"And @Pfeffernusse says that your constant bragging-\" The knight raises her hand to silence you and scoffs, \"Please, these people are merely jealous of my success. Instead of complaining, they should simply work as hard as I! Perhaps I shall show you the power you can attain through diligence such as mine!\" She raises her morningstar and prepares to attack you!
", "questGoldenknight2Boss": "Gold Knight", @@ -273,5 +273,11 @@ "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", "questSnakeBoss": "Serpent of Distraction", "questSnakeDropSnakeEgg": "Snake (Egg)", - "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market" + "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market", + "questUnicornText": "Convincing the Unicorn Queen", + "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", + "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", + "questUnicornBoss": "The Unicorn Queen", + "questUnicornDropUnicornEgg": "Unicorn (Egg)", + "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market" } \ No newline at end of file diff --git a/common/locales/en_GB/rebirth.json b/common/locales/en_GB/rebirth.json index e379042ec4..cd0bd74ad0 100644 --- a/common/locales/en_GB/rebirth.json +++ b/common/locales/en_GB/rebirth.json @@ -23,5 +23,6 @@ "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher", "rebirthPop": "Begin a new character at Level 1 while retaining achievements, collectibles, and tasks with history.", "rebirthName": "Orb of Rebirth", - "reborn": "Reborn, max level <%= reLevel %>" + "reborn": "Reborn, max level <%= reLevel %>", + "confirmReborn": "Are you sure?" } \ No newline at end of file diff --git a/common/locales/en_GB/settings.json b/common/locales/en_GB/settings.json index 543cc6636f..d611519e86 100644 --- a/common/locales/en_GB/settings.json +++ b/common/locales/en_GB/settings.json @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "Tick to Unsubscribe from Emails", "unsubscribeAllEmailsText": "By ticking this box, I certify that I understand that by unsubscribing from all emails, Habitica will never be able to notify me via email about important changes to the site or my account.", "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.", - "subscriptionRateText": "Recurring $<%= price %> every <%= months %> months", + "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", "benefits": "Benefits", "coupon": "Coupon", "couponPlaceholder": "Enter Coupon Code", @@ -136,7 +136,7 @@ "buyGemsGoldCap": "Cap raised to <%= amount %>", "mysticHourglass": "<%= amount %> Mystic Hourglass", "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.", - "purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)", + "purchasedPlanId": "Recurring $<%= price %> USD each <%= months %> Month(s) (<%= plan %>)", "purchasedPlanExtraMonths": "You have <%= months %> months of subscription credit.", "consecutiveSubscription": "Consecutive Subscription", "consecutiveMonths": "Consecutive Months:", diff --git a/common/locales/en_GB/subscriber.json b/common/locales/en_GB/subscriber.json index a6a0b70b6b..61f6f98da7 100644 --- a/common/locales/en_GB/subscriber.json +++ b/common/locales/en_GB/subscriber.json @@ -63,6 +63,32 @@ "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "timeTravelersAlreadyOwned": "Congratulations! You already own everything the Time Travelers currently offer. Thanks for supporting the site!", "mysticHourglassPopover": "A Mystic Hourglass allows you to purchase certain limited-time items, such as monthly Mystery Item Sets and awards from world bosses, from the past!", + "mysterySet201402": "Winged Messenger Set", + "mysterySet201403": "Forest Walker Set", + "mysterySet201404": "Twilight Butterfly Set", + "mysterySet201405": "Flame Wielder Set", + "mysterySet201406": "Octomage Set", + "mysterySet201407": "Undersea Explorer Set", + "mysterySet201408": "Sun Sorcerer Set", + "mysterySet201409": "Autumn Strider Set", + "mysterySet201410": "Winged Goblin Set", + "mysterySet201411": "Feast and Fun Set", + "mysterySet201412": "Penguin Set", + "mysterySet201501": "Starry Knight Set", + "mysterySet201502": "Winged Enchanter Set", + "mysterySet201503": "Aquamarine Set", + "mysterySet201504": "Busy Bee Set", + "mysterySet201505": "Green Knight Set", + "mysterySet201506": "Neon Snorkeler Set", + "mysterySet201507": "Rad Surfer Set", + "mysterySet201508": "Cheetah Costume Set", + "mysterySet201509": "Werewolf Set", + "mysterySet201510": "Horned Goblin Set", + "mysterySet201511": "Wood Warrior Set", + "mysterySet201512": "Winter Flame Set", + "mysterySet301404": "Steampunk Standard Set", + "mysterySet301405": "Steampunk Accessories Set", + "mysterySetwondercon": "Wondercon", "subUpdateCard": "Update Card", "subUpdateTitle": "Update", "subUpdateDescription": "Update the card to be charged.", diff --git a/common/locales/en_GB/tasks.json b/common/locales/en_GB/tasks.json index 48029f8f32..f84425be15 100644 --- a/common/locales/en_GB/tasks.json +++ b/common/locales/en_GB/tasks.json @@ -5,6 +5,7 @@ "beeminderDeleteWarning": "Beeminder users: First read Deleting Completed To-Dos Without Confusing Beeminder!", "addmultiple": "Add Multiple", "addsingle": "Add Single", + "habit": "Habit", "habits": "Habits", "newHabit": "New Habit", "newHabitBulk": "New Habits (one per line)", @@ -32,6 +33,7 @@ "mental": "Mental", "otherExamples": "Eg, professional pursuits, hobbies, financial, etc.", "progress": "Progress", + "daily": "Daily", "dailies": "Dailies", "newDaily": "New Daily", "newDailyBulk": "New Dailies (one per line)", @@ -46,6 +48,7 @@ "day": "Day", "days": "Days", "restoreStreak": "Restore Streak", + "todo": "To-Do", "todos": "To-Dos", "newTodo": "New To-Do", "newTodoBulk": "New To-Dos (one per line)", @@ -57,6 +60,7 @@ "notDue": "Not Due", "grey": "Grey", "score": "Score", + "reward": "Reward", "rewards": "Rewards", "ingamerewards": "Equipment & Skills", "gold": "Gold", @@ -86,7 +90,8 @@ "fortifyPop": "Return all tasks to neutral value (yellow colour), and restore all lost Health.", "fortify": "Fortify", "fortifyText": "Fortify will return all your tasks to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", - "sureDelete": "Are you sure you want to delete this task?", + "confirmFortify": "Are you sure?", + "sureDelete": "Are you sure you want to delete the <%= taskType %> with the text \"<%= taskText %>\"?", "streakCoins": "Streak Bonus!", "pushTaskToTop": "Push task to top. Hold ctrl or cmd to push to bottom.", "emptyTask": "Enter the task's title first.", diff --git a/common/locales/es/backgrounds.json b/common/locales/es/backgrounds.json index 977cb05153..73be189efe 100644 --- a/common/locales/es/backgrounds.json +++ b/common/locales/es/backgrounds.json @@ -56,21 +56,21 @@ "backgroundFrigidPeakNotes": "Escala un pico frígido.", "backgroundSnowyPinesText": "Pinos nevados", "backgroundSnowyPinesNotes": "Refúgiate entre pinos nevados.", - "backgrounds022015": "SET 9: Lanzado en Febrero de 2015", - "backgroundBlacksmithyText": "Forja", - "backgroundBlacksmithyNotes": "Trabaja en la Forja.", + "backgrounds022015": "SET 9: Lanzado en febrero de 2015", + "backgroundBlacksmithyText": "Forjador", + "backgroundBlacksmithyNotes": "Trabaja en la forja.", "backgroundCrystalCaveText": "Cueva de Cristal", "backgroundCrystalCaveNotes": "Explora la Cueva de Cristal.", - "backgroundDistantCastleText": "Castillo Distante", + "backgroundDistantCastleText": "Castillo distante", "backgroundDistantCastleNotes": "Defiende el Castillo Distante.", - "backgrounds032015": "SET 10: Lanzado en Marzo de 2015", - "backgroundSpringRainText": "Lluvia de Primavera", - "backgroundSpringRainNotes": "Baila bajo la Lluvia de Primavera.", + "backgrounds032015": "SET 10: Lanzado en marzo de 2015", + "backgroundSpringRainText": "Lluvia de primavera", + "backgroundSpringRainNotes": "Baila bajo la lluvia de primavera.", "backgroundStainedGlassText": "Vidriera", "backgroundStainedGlassNotes": "Admira estas vidrieras.", "backgroundRollingHillsText": "Colinas Onduladas", "backgroundRollingHillsNotes": "Retoza por las Colinas Onduladas.", - "backgrounds042015": "SET 11: Lanzado en Abril de 2015", + "backgrounds042015": "SET 11: Lanzado en abril de 2015", "backgroundCherryTreesText": "Cerezos", "backgroundCherryTreesNotes": "Admira los cerezos en flor.", "backgroundFloralMeadowText": "Campo Florido", @@ -126,11 +126,11 @@ "backgroundNightDunesNotes": "Camina tranquilamente a través de las Dunas de noche ", "backgroundSunsetOasisText": "Puesta en el Oasis", "backgroundSunsetOasisNotes": "Toma sol en la Puesta del Oasis", - "backgrounds122015": "SET 19: Released December 2015", - "backgroundAlpineSlopesText": "Alpine Slopes", - "backgroundAlpineSlopesNotes": "Ski on the Alpine Slopes.", - "backgroundSnowySunriseText": "Snowy Sunrise", - "backgroundSnowySunriseNotes": "Gaze at the Snowy Sunrise.", - "backgroundWinterTownText": "Winter Town", - "backgroundWinterTownNotes": "Bustle through a Winter Town." + "backgrounds122015": "Set 19: Lanzado en Diciembre del 2015", + "backgroundAlpineSlopesText": "Laderas Alpinas", + "backgroundAlpineSlopesNotes": "Esquía en las Laderas Alpinas", + "backgroundSnowySunriseText": "Amanecer Nevado", + "backgroundSnowySunriseNotes": "Contempla el Amanecer Nevado", + "backgroundWinterTownText": "Pueblo Invernal", + "backgroundWinterTownNotes": "Muévete afanosamente a través del pueblo invernal.\n" } \ No newline at end of file diff --git a/common/locales/es/content.json b/common/locales/es/content.json index af6eb06d84..3da5b672d5 100644 --- a/common/locales/es/content.json +++ b/common/locales/es/content.json @@ -16,7 +16,7 @@ "dropEggPandaCubAdjective": "un gentil", "dropEggLionCubText": "Cachorro de león", "dropEggLionCubMountText": "León", - "dropEggLionCubAdjective": "a regal", + "dropEggLionCubAdjective": "un Real", "dropEggFoxText": "Zorro", "dropEggFoxMountText": "Zorro", "dropEggFoxAdjective": "un astuto", @@ -28,16 +28,16 @@ "dropEggDragonAdjective": "un poderoso", "dropEggCactusText": "Cactus", "dropEggCactusMountText": "Cactus", - "dropEggCactusAdjective": "a prickly", + "dropEggCactusAdjective": "un Espinoso", "dropEggBearCubText": "Cachorro de oso", "dropEggBearCubMountText": "Oso", - "dropEggBearCubAdjective": "a cuddly", + "dropEggBearCubAdjective": "un Mimoso", "questEggGryphonText": "Grifo", "questEggGryphonMountText": "Grifo", "questEggGryphonAdjective": "digno", "questEggHedgehogText": "Erizo", "questEggHedgehogMountText": "Erizo", - "questEggHedgehogAdjective": "a spiky", + "questEggHedgehogAdjective": "un Espinoso", "questEggDeerText": "Ciervo", "questEggDeerMountText": "Ciervo", "questEggDeerAdjective": "elegante", @@ -49,58 +49,61 @@ "questEggRatAdjective": "una sucia", "questEggOctopusText": "Pulpo", "questEggOctopusMountText": "Pulpo", - "questEggOctopusAdjective": "a slippery", + "questEggOctopusAdjective": "un Resbaloso", "questEggSeahorseText": "Caballito de mar", "questEggSeahorseMountText": "Caballito de mar", - "questEggSeahorseAdjective": "a prize", + "questEggSeahorseAdjective": "un Premiado", "questEggParrotText": "Loro", "questEggParrotMountText": "Loro", - "questEggParrotAdjective": "a vibrant", + "questEggParrotAdjective": "un Vibrante", "questEggRoosterText": "Gallo", "questEggRoosterMountText": "Gallo", - "questEggRoosterAdjective": "a strutting", + "questEggRoosterAdjective": "un Pomposo", "questEggSpiderText": "Araña", "questEggSpiderMountText": "Araña", - "questEggSpiderAdjective": "a creepy", + "questEggSpiderAdjective": "un Espeluznante", "questEggOwlText": "Búho", "questEggOwlMountText": "Búho", "questEggOwlAdjective": "un sabio", "questEggPenguinText": "Pingüino", "questEggPenguinMountText": "Pingüino", - "questEggPenguinAdjective": "a perspicacious", + "questEggPenguinAdjective": "un Perspicaz", "questEggTRexText": "Tiranosaurio", "questEggTRexMountText": "Tiranosaurio", - "questEggTRexAdjective": "a tiny-armed", + "questEggTRexAdjective": "un Cortibrazo", "questEggRockText": "Roca", "questEggRockMountText": "Roca", - "questEggRockAdjective": "a lively", + "questEggRockAdjective": "un Animado/a", "questEggBunnyText": "Conejo", "questEggBunnyMountText": "Conejo", - "questEggBunnyAdjective": "a snuggly", + "questEggBunnyAdjective": "un Adorable", "questEggSlimeText": "Limo de Malvavisco", - "questEggSlimeMountText": "Marshmallow Slime", + "questEggSlimeMountText": "Baba de Malvavisco", "questEggSlimeAdjective": "dulce", "questEggSheepText": "Oveja", "questEggSheepMountText": "Oveja", "questEggSheepAdjective": "una lanuda", "questEggCuttlefishText": "Calamar", "questEggCuttlefishMountText": "Calamar", - "questEggCuttlefishAdjective": "a cuddly", + "questEggCuttlefishAdjective": "un Mimoso", "questEggWhaleText": "Ballena", "questEggWhaleMountText": "Ballena", - "questEggWhaleAdjective": "a splashy", + "questEggWhaleAdjective": "una Mojada", "questEggCheetahText": "Guepardo", "questEggCheetahMountText": "Guepardo", - "questEggCheetahAdjective": "an honest", + "questEggCheetahAdjective": "un Honesto", "questEggHorseText": "Caballo", "questEggHorseMountText": "Caballo", "questEggHorseAdjective": "un galopante", "questEggFrogText": "Rana", "questEggFrogMountText": "Rana", - "questEggFrogAdjective": "a princely", + "questEggFrogAdjective": "un Principesco", "questEggSnakeText": "Serpiente", "questEggSnakeMountText": "Serpiente", - "questEggSnakeAdjective": "a slithering", + "questEggSnakeAdjective": "una Deslizante", + "questEggUnicornText": "Unicornio", + "questEggUnicornMountText": "Unicornio alado", + "questEggUnicornAdjective": "a magical", "eggNotes": "Encuentra una poción de eclosión para verter en este huevo y eclosionará en <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Base", "hatchingPotionWhite": "Blanco", @@ -112,7 +115,8 @@ "hatchingPotionCottonCandyPink": "Rosa Algodón de Azúcar", "hatchingPotionCottonCandyBlue": "Azul Algodón de Azúcar", "hatchingPotionGolden": "de Oro", - "hatchingPotionSpooky": "Spooky", + "hatchingPotionSpooky": "Escalofriante", + "hatchingPotionPeppermint": "Menta", "hatchingPotionNotes": "Echa esto en un huevo, y eclosionará como una mascota <%= potText(locale) %>.", "premiumPotionAddlNotes": "No es usable en huevos de mascota de misión.", "foodMeat": "Carne", diff --git a/common/locales/es/faq.json b/common/locales/es/faq.json index 57b2f04d72..0aeb83dff7 100644 --- a/common/locales/es/faq.json +++ b/common/locales/es/faq.json @@ -2,12 +2,12 @@ "frequentlyAskedQuestions": "Preguntas frecuentes", "faqQuestion0": "No entiendo nada, ¿dónde hay un resumen?", "iosFaqAnswer0": "Primero, tienes que añadir las tareas que quieras realizar en tu día a día. Entonces, a medida que cumplas esas tareas en la vida real y las marques como completadas, ganarás experiencia y oro. El oro sirve para comprar equipos y otros objetos, y para obtener recompensas que puedes personalizar. La experiencia hace que tu personaje suba de nivel y desbloquee contenidos como mascotas, habilidades y misiones. Puedes cambiar el aspecto de tu personaje en Menú > Personalizar avatar.\n\nEstas son las acciones básicas: haz clic en el signo más (+) de la esquina superior derecha para añadir una tarea. Si quieres editar una tarea, pulsa en ella. Para eliminarla, desliza el dedo hacia la izquierda sobre ella. Puedes filtrar las tareas por etiquetas en la esquina superior izquierda, y expandir o contraer listas pulsando en el icono de fracción.", - "webFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn Experience and Gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as pets, skills, and quests! For more detail, check out a step-by-step overview of the game at [Help -> Overview for New Users](https://habitica.com/static/overview).", + "webFaqAnswer0": "Primero, tienes que añadir las tareas que quieras realizar en tu día a día. Entonces, a medida que cumplas esas tareas en la vida real y las marques como completadas, ganarás experiencia y oro. El oro sirve para comprar equipos y otros objetos, y para obtener recompensas que puedes personalizar. La experiencia hace que tu personaje suba de nivel y desbloquee contenidos como mascotas, habilidades y misiones. Para mas detalles, échale un vistazo a la guía paso por paso del juego en [Help -> Overview for New Users](https://habitica.com/static/overview)", "faqQuestion1": "¿Cómo puedo establecer mis tareas?", - "iosFaqAnswer1": "Good Habits (the ones with a +) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a -) are tasks that you should avoid, like biting nails. Habits with a + and a - have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award experience and gold. Bad Habits subtract health.\n\n Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by tapping to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n\n To-Dos are your To-Do list. Completing a To-Do earns you gold and experience. You never lose health from To-Dos. You can add a due date to a To-Do by tapping to edit.", + "iosFaqAnswer1": "Los Buenos Hábitos (aquellos con un +) son tareas que puede realizar varias veces al día, como por ejemplo, comer vegetales. Los Malos Hábitos (aquellos con un -) son tareas que debería evitar, como por ejemplo, morderse las uñas. Los Hábitos con un + y un - ofrecen una buena y una mala elección, como subir por las escaleras en oposición a usar el ascensor. Los Buenos Hábitos otorgan Experiencia y Oro. Los Malos Hábitos restan Salud.\n\nLas Diarias son tareas que debe realizar cada día, como por ejemplo lavarse los dientes o revisar el correo electrónico. Puede ajustar los días en los que debe realizar una Diaria haciendo click en el lápiz para editar la tarea. Si se salta una Daria que está aún pendiente, su avatar recibirá daño durante la noche. ¡Tenga cuidado de no añadir demasiadas Diarias al mismo tiempo!\n\nLas Tareas Pendientes son su lista de cosas por hacer. Completar una Tarea Pendiente le hará ganar Oro y Experiencia. Nunca perderás Salud por no completar las Tareas Pendientes. Puede incluir una fecha límite a una Tarea Pendiente haciendo click en el icono del lápiz para editarla.", "webFaqAnswer1": "Los Buenos Hábitos (aquellos con un ) son tareas que puede realizar varias veces al día, como por ejemplo, comer vegetales. Los Malos Hábitos (aquellos con un ) son tareas que debería evitar, como por ejemplo, morderse las uñas. Los Hábitos con un y un ofrecen una buena y una mala elección, como subir por las escaleras en oposición a usar el ascensor. Los Buenos Hábitos otorgan Experiencia y Oro. Los Malos Hábitos restan Salud.\nEl Caballero Dorado ha estado atosigando a los pobres Habitacans ¿No has cumplido todas tus tareas Diarias? ¿Desmarcado un Hábito negativo? Ella usará estos agumentos para hostigarte sobre como deberías seguir su ejemplo. Ella es la muestra brillante de un Habitacan perfecto y tú eres tan solo un fracaso. ¡Bueno, eso no esta bien para nada! Todo el mundo comete errores. Ellos no deberían tener que recibir esa muestra de pesimismo por ello. ¡Quizás sea el momento de reunir algunos testimonios de los afligidos Habitacans y darle al Caballero Dorado su merecido escarmiento!
", "questGoldenknight1CollectTestimony": "Testimonios", - "questGoldenknight1DropGoldenknight2Quest": "La Cadena del Caballero Dorado Parte 2: Oro Sucio (Pergamino)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "El Caballero Dorado, Parte 2: Caballero Dorado", "questGoldenknight2Notes": "Armado con el testimonio de cientos de Habitacans, finalmente confrontas al Caballero Dorado. Así comienzas a recitar las quejas de los Habitacans hacia ella, una por una. \"Y @Pfeffernusse dice que tu constante fanfarronería-\" El Caballero alza su mano para silenciarte y se mofa, \"Por favor, esa gente está simplemente celosa de mis hazañas. ¡En lugar de quejarse, deberían simplemente esforzarse tanto como yo! ¡Quizás debería mostrarte todo el poder que se puede logar con una diligencia como la mía!\" ¡Levanta su lucero del alba y se dispone a atacarte!
", "questGoldenknight2Boss": "Caballero de Oro", @@ -207,7 +207,7 @@ "questKrakenNotes": "It's a warm, sunny day as you sail across the Inkomplete Bay, but your thoughts are clouded with worries about everything that you still need to do. It seems that as soon as you finish one task, another crops up, and then another...La Dama de oro ha estado molestando a los pobres Habiticanos. ¿No cumpliste todas tus Diarias? ¿Marcaste un hábito negativo? Ella lo usará como razón para acosarte y decir que tienes que seguir su ejemplo. Ella es el ejemplo brillante de un Habiticano perfecto y tú no eres más que un fracaso. Bueno, ¡eso no es para nada agradable! Todos comiten errores y no debieran ser tratados con tanta negatividad. ¡Tal vez es hora para reunir unos cuantos testimonios de los Habitacanos ofendidos y darle una a la Dama de oro una severa reprimenda!
", "questGoldenknight1CollectTestimony": "Testimonios", - "questGoldenknight1DropGoldenknight2Quest": "La Cadena de la Dama de oro parte 2: Oro deslustrado (Pergamino)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "El Caballero Dorado, Parte 2: El Caballero de Oro", "questGoldenknight2Notes": "Armado con cientos de testimonios de Habiticanos, enfrentas finalmente a la Dama de oro. Empiezas a recitar las quejas de los Habiticanos, una por una. \"Y @Pfeffernusse dice que tus constantes fanfarronadas-\" Ella alza su mano para silenciarte y se burla, \"Por favor, estas personas simplemente están celosas de mi éxito. En lugar de quejarse, ¡deberían trabajar tan duro como yo! ¡Quizás pueda mostrarte el poder que puedes obtener mediante una diligencia como la mía!\" Entonces levanta su lucero del alba, ¡y se prepara para atacarte!
", "questGoldenknight2Boss": "Dama de oro", @@ -268,10 +268,16 @@ "questFrogBoss": "Rana Desastrosa", "questFrogDropFrogEgg": "Rana (Huevo)", "questFrogUnlockText": "Desbloquea huevos de Rana adquiribles en el Mercado", - "questSnakeText": "The Serpent of Distraction", + "questSnakeText": "La Serpiente de la Distracción", "questSnakeNotes": "It takes a hardy soul to live in the Sand Dunes of Distraction. The arid desert is hardly a productive place, and the shimmering dunes have led many a traveler astray. However, something has even the locals spooked. The sands have been shifting and upturning entire villages. Residents claim a monster with an enormous serpentine body lies in wait under the sands, and they have all pooled together a reward for whomever will help them find and stop it. The much-lauded snake charmers @EmeraldOx and @PainterProphet have agreed to help you summon the beast. Can you stop the Serpent of Distraction?", "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", - "questSnakeBoss": "Serpent of Distraction", - "questSnakeDropSnakeEgg": "Snake (Egg)", - "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market" + "questSnakeBoss": "Serpiente de la Distracción", + "questSnakeDropSnakeEgg": "Serpiente (huevo)", + "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market", + "questUnicornText": "Convincing the Unicorn Queen", + "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", + "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", + "questUnicornBoss": "The Unicorn Queen", + "questUnicornDropUnicornEgg": "Unicorn (Egg)", + "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market" } \ No newline at end of file diff --git a/common/locales/es_419/rebirth.json b/common/locales/es_419/rebirth.json index 9fbb90f3fd..6862da485e 100644 --- a/common/locales/es_419/rebirth.json +++ b/common/locales/es_419/rebirth.json @@ -23,5 +23,6 @@ "rebirthOrb100": "Utilizó una Esfera de Renacimiento para comenzar de nuevo luego de adquirir el Nivel 100 or más alto", "rebirthPop": "Comenzar con un personaje nuevo a Nivel 1, mientras manteniendo logros, lo coleccionable, y tareas con historial.", "rebirthName": "Esfera de renacimiento", - "reborn": "Renacido, nivel máximo <%= reLevel %>" + "reborn": "Renacido, nivel máximo <%= reLevel %>", + "confirmReborn": "Are you sure?" } \ No newline at end of file diff --git a/common/locales/es_419/settings.json b/common/locales/es_419/settings.json index 296109552e..1bbb2e8be3 100644 --- a/common/locales/es_419/settings.json +++ b/common/locales/es_419/settings.json @@ -14,11 +14,11 @@ "startCollapsedPop": "Con esta opción marcada, la lista de etiquetas estará escondida al abrir la tarea para editarla.", "startAdvCollapsed": "Las opciones avanzadas de las tareas no se abren automáticamente", "startAdvCollapsedPop": "Con esta opción marcada, las opciones avanzadas estarán escondidas al abrir la tarea para editarla.", - "dontShowAgain": "Don't show this again", - "suppressLevelUpModal": "Don't show popup when gaining a level", - "suppressHatchPetModal": "Don't show popup when hatching a pet", - "suppressRaisePetModal": "Don't show popup when raising a pet into a mount", - "suppressStreakModal": "Don't show popup when attaining a Streak achievement", + "dontShowAgain": "No mostrar esto de nuevo", + "suppressLevelUpModal": "No mostrar un cuadro de diálogo cuando gane un nivel", + "suppressHatchPetModal": "No mostrar un cuadro de diálogo cuando una mascota eclosione", + "suppressRaisePetModal": "No mostrar un cuadro de diálogo cuando una mascota se vuelva montura", + "suppressStreakModal": "No mostrar un cuadro de diálogo cuando se obtenga una Racha de logros", "showTour": "Mostrar el tour", "restartTour": "Reiniciar el tour de introducción a Habitica", "showBailey": "Mostrar a Bailey", @@ -93,7 +93,7 @@ "loginNameDescription2": "Usuario->Perfil", "loginNameDescription3": "para cambiar el nombre que aparece en tu avatar y mensajes de chat", "emailNotifications": "Notificaciones vía email", - "wonChallenge": "You won a Challenge!", + "wonChallenge": "Ganaste un desafío!", "newPM": "Mensaje privado recibido", "giftedGems": "Gemas regaladas", "giftedGemsInfo": "<%= amount %> Gemas - por <%= name %>", @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "Marque para darse de baja de los emails", "unsubscribeAllEmailsText": "Al marcar esta casilla, certifico que entiendo que al darme de baja de todos los emails, HabitsRPG nunca será capaz de notificarme por ese medio sobre cambios importantes en el sitio o en mi cuenta.", "correctlyUnsubscribedEmailType": "Ha dado de baja correctamente de los emails de \"<%= emailType %>\"", - "subscriptionRateText": "Periodicos $<%= price %> cada <%= months %> meses", + "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", "benefits": "Beneficios", "coupon": "Cupón", "couponPlaceholder": "Introduzca el código de cupón", @@ -136,7 +136,7 @@ "buyGemsGoldCap": "Tope aumentado a <%= amount %>", "mysticHourglass": "<%= amount %> Reloj de arena mística", "mysticHourglassText": "Los Relojes de Arena Mística permiten comprar un anterior Conjunto Misterioso de items del mes.", - "purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)", + "purchasedPlanId": "Recurring $<%= price %> USD each <%= months %> Month(s) (<%= plan %>)", "purchasedPlanExtraMonths": "Tu tienes <%=months %> meses de suscripción crédito. ", "consecutiveSubscription": "Consecutivo Suscripción ", "consecutiveMonths": "Consecutivo Meses:", @@ -144,7 +144,7 @@ "mysticHourglasses": "Reloj de arenas místicas:", "paypal": "PayPal", "amazonPayments": "Amazon Payments", - "timezone": "Time Zone", - "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <%= utc %>", - "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.Le Chevalier d’Or se penche sur le cas de pauvres Habiticiens. Vous n’avez pas validé toutes vos Quotidiennes ? Vous prenez de mauvaises Habitudes ? Chaque faux pas lui donnera une raison de vous harceler à propos du fait que vous devriez suivre son exemple. Elle est l’exemple parfait de l’Habiticienne assidue et vous n’êtes rien d’autre à ses yeux qu’un échec. Eh bien, on peut dire que tout ça n’est pas très sympa, ni agréable à entendre ! Tout le monde fait des erreurs. Ce n’est pas une raison pour être aussi désagréable. Peut-être est-il temps de rassembler les témoignages d’Habiticiens et d’Habiticiennes blessé·e·s par ses propos et de donner une bonne leçon au Chevalier d’Or !
", "questGoldenknight1CollectTestimony": "Témoignages", - "questGoldenknight1DropGoldenknight2Quest": "Campagne du Chevalier d'Or, Partie 2 : Or Terni (Parchemin)", + "questGoldenknight1DropGoldenknight2Quest": "Campagne du Chevalier d'Or, Partie 2 : Chevalier d'Or (Parchemin)", "questGoldenknight2Text": "Campagne du Chevalier d'Or, Partie 2 : Chevalier d'Or", "questGoldenknight2Notes": "Armé de centaines de témoignages d'Habiticien·ne·s, vous confrontez enfin le Chevalier Doré. Vous commencez à lui énoncer les plaintes des Habiticien·ne·s, les unes après les autres. \"Et @Pfeffernusse dit que vos constantes fanfaronnades-\" Le chevalier lève la main pour vous faire taire et ricane, \"S'il vous plait, ces gens sont évidemment jaloux de mon succès. Au lieu de se plaindre, ils devraient tout simplement travailler aussi dur que moi ! Peut-être devrais je vous montrer la puissance que vous pouvez obtenir avec l'assiduité qui est la mienne !\" Elle brandit sa masse et se prépare à vous attaquer !
", "questGoldenknight2Boss": "Chevalier d'Or", @@ -273,5 +273,11 @@ "questSnakeCompletion": "Grâce à l'assistance des charmeurs, vous bannissez le Serpent de la Distraction. Même si vous êtes heureux d'avoir aidé les habitants des Dunes, vous ne pouvez vous empêcher de ressentir un peu de tristesse pour votre ennemi tombé au combat. Alors que vous contemplez la vue, @LordDarkly vous approche : « Merci ! C'est peu, mais j'espère que ça l'exprime bien notre reconnaissance.» Il vous remet un peu d'Or et... des œufs de serpent ! Vous reverrez donc ce majestueux animal après tout.", "questSnakeBoss": "Serpent de Distraction", "questSnakeDropSnakeEgg": "Serpent (Œuf)", - "questSnakeUnlockText": "Déverrouille l'achat d’œufs de serpent au Marché" + "questSnakeUnlockText": "Déverrouille l'achat d’œufs de serpent au Marché", + "questUnicornText": "Convaincre la Reine Licorne", + "questUnicornNotes": "La Crique de Conquête est devenue boueuse et a détruit l'approvisionnement d'eau potable d'Habitudiville ! Heureusement, une vieille légende connue de @Lukreja, prétend qu'avec la corne d'une licorne, la plus immonde des eaux peut être purifiée. Accompagné de votre intrépide guide, @UncommonCriminal, vous escaladez les cimes enneigées des Montagnes Sinueuses. C'est ainsi qu'au sommet glacé du Mont Habitica même, parmi les neiges étincelantes, vous découvrez la reine Licorne. \"Votre requête est frappante.\" vous dit-elle. \"Cependant, vous devrez prouver d'abord être dignes de mon aide !\"", + "questUnicornCompletion": "Impressionnée par votre force et votre diligence, la reine Licorne accepte enfin la valeur de votre quête. Vous permettant de monter sur son dos, elle s’élance vers la source de la Crique de Conquête. Alors qu’elle abaisse sa corne dorée dans l’eau polluée, une lumière bleue éblouissante s’élève de la surface de l’eau. Elle est si aveuglante que vous en êtes forcé de fermer les yeux. Quand vous les ouvrez à nouveau, un instant plus tard, la licorne a disparu. Mais, @rosiesully pousse un cri de joie : l’eau est à présent claire et trois œufs étincelants reposent à l’orée de la crique.", + "questUnicornBoss": "La Reine Licorne", + "questUnicornDropUnicornEgg": "Licorne (œuf)", + "questUnicornUnlockText": "Déverrouille l'achat d’œufs de licorne au Marché" } \ No newline at end of file diff --git a/common/locales/fr/rebirth.json b/common/locales/fr/rebirth.json index b39703662a..abf026690c 100644 --- a/common/locales/fr/rebirth.json +++ b/common/locales/fr/rebirth.json @@ -23,5 +23,6 @@ "rebirthOrb100": "A utilisé un Orbe de Renaissance pour recommencer à zéro après avoir atteint le niveau 100 ou plus", "rebirthPop": "Commencez un nouveau personnage au Niveau 1 en conservant les succès, les objets de collection et les tâches avec historique.", "rebirthName": "Orbe de Renaissance", - "reborn": "Né de nouveau, niveau maximum <%= reLevel %>" + "reborn": "Né de nouveau, niveau maximum <%= reLevel %>", + "confirmReborn": "Est tu sure?" } \ No newline at end of file diff --git a/common/locales/fr/settings.json b/common/locales/fr/settings.json index 2334d81f4d..2712bc84c8 100644 --- a/common/locales/fr/settings.json +++ b/common/locales/fr/settings.json @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "Cocher pour se désabonner des mails", "unsubscribeAllEmailsText": "En cochant cette case, je certifie comprendre qu'en me désabonnant de tous les mails, Habitica n'aura jamais la possibilité de m'avertir par e-mail de changements importants au niveau du site ou de mon compte.", "correctlyUnsubscribedEmailType": "Correctement désinscrit·e des mails \"<%= emailType %>\".", - "subscriptionRateText": "$<%= price %> tous les <%= months %> mois", + "subscriptionRateText": "Récurrent €<%= price %> EUR tous les <%= months %> mois", "benefits": "Avantages", "coupon": "Promo", "couponPlaceholder": "Entrer le Code Promotionnel", @@ -136,7 +136,7 @@ "buyGemsGoldCap": "Limite augmentée à <%= amount %>", "mysticHourglass": "<%= amount %> Sablier Mystique ", "mysticHourglassText": "Un Sablier Mystique vous permet d'acheter des Sets d'Objets Mystère d'un mois passé.", - "purchasedPlanId": "<%= price %> $ tous les <%= months %> mois (<%= plan %>)", + "purchasedPlanId": "Récurrent €<%= price %> EUR tous les <%= months %> mois (<%= plan %>)", "purchasedPlanExtraMonths": "Il vous reste <%= months %> mois de crédit d' abonnement ", "consecutiveSubscription": "Abonnement consécutif", "consecutiveMonths": "Mois consécutifs", @@ -144,7 +144,7 @@ "mysticHourglasses": "Sablier Mystique", "paypal": "PayPal", "amazonPayments": "Paiments Amazon", - "timezone": "Time Zone", - "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <%= utc %>", - "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.The Golden Knight has been getting on poor Habiticans' cases. Didn't do all of your Dailies? Checked off a negative Habit? She will use this as a reason to harass you about how you should follow her example. She is the shining example of a perfect Habitican, and you are naught but a failure. Well, that is not nice at all! Everyone makes mistakes. They should not have to be met with such negativity for it. Perhaps it is time you gather some testimonies from hurt Habiticans and give the Golden Knight a stern talking-to!
", "questGoldenknight1CollectTestimony": "Testimonies", - "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Tarnished Gold (Scroll)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "The Golden Knight, Part 2: Gold Knight", "questGoldenknight2Notes": "Armed with hundreds of Habitican's testimonies, you finally confront the Golden Knight. You begin to recite the Habitcan's complaints to her, one by one. \"And @Pfeffernusse says that your constant bragging-\" The knight raises her hand to silence you and scoffs, \"Please, these people are merely jealous of my success. Instead of complaining, they should simply work as hard as I! Perhaps I shall show you the power you can attain through diligence such as mine!\" She raises her morningstar and prepares to attack you!
", "questGoldenknight2Boss": "האביר הזהב", @@ -241,7 +241,7 @@ "questCheetahText": "Such a Cheetah", "questCheetahNotes": "As you hike across the Sloensteadi Savannah with your friends @PainterProphet, @tivaquinn, @Unruly Hyena, and @Crawford, you're startled to see a Cheetah screeching past with a new Habitican clamped in its jaws. Under the Cheetah's scorching paws, tasks burn away as though complete -- before anyone has the chance to actually finish them! The Habitican sees you and yells, \"Please help me! This Cheetah is making me level too quickly, but I'm not getting anything done. I want to slow down and enjoy the game. Make it stop!\" You fondly remember your own fledgling days, and know that you have to help the newbie by stopping the Cheetah!", "questCheetahCompletion": "The new Habitican is breathing heavily after the wild ride, but thanks you and your friends for your help. \"I'm glad that Cheetah won't be able to grab anyone else. It did leave some Cheetah eggs for us, so maybe we can raise them into more trustworthy pets!\"", - "questCheetahBoss": "Cheetah", + "questCheetahBoss": "צ׳יטה", "questCheetahDropCheetahEgg": "Cheetah (Egg)", "questCheetahUnlockText": "Unlocks purchasable Cheetah eggs in the Market", "questHorseText": "Ride the Night-Mare", @@ -273,5 +273,11 @@ "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", "questSnakeBoss": "Serpent of Distraction", "questSnakeDropSnakeEgg": "Snake (Egg)", - "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market" + "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market", + "questUnicornText": "Convincing the Unicorn Queen", + "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", + "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", + "questUnicornBoss": "The Unicorn Queen", + "questUnicornDropUnicornEgg": "Unicorn (Egg)", + "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market" } \ No newline at end of file diff --git a/common/locales/he/rebirth.json b/common/locales/he/rebirth.json index 73e2fd6683..3889877619 100644 --- a/common/locales/he/rebirth.json +++ b/common/locales/he/rebirth.json @@ -2,9 +2,9 @@ "rebirthNew": "תקומה: הרפתקה חדשה זמינה!", "rebirthUnlock": "הרווחת את הלידה מחדש! חפץ השוק המיוחד הזה מאפשר לך להתחיל משחק חדש ברמה 1 ועדיין לשמור את המשימות, ההישגים, החיות שלך, ועוד. השתמש בזה כדי לנשוף חיים חדשים לריאות של Habitica, אם אתה מרגיש שכבר יש לך הכל, או כדי לחוות את הגימיקים החדשים דרך העיניים הרעננות של שחקן מתחיל!", "rebirthBegin": "לידה מחדש: להתחיל הרפתקה חדשה", - "rebirthStartOver": "Rebirth starts your character over from Level 1.", + "rebirthStartOver": "לידה מחדש מתחילה את הדמות שלך מחדש ברמה 1.", "rebirthAdvList1": "אתה חוזר לרפואה שלמה.", - "rebirthAdvList2": "You have no Experience, Gold, or Equipment (with the exception of free items like Mystery items).", + "rebirthAdvList2": "אין לך ניסיון, זהב, או ציוד (למעט חפצים חופשיים כמו חפצים דמיוניים).", "rebirthAdvList3": "ההרגלים, המטלות היומיות והמשימות ארוכות הטווח שלך והפכו לצהובות, והרצפים שלך יתאפסו.", "rebirthAdvList4": "המקצוע שלך יהיה לוחם/ת עד שתרוויח/י מקצוע חדש.", "rebirthInherit": "הדמות החדשה שלך יורשת מספר דברים מהקודמת:", @@ -16,12 +16,13 @@ "rebirthEarnAchievement": "את/ה גם מקבל/ת הישג מכך שהתחלת הרפתקה חדשה!", "beReborn": "היוולד מחדש", "rebirthAchievement": "התחלת הרפתקה חדשה! זוהי הלידה ה<%= number %> שלך מחדש, והרמה הכי גבוהה אליה הגעת היא <%= level %>. כדי לשבור שיא זה, נסה/י להגיע לרמה גבוהה יותר לפני שתתחיל/י מחדש שוב!", - "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!", + "rebirthAchievement100": "התחלת בהרפתקאה חדשה! זוהי לידה מחדש מספר <%= number %> שלך, והרמה הגבוהה ביותר אליה הגעת היא 100 או יותר. כדי להחשיב את ההישג הזה, התחל את ההרפתקאה הבאה שלך כשהגעת לפחות ל 100!", "rebirthBegan": "התחיל/ה הרפתקה חדשה", "rebirthText": "התחיל/ה <%= rebirths %> הרפתקאות חדשות", "rebirthOrb": "השתמש/ה בכדור הלידה מחדש כדי להתחיל מהתחלה אחרי רמה", - "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher", + "rebirthOrb100": "השתמשת בכדור הלידה מחדש כדי להתחיל מחדש לאחר הגעה לרמה 100 או יותר", "rebirthPop": "התחיל/י דמות חדשה ברמה 1 עם אותם הישגים, חפצי אספנות, משימות והיסטוריה.", "rebirthName": "כדור הלידה מחדש", - "reborn": "היוולד/י מחדש. רמה מירבית: <%= reLevel %>" + "reborn": "היוולד/י מחדש. רמה מירבית: <%= reLevel %>", + "confirmReborn": "האם אתה בטוח?" } \ No newline at end of file diff --git a/common/locales/he/settings.json b/common/locales/he/settings.json index fb3d778865..ea98bfecdb 100644 --- a/common/locales/he/settings.json +++ b/common/locales/he/settings.json @@ -14,11 +14,11 @@ "startCollapsedPop": "אם האפשרות הזו מסומנת, רשימת התגיות של המטלה תהיה מוסתרת כשתפתח/י את המטלה לעריכה", "startAdvCollapsed": "אפשרויות מתקדמות של מטלות מתחילות סגורות", "startAdvCollapsedPop": "אם אפשרות זו מסומנת, אפשרויות מתקדמות יהיו חבויות כאשר תפתח/י את המשימה לעריכה.", - "dontShowAgain": "Don't show this again", - "suppressLevelUpModal": "Don't show popup when gaining a level", - "suppressHatchPetModal": "Don't show popup when hatching a pet", - "suppressRaisePetModal": "Don't show popup when raising a pet into a mount", - "suppressStreakModal": "Don't show popup when attaining a Streak achievement", + "dontShowAgain": "אל תציג זאת שוב", + "suppressLevelUpModal": "אל תציג פופ-אפ בעליית רמה", + "suppressHatchPetModal": "אל תציג פופ-אפ בבקיעה של חיית מחמד", + "suppressRaisePetModal": "אל תציג פופ-אפ כשחיית מחמד הופכת לחיית רכיבה", + "suppressStreakModal": "אל תציג פופ-אפ בהשגת הישג רצף", "showTour": "הראה סיור", "restartTour": "מתחיל מחדש את סיור ההיכרות מהזמן בו הצטרפת לhabitRPG.", "showBailey": "הראה את באילי", @@ -44,8 +44,8 @@ "xml": "(XML)", "json": "(JSON)", "customDayStart": "התחלת יום מותאמת אישית", - "changeCustomDayStart": "Change Custom Day Start?", - "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?", + "changeCustomDayStart": "שנה את מועד תחילת היום?", + "sureChangeCustomDayStart": "האם אתם בטוחים שאתם מעוניינים לשנות את מועד תחילת היום?", "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!", "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.", "misc": "שונות", @@ -93,7 +93,7 @@ "loginNameDescription2": "משתמש->פרופיל", "loginNameDescription3": "כדי לשנות את השם שמופיע באוואטר שלך ובהודעות הצ'אט.", "emailNotifications": "הודעות", - "wonChallenge": "You won a Challenge!", + "wonChallenge": "זכיתם באתגר!", "newPM": "קיבלת הודעה פרטית חדשה", "giftedGems": "אבני חן שזכית בהן", "giftedGemsInfo": "<%= amount %> אבני חן - מאת <%= name %>", @@ -101,7 +101,7 @@ "invitedParty": "הוזמנת לחבורה", "invitedGuild": "הוזמנת לגילדה", "importantAnnouncements": "החשבון שלך אינו פעיל", - "weeklyRecaps": "Summaries of your account activity in the past week", + "weeklyRecaps": "סיכומים של פעילות החשבון שלכם בשבוע האחרון", "questStarted": "ההרפתקאה שלך החלה", "invitedQuest": "הוזמנת להרפתקאה", "kickedGroup": "הוצאת מקבוצה", @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "סמן כדי לבטל רישום ממיילים", "unsubscribeAllEmailsText": "על-ידי סימון תיבה זה, אני מצהיר שאני מבין שעל-ידי ביטול הרישום מכל המיילים, Habitica לעולם לא יוכל להודיע לי באמצעות דוא\"ל על שינויים חשובים לאתר או לחשבון שלי.", "correctlyUnsubscribedEmailType": "ביטלת רישומך בהצלחה ממיילים \"<%= emailType %>.", - "subscriptionRateText": "$<%= price %> חוזרים בכל <%= months %> חודשים", + "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", "benefits": "יתרונות", "coupon": "קופון", "couponPlaceholder": "הקלד קוד קופון", @@ -120,31 +120,31 @@ "apply": "החל", "resubscribe": "הרשם שוב", "promoCode": "קופון", - "promoCodeApplied": "Promo Code Applied! Check your inventory", + "promoCodeApplied": "נעשה שימוש בקופון! בידקו את המלאי שלכם", "promoPlaceholder": "הכנס קוד קופון", "displayInviteToPartyWhenPartyIs1": "הצג כפתור ״הזמן לחבורה״ כאשר בחבורה יש חבר 1.", "saveCustomDayStart": "Save Custom Day Start", - "registration": "Registration", - "addLocalAuth": "Add local authentication:", - "generateCodes": "Generate Codes", - "generate": "Generate", - "getCodes": "Get Codes", + "registration": "הרשמה", + "addLocalAuth": "הוסיפו אימות מקומי:", + "generateCodes": "ייצר קודים", + "generate": "ייצר", + "getCodes": "קבלו קודים", "webhooks": "Webhooks", - "enabled": "Enabled", + "enabled": "מאופשר", "webhookURL": "Webhook URL", - "add": "Add", - "buyGemsGoldCap": "Cap raised to <%= amount %>", - "mysticHourglass": "<%= amount %> Mystic Hourglass", - "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.", - "purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)", - "purchasedPlanExtraMonths": "You have <%= months %> months of subscription credit.", - "consecutiveSubscription": "Consecutive Subscription", - "consecutiveMonths": "Consecutive Months:", - "gemCapExtra": "Gem Cap Extra:", - "mysticHourglasses": "Mystic Hourglasses:", - "paypal": "PayPal", + "add": "הוסף", + "buyGemsGoldCap": "סף הועלה ל<%= amount %>", + "mysticHourglass": "<%= amount %> שעוני-חול מיסטיים", + "mysticHourglassText": "שעוני-חול מיסטיים מאפשרים לרכוש סטים של חפצים מיסתוריים מחודשים קודמים.", + "purchasedPlanId": "Recurring $<%= price %> USD each <%= months %> Month(s) (<%= plan %>)", + "purchasedPlanExtraMonths": "יש לכם ייתרה של <%= months %> חודשי מנוי.", + "consecutiveSubscription": "מנוי רצוף", + "consecutiveMonths": "חודשים רצופים:", + "gemCapExtra": "סף אבני-חן נוספות:", + "mysticHourglasses": "שעוני-חול מיסטיים:", + "paypal": "פיי-פאל", "amazonPayments": "Amazon Payments", - "timezone": "Time Zone", - "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <%= utc %>", + "timezone": "אזור זמן", + "timezoneUTC": "הביטיקה משתמשת באזור הזמן של המחשב שלכם, שהוא: <%= utc %> ", "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.Az Arany Lovag kezd rászállni a szegény Habitica lakók hibáira. Nem csináltad meg az összes Napi feladatod? Bepipáltál egy negatív szokást? Mindent felhasznál arra, hogy azzal zaklasson, hogy példát kéne venned tőle. Ő a ragyogó példánya egy tökéletes Habitica lakónak, és te egy semmi vagy, vagy inkább egy nagy kudarc. Nos, ez egyáltalán nem szép! Mindenki hibázhat. Nem kellene ilyen negatívan reagálni erre. Talán itt az ideje, hogy összegyűjtsünk jó néhány Tanúságtételt és az Arany Lovag is megkapja a maga Szigorú Lehordását!
", "questGoldenknight1CollectTestimony": "Tanúságtételek", - "questGoldenknight1DropGoldenknight2Quest": "Az Arany Lovag lánc 2. rész: Patinás Arany (tekercs)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "The Golden Knight, Part 2: Gold Knight", "questGoldenknight2Notes": "Több száz Habiticai lakos vallomásával felfegyverkezve, végre-valahára szembeszállsz az Arany Lovaggal. Egyenként felolvasod neki Habitica lakóinak panaszait. \"És @Pfeffernusse azt állítja, hogy a folytonos dicsekvésed-\" A lovag felemeli kezét hogy elcsendesítsen és gúnyosan megjegyzi, \"Kérlek, ezek az emberek csak irigykednek a sikereim láttán. Ahelyett, hogy panaszkodnak, egyszerűen csak olyan keményen kéne dolgozniuk mint én. Lehet, hogy meg kéne neked mutatnom az erőmet melyet ha úgy igyekszel mint én, elérhetsz!\" Ezzel felemeli a buzogányát és támadásba lendül!
", "questGoldenknight2Boss": "Arany Lovag", @@ -273,5 +273,11 @@ "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", "questSnakeBoss": "Serpent of Distraction", "questSnakeDropSnakeEgg": "Snake (Egg)", - "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market" + "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market", + "questUnicornText": "Convincing the Unicorn Queen", + "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", + "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", + "questUnicornBoss": "The Unicorn Queen", + "questUnicornDropUnicornEgg": "Unicorn (Egg)", + "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market" } \ No newline at end of file diff --git a/common/locales/hu/rebirth.json b/common/locales/hu/rebirth.json index 9483e0bb6c..4db73fae36 100644 --- a/common/locales/hu/rebirth.json +++ b/common/locales/hu/rebirth.json @@ -23,5 +23,6 @@ "rebirthOrb100": "Használtad az Újjászületés Gömbjét, hogy újrakezd, miután elérted a 100-as, vagy magasabb szintet", "rebirthPop": "Kezdj új karaktert 1-es Szinttől, megtartva a kitűntetéseidet, a gyűjteményeidet, a feladataidat és a történetedet.", "rebirthName": "Az Újjászületés Gömbje", - "reborn": "Újjászülettél, maximális szint <%= reLevel %>" + "reborn": "Újjászülettél, maximális szint <%= reLevel %>", + "confirmReborn": "Are you sure?" } \ No newline at end of file diff --git a/common/locales/hu/settings.json b/common/locales/hu/settings.json index b5cc7e7d0e..ace507b1f5 100644 --- a/common/locales/hu/settings.json +++ b/common/locales/hu/settings.json @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "Pipáld ki hogyha le akarsz iratkozni az Email-ekről", "unsubscribeAllEmailsText": "Ennek a mezőnek a kipipálásával elismerem, hogy megértettem azt, hogyha leiratkozom minden emailről, akkor a Habitica nem fog tudni értesíteni engem Email-en keresztül semmilyen fontos változásról az oldallal vagy a felhasználói fiókommal kapcsolatban.", "correctlyUnsubscribedEmailType": "Sikeresen leiratkoztál a(z) \"<%= emailType %>\" e-mailekről.", - "subscriptionRateText": "Ismétlődő $<%= price %> minden <%= months %>. hónapban", + "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", "benefits": "Előnyök", "coupon": "Kupon", "couponPlaceholder": "Írd be a Kupon kódodat", @@ -136,7 +136,7 @@ "buyGemsGoldCap": "Cap raised to <%= amount %>", "mysticHourglass": "<%= amount %> Mystic Hourglass", "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.", - "purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)", + "purchasedPlanId": "Recurring $<%= price %> USD each <%= months %> Month(s) (<%= plan %>)", "purchasedPlanExtraMonths": "You have <%= months %> months of subscription credit.", "consecutiveSubscription": "Consecutive Subscription", "consecutiveMonths": "Consecutive Months:", diff --git a/common/locales/hu/subscriber.json b/common/locales/hu/subscriber.json index 894e32831e..91e0ab8329 100644 --- a/common/locales/hu/subscriber.json +++ b/common/locales/hu/subscriber.json @@ -63,6 +63,32 @@ "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "timeTravelersAlreadyOwned": "Congratulations! You already own everything the Time Travelers currently offer. Thanks for supporting the site!", "mysticHourglassPopover": "A Mystic Hourglass allows you to purchase certain limited-time items, such as monthly Mystery Item Sets and awards from world bosses, from the past!", + "mysterySet201402": "Winged Messenger Set", + "mysterySet201403": "Forest Walker Set", + "mysterySet201404": "Twilight Butterfly Set", + "mysterySet201405": "Flame Wielder Set", + "mysterySet201406": "Octomage Set", + "mysterySet201407": "Undersea Explorer Set", + "mysterySet201408": "Sun Sorcerer Set", + "mysterySet201409": "Autumn Strider Set", + "mysterySet201410": "Winged Goblin Set", + "mysterySet201411": "Feast and Fun Set", + "mysterySet201412": "Penguin Set", + "mysterySet201501": "Starry Knight Set", + "mysterySet201502": "Winged Enchanter Set", + "mysterySet201503": "Aquamarine Set", + "mysterySet201504": "Busy Bee Set", + "mysterySet201505": "Green Knight Set", + "mysterySet201506": "Neon Snorkeler Set", + "mysterySet201507": "Rad Surfer Set", + "mysterySet201508": "Cheetah Costume Set", + "mysterySet201509": "Werewolf Set", + "mysterySet201510": "Horned Goblin Set", + "mysterySet201511": "Wood Warrior Set", + "mysterySet201512": "Winter Flame Set", + "mysterySet301404": "Steampunk Standard Set", + "mysterySet301405": "Steampunk Accessories Set", + "mysterySetwondercon": "Wondercon", "subUpdateCard": "Kártya frissítése", "subUpdateTitle": "Frissítés", "subUpdateDescription": "Frissítsd a kártyát, hogy feltöltsd.", diff --git a/common/locales/hu/tasks.json b/common/locales/hu/tasks.json index 04b69a181a..7806954f16 100644 --- a/common/locales/hu/tasks.json +++ b/common/locales/hu/tasks.json @@ -5,6 +5,7 @@ "beeminderDeleteWarning": "Beeminder felhasználók: Először olvassátok el ezt: Elvégzett Tennivalók Törlése A Beeminder Összezavarása Nélkül!", "addmultiple": "Több hozzáadása", "addsingle": "Egy hozzáadása", + "habit": "Habit", "habits": "Szokások", "newHabit": "Új szokás", "newHabitBulk": "Új szokások (egy sorba csak egyet)", @@ -32,6 +33,7 @@ "mental": "Szellemi", "otherExamples": "Például szakmai célok, hobbik, pénzügyek, stb.", "progress": "Haladás", + "daily": "Daily", "dailies": "Napi feladatok", "newDaily": "Új Napi feladat", "newDailyBulk": "Új napi feladatok (egy sorba csak egyet)", @@ -46,6 +48,7 @@ "day": "Nap", "days": "Napok", "restoreStreak": "Széria visszaállítása", + "todo": "To-Do", "todos": "Tennivalók", "newTodo": "Új Tennivaló", "newTodoBulk": "Új tennivalók (egy sorba csak egyet)", @@ -57,6 +60,7 @@ "notDue": "nem esedékes", "grey": "Szürke", "score": "Pontszám", + "reward": "Reward", "rewards": "Jutalmak", "ingamerewards": "Felszerelések és képességek", "gold": "Arany", @@ -86,7 +90,8 @@ "fortifyPop": "Visszaállít minden feladatot semleges értékűre (sárga színű), és feltölti az életerőt.", "fortify": "Megerősít", "fortifyText": "Fortify will return all your tasks to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", - "sureDelete": "Biztos vagy benne, hogy törölni akarod ezt a feladatot?", + "confirmFortify": "Are you sure?", + "sureDelete": "Are you sure you want to delete the <%= taskType %> with the text \"<%= taskText %>\"?", "streakCoins": "Széria bónusz!", "pushTaskToTop": "Push task to top. Hold ctrl or cmd to push to bottom.", "emptyTask": "Előbb írd be a feladat címét.", diff --git a/common/locales/it/backgrounds.json b/common/locales/it/backgrounds.json index 43a9d4553e..36575e98be 100644 --- a/common/locales/it/backgrounds.json +++ b/common/locales/it/backgrounds.json @@ -126,11 +126,11 @@ "backgroundNightDunesNotes": "Fai una passeggiata notturna tra le dune.", "backgroundSunsetOasisText": "Oasi al tramonto", "backgroundSunsetOasisNotes": "Goditi l'oasi durante il tramonto.", - "backgrounds122015": "SET 19: Released December 2015", - "backgroundAlpineSlopesText": "Alpine Slopes", - "backgroundAlpineSlopesNotes": "Ski on the Alpine Slopes.", - "backgroundSnowySunriseText": "Snowy Sunrise", - "backgroundSnowySunriseNotes": "Gaze at the Snowy Sunrise.", - "backgroundWinterTownText": "Winter Town", - "backgroundWinterTownNotes": "Bustle through a Winter Town." + "backgrounds122015": "SERIE 19: Dicembre 2015 ", + "backgroundAlpineSlopesText": "Pendii Alpini", + "backgroundAlpineSlopesNotes": "Scia sui pendii delle montagne.", + "backgroundSnowySunriseText": "Alba innevata", + "backgroundSnowySunriseNotes": "Ammira il colore della neve all'alba.", + "backgroundWinterTownText": "Città Invernale", + "backgroundWinterTownNotes": "Passeggia per la città invernale." } \ No newline at end of file diff --git a/common/locales/it/character.json b/common/locales/it/character.json index e7cceb1379..1b7baab509 100644 --- a/common/locales/it/character.json +++ b/common/locales/it/character.json @@ -66,12 +66,12 @@ "level": "Livello", "levelUp": "Livello aumentato!", "gainedLevel": "Nuovo lìvello!", - "leveledUp": "Completando obiettivi nella vita reale, hai raggiunto il livello <%= level %>!", + "leveledUp": "Raggiungendo i tuoi obiettivi nella vita reale, ora sei al livello <%= level %>!", "fullyHealed": "Salute ripristinata!", "huzzah": "Urrà!", "mana": "Mana", - "hp": "PV", - "mp": "PM", + "hp": "HP", + "mp": "MP", "xp": "XP", "health": "Salute", "allocateStr": "Punti assegnati a Forza:", diff --git a/common/locales/it/communityguidelines.json b/common/locales/it/communityguidelines.json index ed24446645..5143a1b810 100644 --- a/common/locales/it/communityguidelines.json +++ b/common/locales/it/communityguidelines.json @@ -93,14 +93,14 @@ "commGuidePara052": "Le infrazioni gravi danneggiano severamente la serenità della community di Habitica e degli utenti, e hanno quindi gravi conseguenze come risultato", "commGuidePara053": "Questa è una lista di infrazioni gravi. Ma non è una lista esaustiva.", "commGuideList05A": "Violazione delle condizioni d'uso", - "commGuideList05B": "Incitamento all'odio, alle molestie/stalking, Cyber-bullismo, Flaming e trolling", + "commGuideList05B": "Incitamento all'odio, molestie/stalking, cyber-bullismo, pubblicazione di contenuti provocatori o irritanti nei confronti di altri utenti", "commGuideList05C": "Violazione della prova", "commGuideList05D": "Impersonare Staff o Moderatori", - "commGuideList05E": "Ripetere infrazioni moderate", - "commGuideList05F": "Creare un secondo account per evitare le conseguenze (per esempio, creare un nuovo account per chattare dopo che ti sono stati revocati i privilegi della chat)", - "commGuideHeadingModerateInfractions": "Infrazioni moderate", + "commGuideList05E": "Ripetere infrazioni lievi", + "commGuideList05F": "Creare un secondo account per evitare i provvedimenti (per esempio, creare un nuovo account per chattare dopo che ti sono stati revocati i privilegi di chat)", + "commGuideHeadingModerateInfractions": "Infrazioni lievi", "commGuidePara054": "Infrazioni lievi non rendono insicura la nostra community, ma la rendolo spiacevole. Queste infrazioni avranno conseguenze lievi. Quando insieme ad altre infrazioni, le conseguenze potrebbero diventare più gravi", - "commGuidePara055": "Questa è una lista di infrazioni lievi. Ma non è una lista esaustiva.", + "commGuidePara055": "Qui ci sono alcuni esempi di infrazioni lievi. Non è una lista esaustiva.", "commGuideList06A": "Ignorare o mancare di rispetto a un moderatore. Questo include screditare i moderatori o altri utenti, difendere o elogiare pubblicamente utenti bannati (ovvero con account sospesi per aver infranto delle regole). Se avete preoccupazioni riguardo una regola o il comportamento di un moderatore, per cortesia contattate Lemoness via email (leslie@habitica.com).", "commGuideList06B": "Backseat Modding. Per una veloce spiegazione di un punto rilevante: una menzione amichevole delle regole va bene. Il Backseat Modding consiste nel dire, domandare e/ o fortemente sottintendere che qualcuno deve fare un'azione che descrivi per correggere un errore. Puoi avvisare chiunque che ha commesso una trasgressione, ma per cortesia non richiedere che venga fatta un'operazione di moderazione, per esempio dire \"Sappi che essere profani è fortemente disincentivato nella taverna, so dovresti eliminare il tuo commento\" è decisamente meglio di \" Andrò a chiedere di rimuovere il tuo post\"", "commGuideList06C": "Ripetute violazioni delle linee guida per gli spazi pubblici", @@ -122,9 +122,9 @@ "commGuideList09B": "Account cancellati", "commGuideList09C": "Disabilita permanentemente (\"freezing\") la progressione come contribuente", "commGuideHeadingModerateConsequences": "Esempio di conseguenze moderate", - "commGuideList10A": "Restrizioni di privilegi legati alla chat", - "commGuideList10B": "Restrizioni di privilegi legati alla chat privata", - "commGuideList10C": "Privilegi limitati alla creazione della gilda/sfida", + "commGuideList10A": "Restrizione di privilegi legati alle chat pubbliche", + "commGuideList10B": "Restrizione di privilegi legati alle chat private", + "commGuideList10C": "Restrizione dei privilegi di creazione gilde/sfide", "commGuideList10D": "Disabilita temporaneamente (\"freezing\") la progressione come contribuente", "commGuideList10E": "Retrocessione del livello di contribuente", "commGuideList10F": "Mettere gli utenti \"in prova\"", @@ -140,20 +140,20 @@ "commGuidePara063": " Se non capisci le conseguenze, o la natura dell'infrazione, chiedilo ai moderatori/Staff per essere aiutato così puoi evitare di commettere infrazioni in futuro.", "commGuideHeadingContributing": "Contribuire a migliorare Habitica", "commGuidePara064": "Habitica è un progetto open-source, quindi ogni abitante di Habitica è invitato a partecipare! Coloro che lo faranno sarano ricompensati secondo i seguenti gradi:", - "commGuideList12A": "Habitica badge del Contribuente, più 3 Gemme", - "commGuideList12B": "Armatura da contribuente, più 3 Gemme", - "commGuideList12C": "Elmetto del contribuente, più 3 Gemme", - "commGuideList12D": "Spada del contribuente più 4 gemme", - "commGuideList12E": "Scudo del contribuente più 4 gemme", - "commGuideList12F": "Animaletto del contribuente più 4 Gemme", - "commGuideList12G": "Invito alla Gilda del contribuente più 4 gemme", - "commGuidePara065": "I moderatori sono scelti tra i 7 livelli dei contribuenti dallo staff e dai moderatori pre esistenti. Nota che mentre i contribuenti tra i 7 livelli hanno lavorato duro a nome del sito, non tutti loro possono parlare con l'autorità di un moderatore.", - "commGuidePara066": "Ci sono alcune note importanti sui livelli contribuente:", - "commGuideList13A": " I livelli sono dati con discrezione. Sono assegnati a discrezione del moderatore, in base a molti fattori, incluso la nostra percezione del lavoro che è stato fatto ed il valore per la community. Ci riserviamo il diritto di cambiare il livello, il titolo e la ricompensa a nostra discrezione.", - "commGuideList13B": "I livelli sono più difficili da ottenere man mano che si progredisce. se crei un mostro, o risolvi un piccolo bug, può essere sufficiente per il primo livello da contribuente, ma non abbastanza per salire al livello superiore. Come ogni buon RPG, con l'aumentare del livello aumenta la sfida!", - "commGuideList13C": "I livelli non \"rincominciano\" in ogni campo. Quando aumenta la difficoltà, guardiamo tutti i vostri contributi, quindi una persona che ha fatto un pò di pixel art, ha fixato un piccolo bug, e si è dilettato un pò nella wiki, non procederà veloce come una persona che ha lavorato duro in un singolo compito. Questo aiuta a mantere le cose corrette!", + "commGuideList12A": "Medaglia sostenitore di Habitica, più 3 Gemme", + "commGuideList12B": "Armatura del sostenitore, più 3 Gemme", + "commGuideList12C": "Elmo del sostenitore, più 3 Gemme", + "commGuideList12D": "Spada del sostenitore, più 4 Gemme", + "commGuideList12E": "Scudo del sostenitore, più 4 Gemme", + "commGuideList12F": "Animale del sostenitore, più 4 Gemme", + "commGuideList12G": "Invito alla \"Gilda dei sostenitori\", più 4 Gemme", + "commGuidePara065": "I moderatori sono scelti tra i sostenitori di livello 7, dallo staff e dagli attuali moderatori. Nota che, anche se i sostenitori di livello 7 hanno lavorato sodo a nome del sito, non tutti loro hanno l'autorità di un moderatore.", + "commGuidePara066": "Ci sono alcune note importanti sui livelli per i sostenitori:", + "commGuideList13A": "I livelli vengono assegnati con discrezione. I livelli vengono conferiti a discrezione dei moderatori, in base a molti fattori, inclusa la nostra percezione del lavoro che è stato fatto ed il suo valore per la comunità. Ci riserviamo il diritto di modificare livelli, titoli e ricompense a nostra discrezione.", + "commGuideList13B": "I livelli sono più difficili da ottenere man mano che si progredisce. Se hai creato un mostro da sconfiggere, o hai risolto un piccolo bug, ciò potrebbe essere sufficiente per ottenere il primo livello di sostenitore, ma non abbastanza per salire al livello superiore. Come in ogni buon RPG, con l'aumentare del livello aumentano le sfide!", + "commGuideList13C": "I livelli non \"ricominciano\" in ogni campo. Quando aumenta la difficoltà, guardiamo tutti i vostri contributi. Quindi una persona che ha disegnato un po' di pixel art, ha risolto un piccolo bug o si è dilettato un po' nella wiki, non procederà veloce come una persona che ha lavorato duramente su un singolo lavoro. Questo aiuta a contribuire in modo leale e corretto!", "commGuideList13D": " Utenti in prova non possono essere promossi al livello successivo. I moderatori hanno il diritto di \"congelare\" gli avanzamenti dell'utente a causa di un'infrazione. Se questo succede, l'utente verrà informato della decisione, e come porre rimedio. I livelli possono essere anche rimossi in come risultati di infrazioni o di essere \"in prova\".", - "commGuideHeadingFinal": "La Sezione Finale", + "commGuideHeadingFinal": "La sezione finale", "commGuidePara067": "Questo è quello che devi sapere, da bravo Habitichese - le linee guida della comunità! Asciugati il sudore dalla fronte e prendi un po' di punti esperienza per averla letta tutta. Se hai dubbi o domande riguardo le linee guida della comunità, per cortesia scrivi a Lemoness (leslie@habitica.com) e sarà felice di aiutarti a chiarire ogni cosa.", "commGuidePara068": "Ora va', prode avventuriero, e sconfiggi qualche Daily!", "commGuideHeadingLinks": "Risorse utili (in inglese)", diff --git a/common/locales/it/content.json b/common/locales/it/content.json index 054e0537cd..76be987be1 100644 --- a/common/locales/it/content.json +++ b/common/locales/it/content.json @@ -75,7 +75,7 @@ "questEggRockMountText": "Roccia", "questEggRockAdjective": "una vivace", "questEggBunnyText": "Coniglietto", - "questEggBunnyMountText": "Coniglietto", + "questEggBunnyMountText": "Coniglio", "questEggBunnyAdjective": "un coccoloso", "questEggSlimeText": "Gelatina di Marshmallow", "questEggSlimeMountText": "Gelatina di Marshmallow", @@ -101,6 +101,9 @@ "questEggSnakeText": "Serpente", "questEggSnakeMountText": "Serpente", "questEggSnakeAdjective": "un sinuoso", + "questEggUnicornText": "Unicorno", + "questEggUnicornMountText": "Unicorno Alato", + "questEggUnicornAdjective": "un magico", "eggNotes": "Trova una pozione per far schiudere questo uovo, e nascerà <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Base", "hatchingPotionWhite": "Bianco", @@ -113,6 +116,7 @@ "hatchingPotionCottonCandyBlue": "Blu Zucchero Filato", "hatchingPotionGolden": "Oro", "hatchingPotionSpooky": "Spettrale", + "hatchingPotionPeppermint": "Menta Piperita", "hatchingPotionNotes": "Versa questa pozione su un uovo, e nascerà un animale <%= potText(locale) %>.", "premiumPotionAddlNotes": "Non utilizzabile su uova di animali ottenute dalle missioni.", "foodMeat": "Carne", diff --git a/common/locales/it/death.json b/common/locales/it/death.json index c3b758258e..5a1b2e03f4 100644 --- a/common/locales/it/death.json +++ b/common/locales/it/death.json @@ -10,7 +10,7 @@ "lowHealthTips1": "Sali di livello per curarti completamente!", "lowHealthTips2": "Compra una Pozione di Salute nella colonna delle Ricompense per ripristinare 15 punti Salute.", "losingHealthQuickly": "Perdi Salute rapidamente?", - "lowHealthTips3": "Le Daily incomplete ti danneggiano a fine giornata, quindi fai attenzione a non aggiungerne troppe tutte insieme!", - "lowHealthTips4": "Se una Daily non va completata in un certo giorno, puoi disattivarla cliccando sull'icona a forma di matita.", + "lowHealthTips3": "Le Giornaliere incomplete ti danneggiano a fine giornata, quindi fai attenzione a non aggiungerne troppe all'inizio!", + "lowHealthTips4": "Se una Giornaliera non va completata in un certo giorno, puoi disattivarla cliccando sull'icona a forma di matita.", "goodLuck": "Buona fortuna!" } \ No newline at end of file diff --git a/common/locales/it/faq.json b/common/locales/it/faq.json index 574756fbc2..301795fc54 100644 --- a/common/locales/it/faq.json +++ b/common/locales/it/faq.json @@ -2,7 +2,7 @@ "frequentlyAskedQuestions": "Domande frequenti", "faqQuestion0": "Sono confuso. Come funziona Habitica?", "iosFaqAnswer0": "Per prima cosa, imposterai un'attività che vuoi completare nella vita di tutti i giorni, quindi, completando le tue attività nella vita vera e spuntandole, riceverai esperienza ed oro. L'oro è usato per comprare equipaggiamento e alcuni item, insieme ad dei premi personalizzati. L'esperienza serve a far salire di livello il tuo personaggio e sbloccare contenuti come animali domestici, abilità, e missioni! Puoi personalizzare il tuo personaggio in Menu > Personalizza Avatar.\n\nAlcuni metodi basilari per interagire: cliccare il (+) nell'angolo in alto a destra per aggiungere una nuova attività. Cliccare su un'attività già presente per modificarla e strisciare verso sinistra per eliminarla. Puoi organizare le attività usando le etichette nell'angolo in alto a sinistra, espandi e contrai checklist cliccando nella bolla vicine alle suddette.", - "webFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn Experience and Gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as pets, skills, and quests! For more detail, check out a step-by-step overview of the game at [Help -> Overview for New Users](https://habitica.com/static/overview).", + "webFaqAnswer0": "Per prima cosa devi impostare i compiti che intendi svolgere nella vita di tutti i giorni. Poi, man mano che completi i compiti nella vita reale e li spunti nel gioco, guadagnerai Esperienza e Oro. L'Oro viene usato per comprare equipaggiamenti, oltre a ricompense personalizzate. L'Esperienza permetterà al tuo personaggio di salire di livello e di sbloccare nuovi contenuti, come Animali, abilità e sfide!. Per ulteriori dettagli, visita una panoramica guidata del gioco ad [Aiuto-> Panoramica per nuovi utenti] \n(https://habitica.com/static/overview).", "faqQuestion1": "Come imposto le mie attività?", "iosFaqAnswer1": "Le Buone Abitudini (quelle con il +) sono attività che puoi fare più volte al giorno, come \"Mangiare verdure, \"Fare sport\" ecc. Le Cattive Abitudini (quelle con il -) sono attività che dovresti evitare, come \"Mordersi le unghie\", \"Mangiare fritto\" ecc. Le Abitudini con un + ed un - hanno una scelta buona ed una cattiva, come prendere le scale al posto di usare l'ascensore. Le Buone Abitudini garantiscono punti esperienza ed oro.Lle Cattive Abitudini tolgono punti vita.\n\nLe Dailies sono attività che compi ogni giorno, come \"Lavare i denti\" o \"Controllare la mail\". Puoi semplicemente assegnare una Daily ai giorni in cui vuoi impostarla cliccando su Modifica. Se salti una Daily assegnata, il tuo Avatar subirà danno durante la notte. Fai attenzione a non aggiungere troppe Daily in una sola volta!\n\nI To-Do si trovano nella tua lista To-Do. Completando una To-Do guadagni oro e punti esperienza. Non perderai mai punti vita dalle To-Do. Puoi aggiungere una data di scadenza alle To-Do cliccando su Modifica.", "webFaqAnswer1": "Le Buone Abitudini (quelle con il ) sono attività che puoi fare più volte al giorno, come \"Mangiare verdure, \"Fare sport\" ecc. Le Cattive Abitudini quelle con il ) sono attività che dovresti evitare, come \"Mordersi le unghie\", \"Mangiare fritto\" ecc. Le Abitudini con un ed un hanno una scelta buona ed una cattiva, come prendere le scale al posto di usare l'ascensore. Le Buone Abitudini garantiscono punti esperienza ed oro. Le Cattive Abitudini tolgono punti vita.\nIl Cavaliere d'Oro si sta intromettendo nelle questioni dei poveri abtanti di Habitica. Non hai fatto tutte le tue Daily? Hai violato un Habit? Lei si sentirà in diritto di importunarti su come dovresti seguire il suo esempio: lei è il modello perfetto di abitante di Habitica, e tu non sei nient'altro che una delusione. Beh, questo non è per niente carino da parte sua! Tutti possono sbagliare, e nessuno dovrebbe essere trattato così duramente per questo. Forse è il momento che tu raccolga un po' di testimonianze da abitanti bistrattati e faccia una bella ramanzina al Cavaliere d'Oro!
", + "questGoldenknight1Notes": "Il Cavaliere d'Oro si sta intromettendo nelle questioni dei poveri abtanti di Habitica. Non hai fatto tutte le tue Attività? Hai segnato un'Abitudine negativa? Lei lo userà come ragione per importunarti su come dovresti seguire il suo esempio. Lei è il modello perfetto di abitante di Habitica, e tu non sei nient'altro che una delusione. Beh, questo non è per niente carino da parte sua! Tutti possono sbagliare, e nessuno dovrebbe essere trattato così duramente per questo. Forse è il momento che tu raccolga un po' di testimonianze da abitanti bistrattati Habitica e faccia una bella ramanzina al Cavaliere d'Oro!
", "questGoldenknight1CollectTestimony": "Testimonianze", - "questGoldenknight1DropGoldenknight2Quest": "Il Cavaliere Dorato Parte 2: L'oro offuscato (Pergamena)", - "questGoldenknight2Text": "Il Cavaliere Dorato, Parte 2: L'oro offuscato", - "questGoldenknight2Notes": "Armato di centinaia di testimonianze degli abitanti di Habitica, fronteggii finalmente il Cavaliere Dorato. Inizi a recitarle le lamentele degli abitanti una per una. \"E @Pfeffernusse sostiene che il tuo costante pavoneggiarti-\" Il cavaliere alza una mano per zittirti e sbuffa, \" Ma per favore, questa gente è banalmente gelosa del mio successo. Invece di lamentarsi, dovrebbero semplicemente lavorare duramente come me! Forse dovrei dimostrarti quale potere si possa ottenere attraverso una diligenza come la mia!\" Solleva la sua mazza chiodata e si prepara ad attaccarti!
", + "questGoldenknight1DropGoldenknight2Quest": "La Catena del Cavaliere Dorato Parte 2: Il Cavaliere Dorato (Pergamena)", + "questGoldenknight2Text": "Il Cavaliere Dorato, Parte 2: Cavaliere d'Oro", + "questGoldenknight2Notes": "Armato di centinaia di testimonianze degli abitanti di Habitica, fronteggi finalmente il Cavaliere Dorato. Inizi a recitarle le lamentele degli abitanti una per una. \"E @Pfeffernusse sostiene che il tuo costante pavoneggiarti-\" Il cavaliere alza una mano per zittirti e sbuffa, \" Ma per favore, queste persone sono soltanto gelose del mio successo. Invece di lamentarsi, dovrebbero semplicemente lavorare sodo come faccio io! Forse dovrei dimostrarti quale potere è possibile ottenere grazie ad una diligenza come la mia!\" Solleva la sua mazza chiodata e si prepara ad attaccarti!
", "questGoldenknight2Boss": "Cavaliere d'Oro", "questGoldenknight2DropGoldenknight3Quest": "Il Cavaliere Dorato - Parte 3: Il Cavaliere di Ferro (Pergamena)", "questGoldenknight3Text": "Il Cavaliere Dorato, Parte 3: Il Cavaliere di Ferro", - "questGoldenknight3Notes": "@Jon Arinbjorn cries out to you to get your attention. In the aftermath of your battle, a new figure has appeared. A knight coated in stained-black iron slowly approaches you with sword in hand. The Golden Knight shouts to the figure, \"Father, no!\" but the knight shows no signs of stopping. She turns to you and says, \"I am sorry. I have been a fool, with a head too big to see how cruel I have been. But my father is crueler than I could ever be. If he isn't stopped he'll destroy us all. Here, use my morningstar and halt the Iron Knight!\"
", + "questGoldenknight3Notes": "@Jon Arinbjorn grida disperatamente per ottenere la tua attenzione. In seguito alla vostra battaglia, è apparsa una nuova figura. Un cavaliere ricoperto di ferro nero si avvicina lentamente a te con la spada in mano. Il Cavaliere Dorato urla rivolta alla figura, \"Padre, no!\" ma il cavaliere non dà segno di volersi fermare. Si rivolge a te e dice, \"Mi dispiace. Sono stata una stupida, con la testa troppo piena di pensieri per vedere quanto fossi crudele. Ma mio padre è più spietato di quanto io sia stata. Se non viene fermato ci distruggerà tutti. Tieni, usa la mia mazza chiodata e ferma il Cavaliere di Ferro!\"
", "questGoldenknight3Completion": "Con un liberatorio *clang* il Cavaliere di Ferro cade sulle sue ginocchia e crolla. \"Sei parecchio forte\" ansima, \"oggi sono stato umiliato\". Il Cavaliere d'Oro ti si avvicina: \"Grazie\" dice, \"penso che abbiamo imparato un po' di modestia e umiltà dal nostro incontro con te. Parlerò con mio padre e gli riferirò le lamentele nei nostri confronti\". \"Forse dovremmo scusarci con tutti gli abitanti...\" Rimugina tra se e se, prima di parlarti di nuovo: \"Ecco, prendi questo in dono, voglio che tu tenga la mia Mazza chiodata. Ora ti appartiene.\"
", "questGoldenknight3Boss": "Il Cavaliere di Ferro", "questGoldenknight3DropHoney": "Miele (cibo)", "questGoldenknight3DropGoldenPotion": "Pozione Oro", - "questGoldenknight3DropWeapon": "Schiacciante Mazza Chiodata Commemorativa di Mustaine (Arma per mano da Scudo)", + "questGoldenknight3DropWeapon": "Massiccia Mazza Memoriale di Mustaine (Arma per mano da Scudo)", "questBasilistText": "Il Basi-list", "questBasilistNotes": "C'é subbuglio al mercato! Uno di quelli dai quali bisognerebbe stare alla larga. Ma tu sei un coraggioso avventuriero, quindi ti ci butti a capofitto trovandoci un Basi-list, che si sta generando da un grumo di To-Do ancora incompleti! Gli abitanti vicini sono paralizzati dal terrore alla vista della lunghezza del mostro, incapaci di agire. Da qualche parte ti giunge la voce di @Arcosine che urla: \"Presto! Copleta le tue Daily e To-Do per privare il mostro delle zanne, prima che qualcuno si tagli con la carta!\" Colpisci in fretta, avventuriero, e spunta quelle caselle; ma attento! Se lasci anche solo una Daily non fatta, il Basi-list attaccherà te e il tuo gruppo!", "questBasilistCompletion": "Il Basi-list ha sparso frammenti di carta, che hanno un bagliore arcobaleno. \"Whew!\" disse @Arcosine. \"Che fortuna che voi ragazzi siate qui!\" Sentendovi più esperti di prima, raccogliete dell'oro tra i frammenti", @@ -131,13 +131,13 @@ "questAtom1Text": "Attacco del Mondano, Parte 1: Disastro di Stoviglie!", "questAtom1Notes": "Hai raggiunto le rive del Lago Lavapiatti per un po' di relax... Ma il lago è infestato da piatti da lavare! Come sarà successo? Beh, non puoi permettere che il lago rimanga in questo stato. C'è soltanto una cosa da fare: lavare i piatti e salvare il vostro luogo di villeggiatura! Sarà meglio trovare un po' di sapone per pulire questa porcheria. Molto sapone...", "questAtom1CollectSoapBars": "Barrette di Sapone", - "questAtom1Drop": "Il Mostro di SnackLess (Pergamena)", + "questAtom1Drop": "Il Mostro Senza-Snack (Pergamena)", "questAtom2Text": "Attacco del Mondano, Parte 2: Il Mostro Senza-Snack", - "questAtom2Notes": "Phew, questo posto sembra molto più bello con tutti questi piatti puliti. Forse, adesso potrai finalmente rilassarti un po'. Oh - sembrerebbe un cartone della pizza quello che sta galleggiando nel lago. Beh, cosa sarà mai un'altra cosa da pulire in fondo? Ma, dannazione, non è un semplice cartone di pizza! Con uno scatto improvviso la scatola si solleva dall'acqua per rivelare la sua vera natura: è la testa di un mostro. Non può essere! Il leggendario Mostro di Snackless? Si dice che abbia vissuto nascosto sin dalla preistoria: una creatura generata dagli avanzi di cibo e dall'immondizia degli antichi abitanti di Habitica. Bleah!", + "questAtom2Notes": "Phew, questo posto sembra molto più bello con tutti questi piatti puliti. Forse, adesso potrai finalmente rilassarti un po'. Oh - sembrerebbe un cartone della pizza quello che sta galleggiando nel lago. Beh, cosa sarà mai un'altra cosa da pulire in fondo? Ma, dannazione, non è un semplice cartone di pizza! Con uno scatto improvviso la scatola si solleva dall'acqua per rivelare la sua vera natura: è la testa di un mostro. Non può essere! Il leggendario Mostro Senza-Snack? Si dice che abbia vissuto nascosto sin dalla preistoria: una creatura generata dagli avanzi di cibo e dall'immondizia degli antichi abitanti di Habitica. Bleah!", "questAtom2Boss": "Il Mostro di SnackLess", "questAtom2Drop": "Il Bucatomante (Pergamena)", - "questAtom3Text": "Attacco del Mondano, Parte 3: Il Lavamante", - "questAtom3Notes": "Con un urlo assordante, e cinque deliziosi tipi di formaggio che cadono dalla sua bocca, il Mostro di Snackless cade in pezzi. \"COME OSI!\" echeggia una voce da sotto la superficie dell'acqua. Una figura che indossa una tunica blu emerge dall'acqua, brandendo uno spazzolino da water magico. Dalla superficie del lago, inizia ad emergere biancheria sporchissima. \"Sono il Bucatomante!\" annuncia rabbioso. \"Sei davvero coraggioso - lavare i miei piatti deliziosamente sporchi, distruggere il mio servitore, ed entrare nel mio regno con abiti così puliti. Preparati a sentire la sozza furia della mia magia anti-bucato\"!", + "questAtom3Text": "Attacco del Mondano, Parte 3: Il Bucatomante", + "questAtom3Notes": "Con un urlo assordante, e cinque deliziosi tipi di formaggio che cadono dalla sua bocca, il Mostro Senza-Snack cade in pezzi. \"COME OSI!\" echeggia una voce da sotto la superficie dell'acqua. Una figura che indossa una tunica blu emerge dall'acqua, brandendo uno spazzolino da water magico. Dalla superficie del lago, inizia ad emergere biancheria sporchissima. \"Sono il Bucatomante!\" annuncia rabbioso. \"Sei davvero coraggioso - lavare i miei piatti deliziosamente sporchi, distruggere il mio servitore, ed entrare nel mio regno con abiti così puliti. Preparati a sentire la sozza furia della mia magia anti-bucato\"!", "questAtom3Completion": "Il pazzo Bucatomante è stato sconfitto! Bucato pulito si deposita a pile intorno a te. Le cose sembrano andare molto bene da queste parti. Mentre inizi a farti strada tra le armature stirate da poco, un bagliore di metallo attrae la tua attenzione, ed il tuo sguardo si posa su un elmo luccicante. Non sai chi possa aver indossato prima questo oggetto luminoso, ma mentre lo indossi, senti la calda presenza di uno spirito generoso. Un peccato che non ci abbiano cucito sopra un'etichetta col nome.", "questAtom3Boss": "Il Bucatomante", "questAtom3DropPotion": "Pozione di schiusura base", @@ -164,8 +164,8 @@ "questStressbeastBossRageBailey": "\"Abominevole Mostro dello Stress usa Colpo Stressante!\"\n\nL'accumulo di stress cura Abominevole Mostro dello Stress!\n\nAah! Le nostre Daily incomplete fanno infuriare ancora di più l'Abominevole Mostro dello Stress, che recupera punti vita! Bailey il Banditore stava ulrando ai cittadini di mettersi in salvo, e ora ha afferrato anche lui! Guardalo, mentre stoicamente riporta le notizie mentre il Mostro dello Stress lo sbatacchia quà e là... Non rendiamo vano il suo gesto eroico, dobbiamo essere il più produttivi possibile per salvare i nostri PNG!", "questStressbeastBossRageGuide": "\"Abominevole Mostro dello Stress usa Colpo Stressante!\"\n\nL'accumulo di stress cura Abominevole Mostro dello Stress!\n\nGuardate! Justin la Guida sta provando a distrarre il Mostro dello Stress, correndogli intorno e gridandogli consigli utili! L'Abominevole Mostro dello Stress pesta i piedi, si agita, ruggisce, ma ormai sembra stremato. Dubito abbia ancora la forza per un altro colpo. Non arrendiamoci, siamo vicini alla vittoria!", "questStressbeastDesperation": "L'Abominevole Mostro dello Stress arriva a 500.000 di vita! L'Abominevole Mostro dello Stress usa Difesa Disperata!\n\nCi siamo quasi, abitanti di Habitica! Con diligenza e con le Daily, abbiamo ridotto la vita dell'Abominevole Mostro dello Stress a solo 500.000! La creatura ruggisce e si dimena disperata, mentre la sua rabbia monta più velocemente che mai. Bailey e Matt urlano terrorizzati quando inizia a squoterli da una parte e dall'altra ad una velocità terrificante, sollevando un'accecante tempesta di neve che rende più difficile colpirlo.\n\nDovremo impegnarci doppiamente, ma non scoraggiamoci - questo è un segno che il Mostro dello Stress è consapevole di essere sul punto della sconfitta. Non arrendiamoci ora!", - "questStressbeastCompletion": "The Abominable Stressbeast is DEFEATED!ゴールデン・ナイトは、貧しいHabiticansのケースに乗っていました。あなたの日課を全てやりませんでしたか？悪い習慣のチェックは外しましたか？あなたがどのように彼女の例に続かなければならないかについて、あなたを悩ます理由として、彼女はこれを使います。彼女は完全なHabiticanの輝く代表例です。そして、あなたは失敗以外のなにものでもありません。さて、それはまったく素晴らしくありません！誰でも、間違いをおかします。彼らは、そのために否定的に応じられる必要はありません。おそらく、あなたが傷つくHabiticansからいくらかの証言を集めて、ゴールデン・ナイトに厳しいお説教をする時です！
", "questGoldenknight1CollectTestimony": "証言", - "questGoldenknight1DropGoldenknight2Quest": "ゴールデンナイトチェーン パート2：光沢を失った黄金(スクロール)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "黄金騎士、パート2: 黄金騎士", "questGoldenknight2Notes": "Habitca人の何百もの証言で武装して、あなたはとうとうゴールデンナイトと対決します。あなたはHabitica人の彼女への不満をひとつひとつ唱え始めます。「そして@Pfeffernusseは絶えずあなたが自慢する-」ナイトは黙って手を上げてあざ笑い「どうか。その人たちは単に私の成功をねたんでいるだけです。泣き言を言うかわりに、私のように単に一生懸命励むべきです！私のように努力で到達できる力を私はおそらくあなたに見せるべきでしょう！」彼女は彼女のモーニングスターを掲げて攻撃態勢をとります！
", "questGoldenknight2Boss": "ゴールドナイト", @@ -273,5 +273,11 @@ "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", "questSnakeBoss": "Serpent of Distraction", "questSnakeDropSnakeEgg": "Snake (Egg)", - "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market" + "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market", + "questUnicornText": "Convincing the Unicorn Queen", + "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", + "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", + "questUnicornBoss": "The Unicorn Queen", + "questUnicornDropUnicornEgg": "Unicorn (Egg)", + "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market" } \ No newline at end of file diff --git a/common/locales/ja/rebirth.json b/common/locales/ja/rebirth.json index 3a8d05a0b8..41526c49d7 100644 --- a/common/locales/ja/rebirth.json +++ b/common/locales/ja/rebirth.json @@ -23,5 +23,6 @@ "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher", "rebirthPop": "実績、グッズ、およびタスクと履歴を保持して、レベル1で新しいキャラクターを始めます。", "rebirthName": "転生のオーブ", - "reborn": "転生しました、最大レベル<%= reLevel %>" + "reborn": "転生しました、最大レベル<%= reLevel %>", + "confirmReborn": "Are you sure?" } \ No newline at end of file diff --git a/common/locales/ja/settings.json b/common/locales/ja/settings.json index a31112720b..2640cd8b3e 100644 --- a/common/locales/ja/settings.json +++ b/common/locales/ja/settings.json @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "メールから購読解除をチェックしてください", "unsubscribeAllEmailsText": "このボックスをチェックすることで、私は全てのメールを購読解除しHabiticaはサイトや私のアカウントでの重要な変更を決してメールで通知できないことを理解した事を証明します。", "correctlyUnsubscribedEmailType": "正しくCorrectly unsubscribed from \"<%= emailType %>\" emails.メールから購読解除されました。", - "subscriptionRateText": "<%= months %>ヶ月毎に繰り返し<%= price %>ドル", + "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", "benefits": "便益", "coupon": "クーポン", "couponPlaceholder": "クーポンコードを入力してください", @@ -136,7 +136,7 @@ "buyGemsGoldCap": "Cap raised to <%= amount %>", "mysticHourglass": "<%= amount %> Mystic Hourglass", "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.", - "purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)", + "purchasedPlanId": "Recurring $<%= price %> USD each <%= months %> Month(s) (<%= plan %>)", "purchasedPlanExtraMonths": "You have <%= months %> months of subscription credit.", "consecutiveSubscription": "Consecutive Subscription", "consecutiveMonths": "Consecutive Months:", diff --git a/common/locales/ja/subscriber.json b/common/locales/ja/subscriber.json index 576fd4d913..aa2f0c36e5 100644 --- a/common/locales/ja/subscriber.json +++ b/common/locales/ja/subscriber.json @@ -63,6 +63,32 @@ "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "timeTravelersAlreadyOwned": "Congratulations! You already own everything the Time Travelers currently offer. Thanks for supporting the site!", "mysticHourglassPopover": "A Mystic Hourglass allows you to purchase certain limited-time items, such as monthly Mystery Item Sets and awards from world bosses, from the past!", + "mysterySet201402": "Winged Messenger Set", + "mysterySet201403": "Forest Walker Set", + "mysterySet201404": "Twilight Butterfly Set", + "mysterySet201405": "Flame Wielder Set", + "mysterySet201406": "Octomage Set", + "mysterySet201407": "Undersea Explorer Set", + "mysterySet201408": "Sun Sorcerer Set", + "mysterySet201409": "Autumn Strider Set", + "mysterySet201410": "Winged Goblin Set", + "mysterySet201411": "Feast and Fun Set", + "mysterySet201412": "Penguin Set", + "mysterySet201501": "Starry Knight Set", + "mysterySet201502": "Winged Enchanter Set", + "mysterySet201503": "Aquamarine Set", + "mysterySet201504": "Busy Bee Set", + "mysterySet201505": "Green Knight Set", + "mysterySet201506": "Neon Snorkeler Set", + "mysterySet201507": "Rad Surfer Set", + "mysterySet201508": "Cheetah Costume Set", + "mysterySet201509": "Werewolf Set", + "mysterySet201510": "Horned Goblin Set", + "mysterySet201511": "Wood Warrior Set", + "mysterySet201512": "Winter Flame Set", + "mysterySet301404": "Steampunk Standard Set", + "mysterySet301405": "Steampunk Accessories Set", + "mysterySetwondercon": "Wondercon", "subUpdateCard": "クレジットカード情報を変更する", "subUpdateTitle": "更新", "subUpdateDescription": "支払いに使用するクレジットカード情報を変更する", diff --git a/common/locales/ja/tasks.json b/common/locales/ja/tasks.json index 74c182220b..7990086692 100644 --- a/common/locales/ja/tasks.json +++ b/common/locales/ja/tasks.json @@ -5,6 +5,7 @@ "beeminderDeleteWarning": "Beeminder ユーザー: はじめに お読みください Beeminderと混同せずに、完了したやるべきことを削除するには!", "addmultiple": "複数追加", "addsingle": "一つ追加", + "habit": "Habit", "habits": "習慣タスク", "newHabit": "新しいタスク", "newHabitBulk": "新しい習慣(一行に一つ)", @@ -32,6 +33,7 @@ "mental": "精神的な", "otherExamples": "例：専門職、趣味、金融関係など", "progress": "進捗", + "daily": "Daily", "dailies": "日課", "newDaily": "新しい日課", "newDailyBulk": "新しい日課(一行に一つ)", @@ -46,6 +48,7 @@ "day": "日", "days": "日", "restoreStreak": "連続日数を修正", + "todo": "To-Do", "todos": "やるべきことタスク", "newTodo": "新しいやるべきことタスク", "newTodoBulk": "新しいToDo(一行に一つ)", @@ -57,6 +60,7 @@ "notDue": "期限が設定されていません", "grey": "無効", "score": "スコア", + "reward": "Reward", "rewards": "報酬", "ingamerewards": "装備&特技", "gold": "ゴールド", @@ -86,7 +90,8 @@ "fortifyPop": "全てのタスクを通常の状態 (黄色)に戻します。加えて全ての体力を回復させます。", "fortify": "強化", "fortifyText": "Fortify will return all your tasks to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", - "sureDelete": "本当にこのタスクを削除しても良いですか？", + "confirmFortify": "Are you sure?", + "sureDelete": "Are you sure you want to delete the <%= taskType %> with the text \"<%= taskText %>\"?", "streakCoins": "連続実行ボーナス！", "pushTaskToTop": "Push task to top. Hold ctrl or cmd to push to bottom.", "emptyTask": "タスクのタイトルをまず入力してください。", diff --git a/common/locales/nl/backgrounds.json b/common/locales/nl/backgrounds.json index 3d7cdfb63a..e948ee0d3d 100644 --- a/common/locales/nl/backgrounds.json +++ b/common/locales/nl/backgrounds.json @@ -126,11 +126,11 @@ "backgroundNightDunesNotes": "Maak een vredige wandeling door de nachtduinen.", "backgroundSunsetOasisText": "Oase bij zonsondergang", "backgroundSunsetOasisNotes": "Baadt in de ondergaande oasezon.", - "backgrounds122015": "SET 19: Released December 2015", - "backgroundAlpineSlopesText": "Alpine Slopes", - "backgroundAlpineSlopesNotes": "Ski on the Alpine Slopes.", - "backgroundSnowySunriseText": "Snowy Sunrise", - "backgroundSnowySunriseNotes": "Gaze at the Snowy Sunrise.", - "backgroundWinterTownText": "Winter Town", - "backgroundWinterTownNotes": "Bustle through a Winter Town." + "backgrounds122015": "SET 19: Uitgebracht in december 2015", + "backgroundAlpineSlopesText": "Berghellingen", + "backgroundAlpineSlopesNotes": "Ski op de berghellingen", + "backgroundSnowySunriseText": "Besneeuwde zonsopkomst", + "backgroundSnowySunriseNotes": "Staar naar de besneeuwde zonsopkomst.", + "backgroundWinterTownText": "Winterdorp", + "backgroundWinterTownNotes": "Geroezemoes door een winterdorp." } \ No newline at end of file diff --git a/common/locales/nl/communityguidelines.json b/common/locales/nl/communityguidelines.json index af575ed6a5..84dc045c90 100644 --- a/common/locales/nl/communityguidelines.json +++ b/common/locales/nl/communityguidelines.json @@ -48,7 +48,7 @@ "commGuidePara022": "De herberg is de belangrijkste plek waar Habiticanen samen kunnen komen. Daniël de Barman houdt zijn établissement brandschoon, en Lemoness tovert graag wat limonade voor je tevoorschijn terwijl je ergens een plekje zoekt om te zitten praten. Onthoud echter wel...", "commGuidePara023": "Er wordt vaak ongedwongen gekletst en er worden productiviteits- of zelfverbeteringstips uitgewisseld.", "commGuidePara024": "Omdat de herbergchat maar 200 berichten kan onthouden is het geen goede plek voor langere gesprekken over één onderwerp, vooral niet over gevoelige onderwerpen (zoals politiek, religies, depressie, het wel of niet verbieden van de aardmanjacht, enz.). Deze gesprekken moeten in de daarvoor geschikte gildes gevoerd worden of in de Back Corner (meer informatie hieronder).", - "commGuidePara027": "Bespreek geen verslavende middelen in de herberg. Veel mensen gebruiken Habitica om van hun slechte gewoontes af te komen. Gesprekken over verslavende of illegale middelen maakt dit wellicht veel moeilijker! Toon respect voor je mede-Herberggasten en houd hier rekening mee. Hieronder valt: roken, alcohol, pornografie, gokken en drugsgebruik en -misbruik, en meer.", + "commGuidePara027": "Bespreek geen verslavende middelen in de herberg. Veel mensen gebruiken Habitica om van hun slechte gewoontes af te komen. Gesprekken over verslavende of illegale middelen maakt dit wellicht veel moeilijker voor ze! Toon respect voor je mede-Herberggasten en houd hier rekening mee. Hieronder vallen onder andere: roken, alcohol, pornografie, gokken en drugsgebruik en -misbruik.", "commGuideHeadingPublicGuilds": "Openbare gildes", "commGuidePara029": "Openbare gildes lijken op de herberg, behalve dat ze een eigen thema hebben en niet zo gericht zijn op algemene gesprekken. Openbare chat in de gildes moet dit thema in het oog houden. Leden van het Wordsmith-gilde vinden het waarschijnlijk niet leuk als het gesprek opeens over tuinieren gaat in plaats van over schrijven, en een Drakenfokkersgilde is misschien niet geïnteresseerd in het ontcijferen van oeroude runen. Sommige gilden zijn hier minder streng in dan anderen, maar over het algemeen geldt: houd je aan het onderwerp!", "commGuidePara031": "Sommige openbare gildes bespreken gevoelige onderwerpen zoals depressie, religie, politiek, enz. Dit is prima, zolang de gesprekken in het gilde de algemene voorwaarden of richtlijnen voor openbare ruimtes niet overtreden, en zolang ze over het onderwerp blijven gaan.", @@ -68,11 +68,11 @@ "commGuideList03E": "Het Wiki Board om materiaal voor de wiki aan te vragen, te verbeteren en te bespreken.", "commGuidePara042": "Ze hebben allemaal hun eigen richtlijnen, en ook de richtlijnen voor openbare ruimtes zijn van toepassing. Gebruikers moeten proberen zich aan het onderwerp te houden in de boards en cards. Geloof ons maar, de boards zijn al druk genoeg! Langere discussies moeten naar het Back Corner-gilde verplaatst worden.", "commGuideHeadingGitHub": "GitHub", - "commGuidePara043": "Habitica gebruikt GitHub om bugs bij te houden en bijdrages te leveren aan de programmacode. Dat is de smidse waar onze onvermoeibare Blacksmiths de functionaliteiten smeden! Alle regels voor openbare ruimtes zijn van toepassing. Wees beleefd tegen de Blacksmiths - ze hebben er een hele kluif aan om de site in de lucht te houden. Hoera voor de Blacksmiths!", + "commGuidePara043": "Habitica gebruikt GitHub om bugs bij te houden en bijdrages te leveren aan de programmacode. Het is de smidse waar onze onvermoeibare \"Blacksmiths\" de functionaliteiten smeden! Alle regels voor openbare ruimtes zijn van toepassing. Wees beleefd tegen de Blacksmiths - ze hebben er een hele kluif aan om de site in de lucht te houden. Hoera voor de Blacksmiths!", "commGuidePara044": "De volgende gebruikers zijn leden van de Habitica-repo:", "commGuideHeadingWiki": "Wiki", "commGuidePara045": "De Habitica-wiki verzamelt informatie over de website. Zij host ook een paar fora, vergelijkbaar met de gildes in Habitica. Daarom zijn alle regels voor openbare ruimtes daar ook van toepassing.", - "commGuidePara046": "De Habitica-wiki kan beschouwd worden als een database voor alles wat met Habitica te maken heeft. Er zijn artikelen over de functionaliteiten van de site, spelhandleidingen, tips voor hoe je kunt bijdragen aan Habitica en plekken waar je je gilde of groep kunt aanprijzen of kunt stemmen over bepaalde onderwerpen", + "commGuidePara046": "De Habitica-wiki kan beschouwd worden als een database voor alles wat met Habitica te maken heeft. Er zijn artikelen over de functionaliteiten van de site, spelhandleidingen, tips over hoe je kunt bijdragen aan Habitica en plekken waar je je gilde of groep kunt aanprijzen en kunt stemmen over bepaalde onderwerpen.", "commGuidePara047": "Omdat de wiki gehost wordt door Wikia, zijn naast de regels die door Habitica en de Habitica-wiki vastgesteld zijn, ook de algemene voorwaarden van Wikia van toepassing.", "commGuidePara048": "De wiki is een samenwerking tussen alle redacteurs, dus er zijn enkele aanvullende richtlijnen van toepassing:", "commGuideList04A": "Vraag nieuwe pagina's of grote veranderingen aan op het Wiki Trello-board", @@ -101,7 +101,7 @@ "commGuideHeadingModerateInfractions": "Gematigde overtredingen", "commGuidePara054": "Gematigde overtredingen zorgen er niet voor dat onze gemeenschap onveilig wordt, maar ze maken hem wel onprettig. Deze overtredingen hebben gematigde gevolgen. Vooral na meerdere overtredingen kunnen de gevolgen ernstiger worden.", "commGuidePara055": "Hieronder volgen enkele voorbeelden van gematigde overtredingen. Dit is geen complete lijst.", - "commGuideList06A": "Een moderator negeren of respectloos behandelen. Hieronder valt in het openbaar klagen over moderators of andere gebruikers en in het openbaar verheerlijken of verdedigen van gebruikers die geroyeerd zijn. Als je je zorgen maakt over één van de regels of moderators, neem dan contact op met Lemoness door een e-mail te sturen naar (leslie@habitica.com).", + "commGuideList06A": "Een moderator negeren of respectloos behandelen. Hieronder valt in het openbaar klagen over moderators of andere gebruikers en in het openbaar verheerlijken of verdedigen van gebruikers die geroyeerd zijn. Als je je zorgen maakt over een van de regels of moderators, neem dan contact op met Lemoness door een e-mail te sturen naar (leslie@habitica.com).", "commGuideList06B": "Beheerderstaken overnemen. Om even duidelijk te zijn: het is prima om iemand vriendelijk aan de regels te herinneren. Beheerderstaken overnemen houdt in dat je vertelt, eist of sterk impliceert dat iemand een fout moet corrigeren door te doen wat jij zegt. Het is prima om mensen erop te wijzen dat ze een overtreding begaan, maar vertel ze niet wat ze moeten doen. \"Dat je het weet, scheldwoorden gebruiken in de herberg wordt afgeraden, dus misschien wil je dat verwijderen\" is beter dan \"Ik moet je vragen om dat bericht te verwijderen.\"", "commGuideList06C": "Herhaalde overtreding van de richtlijnen voor openbare ruimtes", "commGuideList06D": "Herhaalde kleine overtredingen", diff --git a/common/locales/nl/content.json b/common/locales/nl/content.json index d04707b33c..026c3dee6d 100644 --- a/common/locales/nl/content.json +++ b/common/locales/nl/content.json @@ -101,6 +101,9 @@ "questEggSnakeText": "Slang", "questEggSnakeMountText": "Slang", "questEggSnakeAdjective": "een slissende", + "questEggUnicornText": "Eenhoorn", + "questEggUnicornMountText": "Gevleugelde eenhoorn", + "questEggUnicornAdjective": "een magisch", "eggNotes": "Vind een uitbroedtoverdrank om over dit ei te gieten en er zal een <%= eggAdjective(locale) %> <%= eggText(locale) %> uitkomen.", "hatchingPotionBase": "Normale", "hatchingPotionWhite": "Witte", @@ -113,6 +116,7 @@ "hatchingPotionCottonCandyBlue": "Suikerspinblauwe", "hatchingPotionGolden": "Gouden", "hatchingPotionSpooky": "spookachtige", + "hatchingPotionPeppermint": "Pepermunt", "hatchingPotionNotes": "Giet dit over een ei, en er zal een <%= potText(locale) %> dierlijke metgezel uitkomen.", "premiumPotionAddlNotes": "Niet te gebruiken op eieren van queeste-huisdieren.", "foodMeat": "Vlees", diff --git a/common/locales/nl/faq.json b/common/locales/nl/faq.json index 8cb683fd76..e281d5a1e5 100644 --- a/common/locales/nl/faq.json +++ b/common/locales/nl/faq.json @@ -2,7 +2,7 @@ "frequentlyAskedQuestions": "Veelgestelde vragen", "faqQuestion0": "Ik ben in de war. Waar kan ik een overzicht vinden? ", "iosFaqAnswer0": "Allereerst zet je de taken op die je in je dagelijkse leven wil doen. Vervolgens, als je de taken volbrengt en afvinkt, verdien je ervaring en goud. Goud wordt gebruikt om uitrusting en sommige voorwerpen te kopen, evenals voor persoonlijke beloningen. Ervaring zorgt ervoor dat je karakter omhoog gaat in niveau en dat je spelinhoud als huisdieren, vaardigheden en queesten vrijspeelt! Je kunt je karakter aanpassen onder Menu > Avatar aanpassen.\n\nWat simpele dingen om te beginnen: klik op de (+) in de rechterbovenhoek om een nieuwe taak toe te voegen. Tik op een bestaande taak om hem aan te passen en veeg hem naar links om de taak te verwijderen. Je kunt taken sorteren door labels te gebruiken in de linkerbovenhoek en checklists in- en uitklappen door op het checklist-bolletje te klikken.", - "webFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn Experience and Gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as pets, skills, and quests! For more detail, check out a step-by-step overview of the game at [Help -> Overview for New Users](https://habitica.com/static/overview).", + "webFaqAnswer0": "Allereerst creëer je de taken die je in je dagelijkse leven wil voltooien. Door vervolgens de taken te voltooien in het echte leven en deze af te vinken, verdien je ervaringspunten en goud. Goud wordt gebruikt om uitrusting en sommige voorwerpen te kopen, evenals voor je persoonlijke beloningen. Ervaring zorgt ervoor dat je karakter omhoog gaat in speelniveau en dat je spelinhoud als huisdieren, vaardigheden en queesten vrijspeelt! Voor meer informatie kan je de de stap-voor-stap uitleg van het spel lezen op [Help -> Overview for New Users](https://habitica.com/static/overview).", "faqQuestion1": "Hoe stel ik mijn taken in?", "iosFaqAnswer1": "Goede gewoonten (degenen met een +) zijn taken die je meerdere keren per dag kunt doen, zoals groenten eten. Slechte gewoonten (degenen met een -) zijn taken die je zou moeten nalaten, zoals op je nagels bijten. Gewoonten met een + en een - hebben een goede en een slechte keuze, bijvoorbeeld de trap nemen tegenover de lift nemen. Goede gewoonten belonen je met ervaring en goud. Slechte gewoonten doen je levenspunten verliezen.\n\nDagelijkse taken zijn taken die je iedere dag moet doen, zoals je tanden poetsen of je e-mail bekijken. Je kunt de dagen aanpassen waarop je een bepaalde dagelijkse taak moet doen door erop te drukken en hem te bewerken. Als je een dagelijkse taak overslaat op een dag dat hij gedaan moet worden, zal je avatar gedurende de nacht schade oplopen. Wees voorzichtig en voeg niet teveel dagelijkse taken tegelijk toe!\n\nTo-do's zijn de dingen die je nog een keer moet doen. Een to-do afvinken levert geld en ervaringspunten op. Je kunt nooit levenspunten kwijtraken door een to-do. Je kunt een geplande voltooiingsdatum toevoegen aan een to-do door er op te tikken om hem aan te passen.", "webFaqAnswer1": "Goede gewoonten (degenen met een ) zijn taken die je meerdere keren per dag kunt doen, zoals groenten eten. Slechte gewoonten (degenen met een ) zijn taken die je zou moeten nalaten, zoals op je nagels bijten. Gewoonten met een en een hebben een goede en een slechte keuze, bijvoorbeeld de trap nemen tegenover de lift nemen. Goede gewoonten belonen je met ervaring en goud. Slechte gewoonten doen je levenspunten verliezen.\nEen verschrikkelijke aandoening heeft de Habaticanen getroffen. Slechte gewoontes, lang dood gewaand, zijn herrezen, en met wraak. Afwas blijft onafgewassen, leerboeken blijven ongelezen en uitstelgedrag viert hoogtij!
Jij volgt enkele van je eigen terugkerende slechte gewoontes de Moerassen van Stagnatie in en ontdekt de dader: de spookachtige dodenbezweerder Recidive. Je rent eropaf en zwaait met je wapens, maar ze glijden zinloos door de geestverschijning heen.
\"Doe geen moeite\", sist ze met een droge raspende stem. \"Zonder een ketting van maanstenen kan niks me schaden - en meesterjuwelier @aurakami heeft lang geleden alle maanstenen over heel Habatica verpreid!\" Hijgend trek je je terug... maar je weet wat je te doen staat.
", + "questMoonstone1Notes": "Een verschrikkelijke aandoening heeft de Habaticanen getroffen. Slechte gewoontes, lang dood gewaand, zijn herrezen, en met wraak. Afwas blijft onafgewassen, leerboeken blijven ongelezen en uitstelgedrag viert hoogtij!
Jij volgt enkele van je eigen terugkerende slechte gewoontes de Moerassen van Stagnatie in en ontdekt de dader: de spookachtige dodenbezweerder Recidive. Je rent eropaf en zwaait met je wapens, maar ze glijden zinloos door de geestverschijning heen.
\"Doe geen moeite\", sist ze met een droge raspende stem. \"Zonder een ketting van maanstenen kan niks me schaden - en meesterjuwelier @aurakami heeft lang geleden alle maanstenen over heel Habitica verpreid!\" Hijgend trek je je terug... maar je weet wat je te doen staat.
", "questMoonstone1CollectMoonstone": "Maanstenen", "questMoonstone1DropMoonstone2Quest": "De Maanstenen Ketting deel 2: Recidive de Dodenbezweerder (perkamentrol)", "questMoonstone2Text": "De Maanstenen Ketting, deel 2: Recidive de Dodenbezweerder", @@ -90,7 +90,7 @@ "questGoldenknight1Text": "De Gouden Ridder, deel 1: Een Strenge Berisping", "questGoldenknight1Notes": "De Gouden Ridder is Habiticanen lastig aan het vallen. Niet al je Dagelijke Taken gedaan? Een negatieve Gewoonte afgevinkt? Allemaal redenen voor haar om je te vermanen dat je meer haar voorbeeld moet volgen. Zij is het schoolvoorbeeld van de perfecte Habiticaan, en jij bent maar een mislukkeling. Nou, dat is helemaal niet aardig! Iedereen maakt fouten. En ze moeten daarvoor niet zo'n lading negativiteit over zich heen krijgen. Misschien is het tijd om wat getuigenissen te verzamelen van gekwetste Habiticanen, en de Gouden Ridder een strenge berisping te geven!
", "questGoldenknight1CollectTestimony": "Getuigenissen", - "questGoldenknight1DropGoldenknight2Quest": "De Gouden Ridder-serie deel 2: Aangetast Goud (perkamentrol)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "De Gouden Ridder, deel 2: Gouden Ridder", "questGoldenknight2Notes": "Gewapend met honderden getuigenverklaringen van Habiticanen zoek je eindelijk de confrontatie op met de Gouden Ridder. Je begint één voor één de klachten van de Habiticanen op te noemen. \"En @Pfeffernusse vindt dat je constante opschepperij-\" De ridder heft haar hand om je tot stilte te manen en hoont, \"Hou op, die mensen zijn gewoon jaloers op mijn succes. Ze zouden minder moeten zeuren en gewoon net zo hard moeten werken als ik! Misschien moet ik je laten zien hoeveel macht je kunt verzamelen door zo ijverig te zijn als ik!\" Ze heft haar morgenster en bereidt zich voor je aan te vallen!
", "questGoldenknight2Boss": "Gouden Ridder", @@ -251,7 +251,7 @@ "questHorseDropHorseEgg": "Paard (ei)", "questHorseUnlockText": "Maakt het kopen van paardeneieren in de markt mogelijk", "questBurnoutText": "Burnout en de Ontladingsgeesten", - "questBurnoutNotes": "Het is ver na middernacht, kalm en verstikkend heet, wanneer Redphoenix en kapitein der verkenners Kiwibot plots door de stadspoorten komen gerend. 'We moeten alle houten gebouwen evacueren!' roept Redphoenix. 'Opschieten!'Złoty Rycerz lustruje biednych Habitan. Nie zrobiłeś wszystkich Codziennych? Odhaczyłeś negatywny Nawyk? To dla niej pretekst, by cię gnębić opowiadaniem jak to powinieneś podążać za jej przykładem. Jest wzorem idealnego Habitanina, a ty tylko wielką porażką. Cóż, to wcale nie jest miłe! Każdy popełnia błędy. Nie powinno się nikogo przez to aż tak piętnować. Chyba już czas zebrać zeznania od urażonych Habitan i dać Złotemu Rycerzowi srogą reprymendę!
", "questGoldenknight1CollectTestimony": "Zeznania", - "questGoldenknight1DropGoldenknight2Quest": "Seria Złoty Rycerz część 2: Złoto bez blasku (zwój)", + "questGoldenknight1DropGoldenknight2Quest": "Złoty Rycerz, część 2: Złoty Rycerz (zwój)", "questGoldenknight2Text": "Złoty Rycerz, część 2: Złoty Rycerz", "questGoldenknight2Notes": "Uzbrojeni w setki zeznań Habitan, stajecie przed Złotym Rycerzem. Zaczynacie odczytywać przed nią zażalenia Habitan, jedno po drugim. \"Zaś @Pfeffernusse mówi, że twoje ciągłe przechwałki...\" Rycerz unosi dłoń, by cię uciszyć i prycha. \"Błagam, ci ludzie są po prostu zazdrośni o moje sukcesy. Zamiast narzekać, powinni pracować równie ciężko, jak ja! Lepiej pokażę wam moc, którą można osiągnąć przez pracowitość równą mojej!\" Wznosi swój morgensztern i przygotowuje się do ataku!
", "questGoldenknight2Boss": "Złoty Rycerz", @@ -239,8 +239,8 @@ "questDilatoryDistress3DropWeapon": "Trójząb miażdżących fal (broń)", "questDilatoryDistress3DropShield": "Tarcza z księżycowych pereł (tarcza)", "questCheetahText": "Taki gepard", - "questCheetahNotes": "As you hike across the Sloensteadi Savannah with your friends @PainterProphet, @tivaquinn, @Unruly Hyena, and @Crawford, you're startled to see a Cheetah screeching past with a new Habitican clamped in its jaws. Under the Cheetah's scorching paws, tasks burn away as though complete -- before anyone has the chance to actually finish them! The Habitican sees you and yells, \"Please help me! This Cheetah is making me level too quickly, but I'm not getting anything done. I want to slow down and enjoy the game. Make it stop!\" You fondly remember your own fledgling days, and know that you have to help the newbie by stopping the Cheetah!", - "questCheetahCompletion": "The new Habitican is breathing heavily after the wild ride, but thanks you and your friends for your help. \"I'm glad that Cheetah won't be able to grab anyone else. It did leave some Cheetah eggs for us, so maybe we can raise them into more trustworthy pets!\"", + "questCheetahNotes": "Ty i Twoi przyjaciele, @PainterProphet, @tivaquinn, @Unruly Hyena i @Crawford, jadąc przez sawannę Sloensteadi, stajecie jak wryci na widok Geparda mknącego ze świstem, zaciskającego szczęki na nowym Habitaninie. Zadania zdają się palić od pędu gepardzich łap, tak że wydają się wykonane, ale tak naprawdę nikt nie ma szans zdążyć faktycznie się za nie zabrać! Nowy spostrzega Was i krzyczy: \n- Proszę, ratujcie! Ten gepard zabiera mnie na kolejne poziomy za wcześnie i nie nadążam ze zrobieniem czegokolwiek. Zatrzymajcie go!\nCzule wspominacie swoje początki w Habitice i wiecie, że musicie pomóc nowicjuszowi! ", + "questCheetahCompletion": "Nowy Habitanin, oddychając ciężko po dzikiej jeździe, dziękuje Tobie i Twoim przyjaciołom za Waszą pomoc.\n- Cieszę się, że gepard już nikogo nie złapie. Zostawił nam trochę jaj, więc mamy szanse wyhodować gepardy bardziej godne zaufania! ", "questCheetahBoss": "Gepard", "questCheetahDropCheetahEgg": "Gepard (jajo)", "questCheetahUnlockText": "Odblokowuje dostęp do kupna gepardzich jaj na Targu", @@ -273,5 +273,11 @@ "questSnakeCompletion": "Z pomocą zaklinaczy wygnaliście Węża Rozproszenia. Cieszysz się, że pomogłeś mieszkańcom Wydm, jednak jest ci smutno z powodu pokonanego przeciwnika. Podczas gdy podziwiasz widoki, podchodzi do ciebie @LordDarkly. \"Dziękuję! To może nie jest wiele, ale mam nadzieję, że wystarczająco wyraża naszą wdzięczność.\" Wręcza ci trochę złota i... kilka jaj węża! Ostatecznie zobaczysz znowu to wspaniałe zwierzę.", "questSnakeBoss": "Wąż rozproszenia", "questSnakeDropSnakeEgg": "Wąż (jajo)", - "questSnakeUnlockText": "Odblokowuje dostęp do kupna jaj Węża na Targu" + "questSnakeUnlockText": "Odblokowuje dostęp do kupna jaj Węża na Targu", + "questUnicornText": "Przekonywanie królowej jednorożców", + "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", + "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", + "questUnicornBoss": "Królowa jednorożców", + "questUnicornDropUnicornEgg": "Jednorożec (jajo)", + "questUnicornUnlockText": "Odblokowuje możliwość kupna jaj jednorożca na Targu" } \ No newline at end of file diff --git a/common/locales/pl/rebirth.json b/common/locales/pl/rebirth.json index 104e55f842..a49afde1f5 100644 --- a/common/locales/pl/rebirth.json +++ b/common/locales/pl/rebirth.json @@ -23,5 +23,6 @@ "rebirthOrb100": "Wykorzystano Kulę Odrodzenia aby rozpocząć grę od nowa po osiągnięciu Poziomu 100 lub większego", "rebirthPop": "Stwórz nową postać na Poziomie 1 zachowując osiągnięcia, przedmioty kolekcjonerskie oraz zadania wraz z historią.", "rebirthName": "Kula Odrodzenia", - "reborn": "Odrodzony, najwyższy poziom <%= reLevel %>" + "reborn": "Odrodzony, najwyższy poziom <%= reLevel %>", + "confirmReborn": "Na pewno?" } \ No newline at end of file diff --git a/common/locales/pl/settings.json b/common/locales/pl/settings.json index 557a083a3a..e0342f6617 100644 --- a/common/locales/pl/settings.json +++ b/common/locales/pl/settings.json @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "Zaznacz by zrezygnować z subskrypcji e-maili", "unsubscribeAllEmailsText": "Przez zaznaczenie tego pola poświadczam, że rozumiem że po zrezygnowaniu z subskrypcji wszystkich e-maili, Habitica nie będzie w stanie powiadamiać mnie przez e-mail o ważnych zmianach na stronie lub na moim koncie.", "correctlyUnsubscribedEmailType": "Poprawnie zrezygnowano z subskrypcji e-maili \"<%= emailType %>\".", - "subscriptionRateText": "<%= price %> dolarów będzie ściągane z konta co każde <%= months %> miesięcy.", + "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", "benefits": "Korzyści", "coupon": "Kupon", "couponPlaceholder": "Podaj kod z kuponu", @@ -129,14 +129,14 @@ "generateCodes": "Generuj kody", "generate": "Generuj", "getCodes": "Zdobądź kody", - "webhooks": "Webhooks", + "webhooks": "Webhooki", "enabled": "Włączone", - "webhookURL": "Webhook URL", + "webhookURL": "Link do webhooka", "add": "Dodaj", "buyGemsGoldCap": "Limit podniesiony do <%= amount %>", "mysticHourglass": "<%= amount %> Mistyczne Klepsydry", "mysticHourglassText": "Mistyczna Klepsydra pozwala na zakup Zestawów tajemniczych przedmiotów z poprzednich miesięcy.", - "purchasedPlanId": "<%= price %> dolarów będzie pobierane z konta co każde <%= months %> miesięcy (<%= plan %>)", + "purchasedPlanId": "Recurring $<%= price %> USD each <%= months %> Month(s) (<%= plan %>)", "purchasedPlanExtraMonths": "Posiadasz <%= months %> miesięcy kredytu abonenckiego.", "consecutiveSubscription": "Ciągłość abonamentu", "consecutiveMonths": "Ilość miesięcy z rzędu:", @@ -144,7 +144,7 @@ "mysticHourglasses": "Mistyczne Klepsydry:", "paypal": "PayPal", "amazonPayments": "Płatności Amazon", - "timezone": "Time Zone", + "timezone": "Strefa czasowa", "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <%= utc %>", "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.A Cavaleira Dourada tem pego no pé dos pobres Habiticanos. Não fez todas as suas tarefas diárias? Checou um hábito negativo? Ela irá usar isso como motivo para atormentá-lo sobre como você deveria seguir seu exemplo. Ela é o exemplo ilustre de um perfeito Habiticano, e você não é nada mais que um fracassado. Bem, isso não é nada gentil! Todo mundo comete erros. Eles não deveriam ter de lidar com tamanha negatividade por causa disso. Talvez seja hora de reunir alguns depoimentos de Habiticanos atingidos e dar à Cavaleira Dourada a bronca que ela merece!
", "questGoldenknight1CollectTestimony": "Testemunhos", - "questGoldenknight1DropGoldenknight2Quest": "Arco da Cavaleira Dourada, Parte 2: Ouro Deslustrado (Pergaminho)", + "questGoldenknight1DropGoldenknight2Quest": "A Corrente do Cavaleiro Dourado Parte 2: Cavaleiro Dourado (Pergaminho)", "questGoldenknight2Text": "A Cavaleira Dourada, Parte 2: Cavaleira Dourada", "questGoldenknight2Notes": "Armado de centenas de testemunhos de habiticanos você finalmente confronta a Cavaleira Dourada. Você começa a ler as reclamações dos habiticanos, uma a uma: \"E @Pfeffernusse disse que sua vanglória constante...\" A cavaleira levanta sua mão para te silenciar e zomba: \"Por favor, essas pessoas estão claramente com inveja do meu sucesso. Ao invés de se queixar elas deveriam simplesmente trabalhar tão duro quanto eu! Talvez eu deva lhe mostrar o poder que você pode obter através de uma diligência como a minha!\" Ela levanta sua Maça-Estrela e se prepara para atacar você!
", "questGoldenknight2Boss": "Cavaleira Dourada", @@ -253,7 +253,7 @@ "questBurnoutText": "Queimadura e os Espíritos Exaustos", "questBurnoutNotes": "Passou da meia-noite, mas o calor ainda queima quando Redphoenix e a capitã dos escoteiros, Kiwibot, entram abruptamente pelos portões da cidade. \"Precisamos evacuar todas as construções de madeira\", grita Redphoenix. \"Rápido!\"The Golden Knight has been getting on poor Habiticans' cases. Didn't do all of your Dailies? Checked off a negative Habit? She will use this as a reason to harass you about how you should follow her example. She is the shining example of a perfect Habitican, and you are naught but a failure. Well, that is not nice at all! Everyone makes mistakes. They should not have to be met with such negativity for it. Perhaps it is time you gather some testimonies from hurt Habiticans and give the Golden Knight a stern talking-to!
", "questGoldenknight1CollectTestimony": "Testimonies", - "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Tarnished Gold (Scroll)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "The Golden Knight, Part 2: Gold Knight", "questGoldenknight2Notes": "Armed with hundreds of Habitican's testimonies, you finally confront the Golden Knight. You begin to recite the Habitcan's complaints to her, one by one. \"And @Pfeffernusse says that your constant bragging-\" The knight raises her hand to silence you and scoffs, \"Please, these people are merely jealous of my success. Instead of complaining, they should simply work as hard as I! Perhaps I shall show you the power you can attain through diligence such as mine!\" She raises her morningstar and prepares to attack you!
", "questGoldenknight2Boss": "Gold Knight", @@ -273,5 +273,11 @@ "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", "questSnakeBoss": "Serpent of Distraction", "questSnakeDropSnakeEgg": "Snake (Egg)", - "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market" + "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market", + "questUnicornText": "Convincing the Unicorn Queen", + "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", + "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", + "questUnicornBoss": "The Unicorn Queen", + "questUnicornDropUnicornEgg": "Unicorn (Egg)", + "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market" } \ No newline at end of file diff --git a/common/locales/ro/rebirth.json b/common/locales/ro/rebirth.json index a4d11a2a03..bc043766c4 100644 --- a/common/locales/ro/rebirth.json +++ b/common/locales/ro/rebirth.json @@ -23,5 +23,6 @@ "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher", "rebirthPop": "Începe un nou personaj la Nivelul 1 păstrând realizările, obiectele de colecție și țelurile cu istoric.", "rebirthName": "Globul Renașterii", - "reborn": "Renăscut, nivel maxim <%= reLevel %>" + "reborn": "Renăscut, nivel maxim <%= reLevel %>", + "confirmReborn": "Are you sure?" } \ No newline at end of file diff --git a/common/locales/ro/settings.json b/common/locales/ro/settings.json index 13b8cf0bfa..1d9dc3e018 100644 --- a/common/locales/ro/settings.json +++ b/common/locales/ro/settings.json @@ -2,24 +2,24 @@ "settings": "Setări", "language": "Limbă", "americanEnglishGovern": "În cazul unei neînțelegeri în textul traducerii, versiunea originală Engleza Americană prevalează.", - "helpWithTranslation": "Would you like to help with the translation of Habitica? Great! Then visit this Trello card.", + "helpWithTranslation": "Dorești să ajuți la traducerea Habitica? Grozav! Vizitează acest card Trello.", "showHeaderPop": "Arată avatarul tău, nivelul de Sănătate/Experiență și echipa.", "stickyHeader": "Antet lipit", "stickyHeaderPop": "Lipește antetul în partea de sus a ecranului. Lăsând această opțiune nebifată, antetul se va ascunde.", "newTaskEdit": "Deschide tabelul de modificări pentru țelurile noi", "newTaskEditPop": "Cu această opțiune activată, țelurile noi vor fi imediat deschise și vei putea adăuga detalii cum ar fi note sau etichete.", - "dailyDueDefaultView": "Setează pe \"scadente\" implicit cotidienele", - "dailyDueDefaultViewPop": "Cu această setare, cotidienele vor fi implicit \"scadente\" în loc de \"toate\"", - "startCollapsed": "Lista de etichete ale țelurilor e ascunsă", - "startCollapsedPop": "Cu această opțiune activată, lista de etichete a unui țel va fi ascunsă atunci când deschizi o sarcină pentru modificare.", + "dailyDueDefaultView": "Setează pe „scadente” implicit cotidienele", + "dailyDueDefaultViewPop": "Cu această setare, cotidienele vor fi implicit „scadente” în loc de „toate”", + "startCollapsed": "Lista de etichete cu țeluri pornește colapsat.", + "startCollapsedPop": "Cu această opțiune activată, lista de etichete a unui țel va fi ascunsă atunci când deschizi o sarcină pentru modificare prima dată.", "startAdvCollapsed": "Opțiunile avansate ale țelurilor sunt ascunse", "startAdvCollapsedPop": "Cu această opțiune activată, Opțiunile Avansate vor fi ascunse atunci când deschizi pentru prima oară un țel pentru modificare.", - "dontShowAgain": "Don't show this again", - "suppressLevelUpModal": "Don't show popup when gaining a level", - "suppressHatchPetModal": "Don't show popup when hatching a pet", - "suppressRaisePetModal": "Don't show popup when raising a pet into a mount", - "suppressStreakModal": "Don't show popup when attaining a Streak achievement", - "showTour": "Arată Tur de prezentare", + "dontShowAgain": "Nu mai arăta asta din nou", + "suppressLevelUpModal": "Nu arăta popup-ul la câștigarea unui nivel", + "suppressHatchPetModal": "Nu arăta popup-ul la eclozarea unui companion", + "suppressRaisePetModal": "Nu arăta un popul la transformarea unui companion în bidiviu", + "suppressStreakModal": "Nu arăta popup la obținerea realizării unei serii neîntrerupte", + "showTour": "Arată turul de prezentare", "restartTour": "Repornește turul introductiv prezentat când ai intrat prima oară în Habitica.", "showBailey": "Arat-o pe Bailey", "showBaileyPop": "Cheam-o pe Bailey Crainica afară din ascunziș pentru a revedea știrile vechi.", @@ -44,9 +44,9 @@ "xml": "(XML)", "json": "(JSON)", "customDayStart": "Când începe ziua", - "changeCustomDayStart": "Change Custom Day Start?", - "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?", - "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!", + "changeCustomDayStart": "Dorești schimbarea orei de început a zilei?", + "sureChangeCustomDayStart": "Sigur dorești schimbarea orei de început a zilei?", + "nextCron": "Sarcinile tale zilnice se vor reseta prima dată când folosești Habitica după ora <%= time %>. Ai grijă să completezi sarcinile zilnice înainte de această oră!", "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.", "misc": "Altele", "showHeader": "Arată antet", @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "Check to Unsubscribe from Emails", "unsubscribeAllEmailsText": "By checking this box, I certify that I understand that by unsubscribing from all emails, Habitica will never be able to notify me via email about important changes to the site or my account.", "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.", - "subscriptionRateText": "Recurring $<%= price %> every <%= months %> months", + "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", "benefits": "Benefits", "coupon": "Coupon", "couponPlaceholder": "Enter Coupon Code", @@ -136,7 +136,7 @@ "buyGemsGoldCap": "Cap raised to <%= amount %>", "mysticHourglass": "<%= amount %> Mystic Hourglass", "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.", - "purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)", + "purchasedPlanId": "Recurring $<%= price %> USD each <%= months %> Month(s) (<%= plan %>)", "purchasedPlanExtraMonths": "You have <%= months %> months of subscription credit.", "consecutiveSubscription": "Consecutive Subscription", "consecutiveMonths": "Consecutive Months:", diff --git a/common/locales/ro/subscriber.json b/common/locales/ro/subscriber.json index 78023499c0..eecb2339cc 100644 --- a/common/locales/ro/subscriber.json +++ b/common/locales/ro/subscriber.json @@ -63,6 +63,32 @@ "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "timeTravelersAlreadyOwned": "Felicitări! Deja deții tot ce este oferit de călătorii în timp. Mulțumim că susții site-ul!", "mysticHourglassPopover": "O clepsidră mistică îți permite să cumperi anumite articole disponibile o perioadă limitată, cum ar fi seturi misterioase de articole disponibile lunar și premii de la căpcăunii șef din trecut!", + "mysterySet201402": "Winged Messenger Set", + "mysterySet201403": "Forest Walker Set", + "mysterySet201404": "Twilight Butterfly Set", + "mysterySet201405": "Flame Wielder Set", + "mysterySet201406": "Octomage Set", + "mysterySet201407": "Undersea Explorer Set", + "mysterySet201408": "Sun Sorcerer Set", + "mysterySet201409": "Autumn Strider Set", + "mysterySet201410": "Winged Goblin Set", + "mysterySet201411": "Feast and Fun Set", + "mysterySet201412": "Penguin Set", + "mysterySet201501": "Starry Knight Set", + "mysterySet201502": "Winged Enchanter Set", + "mysterySet201503": "Aquamarine Set", + "mysterySet201504": "Busy Bee Set", + "mysterySet201505": "Green Knight Set", + "mysterySet201506": "Neon Snorkeler Set", + "mysterySet201507": "Rad Surfer Set", + "mysterySet201508": "Cheetah Costume Set", + "mysterySet201509": "Werewolf Set", + "mysterySet201510": "Horned Goblin Set", + "mysterySet201511": "Wood Warrior Set", + "mysterySet201512": "Winter Flame Set", + "mysterySet301404": "Steampunk Standard Set", + "mysterySet301405": "Steampunk Accessories Set", + "mysterySetwondercon": "Wondercon", "subUpdateCard": "Update Card", "subUpdateTitle": "Update", "subUpdateDescription": "Update the card to be charged.", diff --git a/common/locales/ro/tasks.json b/common/locales/ro/tasks.json index 542d58bf67..5e3ca68776 100644 --- a/common/locales/ro/tasks.json +++ b/common/locales/ro/tasks.json @@ -5,6 +5,7 @@ "beeminderDeleteWarning": "Beeminder users: First read Deleting Completed To-Dos Without Confusing Beeminder!", "addmultiple": "Add Multiple", "addsingle": "Add Single", + "habit": "Habit", "habits": "Obiceiuri", "newHabit": "Obicei nou", "newHabitBulk": "New Habits (one per line)", @@ -32,6 +33,7 @@ "mental": "Mintal", "otherExamples": "Ex. îndeletniciri profesionale, hobby-uri, financiare etc.", "progress": "Progres", + "daily": "Daily", "dailies": "Cotidiene", "newDaily": "Cotidiană nouă", "newDailyBulk": "New Dailies (one per line)", @@ -46,6 +48,7 @@ "day": "Day", "days": "Days", "restoreStreak": "Restabilește șir", + "todo": "To-Do", "todos": "Sarcini", "newTodo": "Sarcină nouă", "newTodoBulk": "New To-Dos (one per line)", @@ -57,6 +60,7 @@ "notDue": "Not Due", "grey": "Gri", "score": "Score", + "reward": "Reward", "rewards": "Recompense", "ingamerewards": "Equipment & Skills", "gold": "Aur", @@ -86,7 +90,8 @@ "fortifyPop": "Readu toate țelurile la valoarea neutră (culoarea galbenă) și refă toată Sănătatea pierdută.", "fortify": "Fortifică", "fortifyText": "Fortify will return all your tasks to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", - "sureDelete": "Ești sigur că vrei să ștergi acest țel?", + "confirmFortify": "Are you sure?", + "sureDelete": "Are you sure you want to delete the <%= taskType %> with the text \"<%= taskText %>\"?", "streakCoins": "Bonus de realizare în șir!", "pushTaskToTop": "Push task to top. Hold ctrl or cmd to push to bottom.", "emptyTask": "Enter the task's title first.", diff --git a/common/locales/ru/backgrounds.json b/common/locales/ru/backgrounds.json index 1496f557c2..f66e8aa143 100644 --- a/common/locales/ru/backgrounds.json +++ b/common/locales/ru/backgrounds.json @@ -126,11 +126,11 @@ "backgroundNightDunesNotes": "Тихо прогуляйтесь сквозь Ночные Дюны.", "backgroundSunsetOasisText": "Закатный Оазис", "backgroundSunsetOasisNotes": "Насладитесь Закатным Оазисом.", - "backgrounds122015": "SET 19: Released December 2015", - "backgroundAlpineSlopesText": "Alpine Slopes", - "backgroundAlpineSlopesNotes": "Ski on the Alpine Slopes.", - "backgroundSnowySunriseText": "Snowy Sunrise", - "backgroundSnowySunriseNotes": "Gaze at the Snowy Sunrise.", - "backgroundWinterTownText": "Winter Town", - "backgroundWinterTownNotes": "Bustle through a Winter Town." + "backgrounds122015": "Набор 19: Выпущен в декабре 2015", + "backgroundAlpineSlopesText": "Альпийские Склоны", + "backgroundAlpineSlopesNotes": "Лыжи на Альпийских Склонах", + "backgroundSnowySunriseText": "Снежный Восход", + "backgroundSnowySunriseNotes": "Поглядеть на Снежный Восход", + "backgroundWinterTownText": "Зимний Городок", + "backgroundWinterTownNotes": "Крепость через Зимний Городок" } \ No newline at end of file diff --git a/common/locales/ru/content.json b/common/locales/ru/content.json index b59573a47f..df9d5fd2ec 100644 --- a/common/locales/ru/content.json +++ b/common/locales/ru/content.json @@ -1,8 +1,8 @@ { "potionText": "Эликсир здоровья", "potionNotes": "Восстанавливает 15 здоровья (мгновенно)", - "armoireText": "Зачарованная Кладовая", - "armoireNotesFull": "Откройте Кладовую, чтобы случайным образом получить особое Снаряжение, Опыт или еду! Осталось снаряжения:", + "armoireText": "Зачарованный Сундук", + "armoireNotesFull": "Откройте Сундук, чтобы случайным образом получить особое Снаряжение, Опыт или еду! Осталось предметов снаряжения:", "armoireLastItem": "Вы получили последний редкий предмет из волшебного сундука.", "armoireNotesEmpty": "Новое снаряжение будет появляться в сундуке в начале каждого месяца. А пока что продолжайте кликать ради опыта и еды!", "dropEggWolfText": "Волк", @@ -98,9 +98,12 @@ "questEggFrogText": "Лягушонок", "questEggFrogMountText": "Лягушонок", "questEggFrogAdjective": "царственный", - "questEggSnakeText": "Змея", - "questEggSnakeMountText": "Змея", + "questEggSnakeText": "Змей", + "questEggSnakeMountText": "Змей", "questEggSnakeAdjective": "скользкая", + "questEggUnicornText": "Unicorn", + "questEggUnicornMountText": "Winged Unicorn", + "questEggUnicornAdjective": "a magical", "eggNotes": "Найдите инкубационный эликсир, чтобы полить им это яйцо, и из него вылупится <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Обыкновенный", "hatchingPotionWhite": "Белый", @@ -113,6 +116,7 @@ "hatchingPotionCottonCandyBlue": "Синий сахарный", "hatchingPotionGolden": "Золотой", "hatchingPotionSpooky": "Зловещий", + "hatchingPotionPeppermint": "Peppermint", "hatchingPotionNotes": "Полейте это на яйцо и из него вылупится <%= potText(locale) %> питомец.", "premiumPotionAddlNotes": "Несовместим с яйцами квестовых питомцев.", "foodMeat": "Мясо", diff --git a/common/locales/ru/front.json b/common/locales/ru/front.json index fcd10f31c2..bfa99975f1 100644 --- a/common/locales/ru/front.json +++ b/common/locales/ru/front.json @@ -18,6 +18,7 @@ "choreSample4": "Прибрать в одной комнате", "choreSample5": "Постирать и высушить кучу вещей", "chores": "Домашние дела", + "clearBrowserData": "Очистить данные браузера", "communityBug": "Сообщить об ошибке", "communityExtensions": "Аддоны и расширения", "communityFacebook": "Facebook", @@ -164,6 +165,12 @@ "teams": "Команды", "terms": "Правила и условия", "testimonialHeading": "Что говорят пользователи...", + "localStorageTryFirst": "If you are experiencing problems with Habitica, click the button below to clear cookies and local storage for this website (other websites will not be affected). You will need to log in again after doing this, so first be sure that you know your log-in details, which can be found at Settings -> <%= linkStart %>Site<%= linkEnd %>.", + "localStorageTryNext": "If the problem persists, please <%= linkStart %>Report a Bug<%= linkEnd %> if you haven't already.", + "localStorageClearing": "Clearing Local Storage", + "localStorageClearingExplanation": "Your browser's local storage is being cleared. You will be logged out and redirected to the home page. Please wait.", + "localStorageClear": "Clear Local Storage", + "localStorageClearExplanation": "This button will clear local storage and log you out", "tutorials": "Обучение", "unlockByline1": "Достигайте целей и повышайте свой уровень.", "unlockByline2": "Откройте новые инструменты мотивации, включая коллекционирование питомцев, случайные награды, заклинания и другое!", @@ -181,8 +188,7 @@ "marketingInquiries": "Предложения по маркетингу и рекламе в соц. сетях", "tweet": "Твитнуть", "apps": "Мобильные приложения", - "notifyAndroidApp": "Хотите, чтобы мы уведомили вас, когда будет готово Android приложение? Подпишитесь на эту рассылку!", - "checkOutIOSApp": "Попробуйте наше новое iOS приложение!", + "checkOutMobileApps": "Check out our mobile apps!", "imagine1": "Представьте, что улучшать вашу жизнь так же весело, как играть в игру.", "landingCopy1": "Прогрессируй в игре, завершая задачи в реальной жизни.", "landingCopy2": "Сражайтесь с монстрами совместно с друзьями, чтобы быть ответственнее за свои цели.", diff --git a/common/locales/ru/gear.json b/common/locales/ru/gear.json index f6c7a6d53c..a1fee72a11 100644 --- a/common/locales/ru/gear.json +++ b/common/locales/ru/gear.json @@ -134,6 +134,14 @@ "weaponSpecialFall2015MageNotes": "Властительная Вышиведьма может управлять этой волшебной нитью, даже не прикасаясь к ней! Увеличивает интеллект на <%= int %> и восприятие на <%= per %>. Экипировка ограниченного выпуска осени 2015.", "weaponSpecialFall2015HealerText": "Болотно-Слизневое Зелье ", "weaponSpecialFall2015HealerNotes": "Сварено на славу! Теперь вам только остаётся заставить себя это выпить. Увеличивает интеллект на <%= int %>. Экипировка ограниченного выпуска осени 2015.", + "weaponSpecialWinter2016RogueText": "Cocoa Mug", + "weaponSpecialWinter2016RogueNotes": "Warming drink, or boiling projectile? You decide... Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "weaponSpecialWinter2016WarriorText": "Sturdy Shovel", + "weaponSpecialWinter2016WarriorNotes": "Shovel overdue tasks out of the way! Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "weaponSpecialWinter2016MageText": "Sorcerous Snowboard", + "weaponSpecialWinter2016MageNotes": "Your moves are so sick, they must be magic! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "weaponSpecialWinter2016HealerText": "Confetti Cannon", + "weaponSpecialWinter2016HealerNotes": "WHEEEEEEEEEE!!!!!!! HAPPY WINTER WONDERLAND!!!!!!!! Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.", "weaponMystery201411Text": "Вилы пиршества", "weaponMystery201411Notes": "Многофункциональные вилы – вонзайте их во врагов, или в свои любимые блюда! Бонусов не дают. Подарок подписчикам ноября 2014.", "weaponMystery201502Text": "Сверкающий крылатый посох Любви-а-также-Правды", @@ -149,7 +157,7 @@ "weaponArmoireRancherLassoText": "Ковбойское лассо", "weaponArmoireRancherLassoNotes": "Лассо: идеальный инструмент для контролирования пасущегося стада. Увеличивает силу на<%= str %>, восприятие на <%= per %> и интеллект на <%= int %>. Волшебный сундук: Комплект ковбоя (предмет 3 из 3).", "weaponArmoireMythmakerSwordText": "Меч Мифотворца", - "weaponArmoireMythmakerSwordNotes": "Though it may seem humble, this sword has made many mythic heroes. Increases Perception and Strength by <%= attrs %> each. Enchanted Armoire: Golden Toga Set (Item 3 of 3).", + "weaponArmoireMythmakerSwordNotes": "Пускай он выглядит скромно, но этот меч создал много героев из древних мифов. Увеличивает восприятие и силу на <%= attrs %>. Волшебный сундук: Набор Золотой тоги (предмет 3 из 3).", "weaponArmoireIronCrookText": "Железный крюк", "weaponArmoireIronCrookNotes": "Fiercely hammered from iron, this iron crook is good at herding sheep. Increases Perception and Strength by <%= attrs %> each. Enchanted Armoire: Horned Iron Set (Item 3 of 3).", "weaponArmoireGoldWingStaffText": "Посох Золотого Крыла", @@ -158,7 +166,7 @@ "weaponArmoireBatWandNotes": "Эта волшебная палочка может превратить любое задание в летучую мышь! Просто размахивайте ей и смотрите, как задания разлетаются во все стороны. Увеличивает интеллект на <%= int %> и восприятие на <%= per %>. Волшебный сундук: независимый предмет.", "weaponArmoireShepherdsCrookText": "Пастуший Посох", "weaponArmoireShepherdsCrookNotes": "Полезно для выпаса грифонов. Увеличивает Телосложение на by <%= con %>. Волшебный Сундук: Комплект Пастуха (1предмет из 3).", - "weaponArmoireCrystalCrescentStaffText": "Crystal Crescent Staff", + "weaponArmoireCrystalCrescentStaffText": "Посох Хрустального Полумесяца", "weaponArmoireCrystalCrescentStaffNotes": "Summon the power of the crescent moon with this shining staff! Increases Intelligence and Strength by <%= attrs %> each. Enchanted Armoire: Crystal Crescent Set (Item 3 of 3).", "weaponArmoireBlueLongbowText": "Blue Longbow", "weaponArmoireBlueLongbowNotes": "Ready... Aim... Fire! This bow has great range. Increases Perception by 9, Constitution by 8, and Strength by 7. Enchanted Armoire: Independent Item.", @@ -283,6 +291,14 @@ "armorSpecialFall2015MageNotes": "Каждый шов в этих доспехах мерцает волшебством. Увеличивает Интеллект на <%= int %>. Экипировка ограниченного выпуска осени 2015.", "armorSpecialFall2015HealerText": "Облачение знахаря", "armorSpecialFall2015HealerNotes": "Что? Конечно, это был эликсир Телосложения. Нет, ты совершенно точно НЕ превращаешься в жабу! Не квакай больше. Увеличивает Телосложение на <%= con %>. Экипировка ограниченного выпуска осени 2015.", + "armorSpecialWinter2016RogueText": "Cocoa Armor", + "armorSpecialWinter2016RogueNotes": "This leather armor keeps you nice and toasty. Is it actually made from cocoa? You'll never tell. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "armorSpecialWinter2016WarriorText": "Snowman Suit", + "armorSpecialWinter2016WarriorNotes": "Brr! This padded armor is truly powerful... until it melts. Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", + "armorSpecialWinter2016MageText": "Snowboarder Parka", + "armorSpecialWinter2016MageNotes": "The wisest wizard keeps well-bundled in the winter wind. Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.", + "armorSpecialWinter2016HealerText": "Festive Fairy Cloak", + "armorSpecialWinter2016HealerNotes": "Festive Fairies wrap their body wings around themselves for protection as they use their head wings to catch headwinds and fly around Habitica at speeds of up to 100 mph, delivering gifts and spraying everyone with confetti. How droll. Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", "armorMystery201402Text": "Облачение посланника", "armorMystery201402Notes": "Сверкающая и крепкая, эта броня снабжена большим количеством карманов для переноски писем. Бонусов не дает. Подарок подписчикам февраля 2014.", "armorMystery201403Text": "Доспехи лесовика", @@ -315,6 +331,8 @@ "armorMystery201509Notes": "Это же и ЕСТЬ костюм, так? Бонусов не даёт. Подарок подписчикам сентября 2015.", "armorMystery201511Text": "Wooden Armor", "armorMystery201511Notes": "Considering this armor was carved directly from a magical log, it's surprisingly comfortable. Confers no benefit. November 2015 Subscriber Item.", + "armorMystery201512Text": "Cold Fire Armor", + "armorMystery201512Notes": "Summon the icy flames of winter! Confers no benefit. December 2015 Subscriber Item.", "armorMystery301404Text": "Стимпанковский костюм", "armorMystery301404Notes": "Чудной и лихой! Бонусов не дает. Подарок подписчикам февраля 3015.", "armorArmoireLunarArmorText": "Лунные доспехи успокоения", @@ -333,7 +351,7 @@ "armorArmoireShepherdRobesNotes": "Ткань лёгкая и пропускает воздух, идеально для того, чтобы пасти грифонов в жаркий день в пустыне. Увеличивает Силу и Восприятие на <%= attrs %>. Волшебный Сундук: Комплект Пастуха (2 предмет из 3).", "armorArmoireRoyalRobesText": "Королевские Одеяния", "armorArmoireRoyalRobesNotes": "Чудесный правитель, царствуйте весь день подряд! Увеличивает Телосложение, Интеллект и Восприятие на <%= attrs %>. Волшебный сундук: Королевский Комплект (предмет 3 из 3).", - "armorArmoireCrystalCrescentRobesText": "Crystal Crescent Robes", + "armorArmoireCrystalCrescentRobesText": "Мантия Хрустального Полумесяца", "armorArmoireCrystalCrescentRobesNotes": "These magical robes are luminescent at night. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Crystal Crescent Set (Item 2 of 3).", "headgear": "Головной убор", "headBase0Text": "Нет шлема", @@ -454,6 +472,16 @@ "headSpecialFall2015MageNotes": "Каждый шов в этой шляпе прибавляет ей мощи. Увеличивает Восприятие на <%= per %>. Экипировка ограниченного выпуска осени 2015.", "headSpecialFall2015HealerText": "Шапка Лякухи", "headSpecialFall2015HealerNotes": "Это чрезвычайно серьезная шляпа, которая достойна только самых передовых зельеваров. Увеличивает Интеллект на <%= int %>. Экипировка ограниченного выпуска осени 2015.", + "headSpecialNye2015Text": "Ridiculous Party Hat", + "headSpecialNye2015Notes": "You've received a Ridiculous Party Hat! Wear it with pride while ringing in the New Year! Confers no benefit.", + "headSpecialWinter2016RogueText": "Cocoa Helm", + "headSpecialWinter2016RogueNotes": "The protective scarf on this cozy helm is only removed to sip warm winter beverages. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "headSpecialWinter2016WarriorText": "Snowman Cap", + "headSpecialWinter2016WarriorNotes": "Brr! This mighty helm is truly powerful... until it melts. Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "headSpecialWinter2016MageText": "Snowboarder Hood", + "headSpecialWinter2016MageNotes": "Keeps the snow out of your eyes while you're casting spells. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "headSpecialWinter2016HealerText": "Fairy Wing Helm", + "headSpecialWinter2016HealerNotes": "Thesewingsfluttersoquicklythattheyblur! Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.", "headSpecialGaymerxText": "Радужный шлем воина.", "headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.", "headMystery201402Text": "Шлем с крыльями", @@ -480,6 +508,8 @@ "headMystery201509Notes": "Это же и ЕСТЬ маска, так? Бонусов не даёт. Подарок подписчикам сентября 2015.", "headMystery201511Text": "Log Crown", "headMystery201511Notes": "Count the number of rings to learn how old this crown is. Confers no benefit. November 2015 Subscriber Item.", + "headMystery201512Text": "Winter Flame", + "headMystery201512Notes": "These flames burn cold with pure intellect. Confers no benefit. December 2015 Subscriber Item.", "headMystery301404Text": "Модный цилиндр", "headMystery301404Notes": "Модный цилиндр для самых уважаемых господ! Подарок подписчикам января 3015. Бонусов не дает.", "headMystery301405Text": "Обычный цилиндр", @@ -516,7 +546,7 @@ "headArmoireBlueFloppyHatNotes": "Многие заклинания были зашиты в эту простенькую шляпу, придавая ей искрящийся голубой цвет. Увеличивает Телосложение, Интеллект и Восприятие на <%= attrs %> каждый. Волшебный сундук: самостоятельный предмет.", "headArmoireShepherdHeaddressText": " Головной убор Пастуха", "headArmoireShepherdHeaddressNotes": "Иногда грифоны, которых вы пасёте, грызут этот головной убор, но несмотря на это, он придаёт вам умный вид. Увеличивает Интеллект на <%= int %>. Волшебный сундук: Комплект Пастуха (предмет 3 из 3).", - "headArmoireCrystalCrescentHatText": "Crystal Crescent Hat", + "headArmoireCrystalCrescentHatText": "Шляпа Хрустального Полумесяца", "headArmoireCrystalCrescentHatNotes": "The design on this hat waxes and wanes with the phases of the moon. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Crystal Crescent Set (Item 1 of 3).", "offhand": "предмет для защитной руки", "shieldBase0Text": "Нет снаряжения для защитной руки", @@ -595,6 +625,12 @@ "shieldSpecialFall2015WarriorNotes": "Это, конечно, правда, что вы должны быть ПУГАЛОМ и пугать ворон, но нет ничего плохого в том, чтобы с ними подружиться! Увеличивает Телосложение на <%= con %>. Экипировка ограниченного выпуска осени 2015.", "shieldSpecialFall2015HealerText": "Палка Для Помешиваня", "shieldSpecialFall2015HealerNotes": "Эта палка может помешивать всё без таяния, растворения, или воспламенения! Она может быть также использована что-бы яростно тыкать в задачи врага. Увеличивает Телосложение на <%= con %>. Ограниченный Выпуск Осеннего Снаряжения 2015.", + "shieldSpecialWinter2016RogueText": "Cocoa Mug", + "shieldSpecialWinter2016RogueNotes": "Warming drink, or boiling projectile? You decide... Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "shieldSpecialWinter2016WarriorText": "Sled Shield", + "shieldSpecialWinter2016WarriorNotes": "Use this sled to block attacks, or ride it triumphantly into battle! Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", + "shieldSpecialWinter2016HealerText": "Pixie Present", + "shieldSpecialWinter2016HealerNotes": "Open it open it open it open it open it open it!!!!!!!!! Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", "shieldMystery301405Text": "Часовой Щит", "shieldMystery301405Notes": "С этим монументальным часовым щитом время на вашей стороне! Подарок подписчикам июня 3015. Бонусов не дает.", "shieldArmoireGladiatorShieldText": "Щит Гладиатора", diff --git a/common/locales/ru/generic.json b/common/locales/ru/generic.json index 5156c4cfde..3b22acfc82 100644 --- a/common/locales/ru/generic.json +++ b/common/locales/ru/generic.json @@ -3,6 +3,26 @@ "stringNotFound": "Строка '<%= string %>' не найдена.", "titleIndex": "Habitica | Ваша жизнь — ролевая игра", "habitica": "Habitica", + "titleTasks": "Tasks", + "titleAvatar": "Аватар", + "titleBackgrounds": "Фоны", + "titleStats": "Характеристики и достижения", + "titleProfile": "Профиль", + "titleInbox": "Почта", + "titleTavern": "Таверна", + "titleParty": "Команда", + "titleHeroes": "Зал героев", + "titlePatrons": "Зал покровителей", + "titleGuilds": "Гильдии", + "titleChallenges": "Испытания", + "titleDrops": "Рынок", + "titleQuests": "Квесты", + "titlePets": "Питомцы", + "titleMounts": "Скакуны", + "titleEquipment": "Снаряжение", + "titleTimeTravelers": "Путешественники во времени", + "titleSeasonalShop": "Сезонная лавка", + "titleSettings": "Настройки", "expandToolbar": "Показать панель", "collapseToolbar": "Скрыть панель", "markdownBlurb": "Habitica использует форматирование Markdown. Подробнее можно узнать в шпаргалке по Markdown.", @@ -70,7 +90,7 @@ "achievementDilatory": "Спаситель Промедления", "achievementDilatoryText": "Помог(ла) уничтожить Повелителя Откладываемых-На-Завтра Заданий в дни Летнего Всплеска 2014.", "costumeContest": "Участник Конкурса Костюмов", - "costumeContestText": "Участвовал(а) в ", + "costumeContestText": "Participated in the Habitoween Costume Contest. See some of the entries on the Habitica blog!", "costumeContestTextPlural": "Участвовал(а) в <%= number %> Конкурсах Костюмов в честь Хэллоуина. Заходите посмотреть записи в блоге Habitica!", "memberSince": "- Участник с", "lastLoggedIn": "- Последний вход", diff --git a/common/locales/ru/groups.json b/common/locales/ru/groups.json index fb41ac7603..b763d48fa5 100644 --- a/common/locales/ru/groups.json +++ b/common/locales/ru/groups.json @@ -131,7 +131,7 @@ "sendGiftFromBalance": "С баланса", "sendGiftPurchase": "Приобрести", "sendGiftMessagePlaceholder": "Личное сообщение (необязательно)", - "sendGiftSubscription": "<%= months %> месяц(а/ев): $<%= price %>", + "sendGiftSubscription": "<%= months %> Month(s): $<%= price %> USD", "battleWithFriends": "Побеждайте монстров с друзьями", "startPartyWithFriends": "Создайте команду с друзьями!", "startAParty": "Создать команду", diff --git a/common/locales/ru/limited.json b/common/locales/ru/limited.json index d9957b3c98..8f1fd4e1cb 100644 --- a/common/locales/ru/limited.json +++ b/common/locales/ru/limited.json @@ -21,7 +21,7 @@ "valentineCardAchievementText": "Как это мило! Вы так внимательны друг к другу! Отправлено или получено <%= cards %> валентинок.", "polarBear": "Белый медведь", "turkey": "Индейка", - "gildedTurkey": "Gilded Turkey", + "gildedTurkey": "Золотая индейка", "polarBearPup": "Детеныш белого медведя", "jackolantern": "Тыквенная лампа", "seasonalShop": "Сезонная лавка", @@ -31,12 +31,17 @@ "seasonalShopText": "Добро пожаловать в Сезонную лавку! Сейчас мы предлагаем товары весеннего сезонного выпуска. Товары будут доступны ежегодно в дни Весенней Веселухи, но мы открыты только до 30 апреля, так что спешите закупиться сейчас, иначе придется ждать целый год!", "seasonalShopSummerText": "Добро пожаловать в Сезонную лавку! Сейчас мы предлагаем товары летнего сезонного выпуска. Товары будут доступны ежегодно в дни Летнего Всплеска, но мы открыты только до 31 июля, так что спешите закупиться сейчас, иначе придется ждать целый год!", "seasonalShopFallText": "Добро пожаловать в Сезонную лавку! Сейчас мы предлагаем товары осеннего сезонного выпуска. Товары будут доступны ежегодно во время Осеннего Фестиваля, но только до 31 октября, так что спешите закупиться сейчас, иначе придется ждать целый год!", + "seasonalShopWinterText": "Welcome to the Seasonal Shop!! We're stocking winter Seasonal Edition goodies at the moment. Everything here will be available to purchase during the Winter Wonderland event each year, but we're only open until January 31, so be sure to stock up now, or you'll have to wait a year to buy these items again!", "seasonalShopFallTextBroken": "Ох... Добро пожаловать в Сезонную Лавку... Мы предлагаем товары осеннего Сезонного выпуска, или что-то такое... Всё, что есть здесь, будет ежегодно доступно для покупки на протяжении Осеннего Фестиваля, но мы открыты только до 31 Октября... Я полагаю, вам стоит закупиться сейчас, либо придётся ждать... и ждать... и ждать... *вздох*", "seasonalShopRebirth": "Использовав шар возрождения, вы сможете повторно купить это снаряжение в колонке наград. Поначалу вы сможете купить только предметы для вашего текущего класса (класс по умолчанию – воин), но не волнуйтесь: после смены класса вам станут доступны другие классовые предметы.", "candycaneSet": "Карамельная палочка (Маг)", "skiSet": "Лыжник-ассасин (Разбойник)", "snowflakeSet": "Снежинка (Целитель)", "yetiSet": "Укротитель Йети (Воин)", + "northMageSet": "Маг с севера (Маг)", + "icicleDrakeSet": "Icicle Drake (Rogue)", + "soothingSkaterSet": "Soothing Skater (Healer)", + "gingerbreadSet": "Gingerbread Warrior (Warrior)", "toAndFromCard": "Для <%= toName %>, от <%= fromName %>", "nyeCard": "Новогодняя открытка", "nyeCardExplanation": "За то, что вы отметили Новый год вместе, каждый из вас двоих получает значок «добрые знакомые»!", @@ -62,5 +67,6 @@ "witchyWizardSet": "Ведь-маг (маг)", "mummyMedicSet": "Мумифицированный доктор (целитель)", "vampireSmiterSet": "Вампир-убийца (разбойник)", - "fallEventAvailability": "Доступно до 31 октября" + "fallEventAvailability": "Доступно до 31 октября", + "winterEventAvailability": "Доступен до 31 декабря" } \ No newline at end of file diff --git a/common/locales/ru/messages.json b/common/locales/ru/messages.json index fd19532644..8049821da3 100644 --- a/common/locales/ru/messages.json +++ b/common/locales/ru/messages.json @@ -13,13 +13,14 @@ "messageDontEnjoyFood": "<%= egg %> все съел, но не похоже, что <%= foodText %> ему нравится.", "messageBought": "Куплено: <%= itemText %>", "messageEquipped": "Надето: <%= itemText %>.", - "messageUnEquipped": "Снято: <%= itemText %>", + "messageUnEquipped": "Не надето: <%= itemText %>", "messageMissingEggPotion": "У вас нет нужного яйца или эликсира", "messageInvalidEggPotionCombo": "Вы не можете вывести квестового питомца с помощью волшебного инкубационного эликсира. Попробуйте другое яйцо.", "messageAlreadyPet": "У вас уже есть такой питомец! Попробуйте другую комбинацию!", "messageHatched": "Из яйца вылупился питомец! Загляните в стойла, чтобы взять его с собой.", "messageNotEnoughGold": "Недостаточно золота", - "messageTwoHandled": "<%= gearText %> — двуручное оружие", + "messageTwoHandedEquip": "Wielding <%= twoHandedText %> takes two hands, so <%= offHandedText %> has been unequipped.", + "messageTwoHandedUnequip": "Wielding <%= twoHandedText %> takes two hands, so it was unequipped when you armed yourself with <%= offHandedText %>.", "messageDropFood": "Вы нашли: <%= dropText %>! <%= dropNotes %>", "messageDropEgg": "Вы нашли: <%= dropText %> в яйце! <%= dropNotes %>", "messageDropPotion": "Вы нашли <%= dropText %> инкубационный эликсир! <%= dropNotes %>", diff --git a/common/locales/ru/noscript.json b/common/locales/ru/noscript.json index 4ba705bca4..15414aaafb 100644 --- a/common/locales/ru/noscript.json +++ b/common/locales/ru/noscript.json @@ -1,6 +1,6 @@ { - "jsDisabledHeading": "Увы! В вашем браузере не включён JavaScript", - "jsDisabledHeadingFull": "Увы! В вашем браузере не включён JavaScript, и без него Habitica не сможет работать как надо", + "jsDisabledHeading": "Увы! В вашем браузере не включен JavaScript", + "jsDisabledHeadingFull": "Увы! В вашем браузере не включен JavaScript, и без него Habitica не сможет работать как надо", "jsDisabledText": "Habitica не может отобразить сайт должным образом без этого!", "jsDisabledLink": "Пожалуйста, включите JavaScript, чтобы продолжить!" } \ No newline at end of file diff --git a/common/locales/ru/pets.json b/common/locales/ru/pets.json index 1fefa2ad3c..50d4936cd5 100644 --- a/common/locales/ru/pets.json +++ b/common/locales/ru/pets.json @@ -80,6 +80,7 @@ "petKeyPets": "Освободить моих питомцев", "petKeyMounts": "Освободить моих скакунов", "petKeyBoth": "Освободить всех", + "confirmPetKey": "Вы уверены?", "petKeyNeverMind": "Еще не", "gemsEach": "самоцветов за каждый" } \ No newline at end of file diff --git a/common/locales/ru/questscontent.json b/common/locales/ru/questscontent.json index 8342959722..8a7e891606 100644 --- a/common/locales/ru/questscontent.json +++ b/common/locales/ru/questscontent.json @@ -1,6 +1,6 @@ { "questEvilSantaText": "Санта Зверолов", - "questEvilSantaNotes": "Над ледяными просторами раздается жалобный рев. Вы следуете на звуки рыка и рева, которые сопровождаются хихиканьем еще кого-то, и на лесной поляне видите взрослую белую медведицу. Она заперта в клетке и ревет в надежде на спасение. Сверху на клетке пританцовывает маленькое злобное существо в рождественском костюме, подобранном где-то. Одолейте Санту Зверолова и спасите зверя!", + "questEvilSantaNotes": "You hear moaning roars deep in the icefields. You follow the roars and growls - punctuated by another voice's cackling - to a clearing in the woods where you see a fully-grown polar bear. She's caged and shackled, roaring for life. Dancing atop the cage is a malicious little imp wearing castaway Christmas costumes. Vanquish Trapper Santa, and save the beast!", "questEvilSantaCompletion": "Санта Зверолов вскрикивает от злости и спешит скачками скрыться в темноте ночи. Благодарная медведица рыком и ревом пытается вам что-то сказать. Вы отводите ее к стойлам, где Мэтт Бох, знающий язык зверей, выслушивает ее историю, затаив дыхание в ужасе. У нее есть медвежонок! Он убежал вглубь ледяных просторов, когда маму-медведицу схватили. Помогите ей найти детеныша!", "questEvilSantaBoss": "Санта Зверолов", "questEvilSantaDropBearCubPolarMount": "Белый медведь (скакун)", @@ -90,7 +90,7 @@ "questGoldenknight1Text": "Золотой Рыцарь, часть 1: Строгий выговор", "questGoldenknight1Notes": "Золотой Рыцарь вечно недовольна бедными жителями Habitica. Не справились со всеми Ежедневными заданиями? Поддались негативной привычке? Для нее это повод позудеть, что вы должны следовать ее примеру. Она - яркий пример идеального Хаббитанца, а вы лишь неудачник. Что ж, это вовсе не вежливо! Все совершают ошибки. Совсем не обязательно подвергать их за это такому негативу. Наверное, пора вам собрать кое-какие заявления обиженных жителей Habitica и сделать Золотому Рыцарю строгий выговор!
", "questGoldenknight1CollectTestimony": "Заявления", - "questGoldenknight1DropGoldenknight2Quest": "Золотой Рыцарь, часть 2: Тусклое золото (Свиток)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "Золотой Рыцарь, часть 2: Золотой рыцарь", "questGoldenknight2Notes": "Вооруженные сотнями заявлений жителей Habitica, вы, наконец, встречаетесь лицом к лицу с Золотым Рыцарем. Вы начинаете читать ей жалобы жителей Habitica, одну за другой. «А @Pfeffernusse говорит, что ваше нескончаемое бахвальство...» Рыцарь поднимает руку, чтобы остановить вас, и усмехается: «Я вас умоляю, эти люди просто завидуют моему успеху. Вместо того, чтобы жаловаться, им просто нужно работать так же упорно, как я! Возможно, мне стоит показать вам силу, которую можно развить таким усердием, как мое!» Она поднимает свой моргенштерн и собирается напасть на вас!
", "questGoldenknight2Boss": "Золотой Рыцарь", @@ -268,10 +268,16 @@ "questFrogBoss": "Лягушка Беспорядка", "questFrogDropFrogEgg": "Лягушонок (Яйцо)", "questFrogUnlockText": "Позволяет покупать на рынке Лягушонка в яйце.", - "questSnakeText": "Змей Безумаия", + "questSnakeText": "Змей Безумия", "questSnakeNotes": "It takes a hardy soul to live in the Sand Dunes of Distraction. The arid desert is hardly a productive place, and the shimmering dunes have led many a traveler astray. However, something has even the locals spooked. The sands have been shifting and upturning entire villages. Residents claim a monster with an enormous serpentine body lies in wait under the sands, and they have all pooled together a reward for whomever will help them find and stop it. The much-lauded snake charmers @EmeraldOx and @PainterProphet have agreed to help you summon the beast. Can you stop the Serpent of Distraction?", "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", - "questSnakeBoss": "Змей Безумаия", - "questSnakeDropSnakeEgg": "Змея (Яйцо)", - "questSnakeUnlockText": "Позволяет покупать на рынке Змею в яйце." + "questSnakeBoss": "Змей Безумия", + "questSnakeDropSnakeEgg": "Змей (Яйцо)", + "questSnakeUnlockText": "Позволяет покупать на рынке Змея в яйце.", + "questUnicornText": "Convincing the Unicorn Queen", + "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", + "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", + "questUnicornBoss": "The Unicorn Queen", + "questUnicornDropUnicornEgg": "Единорог (яйцо)", + "questUnicornUnlockText": "Позволяет покупать на рынке единорога в яйце." } \ No newline at end of file diff --git a/common/locales/ru/rebirth.json b/common/locales/ru/rebirth.json index d100b6206b..43e15698a8 100644 --- a/common/locales/ru/rebirth.json +++ b/common/locales/ru/rebirth.json @@ -23,5 +23,6 @@ "rebirthOrb100": "Использован шар возрождения, чтобы начать заново после достижения уровня 100 или выше.", "rebirthPop": "Начните заново с персонажем 1 уровня, сохранив достижения, коллекционные предметы и задания с историей.", "rebirthName": "Шар возрождения", - "reborn": "Возрождение, макс. уровень <%= reLevel %>" + "reborn": "Возрождение, макс. уровень <%= reLevel %>", + "confirmReborn": "Вы уверены?" } \ No newline at end of file diff --git a/common/locales/ru/settings.json b/common/locales/ru/settings.json index 2d9ef366d0..260b6f8e67 100644 --- a/common/locales/ru/settings.json +++ b/common/locales/ru/settings.json @@ -16,7 +16,7 @@ "startAdvCollapsedPop": "Когда этот параметр включен, при открытии задания для редактирования раздел «Дополнительные параметры» будет отображаться в свернутом виде.", "dontShowAgain": "Не показывать это снова", "suppressLevelUpModal": "Не показывать всплывающее сообщение при повышении уровня", - "suppressHatchPetModal": "Не показывать всплывающее сообщение при повышении уровня", + "suppressHatchPetModal": "Не показывать всплывающее сообщение при появлении питомца из яйца", "suppressRaisePetModal": "Не показывать всплывающее сообщение при выращивании питомца в скакуна", "suppressStreakModal": "Не показывать всплывающее сообщение при получении достижения Серии", "showTour": "Показать тур", @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "Поставьте галочку, чтобы отписаться от е-мейлов.", "unsubscribeAllEmailsText": "Отписываясь от е-мейлов, я понимаю, что Habitica никогда не сможет известить меня по электронной почте о важных изменениях на сайте или в моем аккаунте.", "correctlyUnsubscribedEmailType": "Вы успешно отписались от уведомлений \"<%= emailType %>\".", - "subscriptionRateText": "Возобновляемый платеж в $<%= price %> каждые <%= months %> месяцев", + "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", "benefits": "Преимущества", "coupon": "Промо", "couponPlaceholder": "Введите Промо Код", @@ -136,15 +136,15 @@ "buyGemsGoldCap": "Предел повышен до <%= amount %>", "mysticHourglass": "Кол-во мистических песочных часов: <%= amount %>", "mysticHourglassText": "Мистические Песочные часы позволяют покупку Комплекта Таинственных предметов предыдущего месяца", - "purchasedPlanId": "Возобновляемая подписка за <%= price %> долларов каждые <%= months %> мес. (<%= plan %>)", + "purchasedPlanId": "Recurring $<%= price %> USD each <%= months %> Month(s) (<%= plan %>)", "purchasedPlanExtraMonths": "Вы были подписаны в течение <%= months %> мес.", "consecutiveSubscription": "Непрерывная подписка", "consecutiveMonths": "Месяцев подряд:", "gemCapExtra": "Доп. предел самоцветов:", "mysticHourglasses": "Мистические песочные часы:", "paypal": "PayPal", - "amazonPayments": "Платёж с помощью Amazon", - "timezone": "Time Zone", + "amazonPayments": "Платеж с помощью Amazon", + "timezone": "Часовой пояс", "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <%= utc %>", "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.The Golden Knight has been getting on poor Habiticans' cases. Didn't do all of your Dailies? Checked off a negative Habit? She will use this as a reason to harass you about how you should follow her example. She is the shining example of a perfect Habitican, and you are naught but a failure. Well, that is not nice at all! Everyone makes mistakes. They should not have to be met with such negativity for it. Perhaps it is time you gather some testimonies from hurt Habiticans and give the Golden Knight a stern talking-to!
", "questGoldenknight1CollectTestimony": "Testimonies", - "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Tarnished Gold (Scroll)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "The Golden Knight, Part 2: Gold Knight", "questGoldenknight2Notes": "Armed with hundreds of Habitican's testimonies, you finally confront the Golden Knight. You begin to recite the Habitcan's complaints to her, one by one. \"And @Pfeffernusse says that your constant bragging-\" The knight raises her hand to silence you and scoffs, \"Please, these people are merely jealous of my success. Instead of complaining, they should simply work as hard as I! Perhaps I shall show you the power you can attain through diligence such as mine!\" She raises her morningstar and prepares to attack you!
", "questGoldenknight2Boss": "Gold Knight", @@ -273,5 +273,11 @@ "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", "questSnakeBoss": "Serpent of Distraction", "questSnakeDropSnakeEgg": "Snake (Egg)", - "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market" + "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market", + "questUnicornText": "Convincing the Unicorn Queen", + "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", + "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", + "questUnicornBoss": "The Unicorn Queen", + "questUnicornDropUnicornEgg": "Unicorn (Egg)", + "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market" } \ No newline at end of file diff --git a/common/locales/sk/rebirth.json b/common/locales/sk/rebirth.json index 7ca74f7469..b879b6c20b 100644 --- a/common/locales/sk/rebirth.json +++ b/common/locales/sk/rebirth.json @@ -23,5 +23,6 @@ "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher", "rebirthPop": "Začni s novou postavou na leveli 1, pričom ti ostanú odznaky, zberateľské predmety, a úlohy.", "rebirthName": "Orb znovuzrodenia", - "reborn": "Znovuzrodený, najvyšší dosiahnutý level: <%= reLevel %>" + "reborn": "Znovuzrodený, najvyšší dosiahnutý level: <%= reLevel %>", + "confirmReborn": "Are you sure?" } \ No newline at end of file diff --git a/common/locales/sk/settings.json b/common/locales/sk/settings.json index 4c1596950d..348b21f72b 100644 --- a/common/locales/sk/settings.json +++ b/common/locales/sk/settings.json @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "Check to Unsubscribe from Emails", "unsubscribeAllEmailsText": "By checking this box, I certify that I understand that by unsubscribing from all emails, Habitica will never be able to notify me via email about important changes to the site or my account.", "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.", - "subscriptionRateText": "Recurring $<%= price %> every <%= months %> months", + "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", "benefits": "Výhody", "coupon": "Coupon", "couponPlaceholder": "Enter Coupon Code", @@ -136,7 +136,7 @@ "buyGemsGoldCap": "Cap raised to <%= amount %>", "mysticHourglass": "<%= amount %> Mystic Hourglass", "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.", - "purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)", + "purchasedPlanId": "Recurring $<%= price %> USD each <%= months %> Month(s) (<%= plan %>)", "purchasedPlanExtraMonths": "You have <%= months %> months of subscription credit.", "consecutiveSubscription": "Consecutive Subscription", "consecutiveMonths": "Consecutive Months:", diff --git a/common/locales/sk/subscriber.json b/common/locales/sk/subscriber.json index c42064e3c5..7cfe59258a 100644 --- a/common/locales/sk/subscriber.json +++ b/common/locales/sk/subscriber.json @@ -63,6 +63,32 @@ "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "timeTravelersAlreadyOwned": "Congratulations! You already own everything the Time Travelers currently offer. Thanks for supporting the site!", "mysticHourglassPopover": "A Mystic Hourglass allows you to purchase certain limited-time items, such as monthly Mystery Item Sets and awards from world bosses, from the past!", + "mysterySet201402": "Winged Messenger Set", + "mysterySet201403": "Forest Walker Set", + "mysterySet201404": "Twilight Butterfly Set", + "mysterySet201405": "Flame Wielder Set", + "mysterySet201406": "Octomage Set", + "mysterySet201407": "Undersea Explorer Set", + "mysterySet201408": "Sun Sorcerer Set", + "mysterySet201409": "Autumn Strider Set", + "mysterySet201410": "Winged Goblin Set", + "mysterySet201411": "Feast and Fun Set", + "mysterySet201412": "Penguin Set", + "mysterySet201501": "Starry Knight Set", + "mysterySet201502": "Winged Enchanter Set", + "mysterySet201503": "Aquamarine Set", + "mysterySet201504": "Busy Bee Set", + "mysterySet201505": "Green Knight Set", + "mysterySet201506": "Neon Snorkeler Set", + "mysterySet201507": "Rad Surfer Set", + "mysterySet201508": "Cheetah Costume Set", + "mysterySet201509": "Werewolf Set", + "mysterySet201510": "Horned Goblin Set", + "mysterySet201511": "Wood Warrior Set", + "mysterySet201512": "Winter Flame Set", + "mysterySet301404": "Steampunk Standard Set", + "mysterySet301405": "Steampunk Accessories Set", + "mysterySetwondercon": "Wondercon", "subUpdateCard": "Update Card", "subUpdateTitle": "Update", "subUpdateDescription": "Update the card to be charged.", diff --git a/common/locales/sk/tasks.json b/common/locales/sk/tasks.json index a78d1b236f..252d616196 100644 --- a/common/locales/sk/tasks.json +++ b/common/locales/sk/tasks.json @@ -5,6 +5,7 @@ "beeminderDeleteWarning": "Beeminder users: First read Deleting Completed To-Dos Without Confusing Beeminder!", "addmultiple": "Add Multiple", "addsingle": "Add Single", + "habit": "Habit", "habits": "Návyky", "newHabit": "Nový návyk", "newHabitBulk": "New Habits (one per line)", @@ -32,6 +33,7 @@ "mental": "Mentálne", "otherExamples": "Napr. profesné ciele, koníčky, finančné, atď.", "progress": "Postup", + "daily": "Daily", "dailies": "Denné úlohy", "newDaily": "Nová denná úloha", "newDailyBulk": "New Dailies (one per line)", @@ -46,6 +48,7 @@ "day": "Day", "days": "Days", "restoreStreak": "Obnoviť sériu", + "todo": "To-Do", "todos": "Úlohy", "newTodo": "Nová úloha", "newTodoBulk": "New To-Dos (one per line)", @@ -57,6 +60,7 @@ "notDue": "Not Due", "grey": "Šedé", "score": "Skóre", + "reward": "Reward", "rewards": "Odmeny", "ingamerewards": "Výstroj a zručnosti", "gold": "Zlato", @@ -86,7 +90,8 @@ "fortifyPop": "Vráť všetky úlohy do neutrálneho stavu (žltá farba) a navráť všetko stratené zdravie.", "fortify": "Posilniť", "fortifyText": "Fortify will return all your tasks to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", - "sureDelete": "Si si istý, že chceš zmazať túto úlohu?", + "confirmFortify": "Are you sure?", + "sureDelete": "Are you sure you want to delete the <%= taskType %> with the text \"<%= taskText %>\"?", "streakCoins": "Bonus za sériu!", "pushTaskToTop": "Push task to top. Hold ctrl or cmd to push to bottom.", "emptyTask": "Enter the task's title first.", diff --git a/common/locales/sr/content.json b/common/locales/sr/content.json index d33c405804..1007dcafac 100644 --- a/common/locales/sr/content.json +++ b/common/locales/sr/content.json @@ -101,6 +101,9 @@ "questEggSnakeText": "Snake", "questEggSnakeMountText": "Snake", "questEggSnakeAdjective": "a slithering", + "questEggUnicornText": "Unicorn", + "questEggUnicornMountText": "Winged Unicorn", + "questEggUnicornAdjective": "a magical", "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Običan", "hatchingPotionWhite": "Beli", @@ -113,6 +116,7 @@ "hatchingPotionCottonCandyBlue": "Plavi šećerni", "hatchingPotionGolden": "Zlatni", "hatchingPotionSpooky": "Spooky", + "hatchingPotionPeppermint": "Peppermint", "hatchingPotionNotes": "Pospite ovo po jajetu, i iz njega će se izleći <%= potText(locale) %> ljubimac.", "premiumPotionAddlNotes": "Not usable on quest pet eggs.", "foodMeat": "Meso", diff --git a/common/locales/sr/front.json b/common/locales/sr/front.json index df08766e82..9f78261d45 100644 --- a/common/locales/sr/front.json +++ b/common/locales/sr/front.json @@ -18,6 +18,7 @@ "choreSample4": "Dovesti sobu u red", "choreSample5": "Oprati i osušiti odeću", "chores": "Kućni poslovi", + "clearBrowserData": "Clear Browser Data", "communityBug": "Prijaviti grešku (bag)", "communityExtensions": "Dodaci i ekstenzije", "communityFacebook": "Facebook", @@ -164,6 +165,12 @@ "teams": "Timovi", "terms": "Uslove korišćenja", "testimonialHeading": "Šta kažu korisnici...", + "localStorageTryFirst": "If you are experiencing problems with Habitica, click the button below to clear cookies and local storage for this website (other websites will not be affected). You will need to log in again after doing this, so first be sure that you know your log-in details, which can be found at Settings -> <%= linkStart %>Site<%= linkEnd %>.", + "localStorageTryNext": "If the problem persists, please <%= linkStart %>Report a Bug<%= linkEnd %> if you haven't already.", + "localStorageClearing": "Clearing Local Storage", + "localStorageClearingExplanation": "Your browser's local storage is being cleared. You will be logged out and redirected to the home page. Please wait.", + "localStorageClear": "Clear Local Storage", + "localStorageClearExplanation": "This button will clear local storage and log you out", "tutorials": "Obuka", "unlockByline1": "Ostvarite svoje ciljeve i dobijte nivo.", "unlockByline2": "Otključajte nove funkcije, poput životinja, nasumičnih nagrada, i magija.", @@ -181,8 +188,7 @@ "marketingInquiries": "Marketing/Social Media Inquiries", "tweet": "Tweet", "apps": "Apps", - "notifyAndroidApp": "Want us to notify you when the Android app is ready? Sign up for this mailing list!", - "checkOutIOSApp": "Check out our new iOS App!", + "checkOutMobileApps": "Check out our mobile apps!", "imagine1": "Imagine if improving your life were as fun as playing a game.", "landingCopy1": "Advance in the game by completing your real-life tasks.", "landingCopy2": "Battle monsters with friends to stay accountable to your goals.", diff --git a/common/locales/sr/gear.json b/common/locales/sr/gear.json index 5ce8046a9a..f12183c9bf 100644 --- a/common/locales/sr/gear.json +++ b/common/locales/sr/gear.json @@ -134,6 +134,14 @@ "weaponSpecialFall2015MageNotes": "A powerful Stitch Witch can control this enchanted thread without even touching it! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Autumn Gear.", "weaponSpecialFall2015HealerText": "Swamp-Slime Potion", "weaponSpecialFall2015HealerNotes": "Brewed to perfection! Now you just have to convince yourself to drink it. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.", + "weaponSpecialWinter2016RogueText": "Cocoa Mug", + "weaponSpecialWinter2016RogueNotes": "Warming drink, or boiling projectile? You decide... Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "weaponSpecialWinter2016WarriorText": "Sturdy Shovel", + "weaponSpecialWinter2016WarriorNotes": "Shovel overdue tasks out of the way! Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "weaponSpecialWinter2016MageText": "Sorcerous Snowboard", + "weaponSpecialWinter2016MageNotes": "Your moves are so sick, they must be magic! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "weaponSpecialWinter2016HealerText": "Confetti Cannon", + "weaponSpecialWinter2016HealerNotes": "WHEEEEEEEEEE!!!!!!! HAPPY WINTER WONDERLAND!!!!!!!! Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.", "weaponMystery201411Text": "Vile za gozbe", "weaponMystery201411Notes": "Probodite protivnike ili ih koristite kao viljušku dok jedete svoju omiljenu hranu - ove višenamenske vile obavljaju sve poslove s lakoćom. Ne daju nikakav bonus. Predmet za pretplatnike novembar 2014.", "weaponMystery201502Text": "Svetlucavo krilato žezlo ljubavi, i istine, takođe", @@ -283,6 +291,14 @@ "armorSpecialFall2015MageNotes": "Every stitch in this armor shimmers with enchantment. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.", "armorSpecialFall2015HealerText": "Potioner Robes", "armorSpecialFall2015HealerNotes": "What? Of course that was a potion of constitution. No, you are definitely not turning into a frog! Don't be ribbiticulous. Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.", + "armorSpecialWinter2016RogueText": "Cocoa Armor", + "armorSpecialWinter2016RogueNotes": "This leather armor keeps you nice and toasty. Is it actually made from cocoa? You'll never tell. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "armorSpecialWinter2016WarriorText": "Snowman Suit", + "armorSpecialWinter2016WarriorNotes": "Brr! This padded armor is truly powerful... until it melts. Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", + "armorSpecialWinter2016MageText": "Snowboarder Parka", + "armorSpecialWinter2016MageNotes": "The wisest wizard keeps well-bundled in the winter wind. Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.", + "armorSpecialWinter2016HealerText": "Festive Fairy Cloak", + "armorSpecialWinter2016HealerNotes": "Festive Fairies wrap their body wings around themselves for protection as they use their head wings to catch headwinds and fly around Habitica at speeds of up to 100 mph, delivering gifts and spraying everyone with confetti. How droll. Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", "armorMystery201402Text": "Odora pismonoše", "armorMystery201402Notes": "Ova svetlucava i izdržljiva odora ima mnoštvo džepova za čuvanje pisama. Ne daje nikakav bonus. Predmet za pretplatnike februar 2014.", "armorMystery201403Text": "Šumski kamuflažni oklop", @@ -315,6 +331,8 @@ "armorMystery201509Notes": "This IS a costume, right? Confers no benefit. September 2015 Subscriber Item.", "armorMystery201511Text": "Wooden Armor", "armorMystery201511Notes": "Considering this armor was carved directly from a magical log, it's surprisingly comfortable. Confers no benefit. November 2015 Subscriber Item.", + "armorMystery201512Text": "Cold Fire Armor", + "armorMystery201512Notes": "Summon the icy flames of winter! Confers no benefit. December 2015 Subscriber Item.", "armorMystery301404Text": "Stimpank odelo", "armorMystery301404Notes": "Kicoško i zanosno! Ne daje nikakav bonus. Predmet za pretplatnike februar 3015..", "armorArmoireLunarArmorText": "Soothing Lunar Armor", @@ -454,6 +472,16 @@ "headSpecialFall2015MageNotes": "Every stitch in this hat augments its power. Increases Perception by <%= per %>. Limited Edition 2015 Autumn Gear.", "headSpecialFall2015HealerText": "Hat of Frog", "headSpecialFall2015HealerNotes": "This is an extremely serious hat that is worthy of only the most advanced potioners. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.", + "headSpecialNye2015Text": "Ridiculous Party Hat", + "headSpecialNye2015Notes": "You've received a Ridiculous Party Hat! Wear it with pride while ringing in the New Year! Confers no benefit.", + "headSpecialWinter2016RogueText": "Cocoa Helm", + "headSpecialWinter2016RogueNotes": "The protective scarf on this cozy helm is only removed to sip warm winter beverages. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "headSpecialWinter2016WarriorText": "Snowman Cap", + "headSpecialWinter2016WarriorNotes": "Brr! This mighty helm is truly powerful... until it melts. Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "headSpecialWinter2016MageText": "Snowboarder Hood", + "headSpecialWinter2016MageNotes": "Keeps the snow out of your eyes while you're casting spells. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", + "headSpecialWinter2016HealerText": "Fairy Wing Helm", + "headSpecialWinter2016HealerNotes": "Thesewingsfluttersoquicklythattheyblur! Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.", "headSpecialGaymerxText": "Dugin šlem", "headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.", "headMystery201402Text": "Krilati šlem", @@ -480,6 +508,8 @@ "headMystery201509Notes": "This IS a mask, right? Confers no benefit. September 2015 Subscriber Item.", "headMystery201511Text": "Log Crown", "headMystery201511Notes": "Count the number of rings to learn how old this crown is. Confers no benefit. November 2015 Subscriber Item.", + "headMystery201512Text": "Winter Flame", + "headMystery201512Notes": "These flames burn cold with pure intellect. Confers no benefit. December 2015 Subscriber Item.", "headMystery301404Text": "Otmeni cilindar", "headMystery301404Notes": "Otmeni cilindar za pripadnike visokog društva! Predmet za pretplatnike januar 3015. Ne daje nikakav bonus.", "headMystery301405Text": "Jednostavni cilindar", @@ -595,6 +625,12 @@ "shieldSpecialFall2015WarriorNotes": "It's true that you're supposed to be SCARING the crows, but there's nothing wrong with making friends! Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.", "shieldSpecialFall2015HealerText": "Stirring Stick", "shieldSpecialFall2015HealerNotes": "This stick can stir anything without melting, dissolving, or bursting into flame! It can also be used to fiercely poke enemy tasks. Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.", + "shieldSpecialWinter2016RogueText": "Cocoa Mug", + "shieldSpecialWinter2016RogueNotes": "Warming drink, or boiling projectile? You decide... Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", + "shieldSpecialWinter2016WarriorText": "Sled Shield", + "shieldSpecialWinter2016WarriorNotes": "Use this sled to block attacks, or ride it triumphantly into battle! Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", + "shieldSpecialWinter2016HealerText": "Pixie Present", + "shieldSpecialWinter2016HealerNotes": "Open it open it open it open it open it open it!!!!!!!!! Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", "shieldMystery301405Text": "Štit sa kazaljkama", "shieldMystery301405Notes": "Sa ovim impozantnim štitom uvek imate dovoljno vremena. Ne daje nikakav bonus. Predmet za pretplatnike jun 3015.", "shieldArmoireGladiatorShieldText": "Gladiator Shield", diff --git a/common/locales/sr/generic.json b/common/locales/sr/generic.json index ec9b393f0b..0ccd2fa826 100644 --- a/common/locales/sr/generic.json +++ b/common/locales/sr/generic.json @@ -3,6 +3,26 @@ "stringNotFound": "Niska <%= string %>” ne postoji.", "titleIndex": "Habitica | Vaš život u vidu igre", "habitica": "Habitika", + "titleTasks": "Tasks", + "titleAvatar": "Avatar", + "titleBackgrounds": "Backgrounds", + "titleStats": "Stats & Achievements", + "titleProfile": "Profile", + "titleInbox": "Inbox", + "titleTavern": "Tavern", + "titleParty": "Party", + "titleHeroes": "Hall of Heroes", + "titlePatrons": "Hall of Patrons", + "titleGuilds": "Guilds", + "titleChallenges": "Challenges", + "titleDrops": "Market", + "titleQuests": "Quests", + "titlePets": "Pets", + "titleMounts": "Mounts", + "titleEquipment": "Equipment", + "titleTimeTravelers": "Time Travelers", + "titleSeasonalShop": "Seasonal Shop", + "titleSettings": "Settings", "expandToolbar": "Pokaži traku s alatima", "collapseToolbar": "Sakrij traku s alatima", "markdownBlurb": "Habitica koristi markdown za formatiranje poruka. Više informacija naći ćete ovde.", diff --git a/common/locales/sr/groups.json b/common/locales/sr/groups.json index c2ce55c778..8adb9814f7 100644 --- a/common/locales/sr/groups.json +++ b/common/locales/sr/groups.json @@ -131,7 +131,7 @@ "sendGiftFromBalance": "From Balance", "sendGiftPurchase": "Purchase", "sendGiftMessagePlaceholder": "Personal message (optional)", - "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>", + "sendGiftSubscription": "<%= months %> Month(s): $<%= price %> USD", "battleWithFriends": "Battle Monsters With Friends", "startPartyWithFriends": "Start a Party with your friends!", "startAParty": "Start a Party", diff --git a/common/locales/sr/limited.json b/common/locales/sr/limited.json index 961ca76208..8eeb872cab 100644 --- a/common/locales/sr/limited.json +++ b/common/locales/sr/limited.json @@ -31,12 +31,17 @@ "seasonalShopText": "Dobro došli u Prodavnicu sezonskih predmeta!! Trenutno u ponudi imamo opremu iz prolećne Sezonske serije. Ovi predmeti biće u prodaju do 30. aprila. Nabavite ih sada, jer ćete sledeću priliku imati tek za godinu dana!", "seasonalShopSummerText": "Welcome to the Seasonal Shop!! We're stocking summertime Seasonal Edition goodies at the moment. Everything here will be available to purchase during the Summer Splash event each year, but we're only open until July 31st, so be sure to stock up now, or you'll have to wait a year to buy these items again!", "seasonalShopFallText": "Welcome to the Seasonal Shop!! We're stocking autumn Seasonal Edition goodies at the moment. Everything here will be available to purchase during the Fall Festival event each year, but we're only open until October 31, so be sure to stock up now, or you'll have to wait a year to buy these items again!", + "seasonalShopWinterText": "Welcome to the Seasonal Shop!! We're stocking winter Seasonal Edition goodies at the moment. Everything here will be available to purchase during the Winter Wonderland event each year, but we're only open until January 31, so be sure to stock up now, or you'll have to wait a year to buy these items again!", "seasonalShopFallTextBroken": "Oh.... Welcome to the Seasonal Shop... We're stocking autumn Seasonal Edition goodies, or something... Everything here will be available to purchase during the Fall Festival event each year, but we're only open until October 31... I guess you should to stock up now, or you'll have to wait... and wait... and wait... *sigh*", "seasonalShopRebirth": "If you've used the Orb of Rebirth, you can repurchase this equipment in the Rewards Column. Initially, you'll only be able to purchase the items for your current class (Warrior by default), but fear not, the other class-specific items will become available if you switch to that class.", "candycaneSet": "Šećerna oprema (Čarobnjak)", "skiSet": "Skijaška oprema (Odmetnik)", "snowflakeSet": "Snežna oprema (Vidar)", "yetiSet": "Oprema lovca na jetije (Ratnik)", + "northMageSet": "Mage of the North (Mage)", + "icicleDrakeSet": "Icicle Drake (Rogue)", + "soothingSkaterSet": "Soothing Skater (Healer)", + "gingerbreadSet": "Gingerbread Warrior (Warrior)", "toAndFromCard": "To: <%= toName %>, From: <%= fromName %>", "nyeCard": "Novogodišnja čestitka", "nyeCardExplanation": "For celebrating the new year together, you both receive the \"Auld Acquaintance\" badge!", @@ -62,5 +67,6 @@ "witchyWizardSet": "Witchy Wizard (Mage)", "mummyMedicSet": "Mummy Medic (Healer)", "vampireSmiterSet": "Vampire Smiter (Rogue)", - "fallEventAvailability": "Available until October 31" + "fallEventAvailability": "Available until October 31", + "winterEventAvailability": "Available until December 31" } \ No newline at end of file diff --git a/common/locales/sr/messages.json b/common/locales/sr/messages.json index 22e44b788f..98f9aadea4 100644 --- a/common/locales/sr/messages.json +++ b/common/locales/sr/messages.json @@ -13,13 +13,14 @@ "messageDontEnjoyFood": "<%= egg %> ne odbija <%= foodText %>, ali izgleda da je ne voli.", "messageBought": "Predmet <%= itemText %> kupljen", "messageEquipped": "Predmet <%= itemText %> postavljen.", - "messageUnEquipped": "Predmet <%= itemText %> je vraćen u inventar.", + "messageUnEquipped": "<%= itemText %> unequipped.", "messageMissingEggPotion": "Nedostaje Vam jaje ili napitak", "messageInvalidEggPotionCombo": "You can't hatch Quest Pet Eggs with Magic Hatching Potions! Try a different egg.", "messageAlreadyPet": "Već imate takvu zver. Pokušajte s nekom drugom kombinacijom.", "messageHatched": "Jaje se izleglo. Zver možete naći u štali.", "messageNotEnoughGold": "Nemate dovoljno zlata.", - "messageTwoHandled": "<%= gearText %> je dvoručno oružje", + "messageTwoHandedEquip": "Wielding <%= twoHandedText %> takes two hands, so <%= offHandedText %> has been unequipped.", + "messageTwoHandedUnequip": "Wielding <%= twoHandedText %> takes two hands, so it was unequipped when you armed yourself with <%= offHandedText %>.", "messageDropFood": "Našli ste <%= dropArticle %><%= dropText %>! <%= dropNotes %>", "messageDropEgg": "Našli ste <%= dropText %> Jaje! <%= dropNotes %>", "messageDropPotion": "Našli ste <%= dropText %> Napitak! <%= dropNotes %>", diff --git a/common/locales/sr/pets.json b/common/locales/sr/pets.json index 13cf85ec6c..0d020817c8 100644 --- a/common/locales/sr/pets.json +++ b/common/locales/sr/pets.json @@ -80,6 +80,7 @@ "petKeyPets": "Oslobodi zveri", "petKeyMounts": "Oslobodi životinje za jahanje", "petKeyBoth": "Oslobodi sve", + "confirmPetKey": "Are you sure?", "petKeyNeverMind": "Otkaži", "gemsEach": "dragulja" } \ No newline at end of file diff --git a/common/locales/sr/questscontent.json b/common/locales/sr/questscontent.json index 22f7911467..a2bfb19485 100644 --- a/common/locales/sr/questscontent.json +++ b/common/locales/sr/questscontent.json @@ -1,6 +1,6 @@ { "questEvilSantaText": "Deda Mraz Traper", - "questEvilSantaNotes": "Čujete žalosne urlike u dubini ledenih polja. Pratite urlike i režanje, isprekidane zlobnim kikotanjem. Prolazite kroz šumu i izlazite na proplanak, gde nailazite na odraslu belu medvedicu, zarobljenu u kavezu, i vezanu lancima. Na vrhu kaveza pleše opaki đavolak u kostimu Deda Mraza. Savladajte Trapera i spasite medveda!", + "questEvilSantaNotes": "You hear moaning roars deep in the icefields. You follow the roars and growls - punctuated by another voice's cackling - to a clearing in the woods where you see a fully-grown polar bear. She's caged and shackled, roaring for life. Dancing atop the cage is a malicious little imp wearing castaway Christmas costumes. Vanquish Trapper Santa, and save the beast!", "questEvilSantaCompletion": "Uz besni vrisak, đavolak beži i nestaje u mračnoj šumi. Zahvalna medvedica pokušava nešto da vam objasni urlicima i režanjem. Vodite je do štale, gde Šaptač Met Bok sa zaprepašćenjem sluša njenu priču. Dok je bila zarobljena u kavezu, njeno mladunče je odlutalo u ledena polja. Pomozite joj da ga nađe!", "questEvilSantaBoss": "Deda Mraz Traper", "questEvilSantaDropBearCubPolarMount": "Beli medved (Životija za jahanje)", @@ -90,7 +90,7 @@ "questGoldenknight1Text": "The Golden Knight, Part 1: A Stern Talking-To", "questGoldenknight1Notes": "Sa svih strana pristižu žalbe Habitikanaca na Zlatnog viteza. Niste uradili Svakodnevne zadatke? Izgubili ste Zdravlje zbog Loše navike? Zlatni vitez će to upotrebiti kao povod da Vam održi lekciju o tome kako treba da se ugledate na nju. Jer ona je paragon savršenog Habitikanca, a Vi ste običan gubitnik. To uopšte nije lepo. Svi mi grešimo, ali ne zaslužujemo da se neko tako ponaša prema nama. Saslušajte pritužbe Habitikanaca, i porazgovarajte sa Zlatnim vitezom o njenom ponašanju.
", "questGoldenknight1CollectTestimony": "Pitužbe", - "questGoldenknight1DropGoldenknight2Quest": "Zlatni vitez, 2. deo: Potamnelo zlato (Svitak)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "The Golden Knight, Part 2: Gold Knight", "questGoldenknight2Notes": "Naoružani stotinama pritužbi Habitikanaca, suočavate se sa Zlatnim Vitezom. Čitate joj žalbe, jednu po jednu. ,,A @Pfeffernusse kaže da tvoje neprekidno hvalisanje-\" Vitez odmahuje rukom i odgovara, ,,Molim vas, ti ljudi su samo ljubomorni. Umesto da se žale, bolje bi bilo rade vredno kao ja! Pokazaću vam šta možete da postignete radom i disciplinom!\" Vitez diže jutarnju zvezdu i sprema se za napad!
", "questGoldenknight2Boss": "Zlatni vitez", @@ -273,5 +273,11 @@ "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", "questSnakeBoss": "Serpent of Distraction", "questSnakeDropSnakeEgg": "Snake (Egg)", - "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market" + "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market", + "questUnicornText": "Convincing the Unicorn Queen", + "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", + "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", + "questUnicornBoss": "The Unicorn Queen", + "questUnicornDropUnicornEgg": "Unicorn (Egg)", + "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market" } \ No newline at end of file diff --git a/common/locales/sr/rebirth.json b/common/locales/sr/rebirth.json index b4bc11f66d..b69f7bcf9e 100644 --- a/common/locales/sr/rebirth.json +++ b/common/locales/sr/rebirth.json @@ -23,5 +23,6 @@ "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher", "rebirthPop": "Počnite iz početka s nivoa 1, i zadržite odlikovanja, kolekcionarske predmete, i zadatke, zajedno sa istorijom.", "rebirthName": "Sfera za reinkarnaciju", - "reborn": "Reinkarniran, najviši nivo <%= reLevel %>" + "reborn": "Reinkarniran, najviši nivo <%= reLevel %>", + "confirmReborn": "Are you sure?" } \ No newline at end of file diff --git a/common/locales/sr/settings.json b/common/locales/sr/settings.json index ef02142a2c..ae3813a869 100644 --- a/common/locales/sr/settings.json +++ b/common/locales/sr/settings.json @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "Kliknite ovde ako ne želite da Vam šaljemo poruke", "unsubscribeAllEmailsText": "Ovim potrvrđujem da razumem da, ako otkažem dozvolu Habitica-u da mi šalje poruke, Habitica više neće moći da me obaveštava mejlovima o bitnim promenama u igri ili na mom nalogu.", "correctlyUnsubscribedEmailType": "Prekid pretplate na \"<%= emailType %>\" poruke ispravno izvršen.", - "subscriptionRateText": "Automatski $<%= price %> svakih <%= months %> meseci", + "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", "benefits": "Prednosti", "coupon": "Kupon", "couponPlaceholder": "Unesite kod sa kupona", @@ -136,7 +136,7 @@ "buyGemsGoldCap": "Cap raised to <%= amount %>", "mysticHourglass": "<%= amount %> Mystic Hourglass", "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.", - "purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)", + "purchasedPlanId": "Recurring $<%= price %> USD each <%= months %> Month(s) (<%= plan %>)", "purchasedPlanExtraMonths": "You have <%= months %> months of subscription credit.", "consecutiveSubscription": "Consecutive Subscription", "consecutiveMonths": "Consecutive Months:", diff --git a/common/locales/sr/subscriber.json b/common/locales/sr/subscriber.json index 99008b01d7..3ea06b8339 100644 --- a/common/locales/sr/subscriber.json +++ b/common/locales/sr/subscriber.json @@ -63,6 +63,32 @@ "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "timeTravelersAlreadyOwned": "Congratulations! You already own everything the Time Travelers currently offer. Thanks for supporting the site!", "mysticHourglassPopover": "A Mystic Hourglass allows you to purchase certain limited-time items, such as monthly Mystery Item Sets and awards from world bosses, from the past!", + "mysterySet201402": "Winged Messenger Set", + "mysterySet201403": "Forest Walker Set", + "mysterySet201404": "Twilight Butterfly Set", + "mysterySet201405": "Flame Wielder Set", + "mysterySet201406": "Octomage Set", + "mysterySet201407": "Undersea Explorer Set", + "mysterySet201408": "Sun Sorcerer Set", + "mysterySet201409": "Autumn Strider Set", + "mysterySet201410": "Winged Goblin Set", + "mysterySet201411": "Feast and Fun Set", + "mysterySet201412": "Penguin Set", + "mysterySet201501": "Starry Knight Set", + "mysterySet201502": "Winged Enchanter Set", + "mysterySet201503": "Aquamarine Set", + "mysterySet201504": "Busy Bee Set", + "mysterySet201505": "Green Knight Set", + "mysterySet201506": "Neon Snorkeler Set", + "mysterySet201507": "Rad Surfer Set", + "mysterySet201508": "Cheetah Costume Set", + "mysterySet201509": "Werewolf Set", + "mysterySet201510": "Horned Goblin Set", + "mysterySet201511": "Wood Warrior Set", + "mysterySet201512": "Winter Flame Set", + "mysterySet301404": "Steampunk Standard Set", + "mysterySet301405": "Steampunk Accessories Set", + "mysterySetwondercon": "Wondercon", "subUpdateCard": "Ažuriranje karte", "subUpdateTitle": "Ažuriranje", "subUpdateDescription": "Ažuriranje karte za punjenje.", diff --git a/common/locales/sr/tasks.json b/common/locales/sr/tasks.json index 77eebadc19..850002b7b0 100644 --- a/common/locales/sr/tasks.json +++ b/common/locales/sr/tasks.json @@ -5,6 +5,7 @@ "beeminderDeleteWarning": "Korisnici Beeminder-a: Pre nego što obrišete zadatke, pročitajte Kako da obrišete završene zadatke, a da ne zbunite Beeminder!", "addmultiple": "Dodaj više odjednom", "addsingle": "Dodaj pojedinačno", + "habit": "Habit", "habits": "Navike", "newHabit": "Nova navika", "newHabitBulk": "Nove navike (svaka navika u novi red)", @@ -32,6 +33,7 @@ "mental": "Umno", "otherExamples": "Npr. profesionalni ciljevi, hobiji, finansije, itd.", "progress": "Napredak", + "daily": "Daily", "dailies": "Svakodnevni zadaci", "newDaily": "Novi svakodnevni zadatak", "newDailyBulk": "Novi svakodnevni zadaci (svaki zadatak u novi red)", @@ -46,6 +48,7 @@ "day": "Day", "days": "Days", "restoreStreak": "Podešavanje brojača", + "todo": "To-Do", "todos": "Jednokratni zadaci", "newTodo": "Novi jednokratni zadatak", "newTodoBulk": "Novi jednokratni zadaci (svaki zadatak u novi red)", @@ -57,6 +60,7 @@ "notDue": "Not Due", "grey": "Sivi", "score": "Uspeh", + "reward": "Reward", "rewards": "Nagrade", "ingamerewards": "Oprema i veštine", "gold": "Zlato", @@ -86,7 +90,8 @@ "fortifyPop": "Vraća sve zadatke na početnu vrednost (žuta boja), i obnavlja izgubljeno zdravlje.", "fortify": "Okrepljenje", "fortifyText": "Fortify will return all your tasks to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", - "sureDelete": "Jeste li sigurni da želite da obrišete ovaj zadatak?", + "confirmFortify": "Are you sure?", + "sureDelete": "Are you sure you want to delete the <%= taskType %> with the text \"<%= taskText %>\"?", "streakCoins": "Bonus zbog redovnog izvršavanja zadataka!", "pushTaskToTop": "Push task to top. Hold ctrl or cmd to push to bottom.", "emptyTask": "Prvo ukucajte naziv zadatka.", diff --git a/common/locales/sv/backgrounds.json b/common/locales/sv/backgrounds.json index 20239e09f5..2a1383e33a 100644 --- a/common/locales/sv/backgrounds.json +++ b/common/locales/sv/backgrounds.json @@ -119,18 +119,18 @@ "backgroundSlimySwampNotes": "Slaska genom en slemmig sumpmark", "backgroundSwarmingDarknessText": "Myllrande Mörker", "backgroundSwarmingDarknessNotes": "Rys i det myllrande mörkret", - "backgrounds112015": "SET 18: Released November 2015", - "backgroundFloatingIslandsText": "Floating Islands", - "backgroundFloatingIslandsNotes": "Hop across the Floating Islands.", - "backgroundNightDunesText": "Night Dunes", - "backgroundNightDunesNotes": "Walk peacefully through the Night Dunes.", - "backgroundSunsetOasisText": "Sunset Oasis", - "backgroundSunsetOasisNotes": "Bask in the Sunset Oasis.", - "backgrounds122015": "SET 19: Released December 2015", - "backgroundAlpineSlopesText": "Alpine Slopes", - "backgroundAlpineSlopesNotes": "Ski on the Alpine Slopes.", - "backgroundSnowySunriseText": "Snowy Sunrise", - "backgroundSnowySunriseNotes": "Gaze at the Snowy Sunrise.", - "backgroundWinterTownText": "Winter Town", + "backgrounds112015": "SET 18: Släpptes November 2015", + "backgroundFloatingIslandsText": "Svävande Öarna", + "backgroundFloatingIslandsNotes": "Hoppa mellan de Svävande Öarna.", + "backgroundNightDunesText": "Nattens Sanddyner", + "backgroundNightDunesNotes": "Vandra fridfullt genom Nattens Sanddyner.", + "backgroundSunsetOasisText": "Solnedgångsoasen", + "backgroundSunsetOasisNotes": "Sola vid Solnedgångsoasen.", + "backgrounds122015": "SET 19: Släpptes December 2015", + "backgroundAlpineSlopesText": "Alpina Backarna", + "backgroundAlpineSlopesNotes": "Åk skidor i de Alpina Backarna.", + "backgroundSnowySunriseText": "Snöig Soluppgång", + "backgroundSnowySunriseNotes": "Betrakta den Snöiga Soluppgången.", + "backgroundWinterTownText": "Vinterstaden", "backgroundWinterTownNotes": "Bustle through a Winter Town." } \ No newline at end of file diff --git a/common/locales/sv/challenge.json b/common/locales/sv/challenge.json index 1c92faac8b..123a44c59b 100644 --- a/common/locales/sv/challenge.json +++ b/common/locales/sv/challenge.json @@ -60,8 +60,8 @@ "noPermissionEditChallenge": "Du har inte tillstånd att ändra den här utmaningen.", "noPermissionDeleteChallenge": "Du har inte tillstånd att ta bort den här utmaningen.", "noPermissionCloseChallenge": "Du har inte tillstånd att stänga den här utmaningen.", - "congratulations": "Congratulations!", - "hurray": "Hurray!", - "noChallengeOwner": "no owner", - "noChallengeOwnerPopover": "This challenge does not have an owner because the person who created the challenge deleted their account." + "congratulations": "Grattis!", + "hurray": "Hurra!", + "noChallengeOwner": "ingen ägare", + "noChallengeOwnerPopover": "Den här utmaningen ägs inte på grund av att skaparen har tagit bort sitt konto. " } \ No newline at end of file diff --git a/common/locales/sv/character.json b/common/locales/sv/character.json index d06d0f4899..86ded6c74d 100644 --- a/common/locales/sv/character.json +++ b/common/locales/sv/character.json @@ -52,7 +52,7 @@ "classEquipBonus": "Klassbonus", "battleGear": "Stridsutrustning", "battleGearText": "Detta är den utrustning som du bär i strid och den påverkar siffrorna när du hanterar dina uppgifter.", - "autoEquipBattleGear": "Auto-equip new gear", + "autoEquipBattleGear": "Använd ny utrustning automatiskt ", "costume": "Dräkt", "costumeText": "Om du föredrar utseendet på annan utrustning än den du har på dig, kryssa i rutan \"Använd Dräkt\" för att visa upp din favoritdräkt medan du har på dig din stridsutrustning undertill.", "useCostume": "Använd Dräkt", @@ -65,10 +65,10 @@ "ultimGearText": "Har uppgraderat till max för vapen och utrustning för de följande klasserna:", "level": "Level", "levelUp": "Level upp!", - "gainedLevel": "You gained a level!", - "leveledUp": "By accomplishing your real-life goals, you've grown to Level <%= level %>!", - "fullyHealed": "You have been fully healed!", - "huzzah": "Huzzah!", + "gainedLevel": "Du har levlat upp!", + "leveledUp": "Genom att nå dina livsmål, så har du växt till Level <%= level %>!", + "fullyHealed": "Din hälsa har återställts!", + "huzzah": "Hurra!", "mana": "Mana", "hp": "HP", "mp": "MP", diff --git a/common/locales/sv/content.json b/common/locales/sv/content.json index 7635bd95e6..a9c5a22f64 100644 --- a/common/locales/sv/content.json +++ b/common/locales/sv/content.json @@ -95,12 +95,15 @@ "questEggHorseText": "Häst", "questEggHorseMountText": "Häst", "questEggHorseAdjective": "galloperande", - "questEggFrogText": "Frog", - "questEggFrogMountText": "Frog", - "questEggFrogAdjective": "a princely", - "questEggSnakeText": "Snake", - "questEggSnakeMountText": "Snake", - "questEggSnakeAdjective": "a slithering", + "questEggFrogText": "Groda", + "questEggFrogMountText": "Groda", + "questEggFrogAdjective": "en prinslig", + "questEggSnakeText": "Orm", + "questEggSnakeMountText": "Orm", + "questEggSnakeAdjective": "en slingrande", + "questEggUnicornText": "Unicorn", + "questEggUnicornMountText": "Winged Unicorn", + "questEggUnicornAdjective": "a magical", "eggNotes": "Hitta en kläckningsdryck och häll på det här ägget så kommer det kläckas till <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Standard", "hatchingPotionWhite": "Vit", @@ -113,6 +116,7 @@ "hatchingPotionCottonCandyBlue": "Ljusblå", "hatchingPotionGolden": "Guld", "hatchingPotionSpooky": "läskig", + "hatchingPotionPeppermint": "Peppermint", "hatchingPotionNotes": "Häll den här på ett ägg, så kläcks det som ett <%= potText(locale) %> husdjur.", "premiumPotionAddlNotes": "Kan ej användas på ägg till uppdragshusdjur", "foodMeat": "Kött", diff --git a/common/locales/sv/contrib.json b/common/locales/sv/contrib.json index 04bf13aaac..666e8b5c7c 100644 --- a/common/locales/sv/contrib.json +++ b/common/locales/sv/contrib.json @@ -28,7 +28,7 @@ "helped": "Hjälpte Habit Växa", "helpedText1": "Hjälpte Habitica växa genom att fylla i", "helpedText2": "denna undersökning.", - "hall": "Hall", + "hall": "Sal", "contribTitle": "Medarbetare-titel (t.ex. \"Smed\")", "contribLevel": "Medarbetarnivå", "contribHallText": "1-7 för normala medhjälpare, 8 för moderatorer, 9 för personal. Detta bestämmer även vilka föremål, husdjur samt riddjur som finns tillgängliga. Bestämmer även färg på namntagg. Nivåerna 8 och 9 blir automatiskt givna admin status.", diff --git a/common/locales/sv/death.json b/common/locales/sv/death.json index 935da8131e..b32bc97d1d 100644 --- a/common/locales/sv/death.json +++ b/common/locales/sv/death.json @@ -5,12 +5,12 @@ "refillHealthTryAgain": "Fyll på Hälsa & Försök Igen", "dyingOftenTips": "Händer detta ofta? Här är några tips!", "losingHealthWarning": "Försiktigt - Du förlorar hälsan!", - "losingHealthWarning2": "Don't let your Health drop to zero! If you do, you'll lose a level, your Gold, and a piece of equipment.", + "losingHealthWarning2": "Låt inte din hälsa nå noll! Om du gör det, förlorar du en level, guld och en del av din utrustning.", "toRegainHealth": "För att återfå hälsa:", - "lowHealthTips1": "Level up to fully heal!", - "lowHealthTips2": "Buy a Health Potion from the Rewards column to restore 15 Health Points.", - "losingHealthQuickly": "Losing Health quickly?", - "lowHealthTips3": "Incomplete Dailies hurt you overnight, so be careful not to add too many at first!", - "lowHealthTips4": "If a Daily isn't due on a certain day, you can disable it by clicking the pencil icon.", - "goodLuck": "Good luck!" + "lowHealthTips1": "Nå nästa level för att helas till fullt!", + "lowHealthTips2": "Köp en hälsodryck från belöningskolumnen för att återställa 15 hälsopoäng.", + "losingHealthQuickly": "Tappar du hälsa snabbt?", + "lowHealthTips3": "Oavklarade Dagliga Uppgifter skadar dig under natten, så var försiktig och inte lägga till för många i början!", + "lowHealthTips4": "Om en daglig uppgift inte behöver göras på en viss veckodag, så kan du avaktivera det genom att klicka på penn-symbolen.", + "goodLuck": "Lycka till!" } \ No newline at end of file diff --git a/common/locales/sv/faq.json b/common/locales/sv/faq.json index da4277f7f7..d7f92f6d9d 100644 --- a/common/locales/sv/faq.json +++ b/common/locales/sv/faq.json @@ -36,9 +36,9 @@ "faqQuestion11": "Hur rapporterar jag en bugg eller begär en funktion?", "iosFaqAnswer11": "You can report a bug, request a feature, or send feedback under Menu > Report a Bug and Menu > Send Feedback! We'll do everything we can to assist you.", "webFaqAnswer11": "Bug reports are collected on GitHub. Go to [Help > Report a Bug](https://github.com/HabitRPG/habitrpg/issues/2760) and follow the instructions. Don't worry, we'll get you fixed up soon!\nThe Golden Knight has been getting on poor Habiticans' cases. Didn't do all of your Dailies? Checked off a negative Habit? She will use this as a reason to harass you about how you should follow her example. She is the shining example of a perfect Habitican, and you are naught but a failure. Well, that is not nice at all! Everyone makes mistakes. They should not have to be met with such negativity for it. Perhaps it is time you gather some testimonies from hurt Habiticans and give the Golden Knight a stern talking-to!
", "questGoldenknight1CollectTestimony": "Vittnesmål", - "questGoldenknight1DropGoldenknight2Quest": "Den Gyllene Riddarens Kedja Del 2: Skamfilat Guld (Skriftrulle)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "The Golden Knight, Part 2: Gold Knight", "questGoldenknight2Notes": "Beväpnad med hundratals Habiticaners vittnesmål konfronterar du till sist den Gyllene Riddaren. Du börjar läsa upp Habiticanernas klagomål, ett efter ett. \"Och @Pfeffernusse säger att ditt konstanta skrytande...\" Riddaren höjer sin hand för att tysta dig och fnyser: \"Men snälla du, de är bara avundsjuka på min framgång. Istället för att klaga borde de helt enkelt arbeta lika hårt som jag\" Jag kanske ska visa dig vilken kraft man kan få genom att vara såhär flitig!\" Hon höjer sin morgonstjärna och förbereder en attack!
", "questGoldenknight2Boss": "Gyllene Riddare", @@ -213,7 +213,7 @@ "questWhaleNotes": "You arrive at the Diligent Docks, hoping to take a submarine to watch the Dilatory Derby. Suddenly, a deafening bellow forces you to stop and cover your ears. \"Thar she blows!\" cries Captain @krazjega, pointing to a huge, wailing whale. \"It's not safe to send out the submarines while she's thrashing around!\"The Golden Knight has been getting on poor Habiticans' cases. Didn't do all of your Dailies? Checked off a negative Habit? She will use this as a reason to harass you about how you should follow her example. She is the shining example of a perfect Habitican, and you are naught but a failure. Well, that is not nice at all! Everyone makes mistakes. They should not have to be met with such negativity for it. Perhaps it is time you gather some testimonies from hurt Habiticans and give the Golden Knight a stern talking-to!
", "questGoldenknight1CollectTestimony": "Свідчення", - "questGoldenknight1DropGoldenknight2Quest": "Золотий Лицар, частина 2: Потьмяніле Золото (Сувій)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "The Golden Knight, Part 2: Gold Knight", "questGoldenknight2Notes": "Armed with hundreds of Habitican's testimonies, you finally confront the Golden Knight. You begin to recite the Habitcan's complaints to her, one by one. \"And @Pfeffernusse says that your constant bragging-\" The knight raises her hand to silence you and scoffs, \"Please, these people are merely jealous of my success. Instead of complaining, they should simply work as hard as I! Perhaps I shall show you the power you can attain through diligence such as mine!\" She raises her morningstar and prepares to attack you!
", "questGoldenknight2Boss": "Золотий Лицар", @@ -273,5 +273,11 @@ "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", "questSnakeBoss": "Serpent of Distraction", "questSnakeDropSnakeEgg": "Snake (Egg)", - "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market" + "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market", + "questUnicornText": "Convincing the Unicorn Queen", + "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", + "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", + "questUnicornBoss": "The Unicorn Queen", + "questUnicornDropUnicornEgg": "Unicorn (Egg)", + "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market" } \ No newline at end of file diff --git a/common/locales/uk/rebirth.json b/common/locales/uk/rebirth.json index 71f3ba9dec..ee9940b4aa 100644 --- a/common/locales/uk/rebirth.json +++ b/common/locales/uk/rebirth.json @@ -16,12 +16,13 @@ "rebirthEarnAchievement": "Ви отримали досягнення за початок нової пригоди!", "beReborn": "Переродись-но!", "rebirthAchievement": "Ви почали нову пригоду! Це Ваше <%= number %> переродження, Ви досягали найбільше <%= level %> рівня. Аби збільшити це досягнення, почніть свою нову пригоду після того, як досягнете вищого рівня!", - "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!", + "rebirthAchievement100": "Ви почали нову пригоду! Це ваше <%= number %> переродження, і найвищий рівень який ви отримали - 100 чи більше. Щоби додати більше до цього досягнення, почніть вашу наступну пригоду, коли отримаєте якнайменше рівень 100!", "rebirthBegan": "Нова пригода починається", "rebirthText": "Нова пригода <%= rebirths %> починається", "rebirthOrb": "Куля переродження була використана, аби почати заново після досягнення рівня", - "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher", + "rebirthOrb100": "Використано Сферу переродження, щоби почати знову після отримання рівня 100 чи вище", "rebirthPop": "Розпочніть заново з персонажем 1 рівня, зберігши досягнення, колекційні предмети та завдання з історією.", "rebirthName": "Куля переродження", - "reborn": "Переродження, максимальний рівень <%= reLevel %>" + "reborn": "Переродження, максимальний рівень <%= reLevel %>", + "confirmReborn": "Are you sure?" } \ No newline at end of file diff --git a/common/locales/uk/settings.json b/common/locales/uk/settings.json index 452e75911b..e7413e98d8 100644 --- a/common/locales/uk/settings.json +++ b/common/locales/uk/settings.json @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "Check to Unsubscribe from Emails", "unsubscribeAllEmailsText": "By checking this box, I certify that I understand that by unsubscribing from all emails, Habitica will never be able to notify me via email about important changes to the site or my account.", "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.", - "subscriptionRateText": "Recurring $<%= price %> every <%= months %> months", + "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", "benefits": "Benefits", "coupon": "Coupon", "couponPlaceholder": "Enter Coupon Code", @@ -136,7 +136,7 @@ "buyGemsGoldCap": "Cap raised to <%= amount %>", "mysticHourglass": "<%= amount %> Mystic Hourglass", "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.", - "purchasedPlanId": "Recurring $<%= price %> each <%= months %> Month(s) (<%= plan %>)", + "purchasedPlanId": "Recurring $<%= price %> USD each <%= months %> Month(s) (<%= plan %>)", "purchasedPlanExtraMonths": "You have <%= months %> months of subscription credit.", "consecutiveSubscription": "Consecutive Subscription", "consecutiveMonths": "Consecutive Months:", diff --git a/common/locales/uk/subscriber.json b/common/locales/uk/subscriber.json index ab20919f17..5b063f488d 100644 --- a/common/locales/uk/subscriber.json +++ b/common/locales/uk/subscriber.json @@ -63,6 +63,32 @@ "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "timeTravelersAlreadyOwned": "Congratulations! You already own everything the Time Travelers currently offer. Thanks for supporting the site!", "mysticHourglassPopover": "A Mystic Hourglass allows you to purchase certain limited-time items, such as monthly Mystery Item Sets and awards from world bosses, from the past!", + "mysterySet201402": "Winged Messenger Set", + "mysterySet201403": "Forest Walker Set", + "mysterySet201404": "Twilight Butterfly Set", + "mysterySet201405": "Flame Wielder Set", + "mysterySet201406": "Octomage Set", + "mysterySet201407": "Undersea Explorer Set", + "mysterySet201408": "Sun Sorcerer Set", + "mysterySet201409": "Autumn Strider Set", + "mysterySet201410": "Winged Goblin Set", + "mysterySet201411": "Feast and Fun Set", + "mysterySet201412": "Penguin Set", + "mysterySet201501": "Starry Knight Set", + "mysterySet201502": "Winged Enchanter Set", + "mysterySet201503": "Aquamarine Set", + "mysterySet201504": "Busy Bee Set", + "mysterySet201505": "Green Knight Set", + "mysterySet201506": "Neon Snorkeler Set", + "mysterySet201507": "Rad Surfer Set", + "mysterySet201508": "Cheetah Costume Set", + "mysterySet201509": "Werewolf Set", + "mysterySet201510": "Horned Goblin Set", + "mysterySet201511": "Wood Warrior Set", + "mysterySet201512": "Winter Flame Set", + "mysterySet301404": "Steampunk Standard Set", + "mysterySet301405": "Steampunk Accessories Set", + "mysterySetwondercon": "Wondercon", "subUpdateCard": "Оновити картку", "subUpdateTitle": "Оновити", "subUpdateDescription": "Оновити картку, з якої будете сплачувати.", diff --git a/common/locales/uk/tasks.json b/common/locales/uk/tasks.json index aaa3adcdde..5c4dbeaf57 100644 --- a/common/locales/uk/tasks.json +++ b/common/locales/uk/tasks.json @@ -5,6 +5,7 @@ "beeminderDeleteWarning": "Шановні учасники: Спершу прочитайте Видалення Виконаних Завдань Без Збиваючих З Пантелику Ситуацій!", "addmultiple": "Додати декілька", "addsingle": "Додати одне", + "habit": "Habit", "habits": "Звички", "newHabit": "Додати звичку", "newHabitBulk": "Нові звички (одна на рядок)", @@ -32,6 +33,7 @@ "mental": "Розумове", "otherExamples": "До прикладу, фахова мета, захоплення, фінанси тощо.", "progress": "Поступ", + "daily": "Daily", "dailies": "Щоденні", "newDaily": "Нове щоденне", "newDailyBulk": "Нові щоденні (одне на рядок)", @@ -46,6 +48,7 @@ "day": "День", "days": "Днів", "restoreStreak": "Відновити серію", + "todo": "To-Do", "todos": "Зробити", "newTodo": "Додати завдання", "newTodoBulk": "Нові завдання (одна на рядок)", @@ -57,6 +60,7 @@ "notDue": "Не обов'язково", "grey": "Сірі", "score": "Рахунок", + "reward": "Reward", "rewards": "Нагороди", "ingamerewards": "Обладунки та Уміння", "gold": "Золото", @@ -86,9 +90,10 @@ "fortifyPop": "Повернути завдання до нейтрального стану (жовтого кольору) та відновити все здоров'я.", "fortify": "Підсилитися", "fortifyText": "Підсилення поверне всі ваші завдання у нейтральний (жовтий) колір, немов ви щойно їх додали, та відновить все ваше здоров’я. Це дуже корисно, якщо ваші червоні задачі роблять гру занадто складною, а сині — занадто простою. Якщо новий початок з чистої сторінки вас мотивує, не шкодуйте самоцвіти та отримайте тимчасове полегшення!", - "sureDelete": "Ви справді бажаєте вилучити це завдання?", + "confirmFortify": "Are you sure?", + "sureDelete": "Are you sure you want to delete the <%= taskType %> with the text \"<%= taskText %>\"?", "streakCoins": "Бонус за серію!", - "pushTaskToTop": "Push task to top. Hold ctrl or cmd to push to bottom.", + "pushTaskToTop": "Перемістити завдання нагору. Натисніть CTRL або CMD, щоб перемістити його донизу", "emptyTask": "Спочатку введіть назву завдання", "dailiesRestingInInn": "Ви відпочиваєте у Господі! Ващі щоденні задачі НЕ пошкодять вас сьогодні, але вони БУДУТЬ оновлюватися кожної доби. Якщо ви у квесті, ви не будете наносити пошкоджень чи отримувати предмети, поки не залишите Господу, але ви все одно можете бути пошкоджени Босом, якщо хтось з вашого Гурту не виконає щоденні задачі.", "habitHelp1": "Корисні звички - це те, що ви часто робите. Вони приносять Золото та Досвід щоразу, як ви клацаєте <%= plusIcon %>.", diff --git a/common/locales/zh/backgrounds.json b/common/locales/zh/backgrounds.json index c21ae8d4e9..3b3adb1a33 100644 --- a/common/locales/zh/backgrounds.json +++ b/common/locales/zh/backgrounds.json @@ -126,11 +126,11 @@ "backgroundNightDunesNotes": "在夜幕沙丘中静静穿行", "backgroundSunsetOasisText": "日落绿洲", "backgroundSunsetOasisNotes": "沐浴在日落绿洲", - "backgrounds122015": "SET 19: Released December 2015", - "backgroundAlpineSlopesText": "Alpine Slopes", - "backgroundAlpineSlopesNotes": "Ski on the Alpine Slopes.", - "backgroundSnowySunriseText": "Snowy Sunrise", - "backgroundSnowySunriseNotes": "Gaze at the Snowy Sunrise.", - "backgroundWinterTownText": "Winter Town", - "backgroundWinterTownNotes": "Bustle through a Winter Town." + "backgrounds122015": "第19组：2015年12月推出", + "backgroundAlpineSlopesText": "滑雪山坡", + "backgroundAlpineSlopesNotes": "在山坡上滑雪", + "backgroundSnowySunriseText": "雪地日出", + "backgroundSnowySunriseNotes": "凝视雪地上升起的太阳", + "backgroundWinterTownText": "冬日小镇", + "backgroundWinterTownNotes": "在冬日小镇里穿行" } \ No newline at end of file diff --git a/common/locales/zh/content.json b/common/locales/zh/content.json index 489d8f36db..038f913c47 100644 --- a/common/locales/zh/content.json +++ b/common/locales/zh/content.json @@ -101,6 +101,9 @@ "questEggSnakeText": "蛇", "questEggSnakeMountText": "蛇", "questEggSnakeAdjective": "一条嘶嘶的", + "questEggUnicornText": "独角兽", + "questEggUnicornMountText": "有翼独角兽", + "questEggUnicornAdjective": "一个神奇的", "eggNotes": "将一瓶孵化药水倒在这个宠物蛋上，你就能孵化出一只<%= eggAdjective(locale) %><%= eggText(locale) %>。", "hatchingPotionBase": "普通", "hatchingPotionWhite": "白色", @@ -113,6 +116,7 @@ "hatchingPotionCottonCandyBlue": "蓝色棉花糖", "hatchingPotionGolden": "金色", "hatchingPotionSpooky": "阴森森的", + "hatchingPotionPeppermint": "薄荷", "hatchingPotionNotes": "把它倒在宠物蛋上可以孵化出一只<%= potText(locale) %>宠物。", "premiumPotionAddlNotes": "无法在任务奖励宠物蛋上使用", "foodMeat": "肉", diff --git a/common/locales/zh/faq.json b/common/locales/zh/faq.json index 7f3c1af2d7..551d55d38d 100644 --- a/common/locales/zh/faq.json +++ b/common/locales/zh/faq.json @@ -2,7 +2,7 @@ "frequentlyAskedQuestions": "经常被问到的问题", "faqQuestion0": "我很迷惑。我在哪里能得到简介 ？", "iosFaqAnswer0": "首先，你要建立起你每天要完成的任务。然后，当你在现实生活中完成这些任务时，在应用中清点它们，你就会得到经验值和金钱。金钱可以用来买装备和一些物品，也可以用来买奖励。经验可以使你的人物升级，并解锁宠物、技能、任务等内容。你可以在菜单>装扮角色中装扮你的角色。\n\n一些基本的交互方法：点击右上角的(+)添加任务。点击一个已经存在的任务去编辑它，左滑来删除它。你可以用左上角标签给任务排序，并通过点击清单气泡来增大和缩小任务清单。", - "webFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn Experience and Gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as pets, skills, and quests! For more detail, check out a step-by-step overview of the game at [Help -> Overview for New Users](https://habitica.com/static/overview).", + "webFaqAnswer0": "首先，你要建立起你每天要完成的任务。然后，当你在现实生活中完成这些任务时，在应用中清点它们，你就会得到经验值和金钱。金钱可以用来买装备和一些物品，也可以用来买奖励。经验可以使你的人物升级，并解锁宠物、技能、任务等内容。更多内容，可以在[帮助 -> 新手教学](https://habitica.com/static/overview).查看详细的游戏入门。", "faqQuestion1": "怎样来建立一个任务？", "iosFaqAnswer1": "好习惯(有+号的那些)养成任务你能够在一天之内完成很多次，比如多吃蔬菜。坏习惯(带有-号的)则是你需要避免去做的，比如啃指甲。同时带有+和-号的任务表示某件事可以有好坏两个选择，比如走楼梯上楼，还有乘坐电梯。养成好习惯能奖励你经验值和金币，坏习惯则会损害生命值。\n\n每日任务是你每天都必须完成的事项，比如刷牙，或者检查你的邮件。可以通过点击每日任务编辑任务完成期限，如果在一个任务到期前你没能完成它，你的健康值将降低，小心，不要一次性加太多每日任务！\n\n待办任务就是你的待办项列表，完成一个待办任务可以获得金币和经验值，你不会因为待办任务损失生命值，可以点击编辑一个待办任务来为它添加完成期限。", "webFaqAnswer1": "好习惯(有的那些)养成任务你能够在一天之内完成很多次，比如多吃蔬菜。坏习惯(带有的)则是你需要避免去做的，比如啃指甲。同时带有 和 的任务表示某件事可以有好坏两个选择，比如走楼梯上楼，还有乘坐电梯。养成好习惯能奖励你经验值和金币，坏习惯则会损害生命值。\n黄金骑士得知了可怜的Habitican们的情况。没有将你们的每日任务全部完成?记录下一个不好的习惯?她会以此为理由来不断的骚扰你，教你怎样像她一样。她是完美的Habitican的经典范例，而你只不过是一个失败者。但是，虽然这的确有点儿不光彩！但是所有人都会犯错。那些犯了错的人也不应因此就受到这样消极的待遇。也许现在对你来说正是时候，从受到伤害的Habitican们那里收集一些证据，然后和黄金骑士来一场严肃的谈话
", "questGoldenknight1CollectTestimony": "证据", - "questGoldenknight1DropGoldenknight2Quest": "黄金骑士项链第2部：暗淡的黄金 (卷轴)", + "questGoldenknight1DropGoldenknight2Quest": "黄金骑士项链第2部：黄金骑士 (卷轴)", "questGoldenknight2Text": "黄金骑士，第2部：黄金骑士", "questGoldenknight2Notes": "身上带着上百个Habitican们的证据，你最终面对着黄金骑士，开始一个接着一个地对她陈述Habitican们对她的不满，“还有@Pfeffernusse说你总是不停的讨价还价-”黄金骑士举起了她的手打断了你，嘲弄道，“拜托，这些人只不过是嫉妒我的成功。比起抱怨，他们更应该像我一样努力的工作！也许我应该向你展示一下，就像我一样，勤奋所能给予你的力量！”说着她举起狼牙棒，准备攻击你！
", "questGoldenknight2Boss": "黄金骑士", @@ -200,7 +200,7 @@ "questSheepText": "雷霆公羊", "questSheepNotes": "在你和朋友一起到任务汗国的乡村郊外散步时，你打算花很短的时间开个小差，于是发现了一间毛纺店，于是你陷入了拖延症不可自拔，都没有发现天际出现了不祥的乌云。“我有个天气要不……不……不好的感觉。” @Misceo 喃喃的说，你抬起了头，雷雨云正聚在一起翻滚，而且看起来很像一群……“我们没空看云瞎想了！” @starsystemic 喊道，“它要打过来了！”雷霆公羊向前撞去，向你甩去一道一道的闪电！", "questSheepBoss": "雷霆公羊", - "questSheepCompletion": "雷霆公羊被你的用功震撼了，它的愤怒已经耗尽，最终它向你甩来三个巨大的冰雹，然后随着低沉的轰隆声逐渐消失。仔细观察以后你发现这些冰雹其实是三个毛茸茸的蛋。你把他们收了起来，在碧蓝的天空下向家走去。", + "questSheepCompletion": "雷霆公羊被你的勤奋震撼了，它的愤怒已经耗尽，最终它向你甩来三个巨大的冰雹，然后随着低沉的轰隆声逐渐消失。仔细观察以后你发现这些冰雹其实是三个毛茸茸的蛋。你把他们收了起来，在碧蓝的天空下向家走去。", "questSheepDropSheepEgg": "羊(蛋)", "questSheepUnlockText": "解锁绵羊蛋购买功能", "questKrakenText": "未完成海妖", @@ -210,43 +210,43 @@ "questKrakenDropCuttlefishEgg": "墨鱼(蛋)", "questKrakenUnlockText": "解锁墨鱼蛋购买功能", "questWhaleText": "鲸之哀嚎", - "questWhaleNotes": "You arrive at the Diligent Docks, hoping to take a submarine to watch the Dilatory Derby. Suddenly, a deafening bellow forces you to stop and cover your ears. \"Thar she blows!\" cries Captain @krazjega, pointing to a huge, wailing whale. \"It's not safe to send out the submarines while she's thrashing around!\"黃金騎士得知了可憐的Habit公民們的情況。沒有將你們的每日任務全部完成?記錄下一個不好的習慣?她會以此為理由來不斷的騷擾你，教你怎樣像她一樣。她是完美Habit公民的經典範例，而你只不過是一個失敗者。但是，雖然這的確有點不光彩！但是所有人都會犯錯。那些犯了錯的人也不應因此就受到這樣消極的待遇。也許現在對你來說正是時候，從受到傷害的Habit公民們那裡收集一些證據，然後和黃金騎士來一場嚴肅的談話
", "questGoldenknight1CollectTestimony": "證明", - "questGoldenknight1DropGoldenknight2Quest": "黃金騎士的項鍊-第2部：失色的黃金(卷軸)", + "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "黃金騎士之鍊，第2部：金幣騎士", "questGoldenknight2Notes": "帶著上百個Habit公民提供的證據，你面對著黃金騎士，開始一個接著一個地對她陳述Habit公民們對她的不滿，\"還有@Pfeffernusse說你總是不停的討價還價-\"黃金騎士舉起了她的手打斷了你，嘲弄道，\"拜託，這些人只不過是嫉妒我的成功。比起抱怨，他們更應該像我一樣努力的工作！也許我應該向你展示一下，就像我一樣，勤奮所能給予你的力量！\"說著她舉起狼牙棒，準備攻擊你！
", "questGoldenknight2Boss": "黃金騎士", @@ -273,5 +273,11 @@ "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", "questSnakeBoss": "Serpent of Distraction", "questSnakeDropSnakeEgg": "蛇（蛋）", - "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market" + "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market", + "questUnicornText": "Convincing the Unicorn Queen", + "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", + "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", + "questUnicornBoss": "The Unicorn Queen", + "questUnicornDropUnicornEgg": "Unicorn (Egg)", + "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market" } \ No newline at end of file diff --git a/common/locales/zh_TW/rebirth.json b/common/locales/zh_TW/rebirth.json index 500fa9790d..c69cdd7e30 100644 --- a/common/locales/zh_TW/rebirth.json +++ b/common/locales/zh_TW/rebirth.json @@ -17,11 +17,12 @@ "beReborn": "重生", "rebirthAchievement": "你開始了一段新冒險！這是你的第<%= number %>次冒險，你曾經獲得的最高級別是<%= level %>級。要累積這個成就，你要在獲得更高等級之後，再開始下一次冒險！", "rebirthAchievement100": "開始了一趟新的冒險旅程！這是你第 <%= number %> 次重生，而你的最高等級達到了 100 以上。要完成這個成就，在你等級至少 100 後開啟新的一趟旅程吧！", - "rebirthBegan": "開始新的冒險", + "rebirthBegan": "已開始新的冒險", "rebirthText": "開始<%= rebirths %> 次新的冒險", "rebirthOrb": "使用重生之球來歸零曾經到達的級別，重新開始遊戲", "rebirthOrb100": "到達級別 100 後，使用重生之球來重生遊戲。", "rebirthPop": "開始一個等級 1 的新角色，並保留成就、物品和任務歷史。", "rebirthName": "重生之球", - "reborn": "重生，最高級別 <%= reLevel %>" + "reborn": "重生，最高級別 <%= reLevel %>", + "confirmReborn": "Are you sure?" } \ No newline at end of file diff --git a/common/locales/zh_TW/settings.json b/common/locales/zh_TW/settings.json index d5c8f135c8..ea5942e973 100644 --- a/common/locales/zh_TW/settings.json +++ b/common/locales/zh_TW/settings.json @@ -93,7 +93,7 @@ "loginNameDescription2": "玩家→基本資料", "loginNameDescription3": "來修改你的你的角色和在聊天室的名字。", "emailNotifications": "電子郵件通知", - "wonChallenge": "You won a Challenge!", + "wonChallenge": "你贏得一個挑戰！", "newPM": "收到的私密訊息", "giftedGems": "禮物用寶石", "giftedGemsInfo": "<%= name %> 的 <%= amount %> 個寶石", @@ -112,7 +112,7 @@ "unsubscribeAllEmails": "取消電子郵件訂閱", "unsubscribeAllEmailsText": "勾選此欄，並且我明白地知道我將取消全部的電子郵件訂閱，Habitica再也沒辦法利用電子郵件提醒我，關於網站或帳戶的重大更改。", "correctlyUnsubscribedEmailType": "從\"<%= emailType %>\"取消訂閱電子郵件。", - "subscriptionRateText": "<%= months %> 個月反覆 <%= price %> 次", + "subscriptionRateText": "Recurring $<%= price %> USD every <%= months %> months", "benefits": "好處", "coupon": "優惠券", "couponPlaceholder": "輸入優惠券代碼", @@ -136,12 +136,12 @@ "buyGemsGoldCap": "上限提高到<%= amount %>", "mysticHourglass": "<%= amount %>神秘沙漏", "mysticHourglassText": "神秘沙漏允許您購買以前每月神祕的物品。", - "purchasedPlanId": "定期$<%= price %>每 <%= months %>月(s) (<%= plan %>)", + "purchasedPlanId": "Recurring $<%= price %> USD each <%= months %> Month(s) (<%= plan %>)", "purchasedPlanExtraMonths": "You have <%= months %> months of subscription credit.", "consecutiveSubscription": "連續訂閱", "consecutiveMonths": "Consecutive Months:", "gemCapExtra": "Gem Cap Extra:", - "mysticHourglasses": "Mystic Hourglasses:", + "mysticHourglasses": "神秘沙漏", "paypal": "PayPal", "amazonPayments": "Amazon Payments", "timezone": "Time Zone", diff --git a/common/locales/zh_TW/subscriber.json b/common/locales/zh_TW/subscriber.json index 7e268d9293..e60422a445 100644 --- a/common/locales/zh_TW/subscriber.json +++ b/common/locales/zh_TW/subscriber.json @@ -63,6 +63,32 @@ "timeTravelersPopover": "我們發現你擁有神秘沙漏，很高興能為你穿越時空！請選擇你想要的寵物、座騎或神秘物品。你可以在這裡觀看看到往昔物品的清單 ！如果這些無法滿足你，也許你會對我們時髦的未來風蒸氣龐克物品有興趣？", "timeTravelersAlreadyOwned": "恭喜！你已擁有時光旅行者目前所供應的所有物品。感謝你對這個網站的支持！", "mysticHourglassPopover": "神秘沙漏能讓你購買特定的限期物品，像是每個月的神祕物品和世界 Boss 的獎品，取得過去的東西！", + "mysterySet201402": "Winged Messenger Set", + "mysterySet201403": "Forest Walker Set", + "mysterySet201404": "Twilight Butterfly Set", + "mysterySet201405": "Flame Wielder Set", + "mysterySet201406": "Octomage Set", + "mysterySet201407": "Undersea Explorer Set", + "mysterySet201408": "Sun Sorcerer Set", + "mysterySet201409": "Autumn Strider Set", + "mysterySet201410": "Winged Goblin Set", + "mysterySet201411": "Feast and Fun Set", + "mysterySet201412": "Penguin Set", + "mysterySet201501": "Starry Knight Set", + "mysterySet201502": "Winged Enchanter Set", + "mysterySet201503": "Aquamarine Set", + "mysterySet201504": "Busy Bee Set", + "mysterySet201505": "Green Knight Set", + "mysterySet201506": "Neon Snorkeler Set", + "mysterySet201507": "Rad Surfer Set", + "mysterySet201508": "Cheetah Costume Set", + "mysterySet201509": "Werewolf Set", + "mysterySet201510": "Horned Goblin Set", + "mysterySet201511": "Wood Warrior Set", + "mysterySet201512": "Winter Flame Set", + "mysterySet301404": "Steampunk Standard Set", + "mysterySet301405": "Steampunk Accessories Set", + "mysterySetwondercon": "Wondercon", "subUpdateCard": "更新信用卡資訊", "subUpdateTitle": "更新", "subUpdateDescription": "更新信用卡以便我們扣款", diff --git a/common/locales/zh_TW/tasks.json b/common/locales/zh_TW/tasks.json index 9a208abbe9..30bbc6aef5 100644 --- a/common/locales/zh_TW/tasks.json +++ b/common/locales/zh_TW/tasks.json @@ -5,6 +5,7 @@ "beeminderDeleteWarning": "Beeminder 用戶: 首先 請閱讀 刪除已完成的待辦事項而不影響你的 Beeminder!", "addmultiple": "新增多項", "addsingle": "新增單項", + "habit": "Habit", "habits": "習慣", "newHabit": "新增習慣", "newHabitBulk": "新習慣(每行一個)", @@ -32,6 +33,7 @@ "mental": "勞心", "otherExamples": "例如：追求工作上的進步、培養嗜好、理財等等。", "progress": "進度", + "daily": "Daily", "dailies": "每日任務", "newDaily": "增加一個每日任務", "newDailyBulk": "新每日任務(每行一個)", @@ -46,6 +48,7 @@ "day": "日", "days": "日", "restoreStreak": "重設連擊數", + "todo": "To-Do", "todos": "待辦事項", "newTodo": "增加待辦事項", "newTodoBulk": "新代辦事項(每行一個)", @@ -57,6 +60,7 @@ "notDue": "未到期", "grey": "已完成", "score": "分數", + "reward": "Reward", "rewards": "獎勵", "ingamerewards": "裝備與技能", "gold": "金幣", @@ -86,7 +90,8 @@ "fortifyPop": "將所有任務調回中性 ( 黃色 )，並將 HP 補滿。", "fortify": "穩固", "fortifyText": "鞏固會將你的任務回復到中性狀態 ( 黃色 ，如同剛新增時)，並把你的生命值補滿。把它當成無計可施時的最後王牌！紅色會為進步提供良好的動力，但如果滿目紅色讓你難過，且每天開始時都對你致命，那麼花費寶石來喘口氣吧！", - "sureDelete": "你確定要刪除這個任務嗎？", + "confirmFortify": "Are you sure?", + "sureDelete": "Are you sure you want to delete the <%= taskType %> with the text \"<%= taskText %>\"?", "streakCoins": "連擊獎勵", "pushTaskToTop": "Push task to top. Hold ctrl or cmd to push to bottom.", "emptyTask": "請先輸入任務的標題", diff --git a/common/script/constants.js b/common/script/constants.js new file mode 100644 index 0000000000..d6e0aa9384 --- /dev/null +++ b/common/script/constants.js @@ -0,0 +1,3 @@ +export const MAX_HEALTH = 50; +export const MAX_LEVEL = 100; +export const MAX_STAT_POINTS = MAX_LEVEL; diff --git a/common/script/content/appearance.js b/common/script/content/appearance.js new file mode 100644 index 0000000000..659de8be95 --- /dev/null +++ b/common/script/content/appearance.js @@ -0,0 +1,62 @@ +export let defaultAppearancePreferences = { + background: {}, + hair: { + bangs: { + 0: true, + 1: true, + 2: true, + 3: true, + }, + base: { + 0: true, + 1: true, + 3: true, + }, + beard: { + 0: true, + }, + color: { + white: true, + brown: true, + blond: true, + red: true, + black: true, + }, + flower: { + 0: true, + 1: true, + 2: true, + 3: true, + 4: true, + 5: true, + 6: true, + }, + mustache: { + 0: true, + }, + }, + shirt: { + black: true, + blue: true, + green: true, + pink: true, + white: true, + yellow: true, + }, + size: { + slim: true, + broad: true, + }, + skin: { + /* eslint-disable quote-props */ + 'ddc994': true, + 'f5a76e': true, + 'ea8349': true, + 'c06534': true, + '98461a': true, + '915533': true, + 'c3e1dc': true, + '6bd049': true, + /* eslint-enable quote-props */ + }, +}; diff --git a/common/script/content/constants.js b/common/script/content/constants.js index 0c0ee334e0..70977f8a8b 100644 --- a/common/script/content/constants.js +++ b/common/script/content/constants.js @@ -22,6 +22,7 @@ export const EVENTS = { summer2015: { start: '2015-06-20', end: '2015-08-02' }, fall2015: { start: '2015-09-21', end: '2015-11-01' }, gaymerx: { start: '2015-12-01', end: '2015-12-14' }, + winter2016: { start: '2015-12-18', end: '2016-02-02' }, }; export const GEAR_TYPES = [ diff --git a/common/script/content/gear/sets/armoire.js b/common/script/content/gear/sets/armoire.js index 16f8655be2..3063555bda 100644 --- a/common/script/content/gear/sets/armoire.js +++ b/common/script/content/gear/sets/armoire.js @@ -86,6 +86,14 @@ let armor = { set: 'crystalCrescent', canOwn: ownsItem('armor_armoire_crystalCrescentRobes'), }, + dragonTamerArmor: { + text: t('armorArmoireDragonTamerArmorText'), + notes: t('armorArmoireDragonTamerArmorNotes', { con: 15 }), + value: 100, + con: 15, + set: 'dragonTamer', + canOwn: ownsItem('armor_armoire_dragonTamerArmor'), + }, }; let eyewear = { @@ -250,6 +258,14 @@ let head = { set: 'crystalCrescent', canOwn: ownsItem('head_armoire_crystalCrescentHat'), }, + dragonTamerHelm: { + text: t('headArmoireDragonTamerHelmText'), + notes: t('headArmoireDragonTamerHelmNotes', { int: 15 }), + value: 100, + int: 15, + set: 'dragonTamer', + canOwn: ownsItem('head_armoire_dragonTamerHelm'), + }, }; let shield = { @@ -280,6 +296,14 @@ let shield = { set: 'royal', canOwn: ownsItem('shield_armoire_royalCane'), }, + dragonTamerShield: { + text: t('shieldArmoireDragonTamerShieldText'), + notes: t('shieldArmoireDragonTamerShieldNotes', { per: 15 }), + value: 100, + per: 15, + set: 'dragonTamer', + canOwn: ownsItem('shield_armoire_dragonTamerShield'), + }, }; let weapon = { @@ -375,6 +399,13 @@ let weapon = { twoHanded: true, canOwn: ownsItem('weapon_armoire_blueLongbow'), }, + glowingSpear: { + text: t('weaponArmoireGlowingSpearText'), + notes: t('weaponArmoireGlowingSpearNotes', { str: 15 }), + value: 100, + str: 15, + canOwn: ownsItem('weapon_armoire_glowingSpear'), + }, }; let armoireSet = { diff --git a/common/script/content/gear/sets/mystery.js b/common/script/content/gear/sets/mystery.js index c42973995c..5374ebb4d5 100644 --- a/common/script/content/gear/sets/mystery.js +++ b/common/script/content/gear/sets/mystery.js @@ -97,6 +97,12 @@ let armor = { mystery: '201511', value: 0, }, + 201512: { + text: t('armorMystery201512Text'), + notes: t('armorMystery201512Notes'), + mystery: '201512', + value: 0, + }, 301404: { text: t('armorMystery301404Text'), notes: t('armorMystery301404Notes'), @@ -250,6 +256,12 @@ let head = { mystery: '201511', value: 0, }, + 201512: { + text: t('headMystery201512Text'), + notes: t('headMystery201512Notes'), + mystery: '201512', + value: 0, + }, 301404: { text: t('headMystery301404Text'), notes: t('headMystery301404Notes'), diff --git a/common/script/content/gear/sets/special/index.js b/common/script/content/gear/sets/special/index.js index c87e4d435d..dedfd7137a 100644 --- a/common/script/content/gear/sets/special/index.js +++ b/common/script/content/gear/sets/special/index.js @@ -25,6 +25,9 @@ let armor = { notes: t('armorSpecialYetiNotes', { con: 9 }), con: 9, value: 90, + canBuy: () => { + return true; + }, }, ski: { event: EVENTS.winter, @@ -33,6 +36,9 @@ let armor = { notes: t('armorSpecialSkiNotes', { per: 15 }), per: 15, value: 90, + canBuy: () => { + return true; + }, }, candycane: { event: EVENTS.winter, @@ -41,6 +47,9 @@ let armor = { notes: t('armorSpecialCandycaneNotes', { int: 9 }), int: 9, value: 90, + canBuy: () => { + return true; + }, }, snowflake: { event: EVENTS.winter, @@ -49,11 +58,15 @@ let armor = { notes: t('armorSpecialSnowflakeNotes', { con: 15 }), con: 15, value: 90, + canBuy: () => { + return true; + }, }, birthday: { event: EVENTS.birthday, text: t('armorSpecialBirthdayText'), - notes: t('armorSpecialBirthdayNotes'), value: 0 }, + notes: t('armorSpecialBirthdayNotes'), value: 0, + }, springRogue: { event: EVENTS.spring, specialClass: 'rogue', @@ -169,6 +182,9 @@ let armor = { notes: t('armorSpecialWinter2015RogueNotes', { per: 15 }), value: 90, per: 15, + canBuy: () => { + return true; + }, }, winter2015Warrior: { event: EVENTS.winter2015, @@ -177,6 +193,9 @@ let armor = { notes: t('armorSpecialWinter2015WarriorNotes', { con: 9 }), value: 90, con: 9, + canBuy: () => { + return true; + }, }, winter2015Mage: { event: EVENTS.winter2015, @@ -185,6 +204,9 @@ let armor = { notes: t('armorSpecialWinter2015MageNotes', { int: 9 }), value: 90, int: 9, + canBuy: () => { + return true; + }, }, winter2015Healer: { event: EVENTS.winter2015, @@ -193,6 +215,9 @@ let armor = { notes: t('armorSpecialWinter2015HealerNotes', { con: 15 }), value: 90, con: 15, + canBuy: () => { + return true; + }, }, birthday2015: { text: t('armorSpecialBirthday2015Text'), @@ -302,6 +327,38 @@ let armor = { notes: t('armorSpecialGaymerxNotes'), value: 0, }, + winter2016Rogue: { + event: EVENTS.winter2016, + specialClass: 'rogue', + text: t('armorSpecialWinter2016RogueText'), + notes: t('armorSpecialWinter2016RogueNotes', { per: 15 }), + value: 90, + per: 15, + }, + winter2016Warrior: { + event: EVENTS.winter2016, + specialClass: 'warrior', + text: t('armorSpecialWinter2016WarriorText'), + notes: t('armorSpecialWinter2016WarriorNotes', { con: 9 }), + value: 90, + con: 9, + }, + winter2016Mage: { + event: EVENTS.winter2016, + specialClass: 'wizard', + text: t('armorSpecialWinter2016MageText'), + notes: t('armorSpecialWinter2016MageNotes', { int: 9 }), + value: 90, + int: 9, + }, + winter2016Healer: { + event: EVENTS.winter2016, + specialClass: 'healer', + text: t('armorSpecialWinter2016HealerText'), + notes: t('armorSpecialWinter2016HealerNotes', { con: 15 }), + value: 90, + con: 15, + }, }; let back = { @@ -388,7 +445,7 @@ let head = { canOwn: ownsItem('head_special_fireCoralCirclet'), }, nye: { - event: EVENTS.winter, + event: EVENTS.winter2016, text: t('headSpecialNyeText'), notes: t('headSpecialNyeNotes'), value: 0, @@ -400,6 +457,9 @@ let head = { notes: t('headSpecialYetiNotes', { str: 9 }), str: 9, value: 60, + canBuy: () => { + return true; + }, }, ski: { event: EVENTS.winter, @@ -408,6 +468,9 @@ let head = { notes: t('headSpecialSkiNotes', { per: 9 }), per: 9, value: 60, + canBuy: () => { + return true; + }, }, candycane: { event: EVENTS.winter, @@ -416,6 +479,9 @@ let head = { notes: t('headSpecialCandycaneNotes', { per: 7 }), per: 7, value: 60, + canBuy: () => { + return true; + }, }, snowflake: { event: EVENTS.winter, @@ -424,6 +490,9 @@ let head = { notes: t('headSpecialSnowflakeNotes', { int: 7 }), int: 7, value: 60, + canBuy: () => { + return true; + }, }, springRogue: { event: EVENTS.spring, @@ -540,6 +609,9 @@ let head = { notes: t('headSpecialWinter2015RogueNotes', { per: 9 }), value: 60, per: 9, + canBuy: () => { + return true; + }, }, winter2015Warrior: { event: EVENTS.winter2015, @@ -548,6 +620,9 @@ let head = { notes: t('headSpecialWinter2015WarriorNotes', { str: 9 }), value: 60, str: 9, + canBuy: () => { + return true; + }, }, winter2015Mage: { event: EVENTS.winter2015, @@ -556,6 +631,9 @@ let head = { notes: t('headSpecialWinter2015MageNotes', { per: 7 }), value: 60, per: 7, + canBuy: () => { + return true; + }, }, winter2015Healer: { event: EVENTS.winter2015, @@ -564,6 +642,9 @@ let head = { notes: t('headSpecialWinter2015HealerNotes', { int: 7 }), value: 60, int: 7, + canBuy: () => { + return true; + }, }, nye2014: { text: t('headSpecialNye2014Text'), @@ -673,6 +754,44 @@ let head = { notes: t('headSpecialGaymerxNotes'), value: 0, }, + winter2016Rogue: { + event: EVENTS.winter2016, + specialClass: 'rogue', + text: t('headSpecialWinter2016RogueText'), + notes: t('headSpecialWinter2016RogueNotes', { per: 9 }), + value: 60, + per: 9, + }, + winter2016Warrior: { + event: EVENTS.winter2016, + specialClass: 'warrior', + text: t('headSpecialWinter2016WarriorText'), + notes: t('headSpecialWinter2016WarriorNotes', { str: 9 }), + value: 60, + str: 9, + }, + winter2016Mage: { + event: EVENTS.winter2016, + specialClass: 'wizard', + text: t('headSpecialWinter2016MageText'), + notes: t('headSpecialWinter2016MageNotes', { per: 7 }), + value: 60, + per: 7, + }, + winter2016Healer: { + event: EVENTS.winter2016, + specialClass: 'healer', + text: t('headSpecialWinter2016HealerText'), + notes: t('headSpecialWinter2016HealerNotes', { int: 7 }), + value: 60, + int: 7, + }, + nye2015: { + text: t('headSpecialNye2015Text'), + notes: t('headSpecialNye2015Notes'), + value: 0, + canOwn: ownsItem('head_special_nye2015'), + }, }; let headAccessory = { @@ -839,6 +958,9 @@ let shield = { notes: t('shieldSpecialYetiNotes', { con: 7 }), con: 7, value: 70, + canBuy: () => { + return true; + }, }, ski: { event: EVENTS.winter, @@ -847,6 +969,9 @@ let shield = { notes: t('weaponSpecialSkiNotes', { str: 8 }), str: 8, value: 90, + canBuy: () => { + return true; + }, }, snowflake: { event: EVENTS.winter, @@ -855,6 +980,9 @@ let shield = { notes: t('shieldSpecialSnowflakeNotes', { con: 9 }), con: 9, value: 70, + canBuy: () => { + return true; + }, }, springRogue: { event: EVENTS.spring, @@ -944,6 +1072,9 @@ let shield = { notes: t('shieldSpecialWinter2015RogueNotes', { str: 8 }), value: 80, str: 8, + canBuy: () => { + return true; + }, }, winter2015Warrior: { event: EVENTS.winter2015, @@ -952,6 +1083,9 @@ let shield = { notes: t('shieldSpecialWinter2015WarriorNotes', { con: 7 }), value: 70, con: 7, + canBuy: () => { + return true; + }, }, winter2015Healer: { event: EVENTS.winter2015, @@ -960,6 +1094,9 @@ let shield = { notes: t('shieldSpecialWinter2015HealerNotes', { con: 9 }), value: 70, con: 9, + canBuy: () => { + return true; + }, }, spring2015Rogue: { event: EVENTS.spring2015, @@ -1033,6 +1170,30 @@ let shield = { value: 70, con: 9, }, + winter2016Rogue: { + event: EVENTS.winter2016, + specialClass: 'rogue', + text: t('shieldSpecialWinter2016RogueText'), + notes: t('shieldSpecialWinter2016RogueNotes', { str: 8 }), + value: 80, + str: 8, + }, + winter2016Warrior: { + event: EVENTS.winter2016, + specialClass: 'warrior', + text: t('shieldSpecialWinter2016WarriorText'), + notes: t('shieldSpecialWinter2016WarriorNotes', { con: 7 }), + value: 70, + con: 7, + }, + winter2016Healer: { + event: EVENTS.winter2016, + specialClass: 'healer', + text: t('shieldSpecialWinter2016HealerText'), + notes: t('shieldSpecialWinter2016HealerNotes', { con: 9 }), + value: 70, + con: 9, + }, }; let weapon = { @@ -1055,6 +1216,9 @@ let weapon = { notes: t('weaponSpecialYetiNotes', { str: 15 }), str: 15, value: 90, + canBuy: () => { + return true; + }, }, ski: { event: EVENTS.winter, @@ -1063,6 +1227,9 @@ let weapon = { notes: t('weaponSpecialSkiNotes', { str: 8 }), str: 8, value: 90, + canBuy: () => { + return true; + }, }, candycane: { event: EVENTS.winter, @@ -1073,6 +1240,9 @@ let weapon = { int: 15, per: 7, value: 160, + canBuy: () => { + return true; + }, }, snowflake: { event: EVENTS.winter, @@ -1081,6 +1251,9 @@ let weapon = { notes: t('weaponSpecialSnowflakeNotes', { int: 9 }), int: 9, value: 90, + canBuy: () => { + return true; + }, }, springRogue: { event: EVENTS.spring, @@ -1203,6 +1376,9 @@ let weapon = { notes: t('weaponSpecialWinter2015RogueNotes', { str: 8 }), value: 80, str: 8, + canBuy: () => { + return true; + }, }, winter2015Warrior: { event: EVENTS.winter2015, @@ -1211,6 +1387,9 @@ let weapon = { notes: t('weaponSpecialWinter2015WarriorNotes', { str: 15 }), value: 90, str: 15, + canBuy: () => { + return true; + }, }, winter2015Mage: { event: EVENTS.winter2015, @@ -1221,6 +1400,9 @@ let weapon = { value: 160, int: 15, per: 7, + canBuy: () => { + return true; + }, }, winter2015Healer: { event: EVENTS.winter2015, @@ -1229,6 +1411,9 @@ let weapon = { notes: t('weaponSpecialWinter2015HealerNotes', { int: 9 }), value: 90, int: 9, + canBuy: () => { + return true; + }, }, spring2015Rogue: { event: EVENTS.spring2015, @@ -1332,6 +1517,40 @@ let weapon = { value: 90, int: 9, }, + winter2016Rogue: { + event: EVENTS.winter2016, + specialClass: 'rogue', + text: t('weaponSpecialWinter2016RogueText'), + notes: t('weaponSpecialWinter2016RogueNotes', { str: 8 }), + value: 80, + str: 8, + }, + winter2016Warrior: { + event: EVENTS.winter2016, + specialClass: 'warrior', + text: t('weaponSpecialWinter2016WarriorText'), + notes: t('weaponSpecialWinter2016WarriorNotes', { str: 15 }), + value: 90, + str: 15, + }, + winter2016Mage: { + event: EVENTS.winter2016, + specialClass: 'wizard', + twoHanded: true, + text: t('weaponSpecialWinter2016MageText'), + notes: t('weaponSpecialWinter2016MageNotes', { int: 15, per: 7 }), + value: 160, + int: 15, + per: 7, + }, + winter2016Healer: { + event: EVENTS.winter2016, + specialClass: 'healer', + text: t('weaponSpecialWinter2016HealerText'), + notes: t('weaponSpecialWinter2016HealerNotes', { int: 9 }), + value: 90, + int: 9, + }, }; let specialSet = { diff --git a/common/script/content/index.js b/common/script/content/index.js index d14727016c..013a77b3fb 100644 --- a/common/script/content/index.js +++ b/common/script/content/index.js @@ -19,6 +19,7 @@ import { import mysterySets from './mystery-sets'; import gear from './gear'; +import { defaultAppearancePreferences } from './appearance'; api.mystery = mysterySets; @@ -922,7 +923,15 @@ api.questEggs = { canBuy: (function(u) { return u.achievements.quests && (u.achievements.quests.snake != null) > 0; }) - } + }, + Unicorn: { + text: t('questEggUnicornText'), + mountText: t('questEggUnicornMountText'), + adjective: t('questEggUnicornAdjective'), + canBuy: (function(u) { + return u.achievements.quests && (u.achievements.quests.unicorn != null) > 0; + }) + }, }; _.each(api.questEggs, function(egg, key) { @@ -1036,7 +1045,7 @@ api.premiumHatchingPotions = { text: t('hatchingPotionPeppermint'), limited: true, canBuy: (function() { - return true; + return false; }) } }; @@ -1582,7 +1591,7 @@ api.quests = { }, evilsanta: { canBuy: (function() { - return false; + return true; }), text: t('questEvilSantaText'), notes: t('questEvilSantaNotes'), @@ -1608,7 +1617,7 @@ api.quests = { }, evilsanta2: { canBuy: (function() { - return false; + return true; }), text: t('questEvilSanta2Text'), notes: t('questEvilSanta2Notes'), @@ -2940,7 +2949,39 @@ api.quests = { exp: 725, unlock: t('questSnakeUnlockText') } - } + }, + unicorn: { + text: t('questUnicornText'), + notes: t('questUnicornNotes'), + completion: t('questUnicornCompletion'), + value: 4, + category: 'pet', + boss: { + name: t('questUnicornBoss'), + hp: 600, + str: 1.5 + }, + drop: { + items: [ + { + type: 'eggs', + key: 'Unicorn', + text: t('questUnicornDropUnicornEgg') + }, { + type: 'eggs', + key: 'Unicorn', + text: t('questUnicornDropUnicornEgg') + }, { + type: 'eggs', + key: 'Unicorn', + text: t('questUnicornDropUnicornEgg') + } + ], + gp: 43, + exp: 350, + unlock: t('questUnicornUnlockText') + } + }, }; _.each(api.quests, function(v, key) { @@ -2970,6 +3011,8 @@ api.questsByLevel = _.sortBy(api.quests, function(quest) { return quest.lvl || 0; }); +api.defaultAppearancePreferences = defaultAppearancePreferences; + api.backgrounds = { backgrounds062014: { beach: { @@ -3237,6 +3280,20 @@ api.backgrounds = { notes: t('backgroundWinterTownNotes') } }, + backgrounds012016: { + frozen_lake: { + text: t('backgroundFrozenLakeText'), + notes: t('backgroundFrozenLakeNotes') + }, + snowman_army: { + text: t('backgroundSnowmanArmyText'), + notes: t('backgroundSnowmanArmyNotes') + }, + winter_night: { + text: t('backgroundWinterNightText'), + notes: t('backgroundWinterNightNotes') + } + }, }; api.subscriptionBlocks = { diff --git a/common/script/content/mystery-sets.js b/common/script/content/mystery-sets.js index d02ef61d36..a430d6f24e 100644 --- a/common/script/content/mystery-sets.js +++ b/common/script/content/mystery-sets.js @@ -1,126 +1,108 @@ import { each } from 'lodash'; +let t = require('./translation.js'); let mysterySets = { 201402: { start: '2014-02-22', end: '2014-02-28', - text: 'Winged Messenger Set', }, 201403: { start: '2014-03-24', end: '2014-04-02', - text: 'Forest Walker Set', }, 201404: { start: '2014-04-24', end: '2014-05-02', - text: 'Twilight Butterfly Set', }, 201405: { start: '2014-05-21', end: '2014-06-02', - text: 'Flame Wielder Set', }, 201406: { start: '2014-06-23', end: '2014-07-02', - text: 'Octomage Set', }, 201407: { start: '2014-07-23', end: '2014-08-02', - text: 'Undersea Explorer Set', }, 201408: { start: '2014-08-23', end: '2014-09-02', - text: 'Sun Sorcerer Set', }, 201409: { start: '2014-09-24', end: '2014-10-02', - text: 'Autumn Strider Set', }, 201410: { start: '2014-10-24', end: '2014-11-02', - text: 'Winged Goblin Set', }, 201411: { start: '2014-11-24', end: '2014-12-02', - text: 'Feast and Fun Set', }, 201412: { start: '2014-12-25', end: '2015-01-02', - text: 'Penguin Set', }, 201501: { start: '2015-01-26', end: '2015-02-02', - text: 'Starry Knight Set', }, 201502: { start: '2015-02-24', end: '2015-03-02', - text: 'Winged Enchanter Set', }, 201503: { start: '2015-03-25', end: '2015-04-02', - text: 'Aquamarine Set', }, 201504: { start: '2015-04-24', end: '2015-05-02', - text: 'Busy Bee Set', }, 201505: { start: '2015-05-25', end: '2015-06-02', - text: 'Green Knight Set', }, 201506: { start: '2015-06-25', end: '2015-07-02', - text: 'Neon Snorkeler Set', }, 201507: { start: '2015-07-24', end: '2015-08-02', - text: 'Rad Surfer Set', }, 201508: { start: '2015-08-23', end: '2015-09-02', - text: 'Cheetah Costume Set', }, 201509: { start: '2015-09-24', end: '2015-10-02', - text: 'Werewolf Set', }, 201510: { start: '2015-10-26', end: '2015-11-02', - text: 'Horned Goblin Set', }, 201511: { start: '2015-11-25', end: '2015-12-02', - text: 'Wood Warrior Set', + }, + 201512: { + start: '2015-12-23', + end: '2016-01-02', }, 301404: { start: '3014-03-24', end: '3014-04-02', - text: 'Steampunk Standard Set', }, 301405: { start: '3014-04-24', end: '3014-05-02', - text: 'Steampunk Accessories Set', }, + // @TODO: Remove wondercon from mystery-sets wondercon: { start: '2014-03-24', end: '2014-04-01', @@ -129,6 +111,7 @@ let mysterySets = { each(mysterySets, (value, key) => { value.key = key; + value.text = t(`mysterySet${key}`); }); export default mysterySets; diff --git a/common/script/count.js b/common/script/count.js index 6305646836..f61da83a09 100644 --- a/common/script/count.js +++ b/common/script/count.js @@ -1,12 +1,17 @@ -import _ from 'lodash'; +import { + each, + filter, + keys, + size, +} from 'lodash'; import content from './content/index'; -const DROP_ANIMALS = _.keys(content.pets); +const DROP_ANIMALS = keys(content.pets); function beastMasterProgress (pets) { let count = 0; - _(DROP_ANIMALS).each((animal) => { + each(DROP_ANIMALS, (animal) => { if (pets[animal] > 0 || pets[animal] === -1) count++; }); @@ -17,7 +22,7 @@ function beastMasterProgress (pets) { function dropPetsCurrentlyOwned (pets) { let count = 0; - _(DROP_ANIMALS).each((animal) => { + each(DROP_ANIMALS, (animal) => { if (pets[animal] > 0) count++; }); @@ -28,7 +33,7 @@ function dropPetsCurrentlyOwned (pets) { function mountMasterProgress (mounts) { let count = 0; - _(DROP_ANIMALS).each((animal) => { + each(DROP_ANIMALS, (animal) => { if (mounts[animal]) count++; }); @@ -37,27 +42,27 @@ function mountMasterProgress (mounts) { } function remainingGearInSet (userGear, set) { - let gear = _.filter(content.gear.flat, (item) => { + let gear = filter(content.gear.flat, (item) => { let setMatches = item.klass === set; let hasItem = userGear[item.key]; return setMatches && !hasItem; }); - let count = _.size(gear); + let count = size(gear); return count; } function questsOfCategory (userQuests, category) { - let quests = _.filter(content.quests, (quest) => { + let quests = filter(content.quests, (quest) => { let categoryMatches = quest.category === category; let hasQuest = userQuests[quest.key]; return categoryMatches && hasQuest; }); - let count = _.size(quests); + let count = size(quests); return count; } diff --git a/common/script/i18n.js b/common/script/i18n.js index 908925e9e5..41a0e63bc2 100644 --- a/common/script/i18n.js +++ b/common/script/i18n.js @@ -37,7 +37,7 @@ function t (stringName) { if (string) { try { - return _.template(string, clonedVars); + return _.template(string)(clonedVars); } catch (_error) { return 'Error processing the string. Please see Help > Report a Bug.'; } @@ -51,7 +51,7 @@ function t (stringName) { } try { - return _.template(stringNotFound, { + return _.template(stringNotFound)({ string: stringName, }); } catch (_error) { diff --git a/common/script/index.js b/common/script/index.js index 292f579de2..2246bc259a 100644 --- a/common/script/index.js +++ b/common/script/index.js @@ -2,6 +2,11 @@ import { daysSince, shouldDo, } from '../../common/script/cron'; +import { + MAX_HEALTH, + MAX_LEVEL, + MAX_STAT_POINTS, +} from './constants'; import * as statHelpers from './statHelpers'; var $w, _, api, content, i18n, moment, preenHistory, sortOrder, @@ -20,9 +25,9 @@ api = module.exports = {}; api.i18n = i18n; api.shouldDo = shouldDo; -api.maxLevel = statHelpers.MAX_LEVEL; +api.maxLevel = MAX_LEVEL; api.capByLevel = statHelpers.capByLevel; -api.maxHealth = statHelpers.MAX_HEALTH; +api.maxHealth = MAX_HEALTH; api.tnl = statHelpers.toNextLevel; api.diminishingReturns = statHelpers.diminishingReturns; @@ -121,7 +126,7 @@ preenHistory = function(history) { */ api.preenTodos = function(tasks) { - return _.where(tasks, function(t) { + return _.filter(tasks, function(t) { return !t.completed || (t.challenge && t.challenge.id) || moment(t.dateCompleted).isAfter(moment().subtract({ days: 3 })); @@ -2063,7 +2068,7 @@ api.wrap = function(user, main) { return content.gear.flat[type + "_base_0"]; } return item; - }, + }, handleTwoHanded: function(item, type, req) { var message, currentWeapon, currentShield; if (type == null) { @@ -2071,17 +2076,17 @@ api.wrap = function(user, main) { } currentShield = content.gear.flat[user.items.gear[type].shield]; currentWeapon = content.gear.flat[user.items.gear[type].weapon]; - + if (item.type === "shield" && (currentWeapon ? currentWeapon.twoHanded : false)) { user.items.gear[type].weapon = 'weapon_base_0'; message = i18n.t('messageTwoHandedUnequip', { twoHandedText: currentWeapon.text(req.language), offHandedText: item.text(req.language), }, req.language); - } else if (item.twoHanded && (currentShield && user.items.gear[type].shield != "shield_base_0")) { - user.items.gear[type].shield = "shield_base_0"; + } else if (item.twoHanded && (currentShield && user.items.gear[type].shield != "shield_base_0")) { + user.items.gear[type].shield = "shield_base_0"; message = i18n.t('messageTwoHandedEquip', { twoHandedText: item.text(req.language), offHandedText: currentShield.text(req.language), - }, req.language); + }, req.language); } return message; }, @@ -2267,27 +2272,30 @@ api.wrap = function(user, main) { })()]++; }, updateStats: function(stats, req, analytics) { - var tnl; if (stats.hp <= 0) { return user.stats.hp = 0; } user.stats.hp = stats.hp; user.stats.gp = stats.gp >= 0 ? stats.gp : 0; - tnl = api.tnl(user.stats.lvl); - if (stats.exp >= tnl) { + + var experienceToNextLevel = api.tnl(user.stats.lvl); + + if (stats.exp >= experienceToNextLevel) { user.stats.exp = stats.exp; - while (stats.exp >= tnl) { - stats.exp -= tnl; + while (stats.exp >= experienceToNextLevel) { + stats.exp -= experienceToNextLevel; user.stats.lvl++; - tnl = api.tnl(user.stats.lvl); + experienceToNextLevel = api.tnl(user.stats.lvl); user.stats.hp = 50; - if (user.stats.lvl > api.maxLevel) { + var userTotalStatPoints = user.stats.str + user.stats.int + user.stats.con + user.stats.per; + + if (userTotalStatPoints >= MAX_STAT_POINTS) { continue; } if (user.preferences.automaticAllocation) { user.fns.autoAllocate(); } else { - user.stats.points = user.stats.lvl - (user.stats.con + user.stats.str + user.stats.per + user.stats.int); + user.stats.points = user.stats.lvl - userTotalStatPoints; if (user.stats.points < 0) { user.stats.points = 0; } diff --git a/common/script/src/content/helpers.js b/common/script/src/content/helpers.js index 7413ac84d6..ca9f0bf074 100644 --- a/common/script/src/content/helpers.js +++ b/common/script/src/content/helpers.js @@ -1,6 +1,4 @@ -import {each, defaults, assign} from 'lodash'; -import capitalize from 'lodash.capitalize'; -import camelCase from 'lodash.camelcase'; +import { each, defaults, assign, capitalize, camelCase } from 'lodash'; import i18n from '../i18n'; diff --git a/common/script/src/i18n.js b/common/script/src/i18n.js index 315624e76a..3b91ede35b 100644 --- a/common/script/src/i18n.js +++ b/common/script/src/i18n.js @@ -25,7 +25,7 @@ module.exports = { clonedVars.locale = locale; if (string) { try { - return _.template(string, clonedVars); + return _.template(string)(clonedVars); } catch (_error) { e = _error; return 'Error processing the string. Please see Help > Report a Bug.'; @@ -37,7 +37,7 @@ module.exports = { stringNotFound = module.exports.translations[locale] && module.exports.translations[locale].stringNotFound; } try { - return _.template(stringNotFound, { + return _.template(stringNotFound)({ string: stringName }); } catch (_error) { diff --git a/common/script/statHelpers.js b/common/script/statHelpers.js index 9f92d506ba..ff52662d52 100644 --- a/common/script/statHelpers.js +++ b/common/script/statHelpers.js @@ -1,11 +1,13 @@ +import { + MAX_LEVEL, +} from './constants'; + /* ------------------------------------------------------ Level cap ------------------------------------------------------ */ -export const MAX_LEVEL = 100; - export function capByLevel (lvl) { if (lvl > MAX_LEVEL) { return MAX_LEVEL; @@ -14,14 +16,6 @@ export function capByLevel (lvl) { } } -/* - ------------------------------------------------------ - Health cap - ------------------------------------------------------ - */ - -export const MAX_HEALTH = 50; - /* ------------------------------------------------------ Scoring diff --git a/karma.conf.js b/karma.conf.js index 6af0403ebd..b888c19ac1 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -78,7 +78,8 @@ module.exports = function(config) { browsers: ['PhantomJS'], preprocessors: { - 'website/public/js/**/*.js': ['coverage'] + 'website/public/js/**/*.js': ['coverage'], + 'test/**/*.js': ['babel'], }, coverageReporter: { diff --git a/migrations/20151229_new_years_hats.js b/migrations/20151229_new_years_hats.js new file mode 100644 index 0000000000..895e545dd0 --- /dev/null +++ b/migrations/20151229_new_years_hats.js @@ -0,0 +1,70 @@ +var migrationName = '20151229_new_years_hats.js'; +var authorName = 'Sabe'; // in case script author needs to know when their ... +var authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done + +/* + * Award 2015 party hat if user has 2014 hat, 2014 hat if they have the 2013 hat, + * and 2013 hat otherwise + */ + +var dbserver = 'localhost:27017'; // FOR TEST DATABASE +// var dbserver = 'username:password@ds031379-a0.mongolab.com:31379'; // FOR PRODUCTION DATABASE +var dbname = 'habitrpg'; + +var mongo = require('mongoskin'); +var _ = require('lodash'); + +var dbUsers = mongo.db(dbserver + '/' + dbname + '?auto_reconnect').collection('users'); + +// specify a query to limit the affected users (empty for all users): +var query = { +}; + +// specify fields we are interested in to limit retrieved data (empty if we're not reading data): +var fields = { + 'items.gear.owned': 1, +}; + +console.warn('Updating users...'); +var progressCount = 1000; +var count = 0; +dbUsers.findEach(query, fields, {batchSize:250}, function(err, user) { + if (err) { return exiting(1, 'ERROR! ' + err); } + if (!user) { + console.warn('All appropriate users found and modified.'); + return displayData(); + } + count++; + + // specify user data to change: + var set = {}; + if (user.items && user.items.gear && user.items.gear.owned && user.items.gear.owned.hasOwnProperty('head_special_nye2014')) { + set = {'migration':migrationName, 'items.gear.owned.head_special_nye2015':false}; + } else if (user.items && user.items.gear && user.items.gear.owned && user.items.gear.owned.hasOwnProperty('head_special_nye')) { + set = {'migration':migrationName, 'items.gear.owned.head_special_nye2014':false}; + } else { + set = {'migration':migrationName, 'items.gear.owned.head_special_nye':false}; + } + + dbUsers.update({_id:user._id}, {$set:set}); + + if (count%progressCount == 0) console.warn(count + ' ' + user._id); + if (user._id == authorUuid) console.warn(authorName + ' processed'); +}); + + +function displayData() { + console.warn('\n' + count + ' users processed\n'); + return exiting(0); +} + + +function exiting(code, msg) { + code = code || 0; // 0 = success + if (code && !msg) { msg = 'ERROR!'; } + if (msg) { + if (code) { console.error(msg); } + else { console.log( msg); } + } + process.exit(code); +} diff --git a/migrations/mystery_items.js b/migrations/mystery_items.js index 1feef7de2a..4a122677fa 100644 --- a/migrations/mystery_items.js +++ b/migrations/mystery_items.js @@ -2,7 +2,7 @@ var _id = ''; var update = { $addToSet: { 'purchased.plan.mysteryItems':{ - $each:['head_mystery_201511','armor_mystery_201511'] + $each:['head_mystery_201512','armor_mystery_201512'] } } }; diff --git a/package.json b/package.json index 5c0048a131..73e723954e 100644 --- a/package.json +++ b/package.json @@ -43,9 +43,7 @@ "in-app-purchase": "^0.2.0", "jade": "~1.11.0", "js2xmlparser": "~0.1.2", - "lodash": "~2.4.1", - "lodash.camelcase": "^3.0.1", - "lodash.capitalize": "^3.0.0", + "lodash": "^3.10.1", "loggly": "~1.0.8", "marked": "^0.3.5", "merge-stream": "^1.0.0", @@ -93,17 +91,20 @@ "coverage": "COVERAGE=true mocha --require register-handlers.js --reporter html-cov > coverage.html; open coverage.html" }, "devDependencies": { + "babel-eslint": "^4.1.6", "chai": "^3.4.0", "chai-as-promised": "^5.1.0", "coveralls": "^2.11.2", "csv": "~0.3.6", "deep-diff": "~0.1.4", "eslint": "^1.9.0", + "eslint-plugin-babel": "^3.0.0", "eslint-plugin-mocha": "^1.1.0", "event-stream": "^3.2.2", "expect.js": "~0.2.0", "istanbul": "^0.3.14", "karma": "~0.13.15", + "karma-babel-preprocessor": "^5.0.0", "karma-chai-plugins": "~0.6.0", "karma-coverage": "^0.5.3", "karma-mocha": "^0.2.0", @@ -113,6 +114,7 @@ "mocha": "^2.3.3", "mongodb": "^2.0.46", "mongoskin": "~0.6.1", + "phantomjs": "^1.9", "protractor": "~2.5.1", "rewire": "^2.3.3", "rimraf": "^2.4.3", diff --git a/tasks/gulp-eslint.js b/tasks/gulp-eslint.js index 83930556c7..13fe2281e1 100644 --- a/tasks/gulp-eslint.js +++ b/tasks/gulp-eslint.js @@ -19,7 +19,6 @@ const TEST_FILES = [ './test/**/*.js', // @TODO remove these negations as the test files are cleaned up. '!./test/api-legacy/**/*', - '!./test/api/**/*', '!./test/common/simulations/**/*', '!./test/content/**/*', '!./test/e2e/**/*', @@ -33,7 +32,7 @@ let linter = (src, options) => { .pipe(eslint(options)) .pipe(eslint.format()) .pipe(eslint.failAfterError()); -} +}; // TODO lint client // TDOO separate linting cong between @@ -49,23 +48,7 @@ gulp.task('lint:common', () => { }); gulp.task('lint:tests', () => { - let options = { - rules: { - 'max-nested-callbacks': 0, - 'no-unused-expressions': 0, - 'mocha/no-exclusive-tests': 2, - 'mocha/no-global-tests': 2, - 'mocha/handle-done-callback': 2, - }, - globals: { - 'expect': true, - '_': true, - 'sinon': true, - }, - plugins: [ 'mocha' ], - }; - - return linter(TEST_FILES, options); + return linter(TEST_FILES); }); gulp.task('lint', ['lint:server', 'lint:common', 'lint:tests']); diff --git a/tasks/gulp-transifex-test.js b/tasks/gulp-transifex-test.js index d4e6cdc3c3..6326069815 100644 --- a/tasks/gulp-transifex-test.js +++ b/tasks/gulp-transifex-test.js @@ -89,7 +89,7 @@ gulp.task('transifex:malformedStrings', () => { } }); }); - }); + }).value(); if (!_.isEmpty(stringsWithMalformedInterpolations)) { let message = 'The following strings have malformed or missing interpolations'; @@ -128,7 +128,7 @@ function eachTranslationFile(languages, cb) { cb(null, lang, filename, parsedEnglishFile, parsedTranslationFile) }); - }); + }).value(); } function eachTranslationString(languages, cb) { @@ -162,7 +162,7 @@ function getStringsWith(json, interpolationRegex) { var match = value.match(interpolationRegex); if(match) strings[file_name][key] = match; }); - }); + }).value(); return strings; } diff --git a/test/.eslintrc b/test/.eslintrc new file mode 100644 index 0000000000..7b5868eca9 --- /dev/null +++ b/test/.eslintrc @@ -0,0 +1,17 @@ +{ + "rules": { + "one-var": 0, + "max-nested-callbacks": 0, + "no-unused-expressions": 0, + "mocha/no-exclusive-tests": 2, + "mocha/no-global-tests": 2, + "mocha/handle-done-callback": 2 + }, + "globals": { + "expect": true, + "_": true, + "sandbox": true, + "sinon": true + }, + "plugins": [ "mocha" ] +} diff --git a/test/api-legacy/coupons.js b/test/api-legacy/coupons.js index af315c549c..1f4fcda3b6 100644 --- a/test/api-legacy/coupons.js +++ b/test/api-legacy/coupons.js @@ -54,7 +54,7 @@ describe("Coupons", function() { expect(coupons.length).to.equal(10); _(coupons).each(function(c) { return expect(c.event).to.equal('wondercon'); - }); + }).value(); return done(); }); }); @@ -90,7 +90,7 @@ describe("Coupons", function() { expect(codes).to.contain('code'); _(coupons).each(function(c) { return expect(codes).to.contain(c._id); - }); + }).value(); return done(); }); }); @@ -106,10 +106,10 @@ describe("Coupons", function() { secondHalf = sortedCoupons.slice(5, 10); _(firstHalf).each(function(c) { return expect(codes).to.contain(c._id); - }); + }).value(); _(secondHalf).each(function(c) { return expect(codes).to.not.contain(c._id); - }); + }).value(); return done(); }); }); @@ -125,10 +125,10 @@ describe("Coupons", function() { secondHalf = sortedCoupons.slice(5, 10); _(firstHalf).each(function(c) { return expect(codes).to.not.contain(c._id); - }); + }).value(); _(secondHalf).each(function(c) { return expect(codes).to.contain(c._id); - }); + }).value(); return done(); }); }); @@ -159,7 +159,7 @@ describe("Coupons", function() { } else { return expect(gear[i]).to.not.exist; } - }); + }).value(); }; beforeEach(function(done) { return registerNewUser(function() { diff --git a/test/api/v2/README.md b/test/api/README.md similarity index 72% rename from test/api/v2/README.md rename to test/api/README.md index 118f17078a..b5223cc0f4 100644 --- a/test/api/v2/README.md +++ b/test/api/README.md @@ -4,7 +4,7 @@ That's great! This README will serve as a quick primer for style conventions and ## What is this? -These are integration tests for the Habitica API. They are performed by making REST requests to the API's endpoints and asserting on the data that is returned. +These are integration tests for the Habitica API. They are performed by making HTTP requests to the API's endpoints and asserting on the data that is returned. If the javascript looks weird to you, that's because it's written in [ES2015](http://www.ecma-international.org/ecma-262/6.0/) and transpiled by [Babel](https://babeljs.io/docs/learn-es2015/). @@ -36,6 +36,21 @@ One caveat. If you have a severe syntax error in your files, the tests may fail $ gulp test:api:safe ``` +If you'd like to run the tests individually and inspect the output from the server, in one pane you can run: + +```bash +$ gulp nodemon +``` + +And run your tests in another pane: + +```bash +$ mocha path/to/file.js + +# Mark a test with the `.only` attribute +$ mocha +``` + ## Structure Each top level route has it's own directory. So, all the routes that begin with `/groups/` live in `/test/api/groups/`. @@ -55,22 +70,24 @@ POST-groups_id_leave.test.js ## Promises -To mitigate [callback hell](http://callbackhell.com/) :imp:, we've written helper methods that [return promises](https://babeljs.io/docs/learn-es2015/#promises). This makes it very easy to chain together commands. All you need to do to make a subsequent request is return another promise and then call `.then((result) => {})` on the surrounding block, like so: +To mitigate [callback hell](http://callbackhell.com/) :imp:, we've written a helper method to generate a user object that can make http requests that [return promises](https://babeljs.io/docs/learn-es2015/#promises). This makes it very easy to chain together commands. All you need to do to make a subsequent request is return another promise and then call `.then((result) => {})` on the surrounding block, like so: ```js it('does something', () => { - let request; - return generateUser().then((user) => { // We return the initial promise so this test can be run asyncronously - request = requester(user); - return request.post('/groups', { + let user; + + return generateUser().then((_user) => { // We return the initial promise so this test can be run asyncronously + user = _user; + + return user.post('/groups', { type: 'party', }); }).then((party) => { // the result of the promise above is the argument of the function - return request.put(`/groups/${party._id}`, { + return user.put(`/groups/${party._id}`, { name: 'My party', }); }).then((result) => { - return request.get('/groups/party'); + return user.get('/groups/party'); }).then((party) => { expect(party.name).to.eql('My party'); }); @@ -81,8 +98,7 @@ If the test is simple, you can use the [chai-as-promised](http://chaijs.com/plug ```js it('makes the party creator the leader automatically', () => { - let api = requester(user); - return expect(request.post('/groups', { + return expect(user.post('/groups', { type: 'party', })).to.eventually.have.deep.property('leader._id', user._id); }); @@ -92,8 +108,7 @@ If the test is checking that the request returns an error, use the `.eventually. ```js it('returns an error', () => { - let api = requester(user); - return expect(request.get('/groups/id-of-a-party-that-user-does-not-belong-to')) + return expect(user.get('/groups/id-of-a-party-that-user-does-not-belong-to')) .to.eventually.be.rejected.and.eql({ code: 404, text: t('messageGroupNotFound'), diff --git a/test/api/v2/groups/GET-groups.test.js b/test/api/v2/groups/GET-groups.test.js index 191afea663..0bf191acfb 100644 --- a/test/api/v2/groups/GET-groups.test.js +++ b/test/api/v2/groups/GET-groups.test.js @@ -2,92 +2,68 @@ import { generateGroup, generateUser, resetHabiticaDB, - requester, } from '../../../helpers/api-integration.helper'; describe('GET /groups', () => { const NUMBER_OF_PUBLIC_GUILDS = 3; const NUMBER_OF_USERS_GUILDS = 2; - let user, api; - - before(() => { - let leader, createdGroup; + let user; + before(async () => { // Set up a world with a mixture of public and private guilds // Invite user to a few of them - return resetHabiticaDB().then(() => { - return generateUser(); - }).then((_user) => { - user = _user; + await resetHabiticaDB(); - return generateUser({ - balance: 10, - }); - }).then((_user) => { - leader = _user; - api = requester(leader); + user = await generateUser(); + let leader = await generateUser({ balance: 10 }); - let publicGuildWithUserAsMember = generateGroup(leader, { - name: 'public guild - is member', - type: 'guild', - privacy: 'public', - members: [leader._id, user._id], - }); + await generateGroup(leader, { + name: 'public guild - is member', + type: 'guild', + privacy: 'public', + members: [leader._id, user._id], + }); - let publicGuildWithoutUserAsMember = generateGroup(leader, { - name: 'public guild - is not member', - type: 'guild', - privacy: 'public', - }); + await generateGroup(leader, { + name: 'public guild - is not member', + type: 'guild', + privacy: 'public', + }); - let privateGuildWithUserAsMember = generateGroup(leader, { - name: 'private guild - is member', - type: 'guild', - privacy: 'private', - members: [leader._id, user._id], - }); + await generateGroup(leader, { + name: 'private guild - is member', + type: 'guild', + privacy: 'private', + members: [leader._id, user._id], + }); - let privateGuildWithoutUserAsMember = generateGroup(leader, { - name: 'private guild - is not member', - type: 'guild', - privacy: 'private', - }); + await generateGroup(leader, { + name: 'private guild - is not member', + type: 'guild', + privacy: 'private', + }); - let partyWithoutUserAsMember = generateGroup(leader, { - name: 'party name', - type: 'party', - privacy: 'private', - }); + await generateGroup(leader, { + name: 'party - is not member', + type: 'party', + privacy: 'private', + }); - let promises = [ - publicGuildWithUserAsMember, - publicGuildWithoutUserAsMember, - privateGuildWithUserAsMember, - privateGuildWithoutUserAsMember, - partyWithoutUserAsMember, - ]; - - return Promise.all(promises); - }).then((groups) => { - api = requester(user); - return api.post('/groups', { - type: 'party', - name: 'user\'s party', - privacy: 'private', - }); + await user.post('/groups', { + name: 'party - is member', + type: 'party', + privacy: 'private', }); }); context('no query passed in', () => { - xit('lists all public guilds, the tavern, user\'s party, and any private guilds that user is a part of - TODO query includes duplicates - IE, tavern is included as tavern and part of public guilds. Refactor so this is not the case'); }); context('tavern passed in as query', () => { - - it('returns only the tavern', () => { - return expect(api.get('/groups', null, {type: 'tavern'})) + it('returns only the tavern', async () => { + await expect(user.get('/groups', null, {type: 'tavern'})) .to.eventually.have.a.lengthOf(1) .and.to.have.deep.property('[0]') .and.to.have.property('_id', 'habitrpg'); @@ -95,9 +71,8 @@ describe('GET /groups', () => { }); context('party passed in as query', () => { - - it('returns only the user\'s party', () => { - return expect(api.get('/groups', null, {type: 'party'})) + it('returns only the user\'s party', async () => { + await expect(user.get('/groups', null, {type: 'party'})) .to.eventually.have.a.lengthOf(1) .and.to.have.deep.property('[0]') .and.to.have.property('leader', user._id); @@ -105,17 +80,15 @@ describe('GET /groups', () => { }); context('public passed in as query', () => { - - it('returns all public guilds', () => { - return expect(api.get('/groups', null, {type: 'public'})) + it('returns all public guilds', async () => { + await expect(user.get('/groups', null, {type: 'public'})) .to.eventually.have.a.lengthOf(NUMBER_OF_PUBLIC_GUILDS); }); }); context('guilds passed in as query', () => { - - it('returns all guilds user is a part of ', () => { - return expect(api.get('/groups', null, {type: 'guilds'})) + it('returns all guilds user is a part of ', async () => { + await expect(user.get('/groups', null, {type: 'guilds'})) .to.eventually.have.a.lengthOf(NUMBER_OF_USERS_GUILDS); }); }); diff --git a/test/api/v2/groups/GET-groups_id.test.js b/test/api/v2/groups/GET-groups_id.test.js index 3c2fda55b8..54ce590222 100644 --- a/test/api/v2/groups/GET-groups_id.test.js +++ b/test/api/v2/groups/GET-groups_id.test.js @@ -1,83 +1,70 @@ import { createAndPopulateGroup, generateUser, - requester, translate as t, } from '../../../helpers/api-integration.helper'; import { find, - each + each, } from 'lodash'; describe('GET /groups/:id', () => { - let typesOfGroups = {}; typesOfGroups['public guild'] = { type: 'guild', privacy: 'public' }; typesOfGroups['private guild'] = { type: 'guild', privacy: 'private' }; - typesOfGroups['party'] = { type: 'party', privacy: 'private' }; + typesOfGroups.party = { type: 'party', privacy: 'private' }; - each(typesOfGroups, (groupData, groupType) => { + each(typesOfGroups, (groupDetails, groupType) => { context(`Member of a ${groupType}`, () => { let leader, member, createdGroup; - before(() => { - return createAndPopulateGroup({ + before(async () => { + let groupData = await createAndPopulateGroup({ members: 30, - groupDetails: { - name: 'test guild', - type: 'guild', - privacy: 'public', - }, - }).then((res) => { - leader = res.leader; - member = res.members[0]; - createdGroup = res.group; + groupDetails, }); + + leader = groupData.leader; + member = groupData.members[0]; + createdGroup = groupData.group; }); - it('returns the group object', () => { - let api = requester(member); - return api.get(`/groups/${createdGroup._id}`).then((group) => { - expect(group._id).to.eql(createdGroup._id); - expect(group.name).to.eql(createdGroup.name); - expect(group.type).to.eql(createdGroup.type); - expect(group.privacy).to.eql(createdGroup.privacy); - }); + it('returns the group object', async () => { + let group = await member.get(`/groups/${createdGroup._id}`); + + expect(group._id).to.eql(createdGroup._id); + expect(group.name).to.eql(createdGroup.name); + expect(group.type).to.eql(createdGroup.type); + expect(group.privacy).to.eql(createdGroup.privacy); }); - it('transforms members array to an array of user objects', () => { - let api = requester(member); - return api.get(`/groups/${createdGroup._id}`).then((group) => { - let member = group.members[0]; - expect(member._id).to.exist; - expect(member.profile.name).to.exist; - expect(member.contributor).to.exist; - expect(member.achievements).to.exist; - expect(member.items).to.exist; - }); + it('transforms members array to an array of user objects', async () => { + let group = await member.get(`/groups/${createdGroup._id}`); + let someMember = group.members[0]; + + expect(someMember._id).to.exist; + expect(someMember.profile.name).to.exist; + expect(someMember.contributor).to.exist; + expect(someMember.achievements).to.exist; + expect(someMember.items).to.exist; }); - it('transforms leader id to leader object', () => { - let api = requester(member); - return api.get(`/groups/${createdGroup._id}`).then((group) => { - expect(group.leader._id).to.eql(leader._id); - expect(group.leader.profile.name).to.eql(leader.profile.name); - expect(group.leader.items).to.exist; - expect(group.leader.stats).to.exist; - expect(group.leader.achievements).to.exist; - expect(group.leader.contributor).to.exist; - }); + it('transforms leader id to leader object', async () => { + let group = await member.get(`/groups/${createdGroup._id}`); + + expect(group.leader._id).to.eql(leader._id); + expect(group.leader.profile.name).to.eql(leader.profile.name); + expect(group.leader.items).to.exist; + expect(group.leader.stats).to.exist; + expect(group.leader.achievements).to.exist; + expect(group.leader.contributor).to.exist; }); - it('includes the user in the members list', () => { - let api = requester(member); - return api.get(`/groups/${createdGroup._id}`).then((group) => { - let members = group.members; - let userInGroup = find(members, (user) => { - return member._id === user._id; - }); - expect(userInGroup).to.be.ok; - }); + it('includes the user in the members list', async () => { + let group = await member.get(`/groups/${createdGroup._id}`); + let userInGroup = find(group.members, '_id', member._id); + + expect(userInGroup).to.exist; }); }); }); @@ -128,8 +115,8 @@ describe('GET /groups/:id', () => { flagCount: 3, }; - beforeEach(() => { - return createAndPopulateGroup({ + beforeEach(async () => { + let groupData = await createAndPopulateGroup({ groupDetails: { name: 'test guild', type: 'guild', @@ -142,137 +129,121 @@ describe('GET /groups/:id', () => { chat5, ], }, - }).then((res) => { - group = res.group; }); + + group = groupData.group; }); context('non-admin', () => { - let api; + let nonAdmin; - beforeEach(() => { - return generateUser().then((user) => { - api = requester(user); - }); + beforeEach(async () => { + nonAdmin = await generateUser(); }); - it('does not include messages with a flag count of 2 or greater', () => { - return api.get(`/groups/${group._id}`).then((_group) => { - expect(_group.chat).to.have.lengthOf(3); - expect(_group.chat[0].id).to.eql(chat1.id); - expect(_group.chat[1].id).to.eql(chat2.id); - expect(_group.chat[2].id).to.eql(chat3.id); - }); + it('does not include messages with a flag count of 2 or greater', async () => { + let fetchedGroup = await nonAdmin.get(`/groups/${group._id}`); + + expect(fetchedGroup.chat).to.have.lengthOf(3); + expect(fetchedGroup.chat[0].id).to.eql(chat1.id); + expect(fetchedGroup.chat[1].id).to.eql(chat2.id); + expect(fetchedGroup.chat[2].id).to.eql(chat3.id); }); - it('does not include user ids in flags object', () => { - return api.get(`/groups/${group._id}`).then((_group) => { - let chatWithOneFlag = _group.chat[2]; - expect(chatWithOneFlag.id).to.eql(chat3.id); - expect(chat3.flags).to.eql({ 'user-id': true }); - expect(chatWithOneFlag.flags).to.eql({}); - }); + it('does not include user ids in flags object', async () => { + let fetchedGroup = await nonAdmin.get(`/groups/${group._id}`); + let chatWithOneFlag = fetchedGroup.chat[2]; + + expect(chatWithOneFlag.id).to.eql(chat3.id); + expect(chat3.flags).to.eql({ 'user-id': true }); + expect(chatWithOneFlag.flags).to.eql({}); }); }); context('admin', () => { - let api; + let admin; - beforeEach(() => { - return generateUser({ + beforeEach(async () => { + admin = await generateUser({ 'contributor.admin': true, - }).then((user) => { - api = requester(user); }); }); - it('includes all messages', () => { - return api.get(`/groups/${group._id}`).then((_group) => { - expect(_group.chat).to.have.lengthOf(5); - expect(_group.chat[0].id).to.eql(chat1.id); - expect(_group.chat[1].id).to.eql(chat2.id); - expect(_group.chat[2].id).to.eql(chat3.id); - expect(_group.chat[3].id).to.eql(chat4.id); - expect(_group.chat[4].id).to.eql(chat5.id); - }); + it('includes all messages', async () => { + let fetchedGroup = await admin.get(`/groups/${group._id}`); + + expect(fetchedGroup.chat).to.have.lengthOf(5); + expect(fetchedGroup.chat[0].id).to.eql(chat1.id); + expect(fetchedGroup.chat[1].id).to.eql(chat2.id); + expect(fetchedGroup.chat[2].id).to.eql(chat3.id); + expect(fetchedGroup.chat[3].id).to.eql(chat4.id); + expect(fetchedGroup.chat[4].id).to.eql(chat5.id); }); - it('includes user ids in flags object', () => { - return api.get(`/groups/${group._id}`).then((_group) => { - let chatWithOneFlag = _group.chat[2]; - expect(chatWithOneFlag.id).to.eql(chat3.id); - expect(chat3.flags).to.eql({ 'user-id': true }); - expect(chatWithOneFlag.flags).to.eql(chat3.flags); - }); + it('includes user ids in flags object', async () => { + let fetchedGroup = await admin.get(`/groups/${group._id}`); + let chatWithOneFlag = fetchedGroup.chat[2]; + + expect(chatWithOneFlag.id).to.eql(chat3.id); + expect(chat3.flags).to.eql({ 'user-id': true }); + expect(chatWithOneFlag.flags).to.eql(chat3.flags); }); }); }); context('Non-member of a public guild', () => { - let leader, nonMember, createdGroup; + let nonMember, createdGroup; - before(() => { - return createAndPopulateGroup({ + before(async () => { + let groupData = await createAndPopulateGroup({ members: 1, groupDetails: { name: 'test guild', type: 'guild', privacy: 'public', }, - }).then((res) => { - leader = res.leader; - createdGroup = res.group; - return generateUser(); - }).then((user) => { - nonMember = user; }); + + createdGroup = groupData.group; + nonMember = await generateUser(); }); - it('returns the group object for a non-member', () => { - let api = requester(nonMember); - return api.get(`/groups/${createdGroup._id}`) - .then((group) => { - expect(group._id).to.eql(createdGroup._id); - expect(group.name).to.eql(createdGroup.name); - expect(group.type).to.eql(createdGroup.type); - expect(group.privacy).to.eql(createdGroup.privacy); - }); + it('returns the group object for a non-member', async () => { + let group = await nonMember.get(`/groups/${createdGroup._id}`); + + expect(group._id).to.eql(createdGroup._id); + expect(group.name).to.eql(createdGroup.name); + expect(group.type).to.eql(createdGroup.type); + expect(group.privacy).to.eql(createdGroup.privacy); }); - it('does not include user in members list', () => { - let api = requester(nonMember); - return api.get(`/groups/${createdGroup._id}`).then((group) => { - let userInGroup = find(group.members, (user) => { - return nonMember._id === user._id; - }); - expect(userInGroup).to.not.be.ok; - }); + it('does not include user in members list', async () => { + let group = await nonMember.get(`/groups/${createdGroup._id}`); + let userInGroup = find(group.members, '_id', nonMember._id); + + expect(userInGroup).to.not.exist; }); }); context('Private Guilds', () => { - let leader, nonMember, createdGroup; + let nonMember, createdGroup; - before(() => { - return createAndPopulateGroup({ + before(async () => { + let groupData = await createAndPopulateGroup({ members: 1, groupDetails: { name: 'test guild', type: 'guild', privacy: 'private', }, - }).then((res) => { - leader = res.leader; - createdGroup = res.group; - return generateUser(); - }).then((user) => { - nonMember = user; }); + + createdGroup = groupData.group; + nonMember = await generateUser(); }); - it('does not return the group object for a non-member', () => { - let api = requester(nonMember); - return expect(api.get(`/groups/${createdGroup._id}`)) + it('does not return the group object for a non-member', async () => { + await expect(nonMember.get(`/groups/${createdGroup._id}`)) .to.eventually.be.rejected.and.eql({ code: 404, text: t('messageGroupNotFound'), @@ -281,28 +252,24 @@ describe('GET /groups/:id', () => { }); context('Non-member of a party', () => { - let leader, nonMember, createdGroup; + let nonMember, createdGroup; - before(() => { - return createAndPopulateGroup({ + before(async () => { + let groupData = await createAndPopulateGroup({ members: 1, groupDetails: { name: 'test party', type: 'party', privacy: 'private', }, - }).then((res) => { - leader = res.leader; - createdGroup = res.group; - return generateUser(); - }).then((user) => { - nonMember = user; }); + + createdGroup = groupData.group; + nonMember = await generateUser(); }); - it('does not return the group object for a non-member', () => { - let api = requester(nonMember); - return expect(api.get(`/groups/${createdGroup._id}`)) + it('does not return the group object for a non-member', async () => { + await expect(nonMember.get(`/groups/${createdGroup._id}`)) .to.eventually.be.rejected.and.eql({ code: 404, text: t('messageGroupNotFound'), @@ -311,47 +278,41 @@ describe('GET /groups/:id', () => { }); context('Member of a party', () => { - let leader, member, createdGroup; + let member, createdGroup; - before(() => { - return createAndPopulateGroup({ + before(async () => { + let groupData = await createAndPopulateGroup({ members: 1, groupDetails: { name: 'test party', type: 'party', privacy: 'private', }, - }).then((res) => { - leader = res.leader; - createdGroup = res.group; - member = res.members[0]; }); + + createdGroup = groupData.group; + member = groupData.members[0]; }); - it('returns the user\'s party if an id of "party" is passed in', () => { - let api = requester(member); - return api.get('/groups/party') - .then((group) => { - expect(group._id).to.eql(createdGroup._id); - expect(group.name).to.eql(createdGroup.name); - expect(group.type).to.eql(createdGroup.type); - expect(group.privacy).to.eql(createdGroup.privacy); - }); + it('returns the user\'s party if an id of "party" is passed in', async () => { + let group = await member.get('/groups/party'); + + expect(group._id).to.eql(createdGroup._id); + expect(group.name).to.eql(createdGroup.name); + expect(group.type).to.eql(createdGroup.type); + expect(group.privacy).to.eql(createdGroup.privacy); }); }); context('Non-existent group', () => { let user; - beforeEach(() => { - return generateUser().then((_user) => { - user = _user; - }); + beforeEach(async () => { + user = await generateUser(); }); - it('returns error if group does not exist', () => { - let api = requester(user); - return expect(api.get('/groups/group-that-does-not-exist')) + it('returns error if group does not exist', async () => { + await expect(user.get('/groups/group-that-does-not-exist')) .to.eventually.be.rejected.and.eql({ code: 404, text: t('messageGroupNotFound'), diff --git a/test/api/v2/groups/POST-groups.test.js b/test/api/v2/groups/POST-groups.test.js index 2fb70e0a7a..d14ea1bee4 100644 --- a/test/api/v2/groups/POST-groups.test.js +++ b/test/api/v2/groups/POST-groups.test.js @@ -1,24 +1,19 @@ import { generateGroup, generateUser, - requester, translate as t, } from '../../../helpers/api-integration.helper'; describe('POST /groups', () => { - context('All groups', () => { - let api, leader; + let leader; - beforeEach(() => { - return generateUser().then((user) => { - leader = user; - api = requester(user); - }); + beforeEach(async () => { + leader = await generateUser(); }); - xit('returns defaults? (TODO: it\'s possible to create a group without a type. Should the group default to party? Should we require type to be set?', () => { - return api.post('/groups').then((group) => { + xit('returns defaults? (TODO: it\'s possible to create a group without a type. Should the group default to party? Should we require type to be set?', async () => { + return leader.post('/groups').then((group) => { expect(group._id).to.exist; expect(group.name).to.eql(`${leader.profile.name}'s group`); expect(group.type).to.eql('party'); @@ -26,69 +21,66 @@ describe('POST /groups', () => { }); }); - it('returns a group object', () => { - let group = { + it('returns a group object', async () => { + let group = await leader.post('/groups', { name: 'Test Group', type: 'party', leaderOnly: { challenges: true }, description: 'Test Group Description', leaderMessage: 'Test Group Message', - }; - - return api.post('/groups', group).then((createdGroup) => { - expect(createdGroup._id).to.exist; - expect(createdGroup.leader).to.eql(leader._id); - expect(createdGroup.name).to.eql(group.name); - expect(createdGroup.description).to.eql(group.description); - expect(createdGroup.leaderMessage).to.eql(group.leaderMessage); - expect(createdGroup.leaderOnly).to.eql(group.leaderOnly); - expect(createdGroup.memberCount).to.eql(1); }); + + expect(group._id).to.exist; + expect(group.leader).to.eql(leader._id); + expect(group.name).to.eql(group.name); + expect(group.description).to.eql(group.description); + expect(group.leaderMessage).to.eql(group.leaderMessage); + expect(group.leaderOnly).to.eql(group.leaderOnly); + expect(group.memberCount).to.eql(1); }); - it('returns a populated members array', () => { - return api.post('/groups', { + it('returns a populated members array', async () => { + let party = await leader.post('/groups', { type: 'party', - }).then((party) => { - let member = party.members[0]; - expect(member._id).to.eql(leader._id); - expect(member.profile).to.eql(leader.profile); - expect(member.contributor).to.eql(leader.contributor); }); + + let member = party.members[0]; + + expect(member._id).to.eql(leader._id); + expect(member.profile).to.eql(leader.profile); + expect(member.contributor).to.eql(leader.contributor); }); }); context('Parties', () => { - let api, leader; + let leader; - beforeEach(() => { - return generateUser().then((user) => { - leader = user; - api = requester(user); + beforeEach(async () => { + leader = await generateUser(); + }); + + it('allows party creation without gems', async () => { + let party = await leader.post('/groups', { + type: 'party', }); + + expect(party._id).to.exist; }); - it('allows party creation without gems', () => { - return expect(api.post('/groups', { + it('prevents party creation if user is already in party', async () => { + await generateGroup(leader, { + name: 'first party that user attempts to create', type: 'party', - })).to.eventually.have.property('_id'); - }); + }); - it('prevents party creation if user is already in party', () => { - return expect(generateGroup(leader, { - type: 'party', - }).then((group) => { - return api.post('/groups', { - type: 'party', - }); - })).to.eventually.be.rejected.and.eql({ + await expect(leader.post('/groups', { type: 'party' })).to.eventually.be.rejected.and.eql({ code: 400, text: t('messageGroupAlreadyInParty'), }); }); - xit('prevents creating a public party. TODO: it is possible to create a public party. Should we send back an error? Automatically switch the privacy to private?', () => { - return expect(api.post('/groups', { + xit('prevents creating a public party. TODO: it is possible to create a public party. Should we send back an error? Automatically switch the privacy to private?', async () => { + return expect(leader.post('/groups', { type: 'party', privacy: 'public', })).to.eventually.be.rejected.and.eql({ @@ -99,53 +91,54 @@ describe('POST /groups', () => { }); context('Guilds', () => { - let api, leader; + let leader; - beforeEach(() => { - return generateUser({ + beforeEach(async () => { + leader = await generateUser({ balance: 2, - }).then((user) => { - leader = user; - api = requester(user); }); }); - it('prevents guild creation when user does not have enough gems', () => { - return expect(generateUser({ + it('prevents guild creation when user does not have enough gems', async () => { + let userWithoutGems = await generateUser({ balance: 0.75, - }).then((user) => { - api = requester(user); - return api.post('/groups', { - type: 'guild', - }); - })).to.eventually.be.rejected.and.eql({ + }); + + await expect(userWithoutGems.post('/groups', { type: 'guild' })).to.eventually.be.rejected.and.eql({ code: 401, text: t('messageInsufficientGems'), }); }); - it('can create a public guild', () => { - return expect(api.post('/groups', { + it('can create a public guild', async () => { + let guild = await leader.post('/groups', { type: 'guild', privacy: 'public', - })).to.eventually.have.property('leader', leader._id); + }); + + expect(guild.leader).to.eql(leader._id); }); - it('can create a private guild', () => { - return expect(api.post('/groups', { + it('can create a private guild', async () => { + let privateGuild = await leader.post('/groups', { type: 'guild', privacy: 'private', - })).to.eventually.have.property('leader', leader._id); + }); + + expect(privateGuild.leader).to.eql(leader._id); }); - it('deducts gems from user and adds them to guild bank', () => { - return expect(api.post('/groups', { + it('deducts gems from user and adds them to guild bank', async () => { + let guild = await leader.post('/groups', { type: 'guild', privacy: 'private', - }).then((group) => { - expect(group.balance).to.eql(1); - return api.get('/user'); - })).to.eventually.have.deep.property('balance', 1); + }); + + expect(guild.balance).to.eql(1); + + let updatedUser = await leader.get('/user'); + + expect(updatedUser.balance).to.eql(1); }); }); }); diff --git a/test/api/v2/groups/POST-groups_id.test.js b/test/api/v2/groups/POST-groups_id.test.js index d71f37a076..eabf3e58c6 100644 --- a/test/api/v2/groups/POST-groups_id.test.js +++ b/test/api/v2/groups/POST-groups_id.test.js @@ -1,23 +1,20 @@ import { generateGroup, generateUser, - requester, translate as t, } from '../../../helpers/api-integration.helper'; describe('POST /groups/:id', () => { - context('user is not the leader of the group', () => { - let api, user, otherUser, groupUserDoesNotOwn; + let user, otherUser, groupUserDoesNotOwn; - beforeEach(() => { + beforeEach(async () => { return Promise.all([ generateUser({ balance: 10 }), generateUser({ balance: 10 }), ]).then((users) => { user = users[0]; otherUser = users[1]; - api = requester(user); return generateGroup(otherUser, { name: 'Group not Owned By User', @@ -30,9 +27,9 @@ describe('POST /groups/:id', () => { }); }); - it('does not allow user to update group', () => { - return expect(api.post(`/groups/${groupUserDoesNotOwn._id}`, { - name: 'Change' + it('does not allow user to update group', async () => { + return expect(user.post(`/groups/${groupUserDoesNotOwn._id}`, { + name: 'Change', })).to.eventually.be.rejected.and.eql({ code: 401, text: t('messageGroupOnlyLeaderCanUpdate'), @@ -41,35 +38,30 @@ describe('POST /groups/:id', () => { }); context('user is the leader of the group', () => { - let api, user, usersGroup; + let user, usersGroup; - beforeEach(() => { - return generateUser({ + beforeEach(async () => { + user = await generateUser({ balance: 10, - }).then((_user) => { - user = _user; - api = requester(user); + }); - return generateGroup(user, { - name: 'Original Group Title', - type: 'guild', - privacy: 'public', - }); - }).then((group) => { - usersGroup = group; + usersGroup = await generateGroup(user, { + name: 'Original Group Title', + type: 'guild', + privacy: 'public', }); }); - it('allows user to update group', () => { - return api.post(`/groups/${usersGroup._id}`, { + it('allows user to update group', async () => { + await user.post(`/groups/${usersGroup._id}`, { name: 'New Group Title', description: 'New group description', - }).then((group) => { - return api.get(`/groups/${usersGroup._id}`); - }).then((group) => { - expect(group.name).to.eql('New Group Title'); - expect(group.description).to.eql('New group description'); }); + + let group = await user.get(`/groups/${usersGroup._id}`); + + expect(group.name).to.eql('New Group Title'); + expect(group.description).to.eql('New group description'); }); }); }); diff --git a/test/api/v2/groups/POST-groups_id_join.test.js b/test/api/v2/groups/POST-groups_id_join.test.js index ce00136f19..1c21fe8a58 100644 --- a/test/api/v2/groups/POST-groups_id_join.test.js +++ b/test/api/v2/groups/POST-groups_id_join.test.js @@ -1,13 +1,11 @@ import { createAndPopulateGroup, generateUser, - requester, translate as t, } from '../../../helpers/api-integration.helper'; import { each, find } from 'lodash'; describe('POST /groups/:id/join', () => { - context('user is already a member of the group', () => { it('returns an error'); }); @@ -15,66 +13,48 @@ describe('POST /groups/:id/join', () => { each({ 'public guild': {type: 'guild', privacy: 'public'}, 'private guild': {type: 'guild', privacy: 'private'}, - 'party': {type: 'party', privacy: 'private'}, - }, (data, groupType) => { + party: {type: 'party', privacy: 'private'}, + }, (groupDetails, groupType) => { context(`user has invitation to a ${groupType}`, () => { - let api, group, invitee; + let group, invitee; - beforeEach(() => { - return createAndPopulateGroup({ - groupDetails: { - type: data.type, - privacy: data.privacy, - }, + beforeEach(async () => { + let groupData = await createAndPopulateGroup({ + groupDetails, invites: 1, - }).then((res) => { - group = res.group; - invitee = res.invitees[0]; - api = requester(invitee); }); + group = groupData.group; + invitee = groupData.invitees[0]; }); - it(`allows user to join a ${groupType}`, () => { - return api.post(`/groups/${group._id}/join`).then((res) => { - return api.get(`/groups/${group._id}`); - }).then((_group) => { - let members = _group.members; - let userInGroup = find(members, (user) => { - return user._id === invitee._id; - }); + it(`allows user to join a ${groupType}`, async () => { + await invitee.post(`/groups/${group._id}/join`); - expect(userInGroup).to.exist; - }); + let members = (await invitee.get(`/groups/${group._id}`)).members; + let userInGroup = find(members, '_id', invitee._id); + + expect(userInGroup).to.exist; }); }); }); each({ 'private guild': {type: 'guild', privacy: 'private'}, - 'party': {type: 'party', privacy: 'private'}, - }, (data, groupType) => { + party: {type: 'party', privacy: 'private'}, + }, (groupDetails, groupType) => { context(`user does not have an invitation to a ${groupType}`, () => { - let api, group, user; + let group, user; - beforeEach(() => { - return createAndPopulateGroup({ - groupDetails: { - type: data.type, - privacy: data.privacy, - }, - }).then((res) => { - group = res.group; - return generateUser(); - }).then((generatedUser) => { - user = generatedUser; - api = requester(user); + beforeEach(async () => { + let groupData = await createAndPopulateGroup({ + groupDetails, }); + group = groupData.group; + user = await generateUser(); }); - it(`does not allow user to join a ${groupType}`, () => { - return expect(api.post(`/groups/${group._id}/join`).then((res) => { - return api.get(`/groups/${group._id}`); - })).to.eventually.be.rejected.and.eql({ + it(`does not allow user to join a ${groupType}`, async () => { + await expect(user.post(`/groups/${group._id}/join`)).to.eventually.be.rejected.and.eql({ code: 401, text: t('messageGroupRequiresInvite'), }); @@ -83,62 +63,49 @@ describe('POST /groups/:id/join', () => { }); context('user does not have an invitation to a public group', () => { - let api, group, user; + let group, user; - beforeEach(() => { - return createAndPopulateGroup({ + beforeEach(async () => { + let groupData = await createAndPopulateGroup({ groupDetails: { type: 'guild', privacy: 'public', }, - }).then((res) => { - group = res.group; - return generateUser(); - }).then((generatedUser) => { - user = generatedUser; - api = requester(user); }); + group = groupData.group; + user = await generateUser(); }); - it('allows user to join a public guild', () => { - return api.post(`/groups/${group._id}/join`).then((res) => { - return api.get(`/groups/${group._id}`); - }).then((_group) => { - let members = _group.members; - let userInGroup = find(members, (member) => { - return user._id === user._id; - }); + it('allows user to join a public guild', async () => { + await user.post(`/groups/${group._id}/join`); - expect(userInGroup).to.exist; - }); + let members = (await user.get(`/groups/${group._id}`)).members; + let userInGroup = find(members, '_id', user._id); + + expect(userInGroup).to.exist; }); }); context('public guild has no leader', () => { let user, group; - beforeEach(() => { - return createAndPopulateGroup({ + beforeEach(async () => { + let groupData = await createAndPopulateGroup({ groupDetails: { name: 'test guild', type: 'guild', privacy: 'public', }, - }).then((res) => { - group = res.group; - return requester(res.leader).post(`/groups/${group._id}/leave`); - }).then((res) => { - return generateUser(); - }).then((generatedUser) => { - user = generatedUser; }); + group = groupData.group; + await groupData.leader.post(`/groups/${group._id}/leave`); + user = await generateUser(); }); - it('makes the joining user the leader', () => { - let api = requester(user); - return expect(api.post(`/groups/${group._id}/join`).then((result) => { - return api.get(`/groups/${group._id}`); - })).to.eventually.have.deep.property('leader._id', user._id); + it('makes the joining user the leader', async () => { + await user.post(`/groups/${group._id}/join`); + + await expect(user.get(`/groups/${group._id}`)).to.eventually.have.deep.property('leader._id', user._id); }); }); }); diff --git a/test/api/v2/groups/POST-groups_id_leave.test.js b/test/api/v2/groups/POST-groups_id_leave.test.js index 408d7ca024..dcfa3077f1 100644 --- a/test/api/v2/groups/POST-groups_id_leave.test.js +++ b/test/api/v2/groups/POST-groups_id_leave.test.js @@ -1,161 +1,138 @@ import { checkExistence, createAndPopulateGroup, - generateUser, - requester, - translate as t, } from '../../../helpers/api-integration.helper'; import { find } from 'lodash'; describe('POST /groups/:id/leave', () => { - context('user is not member of the group', () => { it('returns an error'); }); context('user is a non-leader member of a guild', () => { - let api, user, group; + let user, group; - beforeEach(() => { - return createAndPopulateGroup({ + beforeEach(async () => { + let groupData = await createAndPopulateGroup({ members: 3, groupDetails: { name: 'test guild', type: 'guild', privacy: 'public', }, - }).then((res) => { - user = res.members[0]; - api = requester(user); - group = res.group; }); + + user = groupData.members[0]; + group = groupData.group; }); - it('leaves the group', () => { - return api.post(`/groups/${group._id}/leave`).then((result) => { - return api.get(`/groups/${group._id}`); - }).then((group) => { - let userInGroup = find(group.members, (member) => { - return member._id === user._id; - }); - expect(userInGroup).to.not.be.ok; - }); + it('leaves the group', async () => { + await user.post(`/groups/${group._id}/leave`); + + let members = (await user.get(`/groups/${group._id}`)).members; + let userInGroup = find(members, '_id', user._id); + + expect(userInGroup).to.not.be.ok; }); }); context('user is the last member of a public guild', () => { - let api, user, group; + let user, group; - beforeEach(() => { - return createAndPopulateGroup({ + beforeEach(async () => { + let groupData = await createAndPopulateGroup({ groupDetails: { name: 'test guild', type: 'guild', privacy: 'public', }, - }).then((res) => { - user = res.leader; - api = requester(user); - group = res.group; }); + + user = groupData.leader; + group = groupData.group; }); - it('leaves the group accessible', () => { - return expect(api.post(`/groups/${group._id}/leave`).then((result) => { - return api.get(`/groups/${group._id}`); - })).to.eventually.have.property('_id', group._id); + it('leaves the group accessible', async () => { + await user.post(`/groups/${group._id}/leave`); + + await expect(user.get(`/groups/${group._id}`)).to.eventually.have.property('_id', group._id); }); }); context('user is the last member of a private group', () => { - let api, user, group; + let user, group; - beforeEach(() => { - return createAndPopulateGroup({ + beforeEach(async () => { + let groupData = await createAndPopulateGroup({ groupDetails: { name: 'test guild', type: 'guild', privacy: 'private', }, - }).then((res) => { - user = res.leader; - api = requester(user); - group = res.group; }); + + user = groupData.leader; + group = groupData.group; }); - it('group is deleted', () => { - return expect(api.post(`/groups/${group._id}/leave`).then((result) => { - return checkExistence('groups', group._id); - })).to.eventually.eql(false); + it('group is deleted', async () => { + await user.post(`/groups/${group._id}/leave`); + + await expect(checkExistence('groups', group._id)).to.eventually.eql(false); }); }); context('user is the last member of a private group with pending invites', () => { - let api, user, inviteeRequest1, inviteeRequest2, group; + let user, invitee1, invitee2, group; - beforeEach(() => { - return createAndPopulateGroup({ + beforeEach(async () => { + let groupData = await createAndPopulateGroup({ invites: 2, groupDetails: { name: 'test guild', type: 'guild', privacy: 'private', }, - }).then((res) => { - user = res.leader; - inviteeRequest1 = requester(res.invitees[0]); - inviteeRequest2 = requester(res.invitees[1]); - api = requester(user); - group = res.group; }); + + user = groupData.leader; + group = groupData.group; + invitee1 = groupData.invitees[0]; + invitee2 = groupData.invitees[1]; }); - it('deletes the group invitations from users', () => { - return api.post(`/groups/${group._id}/leave`).then((result) => { - return Promise.all([ - expect(inviteeRequest1.get(`/user`)) - .to.eventually.have.deep.property('invitations.guilds') - .and.to.be.empty, - expect(inviteeRequest2.get(`/user`)) - .to.eventually.have.deep.property('invitations.guilds') - .and.to.be.empty, - ]); - }); + it('deletes the group invitations from users', async () => { + await user.post(`/groups/${group._id}/leave`); + + await expect(invitee1.get(`/user`)).to.eventually.have.deep.property('invitations.guilds').and.to.be.empty; + await expect(invitee2.get(`/user`)).to.eventually.have.deep.property('invitations.guilds').and.to.be.empty; }); }); context('user is the last member of a party with pending invites', () => { - let api, user, inviteeRequest1, inviteeRequest2, group; + let user, invitee1, invitee2, group; - beforeEach(() => { - return createAndPopulateGroup({ + beforeEach(async () => { + let groupData = await createAndPopulateGroup({ invites: 2, groupDetails: { - name: 'test party', + name: 'test guild', type: 'party', privacy: 'private', }, - }).then((res) => { - user = res.leader; - inviteeRequest1 = requester(res.invitees[0]); - inviteeRequest2 = requester(res.invitees[1]); - api = requester(user); - group = res.group; }); + + user = groupData.leader; + group = groupData.group; + invitee1 = groupData.invitees[0]; + invitee2 = groupData.invitees[1]; }); - it('deletes the group invitations from users', () => { - return api.post(`/groups/${group._id}/leave`).then((result) => { - return Promise.all([ - expect(inviteeRequest1.get(`/user`)) - .to.eventually.have.deep.property('invitations.party') - .and.to.be.empty, - expect(inviteeRequest2.get(`/user`)) - .to.eventually.have.deep.property('invitations.party') - .and.to.be.empty, - ]); - }); + it('deletes the group invitations from users', async () => { + await user.post(`/groups/${group._id}/leave`); + + await expect(invitee1.get(`/user`)).to.eventually.have.deep.property('invitations.party').and.to.be.empty; + await expect(invitee2.get(`/user`)).to.eventually.have.deep.property('invitations.party').and.to.be.empty; }); }); }); diff --git a/test/api/v2/groups/POST-groups_id_removeMember.test.js b/test/api/v2/groups/POST-groups_id_removeMember.test.js index 541f2fd736..757ac6bcba 100644 --- a/test/api/v2/groups/POST-groups_id_removeMember.test.js +++ b/test/api/v2/groups/POST-groups_id_removeMember.test.js @@ -1,13 +1,9 @@ import { createAndPopulateGroup, - generateGroup, - generateUser, - requester, translate as t, } from '../../../helpers/api-integration.helper'; describe('POST /groups/:id/removeMember', () => { - context('user is not member of the group', () => { it('returns an error'); }); @@ -17,9 +13,9 @@ describe('POST /groups/:id/removeMember', () => { }); context('user is the leader of a guild', () => { - let api, leader, member, group; + let leader, member, group; - beforeEach(() => { + beforeEach(async () => { return createAndPopulateGroup({ members: 1, groupDetails: { @@ -31,13 +27,11 @@ describe('POST /groups/:id/removeMember', () => { leader = res.leader; member = res.members[0]; group = res.group; - - api = requester(leader); }); }); - it('does not allow leader to remove themselves', () => { - return expect(api.post(`/groups/${group._id}/removeMember`, null, { + it('does not allow leader to remove themselves', async () => { + return expect(leader.post(`/groups/${group._id}/removeMember`, null, { uuid: leader._id, })).to.eventually.be.rejected.and.eql({ code: 401, @@ -45,11 +39,11 @@ describe('POST /groups/:id/removeMember', () => { }); }); - it('can remove other members of guild', () => { - return api.post(`/groups/${group._id}/removeMember`, null, { + it('can remove other members of guild', async () => { + return leader.post(`/groups/${group._id}/removeMember`, null, { uuid: member._id, - }).then((res) => { - return api.get(`/groups/${group._id}`); + }).then(() => { + return leader.get(`/groups/${group._id}`); }).then((guild) => { expect(guild.members).to.have.a.lengthOf(1); expect(guild.members[0]._id).to.not.eql(member._id); diff --git a/test/api/v2/groups/chat/DELETE-groups_id_chat.test.js b/test/api/v2/groups/chat/DELETE-groups_id_chat.test.js index 10e79e3963..cf9f519032 100644 --- a/test/api/v2/groups/chat/DELETE-groups_id_chat.test.js +++ b/test/api/v2/groups/chat/DELETE-groups_id_chat.test.js @@ -1,14 +1,12 @@ import { createAndPopulateGroup, - generateUser, - requester, translate as t, } from '../../../../helpers/api-integration.helper'; describe('DELETE /groups/:id/chat', () => { - let api, group, message, user; + let group, message, user; - beforeEach(() => { + beforeEach(async () => { return createAndPopulateGroup({ groupDetails: { type: 'guild', @@ -17,24 +15,23 @@ describe('DELETE /groups/:id/chat', () => { }).then((res) => { group = res.group; user = res.leader; - api = requester(user); - return api.post(`/groups/${group._id}/chat`, null, { message: 'Some message', }); + return user.post(`/groups/${group._id}/chat`, null, { message: 'Some message' }); }).then((res) => { message = res.message; }); }); - it('deletes a message', () => { - return api.del(`/groups/${group._id}/chat/${message.id}`).then((res) => { - return api.get(`/groups/${group._id}/chat/`); + it('deletes a message', async () => { + return user.del(`/groups/${group._id}/chat/${message.id}`).then(() => { + return user.get(`/groups/${group._id}/chat/`); }).then((messages) => { expect(messages).to.have.length(0); }); }); - it('returns an error is message does not exist', () => { - return expect(api.del(`/groups/${group._id}/chat/some-fake-id`)).to.eventually.be.rejected.and.eql({ + it('returns an error is message does not exist', async () => { + return expect(user.del(`/groups/${group._id}/chat/some-fake-id`)).to.eventually.be.rejected.and.eql({ code: 404, text: t('messageGroupChatNotFound'), }); diff --git a/test/api/v2/groups/chat/GET-groups_id_chat.test.js b/test/api/v2/groups/chat/GET-groups_id_chat.test.js index 1d750e5e7e..2095d16987 100644 --- a/test/api/v2/groups/chat/GET-groups_id_chat.test.js +++ b/test/api/v2/groups/chat/GET-groups_id_chat.test.js @@ -1,48 +1,38 @@ import { createAndPopulateGroup, - generateUser, - requester, - translate as t, } from '../../../../helpers/api-integration.helper'; describe('GET /groups/:id/chat', () => { - context('group with multiple messages', () => { - let group, member, message1, message2, user; + let group, member, user; - beforeEach(() => { - return createAndPopulateGroup({ + beforeEach(async () => { + let groupData = await createAndPopulateGroup({ groupDetails: { type: 'guild', privacy: 'public', }, members: 1, - }).then((res) => { - group = res.group; - user = res.leader; - member = res.members[0]; - - return requester(member).post(`/groups/${group._id}/chat`, null, { message: 'Group member message' }); - }).then((res) => { - message1 = res.message; - - return requester(user).post(`/groups/${group._id}/chat`, null, { message: 'User message' }); - }).then((res) => { - message2 = res.message; }); + + group = groupData.group; + user = groupData.leader; + member = groupData.members[0]; + + await member.post(`/groups/${group._id}/chat`, null, { message: 'Group member message' }); + await user.post(`/groups/${group._id}/chat`, null, { message: 'User message' }); }); - it('gets messages', () => { - let api = requester(user); + it('gets messages', async () => { + let messages = await user.get(`/groups/${group._id}/chat`); - return api.get(`/groups/${group._id}/chat`).then((messages) => { - expect(messages).to.have.length(2); + expect(messages).to.have.length(2); - let message = messages[0]; - expect(message.id).to.exist; - expect(message.text).to.exist; - expect(message.uuid).to.exist; - }); + let message = messages[0]; + + expect(message.id).to.exist; + expect(message.text).to.exist; + expect(message.uuid).to.exist; }); }); }); diff --git a/test/api/v2/groups/chat/POST-groups_id_chat.test.js b/test/api/v2/groups/chat/POST-groups_id_chat.test.js index 6a4f3a0c05..4cb2c21dfa 100644 --- a/test/api/v2/groups/chat/POST-groups_id_chat.test.js +++ b/test/api/v2/groups/chat/POST-groups_id_chat.test.js @@ -1,15 +1,12 @@ import { createAndPopulateGroup, - generateUser, - requester, translate as t, } from '../../../../helpers/api-integration.helper'; describe('POST /groups/:id/chat', () => { + let group, user; - let api, group, user; - - beforeEach(() => { + beforeEach(async () => { return createAndPopulateGroup({ groupDetails: { type: 'guild', @@ -18,12 +15,11 @@ describe('POST /groups/:id/chat', () => { }).then((res) => { group = res.group; user = res.leader; - api = requester(user); }); }); - it('creates a chat message', () => { - return api.post(`/groups/${group._id}/chat`, null, { + it('creates a chat message', async () => { + return user.post(`/groups/${group._id}/chat`, null, { message: 'Test Message', }).then((res) => { let message = res.message; @@ -35,8 +31,8 @@ describe('POST /groups/:id/chat', () => { }); }); - it('does not post an empty message', () => { - return expect(api.post(`/groups/${group._id}/chat`, null, { + it('does not post an empty message', async () => { + return expect(user.post(`/groups/${group._id}/chat`, null, { message: '', })).to.eventually.be.rejected.and.eql({ code: 400, diff --git a/test/api/v2/groups/chat/POST-groups_id_chat_id_clearflags.test.js b/test/api/v2/groups/chat/POST-groups_id_chat_id_clearflags.test.js index e6873c96b1..8a84fa300c 100644 --- a/test/api/v2/groups/chat/POST-groups_id_chat_id_clearflags.test.js +++ b/test/api/v2/groups/chat/POST-groups_id_chat_id_clearflags.test.js @@ -1,14 +1,13 @@ import { createAndPopulateGroup, generateUser, - requester, translate as t, } from '../../../../helpers/api-integration.helper'; describe('POST /groups/:id/chat/:id/clearflags', () => { let group; - beforeEach(() => { + beforeEach(async () => { return createAndPopulateGroup({ groupDetails: { type: 'guild', @@ -27,16 +26,14 @@ describe('POST /groups/:id/chat/:id/clearflags', () => { }); context('non admin', () => { - let api; + let nonadmin; - beforeEach(() => { - return generateUser().then((user) => { - api = requester(user); - }); + beforeEach(async () => { + nonadmin = await generateUser(); }); - it('cannot clear flags', () => { - return expect(api.post(`/groups/${group._id}/chat/message-to-clear/clearflags`)) + it('cannot clear flags', async () => { + return expect(nonadmin.post(`/groups/${group._id}/chat/message-to-clear/clearflags`)) .to.eventually.be.rejected.and.eql({ code: 401, text: t('messageGroupChatAdminClearFlagCount'), @@ -45,34 +42,34 @@ describe('POST /groups/:id/chat/:id/clearflags', () => { }); context('admin', () => { - let api; + let admin; - beforeEach(() => { + beforeEach(async () => { return generateUser({ 'contributor.admin': true, }).then((user) => { - api = requester(user); + admin = user; }); }); - it('clears flags', () => { - return api.post(`/groups/${group._id}/chat/message-to-clear/clearflags`).then((res) => { - return api.get(`/groups/${group._id}/chat`); + it('clears flags', async () => { + return admin.post(`/groups/${group._id}/chat/message-to-clear/clearflags`).then(() => { + return admin.get(`/groups/${group._id}/chat`); }).then((messages) => { expect(messages[0].flagCount).to.eql(0); }); }); - it('leaves old flags on the flag object', () => { - return api.post(`/groups/${group._id}/chat/message-to-clear/clearflags`).then((res) => { - return api.get(`/groups/${group._id}/chat`); + it('leaves old flags on the flag object', async () => { + return admin.post(`/groups/${group._id}/chat/message-to-clear/clearflags`).then(() => { + return admin.get(`/groups/${group._id}/chat`); }).then((messages) => { expect(messages[0].flags).to.have.property('some-id', true); }); }); - it('returns error if message does not exist', () => { - return expect(api.post(`/groups/${group._id}/chat/non-existant-message/clearflags`)) + it('returns error if message does not exist', async () => { + return expect(admin.post(`/groups/${group._id}/chat/non-existant-message/clearflags`)) .to.eventually.be.rejected.and.eql({ code: 404, text: t('messageGroupChatNotFound'), @@ -81,40 +78,34 @@ describe('POST /groups/:id/chat/:id/clearflags', () => { }); context('admin user, group with multiple messages', () => { - let admin, author, group, member; + let admin, author, groupWithMessages; - beforeEach(() => { - return generateUser().then((user) => { - author = user; - - return createAndPopulateGroup({ - groupDetails: { - type: 'guild', - privacy: 'public', - chat: [ - { id: 'message-to-unflag', uuid: author._id, flagCount: 1, flags: {'some-user': true} }, - { id: '1-flag-message', uuid: author._id, flagCount: 1, flags: { 'id1': true } }, - { id: '2-flag-message', uuid: author._id, flagCount: 2, flags: { 'id1': true, 'id2': true } }, - { id: 'no-flags', uuid: author._id, flagCount: 0, flags: {} }, - ], - }, - members: 1, - }); - }).then((res) => { - group = res.group; - return generateUser({ - 'contributor.admin': true, - }); - }).then((user) => { - admin = user; + beforeEach(async () => { + author = await generateUser(); + admin = await generateUser({ + 'contributor.admin': true, }); + + let groupData = await createAndPopulateGroup({ + groupDetails: { + type: 'guild', + privacy: 'public', + chat: [ + { id: 'message-to-unflag', uuid: author._id, flagCount: 1, flags: {'some-user': true} }, + { id: '1-flag-message', uuid: author._id, flagCount: 1, flags: { id1: true } }, + { id: '2-flag-message', uuid: author._id, flagCount: 2, flags: { id1: true, id2: true } }, + { id: 'no-flags', uuid: author._id, flagCount: 0, flags: {} }, + ], + }, + members: 1, + }); + + groupWithMessages = groupData.group; }); - it('changes only the message that is flagged', () => { - let api = requester(admin); - - return api.post(`/groups/${group._id}/chat/message-to-unflag/clearflags`).then((messages) => { - return api.get(`/groups/${group._id}/chat`); + it('changes only the message that is flagged', async () => { + return admin.post(`/groups/${groupWithMessages._id}/chat/message-to-unflag/clearflags`).then(() => { + return admin.get(`/groups/${groupWithMessages._id}/chat`); }).then((messages) => { expect(messages).to.have.lengthOf(4); diff --git a/test/api/v2/groups/chat/POST-groups_id_chat_id_flag.test.js b/test/api/v2/groups/chat/POST-groups_id_chat_id_flag.test.js index dc204e940d..0f064ba6b3 100644 --- a/test/api/v2/groups/chat/POST-groups_id_chat_id_flag.test.js +++ b/test/api/v2/groups/chat/POST-groups_id_chat_id_flag.test.js @@ -1,16 +1,14 @@ import { createAndPopulateGroup, generateUser, - requester, translate as t, } from '../../../../helpers/api-integration.helper'; describe('POST /groups/:id/chat/:id/flag', () => { - context('another member\'s message', () => { let group, member, message, user; - beforeEach(() => { + beforeEach(async () => { return createAndPopulateGroup({ groupDetails: { type: 'guild', @@ -22,29 +20,23 @@ describe('POST /groups/:id/chat/:id/flag', () => { user = res.leader; member = res.members[0]; - return requester(member) - .post(`/groups/${group._id}/chat`, null, { message: 'Group member message', }); + return member.post(`/groups/${group._id}/chat`, null, { message: 'Group member message' }); }).then((res) => { message = res.message; }); }); - it('flags message', () => { - let api = requester(user); - - return api.post(`/groups/${group._id}/chat/${message.id}/flag`).then((messages) => { - return api.get(`/groups/${group._id}/chat`); + it('flags message', async () => { + return user.post(`/groups/${group._id}/chat/${message.id}/flag`).then(() => { + return user.get(`/groups/${group._id}/chat`); }).then((messages) => { - let message = messages[0]; - expect(message.flagCount).to.eql(1); + expect(messages[0].flagCount).to.eql(1); }); }); - it('cannot flag the same message twice', () => { - let api = requester(user); - - return expect(api.post(`/groups/${group._id}/chat/${message.id}/flag`).then((messages) => { - return api.post(`/groups/${group._id}/chat/${message.id}/flag`); + it('cannot flag the same message twice', async () => { + return expect(user.post(`/groups/${group._id}/chat/${message.id}/flag`).then(() => { + return user.post(`/groups/${group._id}/chat/${message.id}/flag`); })).to.eventually.be.rejected.and.eql({ code: 401, text: t('messageGroupChatFlagAlreadyReported'), @@ -53,9 +45,9 @@ describe('POST /groups/:id/chat/:id/flag', () => { }); context('own message', () => { - let api, group, message, user; + let group, message, user; - beforeEach(() => { + beforeEach(async () => { return createAndPopulateGroup({ groupDetails: { type: 'guild', @@ -65,18 +57,15 @@ describe('POST /groups/:id/chat/:id/flag', () => { }).then((res) => { group = res.group; user = res.leader; - api = requester(user); - return api.post(`/groups/${group._id}/chat`, null, { message: 'User\'s own message', }); + return user.post(`/groups/${group._id}/chat`, null, { message: 'User\'s own message' }); }).then((res) => { message = res.message; }); }); - it('cannot flag message', () => { - let api = requester(user); - - return expect(api.post(`/groups/${group._id}/chat/${message.id}/flag`)) + it('cannot flag message', async () => { + return expect(user.post(`/groups/${group._id}/chat/${message.id}/flag`)) .to.eventually.be.rejected.and.eql({ code: 401, text: t('messageGroupChatFlagOwnMessage'), @@ -85,9 +74,9 @@ describe('POST /groups/:id/chat/:id/flag', () => { }); context('nonexistant message', () => { - let api, group, message, user; + let group, user; - beforeEach(() => { + beforeEach(async () => { return createAndPopulateGroup({ groupDetails: { type: 'guild', @@ -96,14 +85,11 @@ describe('POST /groups/:id/chat/:id/flag', () => { }).then((res) => { group = res.group; user = res.leader; - api = requester(user); }); }); - it('returns error', () => { - let api = requester(user); - - return expect(api.post(`/groups/${group._id}/chat/non-existant-message/flag`)) + it('returns error', async () => { + return expect(user.post(`/groups/${group._id}/chat/non-existant-message/flag`)) .to.eventually.be.rejected.and.eql({ code: 404, text: t('messageGroupChatNotFound'), @@ -112,42 +98,35 @@ describe('POST /groups/:id/chat/:id/flag', () => { }); context('group with multiple messages', () => { - let admin, author, group, member, message, user; + let admin, author, group, user; - beforeEach(() => { - return generateUser().then((user) => { - author = user; - - return createAndPopulateGroup({ - groupDetails: { - type: 'guild', - privacy: 'public', - chat: [ - { id: 'message-to-be-flagged', uuid: author._id, flagCount: 0, flags: {} }, - { id: '1-flag-message', uuid: author._id, flagCount: 1, flags: { 'id1': true } }, - { id: '2-flag-message', uuid: author._id, flagCount: 2, flags: { 'id1': true, 'id2': true } }, - { id: 'no-flags', uuid: author._id, flagCount: 0, flags: {} }, - ], - }, - members: 1, - }); - }).then((res) => { - group = res.group; - user = res.leader; - member = res.members[0]; - return generateUser({ - 'contributor.admin': true, - }); - }).then((user) => { - admin = user; + beforeEach(async () => { + author = await generateUser(); + admin = await generateUser({ + 'contributor.admin': true, }); + + let groupData = await createAndPopulateGroup({ + groupDetails: { + type: 'guild', + privacy: 'public', + chat: [ + { id: 'message-to-be-flagged', uuid: author._id, flagCount: 0, flags: {} }, + { id: '1-flag-message', uuid: author._id, flagCount: 1, flags: { id1: true } }, + { id: '2-flag-message', uuid: author._id, flagCount: 2, flags: { id1: true, id2: true } }, + { id: 'no-flags', uuid: author._id, flagCount: 0, flags: {} }, + ], + }, + members: 1, + }); + + group = groupData.group; + user = groupData.leader; }); - it('changes only the message that is flagged', () => { - let api = requester(user); - - return api.post(`/groups/${group._id}/chat/message-to-be-flagged/flag`).then((messages) => { - return requester(admin).get(`/groups/${group._id}/chat`); + it('changes only the message that is flagged', async () => { + return user.post(`/groups/${group._id}/chat/message-to-be-flagged/flag`).then(() => { + return admin.get(`/groups/${group._id}/chat`); }).then((messages) => { expect(messages).to.have.lengthOf(4); @@ -174,7 +153,7 @@ describe('POST /groups/:id/chat/:id/flag', () => { context('admin flagging a message', () => { let group, member, message, user; - beforeEach(() => { + beforeEach(async () => { return createAndPopulateGroup({ groupDetails: { type: 'guild', @@ -190,21 +169,17 @@ describe('POST /groups/:id/chat/:id/flag', () => { user = res.leader; member = res.members[0]; - return requester(member) - .post(`/groups/${group._id}/chat`, null, { message: 'Group member message', }); + return member.post(`/groups/${group._id}/chat`, null, { message: 'Group member message' }); }).then((res) => { message = res.message; }); }); - it('sets flagCount to 5', () => { - let api = requester(user); - - return api.post(`/groups/${group._id}/chat/${message.id}/flag`).then((messages) => { - return api.get(`/groups/${group._id}/chat`); + it('sets flagCount to 5', async () => { + return user.post(`/groups/${group._id}/chat/${message.id}/flag`).then(() => { + return user.get(`/groups/${group._id}/chat`); }).then((messages) => { - let message = messages[0]; - expect(message.flagCount).to.eql(5); + expect(messages[0].flagCount).to.eql(5); }); }); }); diff --git a/test/api/v2/groups/chat/POST-groups_id_chat_id_like.test.js b/test/api/v2/groups/chat/POST-groups_id_chat_id_like.test.js index a89a83742f..cf0e5aae75 100644 --- a/test/api/v2/groups/chat/POST-groups_id_chat_id_like.test.js +++ b/test/api/v2/groups/chat/POST-groups_id_chat_id_like.test.js @@ -1,16 +1,14 @@ import { createAndPopulateGroup, generateUser, - requester, translate as t, } from '../../../../helpers/api-integration.helper'; describe('POST /groups/:id/chat/:id/like', () => { - context('another member\'s message', () => { let group, member, message, user; - beforeEach(() => { + beforeEach(async () => { return createAndPopulateGroup({ groupDetails: { type: 'guild', @@ -22,38 +20,31 @@ describe('POST /groups/:id/chat/:id/like', () => { user = res.leader; member = res.members[0]; - return requester(member) - .post(`/groups/${group._id}/chat`, null, { message: 'Group member message', }); + return member.post(`/groups/${group._id}/chat`, null, { message: 'Group member message' }); }).then((res) => { message = res.message; }); }); - it('likes message', () => { - let api = requester(user); - - return api.post(`/groups/${group._id}/chat/${message.id}/like`).then((messages) => { - let message = messages[0]; - expect(message.likes[user._id]).to.eql(true); + it('likes message', async () => { + return user.post(`/groups/${group._id}/chat/${message.id}/like`).then((messages) => { + expect(messages[0].likes[user._id]).to.eql(true); }); }); - it('returns the message object', () => { - let api = requester(user); - - return api.post(`/groups/${group._id}/chat/${message.id}/like`).then((messages) => { - let message = messages[0]; - expect(message.text).to.eql('Group member message'); - expect(message.uuid).to.eql(member._id); - expect(message.user).to.eql(member.profile.name); + it('returns the message object', async () => { + return user.post(`/groups/${group._id}/chat/${message.id}/like`).then((messages) => { + expect(messages[0].text).to.eql('Group member message'); + expect(messages[0].uuid).to.eql(member._id); + expect(messages[0].user).to.eql(member.profile.name); }); }); }); context('own message', () => { - let api, group, message, user; + let group, message, user; - beforeEach(() => { + beforeEach(async () => { return createAndPopulateGroup({ groupDetails: { type: 'guild', @@ -63,18 +54,15 @@ describe('POST /groups/:id/chat/:id/like', () => { }).then((res) => { group = res.group; user = res.leader; - api = requester(user); - return api.post(`/groups/${group._id}/chat`, null, { message: 'User\'s own message', }); + return user.post(`/groups/${group._id}/chat`, null, { message: 'User\'s own message' }); }).then((res) => { message = res.message; }); }); - it('cannot like message', () => { - let api = requester(user); - - return expect(api.post(`/groups/${group._id}/chat/${message.id}/like`)) + it('cannot like message', async () => { + return expect(user.post(`/groups/${group._id}/chat/${message.id}/like`)) .to.eventually.be.rejected.and.eql({ code: 401, text: t('messageGroupChatLikeOwnMessage'), @@ -83,42 +71,35 @@ describe('POST /groups/:id/chat/:id/like', () => { }); context('group with multiple messages', () => { - let admin, author, group, member, message, user; + let admin, author, group, user; - beforeEach(() => { - return generateUser().then((user) => { - author = user; - - return createAndPopulateGroup({ - groupDetails: { - type: 'guild', - privacy: 'public', - chat: [ - { id: 'message-to-be-liked', likes: {}, uuid: author._id, flagCount: 0, flags: {} }, - { id: '1-like-message', likes: { 'id': true }, uuid: author._id, flagCount: 1, flags: { 'id1': true } }, - { id: '2-like-message', likes: { 'id': true, 'id2': true }, uuid: author._id, flagCount: 2, flags: { 'id1': true, 'id2': true } }, - { id: 'no-likes', likes: {}, uuid: author._id, flagCount: 0, flags: {} }, - ], - }, - members: 1, - }); - }).then((res) => { - group = res.group; - user = res.leader; - member = res.members[0]; - return generateUser({ - 'contributor.admin': true, - }); - }).then((user) => { - admin = user; + beforeEach(async () => { + author = await generateUser(); + admin = await generateUser({ + 'contributor.admin': true, }); + + let groupData = await createAndPopulateGroup({ + groupDetails: { + type: 'guild', + privacy: 'public', + chat: [ + { id: 'message-to-be-liked', likes: {}, uuid: author._id, flagCount: 0, flags: {} }, + { id: '1-like-message', likes: { id: true }, uuid: author._id, flagCount: 1, flags: { id1: true } }, + { id: '2-like-message', likes: { id: true, id2: true }, uuid: author._id, flagCount: 2, flags: { id1: true, id2: true } }, + { id: 'no-likes', likes: {}, uuid: author._id, flagCount: 0, flags: {} }, + ], + }, + members: 1, + }); + + group = groupData.group; + user = groupData.leader; }); - it('changes only the message that is liked', () => { - let api = requester(user); - - return api.post(`/groups/${group._id}/chat/message-to-be-liked/like`).then((messages) => { - return requester(admin).get(`/groups/${group._id}/chat`); + it('changes only the message that is liked', async () => { + return user.post(`/groups/${group._id}/chat/message-to-be-liked/like`).then(() => { + return admin.get(`/groups/${group._id}/chat`); }).then((messages) => { expect(messages).to.have.lengthOf(4); @@ -143,9 +124,9 @@ describe('POST /groups/:id/chat/:id/like', () => { }); context('nonexistant message', () => { - let api, group, message, user; + let group, user; - beforeEach(() => { + beforeEach(async () => { return createAndPopulateGroup({ groupDetails: { type: 'guild', @@ -154,14 +135,11 @@ describe('POST /groups/:id/chat/:id/like', () => { }).then((res) => { group = res.group; user = res.leader; - api = requester(user); }); }); - it('returns error', () => { - let api = requester(user); - - return expect(api.post(`/groups/${group._id}/chat/non-existant-message/like`)) + it('returns error', async () => { + return expect(user.post(`/groups/${group._id}/chat/non-existant-message/like`)) .to.eventually.be.rejected.and.eql({ code: 404, text: t('messageGroupChatNotFound'), diff --git a/test/api/v2/register/POST-register.test.js b/test/api/v2/register/POST-register.test.js index a4d1987002..d62e15787f 100644 --- a/test/api/v2/register/POST-register.test.js +++ b/test/api/v2/register/POST-register.test.js @@ -7,18 +7,17 @@ import { v4 as generateRandomUserName } from 'uuid'; import { each } from 'lodash'; describe('POST /register', () => { - context('username and email are free', () => { - it('registers a new user', () => { + it('registers a new user', async () => { let api = requester(); let username = generateRandomUserName(); let email = `${username}@example.com`; let password = 'password'; return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user._id).to.exist; @@ -27,7 +26,7 @@ describe('POST /register', () => { }); }); - it('requires password and confirmPassword to match', () => { + it('requires password and confirmPassword to match', async () => { let api = requester(); let username = generateRandomUserName(); let email = `${username}@example.com`; @@ -35,58 +34,58 @@ describe('POST /register', () => { let confirmPassword = 'not password'; return expect(api.post('/register', { - username: username, - email: email, - password: password, - confirmPassword: confirmPassword, + username, + email, + password, + confirmPassword, })).to.eventually.be.rejected.and.eql({ code: 401, text: t('messageAuthPasswordMustMatch'), }); }); - it('requires a username', () => { + it('requires a username', async () => { let api = requester(); let email = `${generateRandomUserName()}@example.com`; let password = 'password'; let confirmPassword = 'password'; return expect(api.post('/register', { - email: email, - password: password, - confirmPassword: confirmPassword, + email, + password, + confirmPassword, })).to.eventually.be.rejected.and.eql({ code: 401, text: t('messageAuthCredentialsRequired'), }); }); - it('requires an email', () => { + it('requires an email', async () => { let api = requester(); let username = generateRandomUserName(); let password = 'password'; let confirmPassword = 'password'; return expect(api.post('/register', { - username: username, - password: password, - confirmPassword: confirmPassword, + username, + password, + confirmPassword, })).to.eventually.be.rejected.and.eql({ code: 401, text: t('messageAuthCredentialsRequired'), }); }); - it('requires a password', () => { + it('requires a password', async () => { let api = requester(); let username = generateRandomUserName(); let email = `${username}@example.com`; let confirmPassword = 'password'; return expect(api.post('/register', { - username: username, - email: email, - confirmPassword: confirmPassword, + username, + email, + confirmPassword, })).to.eventually.be.rejected.and.eql({ code: 401, text: t('messageAuthCredentialsRequired'), @@ -96,25 +95,25 @@ describe('POST /register', () => { context('login is already taken', () => { let username, email; - beforeEach(() => { + beforeEach(async () => { username = generateRandomUserName(); email = `${username}@example.com`; return generateUser({ 'auth.local.username': username, 'auth.local.lowerCaseUsername': username, - 'auth.local.email': email + 'auth.local.email': email, }); }); - it('rejects if username is already taken', () => { + it('rejects if username is already taken', async () => { let api = requester(); let uniqueEmail = `${generateRandomUserName()}@exampe.com`; let password = 'password'; return expect(api.post('/register', { - username: username, - email: uniqueEmail, - password: password, + username, + email: uniqueEmail, + password, confirmPassword: password, })).to.eventually.be.rejected.and.eql({ code: 401, @@ -122,15 +121,15 @@ describe('POST /register', () => { }); }); - it('rejects if email is already taken', () => { + it('rejects if email is already taken', async () => { let api = requester(); let uniqueUsername = generateRandomUserName(); let password = 'password'; return expect(api.post('/register', { - username: uniqueUsername, - email: email, - password: password, + username: uniqueUsername, + email, + password, confirmPassword: password, })).to.eventually.be.rejected.and.eql({ code: 401, @@ -142,33 +141,33 @@ describe('POST /register', () => { context('successful login via api', () => { let api, username, email, password; - beforeEach(() => { + beforeEach(async () => { api = requester(); username = generateRandomUserName(); email = `${username}@example.com`; password = 'password'; }); - it('sets all site tour values to -2 (already seen)', () => { + it('sets all site tour values to -2 (already seen)', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.flags.tour).to.not.be.empty; - each(user.flags.tour, (value, attribute) => { + each(user.flags.tour, (value) => { expect(value).to.eql(-2); }); }); }); - it('populates user with default todos, not no other task types', () => { + it('populates user with default todos, not no other task types', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.todos).to.not.be.empty; @@ -178,11 +177,11 @@ describe('POST /register', () => { }); }); - it('populates user with default tags', () => { + it('populates user with default tags', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.tags).to.not.be.empty; @@ -193,33 +192,33 @@ describe('POST /register', () => { context('successful login with habitica-web header', () => { let api, username, email, password; - beforeEach(() => { + beforeEach(async () => { api = requester({}, {'x-client': 'habitica-web'}); username = generateRandomUserName(); email = `${username}@example.com`; password = 'password'; }); - it('sets all common tutorial flags to true', () => { + it('sets all common tutorial flags to true', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.flags.tour).to.not.be.empty; - each(user.flags.tutorial.common, (value, attribute) => { + each(user.flags.tutorial.common, (value) => { expect(value).to.eql(true); }); }); }); - it('populates user with default todos, habits, and rewards', () => { + it('populates user with default todos, habits, and rewards', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.todos).to.not.be.empty; @@ -229,11 +228,11 @@ describe('POST /register', () => { }); }); - it('populates user with default tags', () => { + it('populates user with default tags', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.tags).to.not.be.empty; @@ -244,33 +243,33 @@ describe('POST /register', () => { context('successful login with habitica-android header', () => { let api, username, email, password; - beforeEach(() => { + beforeEach(async () => { api = requester({}, {'x-client': 'habitica-android'}); username = generateRandomUserName(); email = `${username}@example.com`; password = 'password'; }); - it('sets all common tutorial flags to true', () => { + it('sets all common tutorial flags to true', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.flags.tour).to.not.be.empty; - each(user.flags.tutorial.common, (value, attribute) => { + each(user.flags.tutorial.common, (value) => { expect(value).to.eql(true); }); }); }); - it('populates user with default todos, habits, and rewards', () => { + it('populates user with default todos, habits, and rewards', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.todos).to.not.be.empty; @@ -280,11 +279,11 @@ describe('POST /register', () => { }); }); - it('populates user with default tags', () => { + it('populates user with default tags', async () => { return api.post('/register', { - username: username, - email: email, - password: password, + username, + email, + password, confirmPassword: password, }).then((user) => { expect(user.tags).to.not.be.empty; diff --git a/test/api/v2/status/GET-status.test.js b/test/api/v2/status/GET-status.test.js index d5b5c2513f..681da16499 100644 --- a/test/api/v2/status/GET-status.test.js +++ b/test/api/v2/status/GET-status.test.js @@ -1,10 +1,9 @@ import {requester} from '../../../helpers/api-integration.helper'; describe('Status', () => { - - it('returns a status of up when server is up', () => { + it('returns a status of up when server is up', async () => { let api = requester(); - return expect(api.get('/status')) - .to.eventually.eql({status: 'up'}); + + await expect(api.get('/status')).to.eventually.eql({status: 'up'}); }); }); diff --git a/test/api/v2/user/DELETE-user.test.js b/test/api/v2/user/DELETE-user.test.js index 7958c7fddd..416bdcbfee 100644 --- a/test/api/v2/user/DELETE-user.test.js +++ b/test/api/v2/user/DELETE-user.test.js @@ -3,23 +3,18 @@ import { createAndPopulateGroup, generateGroup, generateUser, - requester, - translate as t, } from '../../../helpers/api-integration.helper'; import { find } from 'lodash'; describe('DELETE /user', () => { - let api, user; + let user; - beforeEach(() => { - return generateUser().then((usr) => { - api = requester(usr); - user = usr; - }); + beforeEach(async () => { + user = await generateUser(); }); - it('deletes the user', () => { - return expect(api.del('/user').then((fetchedUser) => { + it('deletes the user', async () => { + return expect(user.del('/user').then(() => { return checkExistence('users', user._id); })).to.eventually.eql(false); }); @@ -31,17 +26,17 @@ describe('DELETE /user', () => { context('last member of a party', () => { let party; - beforeEach(() => { + beforeEach(async () => { return generateGroup(user, { type: 'party', - privacy: 'private' + privacy: 'private', }).then((group) => { party = group; }); }); - it('deletes party when user is the only member', () => { - return expect(api.del('/user').then((result) => { + it('deletes party when user is the only member', async () => { + return expect(user.del('/user').then(() => { return checkExistence('groups', party._id); })).to.eventually.eql(false); }); @@ -50,26 +45,26 @@ describe('DELETE /user', () => { context('last member of a private guild', () => { let guild; - beforeEach(() => { + beforeEach(async () => { return generateGroup(user, { type: 'guild', - privacy: 'private' + privacy: 'private', }).then((group) => { guild = group; }); }); - it('deletes guild when user is the only member', () => { - return expect(api.del('/user').then((result) => { + it('deletes guild when user is the only member', async () => { + return expect(user.del('/user').then(() => { return checkExistence('groups', guild._id); })).to.eventually.eql(false); }); }); context('groups user is leader of', () => { - let api, group, oldLeader, newLeader; + let group, oldLeader, newLeader; - beforeEach(() => { + beforeEach(async () => { return createAndPopulateGroup({ groupDetails: { type: 'guild', @@ -80,13 +75,12 @@ describe('DELETE /user', () => { group = res.group; newLeader = res.members[0]; oldLeader = res.leader; - api = requester(oldLeader); }); }); - it('chooses new group leader for any group user was the leader of', () => { - return api.del('/user').then((res) => { - return requester(newLeader).get(`/groups/${group._id}`); + it('chooses new group leader for any group user was the leader of', async () => { + return oldLeader.del('/user').then(() => { + return newLeader.get(`/groups/${group._id}`); }).then((guild) => { expect(guild.leader).to.exist; expect(guild.leader._id).to.not.eql(oldLeader._id); @@ -95,14 +89,13 @@ describe('DELETE /user', () => { }); context('groups user is a part of', () => { - let api, group1, group2, userToDelete, otherUser; + let group1, group2, userToDelete, otherUser; - beforeEach(() => { + beforeEach(async () => { return generateUser({ balance: 10, - }).then((user) => { - userToDelete = user; - api = requester(userToDelete); + }).then((_user) => { + userToDelete = _user; return generateGroup(userToDelete, { type: 'guild', @@ -122,17 +115,17 @@ describe('DELETE /user', () => { group2 = res.group; otherUser = res.members[0]; - return api.post(`/groups/${group2._id}/join`); + return userToDelete.post(`/groups/${group2._id}/join`); }); }); - it('removes user from all groups user was a part of', () => { - return api.del('/user').then((res) => { - return requester(otherUser).get(`/groups/${group1._id}`); + it('removes user from all groups user was a part of', async () => { + return userToDelete.del('/user').then(() => { + return otherUser.get(`/groups/${group1._id}`); }).then((fetchedGroup1) => { expect(fetchedGroup1.members).to.be.empty; - return requester(otherUser).get(`/groups/${group2._id}`); + return otherUser.get(`/groups/${group2._id}`); }).then((fetchedGroup2) => { expect(fetchedGroup2.members).to.not.be.empty; @@ -143,13 +136,12 @@ describe('DELETE /user', () => { expect(userInGroup).to.not.be.ok; }); }); - }); context('pending invitation to group', () => { - let api, group, userToDelete, otherUser; + let group, userToDelete, otherUser; - beforeEach(() => { + beforeEach(async () => { return createAndPopulateGroup({ groupDetails: { type: 'guild', @@ -164,9 +156,9 @@ describe('DELETE /user', () => { }); }); - it('removes invitations from groups', () => { - return requester(userToDelete).del('/user').then((res) => { - return requester(otherUser).get(`/groups/${group._id}`); + it('removes invitations from groups', async () => { + return userToDelete.del('/user').then(() => { + return otherUser.get(`/groups/${group._id}`); }).then((fetchedGroup) => { expect(fetchedGroup.invites).to.have.a.lengthOf(1); expect(fetchedGroup.invites[0]._id).to.not.eql(userToDelete._id); diff --git a/test/api/v2/user/GET-user.test.js b/test/api/v2/user/GET-user.test.js index d370f4cb0a..b2aaf7d066 100644 --- a/test/api/v2/user/GET-user.test.js +++ b/test/api/v2/user/GET-user.test.js @@ -1,33 +1,28 @@ import { generateUser, - requester, } from '../../../helpers/api-integration.helper'; describe('GET /user', () => { let user; - before(() => { - return generateUser().then((usr) => { - let api = requester(usr); - return api.get('/user'); - }).then((fetchedUser) => { - user = fetchedUser; - }); + before(async () => { + let usr = await generateUser(); + user = await usr.get('/user'); }); - it('gets the user object', () => { + it('gets the user object', async () => { expect(user._id).to.eql(user._id); expect(user.auth.local.username).to.eql(user.auth.local.username); expect(user.todos).to.eql(user.todos); expect(user.items).to.eql(user.items); }); - it('does not include password information', () => { - expect(user.auth.local.hashed_password).to.not.exist - expect(user.auth.local.salt).to.not.exist + it('does not include password information', async () => { + expect(user.auth.local.hashed_password).to.not.exist; + expect(user.auth.local.salt).to.not.exist; }); - it('does not include api token', () => { - expect(user.apiToken).to.not.exist + it('does not include api token', async () => { + expect(user.apiToken).to.not.exist; }); }); diff --git a/test/api/v2/user/GET-user_tags.test.js b/test/api/v2/user/GET-user_tags.test.js index e652a8fcf1..f03be34b04 100644 --- a/test/api/v2/user/GET-user_tags.test.js +++ b/test/api/v2/user/GET-user_tags.test.js @@ -1,20 +1,16 @@ import { generateUser, - requester, } from '../../../helpers/api-integration.helper'; describe('GET /user/tags', () => { - let api, user; + let user; - beforeEach(() => { - return generateUser().then((usr) => { - user = usr; - api = requester(usr); - }); + beforeEach(async () => { + user = await generateUser(); }); - it('gets the user\'s tags', () => { - return expect(api.get('/user/tags')) + it('gets the user\'s tags', async () => { + return expect(user.get('/user/tags')) .to.eventually.eql(user.tags); }); }); diff --git a/test/api/v2/user/GET-user_tags_id.test.js b/test/api/v2/user/GET-user_tags_id.test.js index e7678caec0..0ea13437a7 100644 --- a/test/api/v2/user/GET-user_tags_id.test.js +++ b/test/api/v2/user/GET-user_tags_id.test.js @@ -1,26 +1,22 @@ import { generateUser, - requester, translate as t, } from '../../../helpers/api-integration.helper'; describe('GET /user/tags/id', () => { - let api, user; + let user; - beforeEach(() => { - return generateUser().then((usr) => { - user = usr; - api = requester(usr); - }); + beforeEach(async () => { + user = await generateUser(); }); - it('gets a user\'s tag by id', () => { - return expect(api.get('/user/tags/' + user.tags[0].id)) + it('gets a user\'s tag by id', async () => { + return expect(user.get(`/user/tags/${user.tags[0].id}`)) .to.eventually.eql(user.tags[0]); }); - it('fails for non-existent tags', () => { - return expect(api.get('/user/tags/not-an-id')) + it('fails for non-existent tags', async () => { + return expect(user.get('/user/tags/not-an-id')) .to.eventually.be.rejected.and.eql({ code: 404, text: t('messageTagNotFound'), diff --git a/test/api/v2/user/PUT-user.test.js b/test/api/v2/user/PUT-user.test.js index 87a8898008..68664e6ed3 100644 --- a/test/api/v2/user/PUT-user.test.js +++ b/test/api/v2/user/PUT-user.test.js @@ -1,53 +1,50 @@ import { generateUser, - requester, translate as t, } from '../../../helpers/api-integration.helper'; -import { each } from 'lodash'; +import { each, get } from 'lodash'; describe('PUT /user', () => { - let api, user; + let user; - beforeEach(() => { - return generateUser().then((usr) => { - user = usr; - api = requester(user); - }); + beforeEach(async () => { + user = await generateUser(); }); - context('allowed operations', () => { - it('updates the user', () => { - return api.put('/user', { - 'profile.name' : 'Frodo', + context('Allowed Operations', () => { + it('updates the user', async () => { + let updatedUser = await user.put('/user', { + 'profile.name': 'Frodo', 'preferences.costume': true, 'stats.hp': 14, - }).then((updatedUser) => { - expect(updatedUser.profile.name).to.eql('Frodo'); - expect(updatedUser.preferences.costume).to.eql(true); - expect(updatedUser.stats.hp).to.eql(14); }); + + expect(updatedUser.profile.name).to.eql('Frodo'); + expect(updatedUser.preferences.costume).to.eql(true); + expect(updatedUser.stats.hp).to.eql(14); }); }); - context('top level protected operations', () => { + context('Top Level Protected Operations', () => { let protectedOperations = { 'gem balance': {balance: 100}, - 'auth': {'auth.blocked': true, 'auth.timestamps.created': new Date()}, - 'contributor': {'contributor.level': 9, 'contributor.admin': true, 'contributor.text': 'some text'}, - 'backer': {'backer.tier': 10, 'backer.npc': 'Bilbo'}, - 'subscriptions': {'purchased.plan.extraMonths': 500, 'purchased.plan.consecutive.trinkets': 1000}, + auth: {'auth.blocked': true, 'auth.timestamps.created': new Date()}, + contributor: {'contributor.level': 9, 'contributor.admin': true, 'contributor.text': 'some text'}, + backer: {'backer.tier': 10, 'backer.npc': 'Bilbo'}, + subscriptions: {'purchased.plan.extraMonths': 500, 'purchased.plan.consecutive.trinkets': 1000}, 'customization gem purchases': {'purchased.background.tavern': true, 'purchased.skin.bear': true}, - 'tasks': {todos: [], habits: [], dailys: [], rewards: []}, + tasks: {todos: [], habits: [], dailys: [], rewards: []}, }; each(protectedOperations, (data, testName) => { - it(`does not allow updating ${testName}`, () => { + it(`does not allow updating ${testName}`, async () => { let errorText = []; each(data, (value, operation) => { - errorText.push(t('messageUserOperationProtected', { operation: operation })); + errorText.push(t('messageUserOperationProtected', { operation })); }); - return expect(api.put('/user', data)).to.eventually.be.rejected.and.eql({ + + await expect(user.put('/user', data)).to.eventually.be.rejected.and.eql({ code: 401, text: errorText, }); @@ -55,22 +52,125 @@ describe('PUT /user', () => { }); }); - context('sub-level protected operations', () => { + context('Sub-Level Protected Operations', () => { let protectedOperations = { 'class stat': {'stats.class': 'wizard'}, }; each(protectedOperations, (data, testName) => { - it(`does not allow updating ${testName}`, () => { + it(`does not allow updating ${testName}`, async () => { let errorText = []; each(data, (value, operation) => { - errorText.push(t('messageUserOperationProtected', { operation: operation })); + errorText.push(t('messageUserOperationProtected', { operation })); }); - return expect(api.put('/user', data)).to.eventually.be.rejected.and.eql({ + + await expect(user.put('/user', data)).to.eventually.be.rejected.and.eql({ code: 401, text: errorText, }); }); }); }); + + context('Default Appearance Preferences', () => { + let testCases = { + shirt: 'yellow', + skin: 'ddc994', + 'hair.color': 'blond', + 'hair.bangs': 2, + 'hair.base': 1, + 'hair.flower': 4, + size: 'broad', + }; + + each(testCases, (item, type) => { + const update = {}; + update[`preferences.${type}`] = item; + + it(`updates user with ${type} that is a default`, async () => { + let dbUpdate = {}; + dbUpdate[`purchased.${type}.${item}`] = true; + await user.update(dbUpdate); + + // Sanity checks to make sure user is not already equipped with item + expect(get(user.preferences, type)).to.not.eql(item); + + let updatedUser = await user.put('/user', update); + + expect(get(updatedUser.preferences, type)).to.eql(item); + }); + }); + + it('returns an error if user tries to update body size with invalid type', async () => { + await expect(user.put('/user', { + 'preferences.size': 'round', + })).to.eventually.be.rejected.and.eql({ + code: 401, + text: ['Must purchase round to set it on preferences.size'], + }); + }); + + it('can set beard to default', async () => { + await user.update({ + 'purchased.hair.beard': 3, + 'preferences.hair.beard': 3, + }); + + let updatedUser = await user.put('/user', { + 'preferences.hair.beard': 0, + }); + + expect(updatedUser.preferences.hair.beard).to.eql(0); + }); + + it('can set mustache to default', async () => { + await user.update({ + 'purchased.hair.mustache': 2, + 'preferences.hair.mustache': 2, + }); + + let updatedUser = await user.put('/user', { + 'preferences.hair.mustache': 0, + }); + + expect(updatedUser.preferences.hair.mustache).to.eql(0); + }); + }); + + context('Purchasable Appearance Preferences', () => { + let testCases = { + background: 'volcano', + shirt: 'convict', + skin: 'cactus', + 'hair.base': 7, + 'hair.beard': 2, + 'hair.color': 'rainbow', + 'hair.mustache': 2, + }; + + each(testCases, (item, type) => { + const update = {}; + update[`preferences.${type}`] = item; + + it(`returns an error if user tries to update ${type} with ${type} the user does not own`, async () => { + await expect(user.put('/user', update)).to.eventually.be.rejected.and.eql({ + code: 401, + text: [`Must purchase ${item} to set it on preferences.${type}`], + }); + }); + + it(`updates user with ${type} user does own`, async () => { + let dbUpdate = {}; + dbUpdate[`purchased.${type}.${item}`] = true; + await user.update(dbUpdate); + + // Sanity check to make sure user is not already equipped with item + expect(get(user.preferences, type)).to.not.eql(item); + + let updatedUser = await user.put('/user', update); + + expect(get(updatedUser.preferences, type)).to.eql(item); + }); + }); + }); }); diff --git a/test/api/v2/user/anonymized/GET-user_anonymized.test.js b/test/api/v2/user/anonymized/GET-user_anonymized.test.js index b4cb5cb2b0..6933074046 100644 --- a/test/api/v2/user/anonymized/GET-user_anonymized.test.js +++ b/test/api/v2/user/anonymized/GET-user_anonymized.test.js @@ -1,84 +1,80 @@ import { generateUser, - requester, } from '../../../../helpers/api-integration.helper'; import { each } from 'lodash'; describe('GET /user/anonymized', () => { - let api, user; + let user, anonymizedUser; - before(() => { - return generateUser({ - 'inbox.messages' : { - 'the-message-id' : { - sort : 214, - user : 'Some user', - backer : {}, - contributor : { - text : 'Blacksmith', - level : 2, - contributions : 'Made some contributions', - admin : false + before(async () => { + user = await generateUser({ + 'inbox.messages': { + 'the-message-id': { + sort: 214, + user: 'Some user', + backer: {}, + contributor: { + text: 'Blacksmith', + level: 2, + contributions: 'Made some contributions', + admin: false, }, - uuid : 'some-users-uuid', - flagCount : 0, - flags : {}, - likes : {}, - timestamp : 1444154258699.0000000000000000, - text : 'Lorem ipsum', - id : 'the-messages-id', - sent : true - } - } - }).then((usr) => { - api = requester(usr); - return api.post('/user/tasks', { - text: 'some private text', - notes: 'some private notes', - checklist: [ - {text: 'a private checklist'}, - {text: 'another private checklist'}, - ], - type: 'daily', - }); - }).then((result) => { - return api.get('/user/anonymized'); - }).then((anonymizedUser) => { - user = anonymizedUser; + uuid: 'some-users-uuid', + flagCount: 0, + flags: {}, + likes: {}, + timestamp: 1444154258699.0000000000000000, + text: 'Lorem ipsum', + id: 'the-messages-id', + sent: true, + }, + }, }); + + await user.post('/user/tasks', { + text: 'some private text', + notes: 'some private notes', + checklist: [ + {text: 'a private checklist'}, + {text: 'another private checklist'}, + ], + type: 'daily', + }); + + anonymizedUser = await user.get('/user/anonymized'); }); - it('retains user id', () => { - expect(user._id).to.exist; + it('retains user id', async () => { + expect(anonymizedUser._id).to.eql(user._id); }); - it('removes credentials and financial information', () => { - expect(user.apiToken).to.not.exist; - expect(user.auth.local).to.not.exist; - expect(user.auth.facebook).to.not.exist; - expect(user.purchased.plan).to.not.exist; + it('removes credentials and financial information', async () => { + expect(anonymizedUser.apiToken).to.not.exist; + expect(anonymizedUser.auth.local).to.not.exist; + expect(anonymizedUser.auth.facebook).to.not.exist; + expect(anonymizedUser.purchased.plan).to.not.exist; }); - it('removes profile information', () => { - expect(user.profile).to.not.exist; - expect(user.contributor).to.not.exist; - expect(user.achievements.challenges).to.not.exist; + it('removes profile information', async () => { + expect(anonymizedUser.profile).to.not.exist; + expect(anonymizedUser.contributor).to.not.exist; + expect(anonymizedUser.achievements.challenges).to.not.exist; }); - it('removes social information', () => { - expect(user.newMessages).to.not.exist; - expect(user.invitations).to.not.exist; - expect(user.items.special.nyeReceived).to.not.exist; - expect(user.items.special.valentineReceived).to.not.exist; + it('removes social information', async () => { + expect(anonymizedUser.newMessages).to.not.exist; + expect(anonymizedUser.invitations).to.not.exist; + expect(anonymizedUser.items.special.nyeReceived).to.not.exist; + expect(anonymizedUser.items.special.valentineReceived).to.not.exist; - each(user.inbox.messages, (msg) => { + each(anonymizedUser.inbox.messages, (msg) => { expect(msg.text).to.eql('inbox message text'); }); }); - it('anonymizes task info', () => { + it('anonymizes task info', async () => { each(['habits', 'todos', 'dailys', 'rewards'], (tasks) => { - each(user[tasks], (task) => { + each(anonymizedUser[tasks], (task) => { expect(task.text).to.eql('task text'); expect(task.notes).to.eql('task notes'); @@ -89,14 +85,14 @@ describe('GET /user/anonymized', () => { }); }); - it('anonymizes tags', () => { - each(user.tags, (tag) => { + it('anonymizes tags', async () => { + each(anonymizedUser.tags, (tag) => { expect(tag.name).to.eql('tag'); expect(tag.challenge).to.eql('challenge'); }); }); - it('removes webhooks', () => { - expect(user.webhooks).to.not.exist; + it('removes webhooks', async () => { + expect(anonymizedUser.webhooks).to.not.exist; }); }); diff --git a/test/api/v2/user/batch-update/POST-user_batch-update.test.js b/test/api/v2/user/batch-update/POST-user_batch-update.test.js index c1b1e499b4..7e7d9954f6 100644 --- a/test/api/v2/user/batch-update/POST-user_batch-update.test.js +++ b/test/api/v2/user/batch-update/POST-user_batch-update.test.js @@ -1,69 +1,62 @@ import { generateUser, - requester, translate as t, } from '../../../../helpers/api-integration.helper'; import { each } from 'lodash'; describe('POST /user/batch-update', () => { - let api, user; + let user; - beforeEach(() => { - return generateUser().then((usr) => { - user = usr; - api = requester(user); - }); + beforeEach(async () => { + user = await generateUser(); }); context('allowed operations', () => { - it('makes batch operations', () => { - let task; + it('makes batch operations', async () => { + let task = (await user.get('/user/tasks'))[0]; - return api.get('/user/tasks').then((tasks) => { - task = tasks[0]; - return api.post('/user/batch-update', [ - {op: 'update', body: {'stats.hp': 30}}, - {op: 'update', body: {'profile.name': 'Samwise'}}, - {op: 'score', params: { direction: 'up', id: task.id }}, - ]); - }).then((user) => { - expect(user.stats.hp).to.eql(30); - expect(user.profile.name).to.eql('Samwise'); - return api.get(`/user/tasks/${task.id}`); - }).then((task) => { - expect(task.value).to.be.greaterThan(0); - }); + let updatedUser = await user.post('/user/batch-update', [ + {op: 'update', body: {'stats.hp': 30}}, + {op: 'update', body: {'profile.name': 'Samwise'}}, + {op: 'score', params: { direction: 'up', id: task.id }}, + ]); + + expect(updatedUser.stats.hp).to.eql(30); + expect(updatedUser.profile.name).to.eql('Samwise'); + + let fetchedTask = await user.get(`/user/tasks/${task.id}`); + + expect(fetchedTask.value).to.be.greaterThan(task.value); }); }); - context('development only operations', () => { + context('development only operations', () => { // These tests will fail if your NODE_ENV is set to 'development' instead of 'testing' let protectedOperations = { 'Add Ten Gems': 'addTenGems', 'Add Hourglass': 'addHourglass', }; each(protectedOperations, (operation, description) => { - - it(`it sends back a 500 error for ${description} operation`, () => { - return expect(api.post('/user/batch-update', [ - {op: operation}, + it(`it sends back a 500 error for ${description} operation`, async () => { + return expect(user.post('/user/batch-update', [ + { op: operation }, ])).to.eventually.be.rejected.and.eql({ - code: 500, - text: t('messageUserOperationNotFound', { operation: operation}), - }); + code: 500, + text: t('messageUserOperationNotFound', { operation }), + }); }); }); }); context('unknown operations', () => { - it('sends back a 500 error', () => { - return expect(api.post('/user/batch-update', [ + it('sends back a 500 error', async () => { + return expect(user.post('/user/batch-update', [ {op: 'aNotRealOperation'}, ])).to.eventually.be.rejected.and.eql({ - code: 500, - text: t('messageUserOperationNotFound', { operation: 'aNotRealOperation' }), - }); + code: 500, + text: t('messageUserOperationNotFound', { operation: 'aNotRealOperation' }), + }); }); }); }); diff --git a/test/api/v2/user/pushDevice/POST-pushDevice.test.js b/test/api/v2/user/pushDevice/POST-pushDevice.test.js index 1b5ae41681..75a5270547 100644 --- a/test/api/v2/user/pushDevice/POST-pushDevice.test.js +++ b/test/api/v2/user/pushDevice/POST-pushDevice.test.js @@ -1,23 +1,21 @@ import { generateUser, - requester, } from '../../../../helpers/api-integration.helper'; describe('POST /user/pushDevice', () => { - let api; + let user; - beforeEach(() => { - return generateUser().then((user) => { - api = requester(user); - }); + beforeEach(async () => { + user = await generateUser(); }); - it('registers a device id', () => { - return api.post('/user/pushDevice', { + it('registers a device id', async () => { + return user.post('/user/pushDevice', { regId: '123123', type: 'android', }).then((devices) => { let device = devices[0]; + expect(device._id).to.exist; expect(device.regId).to.eql('123123'); expect(device.type).to.eql('android'); diff --git a/test/api/v2/user/tasks/DELETE-tasks_id.test.js b/test/api/v2/user/tasks/DELETE-tasks_id.test.js index 72c18f6b6c..2d0a1615d2 100644 --- a/test/api/v2/user/tasks/DELETE-tasks_id.test.js +++ b/test/api/v2/user/tasks/DELETE-tasks_id.test.js @@ -1,42 +1,37 @@ import { generateUser, - requester, translate as t, } from '../../../../helpers/api-integration.helper'; describe('DELETE /user/tasks/:id', () => { - let api, user, task; + let user, task; - beforeEach(() => { - return generateUser().then((_user) => { - user = _user; - task = user.todos[0]; - api = requester(user); + beforeEach(async () => { + user = await generateUser(); + task = user.todos[0]; + }); + + it('deletes a task', async () => { + await user.del(`/user/tasks/${task.id}`); + + await expect(user.get(`/user/tasks/${task.id}`)).to.eventually.be.rejected.and.eql({ + code: 404, + text: t('messageTaskNotFound'), }); }); - it('deletes a task', () => { - return expect(api.del(`/user/tasks/${task.id}`) - .then((res) => { - return api.get(`/user/tasks/${task.id}`); - })).to.eventually.be.rejected.and.eql({ - code: 404, - text: t('messageTaskNotFound'), - }); - }); - - it('returns an error if the task does not exist', () => { - return expect(api.del('/user/tasks/task-that-does-not-exist')) + it('returns an error if the task does not exist', async () => { + return expect(user.del('/user/tasks/task-that-does-not-exist')) .to.eventually.be.rejected.and.eql({ code: 404, text: t('messageTaskNotFound'), - }); + }); }); - it('does not delete another user\'s task', () => { + it('does not delete another user\'s task', async () => { return expect(generateUser().then((otherUser) => { let otherUsersTask = otherUser.todos[0]; - return api.del(`/user/tasks/${otherUsersTask.id}`); + return user.del(`/user/tasks/${otherUsersTask.id}`); })).to.eventually.be.rejected.and.eql({ code: 404, text: 'Task not found.', diff --git a/test/api/v2/user/tasks/GET-tasks.test.js b/test/api/v2/user/tasks/GET-tasks.test.js index 89492b717b..3d750cab8c 100644 --- a/test/api/v2/user/tasks/GET-tasks.test.js +++ b/test/api/v2/user/tasks/GET-tasks.test.js @@ -1,13 +1,11 @@ import { generateUser, - requester, - translate as t, } from '../../../../helpers/api-integration.helper'; describe('GET /user/tasks/', () => { - let api, user; + let user; - beforeEach(() => { + beforeEach(async () => { return generateUser({ dailys: [ {text: 'daily', type: 'daily'}, @@ -17,12 +15,11 @@ describe('GET /user/tasks/', () => { ], }).then((_user) => { user = _user; - api = requester(user); }); }); - it('gets all tasks', () => { - return api.get(`/user/tasks/`).then((tasks) => { + it('gets all tasks', async () => { + return user.get(`/user/tasks/`).then((tasks) => { expect(tasks).to.be.an('array'); expect(tasks.length).to.be.greaterThan(3); diff --git a/test/api/v2/user/tasks/GET-tasks_id.test.js b/test/api/v2/user/tasks/GET-tasks_id.test.js index d3242ab40e..c57f9c0038 100644 --- a/test/api/v2/user/tasks/GET-tasks_id.test.js +++ b/test/api/v2/user/tasks/GET-tasks_id.test.js @@ -1,22 +1,18 @@ import { generateUser, - requester, translate as t, } from '../../../../helpers/api-integration.helper'; describe('GET /user/tasks/:id', () => { - let api, user, task; + let user, task; - beforeEach(() => { - return generateUser().then((_user) => { - user = _user; - task = user.todos[0]; - api = requester(user); - }); + beforeEach(async () => { + user = await generateUser(); + task = user.todos[0]; }); - it('gets a task', () => { - return api.get(`/user/tasks/${task.id}`).then((foundTask) => { + it('gets a task', async () => { + return user.get(`/user/tasks/${task.id}`).then((foundTask) => { expect(foundTask.id).to.eql(task.id); expect(foundTask.text).to.eql(task.text); expect(foundTask.notes).to.eql(task.notes); @@ -25,18 +21,19 @@ describe('GET /user/tasks/:id', () => { }); }); - it('returns an error if the task does not exist', () => { - return expect(api.get('/user/tasks/task-that-does-not-exist')) + it('returns an error if the task does not exist', async () => { + return expect(user.get('/user/tasks/task-that-does-not-exist')) .to.eventually.be.rejected.and.eql({ code: 404, text: t('messageTaskNotFound'), - }); + }); }); - it('does not get another user\'s task', () => { + it('does not get another user\'s task', async () => { return expect(generateUser().then((otherUser) => { let otherUsersTask = otherUser.todos[0]; - return api.get(`/user/tasks/${otherUsersTask.id}`); + + return user.get(`/user/tasks/${otherUsersTask.id}`); })).to.eventually.be.rejected.and.eql({ code: 404, text: t('messageTaskNotFound'), diff --git a/test/api/v2/user/tasks/POST-tasks.test.js b/test/api/v2/user/tasks/POST-tasks.test.js index 1f7a837990..6ddc1d33fd 100644 --- a/test/api/v2/user/tasks/POST-tasks.test.js +++ b/test/api/v2/user/tasks/POST-tasks.test.js @@ -1,33 +1,28 @@ import { generateUser, - requester, translate as t, } from '../../../../helpers/api-integration.helper'; describe('POST /user/tasks', () => { + let user; - let api, user; - - beforeEach(() => { - return generateUser().then((_user) => { - user = _user; - api = requester(user); - }); + beforeEach(async () => { + user = await generateUser(); }); - it('creates a task', () => { - return api.post('/user/tasks').then((task) => { + it('creates a task', async () => { + return user.post('/user/tasks').then((task) => { expect(task.id).to.exist; }); }); - it('creates a habit by default', () => { - return expect(api.post('/user/tasks')) + it('creates a habit by default', async () => { + return expect(user.post('/user/tasks')) .to.eventually.have.property('type', 'habit'); }); - it('creates a task with specified values', () => { - return api.post('/user/tasks', { + it('creates a task with specified values', async () => { + return user.post('/user/tasks', { type: 'daily', text: 'My task', notes: 'My notes', @@ -40,10 +35,10 @@ describe('POST /user/tasks', () => { }); }); - it('does not create a task with an id that already exists', () => { + it('does not create a task with an id that already exists', async () => { let todo = user.todos[0]; - return expect(api.post('/user/tasks', { + return expect(user.post('/user/tasks', { id: todo.id, })).to.eventually.be.rejected.and.eql({ code: 409, @@ -51,8 +46,8 @@ describe('POST /user/tasks', () => { }); }); - xit('TODO: no error is thrown - throws a 500 validation error if invalid type is posted', () => { - return expect(api.post('/user/tasks', { + xit('TODO: no error is thrown - throws a 500 validation error if invalid type is posted', async () => { + return expect(user.post('/user/tasks', { type: 'not-valid', })).to.eventually.be.rejected.and.eql({ code: 500, @@ -60,8 +55,8 @@ describe('POST /user/tasks', () => { }); }); - xit('TODO: no error is thrown - throws a 500 validation error if invalid data is posted', () => { - return expect(api.post('/user/tasks', { + xit('TODO: no error is thrown - throws a 500 validation error if invalid data is posted', async () => { + return expect(user.post('/user/tasks', { frequency: 'not-valid', })).to.eventually.be.rejected.and.eql({ code: 500, diff --git a/test/api/v2/user/tasks/PUT-tasks_id.test.js b/test/api/v2/user/tasks/PUT-tasks_id.test.js index 14ed0262ba..90a5065db4 100644 --- a/test/api/v2/user/tasks/PUT-tasks_id.test.js +++ b/test/api/v2/user/tasks/PUT-tasks_id.test.js @@ -1,22 +1,17 @@ import { generateUser, - requester, - translate as t, } from '../../../../helpers/api-integration.helper'; describe('PUT /user/tasks/:id', () => { - let api, user, task; + let user, task; - beforeEach(() => { - return generateUser().then((_user) => { - user = _user; - api = requester(user); - task = user.todos[0]; - }); + beforeEach(async () => { + user = await generateUser(); + task = user.todos[0]; }); - it('does not update the id of the task', () => { - return api.put(`/user/tasks/${task.id}`, { + it('does not update the id of the task', async () => { + return user.put(`/user/tasks/${task.id}`, { id: 'some-thing', }).then((updatedTask) => { expect(updatedTask.id).to.eql(task.id); @@ -24,8 +19,8 @@ describe('PUT /user/tasks/:id', () => { }); }); - it('does not update the type of the task', () => { - return api.put(`/user/tasks/${task.id}`, { + it('does not update the type of the task', async () => { + return user.put(`/user/tasks/${task.id}`, { type: 'habit', }).then((updatedTask) => { expect(updatedTask.type).to.eql(task.type); @@ -33,34 +28,34 @@ describe('PUT /user/tasks/:id', () => { }); }); - it('updates text, attribute, priority, value and notes', () => { - return api.put(`/user/tasks/${task.id}`, { + it('updates text, attribute, priority, value and notes', async () => { + return user.put(`/user/tasks/${task.id}`, { text: 'new text', notes: 'new notes', value: 10000, - priority: .5, + priority: 0.5, attribute: 'str', }).then((updatedTask) => { expect(updatedTask.text).to.eql('new text'); expect(updatedTask.notes).to.eql('new notes'); expect(updatedTask.value).to.eql(10000); - expect(updatedTask.priority).to.eql(.5); + expect(updatedTask.priority).to.eql(0.5); expect(updatedTask.attribute).to.eql('str'); }); }); - it('returns an error if the task does not exist', () => { - return expect(api.put('/user/tasks/task-id-that-does-not-exist')) + it('returns an error if the task does not exist', async () => { + return expect(user.put('/user/tasks/task-id-that-does-not-exist')) .to.eventually.be.rejected.and.eql({ code: 404, text: 'Task not found.', }); }); - it('does not update another user\'s task', () => { + it('does not update another user\'s task', async () => { return expect(generateUser().then((otherUser) => { let otherUsersTask = otherUser.todos[0]; - return api.put(`/user/tasks/${otherUsersTask._id}`, { + return user.put(`/user/tasks/${otherUsersTask._id}`, { name: 'some name', }); })).to.eventually.be.rejected.and.eql({ diff --git a/test/common/preenTodos.test.js b/test/common/preenTodos.test.js new file mode 100644 index 0000000000..c9f9a45028 --- /dev/null +++ b/test/common/preenTodos.test.js @@ -0,0 +1,76 @@ +import moment from 'moment'; +import { generateTodo } from '../helpers/common.helper'; +import { preenTodos } from '../../common/script/index.js'; + +describe('#preenTodos', () => { + let todos, uncompletedTodo, completedChallengeTodo, newlyCompletedTodo, completedTodoFromTwoDaysAgo, completedTodoFromThreeDaysAgo, completedTodoFromTenDaysAgo; + + beforeEach(() => { + uncompletedTodo = generateTodo({ completed: false }); + completedChallengeTodo = generateTodo({ + completed: true, + challenge: { id: 'some-challenge' }, + }); + newlyCompletedTodo = generateTodo({ + completed: true, + dateCompleted: moment(), + }); + completedTodoFromTwoDaysAgo = generateTodo({ + completed: true, + dateCompleted: moment().subtract({ days: 2 }), + }); + completedTodoFromThreeDaysAgo = generateTodo({ + completed: true, + dateCompleted: moment().subtract({ days: 3 }), + }); + completedTodoFromTenDaysAgo = generateTodo({ + completed: true, + dateCompleted: moment().subtract({ days: 10 }), + }); + + todos = [ + uncompletedTodo, + completedChallengeTodo, + newlyCompletedTodo, + completedTodoFromTwoDaysAgo, + completedTodoFromThreeDaysAgo, + completedTodoFromTenDaysAgo, + ]; + }); + + it('includes uncompleted todos', () => { + let preenedTodos = preenTodos(todos); + + expect(preenedTodos).to.include(uncompletedTodo); + }); + + it('includes completed challenge todos', () => { + let preenedTodos = preenTodos(todos); + + expect(preenedTodos).to.include(completedChallengeTodo); + }); + + it('includes recently completed todos', () => { + let preenedTodos = preenTodos(todos); + + expect(preenedTodos).to.include(newlyCompletedTodo); + }); + + it('includes todos completed two days ago', () => { + let preenedTodos = preenTodos(todos); + + expect(preenedTodos).to.include(completedTodoFromTwoDaysAgo); + }); + + it('does not include todos completed three days ago', () => { + let preenedTodos = preenTodos(todos); + + expect(preenedTodos).to.not.include(completedTodoFromThreeDaysAgo); + }); + + it('does not include todos completed more than three days ago', () => { + let preenedTodos = preenTodos(todos); + + expect(preenedTodos).to.not.include(completedTodoFromTenDaysAgo); + }); +}); diff --git a/test/common/user.fns.buy.test.js b/test/common/user.fns.buy.test.js index a4b067f9f4..0cf39c1eb0 100644 --- a/test/common/user.fns.buy.test.js +++ b/test/common/user.fns.buy.test.js @@ -160,8 +160,8 @@ describe('user.fns.buy', () => { let armoireKey = gearObject.key; fullArmoire[armoireKey] = true; - }); - }); + }).value(); + }).value(); beforeEach(() => { user.achievements.ultimateGearSets = { rogue: true }; diff --git a/test/common/user.fns.updateStats.test.js b/test/common/user.fns.updateStats.test.js new file mode 100644 index 0000000000..0e41812cb3 --- /dev/null +++ b/test/common/user.fns.updateStats.test.js @@ -0,0 +1,73 @@ +import { + generateUser, +} from '../helpers/common.helper'; + +describe('user.fns.updateStats', () => { + let user; + + beforeEach(() => { + user = generateUser({}); + }); + + context('no hp', () => { + it('returns 0 if user\'s hp is 0', () => { + let stats = { + hp: 0, + }; + + expect(user.fns.updateStats(stats)).to.eql(0); + }); + + it('returns 0 if user\'s hp is less than 0', () => { + let stats = { + hp: -5, + }; + + expect(user.fns.updateStats(stats)).to.eql(0); + }); + + it('sets user\'s hp to 0 if it is less than 0', () => { + let stats = { + hp: -5, + }; + + user.fns.updateStats(stats); + + expect(user.stats.hp).to.eql(0); + }); + }); + + context('Stat Allocation', () => { + it('Adds an attibute point when user\'s stat points are less than max level', () => { + let stats = { + exp: 3581, + }; + + user.stats.lvl = 99; + user.stats.str = 25; + user.stats.int = 25; + user.stats.con = 25; + user.stats.per = 24; + + user.fns.updateStats(stats); + + expect(user.stats.points).to.eql(1); + }); + + it('Does not add an attibute point when user\'s stat points are equal to max level', () => { + let stats = { + exp: 3581, + }; + + user.stats.lvl = 99; + user.stats.str = 25; + user.stats.int = 25; + user.stats.con = 25; + user.stats.per = 25; + + user.fns.updateStats(stats); + + expect(user.stats.points).to.eql(0); + }); + }); +}); diff --git a/test/content/gear.js b/test/content/gear.js index 7da129cb26..1e6a80ffe9 100644 --- a/test/content/gear.js +++ b/test/content/gear.js @@ -1,8 +1,7 @@ import { expectValidTranslationString, } from '../helpers/content.helper'; -import { each } from 'lodash'; -import camelCase from 'lodash.camelcase'; +import { each, camelCase } from 'lodash'; import { tree as allGear } from '../../common/script/content/gear'; import backerGear from '../../common/script/content/gear/sets/special/special-backer'; diff --git a/test/content/mysterySets.test.js b/test/content/mysterySets.test.js new file mode 100644 index 0000000000..97b44f4209 --- /dev/null +++ b/test/content/mysterySets.test.js @@ -0,0 +1,14 @@ +import {each} from 'lodash'; +import { + expectValidTranslationString +} from '../helpers/content.helper'; + +import mysterySets from '../../common/script/content/mystery-sets'; + +describe('Mystery Sets', () => { + it('has a valid text string', () => { + each(mysterySets, (set, key) => { + expectValidTranslationString(set.text); + }); + }); +}); diff --git a/test/helpers/api-integration.helper.js b/test/helpers/api-integration.helper.js index c8a452f7c3..56df233a1c 100644 --- a/test/helpers/api-integration.helper.js +++ b/test/helpers/api-integration.helper.js @@ -4,6 +4,7 @@ import { assign, each, isEmpty, + set, times, } from 'lodash'; import { MongoClient as mongo } from 'mongodb'; @@ -13,6 +14,32 @@ import i18n from '../../common/script/src/i18n'; i18n.translations = require('../../website/src/libs/i18n.js').translations; const API_TEST_SERVER_PORT = 3003; +const API_V = process.env.API_VERSION || 'v2'; // eslint-disable-line no-process-env +const ROUTES = { + v2: { + register: '/register', + }, + v3: { + register: '/user/auth/local/register', + }, +}; + +class ApiUser { + constructor (options) { + assign(this, options); + + this.get = _requestMaker(this, 'get'); + this.post = _requestMaker(this, 'post'); + this.put = _requestMaker(this, 'put'); + this.del = _requestMaker(this, 'del'); + } + + update (options) { + return new Promise((resolve) => { + _updateDocument('users', this, options, resolve); + }); + } +} // Sets up an abject that can make all REST requests // If a user is passed in, the uuid and api token of @@ -78,14 +105,16 @@ export function generateUser (update = {}) { let request = _requestMaker({}, 'post'); return new Promise((resolve, reject) => { - request('/register', { + request(ROUTES[API_V].register, { username, email, password, confirmPassword: password, }).then((user) => { _updateDocument('users', user, update, () => { - resolve(user); + let apiUser = new ApiUser(user); + + resolve(apiUser); }); }).catch(reject); }); @@ -221,7 +250,7 @@ export function resetHabiticaDB () { function _requestMaker (user, method, additionalSets) { return (route, send, query) => { return new Promise((resolve, reject) => { - let request = superagent[method](`http://localhost:${API_TEST_SERVER_PORT}/api/v2${route}`) + let request = superagent[method](`http://localhost:${API_TEST_SERVER_PORT}/api/${API_V}${route}`) .accept('application/json'); if (user && user._id && user.apiToken) { @@ -241,10 +270,20 @@ function _requestMaker (user, method, additionalSets) { if (err) { if (!err.response) return reject(err); - return reject({ - code: err.response.status, - text: err.response.body.err, - }); + if (API_V === 'v3') { + return reject({ + code: err.status, + error: err.response.body.error, + message: err.response.body.message, + }); + } else if (API_V === 'v2') { + return reject({ + code: err.status, + text: err.response.body.err, + }); + } + + return reject(err); } resolve(response.body); @@ -263,11 +302,17 @@ function _updateDocument (collectionName, doc, update, cb) { let collection = db.collection(collectionName); - collection.update({ _id: doc._id }, { $set: update }, (updateErr) => { + collection.updateOne({ _id: doc._id }, { $set: update }, (updateErr) => { if (updateErr) throw new Error(`Error updating ${collectionName}: ${updateErr}`); - assign(doc, update); + _updateLocalDocument(doc, update); db.close(); cb(); }); }); } + +function _updateLocalDocument (doc, update) { + each(update, (value, param) => { + set(doc, param, value); + }); +} diff --git a/test/spec/controllers/authCtrlSpec.js b/test/spec/controllers/authCtrlSpec.js index a2db08a944..b1f87d4d91 100644 --- a/test/spec/controllers/authCtrlSpec.js +++ b/test/spec/controllers/authCtrlSpec.js @@ -1,45 +1,121 @@ 'use strict'; describe('Auth Controller', function() { + var scope, ctrl, user, $httpBackend, $window, $modal; - describe('AuthCtrl', function(){ - var scope, ctrl, user, $httpBackend, $window; - - beforeEach(function(){ - module(function($provide) { - $provide.value('Analytics', analyticsMock); - $provide.value('Chat', { seenMessage: function() {} }); - }); - - inject(function(_$httpBackend_, $rootScope, $controller) { - $httpBackend = _$httpBackend_; - scope = $rootScope.$new(); - scope.loginUsername = 'user'; - scope.loginPassword = 'pass'; - $window = { location: { href: ""}, alert: sandbox.spy() }; - user = { user: {}, authenticate: sandbox.spy() }; - - ctrl = $controller('AuthCtrl', {$scope: scope, $window: $window, User: user}); - }) + beforeEach(function(){ + module(function($provide) { + $provide.value('Analytics', analyticsMock); + $provide.value('Chat', { seenMessage: function() {} }); }); - describe('logging in', function() { + inject(function(_$httpBackend_, $rootScope, $controller, _$modal_) { + $httpBackend = _$httpBackend_; + scope = $rootScope.$new(); + scope.loginUsername = 'user'; + scope.loginPassword = 'pass'; + $window = { location: { href: ""}, alert: sandbox.spy() }; + $modal = _$modal_; + user = { user: {}, authenticate: sandbox.spy() }; - it('should log in users with correct uname / pass', function() { - $httpBackend.expectPOST('/api/v2/user/auth/local').respond({id: 'abc', token: 'abc'}); - scope.auth(); - $httpBackend.flush(); - expect(user.authenticate).to.be.calledOnce; - expect($window.alert).to.not.be.called; + ctrl = $controller('AuthCtrl', {$scope: scope, $window: $window, User: user}); + }) + }); + + describe('logging in', function() { + + it('should log in users with correct uname / pass', function() { + $httpBackend.expectPOST('/api/v2/user/auth/local').respond({id: 'abc', token: 'abc'}); + scope.auth(); + $httpBackend.flush(); + expect(user.authenticate).to.be.calledOnce; + expect($window.alert).to.not.be.called; + }); + + it('should not log in users with incorrect uname / pass', function() { + $httpBackend.expectPOST('/api/v2/user/auth/local').respond(404, ''); + scope.auth(); + $httpBackend.flush(); + expect(user.authenticate).to.not.be.called; + expect($window.alert).to.be.calledOnce; + }); + }); + + describe('#clearLocalStorage', function () { + var timer; + + beforeEach(function () { + timer = sandbox.useFakeTimers(); + sandbox.stub($modal, 'open'); + }); + + it('opens modal with message about clearing local storage and logging out', function () { + scope.clearLocalStorage(); + + expect($modal.open).to.be.calledOnce; + expect($modal.open).to.be.calledWith({ + templateUrl: 'modals/message-modal.html', + scope: scope }); - it('should not log in users with incorrect uname / pass', function() { - $httpBackend.expectPOST('/api/v2/user/auth/local').respond(404, ''); - scope.auth(); - $httpBackend.flush(); - expect(user.authenticate).to.not.be.called; - expect($window.alert).to.be.calledOnce; - }); + expect(scope.messageModal.title).to.eql(window.env.t('localStorageClearing')); + expect(scope.messageModal.body).to.eql(window.env.t('localStorageClearingExplanation')); + }); + + it('does not call $scope.logout before 3 seconds', function () { + sandbox.stub(scope, 'logout'); + + scope.clearLocalStorage(); + + timer.tick(2999); + + expect(scope.logout).to.not.be.called; + }); + + it('calls $scope.logout after 3 seconds', function () { + sandbox.stub(scope, 'logout'); + + scope.clearLocalStorage(); + + timer.tick(3000); + + expect(scope.logout).to.be.calledOnce; + }); + + it('does not clear local storage before 3 seconds', function () { + sandbox.stub(localStorage, 'clear'); + + scope.clearLocalStorage(); + + timer.tick(2999); + + expect(localStorage.clear).to.not.be.called; + }); + + it('clears local storage after 3 seconds', function () { + sandbox.stub(localStorage, 'clear'); + + scope.clearLocalStorage(); + + timer.tick(3000); + + expect(localStorage.clear).to.be.calledOnce; + }); + + it('does not redirect to /logout route before 3 seconds', function () { + scope.clearLocalStorage(); + + timer.tick(2999); + + expect($window.location.href).to.eql(''); + }); + + it('redirects to /logout after 3 seconds', function () { + scope.clearLocalStorage(); + + timer.tick(3000); + + expect($window.location.href).to.eql('/logout'); }); }); }); diff --git a/test/spec/controllers/inviteToGroupCtrlSpec.js b/test/spec/controllers/inviteToGroupCtrlSpec.js index 91d251dc58..385f42dda1 100644 --- a/test/spec/controllers/inviteToGroupCtrlSpec.js +++ b/test/spec/controllers/inviteToGroupCtrlSpec.js @@ -68,13 +68,13 @@ describe('Invite to Group Controller', function() { it('uses provided name', function() { scope.group.name = 'test party'; scope.inviteNewUsers('uuid'); - expect(group.name).to.eql('test party'); + expect(scope.group.name).to.eql('test party'); }); it('names the group if no name is provided', function() { scope.group.name = ''; scope.inviteNewUsers('uuid'); - expect(group.name).to.eql(env.t('possessiveParty', {name: user.profile.name})); + expect(scope.group.name).to.eql(env.t('possessiveParty', {name: user.profile.name})); }); }); diff --git a/test/spec/controllers/settingsCtrlSpec.js b/test/spec/controllers/settingsCtrlSpec.js index 2950b235d6..527600b29e 100644 --- a/test/spec/controllers/settingsCtrlSpec.js +++ b/test/spec/controllers/settingsCtrlSpec.js @@ -1,15 +1,28 @@ 'use strict'; -describe('Settings Controller', function() { +describe('Settings Controller', function () { var rootScope, scope, user, User, ctrl; - beforeEach(function() { + const actionClickEvent = { + target: document.createElement('button'), + }; + + beforeEach(function () { module(function($provide) { user = specHelper.newUser(); User = { set: sandbox.stub(), user: user }; + + User.user.ops = { + reroll: sandbox.stub(), + rebirth: sandbox.stub(), + releasePets: sandbox.stub(), + releaseMounts: sandbox.stub(), + releaseBoth: sandbox.stub(), + }; + $provide.value('User', User); $provide.value('Guide', sandbox.stub()); }); @@ -25,20 +38,20 @@ describe('Settings Controller', function() { }); }); - describe('#openDayStartModal', function() { - beforeEach(function() { + describe('#openDayStartModal', function () { + beforeEach(function () { sandbox.stub(rootScope, 'openModal'); sandbox.stub(window, 'alert'); }); - it('opens the day start modal', function() { + it('opens the day start modal', function () { scope.openDayStartModal(5); expect(rootScope.openModal).to.be.calledOnce; expect(rootScope.openModal).to.be.calledWith('change-day-start', {scope: scope}); }); - it('sets nextCron variable', function() { + it('sets nextCron variable', function () { expect(scope.nextCron).to.not.exist; scope.openDayStartModal(5); @@ -46,7 +59,7 @@ describe('Settings Controller', function() { expect(scope.nextCron).to.exist; }); - it('calculates the next time cron will run', function() { + it('calculates the next time cron will run', function () { var fakeCurrentTime = new Date(2013, 3, 1, 3, 12).getTime(); var expectedTime = new Date(2013, 3, 1, 5, 0, 0).getTime(); sandbox.useFakeTimers(fakeCurrentTime); @@ -56,7 +69,7 @@ describe('Settings Controller', function() { expect(scope.nextCron).to.eq(expectedTime); }); - it('calculates the next time cron will run and adds a day if cron would have already passed', function() { + it('calculates the next time cron will run and adds a day if cron would have already passed', function () { var fakeCurrentTime = new Date(2013, 3, 1, 8, 12).getTime(); var expectedTime = new Date(2013, 3, 2, 5, 0, 0).getTime(); sandbox.useFakeTimers(fakeCurrentTime); @@ -67,9 +80,9 @@ describe('Settings Controller', function() { }); }); - describe('#saveDayStart', function() { + describe('#saveDayStart', function () { - it('updates user\'s custom day start and last cron', function() { + it('updates user\'s custom day start and last cron', function () { var fakeCurrentTime = new Date(2013, 3, 1, 8, 12).getTime(); var expectedTime = fakeCurrentTime; sandbox.useFakeTimers(fakeCurrentTime); @@ -83,4 +96,191 @@ describe('Settings Controller', function() { }); }); }); + + context('Player Reroll', function () { + describe('#reroll', function () { + beforeEach(function () { + scope.clickReroll(actionClickEvent); + }); + + it('destroys the previous popover if it exists', function () { + sandbox.spy($.fn, 'popover'); + + scope.reroll(false); + + expect(scope.popoverEl).to.exist; + expect($.fn.popover).to.be.calledWith('destroy'); + }); + + it('doesn\'t call reroll when not confirmed', function () { + scope.reroll(false); + + expect(user.ops.reroll).to.not.be.calledOnce; + }); + + it('calls reroll on the user when confirmed', function () { + sandbox.stub(rootScope.$state, 'go'); + + scope.reroll(true); + + expect(user.ops.reroll).to.be.calledWith({}); + }); + + it('navigates to the tasks page when confirmed', function () { + sandbox.stub(rootScope.$state, 'go'); + + scope.reroll(true); + + expect(rootScope.$state.go).to.be.calledWith('tasks'); + }); + }); + + describe('#clickReroll', function () { + it('displays a confirmation popover for the user', function () { + sandbox.spy($.fn, 'popover'); + + scope.clickReroll(actionClickEvent); + + expect($.fn.popover).to.be.calledWith('destroy'); + expect($.fn.popover).to.be.calledWith('show'); + }); + }); + }); + + context('Player Rebirth', function () { + describe('#rebirth', function () { + beforeEach(function () { + scope.clickRebirth(actionClickEvent); + }); + + it('destroys the previous popover if it exists', function () { + sandbox.spy($.fn, 'popover'); + + scope.rebirth(false); + + expect(scope.popoverEl).to.exist; + expect($.fn.popover).to.be.calledWith('destroy'); + }); + + it('doesn\'t call rebirth when not confirmed', function () { + scope.rebirth(false); + + expect(user.ops.rebirth).to.not.be.calledOnce; + }); + + it('calls rebirth on the user when confirmed', function () { + sandbox.stub(rootScope.$state, 'go'); + + scope.rebirth(true); + + expect(user.ops.rebirth).to.be.calledWith({}); + }); + + it('navigates to tasks page when confirmed', function () { + sandbox.stub(rootScope.$state, 'go'); + + scope.rebirth(true); + + expect(rootScope.$state.go).to.be.calledWith('tasks'); + }); + }); + + describe('#clickRebirth', function () { + it('displays a confirmation popover for the user', function () { + sandbox.spy($.fn, 'popover'); + + scope.clickRebirth(actionClickEvent); + + expect($.fn.popover).to.be.calledWith('destroy'); + expect($.fn.popover).to.be.calledWith('show'); + }); + }); + }) + + context('Releasing pets and mounts', function () { + describe('#release', function () { + beforeEach(function () { + scope.clickRelease('dummy', actionClickEvent); + + sandbox.stub(rootScope.$state, 'go'); + }); + + it('destroys the previous popover if it exists', function () { + sandbox.spy($.fn, 'popover'); + + scope.releaseAnimals('', false); + + expect($.fn.popover).to.be.calledWith('destroy'); + }); + + it('doesn\'t call any release method if type is not provided', function () { + scope.releaseAnimals(); + + expect(User.user.ops.releasePets).to.not.be.called; + expect(User.user.ops.releaseMounts).to.not.be.called; + expect(User.user.ops.releaseBoth).to.not.be.called; + }); + + it('doesn\'t redirect to tasks page if type is not provided', function () { + scope.releaseAnimals(); + + expect(rootScope.$state.go).to.not.be.called; + }) + + it('calls releasePets when "pets" is provided', function () { + scope.releaseAnimals('pets'); + + expect(User.user.ops.releasePets).to.be.calledOnce; + }); + + it('navigates to the tasks page when "pets" is provided', function () { + scope.releaseAnimals('pets'); + + expect(rootScope.$state.go).to.be.calledOnce; + }); + + it('calls releaseMounts when "mounts" is provided', function () { + scope.releaseAnimals('mounts'); + + expect(User.user.ops.releaseMounts).to.be.calledOnce; + }); + + it('navigates to the tasks page when "mounts" is provided', function () { + scope.releaseAnimals('mounts'); + + expect(rootScope.$state.go).to.be.calledOnce; + }); + + it('calls releaseBoth when "both" is provided', function () { + scope.releaseAnimals('both'); + + expect(User.user.ops.releaseBoth).to.be.calledOnce; + }); + + it('navigates to the tasks page when "both" is provided', function () { + scope.releaseAnimals('both'); + + expect(rootScope.$state.go).to.be.calledOnce; + }); + + it('does not call release functions when non-applicable argument is passed in', function () { + scope.releaseAnimals('dummy'); + + expect(User.user.ops.releasePets).to.not.be.called; + expect(User.user.ops.releaseMounts).to.not.be.called; + expect(User.user.ops.releaseBoth).to.not.be.called; + }); + }); + + describe('#clickRelease', function () { + it('displays a confirmation popover for the user', function () { + sandbox.spy($.fn, 'popover'); + scope.clickRelease('dummy', actionClickEvent); + + expect($.fn.popover).to.be.calledWith('destroy'); + expect($.fn.popover).to.be.called; + expect($.fn.popover).to.be.calledWith('show'); + }); + }); + }); }); diff --git a/test/spec/controllers/tasksCtrlSpec.js b/test/spec/controllers/tasksCtrlSpec.js index 28ffa79f0b..ea6da32897 100644 --- a/test/spec/controllers/tasksCtrlSpec.js +++ b/test/spec/controllers/tasksCtrlSpec.js @@ -1,12 +1,18 @@ 'use strict'; describe('Tasks Controller', function() { - var $rootScope, shared, scope, user, ctrl; + var $rootScope, shared, scope, user, User, ctrl; beforeEach(function() { user = specHelper.newUser(); + User = { + user: user + }; + User.user.ops = { + deleteTask: sandbox.stub(), + }; module(function($provide) { - $provide.value('User', {user: user}); + $provide.value('User', User); $provide.value('Guide', {}); }); @@ -14,9 +20,9 @@ describe('Tasks Controller', function() { scope = $rootScope.$new(); shared = Shared; - $controller('RootCtrl', {$scope: scope, User: {user: user}}); + $controller('RootCtrl', {$scope: scope, User: User}); - ctrl = $controller('TasksCtrl', {$scope: scope, User: {user: user}}); + ctrl = $controller('TasksCtrl', {$scope: scope, User: User}); }); }); @@ -29,6 +35,32 @@ describe('Tasks Controller', function() { }); }); + describe('removeTask', function() { + var task; + + beforeEach(function() { + sandbox.stub(window, 'confirm'); + task = specHelper.newTodo(); + }); + + it('asks user to confirm deletion', function() { + scope.removeTask(task); + expect(window.confirm).to.be.calledOnce; + }); + + it('does not remove task if not confirmed', function() { + window.confirm.returns(false); + scope.removeTask(task); + expect(user.ops.deleteTask).to.not.be.called; + }); + + it('removes task', function() { + window.confirm.returns(true); + scope.removeTask(task); + expect(user.ops.deleteTask).to.be.calledOnce; + }); + }); + describe('watch to updateStore', function() { it('updates itemStore when user gear changes', function() { sinon.stub(shared, 'updateStore').returns({item: true}); diff --git a/test/spec/specHelper.js b/test/spec/specHelper.js index eb818a6ee0..9324fa5d8b 100644 --- a/test/spec/specHelper.js +++ b/test/spec/specHelper.js @@ -26,7 +26,7 @@ var specHelper = {}; gear: { equipped: {}, costume: {}, owned: {} } }; - user = { + var user = { _id: 'unique-user-id', auth: { timestamps: {} }, stats: stats, @@ -53,7 +53,7 @@ var specHelper = {}; function newGroup(overrides) { var quest = { progress: { }, active: false }; - group = { + var group = { _id: 'group-id', leader : 'leader-id', memberCount : 1, diff --git a/vagrant.sh b/vagrant.sh index 38246143e8..ceb1e9ab38 100644 --- a/vagrant.sh +++ b/vagrant.sh @@ -26,6 +26,8 @@ function autostart_habitrpg { # Main provisioning echo Setting up Habitica... echo cd /vagrant >> /home/vagrant/.bashrc +# Needed for running e2e tests +echo export DISPLAY=:99 >> /home/vagrant/.bashrc # Prevent warnings: "dpkg-preconfigure: unable to re-open stdin ..." export DEBIAN_FRONTEND=noninteractive @@ -70,6 +72,15 @@ echo Installing node.js apt-get install -qq nodejs echo Updating npm... npm install -g npm +echo Installing Xvfb... +apt-get install -qq xvfb +echo Installing Java7... +apt-get install -qq openjdk-7-jre +echo Downloading Firefox... +wget http://sourceforge.net/projects/ubuntuzilla/files/mozilla/apt/pool/main/f/firefox-mozilla-build/firefox-mozilla-build_40.0.3-0ubuntu1_amd64.deb/download -O firefox.deb >/dev/null 2>&1 +echo Installing Firefox... +dpkg -i firefox.deb +rm firefox.deb cd /vagrant diff --git a/website/public/js/app.js b/website/public/js/app.js index bae9606422..6b39f45d63 100644 --- a/website/public/js/app.js +++ b/website/public/js/app.js @@ -49,7 +49,8 @@ window.habitrpg = angular.module('habitrpg', // Tasks .state('tasks', { url: "/tasks", - templateUrl: "partials/main.html" + templateUrl: "partials/main.html", + title: env.t('titleTasks') }) // Options @@ -67,19 +68,23 @@ window.habitrpg = angular.module('habitrpg', }) .state('options.profile.avatar', { url: "/avatar", - templateUrl: "partials/options.profile.avatar.html" + templateUrl: "partials/options.profile.avatar.html", + title: env.t('titleAvatar') }) .state('options.profile.backgrounds', { url: '/backgrounds', - templateUrl: "partials/options.profile.backgrounds.html" + templateUrl: "partials/options.profile.backgrounds.html", + title: env.t('titleBackgrounds') }) .state('options.profile.stats', { url: "/stats", - templateUrl: "partials/options.profile.stats.html" + templateUrl: "partials/options.profile.stats.html", + title: env.t('titleStats') }) .state('options.profile.profile', { url: "/profile", - templateUrl: "partials/options.profile.profile.html" + templateUrl: "partials/options.profile.profile.html", + title: env.t('titleProfile') }) // Options > Groups @@ -90,19 +95,22 @@ window.habitrpg = angular.module('habitrpg', .state('options.social.inbox', { url: "/inbox", - templateUrl: "partials/options.social.inbox.html" + templateUrl: "partials/options.social.inbox.html", + title: env.t('titleInbox') }) .state('options.social.tavern', { url: "/tavern", templateUrl: "partials/options.social.tavern.html", - controller: 'TavernCtrl' + controller: 'TavernCtrl', + title: env.t('titleTavern') }) .state('options.social.party', { url: '/party', templateUrl: "partials/options.social.party.html", - controller: 'PartyCtrl' + controller: 'PartyCtrl', + title: env.t('titleParty') }) .state('options.social.hall', { @@ -112,30 +120,36 @@ window.habitrpg = angular.module('habitrpg', .state('options.social.hall.heroes', { url: '/heroes', templateUrl: "partials/options.social.hall.heroes.html", - controller: 'HallHeroesCtrl' + controller: 'HallHeroesCtrl', + title: env.t('titleHeroes') }) .state('options.social.hall.patrons', { url: '/patrons', templateUrl: "partials/options.social.hall.patrons.html", - controller: 'HallPatronsCtrl' + controller: 'HallPatronsCtrl', + title: env.t('titlePatrons') }) .state('options.social.guilds', { url: '/guilds', templateUrl: "partials/options.social.guilds.html", - controller: 'GuildsCtrl' + controller: 'GuildsCtrl', + title: env.t('titleGuilds') }) .state('options.social.guilds.public', { url: '/public', - templateUrl: "partials/options.social.guilds.public.html" + templateUrl: "partials/options.social.guilds.public.html", + title: env.t('titleGuilds') }) .state('options.social.guilds.create', { url: '/create', - templateUrl: "partials/options.social.guilds.create.html" + templateUrl: "partials/options.social.guilds.create.html", + title: env.t('titleGuilds') }) .state('options.social.guilds.detail', { url: '/:gid', templateUrl: 'partials/options.social.guilds.detail.html', + title: env.t('titleGuilds'), controller: ['$scope', 'Groups', 'Chat', '$stateParams', function($scope, Groups, Chat, $stateParams){ Groups.Group.get({gid:$stateParams.gid}, function(group){ @@ -150,11 +164,13 @@ window.habitrpg = angular.module('habitrpg', url: "/challenges", params: { groupIdFilter: null }, controller: 'ChallengesCtrl', - templateUrl: "partials/options.social.challenges.html" + templateUrl: "partials/options.social.challenges.html", + title: env.t('titleChallenges') }) .state('options.social.challenges.detail', { url: '/:cid', templateUrl: 'partials/options.social.challenges.detail.html', + title: env.t('titleChallenges'), controller: ['$scope', 'Challenges', '$stateParams', function($scope, Challenges, $stateParams){ $scope.obj = $scope.challenge = Challenges.Challenge.get({cid:$stateParams.cid}, function(){ @@ -165,6 +181,7 @@ window.habitrpg = angular.module('habitrpg', .state('options.social.challenges.edit', { url: '/:cid/edit', templateUrl: 'partials/options.social.challenges.detail.html', + title: env.t('titleChallenges'), controller: ['$scope', 'Challenges', '$stateParams', function($scope, Challenges, $stateParams){ $scope.obj = $scope.challenge = Challenges.Challenge.get({cid:$stateParams.cid}, function(){ @@ -175,6 +192,7 @@ window.habitrpg = angular.module('habitrpg', .state('options.social.challenges.detail.member', { url: '/:uid', templateUrl: 'partials/options.social.challenges.detail.member.html', + title: env.t('titleChallenges'), controller: ['$scope', 'Challenges', '$stateParams', function($scope, Challenges, $stateParams){ $scope.obj = Challenges.Challenge.getMember({cid:$stateParams.cid, uid:$stateParams.uid}, function(){ @@ -191,62 +209,75 @@ window.habitrpg = angular.module('habitrpg', }) .state('options.inventory.drops', { url: '/drops', - templateUrl: "partials/options.inventory.drops.html" + templateUrl: "partials/options.inventory.drops.html", + title: env.t('titleDrops') }) .state('options.inventory.quests', { url: '/quests', - templateUrl: "partials/options.inventory.quests.html" + templateUrl: "partials/options.inventory.quests.html", + title: env.t('titleQuests') }) .state('options.inventory.pets', { url: '/pets', - templateUrl: "partials/options.inventory.pets.html" + templateUrl: "partials/options.inventory.pets.html", + title: env.t('titlePets') }) .state('options.inventory.mounts', { url: '/mounts', - templateUrl: "partials/options.inventory.mounts.html" + templateUrl: "partials/options.inventory.mounts.html", + title: env.t('titleMounts') }) .state('options.inventory.equipment', { url: '/equipment', - templateUrl: "partials/options.inventory.equipment.html" + templateUrl: "partials/options.inventory.equipment.html", + title: env.t('titleEquipment') }) .state('options.inventory.timetravelers', { url: '/timetravelers', - templateUrl: "partials/options.inventory.timetravelers.html" + templateUrl: "partials/options.inventory.timetravelers.html", + title: env.t('titleTimeTravelers') }) .state('options.inventory.seasonalshop', { url: '/seasonalshop', - templateUrl: "partials/options.inventory.seasonalshop.html" + templateUrl: "partials/options.inventory.seasonalshop.html", + title: env.t('titleSeasonalShop') }) // Options > Settings .state('options.settings', { url: "/settings", controller: 'SettingsCtrl', - templateUrl: "partials/options.settings.html" + templateUrl: "partials/options.settings.html", }) .state('options.settings.settings', { url: "/settings", - templateUrl: "partials/options.settings.settings.html" + templateUrl: "partials/options.settings.settings.html", + title: env.t('titleSettings') }) .state('options.settings.api', { url: "/api", - templateUrl: "partials/options.settings.api.html" + templateUrl: "partials/options.settings.api.html", + title: env.t('titleSettings') }) .state('options.settings.export', { url: "/export", - templateUrl: "partials/options.settings.export.html" + templateUrl: "partials/options.settings.export.html", + title: env.t('titleSettings') }) .state('options.settings.promo', { url: "/promo", - templateUrl: "partials/options.settings.promo.html" + templateUrl: "partials/options.settings.promo.html", + title: env.t('titleSettings') }) .state('options.settings.subscription', { url: "/subscription", - templateUrl: "partials/options.settings.subscription.html" + templateUrl: "partials/options.settings.subscription.html", + title: env.t('titleSettings') }) .state('options.settings.notifications', { url: "/notifications", - templateUrl: "partials/options.settings.notifications.html" + templateUrl: "partials/options.settings.notifications.html", + title: env.t('titleSettings') }); var settings = JSON.parse(localStorage.getItem(STORAGE_SETTINGS_ID)); diff --git a/website/public/js/controllers/authCtrl.js b/website/public/js/controllers/authCtrl.js index 7dced7ce00..5b486677f5 100644 --- a/website/public/js/controllers/authCtrl.js +++ b/website/public/js/controllers/authCtrl.js @@ -11,7 +11,7 @@ angular.module('habitrpg') $scope.logout = function() { localStorage.clear(); - window.location.href = '/logout'; + $window.location.href = '/logout'; }; var runAuth = function(id, token) { @@ -105,6 +105,23 @@ angular.module('habitrpg') }, function( e ){ alert("Signin error: " + e.error.message ); }); - } + }; + + $scope.clearLocalStorage = function () { + $scope.messageModal = { + title: window.env.t('localStorageClearing'), + body: window.env.t('localStorageClearingExplanation'), + noFooter: true, + }; + + $modal.open({ + templateUrl: 'modals/message-modal.html', + scope: $scope + }); + + var threeSecondsForUsersToReadClearLocalStorageMessage = 3000; + + setTimeout($scope.logout, threeSecondsForUsersToReadClearLocalStorageMessage); + }; } ]); diff --git a/website/public/js/controllers/challengesCtrl.js b/website/public/js/controllers/challengesCtrl.js index 1cafe40d44..30aac589d5 100644 --- a/website/public/js/controllers/challengesCtrl.js +++ b/website/public/js/controllers/challengesCtrl.js @@ -83,7 +83,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User', _(clonedTasks).each(function(val, type) { challenge[type + 's'].forEach(_cloneTaskAndPush); - }); + }).value(); $scope.obj = $scope.newChallenge = new Challenges.Challenge({ name: challenge.name, @@ -212,7 +212,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User', }; $scope.removeTask = function(task, list) { - if (!confirm(window.env.t('sureDelete'))) return; + if (!confirm(window.env.t('sureDelete', {taskType: window.env.t(task.type), taskText: task.text}))) return; //TODO persist // User.log({op: "delTask", data: task}); _.remove(list, task); diff --git a/website/public/js/controllers/guildsCtrl.js b/website/public/js/controllers/guildsCtrl.js index 020ebbe956..4c9259eaf8 100644 --- a/website/public/js/controllers/guildsCtrl.js +++ b/website/public/js/controllers/guildsCtrl.js @@ -57,27 +57,29 @@ habitrpg.controller("GuildsCtrl", ['$scope', 'Groups', 'User', 'Challenges', '$r $scope.popoverEl = $($event.target); var html, title; Challenges.Challenge.query(function(challenges) { - challenges = _.pluck(_.filter(challenges, function(c) { - return c.group._id == group._id; - }), '_id'); - if (_.intersection(challenges, User.user.challenges).length > 0) { - html = $compile( - '' + window.env.t('removeTasks') + '