Your avatar starts plain until you've earned Equipment!
",
+ "tourAvatarProceed": "Show me my tasks!",
+ "tourToDosBrief": "To-Do List
Check off To-Dos to earn Gold & Experience!
To-Dos never make your avatar lose Health.
",
+ "tourDailiesBrief": "Daily Tasks
Dailies repeat every day.
You lose Health if you skip Dailies.
",
+ "tourDailiesProceed": "I'll be careful!",
+ "tourHabitsBrief": "Good & Bad Habits
Good Habits award Gold & Experience.
Bad Habits make you lose Health.
",
+ "tourHabitsProceed": "Makes sense!",
+ "tourRewardsBrief": "Reward List
Spend your hard-earned Gold here!
Purchase Equipment for your avatar, or set custom Rewards.
",
+ "tourRewardsProceed": "That's all!",
+
+ "welcomeToHabit": "Welcome to HabitRPG, a game to improve your life!",
+ "welcome1": "Create and customize an in-game avatar to represent you.",
+ "welcome2": "Your real-life tasks affect your avatar's Health (HP), Experience (XP), and Gold!",
+ "welcome3": "Complete tasks to earn Experience (XP) and Gold, which unlock awesome features and rewards!",
+ "welcome4": "Avoid bad habits that drain Health (HP), or your avatar will die!",
+ "welcome5": "Now you'll customize your avatar and set up your tasks...",
+ "imReady": "I'm Ready!"
}
diff --git a/common/locales/en/quests.json b/common/locales/en/quests.json
index e0546fcf8a..256ff78642 100644
--- a/common/locales/en/quests.json
+++ b/common/locales/en/quests.json
@@ -1,9 +1,11 @@
{
"quests": "Quests",
"quest": "quest",
+ "questDetails": "Quest Details",
+ "invitations": "Invitations",
"completed": "Completed!",
"youReceived": "You've Received",
- "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Options > Social > Party.",
+ "questSend": "Clicking \"Invite\" will send an invitation to your party members. When all members have accepted or denied, the quest begins. See status under Social > Party.",
"inviteParty": "Invite Party",
"questInvitation": "Quest Invitation: ",
"questInvitationTitle": "Quest Invitation",
@@ -19,7 +21,7 @@
"bossStrength": "Boss Strength",
"collect": "Collect",
"collected": "Collected",
- "bossDmg1": "To hurt a boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "Only participants will fight the boss and share in the quest loot.",
"tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossColl1": "To collect items, do your positive tasks. Quest items drop just like normal items; however, you won't see the drops until the next day, then everything you've found will be tallied up and contributed to the pile.",
diff --git a/common/locales/en/settings.json b/common/locales/en/settings.json
index a1eb6ce215..26c252902b 100644
--- a/common/locales/en/settings.json
+++ b/common/locales/en/settings.json
@@ -118,5 +118,7 @@
"resubscribe": "Resubscribe",
"promoCode": "Promo Code",
"promoCodeApplied": "Promo Code Applied! Check your inventory",
- "promoPlaceholder": "Enter Promotion Code"
+ "promoPlaceholder": "Enter Promotion Code",
+ "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)",
+ "displayInviteToPartyWhenPartyIs1": "Display Invite To Party button when party has 1 member."
}
diff --git a/common/locales/en/subscriber.json b/common/locales/en/subscriber.json
index 4f602a48a3..e6e4876c09 100644
--- a/common/locales/en/subscriber.json
+++ b/common/locales/en/subscriber.json
@@ -3,17 +3,17 @@
"subscriptions": "Subscriptions",
"subDescription": "Disable ads, buy gems with gold, monthly mystery item, retain progress history, double daily drop-caps, supports the devs. Click for more info.",
"disableAds": "Disable ads",
- "disableAdsText": "Ads will stay disabled while you have an active subscription (original users with disabled ads are grandfathered).",
+ "disableAdsText": "Ads are disabled while you have an active subscription (original donors are grandfathered).",
"buyGemsGold": "Buy Gems with Gold",
- "buyGemsGoldText": "(1 Gem costs <%= gemCost %> Gold) Addresses the \"pay to win\" concern, as everything is now achievable through hard work. There's a <%= gemLimit %> Gem monthly conversion cap to prevent farming.",
+ "buyGemsGoldText": "Alexander the Merchant will sell you gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> gems per month, but this cap increases by 5 gems for every three months of consecutive subscription, up to a maximum of 50 gems per month!",
"retainHistory": "Retain full history entries",
"retainHistoryText": "Makes your full history available in graphs and export. Non-subscriber histories get consolidated for database optimization.",
"doubleDrops": "Daily drop-caps doubled",
"doubleDropsText": "Complete your stable faster!",
"mysteryItem": "Unique Monthly Subscription Items",
- "mysteryItemText": "Each month, all subscribers will get a totally unique cosmetic item for their avatars!",
+ "mysteryItemText": "Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.",
"supportDevs": "Supports the developers",
- "supportDevsText": "This open source project can use all the help it can get. Help us keep Habit alive!",
+ "supportDevsText": "Your subscription helps keep Habitica thriving and helps fund the development of new features. Thank you for your generosity!",
"monthUSD": "USD / Month",
"organization": "Organization",
"groupPlans": "Corporate Plans",
diff --git a/common/locales/en/tasks.json b/common/locales/en/tasks.json
index 885eb9dddc..e80aeee367 100644
--- a/common/locales/en/tasks.json
+++ b/common/locales/en/tasks.json
@@ -14,15 +14,15 @@
"save": "Save",
"addChecklist": "Add Checklist",
"checklist": "Checklist",
- "checklistText": "For Dailies, partially completed checklists reduce damage. For example, a 4-item checklist with 3 completed reduces damage for that incomplete Daily to 25%. Completed checklist items on a To-Do add a multiplier: 3 checks means +3x (total 4x) the Experience, Gold, and Mana.",
+ "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
"expandCollapse": "Expand/Collapse",
- "text": "Text",
+ "text": "Title",
"extraNotes": "Extra Notes",
"direction/Actions": "Direction/Actions",
"advancedOptions": "Advanced Options",
"difficulty": "Difficulty",
"difficultyHelpTitle": "How difficult is this task?",
- "difficultyHelpContent": "This multiplies its point value. Use sparingly, rely instead on our organic value-adjustment algorithms. But some tasks are grossly more valuable (Write Thesis vs Floss Teeth). Click for more info.",
+ "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!",
"easy": "Easy",
"medium": "Medium",
"hard": "Hard",
@@ -36,6 +36,11 @@
"newDailyBulk": "New Dailies (one per line)",
"streakCounter": "Streak Counter",
"repeat": "Repeat",
+ "repeatEvery": "Repeat Every",
+ "repeatDays": "Every X Days",
+ "repeatWeek": "On Certain Days of the Week",
+ "day": "Day",
+ "days": "Days",
"restoreStreak": "Restore Streak",
"todos": "To-Dos",
"newTodo": "New To-Do",
@@ -60,6 +65,9 @@
"clearTags": "Clear",
"hideTags": "Hide",
"showTags": "Show",
+ "startDate": "Start Date",
+ "startDateHelpTitle": "When should this task start?",
+ "startDateHelp": "Set the date for which this task takes effect. Will not be due on earlier days.",
"streakName": "Streak Achievements",
"streakText": "Has performed <%= streaks %> 21-day streaks on Dailies",
"streakSingular": "Streaker",
@@ -78,5 +86,23 @@
"pushTaskToTop": "Push task to top",
"pushTaskToBottom": "Push task to bottom",
"emptyTask": "Enter the task's title first.",
- "dailiesRestingInInn": "You're Resting in the Inn! Your Dailies will NOT hurt you tonight, but they WILL still refresh every day. If you're in a quest, you won't deal damage/collect items until you check out of the Inn, but you can still be injured by a Boss if your Party mates skip their own Dailies."
+ "dailiesRestingInInn": "You're Resting in the Inn! Your Dailies will NOT hurt you tonight, but they WILL still refresh every day. If you're in a quest, you won't deal damage/collect items until you check out of the Inn, but you can still be injured by a Boss if your Party mates skip their own Dailies.",
+ "habitHelp1": "Good Habits are things that you do often. They award Gold and Experience every time you click the <%= plusIcon %>.",
+ "habitHelp2": "Bad Habits are things you want to avoid doing. They remove Health every time you click the <%= minusIcon %>.",
+ "habitHelp3": "For inspiration, check out these sample Habits!",
+ "newbieGuild": "More questions? Ask in the <%= linkStart %>Newbies Guild<%= linkEnd %>!",
+ "dailyHelp1": "Dailies repeat <%= emphasisStart %>every day<%= emphasisEnd %> that they are active. Click the <%= pencilIcon %> to change the days a Daily is active.",
+ "dailyHelp2": "If you don't complete active Dailies, you lose Health when your day rolls over.",
+ "dailyHelp3": "Dailies turn <%= emphasisStart %>redder<%= emphasisEnd %> when you miss them, and <%= emphasisStart %>bluer<%= emphasisEnd %> when you complete them. The redder the Daily, the more it will reward you... or hurt you.",
+ "dailyHelp4": "To change when your day rolls over, go to <%= linkStart %> Settings > Site<%= linkEnd %> > Custom Day Start.",
+ "dailyHelp5": "For inspiration, check out these sample Dailies!",
+ "toDoHelp1": "To-Dos start yellow, and get redder (more valuable) the longer it takes to complete them.",
+ "toDoHelp2": "To-Dos never hurt you! They only award Gold and Experience.",
+ "toDoHelp3": "Breaking a To-Do down into a checklist of smaller items will make it less scary, and will increase your points!",
+ "toDoHelp4": "For inspiration, check out these sample To-Dos!",
+ "rewardHelp1": "The Equipment you buy for your avatar is stored in <%= linkStart %>Inventory > Equipment<%= linkEnd %>.",
+ "rewardHelp2": "Equipment affects your stats (<%= linkStart %>Avatar > Stats<%= linkEnd %>).",
+ "rewardHelp3": "Special equipment will appear here during World Events.",
+ "rewardHelp4": "Don't be afraid to set custom Rewards! Check out some samples here.",
+ "clickForHelp": "Click for help"
}
diff --git a/common/locales/en@pirate/backgrounds.json b/common/locales/en@pirate/backgrounds.json
index 14450bc864..62fe19f325 100644
--- a/common/locales/en@pirate/backgrounds.json
+++ b/common/locales/en@pirate/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "Mountain Lake",
"backgroundMountainLakeNotes": "Dip your toes in a Mountain Lake.",
"backgroundPagodasText": "Pagodas",
- "backgroundPagodasNotes": "Climb to the top of Pagodas."
+ "backgroundPagodasNotes": "Climb to the top of Pagodas.",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/en@pirate/challenge.json b/common/locales/en@pirate/challenge.json
index d4a21344a2..3feb48f62d 100644
--- a/common/locales/en@pirate/challenge.json
+++ b/common/locales/en@pirate/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Select a winner an' close th' challenge:",
"deleteOrSelect": "Delete or select winner",
"endChallenge": "End Challenge",
- "challengeDiscription": "These be t' challenge's tasks. As users participate, they gunna change color 'n gain graphs t' show ye t' overall progress 'o t' group.",
+ "challengeDiscription": "These are the Challenge's tasks that will be added to your task dashboard when you join this Challenge. The sample Challenge tasks below will change color and gain graphs to show you the overall progress of the group.",
"hows": "How's Everyone Doing?",
"filter": "Filter",
"groups": "Groups",
@@ -33,7 +33,8 @@
"challengeTagPop": "Challenges appear on tag-lists & task-tooltips. So while ye'll want a descriptive title above, ye'll also need a 'short name'. Eg, 'Lose 10 pounds in 3 months' might become '-10lb' (Click fer more info).",
"challengeDescr": "Description",
"prize": "Treasure",
- "prizePop": "If someone can 'win' yer challenge, ye can optionally award that winner a Gem prize. Max = #gems ye own (+ alliance.gems, if ye created this challenge's alliance). Note: This prize can't be changed later an' will not be refunded if challenge is cancelled.",
+ "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.",
+ "prizePopTavern": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
"publicChallenges": "Minimum 1 Gem fer public challenges (helps prevent spam, it really does).",
"officialChallenge": "Official HabitRPG Challenge",
"by": "by",
@@ -43,6 +44,7 @@
"selectGroup": "Please select group",
"challengeCreated": "Challenge created",
"sureDelCha": "Delete challenge, arrr ye sure?",
+ "sureDelChaTavern": "Delete challenge, are you sure? Your gems will not be refunded.",
"removeTasks": "Remove Tasks",
"keepTasks": "Keep Tasks",
"closeCha": "Close challenge an'...",
diff --git a/common/locales/en@pirate/character.json b/common/locales/en@pirate/character.json
index 98967571f2..58ba1b45ab 100644
--- a/common/locales/en@pirate/character.json
+++ b/common/locales/en@pirate/character.json
@@ -52,9 +52,11 @@
"costume": "Costume",
"costumeText": "If ye prefer th' look 'o other gear to what ye have equipped, check th' \"Use Costume\" box to visually don a costume while wearin' ye battle gear underneath.",
"useCostume": "Use Costume",
- "gearAchievement": "Ye have earned th' \"Ultimate Gear\" Achievement fer upgradin' to th' maximum gear set!",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Ultimate Gear",
- "ultimGearText": "Has upgraded to th' maximum weapon 'n armor set",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Level",
"levelUp": "Level Up!",
"mana": "Mana",
diff --git a/common/locales/en@pirate/content.json b/common/locales/en@pirate/content.json
index c35cec7b6e..67ffdb2446 100644
--- a/common/locales/en@pirate/content.json
+++ b/common/locales/en@pirate/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Health Potion",
"potionNotes": "Recover 15 Health (Instant Use)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "Wolf",
"dropEggWolfAdjective": "loyal",
"dropEggTigerCubText": "Tiger Cub",
diff --git a/common/locales/en@pirate/front.json b/common/locales/en@pirate/front.json
index 0d5261a702..f3f8555a03 100644
--- a/common/locales/en@pirate/front.json
+++ b/common/locales/en@pirate/front.json
@@ -172,5 +172,11 @@
"username": "Username",
"watchVideos": "Watch Videos",
"work": "Work",
- "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!"
+ "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",
+ "reportAccountProblems": "Report Account Problems",
+ "reportCommunityIssues": "Report Community Issues",
+ "generalQuestionsSite": "General Questions about the Site",
+ "businessInquiries": "Business Inquiries",
+ "merchandiseInquiries": "Merchandise Inquiries",
+ "marketingInquiries": "Marketing/Social Media Inquiries"
}
\ No newline at end of file
diff --git a/common/locales/en@pirate/gear.json b/common/locales/en@pirate/gear.json
index b02bf63fe4..9d44107668 100644
--- a/common/locales/en@pirate/gear.json
+++ b/common/locales/en@pirate/gear.json
@@ -120,6 +120,8 @@
"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",
"weaponMystery201502Notes": "Fer WINGS! Fer LOVE! Fer ALSO TRUTH! Don't benefit ye. February 2015 Subscriberrr Item",
+ "weaponMystery201505Text": "Green Knight Lance",
+ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "Steampunk Cane",
"weaponMystery301404Notes": "Excellent fer struttin' about town. March 3015 Subscriberrr Item. Don't benefit ye.",
"armor": "armor",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "Who's a penguin? Confers no benefit. December 2014 Subscriber Item.",
"headMystery201501Text": "Starry Helm",
"headMystery201501Notes": "The constellations flicker and swirl in this helm, guiding the wearer's thoughts towards focus. Confers no benefit. January 2015 Subscriber Item.",
+ "headMystery201505Text": "Green Knight Helm",
+ "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 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",
diff --git a/common/locales/en@pirate/generic.json b/common/locales/en@pirate/generic.json
index a1558c0314..8d00cd3a51 100644
--- a/common/locales/en@pirate/generic.json
+++ b/common/locales/en@pirate/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitica",
"expandToolbar": "Expand Toolbar",
"collapseToolbar": "Collapse Toolbar",
- "formattingMarkdown": "Markdown formatting allowed",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*Italics*",
+ "bold": "**Bold**",
+ "strikethrough": "~~Strikethrough~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "Achievements",
"modalAchievement": "Achievement!",
"special": "Special",
diff --git a/common/locales/en@pirate/groups.json b/common/locales/en@pirate/groups.json
index e8b964cf58..371ac232d0 100644
--- a/common/locales/en@pirate/groups.json
+++ b/common/locales/en@pirate/groups.json
@@ -109,5 +109,12 @@
"inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
"byColon": "By:",
"inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "inviteAlertInfo2": "Or share this link (copy/paste):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/en@pirate/npc.json b/common/locales/en@pirate/npc.json
index 8e40771c8e..d4c7d8c408 100644
--- a/common/locales/en@pirate/npc.json
+++ b/common/locales/en@pirate/npc.json
@@ -2,8 +2,8 @@
"npc": "NPC",
"npcText": "Backed th' Kickstarter project at th' maximum level!",
"mattBoch": "Matt Boch",
- "mattShall": "Shall I bring ye yer steed, <%= name %>? Click a mount t' saddle up.",
- "mattBochText1": "Ahoy there! Welcome to the Stable! I be Matt, the beast master. Choose a pet here to venture at yer side. Feed them 'n they'll grow into powerful steeds.",
+ "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
+ "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
"daniel": "Daniel",
"danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
"danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
@@ -45,9 +45,9 @@
"tourScrollDown": "Be sure to scroll all the way down to see all the options! Click on your avatar again to return to the tasks page.",
"tourMuchMore": "When you're done with tasks, you can form a Party with friends, chat in the shared-interest Guilds, join Challenges, and more!",
"tourStatsPage": "This is your Stats page! Earn achievements by completing the listed tasks.",
- "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can freeze your account in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
+ "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
"tourPartyPage": "Yer crew will hold ye accountable. Invite mates aboard to uncover a Quest Scroll!",
"tourGuildsPage": "Guilds are social groups with common themes. Search for the subjects that interest you! We recommend the Newbies Guild.",
- "tourChallengesPage": "Joining a Challenge will add tasks to your account. Compete against other users to win gem prizes!",
+ "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
"tourMarketPage": "Starting at Level 4, eggs and hatching potions drop randomly when you complete tasks. They appear here - use them to hatch pets! You can also buy items from the Market."
}
\ No newline at end of file
diff --git a/common/locales/en@pirate/quests.json b/common/locales/en@pirate/quests.json
index a1432d38fa..0440dce2f2 100644
--- a/common/locales/en@pirate/quests.json
+++ b/common/locales/en@pirate/quests.json
@@ -19,7 +19,7 @@
"bossStrength": "Boss Strength",
"collect": "Collect",
"collected": "Collected",
- "bossDmg1": "To hurt a boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "Only participants will fight th' boss an' share in the adventure's loot.",
"tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossColl1": "To collect items, do ye positive tasks. Quest items drop just like normal items; however, ye won't spy wit' ye eye th' loot 'til th' next day, then everythin' ye've found gunna be tallied up 'n contributed to th' pile.",
diff --git a/common/locales/en@pirate/tasks.json b/common/locales/en@pirate/tasks.json
index 9f59acfa54..5035ec4041 100644
--- a/common/locales/en@pirate/tasks.json
+++ b/common/locales/en@pirate/tasks.json
@@ -14,7 +14,7 @@
"save": "Save",
"addChecklist": "Add Checklist",
"checklist": "Checklist",
- "checklistText": "Fer Dailies, partially completed checklists reduce damage. fer example, a 4-item checklist wit' 3 completed reduces damage fer that incomplete Daily to 25%. Completed checklist items on a To-Do add a multiplier: 3 checks means +3x (total 4x) th' Experience, Doubloons, 'n Mana.",
+ "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
"expandCollapse": "Expand/Collapse",
"text": "Text",
"extraNotes": "Extra Notes",
@@ -22,7 +22,7 @@
"advancedOptions": "Advanced Options",
"difficulty": "Difficulty",
"difficultyHelpTitle": "How difficult is this task?",
- "difficultyHelpContent": "'tis multiplies its point value. Use sparin'ly, rely instead on our organic value-adjustment algorithms. But some tasks be grossly more valuable (write ransom vs pick at teeth). Click fer more info.",
+ "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!",
"easy": "Easy",
"medium": "Medium",
"hard": "Harrrd",
diff --git a/common/locales/en_GB/backgrounds.json b/common/locales/en_GB/backgrounds.json
index 3d3255ded6..a8bea3f017 100644
--- a/common/locales/en_GB/backgrounds.json
+++ b/common/locales/en_GB/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "Mountain Lake",
"backgroundMountainLakeNotes": "Dip your toes in a Mountain Lake.",
"backgroundPagodasText": "Pagodas",
- "backgroundPagodasNotes": "Climb to the top of Pagodas."
+ "backgroundPagodasNotes": "Climb to the top of Pagodas.",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/en_GB/challenge.json b/common/locales/en_GB/challenge.json
index 2e6c9a6fe6..ff06771f31 100644
--- a/common/locales/en_GB/challenge.json
+++ b/common/locales/en_GB/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Select a winner and close the challenge:",
"deleteOrSelect": "Delete or select winner",
"endChallenge": "End Challenge",
- "challengeDiscription": "These are the challenge's tasks. As users participate, they will change colour and gain graphs to show you the overall progress of the group.",
+ "challengeDiscription": "These are the Challenge's tasks that will be added to your task dashboard when you join this Challenge. The sample Challenge tasks below will change color and gain graphs to show you the overall progress of the group.",
"hows": "How's Everyone Doing?",
"filter": "Filter",
"groups": "Groups",
@@ -33,7 +33,8 @@
"challengeTagPop": "Challenges appear on tag-lists & task-tooltips. So while you'll want a descriptive title above, you'll also need a 'short name'. Eg, 'Lose 10 pounds in 3 months' might become '-10lb' (Click for more info).",
"challengeDescr": "Description",
"prize": "Prize",
- "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = number of gems you own (and guild gems, if you created this challenge's guild). Note: This prize can't be changed later and will not be refunded if challenge is cancelled.",
+ "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.",
+ "prizePopTavern": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
"publicChallenges": "Minimum 1 Gem for public challenges (helps prevent spam, it really does).",
"officialChallenge": "Official HabitRPG Challenge",
"by": "by",
@@ -43,6 +44,7 @@
"selectGroup": "Please select group",
"challengeCreated": "Challenge created",
"sureDelCha": "Delete challenge, are you sure?",
+ "sureDelChaTavern": "Delete challenge, are you sure? Your gems will not be refunded.",
"removeTasks": "Remove Tasks",
"keepTasks": "Keep Tasks",
"closeCha": "Close challenge and...",
diff --git a/common/locales/en_GB/character.json b/common/locales/en_GB/character.json
index 802b6548ef..3ffb5e5176 100644
--- a/common/locales/en_GB/character.json
+++ b/common/locales/en_GB/character.json
@@ -52,9 +52,11 @@
"costume": "Costume",
"costumeText": "If you prefer the look of other gear to what you have equipped, check the \"Use Costume\" box to visually don a costume while wearing your battle gear underneath.",
"useCostume": "Use Costume",
- "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set!",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Ultimate Gear",
- "ultimGearText": "Has upgraded to the maximum weapon and armour set",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Level",
"levelUp": "Level Up!",
"mana": "Mana",
@@ -70,7 +72,7 @@
"allocatePerPop": "Add a point to Perception",
"allocateInt": "Points allocated to Intelligence:",
"allocateIntPop": "Add a point to Intelligence",
- "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue leveling up, or start a new adventure at level 1 by using the Orb of Rebirth, now available for free in the Market.",
+ "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue levelling up, or start a new adventure at level 1 by using the Orb of Rebirth, now available for free in the Market.",
"stats": "Stats",
"strength": "Strength",
"strengthText": "Strength increases the chance of random \"critical hits\" and the Gold, Experience, and drop chance boost from them. It also helps deal damage to boss monsters.",
diff --git a/common/locales/en_GB/content.json b/common/locales/en_GB/content.json
index f3e86a08ad..1462ae781a 100644
--- a/common/locales/en_GB/content.json
+++ b/common/locales/en_GB/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Health Potion",
"potionNotes": "Recover 15 Health (Instant Use)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "Wolf",
"dropEggWolfAdjective": "loyal",
"dropEggTigerCubText": "Tiger Cub",
diff --git a/common/locales/en_GB/front.json b/common/locales/en_GB/front.json
index b33b3b6133..6b13129362 100644
--- a/common/locales/en_GB/front.json
+++ b/common/locales/en_GB/front.json
@@ -67,7 +67,7 @@
"health": "Health",
"healthSample1": "Drink Water/Soda",
"healthSample2": "Chew Gum/Smoke",
- "healthSample3": "Take Stairs/Elevator",
+ "healthSample3": "Take Stairs/Lift",
"healthSample4": "Eat Healthy/Junk Food",
"healthSample5": "Break a Sweat for 1 hr",
"history": "History",
@@ -121,7 +121,7 @@
"mobileIOS": "iOS",
"motivate": "Motivate yourself and your team!",
"motivate1": "Motivate yourself to do anything.",
- "motivate2": "Get Organized. Get Motivated. Get Gold.",
+ "motivate2": "Get Organised. Get Motivated. Get Gold.",
"passConfirm": "Confirm Password",
"passMan": "In case you are using a password manager (like 1Password) and have problems logging in, try typing username and password manually.",
"password": "Password",
@@ -135,9 +135,9 @@
"punishByline": "Break bad habits and procrastination cycles with immediate consequences.",
"punishHeading1": "Miss a daily goal?",
"punishHeading2": "Lose health!",
- "questByline1": "Playing with your friends keeps you accountable for your tasks.",
+ "questByline1": "Playing with your mates keeps you accountable for your tasks.",
"questByline2": "Issue each other Challenges to complete a goal together!",
- "questHeading1": "Battle monsters with your friends!",
+ "questHeading1": "Battle monsters with your mates!",
"questHeading2": "If you slack off, they all get hurt!",
"register": "Register",
"rewardByline1": "Spend gold on virtual and real-life rewards.",
@@ -166,11 +166,17 @@
"testimonialHeading": "What people say...",
"tutorials": "Tutorials",
"unlockByline1": "Achieve your goals and level up.",
- "unlockByline2": "Unlock new motivational tools, such as pet collecting, random rewards, spell-casting, and more!",
+ "unlockByline2": "Unlock new motivational tools such as pet collecting, random rewards, spell-casting, and more!",
"unlockHeadline": "As you stay productive, you unlock new content!",
"useUUID": "Use UUID / API Token (For Facebook Users)",
"username": "Username",
"watchVideos": "Watch Videos",
"work": "Work",
- "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!"
+ "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",
+ "reportAccountProblems": "Report Account Problems",
+ "reportCommunityIssues": "Report Community Issues",
+ "generalQuestionsSite": "General Questions about the Site",
+ "businessInquiries": "Business Inquiries",
+ "merchandiseInquiries": "Merchandise Inquiries",
+ "marketingInquiries": "Marketing/Social Media Inquiries"
}
\ No newline at end of file
diff --git a/common/locales/en_GB/gear.json b/common/locales/en_GB/gear.json
index c1fc510cd1..11650fc01b 100644
--- a/common/locales/en_GB/gear.json
+++ b/common/locales/en_GB/gear.json
@@ -120,6 +120,8 @@
"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",
"weaponMystery201502Notes": "For WINGS! For LOVE! For ALSO TRUTH! Confers no benefit. February 2015 Subscriber Item.",
+ "weaponMystery201505Text": "Green Knight Lance",
+ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "Steampunk Cane",
"weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",
"armor": "armour",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "Who's a penguin? Confers no benefit. December 2014 Subscriber Item.",
"headMystery201501Text": "Starry Helm",
"headMystery201501Notes": "The constellations flicker and swirl in this helm, guiding the wearer's thoughts towards focus. Confers no benefit. January 2015 Subscriber Item.",
+ "headMystery201505Text": "Green Knight Helm",
+ "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 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",
diff --git a/common/locales/en_GB/generic.json b/common/locales/en_GB/generic.json
index cd9720b526..9c3e69c42e 100644
--- a/common/locales/en_GB/generic.json
+++ b/common/locales/en_GB/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitica",
"expandToolbar": "Expand Toolbar",
"collapseToolbar": "Collapse Toolbar",
- "formattingMarkdown": "Markdown formatting allowed",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*Italics*",
+ "bold": "**Bold**",
+ "strikethrough": "~~Strikethrough~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "Achievements",
"modalAchievement": "Achievement!",
"special": "Special",
diff --git a/common/locales/en_GB/groups.json b/common/locales/en_GB/groups.json
index f75f10fe51..438ee06e62 100644
--- a/common/locales/en_GB/groups.json
+++ b/common/locales/en_GB/groups.json
@@ -109,5 +109,12 @@
"inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
"byColon": "By:",
"inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "inviteAlertInfo2": "Or share this link (copy/paste):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/en_GB/npc.json b/common/locales/en_GB/npc.json
index 5872562e14..4762a5d938 100644
--- a/common/locales/en_GB/npc.json
+++ b/common/locales/en_GB/npc.json
@@ -2,8 +2,8 @@
"npc": "NPC",
"npcText": "Backed the Kickstarter project at the maximum level!",
"mattBoch": "Matt Boch",
- "mattShall": "Shall I bring you your steed, <%= name %>? Click a mount to saddle up.",
- "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to venture at your side. Feed them and they'll grow into powerful steeds.",
+ "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
+ "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
"daniel": "Daniel",
"danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest — vacation? illness? — I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
"danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
@@ -45,9 +45,9 @@
"tourScrollDown": "Be sure to scroll all the way down to see all the options! Click on your avatar again to return to the tasks page.",
"tourMuchMore": "When you're done with tasks, you can form a Party with friends, chat in the shared-interest Guilds, join Challenges, and more!",
"tourStatsPage": "This is your Stats page! Earn achievements by completing the listed tasks.",
- "tourTavernPage": "Welcome to the Tavern, an all-ages chat room! You can freeze your account in case of illness or travel by clicking \"Rest in the Inn\". Come say hi!",
+ "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
"tourPartyPage": "Your Party will help you stay accountable. Invite friends to unlock a Quest Scroll!",
"tourGuildsPage": "Guilds are social groups with common themes. Search for the subjects that interest you! We recommend the Newbies Guild.",
- "tourChallengesPage": "Joining a Challenge will add tasks to your account. Compete against other users to win gem prizes!",
+ "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
"tourMarketPage": "Starting at Level 4, eggs and hatching potions drop randomly when you complete tasks. They appear here—use them to hatch pets! You can also buy items from the Market."
}
\ No newline at end of file
diff --git a/common/locales/en_GB/quests.json b/common/locales/en_GB/quests.json
index 739ab8ea46..edaf703743 100644
--- a/common/locales/en_GB/quests.json
+++ b/common/locales/en_GB/quests.json
@@ -19,7 +19,7 @@
"bossStrength": "Boss Strength",
"collect": "Collect",
"collected": "Collected",
- "bossDmg1": "To hurt a boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "Only participants will fight the boss and share in the quest loot.",
"tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossColl1": "To collect items, do your positive tasks. Quest items drop just like normal items; however, you won't see the drops until the next day, then everything you've found will be tallied up and contributed to the pile.",
diff --git a/common/locales/en_GB/questscontent.json b/common/locales/en_GB/questscontent.json
index 8dfe067fc7..4b448340a5 100644
--- a/common/locales/en_GB/questscontent.json
+++ b/common/locales/en_GB/questscontent.json
@@ -198,7 +198,7 @@
"questSlimeDropSlimeEgg": "Marshmallow Slime (Egg)",
"questSlimeUnlockText": "Unlocks purchasable slime eggs in the Market",
"questSheepText": "The Thunder Ram",
- "questSheepNotes": "As you wander the rural Taskan countryside with friends, taking a \"quick break\" from your obligations, you find a cozy yarn shop. You are so absorbed in your procrastination that you hardly notice the ominous clouds creep over the horizon. \"I've got a ba-a-a-ad feeling about this weather,\" mutters @Misceo, and you look up. The stormy clouds are swirling together, and they look a lot like a... \"We don't have time for cloud-gazing!\" @starsystemic shouts. \"It's attacking!\" The Thunder Ram hurtles forward, slinging bolts of lightning right at you!",
+ "questSheepNotes": "As you wander the rural Taskan countryside with friends, taking a \"quick break\" from your obligations, you find a cosy yarn shop. You are so absorbed in your procrastination that you hardly notice the ominous clouds creep over the horizon. \"I've got a ba-a-a-ad feeling about this weather,\" mutters @Misceo, and you look up. The stormy clouds are swirling together, and they look a lot like a... \"We don't have time for cloud-gazing!\" @starsystemic shouts. \"It's attacking!\" The Thunder Ram hurtles forward, slinging bolts of lightning right at you!",
"questSheepBoss": "Thunder Ram",
"questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
"questSheepDropSheepEgg": "Sheep (Egg)",
diff --git a/common/locales/en_GB/settings.json b/common/locales/en_GB/settings.json
index d8c3c97d75..496f0bdab4 100644
--- a/common/locales/en_GB/settings.json
+++ b/common/locales/en_GB/settings.json
@@ -113,7 +113,7 @@
"benefits": "Benefits",
"coupon": "Coupon",
"couponPlaceholder": "Enter Coupon Code",
- "couponText": "We sometimes have events and give out promo codes for special gear. (eg, those who stop by our Wondercon booth)",
+ "couponText": "We sometimes have events and give out promo codes for special gear. (e.g., those who stop by our Wondercon booth)",
"apply": "Apply",
"resubscribe": "Resubscribe",
"promoCode": "Promo Code",
diff --git a/common/locales/en_GB/spells.json b/common/locales/en_GB/spells.json
index 651f05bcdb..4c65fa7096 100644
--- a/common/locales/en_GB/spells.json
+++ b/common/locales/en_GB/spells.json
@@ -4,31 +4,31 @@
"spellWizardMPHealText": "Ethereal Surge",
"spellWizardMPHealNotes": "You sacrifice mana to help your friends. The rest of your party gains MP! (Based on: INT)",
"spellWizardEarthText": "Earthquake",
- "spellWizardEarthNotes": "Your mental power shakes the earth. Your whole party gains a buff to Intelligence! (Based on: Unbuffed INT)",
+ "spellWizardEarthNotes": "Your mental power shakes the earth. Your whole party gains a boost to Intelligence! (Based on: Unboosted INT)",
"spellWizardFrostText": "Chilling Frost",
"spellWizardFrostNotes": "Ice covers your tasks. None of your streaks will reset to zero tomorrow! (One cast affects all streaks.)",
"spellWarriorSmashText": "Brutal Smash",
"spellWarriorSmashNotes": "You hit a task with all of your might. It gets more blue/less red, and you deal extra damage to Bosses! Click on a task to cast. (Based on: STR)",
"spellWarriorDefensiveStanceText": "Defensive Stance",
- "spellWarriorDefensiveStanceNotes": "You prepare yourself for the onslaught of your tasks. You gain a buff to Constitution! (Based on: Unbuffed CON)",
+ "spellWarriorDefensiveStanceNotes": "You prepare yourself for the onslaught of your tasks. You gain a boost to Constitution! (Based on: Unboosted CON)",
"spellWarriorValorousPresenceText": "Valorous Presence",
- "spellWarriorValorousPresenceNotes": "Your presence emboldens your party. Your whole party gains a buff to Strength! (Based on: Unbuffed STR)",
+ "spellWarriorValorousPresenceNotes": "Your presence emboldens your party. Your whole party gains a boost to Strength! (Based on: Unboosted STR)",
"spellWarriorIntimidateText": "Intimidating Gaze",
- "spellWarriorIntimidateNotes": "Your gaze strikes fear into your enemies. Your whole party gains a buff to Constitution! (Based on: Unbuffed CON)",
+ "spellWarriorIntimidateNotes": "Your gaze strikes fear into your enemies. Your whole party gains a boost to Constitution! (Based on: Unboosted CON)",
"spellRoguePickPocketText": "Pickpocket",
"spellRoguePickPocketNotes": "You rob a nearby task. You gain gold! Click on a task to cast. (Based on: PER)",
"spellRogueBackStabText": "Backstab",
"spellRogueBackStabNotes": "You betray a foolish task. You gain gold and XP! Click on a task to cast. (Based on: STR)",
"spellRogueToolsOfTradeText": "Tools of the Trade",
- "spellRogueToolsOfTradeNotes": "You share your talents with friends. Your whole party gains a buff to Perception! (Based on: Unbuffed PER)",
+ "spellRogueToolsOfTradeNotes": "You share your talents with friends. Your whole party gains a boost to Perception! (Based on: Unboosted PER)",
"spellRogueStealthText": "Stealth",
- "spellRogueStealthNotes": "You are too sneaky to spot. Some of your undone Dailies will not cause damage tonight, and their streaks/color will not change. (Cast multiple times to affect more Dailies)",
+ "spellRogueStealthNotes": "You are too sneaky to spot. Some of your undone Dailies will not cause damage tonight, and their streaks/colour will not change. (Cast multiple times to affect more Dailies)",
"spellHealerHealText": "Healing Light",
"spellHealerHealNotes": "Light covers your body, healing your wounds. You regain health! (Based on: CON and INT)",
"spellHealerBrightnessText": "Searing Brightness",
"spellHealerBrightnessNotes": "A burst of light dazzles your tasks. They become more blue and less red! (Based on: INT)",
"spellHealerProtectAuraText": "Protective Aura",
- "spellHealerProtectAuraNotes": "You shield your party from damage. Your whole party gains a buff to Constitution! (Based on: Unbuffed CON)",
+ "spellHealerProtectAuraNotes": "You shield your party from damage. Your whole party gains a boost to Constitution! (Based on: Unboosted CON)",
"spellHealerHealAllText": "Blessing",
"spellHealerHealAllNotes": "A soothing aura surrounds you. Your whole party regains health! (Based on: CON and INT)",
"spellSpecialSnowballAuraText": "Snowball",
diff --git a/common/locales/en_GB/tasks.json b/common/locales/en_GB/tasks.json
index 5bfcb4f042..515992d5d7 100644
--- a/common/locales/en_GB/tasks.json
+++ b/common/locales/en_GB/tasks.json
@@ -14,7 +14,7 @@
"save": "Save",
"addChecklist": "Add Checklist",
"checklist": "Checklist",
- "checklistText": "For Dailies, partially completed checklists reduce damage. For example, a 4-item checklist with 3 completed reduces damage for that incomplete Daily to 25%. Completed checklist items on a To-Do add a multiplier: 3 ticks means +3x (total 4x) the Experience, Gold, and Mana.",
+ "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
"expandCollapse": "Expand/Collapse",
"text": "Text",
"extraNotes": "Extra Notes",
@@ -22,7 +22,7 @@
"advancedOptions": "Advanced Options",
"difficulty": "Difficulty",
"difficultyHelpTitle": "How difficult is this task?",
- "difficultyHelpContent": "This multiplies its point value. Use sparingly, rely instead on our organic value-adjustment algorithms. But some tasks are grossly more valuable (Write Thesis vs Floss Teeth). Click for more info.",
+ "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!",
"easy": "Easy",
"medium": "Medium",
"hard": "Hard",
@@ -54,6 +54,7 @@
"newReward": "New Reward",
"newRewardBulk": "New Rewards (one per line)",
"price": "Price",
+ "search": "Search",
"tags": "Tags",
"editTags": "Edit",
"newTag": "New Tag",
@@ -79,4 +80,4 @@
"pushTaskToBottom": "Push task to bottom",
"emptyTask": "Enter the task's title first.",
"dailiesRestingInInn": "You're Resting in the Inn! Your Dailies will NOT hurt you tonight, but they WILL still refresh every day. If you're in a quest, you won't deal damage/collect items until you check out of the Inn, but you can still be injured by a Boss if your Party mates skip their own Dailies."
-}
\ No newline at end of file
+}
diff --git a/common/locales/es/backgrounds.json b/common/locales/es/backgrounds.json
index 23bac4913e..1e94f34af4 100644
--- a/common/locales/es/backgrounds.json
+++ b/common/locales/es/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "Mountain Lake",
"backgroundMountainLakeNotes": "Dip your toes in a Mountain Lake.",
"backgroundPagodasText": "Pagodas",
- "backgroundPagodasNotes": "Climb to the top of Pagodas."
+ "backgroundPagodasNotes": "Climb to the top of Pagodas.",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/es/challenge.json b/common/locales/es/challenge.json
index cf6776c53b..cd84d273cc 100644
--- a/common/locales/es/challenge.json
+++ b/common/locales/es/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Seleccionar un ganador y cerrar el desafío:",
"deleteOrSelect": "Borrar o seleccionar el ganador",
"endChallenge": "Terminar desafío",
- "challengeDiscription": "Estas son las tareas del desafío. A medida que los usuarios participen, las tareas cambiarán de color y aparecerán gráficos para mostrar el progreso del grupo.",
+ "challengeDiscription": "These are the Challenge's tasks that will be added to your task dashboard when you join this Challenge. The sample Challenge tasks below will change color and gain graphs to show you the overall progress of the group.",
"hows": "¿Qué tal vamos?",
"filter": "Filtro",
"groups": "Grupos",
@@ -33,7 +33,8 @@
"challengeTagPop": "Los Desafíos aparecen en la lista de etiquetas y en los consejos de tarea. Así que, aunque el título debería ser descriptivo, también se necesita una «abreviatura». Por ejemplo, «Perder 5 kilos en 3 meses» se puede convertir en «-5 kg» (pulsar en «?» proveerá más información).",
"challengeDescr": "Descripción",
"prize": "Premio",
- "prizePop": "Si alguien puede 'ganar' tu desafío, tienes la opción de premiar al ganador con una Gema. Máximo = #gemas que tienes (+ las gemas del gremio, si eres tú quien creó el gremio de este desafío). Nota: Este premio no se puede cambiar más tarde y no será devuelto si se cancela el desafío.",
+ "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.",
+ "prizePopTavern": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
"publicChallenges": "Mínimo 1 Gema para desafíos públicos (ayuda a prevenir el spam, de verdad que sí).",
"officialChallenge": "Desafío oficial de HabitRPG",
"by": "por",
@@ -43,6 +44,7 @@
"selectGroup": "Por favor seleccione un grupo",
"challengeCreated": "Desafío creado",
"sureDelCha": "Eliminar desafío, ¿estás seguro?",
+ "sureDelChaTavern": "Delete challenge, are you sure? Your gems will not be refunded.",
"removeTasks": "Eliminar Tareas",
"keepTasks": "Mantener Tareas",
"closeCha": "Cerrar desafío y...",
diff --git a/common/locales/es/character.json b/common/locales/es/character.json
index 5fdb27124e..a96fcfaf6a 100644
--- a/common/locales/es/character.json
+++ b/common/locales/es/character.json
@@ -52,9 +52,11 @@
"costume": "Disfraz",
"costumeText": "Si prefieres el aspecto de otro equipo al que estás usando, marca la casilla «Usar Disfraz» para llevarlo como disfraz mientras usas tu equipo de batalla debajo.",
"useCostume": "Llevar Disfraz ",
- "gearAchievement": "¡Has conseguido el logro «Equipo Definitivo» por llegar al máximo set de equipo!",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Equipo Definitivo",
- "ultimGearText": "Ha llegado al máximo set de armadura y arma",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Nivel",
"levelUp": "¡Subiste de Nivel!",
"mana": "Maná",
diff --git a/common/locales/es/content.json b/common/locales/es/content.json
index 4bddf4541a..02676b1ba1 100644
--- a/common/locales/es/content.json
+++ b/common/locales/es/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Pócima de Salud",
"potionNotes": "Recuperar 15 de Salud (uso instantáneo)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "Lobo",
"dropEggWolfAdjective": "leal",
"dropEggTigerCubText": "Cachorro de tigre",
diff --git a/common/locales/es/front.json b/common/locales/es/front.json
index 827072af57..9fabecdd61 100644
--- a/common/locales/es/front.json
+++ b/common/locales/es/front.json
@@ -5,7 +5,7 @@
"alexandraQuote": "No pude NO hablar sobre HabitRPG durante mi conferencia en Madrid. Es una herramienta imprescindible para freelancers que aun necesitan un jefe.",
"althaireQuote": "Estar siempre en una misión realmente me motiva a hacer todas mis tareas diarias y pendientes. Mi mayor motivación es no decepcionar a mi grupo.",
"andeeliaoQuote": "Awesome product, just started a few days ago and already more conscious and productive with my time!",
- "autumnesquirrelQuote": "I'm procrastinating less on work and housework and pay bills on time.",
+ "autumnesquirrelQuote": "Estoy postergando menos en el trabajo en las tareas domésticas y pago las cuentas a tiempo.",
"businessSample1": "Confirm 1 page of Inventory",
"businessSample2": "20 mins Filing",
"businessSample3": "Sort and Process Inbox",
@@ -41,8 +41,8 @@
"evagantzQuote": "My very first dentist appointment where the hygienist was actually excited about my flossing habits. Thanks Habitrpg!",
"examplesHeading": "Players use HabitRPG to manage...",
"featureAchievementByline": "Do something totally awesome? Get a badge and show it off!",
- "featureAchievementHeading": "Achievement Badges",
- "featureEquipByline": "Buy limited edition equipment, potions, and other virtual goodies in our Market with your task rewards!",
+ "featureAchievementHeading": "Insignias Logró",
+ "featureEquipByline": "¡Compre equipo de edición limitada, pociones, y otras golosinas virtuales en nuestro mercado con sus premios de tareas!",
"featureEquipHeading": "Equipamiento y extras",
"featurePetByline": "Eggs and items drop when you complete your tasks. Be as productive as possible to collect pets and mounts!",
"featurePetHeading": "Mascotas y Monturas",
@@ -172,5 +172,11 @@
"username": "Nombre de Usuario",
"watchVideos": "Ver Vídeos",
"work": "Trabajar",
- "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!"
+ "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",
+ "reportAccountProblems": "Report Account Problems",
+ "reportCommunityIssues": "Report Community Issues",
+ "generalQuestionsSite": "General Questions about the Site",
+ "businessInquiries": "Business Inquiries",
+ "merchandiseInquiries": "Merchandise Inquiries",
+ "marketingInquiries": "Marketing/Social Media Inquiries"
}
\ No newline at end of file
diff --git a/common/locales/es/gear.json b/common/locales/es/gear.json
index 652cf5535e..4d17082956 100644
--- a/common/locales/es/gear.json
+++ b/common/locales/es/gear.json
@@ -120,6 +120,8 @@
"weaponMystery201411Notes": "Clávasela a tus enemigos o ataca tus comidas favoritas - ¡esta horca versátil vale para todo! No confiere ningún beneficio. Artículo de suscriptor de noviembre 2014.",
"weaponMystery201502Text": "Báculo Reluciente Alado del Amor y También de la Verdad",
"weaponMystery201502Notes": "¡Por las ALAS! ¡Por el AMOR! ¡También por la VERDAD! No otorga ningún beneficio. Artículo de suscriptor de Febrero 2015.",
+ "weaponMystery201505Text": "Green Knight Lance",
+ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "Bastón Steampunk",
"weaponMystery301404Notes": "Excelente para darse una vuelta por la ciudad. Artículo del suscriptor de marzo 3015. No da beneficios.",
"armor": "armadura",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "¿Quién es un pingüino? No proporciona ningún beneficio. Artículo de suscriptor de diciembre 2014.",
"headMystery201501Text": "Casco Estrellado",
"headMystery201501Notes": "Parece como si las constelaciones parpadearan y giraran en este yelmo, guiando los pensamientos del que lo lleva hacia la concentración. No otorga ningún beneficio. Artículo de Suscriptor de Enero del 2015.",
+ "headMystery201505Text": "Green Knight Helm",
+ "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 2015 Subscriber Item.",
"headMystery301404Text": "Sombrero de copa sofisticado",
"headMystery301404Notes": "¡Un sofisticado sombrero de copa solo para los más refinados caballeros! No otorga ningún beneficio. Artículo de Suscriptor de Enero del 3015",
"headMystery301405Text": "Sombrero de copa básico",
diff --git a/common/locales/es/generic.json b/common/locales/es/generic.json
index f05d0f9a53..913020c6c8 100644
--- a/common/locales/es/generic.json
+++ b/common/locales/es/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitica",
"expandToolbar": "Abrir barra de herramientas",
"collapseToolbar": "Cerrar barra de herramientas",
- "formattingMarkdown": "Formato Markdown permitido",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*Italics*",
+ "bold": "**Bold**",
+ "strikethrough": "~~Strikethrough~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "Logros",
"modalAchievement": "¡Logro!",
"special": "Especial",
diff --git a/common/locales/es/groups.json b/common/locales/es/groups.json
index 06a105e23f..cb8a059e4e 100644
--- a/common/locales/es/groups.json
+++ b/common/locales/es/groups.json
@@ -109,5 +109,12 @@
"inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
"byColon": "By:",
"inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "inviteAlertInfo2": "Or share this link (copy/paste):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/es/npc.json b/common/locales/es/npc.json
index c3451fa4d4..62982ad3f7 100644
--- a/common/locales/es/npc.json
+++ b/common/locales/es/npc.json
@@ -2,8 +2,8 @@
"npc": "PNJ",
"npcText": "¡Apoyó el proyecto de Kickstarter al nivel máximo!",
"mattBoch": "Matt Boch",
- "mattShall": "¿Te traigo tu corcel, <%= name %>? Clic en una montura para ensillar.",
- "mattBochText1": "¡Bienvenidos al Establo! Soy Matt, el maestro de las bestias. Escoge un mascota aquí para que viaje a tu lado. Aliméntalas y se convertirán en poderosas monturas.",
+ "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
+ "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
"daniel": "Daniel",
"danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
"danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
@@ -45,9 +45,9 @@
"tourScrollDown": "¡Estate seguro de que te has desplazado hasta abajo del todo para ver todas las opciones! Da click en tu personaje otra vez para volver a la página de Tareas.",
"tourMuchMore": "¡Cuando hayas acabado con tus tareas, puedes formar un grupo con tus amigos, chatear en los Gremios de tu interés, unirte a los Desafíos, y mucho más!",
"tourStatsPage": "¡Está es tu página de Estadísticas! Consigue logros completando las tareas de las listas.",
- "tourTavernPage": "Bienvenido a la Taberna, ¡una sala de chat para todas las edades! Puedes congelar tu cuenta en caso de enfermedad o de viaje dando click a \"Descansar en la Posada\". ¡Ven a decir hola!",
+ "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
"tourPartyPage": "Tu Grupo te ayudará a mantenerte responsable. Invita a amigos para desbloquear un Pergamino de Misión.",
"tourGuildsPage": "Los Gremios son grupos sociales con temas en común. ¡Busca los temas que te interesan! Te recomendamos el Gremio de los Principiantes. ",
- "tourChallengesPage": "Unirte a un Desafío añadirá tareas a tu cuenta. ¡Compite contra otros usuarios para ganar gemas de recompensa!",
+ "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
"tourMarketPage": "Desde el nivel 4, los huevos y pociones eclosionadoras caen de manera aleatoria cuando completas tareas. Aparecen aquí - ¡úsalas para eclosionar mascotas! También puedes comprar objetos del Mercado."
}
\ No newline at end of file
diff --git a/common/locales/es/quests.json b/common/locales/es/quests.json
index 6cf94176b2..1e99495573 100644
--- a/common/locales/es/quests.json
+++ b/common/locales/es/quests.json
@@ -19,7 +19,7 @@
"bossStrength": "Fuerza del Jefe",
"collect": "Recoger",
"collected": "Recogido",
- "bossDmg1": "Para dañar a un jefe, completa tus tareas Diarias y tareas Pendientes. Un mayor daño en una tarea significa un mayor daño al jefe (completar tareas rojas, hechizos de Mago, ataques de Guerrero, etc.) El jefe va a ejercer daño a todos los participantes de la misión por cada tarea Diaria que no hayas completado (multiplicado por la Fuerza del jefe) además de su daño normal, así que ¡mantén tu grupo sano completando tus tareas Diarias!\nTodo el daño de y para el jefe se anota a un cronómetro (cuando reinicie tu día).",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "Solo los participantes pelearan contra el jefe y compartiran el botín de la misión.",
"tavernBossInfo": "Para dañar a un jefe de mundo, completa tus tareas Diarias y tareas Pendientes. Un mayor daño en una tarea significa un mayor daño al jefe (completar tareas rojas, hechizos de Mago, ataques de Guerrero, etc.) Por cada tarea Diaria que no hayas completado (multiplicado por la Fuerza del jefe), la Ira del jefe aumentará. Una vez su Ira alcance el máximo, algo malo va a pasar - ¡así que completa tus tareas Diarias! Todo el daño de y para el jefe se anota a un cronómetro (cuando reinicie tu día).",
"bossColl1": "Para conseguir objetos de misión, haz tus tareas. Los objetos de misión aparecen como los demás; sin embargo, no los verás hasta el día siguiente, en ese momento todo lo que hayais encontrado se pondrá en común.",
diff --git a/common/locales/es/tasks.json b/common/locales/es/tasks.json
index a6b36fd467..e9d362b767 100644
--- a/common/locales/es/tasks.json
+++ b/common/locales/es/tasks.json
@@ -14,7 +14,7 @@
"save": "Guardar",
"addChecklist": "Aňadir Lista",
"checklist": "Lista",
- "checklistText": "En las tareas Diarias, las listas completadas parcialmente reducen el daño. Por ejemplo, una lista de 4 partes con 3 completadas reduce el daño por esa tarea incompleta al 25%. Los elementos completados en la lista de una tarea Pendiente añaden un multiplicador: 3 hechos significan +3x (de un total de +4x) la experiencia, oro y mana.",
+ "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
"expandCollapse": "Expandir/Colapsar",
"text": "Texto",
"extraNotes": "Notas Extra",
@@ -22,7 +22,7 @@
"advancedOptions": "Opciones Avanzadas",
"difficulty": "Dificultad",
"difficultyHelpTitle": "¿Qué dificultad tiene esta tarea?",
- "difficultyHelpContent": "Esto multiplica su valor de puntos. No usar a menudo, confía en nuestro algoritmo de ajuste orgánico. Aún así, algunas tareas son mucho más valiosas que otras (Escribir Tesis vs Lavarse los dientes). Haz click para más información.",
+ "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!",
"easy": "Fácil",
"medium": "Intermedio",
"hard": "Difícil",
diff --git a/common/locales/es_419/backgrounds.json b/common/locales/es_419/backgrounds.json
index 2f105736db..919c6e039d 100644
--- a/common/locales/es_419/backgrounds.json
+++ b/common/locales/es_419/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "Mountain Lake",
"backgroundMountainLakeNotes": "Dip your toes in a Mountain Lake.",
"backgroundPagodasText": "Pagodas",
- "backgroundPagodasNotes": "Climb to the top of Pagodas."
+ "backgroundPagodasNotes": "Climb to the top of Pagodas.",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/es_419/challenge.json b/common/locales/es_419/challenge.json
index 0e29f24145..3acae60e0d 100644
--- a/common/locales/es_419/challenge.json
+++ b/common/locales/es_419/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Seleccionar un ganador y cerrar el desafío:",
"deleteOrSelect": "Borrar o seleccionar el ganador",
"endChallenge": "Terminar desafío",
- "challengeDiscription": "Estas son las tareas del desafío. A medida que los usuarios participen, las tareas cambiarán de color y aparecerán gráficos para mostrar el progreso del grupo.",
+ "challengeDiscription": "These are the Challenge's tasks that will be added to your task dashboard when you join this Challenge. The sample Challenge tasks below will change color and gain graphs to show you the overall progress of the group.",
"hows": "¿Qué tal vamos?",
"filter": "Filtro",
"groups": "Grupos",
@@ -33,7 +33,8 @@
"challengeTagPop": "Los Desafíos aparecen en la lista de etiquetas y en las herramientas de tarea. Así que, aunque el título debería ser descriptivo, también se necesita una 'abreviatura'. P ej, 'Perder 5 kilos en 3 meses' se puede convertir en '-5 kg' (Haz clic para más información).",
"challengeDescr": "Descripción",
"prize": "Premio",
- "prizePop": "Si alguien puede 'ganar' tu desafío, tienes la opción de premiar al ganador con una Gema. Máximo = #gemas que tienes (+las gemas del gremio, si eres tú quien creó el gremio de este desafío). Nota: Este premio no se puede cambiar más tarde y no será devuelto si se cancela el desafío.",
+ "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.",
+ "prizePopTavern": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
"publicChallenges": "Mínimo 1 Gema para desafíos públicos (ayuda a prevenir el spam, de verdad que sí).",
"officialChallenge": "Desafío oficial de HabitRPG",
"by": "por",
@@ -43,6 +44,7 @@
"selectGroup": "Por favor seleccione un grupo",
"challengeCreated": "Desafío creado",
"sureDelCha": "Eliminar desafío, ¿estás seguro?",
+ "sureDelChaTavern": "Delete challenge, are you sure? Your gems will not be refunded.",
"removeTasks": "Eliminar Tareas",
"keepTasks": "Mantener Tareas",
"closeCha": "Cerrar desafío y...",
diff --git a/common/locales/es_419/character.json b/common/locales/es_419/character.json
index 8feaf05c96..eb876ba53b 100644
--- a/common/locales/es_419/character.json
+++ b/common/locales/es_419/character.json
@@ -52,9 +52,11 @@
"costume": "Disfraz",
"costumeText": "Si prefieres el aspecto de otro equipo al que estás usando, marca la casilla \"Usar Disfraz\" para llevarlo como disfraz mientras usas tu equipo de batalla por debajo.",
"useCostume": "Llevar disfraz ",
- "gearAchievement": "¡Has conseguido el logro \"Equipo definitivo\" por llegar al máximo conjunto de equipo!",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Equipo definitivo",
- "ultimGearText": "Ha llegado al máximo conjunto de arma y armadura",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Nivel",
"levelUp": "¡Subiste de nivel!",
"mana": "Maná",
@@ -70,7 +72,7 @@
"allocatePerPop": "Añadir un punto a Percepción",
"allocateInt": "Puntos asignados a Inteligencia:",
"allocateIntPop": "Añadir un punto a Inteligencia",
- "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue leveling up, or start a new adventure at level 1 by using the Orb of Rebirth, now available for free in the Market.",
+ "noMoreAllocate": "Ahora que has alcanzado el nivel 100, ya no ganarás más Puntos de Atributo. Puedes seguir subiendo de nivel, o empezar una nueva aventura en el nivel 1 utilizando la Esfera de Renacimiento, que ahora se encuentra disponible gratuitamente en el Mercado.",
"stats": "Estadísticas",
"strength": "Fuerza",
"strengthText": "La Fuerza aumenta la probabilidad de conseguir \"golpes críticos\" aleatorios y el Oro, la Experiencia y la probabilidad de conseguir botín al asestarlos. También ayuda a hacer daño a los monstruos jefe.",
@@ -140,5 +142,5 @@
"unequipBattleGear": "Quitar equipo de batalla",
"unequipCostume": "Quitar disfraz",
"unequipPetMountBackground": "Quitar Mascota, Montura y Fondo",
- "animalSkins": "Animal Skins"
+ "animalSkins": "Pieles de animales"
}
\ No newline at end of file
diff --git a/common/locales/es_419/content.json b/common/locales/es_419/content.json
index ee69a21d34..4ce3b68992 100644
--- a/common/locales/es_419/content.json
+++ b/common/locales/es_419/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Poción curativa",
"potionNotes": "Recuperar 15 de Salud (Uso instantáneo)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "Lobo",
"dropEggWolfAdjective": "leal",
"dropEggTigerCubText": "Cachorro de tigre",
@@ -56,8 +60,8 @@
"questEggBunnyAdjective": "zalamero",
"questEggSlimeText": "Marshmallow Slime",
"questEggSlimeAdjective": "dulce",
- "questEggSheepText": "Sheep",
- "questEggSheepAdjective": "woolly",
+ "questEggSheepText": "Oveja",
+ "questEggSheepAdjective": "lanuda",
"eggNotes": "Encuentra una poción de eclosión para verter sobre este huevo y nacerá un <%= eggText(locale) %> <%= eggAdjective(locale) %>.",
"hatchingPotionBase": "Básico",
"hatchingPotionWhite": "Blanco",
diff --git a/common/locales/es_419/front.json b/common/locales/es_419/front.json
index 0c2900ebf6..3a4c4190cf 100644
--- a/common/locales/es_419/front.json
+++ b/common/locales/es_419/front.json
@@ -17,7 +17,7 @@
"choreSample3": "Wash a Load of Dishes",
"choreSample4": "Tidy One Room",
"choreSample5": "Wash and Dry a Load of Clothes",
- "chores": "Chores",
+ "chores": "Quehaceres",
"communityBug": "Enviar un informe de error",
"communityExtensions": "Complementos y Extensiones",
"communityFacebook": "Facebook",
@@ -34,47 +34,47 @@
"companyVideos": "Videos",
"contribUse": "HabitRPG contributors use",
"dragonsilverQuote": "No sabría decir cuántos sistemas de gestión de tiempo y tareas he probado a través de las décadas... HabitRPG es el único que realmente me ha ayudado a hacer las cosas en vez de solo enlistarlas.",
- "dreimQuote": "When I discovered HabitRPG last summer, I had just failed about half of my exams. Thanks to the Dailies… I was able to organize and discipline myself, and I actually passed all my exams with really good grades a month ago.",
- "elmiQuote": "¡Cada mañana ansió levantarme para ganar oro!",
+ "dreimQuote": "Cuando descubír HabitRPG el verano pasado acababa de reprobar la mitad de mis exámenes. Gracias a las Diarias pude organizarme y autodisciplinarme, ¡y el mes pasado aprobé todos mis exámenes con buenas calificaciones!",
+ "elmiQuote": "¡Cada mañana ansío levantarme para ganar oro!",
"email": "Email",
"emailNewPass": "Enviar nueva contraseña ",
"evagantzQuote": "My very first dentist appointment where the hygienist was actually excited about my flossing habits. Thanks Habitrpg!",
"examplesHeading": "Players use HabitRPG to manage...",
- "featureAchievementByline": "¿Acabas de hacer algo totalmente increible? Consigue una medalla y presumela",
+ "featureAchievementByline": "¿Acabas de hacer algo totalmente increíble? ¡Consigue una medalla y presúmela!",
"featureAchievementHeading": "Medallas de Logros",
- "featureEquipByline": "Buy limited edition equipment, potions, and other virtual goodies in our Market with your task rewards!",
- "featureEquipHeading": "Equipment and extras",
+ "featureEquipByline": "¡Compra equipamiento de edición limitada, pociones y otros bienes virtuales en nuestro Mercado con las recompensas que ganes por tus tareas!",
+ "featureEquipHeading": "Equipamiento y extras",
"featurePetByline": "Eggs and items drop when you complete your tasks. Be as productive as possible to collect pets and mounts!",
"featurePetHeading": "Mascotas y Monturas",
- "featureSocialByline": "Join common-interest groups with like-minded people. Create Challenges to compete against other users.",
+ "featureSocialByline": "Únete a grupos que comparten tus mismos intereses y piensan igual que tú. Crea Retos para competir con otros usuarios.",
"featureSocialHeading": "Social play",
- "featuredIn": "Featured in",
+ "featuredIn": "Como lo viste en",
"featuresHeading": "We also feature...",
"footerCommunity": "Comunidad",
"footerCompany": "Compañía",
"footerMobile": "Móvil",
"footerSocial": "Social",
"forgotPass": "Olvidé mi contraseña",
- "frabjabulousQuote": "HabitRPG is the reason I got a killer, high-paying job... and even more miraculous, I'm now a daily flosser!",
+ "frabjabulousQuote": "HabitRPG es la razón por la que conseguí un excelente y bien remunerado empleo... y aún más milagroso, ¡utilizo hilo dental diariamente!",
"free": "Juega gratis",
"gamifyButton": "Gamify your life today!",
"goalSample1": "Practicar Piano por 1 hora",
"goalSample2": "Work on article for publication",
- "goalSample3": "Work on blog post",
- "goalSample4": "Japanese lesson on Duolingo",
- "goalSample5": "Read an Informative Article",
- "goals": "Goals",
- "health": "Health",
- "healthSample1": "Tomar agua/Bebida",
+ "goalSample3": "Trabajar en una entrada para el blog",
+ "goalSample4": "Lección de japonés en duolingo",
+ "goalSample5": "Leer un artículo informativo",
+ "goals": "Metas",
+ "health": "Salud",
+ "healthSample1": "Tomar agua/soda",
"healthSample2": "Mascar chicle/Fumar",
"healthSample3": "Usar las escaleras/elevador",
- "healthSample4": "Comer comida saludable/Chatarra",
+ "healthSample4": "Comer comida saludable/chatarra",
"healthSample5": "Break a Sweat for 1 hr",
"history": "Historia",
"infhQuote": "HabitRPG has really helped me impart structure to my life in graduate school.",
"invalidEmail": "Se requiere una dirección válida de correo electrónico para poder restablecer una contraseña.",
"irishfeet123Quote": "I've had horrible habits with clearing my place completely after meals and leaving cups all over the place. HabitRPG has cured that!",
- "joinOthers": "Join 200,000 people making it fun to achieve goals!",
+ "joinOthers": "¡Únete a 200,000 personas que se divierten mientras cumplen sus metas!",
"kazuiQuote": "Before HabitRPG, 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": "paquetes administrativos",
"landingend": "¿Todavía no estás convencido? ",
@@ -89,7 +89,7 @@
"landingp3header": "Consecuencias",
"landingp4": "Con una comunidad activa, HabitRPG proporciona la responsabilidad que necesitas para mantenerte enfocado en el trabajo. Con el sistema de equipos, puedes traer a un grupo de amigos para que te animen. El sistema de gremios te permite encontrar a gente con intereses o obstáculos similares a los tuyos, así podrás compartir tus objetivos e intercambiar consejos sobre como enfrentar tus problemas. En HabitRPG, la comunidad significa que tienes el apoyo y la responsabilidad que necesitas para tener éxito.",
"landingp4header": "Responsabilidad",
- "leadText": "HabitRPG is a free habit building and productivity app that treats your real life like a game. With in-game rewards and punishments to motivate you and a strong social network to inspire you, HabitRPG can help you achieve your goals to become healthy, hard-working, and happy.",
+ "leadText": "HabitRPG es una app gratuita para establecer hábitos y mejorar tu productividad que hace que tu vida sea como un juego. Con recompensas y castigos para mantenerte motivado, y con una fuerte comunidad detrás para inspirarte, HabitRPG te ayuda a alcanzar tus metas para convertirte en alguien sano, productivo y feliz.",
"login": "Entrar",
"loginAndReg": "Entrar / Crear cuenta",
"loginFacebookAlt": "Entrar / Regístrate con Facebook",
@@ -119,9 +119,9 @@
"marketing4Lead3Title": "Jueguifica todo",
"mobileAndroid": "Android",
"mobileIOS": "iOS",
- "motivate": "Motivate yourself and your team!",
- "motivate1": "Motivate a hacer cualquier cosa.",
- "motivate2": "Consigue Organizarte. Consigue Motivarte. Consigue Oro.",
+ "motivate": "¡Motívate a ti mismo y a tu equipo!",
+ "motivate1": "Motívate a hacer cualquier cosa.",
+ "motivate2": "Consigue organizarte. Consigue motivarte. Consigue oro.",
"passConfirm": "Confirmar contraseña",
"passMan": "Si estás utilizando un gestor de contraseñas (como 1Password) y tienes problemas iniciando tu sesión, intenta escribir tu nombre de usuario y contraseña manualmente.",
"password": "Contraseña",
@@ -133,8 +133,8 @@
"privacy": "Política de privacidad",
"psst": "Chss",
"punishByline": "Break bad habits and procrastination cycles with immediate consequences.",
- "punishHeading1": "Miss a daily goal?",
- "punishHeading2": "Lose health!",
+ "punishHeading1": "¿No cumpliste alguna meta diaria?",
+ "punishHeading2": "¡Pierde salud!",
"questByline1": "Playing with your friends keeps you accountable for your tasks.",
"questByline2": "Issue each other Challenges to complete a goal together!",
"questHeading1": "Battle monsters with your friends!",
@@ -161,16 +161,22 @@
"teamSample1": "Outline Meeting Itinerary for Tuesday",
"teamSample2": "Brainstorm Growth Hacking",
"teamSample3": "Discuss this week’s KPIs",
- "teams": "Teams",
+ "teams": "Equipos",
"terms": "Términos y condiciones",
- "testimonialHeading": "What people say...",
+ "testimonialHeading": "Qué opina la gente...",
"tutorials": "Tutoriales",
- "unlockByline1": "Achieve your goals and level up.",
+ "unlockByline1": "Cumple tus metas y sube de nivel.",
"unlockByline2": "Unlock new motivational tools, such as pet collecting, random rewards, spell-casting, and more!",
"unlockHeadline": "As you stay productive, you unlock new content!",
"useUUID": "Utilizar UUID / Ficha API (Para Usuarios de Facebook)",
"username": "Nombre de Usuario",
"watchVideos": "Mirar videos",
- "work": "Work",
- "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!"
+ "work": "Trabajo",
+ "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",
+ "reportAccountProblems": "Report Account Problems",
+ "reportCommunityIssues": "Report Community Issues",
+ "generalQuestionsSite": "General Questions about the Site",
+ "businessInquiries": "Business Inquiries",
+ "merchandiseInquiries": "Merchandise Inquiries",
+ "marketingInquiries": "Marketing/Social Media Inquiries"
}
\ No newline at end of file
diff --git a/common/locales/es_419/gear.json b/common/locales/es_419/gear.json
index 926a6dd625..3991b130e0 100644
--- a/common/locales/es_419/gear.json
+++ b/common/locales/es_419/gear.json
@@ -120,6 +120,8 @@
"weaponMystery201411Notes": "Apuñalar a tus enemigos o tu comida favorita - ¡esta horca versátil lo hace todo! No otorga ningún beneficio. Articulo de suscriptor de noviembre 2014.",
"weaponMystery201502Text": "Reluciente báculo alado del Amor y también de la Verdad.",
"weaponMystery201502Notes": "¡Por las ALAS! ¡Por el AMOR! ¡También por la VERDAD! No confiere ningún beneficio. Artículo de subscriptor de Febrero del 2015.",
+ "weaponMystery201505Text": "Green Knight Lance",
+ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "Bastón steampunk",
"weaponMystery301404Notes": "Excelente para dar una vuelta por el pueblo. Artículo de suscriptor de marzo 3015. No otorga ningún beneficio.",
"armor": "armadura",
@@ -219,10 +221,10 @@
"armorSpecialWinter2015HealerNotes": "Patinar sobre hielo es muy relajante, pero no deberías intentarlo sin este equipo protector por si te atacan las bestias de hielo. Incrementa la Constitución por <%= con %>. Equipamiento de edición limitada de invierno 2014-2015.",
"armorSpecialSpring2015RogueText": "Túnica desafinada",
"armorSpecialSpring2015RogueNotes": "Peludo, suave, e indudablemente no inflamable. Aumenta la Percepción por <%= per %>. Equipamiento de edición limitada de primavera 2015.",
- "armorSpecialSpring2015WarriorText": "Armadura Cauta",
- "armorSpecialSpring2015WarriorNotes": "Solo a los perritos mas fieros se les permite ser tan mulliditos. Aumenta la constitución por <%= con %>. Equipamiento de edición limitada de primavera 2015.",
- "armorSpecialSpring2015MageText": "Traje de Conejito para Magos.",
- "armorSpecialSpring2015MageNotes": "¡Tu faldón combina con tu rabo de algodón! Aumenta la Inteligencia por <%= int %>. Equipamiento de edición limitada de primavera 2015.",
+ "armorSpecialSpring2015WarriorText": "Armadura Cautelosa",
+ "armorSpecialSpring2015WarriorNotes": "Solo a los perritos más fieros se les permite ser tan mulliditos. Aumenta la Constitución por <%= con %>. Equipamiento de edición limitada de primavera 2015.",
+ "armorSpecialSpring2015MageText": "Traje de conejito para magos.",
+ "armorSpecialSpring2015MageNotes": "¡Tu faldón combina con tu rabito de algodón! Aumenta la Inteligencia por <%= int %>. Equipamiento de edición limitada de primavera 2015.",
"armorSpecialSpring2015HealerText": "Traje de gato reconfortante.",
"armorSpecialSpring2015HealerNotes": "Este suave traje de gato es cómodo, y tan reconfortante como el té de menta. Aumenta la Constitución por <%= con %>. Equipamiento de edición limitada de primavera 2015.",
"armorMystery201402Text": "Túnica de mensajero",
@@ -246,9 +248,9 @@
"armorMystery201501Text": "Armadura estrellada",
"armorMystery201501Notes": "Las galaxias brillan en el metal de esta armadura, fortaleciendo la determinación del usuario. No otorga ningún beneficio. Artículo de suscriptor de enero 2015 .",
"armorMystery201503Text": "Armadura de aguamarina",
- "armorMystery201503Notes": "Este mineral azul simboliza la buena suerte, felicidad, y productividad eterna. No otorga ningún beneficio. Artículo de subscriptor de Marzo 2015.",
- "armorMystery201504Text": "Túnica de Abeja Trabajadora",
- "armorMystery201504Notes": "¡Vas a ser tan productivo como una abeja trabajadora en esta atractiva túnica! No otorga ningun beneficio. Articulo de suscriptor Abril 2015",
+ "armorMystery201503Notes": "Este mineral azul simboliza la buena suerte, felicidad, y productividad eternas. No otorga ningún beneficio. Artículo de subscriptor de Marzo 2015.",
+ "armorMystery201504Text": "Túnica de abeja trabajadora",
+ "armorMystery201504Notes": "¡Vas a ser tan productivo como una abeja trabajadora con esta atractiva túnica! No otorga ningún beneficio. Artículo de suscriptor de Abril 2015.",
"armorMystery301404Text": "Traje steampunk",
"armorMystery301404Notes": "¡Sofisticado y elegante, oh no! No otorga ningún beneficio. Artículo de suscriptor de febrero 3015.",
"headgear": "protector de cabeza",
@@ -345,11 +347,11 @@
"headSpecialWinter2015HealerText": "Orejeras cómodas",
"headSpecialWinter2015HealerNotes": "Estas orejeras calientitas no dejan pasar ni al frío ni a los ruidos que distraen. Incrementan la Inteligencia por <%= int %>. Equipamiento de edición limitada de invierno 2014-2015.",
"headSpecialSpring2015RogueText": "Yelmo a prueba de fuego",
- "headSpecialSpring2015RogueNotes": "¿Fuego? ¡HAH! ¡Te deslizas ferozmente en la cara del fuego! Aumenta la percepción por <%= per %>. Equipamiento de edición limitada de primavera 2015.",
- "headSpecialSpring2015WarriorText": "Yelmo Cauto",
+ "headSpecialSpring2015RogueNotes": "¿Fuego? ¡HAH! ¡Te deslizas ferozmente en su cara! Aumenta la Percepción por <%= per %>. Equipamiento de edición limitada de primavera 2015.",
+ "headSpecialSpring2015WarriorText": "Yelmo Cauteloso",
"headSpecialSpring2015WarriorNotes": "¡Cuidado con el yelmo! Solo un perrito feroz podría llevarlo. No te rías. Aumenta la fuerza por <%= str %>. Equipamiento de edición limitada de primavera 2015.",
- "headSpecialSpring2015MageText": "Sombrero de Escenario para Magos",
- "headSpecialSpring2015MageNotes": "Qué fue primero, ¿El conejito o el sombrero? Aumenta la Percepción por <%= per %>. Equipamiento de edición limitada de primavera 2015.",
+ "headSpecialSpring2015MageText": "Sombrero de escenario para magos",
+ "headSpecialSpring2015MageNotes": "¿Qué fue primero? ¿El conejito o el sombrero? Aumenta la Percepción por <%= per %>. Equipamiento de edición limitada de primavera 2015.",
"headSpecialSpring2015HealerText": "Corona reconfortante",
"headSpecialSpring2015HealerNotes": "La perla en el centro de esta corona calma y reconforta a aquellos que la rodean. Aumenta la Inteligencia por <%= int %>. Equipamiento de edición limitada de primavera 2015.",
"headSpecialGaymerxText": "Yelmo de guerrero arco iris",
@@ -368,8 +370,10 @@
"headMystery201411Notes": "Este es el casco tradicional usado en el adorado deporte Habiticano Balanbol, el cual consiste en cubrirse con un gran equipamiento protector y luego comprometerse a mantener un equilibrio sano entre la vida y el trabajo... MIENTRAS TE PERSIGUEN HIPOGRIFOS. No otorga ningún beneficio. Artículo de suscriptor de noviembre 2014.",
"headMystery201412Text": "Gorro de pingüino",
"headMystery201412Notes": "¿Quien es un pingüino? No otorga ningún beneficio. Artículo de suscriptor de diciembre 2014.",
- "headMystery201501Text": "Yelmo Estrellado",
+ "headMystery201501Text": "Yelmo estrellado",
"headMystery201501Notes": "Las constelaciones parpadean y se arremolinan en este yelmo, enfocando los pensamientos del usuario. No otorga ningún beneficio. Artículo de suscriptor de enero 2015.",
+ "headMystery201505Text": "Green Knight Helm",
+ "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 2015 Subscriber Item.",
"headMystery301404Text": "Galera elegante",
"headMystery301404Notes": "¡Una galera elegante para los señores más sofisticados! Artículo de Suscriptor de Enero de 3015. No confiere ningún beneficio.",
"headMystery301405Text": "Galera básica",
@@ -432,11 +436,11 @@
"shieldSpecialWinter2015HealerText": "Escudo relajante",
"shieldSpecialWinter2015HealerNotes": "Este escudo desvía el viento helado. Incrementa la Constitución por <%= con %>. Equipamiento de edición limitada de invierno 2014-2015.",
"shieldSpecialSpring2015RogueText": "Chirrido explosivo",
- "shieldSpecialSpring2015RogueNotes": "No dejes que el sonido te engañe - estos explosivos pegan muy fuerte. Incrementa la fuerza por <%= str %>. Equipamiento de edición limitada de primavera 2015.",
- "shieldSpecialSpring2015WarriorText": "Plato Disco",
- "shieldSpecialSpring2015WarriorNotes": "Arrójalo a tus enemigos... o simplemente sostenlo, porque se llenará de deliciosas croquetas a la hora de comer. Aumenta la constitución por <%= con %>. Equipamiento de edición limitada de primavera 2015.",
+ "shieldSpecialSpring2015RogueNotes": "No dejes que el sonido te engañe - estos explosivos pegan muy fuerte. Incrementa la Fuerza por <%= str %>. Equipamiento de edición limitada de primavera 2015.",
+ "shieldSpecialSpring2015WarriorText": "Plato disco",
+ "shieldSpecialSpring2015WarriorNotes": "Arrójalo a tus enemigos... o simplemente sostenlo, porque se llenará de deliciosas croquetas a la hora de comer. Aumenta la Constitución por <%= con %>. Equipamiento de edición limitada de primavera 2015.",
"shieldSpecialSpring2015HealerText": "Almohada decorada",
- "shieldSpecialSpring2015HealerNotes": "Puedes descansar tu cabeza en esta almohada suave, o puedes luchar con sus temibles garras. ¡Raaawr! Aumenta la Constitución por <%= con %>. Equipamiento de edición limitada de primavera 2015.",
+ "shieldSpecialSpring2015HealerNotes": "Puedes descansar tu cabeza en esta suavealmohada, o puedes luchar con sus temibles garras. ¡Raaawr! Aumenta la Constitución por <%= con %>. Equipamiento de edición limitada de primavera 2015.",
"shieldMystery301405Text": "Escudo reloj",
"shieldMystery301405Notes": "¡El tiempo está de tu lado con este imponente escudo reloj! No otorga ningún beneficio. Artículo de suscriptor de junio 3015.",
"backBase0Text": "Sin accesorio de la espalda",
@@ -448,7 +452,7 @@
"backMystery201410Text": "Alas de duende",
"backMystery201410Notes": "Precipítate en la noche con estas fuertes alas. No confieren ningún beneficio. Artículo de Suscriptor de Octubre de 2014.",
"backMystery201504Text": "Alas de abeja trabajadora",
- "backMystery201504Notes": "¡Bzzz bzzz bzzz! revolotea de tarea en tarea. No otorga ningun beneficio. Articulo de suscriptor Abril 2015",
+ "backMystery201504Notes": "¡Bzzz bzzz bzzz! Revolotea de tarea en tarea. No otorga ningún beneficio. Artículo de suscriptor Abril 2015.",
"backSpecialWonderconRedText": "Capa poderosa",
"backSpecialWonderconRedNotes": "Da chasquidos con fuerza y belleza. No otorga ningún beneficio. Artículo de edición especial de convención .",
"backSpecialWonderconBlackText": "Capa furtiva",
@@ -478,14 +482,14 @@
"headAccessorySpecialSpringMageNotes": "Estas orejas redondas de ratón son sedosas. No otorgan ningún beneficio. Equipamiento de edición limitada de primavera 2014.",
"headAccessorySpecialSpringHealerText": "Orejas de perro amarillas",
"headAccessorySpecialSpringHealerNotes": "Colgantes pero lindas. ¿Quieres jugar? No otorgan ningún beneficio. Equipamiento de edición limitada de primavera 2014.",
- "headAccessorySpecialSpring2015RogueText": "Orejas de Ratón Amarillas",
- "headAccessorySpecialSpring2015RogueNotes": "Estas orejas se hacen de acero contra el sonido de las explosiones. No otorgan ningún beneficio. Equipamiento de edición limitada de primavera 2015.",
- "headAccessorySpecialSpring2015WarriorText": "Orejas de Perro Moradas",
+ "headAccessorySpecialSpring2015RogueText": "Orejas de ratón amarillas",
+ "headAccessorySpecialSpring2015RogueNotes": "Estas orejas se vuelve de acero frente al sonido de explosiones. No otorgan ningún beneficio. Equipamiento de edición limitada de primavera 2015.",
+ "headAccessorySpecialSpring2015WarriorText": "Orejas de perro moradas",
"headAccessorySpecialSpring2015WarriorNotes": "Son moradas. Son orejas de perro. No pierdas tu tiempo con mas insensateces. No confiere ningún beneficio. Equipamiento de edición limitada de primavera 2015.",
- "headAccessorySpecialSpring2015MageText": "Orejas de Conejito Azules",
+ "headAccessorySpecialSpring2015MageText": "Orejas de conejito azules",
"headAccessorySpecialSpring2015MageNotes": "Estas orejas escuchan atentamente, en caso de que algún mago esté revelando secretos. No confieren ningún beneficio. Equipamiento de edición limitada de primavera 2015.",
- "headAccessorySpecialSpring2015HealerText": "Orejas de Gatito Verdes",
- "headAccessorySpecialSpring2015HealerNotes": "Estas adorables orejas de gatito pondrán a los demás verde de envidia. No confieren ningún beneficio. Equipamiento de edición limitada de primavera 2015.",
+ "headAccessorySpecialSpring2015HealerText": "Orejas de gatito verdes",
+ "headAccessorySpecialSpring2015HealerNotes": "Estas adorables orejas de gatito pondrán a los demás verdes de envidia. No confieren ningún beneficio. Equipamiento de edición limitada de primavera 2015.",
"headAccessoryBearEarsText": "Bear Ears",
"headAccessoryBearEarsNotes": "These ears make you look like a cuddly bear! Confers no benefit.",
"headAccessoryCactusEarsText": "Cactus Ears",
@@ -509,7 +513,7 @@
"headAccessoryMystery201409Text": "Astas de otoño",
"headAccessoryMystery201409Notes": "Estas astas poderosas cambian de color con las hojas. No otorgan ningún beneficio. Artículo de suscriptor de septiembre 2014.",
"headAccessoryMystery201502Text": "Alas del pensamiento",
- "headAccessoryMystery201502Notes": "¡Deja volar tu imaginación! No otorga ningún beneficio. Objeto de subscriptor de Febrero del 2015.",
+ "headAccessoryMystery201502Notes": "¡Deja volar tu imaginación! No otorga ningún beneficio. Objeto de subscriptor de Febrero 2015.",
"headAccessoryMystery301405Text": "Gafas de tocado",
"headAccessoryMystery301405Notes": "\"Las gafas son para tus ojos\", dijeron. \"Nadie quiere gafas que sólo se puedan usar sobre la cabeza\", dijeron. ¡Ja! ¡Claramente les demostraste que estaban equivocados! No otorgan ningún beneficio. Artículo de suscriptor de agosto 3015.",
"eyewearBase0Text": "Sin gafas",
@@ -523,7 +527,7 @@
"eyewearSpecialWonderconBlackText": "Máscara furtiva",
"eyewearSpecialWonderconBlackNotes": "Tus motivos son sin duda legítimos. No otorga ningún beneifico. Artículo de edición especial de convención.",
"eyewearMystery201503Text": "Gafas de aguamarina",
- "eyewearMystery201503Notes": "No se deje golpear en el ojo por estas gemas brillantes! No otorgan ningún beneficio. Artículo de subscriptor de Marzo 2015.",
+ "eyewearMystery201503Notes": "¡No se te dejes picar el ojo con estas brillantes gemas ! No otorgan ningún beneficio. Artículo de subscriptor de Marzo 2015.",
"eyewearMystery301404Text": "Gafas para ojos",
"eyewearMystery301404Notes": "Ninguna clase de accesorio para los ojos podría ser más elegante que un par de gafas - excepto, quizás, un monóculo. No otorgan ningún beneficio. Artículo de suscriptor de abril 3015.",
"eyewearMystery301405Text": "Monóculo",
diff --git a/common/locales/es_419/generic.json b/common/locales/es_419/generic.json
index 4156647312..e4fceb8f93 100644
--- a/common/locales/es_419/generic.json
+++ b/common/locales/es_419/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitica",
"expandToolbar": "Abrir barra de herramientas",
"collapseToolbar": "Cerrar barra de herramientas",
- "formattingMarkdown": "Formato Markdown permitido",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*Italics*",
+ "bold": "**Bold**",
+ "strikethrough": "~~Strikethrough~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "Logros",
"modalAchievement": "¡Logro!",
"special": "Especial",
diff --git a/common/locales/es_419/groups.json b/common/locales/es_419/groups.json
index 4519629c3b..6f3d4f6d72 100644
--- a/common/locales/es_419/groups.json
+++ b/common/locales/es_419/groups.json
@@ -109,5 +109,12 @@
"inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
"byColon": "By:",
"inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "inviteAlertInfo2": "Or share this link (copy/paste):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/es_419/npc.json b/common/locales/es_419/npc.json
index 0bff6c206e..be303d2432 100644
--- a/common/locales/es_419/npc.json
+++ b/common/locales/es_419/npc.json
@@ -2,8 +2,8 @@
"npc": "PNJ",
"npcText": "¡Apoyó el proyecto de Kickstarter al nivel máximo!",
"mattBoch": "Matt Boch",
- "mattShall": "¿Te traigo tu corcel, <%= name %>? Haz clic en una montura para ensillarlo.",
- "mattBochText1": "¡Bienvenidos al Establo! Soy Matt, el maestro de las bestias. Escoge una mascota aquí para que aventure a tu lado. Aliméntalas y se convertirán en corceles poderosos.",
+ "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
+ "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
"daniel": "Daniel",
"danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
"danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
@@ -45,9 +45,9 @@
"tourScrollDown": "¡Asegúrate de desplazarse hacia abajo para ver todas las opciones! Haga clic en el avatar otra vez para regresar a la página de tareas.",
"tourMuchMore": "¡Cuando hayas terminado con tus tareas, podrás hacer un Equipo con tus amigos, chatear en los Gremios que te interesen, unirte a Desafíos, y más!",
"tourStatsPage": "¡Esta es la página de Estadísticas! Gana logros completando las tareas listadas.",
- "tourTavernPage": "¡Bienvenido a la Taberna, una sala de chat para todas edades! Puedes congelar tu cuenta en caso de enfermedad o viaje haciendo clic en 'Descansa en la Posada'. ¡Ven y di \"hola\"!",
+ "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
"tourPartyPage": "Tu equipo te ayudará a que te mantengas responsable. ¡Invita a tus amigo para desbloquear un Pergamino de misión!",
"tourGuildsPage": "Los Gremios son grupos sociales con temas comunes. ¡Busca los temas que te interesen! Te recomendamos el Gremio de los novatos.",
- "tourChallengesPage": "Alistarse en un Desafío añadirá tareas a tu cuenta. ¡Compite contra otros usuarios para ganar premios de gemas!",
+ "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
"tourMarketPage": "Cuando comienzas el Nivel 4, huevos y pociones de eclosión empezarán a caer al azar cuando completes tareas. Aparecen aquí - ¡úsalos para eclosionar a las mascotas! También puedes comprar artículos del Mercado."
}
\ No newline at end of file
diff --git a/common/locales/es_419/pets.json b/common/locales/es_419/pets.json
index 2df6a46bdf..2f5821e3dd 100644
--- a/common/locales/es_419/pets.json
+++ b/common/locales/es_419/pets.json
@@ -26,7 +26,7 @@
"inventoryText": "Haz clic en un huevo para ver las pociones utilizables resaltadas en verde, y después haz clic en una de las pociones para incubar tu mascota. Si ninguna poción se destacó, haz clic en ese huevo de nuevo para anular la selección, y haz clic en una poción primero para destacar los huevos utilizables. También puedes vender objetos no deseados a Alexander el Comerciante.",
"food": "Comida y Monturas",
"noFood": "No tienes ni comida ni monturas.",
- "dropsExplanation": "Consigue estos objetos mas rapido con gemas si no quieres esperar a que aparescan cuando completes una tarea. Aprende mas acerca del sistema de botín.",
+ "dropsExplanation": "Consigue estos objetos más rápido con gemas si no quieres esperar a que aparezcan cuando completes una Tarea. Aprende más acerca del sistema de botín.",
"beastMasterProgress": "Progreso de Maestro de las bestias",
"beastAchievement": "¡Has ganado el Logro de \"Maestro de las Bestias\" por haber coleccionado todas las mascotas!",
"beastMasterName": "Maestro de las bestias",
diff --git a/common/locales/es_419/quests.json b/common/locales/es_419/quests.json
index 1bc97c926e..cd216f842b 100644
--- a/common/locales/es_419/quests.json
+++ b/common/locales/es_419/quests.json
@@ -19,7 +19,7 @@
"bossStrength": "Fuerza del Jefe",
"collect": "Recolectar",
"collected": "Recogido",
- "bossDmg1": "Para hacerle daño a un jefe, completa tus Diarias y Pendientes. Mientras más alto sea el nivel de la tarea, más daño le harás al jefe (completando las rojas, hechizos de los Magos, ataques de los Guerreros, etc). El jefe le hará daño a cada participante en la misión por cada Diaria que no completas (multiplicado por la Fuerza del jefe) además del daño regular, ¡así que mantén tu equipo saludable completando tus diarias! Todo el daño que ocasionen tú y el jefe es calculado durante el cron (al reinicio de tu día).",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "Only participants will fight the boss and share in the quest loot.",
"tavernBossInfo": "Para hacerle daño a un jefe mundial, completa tus Diarias y Pendientes. Mientras más alto sea el nivel de la tarea, más daño le harás al jefe (completando las rojas, hechizos de los Magos, ataques de los Guerreros, etc). Por cada Diaria que no completes (multiplicado por la Fuerza del jefe) aumentará la ira del jefe. Una vez que su ira llegue al máximo, algo malo pasará - ¡así que completa tus diarias! Todo el daño que ocasionen tu y el jefe es calculado durante el cron (al reinicio de tu día).",
"bossColl1": "Para coleccionar artículos, haga tus tareas positivas. Objetos de misiones se ganan como objetos normales; sin embargo, no verá estos artículos hasta el próximo día cuando todo que encontró estará sumado y contribuido al total.",
diff --git a/common/locales/es_419/questscontent.json b/common/locales/es_419/questscontent.json
index 8a5cab12cf..281fd23bf5 100644
--- a/common/locales/es_419/questscontent.json
+++ b/common/locales/es_419/questscontent.json
@@ -197,9 +197,9 @@
"questSlimeCompletion": "With a final jab, you trap the Jelly Regent in an over-sized donut, rushed in by @Overomega, @LordDarkly, and @Shaner, the quick-thinking leaders of the pastry club. As everyone is patting you on the back, you feel someone slip something into your pocket. It’s the reward for your sweet success: three Marshmallow Slime eggs.",
"questSlimeDropSlimeEgg": "Marshmallow Slime (Egg)",
"questSlimeUnlockText": "Unlocks purchasable slime eggs in the Market",
- "questSheepText": "The Thunder Ram",
- "questSheepNotes": "As you wander the rural Taskan countryside with friends, taking a \"quick break\" from your obligations, you find a cozy yarn shop. You are so absorbed in your procrastination that you hardly notice the ominous clouds creep over the horizon. \"I've got a ba-a-a-ad feeling about this weather,\" mutters @Misceo, and you look up. The stormy clouds are swirling together, and they look a lot like a... \"We don't have time for cloud-gazing!\" @starsystemic shouts. \"It's attacking!\" The Thunder Ram hurtles forward, slinging bolts of lightning right at you!",
- "questSheepBoss": "Thunder Ram",
+ "questSheepText": "El carnero del trueno",
+ "questSheepNotes": "Mientras deambulas por las campiñas de Taskan con tus amigos, tomando un \"rápido descanso\" de tus obligaciones, encuentras una acogedora tienda de estambre. Estás tan sumergido en tu procastinación que apenas y te das cuenta de las siniestras nubes que cubren el cielo. \"Tengo un ma-a-al presentimiento de este clima\", balbucea @Misceo mientras miras hacia arriba. Las tempestuosas nubes se arremolinan y se parecen mucho a... \"¡No tenemos tiempo para mirar nubes!\" grita @starsystemic. \"¡Está atacando!\" ¡El carnero del trueno se abalanza, lanzando relámpagos y truenos hacia ti!",
+ "questSheepBoss": "Carnero del trueno",
"questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
"questSheepDropSheepEgg": "Sheep (Egg)",
"questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market"
diff --git a/common/locales/es_419/settings.json b/common/locales/es_419/settings.json
index 7ec42318a8..c1a1b8c616 100644
--- a/common/locales/es_419/settings.json
+++ b/common/locales/es_419/settings.json
@@ -41,10 +41,10 @@
"json": "(JSON)",
"customDayStart": "Comienzo de día personalizado",
"24HrClock": "Sistema 24h",
- "customDayStartInfo1": "HabitRPG por defecto chequea y resetea tus Diarias a la medianoche en tu propia zona horaria cada día. Es recomendable que leas la siguiente información antes de cambiar la configuración por defecto.",
+ "customDayStartInfo1": "HabitRPG por defecto revisa y resetea tus Diarias a la medianoche en tu propia zona horaria cada día. Es recomendable que leas la siguiente información antes de cambiar la configuración por defecto.",
"customDayStartInfo2": "(mostrar más)",
"customDayStartInfo3": "(mostrar menos)",
- "customDayStartInfo4": "Complete all your Dailies before changing the Custom Day Start or Rest in the Inn that day. Changing your Custom Day Start may cause Cron to run immediately, but after the first day it works as expected.
Allow a window of two hours for the change to take effect. For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.
Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
+ "customDayStartInfo4": "Completa todas tus Diarias antes the establecer un nuevo inicio de día. or Descansa en la Taberna ese día. Establecer un nuevo inicio de día puede causar que tuCronse reestablezca inmediatamente, pero después del primer día debería funcionar de manera normal.
Espero un lapso de al menos dos horas para que se realice el cambio. Por ejemplo, si tu día comience a las 0 (medianoche), cámbialo antes de las 10pm; Si lo quieres establecer a las 9pm, cámbialo antes de las 7pm.
Ingresa una hora entre las 0 y las 23 (se usa un reloj de 24 horas). Escribir la hora es más fácil que usar las flechas de desplazamiento. Una vez configurada la hora, refresca la página para confirmar que el nuevo valor que seleccionaste sea el correcto..",
"misc": "Varios",
"showHeader": "Mostrar cabecera",
"changePass": "Cambiar contraseña",
@@ -93,12 +93,12 @@
"wonChallenge": "Ganaste un desafío",
"newPM": "Mensaje privado recibido",
"giftedGems": "Gemas regaladas",
- "giftedGemsInfo": "<%= amount %> Gems - by <%= name %>",
+ "giftedGemsInfo": "<%= amount %> Gemas - por <%= name %>",
"giftedSubscription": "Suscripción regalada",
"invitedParty": "Invitado al Equipo",
"invitedGuild": "Invitado al Gremio",
"inactivityEmails": "Tu cuenta está inactiva",
- "weeklyRecaps": "Summaries of your account activity in the past week",
+ "weeklyRecaps": "Resumen de la actividad de tu cuenta en la última semana",
"questStarted": "Tu Misión ha comenzado",
"invitedQuest": "Invitado a la Misión",
"kickedGroup": "Expulsado del grupo",
@@ -113,10 +113,10 @@
"benefits": "Beneficios",
"coupon": "Cupón",
"couponPlaceholder": "Introduzca el código de cupón",
- "couponText": "We sometimes have events and give out promo codes for special gear. (eg, those who stop by our Wondercon booth)",
- "apply": "Apply",
- "resubscribe": "Resubscribe",
- "promoCode": "Promo Code",
- "promoCodeApplied": "Promo Code Applied! Check your inventory",
- "promoPlaceholder": "Enter Promotion Code"
+ "couponText": "A veces tenemos eventos y damos cupones con códigos para equipamiento especial. (p ej, a aquellos que nos visitan a nuestro stand de Wondercon)",
+ "apply": "Aplicar",
+ "resubscribe": "Reanudar suscripción",
+ "promoCode": "Código promocional",
+ "promoCodeApplied": "¡Tu código promocional fue aceptado! Revisa tu inventario.",
+ "promoPlaceholder": "Ingresa tu código promocional"
}
\ No newline at end of file
diff --git a/common/locales/es_419/spells.json b/common/locales/es_419/spells.json
index d13c44c767..ce60de8d56 100644
--- a/common/locales/es_419/spells.json
+++ b/common/locales/es_419/spells.json
@@ -1,14 +1,14 @@
{
"spellWizardFireballText": "Explosión de llamas",
- "spellWizardFireballNotes": "Flames burst from your hands. You gain XP, and you deal extra damage to Bosses! Click on a task to cast. (Based on: INT)",
+ "spellWizardFireballNotes": "Llamas estallan de tus manos. ¡Ganas EXP y haces daño adicional a los Jefes! Haz click sobre una tarea para invocar el conjuro. (Basado en: INT).",
"spellWizardMPHealText": "Corriente etérea",
- "spellWizardMPHealNotes": "Sacrificaste maná para ayudar a tus amigos. El resto e tu grupo ganó PM (Basado en: INT)",
+ "spellWizardMPHealNotes": "Sacrificaste maná para ayudar a tus amigos. ¡El resto de tu grupo recupera PM! (Basado en: INT)",
"spellWizardEarthText": "Terremoto",
- "spellWizardEarthNotes": "Tu poder mental hace temblar la tierra. Todo tu grupo gana una mejora de inteligencia (Basado en: poca INT )",
+ "spellWizardEarthNotes": "Tu poder mental hace temblar la tierra. ¡La Inteligencia de tu equipo se ve potenciada! (Basado en: INT no potenciada )",
"spellWizardFrostText": "Helada escalofriante",
- "spellWizardFrostNotes": "El hielo cubre tus tareas. Ninguna de tus rachas se restablecerá a cero mañana! (Un conjuro afecta a todas las rachas.)",
+ "spellWizardFrostNotes": "El hielo cubre tus tareas. ¡Ninguna de tus rachas se reiniciará a cero mañana! (Un conjuro afecta a todas las rachas.)",
"spellWarriorSmashText": "Golpe brutal",
- "spellWarriorSmashNotes": "You hit a task with all of your might. It gets more blue/less red, and you deal extra damage to Bosses! Click on a task to cast. (Based on: STR)",
+ "spellWarriorSmashNotes": "Golpeas salvajemente a una tarea con toda tu fuerza. ¡La tarea se vuelve más azul/menos roja y haces daño adicional a los Jefes! Haz lick sobre una tarea para invocar el conjuro. (Basado en FRZ).",
"spellWarriorDefensiveStanceText": "Postura defensiva",
"spellWarriorDefensiveStanceNotes": "You prepare yourself for the onslaught of your tasks. You gain a buff to Constitution! (Based on: Unbuffed CON)",
"spellWarriorValorousPresenceText": "Presencia valerosa",
@@ -36,11 +36,11 @@
"spellSpecialSaltText": "Sal",
"spellSpecialSaltNotes": "Alguien te ha lanzado una bola de nieve. Ja Ja, muy gracioso. ¡Ahora quítame esta nieve de encima!",
"spellSpecialSpookDustText": "Brillantina espeluznante",
- "spellSpecialSpookDustNotes": "Convierte a un amigo en una sabana flotante con ojos!",
+ "spellSpecialSpookDustNotes": "¡Convierte a un amigo en una manta flotante con ojos!",
"spellSpecialOpaquePotionText": "Poción opaca",
"spellSpecialOpaquePotionNotes": "Cancela los efectos de la brillantina espeluznante.",
"spellSpecialShinySeedText": "Semilla radiante",
- "spellSpecialShinySeedNotes": "Transforma a un amigo en una alegre flor!",
+ "spellSpecialShinySeedNotes": "¡Transforma a un amigo en una alegre flor!",
"spellSpecialPetalFreePotionText": "Poción libre de petalos",
- "spellSpecialPetalFreePotionNotes": "Cancela los efectos de una Semilla Radiante"
+ "spellSpecialPetalFreePotionNotes": "Cancela los efectos de una Semilla radiante"
}
\ No newline at end of file
diff --git a/common/locales/es_419/tasks.json b/common/locales/es_419/tasks.json
index c17c2dcbf3..937b33973f 100644
--- a/common/locales/es_419/tasks.json
+++ b/common/locales/es_419/tasks.json
@@ -14,7 +14,7 @@
"save": "Guardar",
"addChecklist": "Añadir lista de control",
"checklist": "Lista de control",
- "checklistText": "En las Diarias, las listas completadas parcialmente reducen el daño. Por ejemplo, una lista de 4 partes con 3 completadas reduce el daño por esa tarea incompleta al 25%. Los elementos completados en la lista de una tarea Pendiente añaden un multiplicador: 3 hechos significan +3x (un total de 4x) la Experiencia, Oro y Maná.",
+ "checklistText": "¡Distribuye una tarea en partes! Las listas de control incrementan la Experiencia y el Oro ganados por completar Pendientes, y reducen el daño causado por una Diaria.",
"expandCollapse": "Expandir/Contraer",
"text": "Texto",
"extraNotes": "Notas adicionales",
@@ -22,7 +22,7 @@
"advancedOptions": "Opciones avanzadas",
"difficulty": "Dificultad",
"difficultyHelpTitle": "¿Qué dificultad tiene esta tarea?",
- "difficultyHelpContent": "Esto multiplica su valor de puntos. No usar a menudo, confía en nuestro algoritmo de ajuste orgánico. Aún así, algunas tareas son mucho más valiosas que otras (Escribir tesis vs Lavarse los dientes). Haz clic para más información.",
+ "difficultyHelpContent": "Entre más difícil sea la tarea, recibirás mayor cantidad de Experiencia y Oro cuando la elimines de la lista... ¡pero hará más daño si es parte de una Diaria o un Mal Hábito!",
"easy": "Fácil",
"medium": "Intermedio",
"hard": "Difícil",
@@ -78,5 +78,5 @@
"pushTaskToTop": "Enviar tarea al tope",
"pushTaskToBottom": "Enviar tarea al fondo",
"emptyTask": "Primero escribe el título de la tarea.",
- "dailiesRestingInInn": "You're Resting in the Inn! Your Dailies will NOT hurt you tonight, but they WILL still refresh every day. If you're in a quest, you won't deal damage/collect items until you check out of the Inn, but you can still be injured by a Boss if your Party mates skip their own Dailies."
+ "dailiesRestingInInn": "¡Estás descansando en la Posada! Tus Diarias no te harán daño esta noche, pero continuarán reiniciándose cada día. Si te encuentras una misión, no harás daño/coleccionarás objetos hasta que hayas salido de la Posada, pero sí recibirás daño de un Jefe si tus compañeros no completan sus Diarias."
}
\ No newline at end of file
diff --git a/common/locales/fr/backgrounds.json b/common/locales/fr/backgrounds.json
index 88a762c914..98136c2d3f 100644
--- a/common/locales/fr/backgrounds.json
+++ b/common/locales/fr/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "Lac en Altitude",
"backgroundMountainLakeNotes": "Trempez vos orteils dans un Lac en Altitude.",
"backgroundPagodasText": "Pagodes",
- "backgroundPagodasNotes": "Grimpez au sommet de Pagodes."
+ "backgroundPagodasNotes": "Grimpez au sommet de Pagodes.",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/fr/challenge.json b/common/locales/fr/challenge.json
index 7bde022921..b2e5519ede 100644
--- a/common/locales/fr/challenge.json
+++ b/common/locales/fr/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Désigner un vainqueur et clore le défi :",
"deleteOrSelect": "Supprimer ou désigner un vainqueur",
"endChallenge": "Clore le défi",
- "challengeDiscription": "Voici les tâches du défi. Lorsque des utilisateurs participent, elles changent de couleur et un graphique est généré pour vous montrer le progrès général du groupe.",
+ "challengeDiscription": "Voici les tâches du Défi, qui vont être ajoutées à votre propre tableau de bord lorsque vous rejoindrez ce Défi. Les tâches de Défi ci-dessous changeront alors de couleur et vous pourrez voir des graphiques montrant les progrès du groupe dans son ensemble. ",
"hows": "Où en sont les autres ?",
"filter": "Filtre",
"groups": "Groupes",
@@ -33,7 +33,8 @@
"challengeTagPop": "Les défis apparaissent dans la liste des étiquettes et dans l'infobulle des tâches. Utilisez un titre représentatif et une étiquette courte. Par exemple : \"Perdre 5 kilos en 3 mois\" pour le titre et \"-5kg\" pour l'étiquette (Cliquez pour plus d'informations).",
"challengeDescr": "Description",
"prize": "Récompense",
- "prizePop": "Si quelqu'un peut \"remporter\" votre défi, vous pouvez éventuellement récompenser ce vainqueur avec des Gemmes. Le maximum correspond au nombre de Gemmes que vous possédez (plus les gemmes de guilde, s'il s'agit du défi d'une guilde dont vous êtes le créateur). Remarque : cette récompense ne pourra être modifiée par la suite et ne sera pas restituée si le défi est annulé.",
+ "prizePop": "S'il est possible de \"gagner\" votre défi, vous pouvez choisir de récompenser le vainqueur avec des Gemmes. La récompense maximum est le nombre de Gemmes que vous possédez vous-mêmes (auxquelles s'ajoutent les Gemmes de la guilde si vous êtes le créateur de la guilde proposant le défi). Remarque: la récompense ne peut pas être modifiée ultérieurement. ",
+ "prizePopTavern": "S'il est possible de \"gagner\" votre défi, vous pouvez choisir de récompenser le vainqueur avec des Gemmes. La récompense maximum est le nombre de Gemmes que vous possédez vous-mêmes (auxquelles s'ajoutent les Gemmes de la guilde si vous êtes le créateur de la guilde proposant le défi). Remarque: la récompense ne peut pas être modifiée ultérieurement et récompenses des défis de la Taverne ne peuvent être restituées si le défi est annulé. ",
"publicChallenges": "Minimum 1 gemme pour les défis publics (ça aide à lutter contre le spam, pour de vrai).",
"officialChallenge": "Défi officiel HabitRPG",
"by": "par",
@@ -43,6 +44,7 @@
"selectGroup": "Veuillez sélectionner un groupe",
"challengeCreated": "Défi créé",
"sureDelCha": "Êtes-vous vraiment sûr de vouloir supprimer le défi ?",
+ "sureDelChaTavern": "Êtes-vous sûr de vouloir supprimer le défi? Vos Gemmes ne vous seront pas restituées. ",
"removeTasks": "Supprimer les tâches",
"keepTasks": "Conserver les tâches",
"closeCha": "Clore le défi et…",
diff --git a/common/locales/fr/character.json b/common/locales/fr/character.json
index f0e8cc5d67..f2183f6790 100644
--- a/common/locales/fr/character.json
+++ b/common/locales/fr/character.json
@@ -52,9 +52,11 @@
"costume": "Costume",
"costumeText": "Si vous préférez l'apparence d'un équipement différent de celui que vous avez équipé, choisissez \"Utiliser un Costume\" pour le porter en costume tout en conservant les bonus de votre équipement.",
"useCostume": "Utiliser un Costume",
- "gearAchievement": "Vous avez gagné le succès \"Armé jusqu'aux dents\" pour avoir acheté tous les meilleurs équipements ! ",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Armé jusqu'aux dents",
- "ultimGearText": "S'est équipé avec les meilleurs armes et les meilleures armures.",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Niveau",
"levelUp": "Montée de niveau !",
"mana": "Mana",
@@ -70,7 +72,7 @@
"allocatePerPop": "Ajouter un point en Perception",
"allocateInt": "Points alloués en Intelligence : ",
"allocateIntPop": "Ajouter un point en Intelligence",
- "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue leveling up, or start a new adventure at level 1 by using the Orb of Rebirth, now available for free in the Market.",
+ "noMoreAllocate": "Maintenant que vous avez atteint le niveau 100, vous ne gagnerez plus de Points d'Attribut. Vous pouvez continuer à passer des niveaux ou commencer une nouvelle aventure depuis le niveau 1 en utilisant l'Orbe de Renaissance, disponible gratuitement au Marché dès maintenant.",
"stats": "Caractéristiques",
"strength": "Force",
"strengthText": "La Force augmente les chances de \"coups critiques\" aléatoires et donc les bonus d'or, d'expérience et de gain de butin qui en découlent. Elle aide aussi à infliger des dommages aux boss.",
diff --git a/common/locales/fr/communityguidelines.json b/common/locales/fr/communityguidelines.json
index 3d3733ab99..bf3ee36e3f 100644
--- a/common/locales/fr/communityguidelines.json
+++ b/common/locales/fr/communityguidelines.json
@@ -4,7 +4,7 @@
"commGuideHeadingWelcome": "Bienvenue en Habitica !",
"commGuidePara001": "Salutations, brave aventurier ! Bienvenue en Habitica, le pays de la productivité, de la vie saine et de l'occasionnel griffon ravageur. Nous sommes une joyeuse communauté faite de personnes serviables qui se soutiennent les unes les autres sur la voie de l’amélioration de soi.",
"commGuidePara002": "Afin que tout le monde se sente bien, heureux et productif dans la communauté, nous avons établi quelques règles de conduite. Nous les avons minutieusement forgées afin de les rendre aussi agréables et faciles à lire que possible. Nous vous enjoignons à prendre le temps de les lire.",
- "commGuidePara003": "Ces règles s’appliquent à tous les espaces sociaux que nous utilisons, comprenant (mais pas forcément limités à) Trello, GitHub, Transifex et Wikia (c’est-à-dire le wiki). Parfois, des situations imprévues surgiront, comme une nouvelle source de conflit ou un nécromancien perfide. Si cela arrive, les modérateurs et modératrices (Mods) pourront y faire face en éditant ces règles de conduite afin de protéger la communauté de nouvelles menaces. Soyez sans crainte : vous serez prévenu·es par une annonce de Bailey si cela devait être le cas.",
+ "commGuidePara003": "Ces règles s’appliquent à tous les espaces sociaux que nous utilisons, comprenant (mais pas forcément limités à) Trello, GitHub, Transifex et Wikia (c’est-à-dire le wiki). Parfois, des situations inattendues surgiront, comme une nouvelle source de conflit ou un vicieux nécromancien. Si cela arrive, les modérateurs et modératrices (Mods) pourront y faire face en éditant ces règles de conduite afin de protéger la communauté de nouvelles menaces. Soyez sans crainte : vous serez prévenu·es par une annonce de Bailey si cela devait être le cas.",
"commGuidePara004": "Et maintenant, à vos plumes et parchemins pour la prise de notes : commençons !",
"commGuideHeadingBeing": "Être Habiticien·ne",
"commGuidePara005": "HabitRPG est d’abord et avant tout un site internet dédié à l’amélioration de soi. Résultat : nous avons la chance d’avoir attiré l’une des communautés les plus chaleureuses, sympathiques, courtoises et solidaires de l’internet. Divers traits caractérisent les Habiticien·nes. Certains des plus courants et des plus marquants sont :",
@@ -40,7 +40,7 @@
"commGuideList02F": "Obtempérez immédiatement si un Modérateur vous demande de cesser une conversation ou de la déplacer dans l'Arrière-Boutique. Les derniers mots et tirades finales devraient être lancés (courtoisement) à votre \"table\" dans l'Arrière-Boutique, si vous en avez la permission.",
"commGuideList02G": "Prenez le temps de la réflexion plutôt que de répondre de manière impulsive si quelqu'un vous dit qu'une de vos propos ou actions l'ont gêné. Il faut une une grande force pour être capable de présenter des excuses sincères. Si vous trouvez qu'une personne vous a répondu de manière inappropriée, contactez un-e Mod plutôt que de l'interpeller en public.",
"commGuideList02H": "Les conversations polémiques/contentieuses devraient être rapportées à la modération. Si vous trouvez qu’une conversation devient trop animée, trop passionnée ou offensante, cessez d’y participer. À la place, envoyez un courriel à leslie@habitrpg.com pour nous prévenir. C’est notre travail de vous protéger.",
- "commGuideList02I": "Ne spammez pas Le spam peut inclure, sans y être limité : poster le même commentaire ou la même demande dans de multiples endroits, poster des liens sans explication ou contexte, poster des messages incohérents, ou poster le même message à la chaîne. Les demandes répétées de gemmes ou d'abonnements peuvent aussi être considérées comme du spam.",
+ "commGuideList02I": "Ne spammez pas Le spam peut inclure, sans être limité à : poster le même commentaire ou la même demande dans de multiples endroits, poster des liens sans explication ou contexte, poster des messages incohérents, ou poster le même message à la chaîne. Les demandes répétées de gemmes ou d'abonnements peuvent aussi être considérées comme du spam.",
"commGuidePara019": "Dans les espaces privés, une plus grande liberté est accordée pour discuter de ce dont vous avez envie, mais vous êtes toujours soumis aux Conditions d'Utilisation et ne devez pas les enfreindre : pas de contenu discriminatoire, violent ou menaçant.",
"commGuidePara020": "Les Message Privés (MP) ont quelques règles additionnelles. Si une personne vous a bloqué, ne la contactez pas par un autre biais pour lui demander de vous débloquer. Vous ne devriez également pas envoyer des MPs à quelqu'un en lui demandant de l'aide (dans la mesure où les réponses publiques aux questions sont utiles à la communauté). Enfin, n'envoyez à personne de messages les priant de vous offrir des gemmes ou un abonnement, ce qui peut être considéré comme du spam.",
"commGuidePara021": "De plus, certains lieux publics d’Habitica ont des règles supplémentaires.",
@@ -68,7 +68,7 @@
"commGuideList03E": "Le Forum Wiki est une place pour améliorer le contenu du nouveau Wiki, en discuter et demander de nouvelles pages.",
"commGuidePara042": "Tous ont leurs propres règles, et les règles d’Espace Public s’appliquent toujours. Il vaut mieux éviter de dériver du sujet principal sur le tableau ou les fiches. Croyez-nous, les tableaux sont bien assez encombrés comme cela ! Les conversations prolongées devraient être déplacées dans le Coin du Fond.",
"commGuideHeadingGitHub": "GitHub",
- "commGuidePara043": "HabitRPG utilise GitHub pour traquer les bugs et contribuer au code. C’est la forge où nos infatigables Forgeron·ne·s façonnent les options ! Toutes les règles d’Espace Public s’appliquent. Soyez très poli avec les artisans – ils ont beaucoup de travail, à faire fonctionner le site ! Bravo les Forgeron·ne·s !",
+ "commGuidePara043": "HabitRPG utilise GitHub pour traquer les bugs et contribuer au code. C’est la forge où nos infatigables Forgeron·ne·s façonnent les options ! Toutes les règles d’Espace Public s’appliquent. Soyez très poli avec les Forgeron·ne·s – ils ont beaucoup de travail, à faire fonctionner le site ! Bravo les Forgeron·ne·s !",
"commGuidePara044": "Les personnes suivantes sont membres du coin HabitRPG : ",
"commGuideHeadingWiki": "Wiki",
"commGuidePara045": "Le wiki HabitRPG rassemble des informations à propos du site. Il héberge également quelques forums similaires aux guildes de HabitRPG. Ainsi, les règles d’Espace Public s’appliquent.",
diff --git a/common/locales/fr/content.json b/common/locales/fr/content.json
index 6c8530d429..26993e8926 100644
--- a/common/locales/fr/content.json
+++ b/common/locales/fr/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Potion de Santé",
"potionNotes": "Rend 15 points de Santé (effet immédiat)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "Loup",
"dropEggWolfAdjective": "loyal",
"dropEggTigerCubText": "Tigreau",
@@ -56,8 +60,8 @@
"questEggBunnyAdjective": "câlin",
"questEggSlimeText": "Glaire de Guimauve",
"questEggSlimeAdjective": "bonbon",
- "questEggSheepText": "Sheep",
- "questEggSheepAdjective": "woolly",
+ "questEggSheepText": "Mouton",
+ "questEggSheepAdjective": "laineux",
"eggNotes": "Trouvez une potion d’éclosion à verser sur cet œuf et il en sortira un·e <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
"hatchingPotionBase": "de Base",
"hatchingPotionWhite": "Blanc",
diff --git a/common/locales/fr/front.json b/common/locales/fr/front.json
index 691a3b76f5..7a8e91a860 100644
--- a/common/locales/fr/front.json
+++ b/common/locales/fr/front.json
@@ -172,5 +172,11 @@
"username": "Nom d'Utilisateur",
"watchVideos": "Regarder les vidéos",
"work": "Travailler",
- "zelahQuote": "Avec HabitRPG, j'envisage même d'aller au lit à l'heure rien qu'à la pensée d'obtenir des points pour m'être couché de bonne heure ou de perdre de la santé pour m'être couché tard!"
+ "zelahQuote": "Avec HabitRPG, j'envisage même d'aller au lit à l'heure rien qu'à la pensée d'obtenir des points pour m'être couché de bonne heure ou de perdre de la santé pour m'être couché tard!",
+ "reportAccountProblems": "Signaler un problème sur votre compte",
+ "reportCommunityIssues": "Signaler un problème au niveau de la Communauté",
+ "generalQuestionsSite": "Questions d'ordre général sur le Site",
+ "businessInquiries": "Demandes pour les entreprises",
+ "merchandiseInquiries": "Demandes commerciales",
+ "marketingInquiries": "Demandes pour le marketing/les réseaux sociaux"
}
\ No newline at end of file
diff --git a/common/locales/fr/gear.json b/common/locales/fr/gear.json
index a204303c23..f311c89f21 100644
--- a/common/locales/fr/gear.json
+++ b/common/locales/fr/gear.json
@@ -120,6 +120,8 @@
"weaponMystery201411Notes": "Embrochez vos ennemis ou plantez-la dans votre nourriture préférée : cette fourche multi-fonctions peut tout faire ! N'apporte aucun bonus. Équipement d'Abonné de Novembre 2014.",
"weaponMystery201502Text": "Bâton Chatoyant Ailé d'Amour et Aussi de Vérité",
"weaponMystery201502Notes": "Pour les AILES ! Pour l'AMOUR ! Et AUSSI pour la VÉRITÉ ! N'apporte aucun bonus. Équipement d'Abonné de Février 2015.",
+ "weaponMystery201505Text": "Lance du Chevalier Vert",
+ "weaponMystery201505Notes": "Cette lance verte et argent a désarçonné de nombreux adversaires! N'apporte aucun bonus. Équipement d'Abonné de Mai 2015.",
"weaponMystery301404Text": "Canne Steampunk",
"weaponMystery301404Notes": "Parfaite pour faire un tour en ville. N'apporte aucun bonus. Équipement d'Abonné de Mars 3015.",
"armor": "armure",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "Qui est un pingouin ? N'apporte aucun bonus. Équipement d'Abonné de Décembre 2014.",
"headMystery201501Text": "Heaume Stellaire",
"headMystery201501Notes": "Les constellations de ce casque scintillent et tourbillonnent, canalisant les pensées de son porteur. N'apporte aucun bonus. Équipement d'Abonné de Janvier 2015.",
+ "headMystery201505Text": "Heaume du Chevalier Vert",
+ "headMystery201505Notes": "La plume verte au sommet de ce heaume ondule fièrement. N'apport aucun bonus. Équipement d'Abonné de Mai 2015.",
"headMystery301404Text": "Haut-de-forme Fantaisiste",
"headMystery301404Notes": "Un couvre-chef fantaisiste pour les gens de bonne famille les plus élégants ! N'apporte aucun bonus. Équipement d'Abonné de Janvier 3015.",
"headMystery301405Text": "Haut-de-forme Classique",
diff --git a/common/locales/fr/generic.json b/common/locales/fr/generic.json
index 4c6b57fff2..a022230d2d 100644
--- a/common/locales/fr/generic.json
+++ b/common/locales/fr/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitica",
"expandToolbar": "Montrer la barre d'outlis",
"collapseToolbar": "Cacher la barre d'outils",
- "formattingMarkdown": "Balise Markdown possible",
+ "markdownBlurb": "HabitRPG utilise le balisage markdown dans les espaces de discussion. Voir le Mémo de Markdownt pour de plus amples informations.",
+ "showFormattingHelp": "Afficher l'aide pour l'utilisation des balises. ",
+ "hideFormattingHelp": "Masquer l'aide pour l'utilisation des balises.",
+ "youType": "Lorsque vous tapez: ",
+ "youSee": "Vous voyez:",
+ "italics": "*Italique*",
+ "bold": "**Gras**",
+ "strikethrough": "~~Barré~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[Habit RPG, c'est la classe!](https://habitrpg.com)",
+ "markdownImageEx": "![texte alternatif obligatoire](https://habitrpg.com/cake.png \"facultatif: titre affiché en passant la souris\")",
+ "unorderedListHTML": "+ Premier article + Second article + Troisième article",
+ "unorderedListMarkdown": "+ Premier article\n+ Second article\n+ Troisième article",
+ "code": "`code`",
"achievements": "Succès",
"modalAchievement": "Succès !",
"special": "Spécial",
diff --git a/common/locales/fr/groups.json b/common/locales/fr/groups.json
index 947568b568..d2dae1a9fe 100644
--- a/common/locales/fr/groups.json
+++ b/common/locales/fr/groups.json
@@ -102,12 +102,19 @@
"messageWroteIn": "<%= user %> a écrit dans <%= group %>",
"msgPreviewHeading": "Aperçu du message",
"leaderOnlyChallenges": "Seul le responsable du groupe peut créer des défis",
- "sendGift": "Send Gift",
- "inviteFriends": "Invite Friends",
- "inviteAlertInfo": "Invite friends by User ID here.",
- "inviteExistUser": "Invite Existing User",
- "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
- "byColon": "By:",
- "inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "sendGift": "Envoyer un cadeau",
+ "inviteFriends": "Inviter des amis",
+ "inviteAlertInfo": "Inviter des amis ici avec leur ID d'Utilisateur.",
+ "inviteExistUser": "Inviter un utilisateur existant",
+ "inviteByEmail": "Inviter des amis par courriel. S'ils s'inscrivent en réponse à votre courriel, ils seront automatiquement invités à ce groupe. ",
+ "byColon": "Invité par: ",
+ "inviteNewUsers": "Inviter un/plusieurs nouveau(x) utilisateur(s)",
+ "inviteAlertInfo2": "Ou partagez ce lien (copier/coller):",
+ "sendGiftHeading": "Envoyer un cadeau à <%= name %>",
+ "sendGiftGemsBalance": "De vos <%= number %> Gemmes",
+ "sendGiftCost": "Total: <%= cost %>$ (USD)",
+ "sendGiftFromBalance": "Offrir vos propres Gemmes",
+ "sendGiftPurchase": "Acheter les Gemmes",
+ "sendGiftMessagePlaceholder": "Message personnel (facultatif)",
+ "sendGiftSubscription": "<%= months %> mois: <%= price %>$ (USD)"
}
\ No newline at end of file
diff --git a/common/locales/fr/npc.json b/common/locales/fr/npc.json
index 082499ff81..ae53dddd4f 100644
--- a/common/locales/fr/npc.json
+++ b/common/locales/fr/npc.json
@@ -2,8 +2,8 @@
"npc": "PNJ",
"npcText": "A soutenu le projet Kickstarter à son niveau maximum ! ",
"mattBoch": "Matt Boch",
- "mattShall": "Dois-je amener votre destrier, <%= name%> ? Cliquez sur une monture pour monter en selle.",
- "mattBochText1": "Bienvenue à l’Écurie ! Je suis Matt, le Maîtres des Bêtes. Choisissez ici un familier qui partira à l'aventure à vos côtés. Nourrissez-les et ils évolueront en de puissantes montures. ",
+ "mattShall": "Dois-je préparer votre coursier, <%= name %>? Lorsque vous avez assez nourri un animal pour qu'il devienne une fière monture, il apparaîtra ici. Cliquez sur une monture pour monter en selle!",
+ "mattBochText1": "Bienvenue à l'Écurie! Je suis Matt, le Maître des Bêtes. Après avoir passé le niveau 4, vous pouvez faire éclore vos familiers grâce à vos œufs et potions. Lorsque vous faites éclore un animal au Marché, il apparaîtra ici! Cliquez sur l'image d'un animal pour le faire rejoindre votre avatar. Donnez-leur la nourriture que vous trouvez dès la fin du niveau 4, et ils deviendront de puissantes montures. ",
"daniel": "Daniel",
"danielText": "Bienvenue à la Taverne ! Restez un moment et rencontrez les habitants. Si vous avez besoin de vous reposer (vacances ? maladie ?), je vous installerai à l'Auberge. Pendant votre séjour, vos tâches Quotidiennes ne vous infligeront pas de dommages à la fin de la journée, mais vous pourrez quand même les réaliser.",
"danielText2": "Prenez garde : si vous êtes au milieu d'une quête contre un boss, celui-ci vous infligera tout de même des blessures en fonction des Quotidiennes manquées des membres de votre groupe ! De façon identique, vos propres dégâts au Boss (ou les objets récoltés) ne seront pas appliquez tant que vous ne quitterez pas l'Auberge.",
@@ -45,9 +45,9 @@
"tourScrollDown": "Faites attention à bien aller tout en bas de la page pour voir toutes les options ! Cliquez sur votre avatar à nouveau pour retourner à la page des tâches.",
"tourMuchMore": "Quand vous aurez fini avec vos tâches, vous pourrez former une équipe avec vos amis, discuter dans les guildes liées à vos centres d'intérêts, participer à des défis, et bien plus !",
"tourStatsPage": "Ceci est votre page de statistiques ! Remportez des succès en complétant les tâches listées.",
- "tourTavernPage": "Bienvenue à la Taverne, un lieu de discussion pour tout le monde ! Vous pouvez geler votre compte en cas de maladie ou de voyage, en cliquant sur \"Se reposer à l'Auberge.\" Venez dire bonjour !",
+ "tourTavernPage": "Bienvenue à la Taverne, un lieu de discussion pour tous! Vous pouvez vous protéger des dégâts causés par vos Quotidiennes en cas de maladie ou de voyage en cliquant sur \"Se reposer à l'Auberge\". Venez dire bonjour!",
"tourPartyPage": "Votre équipe vous aidera à rester responsable. Invitez des amis pour déverrouiller un parchemin de quête !",
"tourGuildsPage": "Les Guildes sont des groupes de personnes avec des centres d'intérêts communs. Recherchez les sujets qui vous plaisent ! Nous vous recommandons la guilde des nouveaux arrivants.",
- "tourChallengesPage": "Rejoindre un défi ajoutera des tâches à votre compte. Rivalisez avec d'autres membres pour gagner des gemmes !",
+ "tourChallengesPage": "Les Défis sont des listes de tâches créées par des membres! Rejoindre un défi ajoutera ses tâches à votre compte. Rivalisez avec d'autres membres pour gagner des gemmes!",
"tourMarketPage": "A partir du niveau 4, des œufs et des potions d'éclosion apparaitront au hasard comme butin lorsque vous réaliserez vos tâches. Ils apparaissent ici - utilisez-les pour faire éclore des Familiers ! Vous pouvez aussi acheter des objets au Marché."
}
\ No newline at end of file
diff --git a/common/locales/fr/quests.json b/common/locales/fr/quests.json
index 4cfc1fff6d..887cb68b70 100644
--- a/common/locales/fr/quests.json
+++ b/common/locales/fr/quests.json
@@ -6,8 +6,8 @@
"questSend": "Cliquer sur \"Inviter\" enverra une invitation aux membres de votre équipe. Quand tous les membres auront accepté ou refusé, la quête commencera. Voir l'avancement dans Options > Social > Équipe.",
"inviteParty": "Inviter l'équipe",
"questInvitation": "Invitation à une Quête :",
- "questInvitationTitle": "Quest Invitation",
- "questInvitationInfo": "Invitation for the Quest <%= quest %>",
+ "questInvitationTitle": "Invitation à une Quête",
+ "questInvitationInfo": "Invitation à la Quête <%= quest %>",
"askLater": "Redemander plus tard",
"buyQuest": "Acheter une quête",
"accepted": "Acceptée",
@@ -19,7 +19,7 @@
"bossStrength": "Force du Boss",
"collect": "Collecter",
"collected": "Récolté",
- "bossDmg1": "Pour blesser un boss, complétez vos tâches Quotidiennes et À faire. Plus la tâche aura un niveau élevé, plus elle blessera le boss (compléter les tâches rouges, lancer des sorts de Mage, des attaques de Guerrier, etc). Le boss causera des dommages à chacun des participants de la quête pour chaque Quotidienne que vous aurez manquée (multiplié par la Force du boss) en plus des dommages normaux, alors, protégez vos amis en complétant vos Quotidiennes ! Tous les dommages causés par vous et par le boss sont pris en compte au cron (à la réinitialisation de votre journée).",
+ "bossDmg1": "Chaque tâche Quotidienne ou À Faire et chaque Habitude positive inflige des dommages au boss. Frappez plus fort avec des tâches plus rouges ou avec les sorts Frappe Brutale et Eplosion de Flammes. Le boss infligera des dommages à chacun des participants de la quête pour chaque Quotidienne que vous aurez manquée (multipliés par la Force du boss) en plus des dommages normaux. Alors protégez votre équipe en effectuant vos Quotidiennes! Tout dommage causé par vous et par le boss est pris en compte au cron (la réinitialisation de votre journée).",
"bossDmg2": "Seuls les participants pourront combattre le boss et partager le butin de la quête.",
"tavernBossInfo": "Pour blesser un boss mondial, complétez vos tâches Quotidiennes et À faire. Plus vous infligez de dommages à une tâche, plus vous en infligerez au boss en conséquence (tâches rouges, sorts de Mage, attaques de Guerrier, etc). Pour chaque Quotidienne que vous avez manqué (multiplié par la Force du boss), la barre de Rage du boss augmentera. Lorsque sa Rage atteindra son maximum, quelque chose de terrible arrivera, donc complétez vos Quotidiennes ! Tous les dommages infligés au boss et par lui seront pris en compte au cron (le passage d'une journée à l'autre).",
"bossColl1": "Pour obtenir des objets, accomplissez vos tâches positives. Vous trouvez les objets de quêtes de la même façon que vous trouvez les objets normaux mais vous ne les verrez que le jour suivant. À ce moment, tous les objets de quêtes que vous aurez trouvés seront comptabilisés et s'ajouteront à la pile.",
diff --git a/common/locales/fr/questscontent.json b/common/locales/fr/questscontent.json
index 32958cfb35..e350c3ca27 100644
--- a/common/locales/fr/questscontent.json
+++ b/common/locales/fr/questscontent.json
@@ -197,10 +197,10 @@
"questSlimeCompletion": "Avec un dernier coup, vous piégez le Régent de Gelée dans un énorme donut, hâté par @Overomega, @LordDarkly, et @Shaner, les meneurs vifs d'esprit du club de pâtisserie. Alors que tout le monde vous félicite, vous sentez quelqu'un glisser quelque chose dans votre poche. C'est la récompense pour votre prompt succès : trois œufs de Boule de Guimauve. ",
"questSlimeDropSlimeEgg": "Boule de Guimauve (Œuf)",
"questSlimeUnlockText": "Débloque l'achat des Boules de Guimauve au marché",
- "questSheepText": "The Thunder Ram",
- "questSheepNotes": "As you wander the rural Taskan countryside with friends, taking a \"quick break\" from your obligations, you find a cozy yarn shop. You are so absorbed in your procrastination that you hardly notice the ominous clouds creep over the horizon. \"I've got a ba-a-a-ad feeling about this weather,\" mutters @Misceo, and you look up. The stormy clouds are swirling together, and they look a lot like a... \"We don't have time for cloud-gazing!\" @starsystemic shouts. \"It's attacking!\" The Thunder Ram hurtles forward, slinging bolts of lightning right at you!",
- "questSheepBoss": "Thunder Ram",
- "questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
- "questSheepDropSheepEgg": "Sheep (Egg)",
- "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market"
+ "questSheepText": "Le Bélier du Tonnerre",
+ "questSheepNotes": "Alors que vous vous promenez dans le paysage campagnard Tâcherain avec des amis, prenant une \"petite pause\" au milieu de vos obligations, vous tombez sur un adorable magasin de laine. Vous êtes si concentré dans votre procrastination que vous remarquez à peine les nuages menaçants qui se rapprochent en douce depuis l'horizon. \"C'est bê-ê-ê-ête que le temps se couvre. Ça ne présage rien de bon\", grommelle @Misceo, et vous regardez alors en l'air. Les nuages orageux tourbillonnent en volutes qui ressemblent fortement à.un... \"Nous n'avons pas le temps d'observer les nuages!\" crie @starsystemic. \"Il attaque!\" Le Bélier du Tonnerre arrive à toute allure, lançant des éclairs sur vous! ",
+ "questSheepBoss": "Bélier du Tonnerre",
+ "questSheepCompletion": "Impressionné par votre assiduité, le Bélier du Tonnerre voit sa fureur se calmer peu à peu. Il lance trois énormes grêlons dans votre direction et disparaît dans un grondement sourd. En allant voir les grêlons de plus près, vous vous apercevez que ce sont en fait trois œufs doux et floconneux. Vous les ramassez et rentrez chez vous en flânant sous un ciel sans tache.",
+ "questSheepDropSheepEgg": "Mouton (Œuf)",
+ "questSheepUnlockText": "Déverrouille l'achat d’œufs de mouton au Marché"
}
\ No newline at end of file
diff --git a/common/locales/fr/settings.json b/common/locales/fr/settings.json
index 65b24fafcd..8f1e9ee1b0 100644
--- a/common/locales/fr/settings.json
+++ b/common/locales/fr/settings.json
@@ -93,7 +93,7 @@
"wonChallenge": "Vous avez Remporté un Défi",
"newPM": "Message Privé Reçu",
"giftedGems": "Gemmes Offertes",
- "giftedGemsInfo": "<%= amount %> Gems - by <%= name %>",
+ "giftedGemsInfo": "<%= amount %> Gemmes - de <%= name %>",
"giftedSubscription": "Abonnement Offert",
"invitedParty": "Invitation dans une Équipe",
"invitedGuild": "Invitation dans une Guilde",
diff --git a/common/locales/fr/tasks.json b/common/locales/fr/tasks.json
index f6c3daafa2..7e7ca9d0b1 100644
--- a/common/locales/fr/tasks.json
+++ b/common/locales/fr/tasks.json
@@ -14,7 +14,7 @@
"save": "Enregistrer",
"addChecklist": "Ajouter une Liste de vérification",
"checklist": "Liste de vérification",
- "checklistText": "Pour les tâches Quotidiennes, une liste de vérification partiellement complétée réduira les dommages. Par exemple, une liste de 4 lignes avec 3 d'entre elles complétées réduira les dommages pour cette tâche incomplète à 25%. \nLes lignes complétées sur une tâche À Faire ajoute un multiplicateur : 3 cases cochées donnent un multiplicateur de +3x (pour un total de +4x) sur l'Expérience, l'Or et le Mana. ",
+ "checklistText": "Morcelez vos tâches! Les listes de vérification augmentent le gain d'Expérience et d'Or pour les tâches À Faire, et réduisent les dommages infligés par les Quotidiennes. ",
"expandCollapse": "Développer/Réduire",
"text": "Texte",
"extraNotes": "Notes supplémentaires",
@@ -22,7 +22,7 @@
"advancedOptions": "Options avancées",
"difficulty": "Difficulté",
"difficultyHelpTitle": "Quelle est la difficulté de cette tâche ?",
- "difficultyHelpContent": "Ceci modifie sa valeur en points. A utiliser avec prudence, faites plutôt confiance à nos algorithmes organiques d'ajustement de valeur. Évidemment, certaines tâches ont plus de valeur que d'autres (écrire une thèse VS se brosser les dents). Cliquez pour plus d'informations.",
+ "difficultyHelpContent": "Plus une tâche est difficile, plus vous gagnez d'Expérience et d'Or lorsque vous la cochez... mais elle vous blesse d'autant plus si c'est une Quotidienne ou une Mauvaise Habitude!",
"easy": "Facile",
"medium": "Moyen",
"hard": "Difficile",
diff --git a/common/locales/he/backgrounds.json b/common/locales/he/backgrounds.json
index 32b768095c..93556d690d 100644
--- a/common/locales/he/backgrounds.json
+++ b/common/locales/he/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "אגם לנוף הרים",
"backgroundMountainLakeNotes": "לשכשך רגליים באגם לנוף הרים",
"backgroundPagodasText": "מקדש במזרח הרחוק",
- "backgroundPagodasNotes": "לטפס לראש המקדש."
+ "backgroundPagodasNotes": "לטפס לראש המקדש.",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/he/challenge.json b/common/locales/he/challenge.json
index 66f44a1c7b..8f0483b4ca 100644
--- a/common/locales/he/challenge.json
+++ b/common/locales/he/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "בחר מנצח וחתום את האתגר:",
"deleteOrSelect": "מחק או בחר מנצח",
"endChallenge": "חתום את האתגר",
- "challengeDiscription": "אלה הן משימות האתגר. בזמן שמשתמשים אחרים משתתפים באתגר, הן משנות צבעים ומקבלות גרפים המצביעים על ההתקדמות הכללית של הקבוצה.",
+ "challengeDiscription": "These are the Challenge's tasks that will be added to your task dashboard when you join this Challenge. The sample Challenge tasks below will change color and gain graphs to show you the overall progress of the group.",
"hows": "מה מצבם של כולם?",
"filter": "מסנן",
"groups": "קבוצות",
@@ -33,7 +33,8 @@
"challengeTagPop": "אתגרים מופיעים ברשימות-תגים ובכלי-משימות, כך שאתה צריך לתת להם בנוסף לכותרת מפורטת, שם קצר וקולע, למשל: 'לאבד 1.5 קילו ב3 חודשים' יכול להתקצר ל'-1.5 ק\"ג' (לחץ למידע נוסף)",
"challengeDescr": "תיאור",
"prize": "פרס",
- "prizePop": "אם מישהו יכול 'לנצח' באתגר שלך, יש לך את האפשרות לזכות אותו בפרס. תוכל/י להעניק לכל היותר כמספר אבני החן שלך (+ אבני החן של הגילדה שלך, אם את/ה ראש הגילדה של אתגר זה). הערה: לא ניתן לשנות את הפרס מאוחר יותר, ואבני החן לא יוחזרו לך גם אם תבטל/י את האתגר.",
+ "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.",
+ "prizePopTavern": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
"publicChallenges": "לכל הפחות אבן חן אחת לאתגרים ציבוריים (זה עוזר למנוע ספאם, אל תזלזל/י)",
"officialChallenge": "אתגר רשמי של האתר",
"by": "פורסם ע\"י",
@@ -43,6 +44,7 @@
"selectGroup": "אנא בחר/י קבוצה",
"challengeCreated": "האתגר נוצר בהצלחה",
"sureDelCha": "ביקשת למחוק את האתגר. בטוח/ה בזה?",
+ "sureDelChaTavern": "Delete challenge, are you sure? Your gems will not be refunded.",
"removeTasks": "הסר משימות",
"keepTasks": "שמור משימות",
"closeCha": "סגור את המשימות וגם...",
diff --git a/common/locales/he/character.json b/common/locales/he/character.json
index dfa73485de..fe881d4ed6 100644
--- a/common/locales/he/character.json
+++ b/common/locales/he/character.json
@@ -52,9 +52,11 @@
"costume": "תחפושת",
"costumeText": "אם אתה מעדיף להיראות אחרת מהדרך בה ציידת את דמותך, סמן את האפשרות \"השתמש בתחפושת\" כדי לעטות תחפושת מגניבה ומטריפת חושים, בעוד שהציוד האמיתי שלך יישאר חבוי מתחתיה.",
"useCostume": "שימוש בתחפושת",
- "gearAchievement": "הרווחת את התג ״ציוד מקסימלי\" על השגת הציוד הטוב ביותר למקצוע שלך!",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "ציוד מקסימלי",
- "ultimGearText": "שדרג את נשקיו ושריונו לדרגה הגבוהה ביותר",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "דרגה",
"levelUp": "עלית דרגה!",
"mana": "מאנה",
diff --git a/common/locales/he/content.json b/common/locales/he/content.json
index a78720fee9..245af9d0b7 100644
--- a/common/locales/he/content.json
+++ b/common/locales/he/content.json
@@ -1,6 +1,10 @@
{
"potionText": "שיקוי ריפוי",
"potionNotes": "מרפא 15 נק\"פ (שימוש מיידי)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "זאב",
"dropEggWolfAdjective": "נאמן",
"dropEggTigerCubText": "גור נמרים",
diff --git a/common/locales/he/front.json b/common/locales/he/front.json
index 153ebd81fa..c32e241276 100644
--- a/common/locales/he/front.json
+++ b/common/locales/he/front.json
@@ -172,5 +172,11 @@
"username": "שם משתמש",
"watchVideos": "צפה/י בסרטונים",
"work": "עבודה",
- "zelahQuote": "עם HabitRPG, אני משתכנע ללכת לישון בזמן מעצם המחשבה על השגת נקודות על שינה מוקדמת או איבוד אותן נקודות עבור שינה מאוחרת!"
+ "zelahQuote": "עם HabitRPG, אני משתכנע ללכת לישון בזמן מעצם המחשבה על השגת נקודות על שינה מוקדמת או איבוד אותן נקודות עבור שינה מאוחרת!",
+ "reportAccountProblems": "Report Account Problems",
+ "reportCommunityIssues": "Report Community Issues",
+ "generalQuestionsSite": "General Questions about the Site",
+ "businessInquiries": "Business Inquiries",
+ "merchandiseInquiries": "Merchandise Inquiries",
+ "marketingInquiries": "Marketing/Social Media Inquiries"
}
\ No newline at end of file
diff --git a/common/locales/he/gear.json b/common/locales/he/gear.json
index 64fda73dcb..e08eb8222c 100644
--- a/common/locales/he/gear.json
+++ b/common/locales/he/gear.json
@@ -120,6 +120,8 @@
"weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
"weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
"weaponMystery201502Notes": "For WINGS! For LOVE! For ALSO TRUTH! Confers no benefit. February 2015 Subscriber Item.",
+ "weaponMystery201505Text": "Green Knight Lance",
+ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "Steampunk Cane",
"weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",
"armor": "שריון",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "Who's a penguin? Confers no benefit. December 2014 Subscriber Item.",
"headMystery201501Text": "Starry Helm",
"headMystery201501Notes": "The constellations flicker and swirl in this helm, guiding the wearer's thoughts towards focus. Confers no benefit. January 2015 Subscriber Item.",
+ "headMystery201505Text": "Green Knight Helm",
+ "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 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",
diff --git a/common/locales/he/generic.json b/common/locales/he/generic.json
index 262fdddaf7..0ebab29864 100644
--- a/common/locales/he/generic.json
+++ b/common/locales/he/generic.json
@@ -5,7 +5,20 @@
"habitica": "האביטיקה",
"expandToolbar": "הרחב סרגל כלים",
"collapseToolbar": "הקטן סרגל כלים",
- "formattingMarkdown": "השתמש בטקסט פשוט",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*Italics*",
+ "bold": "**Bold**",
+ "strikethrough": "~~Strikethrough~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "הישגים",
"modalAchievement": "הישג!",
"special": "מיוחד",
diff --git a/common/locales/he/groups.json b/common/locales/he/groups.json
index 1ab75a14e8..b5c3f65ee7 100644
--- a/common/locales/he/groups.json
+++ b/common/locales/he/groups.json
@@ -109,5 +109,12 @@
"inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
"byColon": "By:",
"inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "inviteAlertInfo2": "Or share this link (copy/paste):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/he/npc.json b/common/locales/he/npc.json
index 4d8549a52e..f4832d7fa2 100644
--- a/common/locales/he/npc.json
+++ b/common/locales/he/npc.json
@@ -2,8 +2,8 @@
"npc": "דב\"ש",
"npcText": "גיבה את פרוייקט הקיקסטראטר במלוא המסירות!",
"mattBoch": "מאט בוך",
- "mattShall": "שאביא לך את חיית הרכיבה שלך, <%= name %>? לחץ/י על החיה עליה ברצונך לרכב.",
- "mattBochText1": "ברוכים הבאים לאורווה! אני מאט, אדון החיות. בחר/י חיית מחמד מאלו המופיעות כאן אשר תלך לצידך. האכל/האכילי אותן היטב והן תגדלנה לחיות רכיבה מרשימות.",
+ "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
+ "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
"daniel": "דניאל",
"danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
"danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
@@ -45,9 +45,9 @@
"tourScrollDown": "Be sure to scroll all the way down to see all the options! Click on your avatar again to return to the tasks page.",
"tourMuchMore": "When you're done with tasks, you can form a Party with friends, chat in the shared-interest Guilds, join Challenges, and more!",
"tourStatsPage": "This is your Stats page! Earn achievements by completing the listed tasks.",
- "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can freeze your account in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
+ "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
"tourPartyPage": "Your Party will help you stay accountable. Invite friends to unlock a Quest Scroll!",
"tourGuildsPage": "Guilds are social groups with common themes. Search for the subjects that interest you! We recommend the Newbies Guild.",
- "tourChallengesPage": "Joining a Challenge will add tasks to your account. Compete against other users to win gem prizes!",
+ "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
"tourMarketPage": "Starting at Level 4, eggs and hatching potions drop randomly when you complete tasks. They appear here - use them to hatch pets! You can also buy items from the Market."
}
\ No newline at end of file
diff --git a/common/locales/he/quests.json b/common/locales/he/quests.json
index a1e58e2aca..8b9d795149 100644
--- a/common/locales/he/quests.json
+++ b/common/locales/he/quests.json
@@ -19,7 +19,7 @@
"bossStrength": "עוצמת האויב",
"collect": "לאסוף",
"collected": "נאסף",
- "bossDmg1": "To hurt a boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "רק משתתפים שנלחמים בבוס חולקים בביזת המשימה.",
"tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossColl1": "כדי לאסוף חפצים, בצע/י מטלות חיוביות. חפצי קווסט נופלים ממש כמו חפצים רגילים, אם כי, את/ה לא תראה/י אותם עד היום הבא, בו כל מה שמצאה החבורה ייאסף לערימת המשימה.",
diff --git a/common/locales/he/tasks.json b/common/locales/he/tasks.json
index 9bb541cc37..0b0be55988 100644
--- a/common/locales/he/tasks.json
+++ b/common/locales/he/tasks.json
@@ -14,7 +14,7 @@
"save": "שמור",
"addChecklist": "הוסף רשימה חדשה",
"checklist": "רשימה",
- "checklistText": "עבור מטלות יומיות, רשימות שמולאו באופן חלקי יפחיתו את הנזק. למשל, רשימה בת 4 איברים אשר 3 מהם מסומנים מפחיתה את הנזק ל25%. רשימת משימות מלאה במטלת ביצוע מכפילה את הפס: כלומר 3 סימונים אומרים עוד 3X+ (כלומר סה\"כ 4X) לפרס ניסיון, הזהב, והמאנה.",
+ "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
"expandCollapse": "הרחבה/הקרסה",
"text": "טקסט",
"extraNotes": "רשימות נוספות",
@@ -22,7 +22,7 @@
"advancedOptions": "אפשרויות מתקדמות",
"difficulty": "רמת קושי",
"difficultyHelpTitle": "עד כמה קשה המשימה?",
- "difficultyHelpContent": "זה מכפיל את שווי הנקודות של המשימה. השתמש/י בכך לעיתים נדירות, ובמקום זאת הסתמך/י על אתגוריתמי הכיוונון האורגני שלנו. אם כי, משימות מסויימות שוות יותר באופן גורף (למשל כתיבת תזה לעומת צחצוח שיניים). לחץ לקבלת מידע נוסף.",
+ "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!",
"easy": "קל",
"medium": "בינוני",
"hard": "קשה",
diff --git a/common/locales/hu/backgrounds.json b/common/locales/hu/backgrounds.json
index 7cdab6e2f9..254e912dbc 100644
--- a/common/locales/hu/backgrounds.json
+++ b/common/locales/hu/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "Hegyi tó",
"backgroundMountainLakeNotes": "Mártsd bele a lábujjad egy hegyi tóba",
"backgroundPagodasText": "Pagodák",
- "backgroundPagodasNotes": "Mássz fel a csúcsra a Pagodákig"
+ "backgroundPagodasNotes": "Mássz fel a csúcsra a Pagodákig",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/hu/challenge.json b/common/locales/hu/challenge.json
index 4cd20e3016..787e6938f8 100644
--- a/common/locales/hu/challenge.json
+++ b/common/locales/hu/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Válassz győztest és zárd le a kihívást:",
"deleteOrSelect": "Győztes törlése vagy kiválasztása",
"endChallenge": "Kihívás befejezése",
- "challengeDiscription": "Ezek a kihívás feladatai. Ahogy a résztvevők haladnak vele, a színük változni fog és megjelennek a grafikonon, ahol láthatod a csoport haladását.",
+ "challengeDiscription": "Ezek a kihívás feladatai, amik a feladataid közé kerülnek, amikor a kihíváshoz csatlakozol. Lent, a kihíváshoz tartozó feladatok színe meg fog változni és grafikonokat is kapnak, hogy láthasd az egész csoport teljesítményét.",
"hows": "Hogy haladtok?",
"filter": "Szűrő",
"groups": "Csoportok",
@@ -33,7 +33,8 @@
"challengeTagPop": "A kihívások cimkékben és tippekben jellennek meg, tehát kell egy bő és egy rövid leírás pl: \"Fogyj 10 kilót 3 hónap alatt\"-ból \"-10kg\" lesz (Kattints bővebb infókért).",
"challengeDescr": "Leírás",
"prize": "Jutalom",
- "prizePop": "Ha valaki meg tudja \"nyerni\" a kihívásodat, akkor opcionálisan ajándékozhatsz neki Drágakövet. Max = drágaköveid száma (+ céh drágaköveinek száma, ha te hoztad létre a kihívás céhét). Megjegyzés: A díjat nem tudod később megváltoztatni, és akkor sem kapod vissza, ha a kihívást visszavonják.",
+ "prizePop": "Ha valaki meg tudja \"nyerni\" a kihívásodat, akkor opcionálisan ajándékozhatsz neki Drágakövet. Max = drágaköveid száma (+ céh drágaköveinek száma, ha te hoztad létre a kihívás céhét). Megjegyzés: A díjat nem tudod később megváltoztatni.",
+ "prizePopTavern": "Ha valaki meg tudja \"nyerni\" a kihívásodat, akkor opcionálisan ajándékozhatsz neki Drágakövet. Max = drágaköveid száma (+ céh drágaköveinek száma, ha te hoztad létre a kihívás céhét). Megjegyzés: A díjat nem tudod később megváltoztatni, és a Fogadós kihívások esetén akkor sem kapod vissza, ha a kihívást visszavonod.",
"publicChallenges": "Legalább 1 Drágakő nyílvános kihívásoknak . Segít megakadályozni a spamelést (valóban segít).",
"officialChallenge": "Hivatalos HabitRPG kihívás",
"by": "által",
@@ -43,6 +44,7 @@
"selectGroup": "Válassz csoportot",
"challengeCreated": "Kihívás létrehozva",
"sureDelCha": "Biztosan törlöd a kihívást?",
+ "sureDelChaTavern": "Biztosan törlöd a kihívást? A drágaköveket nem kapod vissza.",
"removeTasks": "Feladatok eltávolítása",
"keepTasks": "Feladatok megtartása",
"closeCha": "Kihívás bezárása és ...",
diff --git a/common/locales/hu/character.json b/common/locales/hu/character.json
index 20fb85c745..7b707dca4f 100644
--- a/common/locales/hu/character.json
+++ b/common/locales/hu/character.json
@@ -52,9 +52,11 @@
"costume": "Ruha",
"costumeText": "Ha tetszenek a ruhák, amiket hordasz, akkor pipáld ki a \"Ruha használata\" gombot, hogy felöltsd őket és a harci felszereléseid felett látszódjanak.",
"useCostume": "Ruha használata",
- "gearAchievement": "Elérted a \"Tökéletes harci felszerelés\" Kitűntetést, amiért a maximumra fejlesztetted a felszerelésedet.",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Tökéletes harci felszerelés",
- "ultimGearText": "Már felfejlesztetted a maximálisra a fegyeredet és a páncéljaidat",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Szint",
"levelUp": "Szintet léptél!",
"mana": "Mana",
@@ -70,7 +72,7 @@
"allocatePerPop": "Egy pont hozzáadása az Észleléshez",
"allocateInt": "Intelligenciára költött pontok: ",
"allocateIntPop": "Egy pont hozzáadása az Intelligenciához: ",
- "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue leveling up, or start a new adventure at level 1 by using the Orb of Rebirth, now available for free in the Market.",
+ "noMoreAllocate": "Most, hogy elérted a 100-as szintet, nem kapsz több pontot a tulajdonságaidhoz. A szintedet tovább növelheted, vagy egy újabb kalandba kezdhetsz az Újjászületés Gömbjével, ami mostantól ingyenesen elérhető a piacon.",
"stats": "Karakterlap",
"strength": "Erő",
"strengthText": "Az erő növeli a \"kritikus csapások\" esélyét, növeli az arany és a tapasztalat szerzést, valamint a zsákmányok szerzésének esélyét. Továbbá segít a főellenségek sebzésében.",
diff --git a/common/locales/hu/content.json b/common/locales/hu/content.json
index d1e0abb53f..3b90e71a62 100644
--- a/common/locales/hu/content.json
+++ b/common/locales/hu/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Gyógyital",
"potionNotes": "Helyreállít 15 életerő pontot (azonnali használat)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "Farkas",
"dropEggWolfAdjective": "hűséges",
"dropEggTigerCubText": "Tigriskölyök",
@@ -56,8 +60,8 @@
"questEggBunnyAdjective": "cuki",
"questEggSlimeText": "Pillecukor ragacs",
"questEggSlimeAdjective": "édes",
- "questEggSheepText": "Sheep",
- "questEggSheepAdjective": "woolly",
+ "questEggSheepText": "Bárány",
+ "questEggSheepAdjective": "gyapjas",
"eggNotes": "Keress egy keltetőfőzetet ehhez a tojáshoz, és egy <%= eggAdjective(locale) %> <%= eggText(locale) %> kel majd ki belőle.",
"hatchingPotionBase": "Alap",
"hatchingPotionWhite": "Fehér",
diff --git a/common/locales/hu/front.json b/common/locales/hu/front.json
index 72c7b444ef..59ec4293a1 100644
--- a/common/locales/hu/front.json
+++ b/common/locales/hu/front.json
@@ -2,22 +2,22 @@
"FAQ": "GYIK",
"accept1Terms": "Az alábbi gomb megnyomásával elfogadom a",
"accept2Terms": "és az",
- "alexandraQuote": "Couldn't NOT talk about HabitRPG during my speech in Madrid. Must-have tool for freelancers who still need a boss.",
- "althaireQuote": "Having a quest constantly on really motivates me to do all my dailies and do all my to-dos. My biggest motivation is not letting my party down.",
- "andeeliaoQuote": "Awesome product, just started a few days ago and already more conscious and productive with my time!",
- "autumnesquirrelQuote": "I'm procrastinating less on work and housework and pay bills on time.",
- "businessSample1": "Confirm 1 page of Inventory",
- "businessSample2": "20 mins Filing",
- "businessSample3": "Sort and Process Inbox",
- "businessSample4": "Prepare 1 Document for Client",
- "businessSample5": "Call Clients/Put Off Phone Calls",
- "businessText": "Use HabitRPG at your business",
- "choreSample1": "Put Dirty Clothes in Hamper",
- "choreSample2": "20 mins of Housework",
- "choreSample3": "Wash a Load of Dishes",
- "choreSample4": "Tidy One Room",
- "choreSample5": "Wash and Dry a Load of Clothes",
- "chores": "Chores",
+ "alexandraQuote": "Nem tudtam kihagyni a HabitRPG-t a beszédemből Madridban. Ez egy kötelező eszköz minden olyan vállalkozónak, akinek még mindig szüksége van egy főnökre.",
+ "althaireQuote": "Folyamatos aktív küldetés a legnagyobb motivációm arra, hogy minden napi feladatomat és tennivalómat elvégezzem. A legnagyobb motivációm az, hogy nem hagyhatom a csoportomat elbukni.",
+ "andeeliaoQuote": "Bámulatos termék, még csak néhány napja kezdtem el használni és már most tudatosabb és hatékonyabb vagyok az időmmel.",
+ "autumnesquirrelQuote": "Kevesebbet halogatom a munkám és a házimunkát, és a csekkeket is időben fizetem.",
+ "businessSample1": "1 oldal nyilvántartás jóváhagyása",
+ "businessSample2": "20 perc iktatás",
+ "businessSample3": "Bejövő levelek rendezése és feldolgozása",
+ "businessSample4": "1 ügyféldokumentum elkészítése",
+ "businessSample5": "Ügyfeleket Felhívni/Hívásokat elhalasztani",
+ "businessText": "Használd a HabitRPG-t az üzleti életben",
+ "choreSample1": "Piszkos ruhákat a szennyestartóba",
+ "choreSample2": "20 perc házimunka",
+ "choreSample3": "Elmosogatni a piszkos edényeket",
+ "choreSample4": "Egy szoba kitakarítása",
+ "choreSample5": "Kimosni és megszárítani a ruhákat",
+ "chores": "Házimunka",
"communityBug": "Programhiba bejelentése",
"communityExtensions": "Kiegészítők és kiterjesztések",
"communityFacebook": "Facebook",
@@ -32,50 +32,50 @@
"companyPrivacy": "Titoktartás",
"companyTerms": "Feltételek",
"companyVideos": "Videók",
- "contribUse": "HabitRPG contributors use",
- "dragonsilverQuote": "I can't tell you how many time and task tracking systems I've tried over the decades... HRPG is the only thing I've used that actually helps me get things done rather than just list them.",
- "dreimQuote": "When I discovered HabitRPG last summer, I had just failed about half of my exams. Thanks to the Dailies… I was able to organize and discipline myself, and I actually passed all my exams with really good grades a month ago.",
- "elmiQuote": "Every morning I'm looking forward to getting up so I can earn some gold!",
+ "contribUse": "Eszközök, amiket a HabitRPG közreműködök használnak",
+ "dragonsilverQuote": "El sem tudom mondani, mennyi idő- és folyamatmenedzsment rendszert próbáltam ki az elmúlt évtizedekben... A HRPG az egyetlen olyan, ami gyakorlatilag segít abban, hogy megcsináljam a dolgaim és ne csak felírjam őket ",
+ "dreimQuote": "Éppen megbuktam a vizsgáim felén tavaly nyáron, amikor felfedeztem a HabitRPG-t. Hála a Napi feladatoknak… sikerült összeszerveznem és fegyelmeznem magam, és gyakorlatilag minden vizsgámon nagyon jó jegyekkel mentem át.",
+ "elmiQuote": "Minden reggel várom, hogy felkelhessek, hogy elkezdhessek aranyat gyűjteni!",
"email": "Email",
"emailNewPass": "Új jelszó kérése",
- "evagantzQuote": "My very first dentist appointment where the hygienist was actually excited about my flossing habits. Thanks Habitrpg!",
- "examplesHeading": "Players use HabitRPG to manage...",
- "featureAchievementByline": "Do something totally awesome? Get a badge and show it off!",
- "featureAchievementHeading": "Achievement Badges",
- "featureEquipByline": "Buy limited edition equipment, potions, and other virtual goodies in our Market with your task rewards!",
- "featureEquipHeading": "Equipment and extras",
- "featurePetByline": "Eggs and items drop when you complete your tasks. Be as productive as possible to collect pets and mounts!",
- "featurePetHeading": "Pets and Mounts",
- "featureSocialByline": "Join common-interest groups with like-minded people. Create Challenges to compete against other users.",
- "featureSocialHeading": "Social play",
- "featuredIn": "Featured in",
- "featuresHeading": "We also feature...",
+ "evagantzQuote": "A legelső fogorvosi látogatásom, ahol a fogászom gyakorlatilag izgatott volt a fogápolási szokásaim miatt. Köszi HabitRPG!",
+ "examplesHeading": "Mire is használják a játékosok a HabitRPG-t...",
+ "featureAchievementByline": "Valami állatit csináltál? Szerezz egy jelvényt és dicsekedj vele!",
+ "featureAchievementHeading": "Kitüntetések",
+ "featureEquipByline": "Vegyél magadnak a feladataid jutalmából korlátozott kiadású felszereléseket, italokat, és más virtuális cuccokat a Piacon.",
+ "featureEquipHeading": "Felszerelés és extrák",
+ "featurePetByline": "Tojásokat és tárgyakat találhatsz, amikor teljesíted a feladataid. Légy a lehető legproduktívabb, hogy összegyűjtsd az állatokat és a hátasokat.",
+ "featurePetHeading": "Állatok és hátasok",
+ "featureSocialByline": "Csatlakozz közös érdeklődésű csoportba hasonló gondolkodású emberekkel. Hozz létre kihívásokat, így versenyezhetsz másik felhasználókkal.",
+ "featureSocialHeading": "Közösségi élmény",
+ "featuredIn": "Megjelent",
+ "featuresHeading": "További lehetőségek...",
"footerCommunity": "Közösség",
"footerCompany": "Cég",
"footerMobile": "Mobil",
"footerSocial": "Közösség",
"forgotPass": "Elfelejtettem a jelszavam",
- "frabjabulousQuote": "HabitRPG is the reason I got a killer, high-paying job... and even more miraculous, I'm now a daily flosser!",
- "free": "Play for free",
- "gamifyButton": "Gamify your life today!",
- "goalSample1": "Practice Piano for 1 Hour",
- "goalSample2": "Work on article for publication",
- "goalSample3": "Work on blog post",
- "goalSample4": "Japanese lesson on Duolingo",
- "goalSample5": "Read an Informative Article",
- "goals": "Goals",
- "health": "Health",
- "healthSample1": "Drink Water/Soda",
- "healthSample2": "Chew Gum/Smoke",
- "healthSample3": "Take Stairs/Elevator",
- "healthSample4": "Eat Healthy/Junk Food",
- "healthSample5": "Break a Sweat for 1 hr",
+ "frabjabulousQuote": "A HabitRPG az, amiért egy király, nagyon jól fizető állást kaptam... és ami még csodálatosabb, naponta használok fogselymet.",
+ "free": "Játssz ingyen",
+ "gamifyButton": "Tedd játékká az életed ma!",
+ "goalSample1": "1 óra zongora gyakorlás",
+ "goalSample2": "Egy cikk a publikálashoz",
+ "goalSample3": "Blog cikk írása",
+ "goalSample4": "Japán lecke a Duolinguo-n",
+ "goalSample5": "Hasznos cikk elolvasása",
+ "goals": "Célok",
+ "health": "Egészség",
+ "healthSample1": "Víz/Üdítő ivás",
+ "healthSample2": "Rágózás/Dohányzás",
+ "healthSample3": "Lépcsőzés/Liftezés",
+ "healthSample4": "Egészséges étel/Gyorskaja",
+ "healthSample5": "1 óra edzés",
"history": "Előzmények",
- "infhQuote": "HabitRPG has really helped me impart structure to my life in graduate school.",
+ "infhQuote": "HabitRPG tényleg segített szervezettséget vinni az egyetemi életembe.",
"invalidEmail": "A jelszó resethez érvényes email cím szükséges.",
- "irishfeet123Quote": "I've had horrible habits with clearing my place completely after meals and leaving cups all over the place. HabitRPG has cured that!",
- "joinOthers": "Join 200,000 people making it fun to achieve goals!",
- "kazuiQuote": "Before HabitRPG, 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.",
+ "irishfeet123Quote": "Szörnyű szokásom volt, hogy nem takarítottam el az étkezések után és mindenhol poharakat hagytam. HabitRPG megjavította ezt!",
+ "joinOthers": "Csatlakozz ahhoz a 200.000 emberhez, akik szórakozva érik el céljukat.",
+ "kazuiQuote": "A HabitRPG előtt megragadtam a diplomamunkámmal, ezenkívül elégedetlen voltam az olyan dolgokhoz való hozzáállásommal, mint a házimunka, a szótanulás vagy a Go elméletének tanulmányozása. Végül kiderült, hogy motivál és folyamatosan tudok dolgozni, hogyha ezeket a feladatokat kisebb, könnyen kezelhető listába rendezem.",
"landingadminlink": "adminisztratív csomagunkat",
"landingend": "Nem győzött még meg?",
"landingend2": "Lásd részletesebb listánkat",
@@ -89,7 +89,7 @@
"landingp3header": "Következmények",
"landingp4": "A HabitRPG aktív közössége megadja azt az elszámolási kötelezettséget, ami segít neked a feladataidra fókuszálni. A csapat rendszerrel magaddal hozhatod a közeli barátaid csoportját, hogy segítsenek. A céh rendszer lehetővé teszi, hogy olyan embereket találj, akiknek hasonló az érdeklődése, vagy hasonló problémákkal küzdenek, így megoszthatjátok a céljaitokat és ötleteket cserélhettek a problémáitok megoldásához. A HabitRPG-n a közösség azt jelenti, hogy rendelkezésedre áll a támogatás és az elszámoltathatóság, ami ahhoz kell, hogy sikeres légy.",
"landingp4header": "Elszámolási kötelezettség",
- "leadText": "HabitRPG is a free habit building and productivity app that treats your real life like a game. With in-game rewards and punishments to motivate you and a strong social network to inspire you, HabitRPG can help you achieve your goals to become healthy, hard-working, and happy.",
+ "leadText": "A HabitRPG egy szokás kiépítő és termelékenységnövelő ingyenes alkalmazás, ami az életet játékként kezeli. Beépített jutalmakkal, büntetésekkel és erős közösségi hálózattal inspirálva, a HabitRPG segíteni tud neked elérni a céljaidat, hogy egészséges, szorgalmas és boldog legyél.",
"login": "Belépés",
"loginAndReg": "Belépés / Regisztráció",
"loginFacebookAlt": "Belépés / Regisztráció Facebookal",
@@ -119,58 +119,64 @@
"marketing4Lead3Title": "Játékosíts mindent",
"mobileAndroid": "Android",
"mobileIOS": "iOS",
- "motivate": "Motivate yourself and your team!",
- "motivate1": "Motivate yourself to do anything.",
- "motivate2": "Get Organized. Get Motivated. Get Gold.",
+ "motivate": "Motiváld magad és a csapatod!",
+ "motivate1": "Motiváld magad, hogy csinálj valamit.",
+ "motivate2": "Szerezz szervezettséget. Szerezz motivációt. Szerezz aranyat.",
"passConfirm": "Jelszó megerősítése",
"passMan": "Ha egy jelszó karbantartót használsz (mint az 1Password) és problémát okoz a belépés, akkor próbáld meg beírni a felhasználónevedet és a jelszavadat kézzel.",
"password": "Jelszó",
"playButton": "Játssz",
- "playButtonFull": "Play HabitRPG",
+ "playButtonFull": "Játssz",
"presskit": "Sajtókészlet",
"presskitDownload": "Összes kép letöltése:",
"presskitText": "Köszönjük érdeklődését a HabitRPG iránt! Amennyiben cikket ír vagy videót készít a HabitRPG-ről használja az alábbi képeket. További információkért kérjük lépjen kapcsolatba Siena Leeslie-vel a leslie@habitrpg.com címen. ",
"privacy": "Adatvédelmi nyilatkozat",
"psst": "Psszt",
- "punishByline": "Break bad habits and procrastination cycles with immediate consequences.",
- "punishHeading1": "Miss a daily goal?",
- "punishHeading2": "Lose health!",
- "questByline1": "Playing with your friends keeps you accountable for your tasks.",
- "questByline2": "Issue each other Challenges to complete a goal together!",
- "questHeading1": "Battle monsters with your friends!",
- "questHeading2": "If you slack off, they all get hurt!",
+ "punishByline": "Szakíts a rossz szokásokkal és halogatással azonnali következményekkel.",
+ "punishHeading1": "Kihagytál egy napi feladatot?",
+ "punishHeading2": "Veszíts életerőt!",
+ "questByline1": "Ha barátokkal játszol felelős tudsz maradni a feladataidért.",
+ "questByline2": "Készítsetek kihívásokat egymásnak, hogy hamarabb elérjétek a céljaitokat.",
+ "questHeading1": "Harcolj szörnyek ellen a barátaiddal.",
+ "questHeading2": "Ha hanyag vagy, akkor mindenki megsérül.",
"register": "Regisztráció",
- "rewardByline1": "Spend gold on virtual and real-life rewards.",
- "rewardByline2": "Instant rewards keep you motivated!",
- "rewardHeading": "Complete a task to earn gold!",
- "sampleDailies": "Sample Dailies",
- "sampleHabits": "Sample Habits",
- "sampleToDo": "Sample To-Dos",
- "school": "School",
- "schoolSample1": "Finish 1 Assignment",
- "schoolSample2": "Study 1 hour",
- "schoolSample3": "Meet with Study Group",
- "schoolSample4": "Notes for 1 Chapter",
- "schoolSample5": "Read 1 Chapter",
- "sixteenBitFilQuote": "I'm getting my jobs and tasks done in record time thanks to HabitRPG. I'm just always so eager to reach my next level-up!",
- "skysailorQuote": "My party and our quests keep me engaged in the game, which keeps me motivated to get things done and change my life in positive ways",
+ "rewardByline1": "Költsd el az aranyat virtuális és valós jutalmakra.",
+ "rewardByline2": "Azonnali jutalmak motiválnak folyamatosan.",
+ "rewardHeading": "Teljesítsd a feladatod és szerezz aranyat!",
+ "sampleDailies": "Minta napi feladatok",
+ "sampleHabits": "Minta szokások",
+ "sampleToDo": "Minta Tennivalók",
+ "school": "Iskola",
+ "schoolSample1": "Befejezni 1 megbízást",
+ "schoolSample2": "1 óra tanulás",
+ "schoolSample3": "Találkozni a tanulócsoporttal",
+ "schoolSample4": "1 fejezetet kijegyzetelni",
+ "schoolSample5": "1 fejezet elolvasása",
+ "sixteenBitFilQuote": "Rekord idő alatt végzek a munkámmal és a feladataimmal hála a HabitRPG-nel. Alig bírom kivárni, hogy újra szintet léphessek.",
+ "skysailorQuote": "A csoportom és a küldetésünk a játékban tartanak, ami motivál a feladataim elvégzésében és jó irányban változtatja meg az életem",
"socialTitle": "HabitRPG | Játszd az életed",
- "supermouse35Quote": "I'm exercising more and I haven't forgotten to take my meds for months! Thanks, Habit. :D",
+ "supermouse35Quote": "Többet edzek és már hónapok óta nem felejtettem el bevenni a gyógyszereimet! Köszi, Habit. :D",
"sync": "Szinkronizálás",
"tasks": "Feladatok",
- "teamSample1": "Outline Meeting Itinerary for Tuesday",
+ "teamSample1": "Megbeszélés vázlat előkészítése keddre",
"teamSample2": "Brainstorm Growth Hacking",
- "teamSample3": "Discuss this week’s KPIs",
- "teams": "Teams",
+ "teamSample3": "Heti KPI megbeszélése",
+ "teams": "Csoportok",
"terms": "Általános Szerződési Feltételeket",
- "testimonialHeading": "What people say...",
+ "testimonialHeading": "Játékosok véleménye...",
"tutorials": "Oktatóanyagok",
- "unlockByline1": "Achieve your goals and level up.",
- "unlockByline2": "Unlock new motivational tools, such as pet collecting, random rewards, spell-casting, and more!",
- "unlockHeadline": "As you stay productive, you unlock new content!",
+ "unlockByline1": "Érd el a céljaid és lépj szintet.",
+ "unlockByline2": "Oldj fel újabb motivációs eszközöket, mint például állat gyűjtés, véletlenszerű jutalmak, varázslás, és még sok más!",
+ "unlockHeadline": "Minél tovább maradsz produktív, annál több új tartalmat érhetsz el!",
"useUUID": "Használj UUID / API Kulcs (Facebook felhasználóknak) párost",
"username": "Felhasználónév",
"watchVideos": "Nézz videókat",
- "work": "Work",
- "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!"
+ "work": "Munka",
+ "zelahQuote": "A HabitRPG-vel, rá tudom venni magam, hogy időben menjek az ágyba; azzal az egyszerű gondolattal, hogy ha időben ágyba megyek, akkor pontot kapok, ha pedig későn, akkor életet vesztek.",
+ "reportAccountProblems": "Fiók problémák jelentése",
+ "reportCommunityIssues": "Közösségi problémák jelentése",
+ "generalQuestionsSite": "Általános kérdések az oldalról",
+ "businessInquiries": "Üzleti információk",
+ "merchandiseInquiries": "Termék információk",
+ "marketingInquiries": "Marketing/Közösségi média információk"
}
\ No newline at end of file
diff --git a/common/locales/hu/gear.json b/common/locales/hu/gear.json
index a2a2c1e205..645802ab31 100644
--- a/common/locales/hu/gear.json
+++ b/common/locales/hu/gear.json
@@ -120,6 +120,8 @@
"weaponMystery201411Notes": "Szúrd le az ellenségeidet vagy túrj bele kedvenc eledeleidbe - ezzel a sokoldalú vasvillával mindent megtehetsz! Nem ad bónuszt. 2014 Novemberi előfizetői tárgy.",
"weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
"weaponMystery201502Notes": "For WINGS! For LOVE! For ALSO TRUTH! Confers no benefit. February 2015 Subscriber Item.",
+ "weaponMystery201505Text": "Zöld lovagi lándzsa",
+ "weaponMystery201505Notes": "Ez a zöld-ezüst lándzsa sok lovagot ütött már ki a nyergéből. Nem ad semmi előnyt. 2015 májusi előfizetői tárgy",
"weaponMystery301404Text": "Steampunk sétabot",
"weaponMystery301404Notes": "Kiváló arra, hogy tegyél egy sétát a városban vele. 3015 Márciusi előfizetői tárgy. Nem ad bónuszt.",
"armor": "páncél",
@@ -344,7 +346,7 @@
"headSpecialWinter2015MageNotes": "E sapka anyaga változik és világít amikor a viselője tanul. Növeli az észlelésedet <%= per %> ponttal. Korlátozott Példányszámú 2014-2015-ös Téli felszerelés!",
"headSpecialWinter2015HealerText": "Körülölelő Fülvédő",
"headSpecialWinter2015HealerNotes": "Ezek a meleg fülvédők megvédenek a hidegrázástól és a zavaró hangoktól. Növeli az intelligenciát <%= int %> ponttal. Korlátozott Példányszámú 2014-2015-ös Téli felszerelés.",
- "headSpecialSpring2015RogueText": "Fireproof Helm",
+ "headSpecialSpring2015RogueText": "Tűzálló sisak",
"headSpecialSpring2015RogueNotes": "Fire? HAH! You squeak fiercely in the face of fire! Increases Perception by <%= per %>. Limited Edition 2015 Spring Gear.",
"headSpecialSpring2015WarriorText": "Beware Helm",
"headSpecialSpring2015WarriorNotes": "Beware the Helm! Only a fierce doggy can wear it. Stop laughing. Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "Na ki a pingvin? Nem ad bónuszt. 2014 decemberi előfizetői tárgy.",
"headMystery201501Text": "Csillagos Sisak",
"headMystery201501Notes": "A csillagképek hunyorognak és kavarognak ebben a sisakban, fókuszálva a viselő gondolatait. Nem ad semmi előnyt. 2015 januári előfizetői tárgy.",
+ "headMystery201505Text": "Zöld lovag sisak",
+ "headMystery201505Notes": "A zöld tollazat büszkén hullámzik ezen a vas sisakon. Nem ad semmi előnyt. 2015 májusi előfizetői tárgy",
"headMystery301404Text": "Elegáns Cilinder",
"headMystery301404Notes": "Egy elegáns cilinder a legnemesebb előkelőségeknek! 3015 januári előfizetői tárgy. Nem ad semmi előnyt.",
"headMystery301405Text": "Egyszerű Cilinder",
@@ -466,8 +470,8 @@
"bodySpecialSummerHealerText": "Korall nyaklánc",
"bodySpecialSummerHealerNotes": "Stílusos nyaklánc élő korallból. Nem ad bónuszt. Korlátozott Példányszámú 2014 Nyári Felszerelés.",
"headAccessory": "head accessory",
- "accessories": "Accessories",
- "animalEars": "Animal Ears",
+ "accessories": "Kiegészítők",
+ "animalEars": "Állat fülek",
"headAccessoryBase0Text": "Nincs fej kiegészítő",
"headAccessoryBase0Notes": "Nincs fej kiegészítő.",
"headAccessorySpecialSpringRogueText": "Lila macskafülek",
@@ -478,11 +482,11 @@
"headAccessorySpecialSpringMageNotes": "Ezek a kerek egérfülek pihepuhák. Nem ad bónuszt. Korlátozott példányszámú 2014-es Tavaszi Felszerelés.",
"headAccessorySpecialSpringHealerText": "Sárga kutya fülek",
"headAccessorySpecialSpringHealerNotes": "Lecsüngenek, de cukik. Akarsz játszani? Nem ad bónuszt. Korlátozott példányszámú 2014-es Tavaszi Felszerelés.",
- "headAccessorySpecialSpring2015RogueText": "Yellow Mouse Ears",
+ "headAccessorySpecialSpring2015RogueText": "Sárga egér fülek",
"headAccessorySpecialSpring2015RogueNotes": "These ears steel themselves against the sound of explosions. Confers no benefit. Limited Edition 2015 Spring Gear.",
- "headAccessorySpecialSpring2015WarriorText": "Purple Dog Ears",
+ "headAccessorySpecialSpring2015WarriorText": "Lila kutya fülek",
"headAccessorySpecialSpring2015WarriorNotes": "They are purple. They are dog ears. Do not waste your time with further foolishness. Confers no benefit. Limited Edition 2015 Spring Gear.",
- "headAccessorySpecialSpring2015MageText": "Blue Bunny Ears",
+ "headAccessorySpecialSpring2015MageText": "Kék nyuszifülek",
"headAccessorySpecialSpring2015MageNotes": "These ears listen keenly, in case somewhere a magician is revealing secrets. Confers no benefit. Limited Edition 2015 Spring Gear.",
"headAccessorySpecialSpring2015HealerText": "Green Kitty Ears",
"headAccessorySpecialSpring2015HealerNotes": "These cute kitty ears will make others green with envy. Confers no benefit. Limited Edition 2015 Spring Gear.",
diff --git a/common/locales/hu/generic.json b/common/locales/hu/generic.json
index fa378193aa..dffa15b372 100644
--- a/common/locales/hu/generic.json
+++ b/common/locales/hu/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitika",
"expandToolbar": "Eszköztár lenyitása",
"collapseToolbar": "Eszköztár összecsukása",
- "formattingMarkdown": "Markdown formázás engedélyezve",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*Italics*",
+ "bold": "**Bold**",
+ "strikethrough": "~~Strikethrough~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "Kitűntetések",
"modalAchievement": "Kitűntetés!",
"special": "Különleges",
diff --git a/common/locales/hu/groups.json b/common/locales/hu/groups.json
index 67af98de11..4698d9b264 100644
--- a/common/locales/hu/groups.json
+++ b/common/locales/hu/groups.json
@@ -109,5 +109,12 @@
"inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
"byColon": "By:",
"inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "inviteAlertInfo2": "Or share this link (copy/paste):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/hu/npc.json b/common/locales/hu/npc.json
index ee5a29be08..683d60c76a 100644
--- a/common/locales/hu/npc.json
+++ b/common/locales/hu/npc.json
@@ -2,8 +2,8 @@
"npc": "NJK",
"npcText": "Támogatta a Kickstarter projektet a maximális szinten!",
"mattBoch": "Matt Boch",
- "mattShall": "Hozzam-e elő a paripád, <%= name %>? Klikkelj, hogy felpattanj a nyeregbe.",
- "mattBochText1": "Üdvözlet az Istállóban! Én Matt vagyok, a bestiamester. Itt választhatsz háziállatot kísérőnek. Ha eteted őket, akkor erős paripákká fognak nőni.",
+ "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
+ "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
"daniel": "Daniel",
"danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
"danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
@@ -45,9 +45,9 @@
"tourScrollDown": "Lapozz le teljesen az oldal aljára, hogy biztosan lásd az összes beállítási lehetőséget! Kattints még egyszer az avatárodra, hogy visszamenj a feladataidhoz.",
"tourMuchMore": "Ha végeztél a feladataiddal, akkor csinálhatsz csapatot a barátaiddal, társaloghatsz a hasonló érdeklődésű céhekben, kihívásokhoz csatlakozhatsz és még sok hasonlóval foglalkozhatsz!",
"tourStatsPage": "This is your Stats page! Earn achievements by completing the listed tasks.",
- "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can freeze your account in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
+ "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
"tourPartyPage": "Your Party will help you stay accountable. Invite friends to unlock a Quest Scroll!",
"tourGuildsPage": "Guilds are social groups with common themes. Search for the subjects that interest you! We recommend the Newbies Guild.",
- "tourChallengesPage": "Joining a Challenge will add tasks to your account. Compete against other users to win gem prizes!",
+ "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
"tourMarketPage": "Starting at Level 4, eggs and hatching potions drop randomly when you complete tasks. They appear here - use them to hatch pets! You can also buy items from the Market."
}
\ No newline at end of file
diff --git a/common/locales/hu/quests.json b/common/locales/hu/quests.json
index eeff782d80..5132c68b2a 100644
--- a/common/locales/hu/quests.json
+++ b/common/locales/hu/quests.json
@@ -19,7 +19,7 @@
"bossStrength": "Főellenség ereje",
"collect": "Gyűjts be",
"collected": "Begyűjtve",
- "bossDmg1": "Hogy sebezd a főellenséget, teljesítsd a Napi feladataidat és a Teendőidet. A nagyobb feladat sebzés nagyobb főellenség sebzést is jelent (piros feladatok elvégzése, Mágus varázslatok, Harcos támadások, stb.). A főszörny a küldetés minden résztvevőjét sebezni fogja minden elmulasztott Napi feladatért (megszorozva a Főellenség erejével), a normál sebzés mellé, szóval tartsd a csapatod egészségesen a Napi feladatok elvégzésével! Minden sebzés a nap végén számolódik (a napfordulódon)",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "Csak a résztvevők harcolnak a főellenséggel és ők osztják meg a küldetés zsákmányát is.",
"tavernBossInfo": "Hogy sebezd a világi főellenséget, teljesítsd a Napi feladataidat és a Teendőidet. A nagyobb feladat sebzés nagyobb főellenség sebzést is jelent (piros feladatok elvégzése, Mágus varázslatok, Harcos támadások, stb.). Minden elmulasztott Napi feladatod (szorozva a szörny erejével) tovább haragítja a főszörnyet. Ha eléri a maximális őrjöngést, akkor valami nagyon rossz fog történni - szóval végezd el a Napi feladataidat! Minden sebzés a nap végén számolódik (a napfordulódon)",
"bossColl1": "Tárgygyűjtéshez végezd el a pozitív feladataidat. Küldetés tárgyak ugyanúgy esnek, mint normál tárgyak; bár ezeket nem látod a következő napig, amikor minden, amit találtál össze lesz vonva és hozzátéve a halomhoz.",
diff --git a/common/locales/hu/settings.json b/common/locales/hu/settings.json
index 54adc2ec60..3d4126a673 100644
--- a/common/locales/hu/settings.json
+++ b/common/locales/hu/settings.json
@@ -98,7 +98,7 @@
"invitedParty": "Meghívva egy csapatba",
"invitedGuild": "Meghívva egy céhbe",
"inactivityEmails": "A fiókod inaktiv",
- "weeklyRecaps": "Summaries of your account activity in the past week",
+ "weeklyRecaps": "Összefoglaló az elmúlt heti fiók aktivitásodról",
"questStarted": "A küldetésed elkezdődött",
"invitedQuest": "Meghívva egy küldetésre",
"kickedGroup": "Kirúgtak a csoportból",
@@ -113,10 +113,10 @@
"benefits": "Előnyök",
"coupon": "Kupon",
"couponPlaceholder": "Írd be a Kupon kódodat",
- "couponText": "We sometimes have events and give out promo codes for special gear. (eg, those who stop by our Wondercon booth)",
- "apply": "Apply",
- "resubscribe": "Resubscribe",
- "promoCode": "Promo Code",
- "promoCodeApplied": "Promo Code Applied! Check your inventory",
- "promoPlaceholder": "Enter Promotion Code"
+ "couponText": "Néha eseményeket tartunk és promóciós kódokat adunk különleges felszerelésekért (például azoknak, akik megállnak a standunknál a Wondercon-on)",
+ "apply": "Alkalmaz",
+ "resubscribe": "Újra feliratkozás",
+ "promoCode": "Promóciós kód",
+ "promoCodeApplied": "Promóciós kód elfogadva! Ellenőrizd le a tárgylistád",
+ "promoPlaceholder": "Írd be a Promóciós kódodat"
}
\ No newline at end of file
diff --git a/common/locales/hu/tasks.json b/common/locales/hu/tasks.json
index 65352cea5d..053ec78d05 100644
--- a/common/locales/hu/tasks.json
+++ b/common/locales/hu/tasks.json
@@ -14,7 +14,7 @@
"save": "Ment",
"addChecklist": "Feladatlista hozzáadása",
"checklist": "Feladatlista",
- "checklistText": "A részlegesen kipipált feladatlisták csökkentik a Napi feladatok által okozott sebzést. Például ha egy 4 elemű cseklistából 3 kész, akkor 25%-ra csökkenti a sebzést. Kipipált cseklista elemek egy Tennivalón szorzót adnak hozzá: 3 pipa +3x (összesen 4x)-os szorzót ad Tapasztalati pontban, Aranyban és Manában.",
+ "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
"expandCollapse": "Kibont/Összecsuk",
"text": "Szöveg",
"extraNotes": "További feljegyzések",
@@ -22,7 +22,7 @@
"advancedOptions": "Haladó beállítások",
"difficulty": "Nehézség",
"difficultyHelpTitle": "Milyen nehéz ez a feladat?",
- "difficultyHelpContent": "Ez szorozza a pontértéket. Használd ritkán, inkább hagyatkozz a természetes értékadó algoritmusunkra. Ennek ellenére vannak feladatok, amik igencsak értékesebbek (Tézis írás vs Fogselyem használat). Kattints több infóért.",
+ "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!",
"easy": "Könnyű",
"medium": "Közepes",
"hard": "Nehéz",
diff --git a/common/locales/it/backgrounds.json b/common/locales/it/backgrounds.json
index 6afba0fd6a..8de55d6221 100644
--- a/common/locales/it/backgrounds.json
+++ b/common/locales/it/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "Lago di montagna",
"backgroundMountainLakeNotes": "Immergi i tuoi piedi in un lago montano.",
"backgroundPagodasText": "Pagode",
- "backgroundPagodasNotes": "Arrampicati sulla cima delle pagode."
+ "backgroundPagodasNotes": "Arrampicati sulla cima delle pagode.",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/it/challenge.json b/common/locales/it/challenge.json
index 06ac0330a8..bcd1db6cd5 100644
--- a/common/locales/it/challenge.json
+++ b/common/locales/it/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Scegli un vincitore e chiudi la sfida:",
"deleteOrSelect": "Elimina o scegli il vincitore",
"endChallenge": "Fine Sfida",
- "challengeDiscription": "Queste sono le attività della sfida. Mentre gli utenti partecipano, esse cambieranno colore e sui grafici verrà mostrato l'andamento complessivo del gruppo.",
+ "challengeDiscription": "Queste sono le attività della Sfida che verranno aggiunte alla tua pagina delle attività quando parteciperai a questa Sfida. Le attività esempio della Sfida qui sotto cambieranno colore e appariranno dei grafici per mostrarti il progresso complessivo del gruppo.",
"hows": "Come se la cavano gli altri?",
"filter": "Filtro",
"groups": "Gruppi",
@@ -33,7 +33,8 @@
"challengeTagPop": "Le sfide compaiono nelle liste dei tag (etichette), quindi oltre al titolo descrittivo avrai bisogno anche di un nome breve e facilmente riconoscibile. Per esempio, 'Perdi 10 kg in 3 mesi' potrebbe diventare '-10kg' (Clicca il '?' per saperne di più).",
"challengeDescr": "Descrizione",
"prize": "Premio",
- "prizePop": "Se qualcuno può 'vincere' la tua sfida, puoi opzionalmente ricompensarlo con un premio in Gemme. Il premio massimo equivale al numero di Gemme che possiedi (+ n° di Gemme della Gilda, se la sfida è della tua Gilda). Nota: questo premio non potrà essere modificato, inoltre non potrà essere rimborsato se annullato.",
+ "prizePop": "Se qualcuno può 'vincere' questa sfida, hai l'opzione di ricompensarlo con un premio in Gemme. Il premio massimo equivale al numero di gemme che possiedi (+ le gemme della gilda, se sei tu il creatore della gilda di questa sfida). Nota: Questo premio non potrà essere successivamente modificato.",
+ "prizePopTavern": "Se qualcuno può 'vincere' questa sfida, hai l'opzione di ricompensarlo con un premio in Gemme. Il premio massimo equivale al numero di gemme che possiedi (+ le gemme della gilda, se sei tu il creatore della gilda di questa sfida). Nota: Questo premio non potrà essere successivamente modificato e le sfide della Taverna non verranno rimborsate in caso siano cancellate.",
"publicChallenges": "Serve un minimo di 1 Gemma per le sfide pubbliche (aiuta a prevenire lo spam, lo fa davvero).",
"officialChallenge": "Sfida Ufficiale HabitRPG",
"by": "di ",
@@ -43,6 +44,7 @@
"selectGroup": "Seleziona un gruppo",
"challengeCreated": "Sfida creata",
"sureDelCha": "Vuoi davvero eliminare questa sfida?",
+ "sureDelChaTavern": "Sei sicuro di voler cancellare questa sfida? Le tue gemme non verranno rimborsate.",
"removeTasks": "Rimuovi attività",
"keepTasks": "Tieni attività",
"closeCha": "Chiudi sfida e...",
diff --git a/common/locales/it/character.json b/common/locales/it/character.json
index d7045cc665..d61c33c6a7 100644
--- a/common/locales/it/character.json
+++ b/common/locales/it/character.json
@@ -52,9 +52,11 @@
"costume": "Costume",
"costumeText": "Se preferisci il look di oggetti diversi da quelli equipaggiati, metti una spunta su \"Usa costume\" per visualizzare un costume anzichè l'equipaggiamento da battaglia (nonostante il cambio di aspetto, rimangono tutti i bonus delle armi e delle armature).",
"useCostume": "Usa costume ",
- "gearAchievement": "Hai ottenuto il Trofeo \"Armato Fino Ai Denti\" per aver potenziato al massimo livello il tuo equipaggiamento!",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Armato Fino Ai Denti",
- "ultimGearText": "Ha potenziato al massimo l'arma e il set dell'armatura",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Livello",
"levelUp": "Livello aumentato!",
"mana": "Mana",
@@ -70,7 +72,7 @@
"allocatePerPop": "Aggiungi un punto a Percezione (PER)",
"allocateInt": "Punti assegnati a Intelligenza:",
"allocateIntPop": "Aggiungi un punto a Intelligenza (INT)",
- "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue leveling up, or start a new adventure at level 1 by using the Orb of Rebirth, now available for free in the Market.",
+ "noMoreAllocate": "Ora che hai raggiunto il livello 100, non guadagnerai altri Punti Attributo. Puoi continuare a salire di livello, o iniziare una nuova avventura dal livello 1 usando la Sfera della Rinascita, ora disponibile gratuitamente nel Mercato.",
"stats": "Statistiche",
"strength": "Forza",
"strengthText": "L'attributo Forza aumenta la probabilità di sferrare \"colpi critici\", aumentando l'oro, l'esperienza e la probabilità di drop che potrai guadagnare grazie ad essi. In più, permette di arrecare maggiori danni ai boss delle missioni.",
diff --git a/common/locales/it/content.json b/common/locales/it/content.json
index 713ea30160..995fd70400 100644
--- a/common/locales/it/content.json
+++ b/common/locales/it/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Pozione di Salute",
"potionNotes": "Ripristina 15 punti Salute (utilizzo immediato)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "Lupo",
"dropEggWolfAdjective": "un leale",
"dropEggTigerCubText": "Cucciolo di Tigre",
@@ -56,8 +60,8 @@
"questEggBunnyAdjective": "un coccoloso",
"questEggSlimeText": "Gelatina di Marshmallow",
"questEggSlimeAdjective": "una dolce",
- "questEggSheepText": "Sheep",
- "questEggSheepAdjective": "woolly",
+ "questEggSheepText": "Pecorella",
+ "questEggSheepAdjective": "una soffice",
"eggNotes": "Trova una pozione per far schiudere questo uovo, e nascerà <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
"hatchingPotionBase": "Base",
"hatchingPotionWhite": "Bianco",
diff --git a/common/locales/it/front.json b/common/locales/it/front.json
index e57202b9c3..247e2e91d2 100644
--- a/common/locales/it/front.json
+++ b/common/locales/it/front.json
@@ -172,5 +172,11 @@
"username": "Nome utente",
"watchVideos": "Guarda i video",
"work": "Lavoro",
- "zelahQuote": "Con HabitRPG riesco a persuadermi ad andare a letto in tempo con il pensiero di guadagnare punti per essere andata a dormire presto o perdere salute per esserci andata tardi!"
+ "zelahQuote": "Con HabitRPG riesco a persuadermi ad andare a letto in tempo con il pensiero di guadagnare punti per essere andata a dormire presto o perdere salute per esserci andata tardi!",
+ "reportAccountProblems": "Segnala un problema con l'Account",
+ "reportCommunityIssues": "Segnala un problema con la Community",
+ "generalQuestionsSite": "Domande generiche sul Sito",
+ "businessInquiries": "Informazioni sul Business",
+ "merchandiseInquiries": "Informazioni sui Prodotti",
+ "marketingInquiries": "Informazioni su Marketing e Social Media"
}
\ No newline at end of file
diff --git a/common/locales/it/gear.json b/common/locales/it/gear.json
index 30fa60bfb7..e19b3568b8 100644
--- a/common/locales/it/gear.json
+++ b/common/locales/it/gear.json
@@ -120,6 +120,8 @@
"weaponMystery201411Notes": "Infilza i tuoi nemici o inforca i tuoi cibi preferiti - questo versatile forcone può fare di tutto! Non conferisce alcun bonus. Oggetto per abbonati, novembre 2014.",
"weaponMystery201502Text": "Scintillante Scettro Alato dell'Amore e anche della Verità",
"weaponMystery201502Notes": "Per le ALI! Per l'AMORE! E anche per la VERITA'! Non conferisce alcun bonus. Oggetto per abbonati, febbraio 2015.",
+ "weaponMystery201505Text": "Lancia del Cavaliere Verde",
+ "weaponMystery201505Notes": "Questa lancia verde e argento ha disarcionato molti avversari dai propri destrieri. Non conferisce alcun bonus. Oggetto per abbonati: maggio 2015.",
"weaponMystery301404Text": "Bastone Steampunk",
"weaponMystery301404Notes": "Eccellente per fare un giro in città. Oggetto per abbonati, marzo 3015. Non conferisce alcun bonus.",
"armor": "armatura",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "Chi è questo pinguino? Non conferisce alcun bonus. Oggetto per abbonati, dicembre 2014.",
"headMystery201501Text": "Elmo Stellato",
"headMystery201501Notes": "Le costellazioni brillano in questo elmo, guidando i pensieri di chi lo indossa verso la concentrazione. Non conferisce alcun bonus. Oggetto per abbonati, gennaio 2015.",
+ "headMystery201505Text": "Elmo del Cavaliere Verde",
+ "headMystery201505Notes": "La verde piuma su questo elmo di ferro sventola con orgoglio. Non conferisce alcun bonus. Oggetto per abbonati: maggio 2015.",
"headMystery301404Text": "Cilindro Elegante",
"headMystery301404Notes": "Un cilindro per i più fini gentiluomini! Oggetto per abbonati, gennaio 3015. Non conferisce alcun bonus.",
"headMystery301405Text": "Cilindro Base",
diff --git a/common/locales/it/generic.json b/common/locales/it/generic.json
index bcbe475cc0..8d9231e87e 100644
--- a/common/locales/it/generic.json
+++ b/common/locales/it/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitica",
"expandToolbar": "Mostra barra",
"collapseToolbar": "Nascondi barra",
- "formattingMarkdown": "Formattazione Markdown consentita",
+ "markdownBlurb": "HabitRPG usa il metodo di formattazione markdown. Consulta la Tabella riassuntiva del markdown per maggiori informazioni.",
+ "showFormattingHelp": "Mostra guida per la formattazione",
+ "hideFormattingHelp": "Nascondi guida per la formattazione",
+ "youType": "Digiti:",
+ "youSee": "Vedi:",
+ "italics": "*Corsivo*",
+ "bold": "**Grassetto**",
+ "strikethrough": "~~Sbarrato~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG è fantastico!](https://habitrpg.com)",
+ "markdownImageEx": "![testo alt obbligatorio](https://habitrpg.com/cake.png \"titolo facoltativo al passaggio del mouse\")",
+ "unorderedListHTML": "+ Primo elemento + Secondo elemento + Terzo elemento",
+ "unorderedListMarkdown": "+ Primo elemento\n+ Secondo elemento\n+ Terzo elemento",
+ "code": "`codice`",
"achievements": "Trofei",
"modalAchievement": "Trofeo!",
"special": "Speciale",
diff --git a/common/locales/it/groups.json b/common/locales/it/groups.json
index 74348aabe6..3b4a371c39 100644
--- a/common/locales/it/groups.json
+++ b/common/locales/it/groups.json
@@ -102,12 +102,19 @@
"messageWroteIn": "<%= user %> ha scritto in <%= group %>",
"msgPreviewHeading": "Anteprima messaggio",
"leaderOnlyChallenges": "Solo il leader del gruppo può creare le sfide",
- "sendGift": "Send Gift",
- "inviteFriends": "Invite Friends",
- "inviteAlertInfo": "Invite friends by User ID here.",
- "inviteExistUser": "Invite Existing User",
- "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
- "byColon": "By:",
- "inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "sendGift": "Invia regalo",
+ "inviteFriends": "Invita amici",
+ "inviteAlertInfo": "Invita amici tramite ID Utente da qui.",
+ "inviteExistUser": "Invita Utente Esistente",
+ "inviteByEmail": "Invita amici tramite email. Se si iscrivono tramite la tua email, verranno automaticamente invitati a questo gruppo.",
+ "byColon": "Da:",
+ "inviteNewUsers": "Invita nuovi utenti",
+ "inviteAlertInfo2": "Oppure condividi questo link (copia/incolla):",
+ "sendGiftHeading": "Invia Regalo a <%= name %>",
+ "sendGiftGemsBalance": "Da <%= number %> Gemme",
+ "sendGiftCost": "Totale: $<%= cost %> USD",
+ "sendGiftFromBalance": "Dal Bilancio",
+ "sendGiftPurchase": "Acquisto",
+ "sendGiftMessagePlaceholder": "Messaggio personale (facoltativo)",
+ "sendGiftSubscription": "<%= months %> Mese(/i): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/it/npc.json b/common/locales/it/npc.json
index eb025103a4..5260884f1d 100644
--- a/common/locales/it/npc.json
+++ b/common/locales/it/npc.json
@@ -2,8 +2,8 @@
"npc": "NPC",
"npcText": "Ha contribuito al progetto Kickstarter al massimo livello!",
"mattBoch": "Matt Boch",
- "mattShall": "Devo portarti il tuo destriero, <%= name %>? Clicca su una cavalcatura per montarvi in groppa.",
- "mattBochText1": "Benvenuto alla Scuderia! Sono Matt, il domatore. Scegli un animale che vuoi come compagno nella tua impresa. Dagli da mangiare e crescerà diventando un possente destriero!",
+ "mattShall": "Devo portarti il tuo destriero, <%= name %>? Una volta che avrai dato abbastanza cibo al tuo animale da trasformarlo in una cavalcatura, apparirà qui. Fai click su una cavalcatura per montare in sella!",
+ "mattBochText1": "Benvenuto alla Scuderia! Io sono Matt, il domatore. Dopo il livello 4, puoi far nascere degli animali utilizzando uova e pozioni. Quando fai schiudere un uovo nel Mercato, apparirà qui! Fai click sull'immagine di un animale per aggiungerlo al tuo avatar. Dagli da mangiare il cibo che troverai dopo il livello 4, e crescerà fino a diventare una potente cavalcatura!",
"daniel": "Daniel",
"danielText": "Benvenuto nella Taverna! Resta per un po' e incontra la gente del posto. Se hai bisogno di riposare (vacanza? malattia?), ti sistemerò nella Locanda. Mentre riposi, le tue Daily non ti danneggeranno alla fine del giorno, ma potrai comunque spuntarle.",
"danielText2": "Fai attenzione: se stai partecipando ad una missione Boss, il boss ti danneggerà comunque per le Daily non completate dei tuoi compagni di squadra! Inoltre, il tuo danno al Boss (o la raccolta di oggetti) non avrà effetto finchè non lasci la Locanda.",
@@ -45,9 +45,9 @@
"tourScrollDown": "Assicurati di scorrere la pagina fino alla fine per vedere tutte le opzioni! Fai di nuovo click sul tuo avatar per tornare alla pagina delle attività.",
"tourMuchMore": "Quando hai finito con le attività, puoi creare una Squadra insieme ai tuoi amici, chattare nelle Gilde di interessi comuni, partecipare alle Sfide, e tanto altro ancora!",
"tourStatsPage": "Questa è la pagina delle tue Statistiche! Guadagna delle medaglie compiendo le azioni elencate.",
- "tourTavernPage": "Benvenuto alla Taverna, una chat pubblica per tutte le età! Puoi \"congelare\" il tuo account in caso di malattia o viaggio facendo click su \"Riposa nella Locanda\". Vieni a farci un saluto!",
+ "tourTavernPage": "Benvenuto alla Taverna, una chat pubblica per tutte le età! Puoi fare in modo che le tue Daily non ti danneggino in caso di malattia o di viaggio facendo click su \"Riposa nella Locanda\". Vieni a farci un saluto!",
"tourPartyPage": "La tua Squadra ti aiuterà a restare in riga. Invita degli amici per sbloccare una Pergamena!",
"tourGuildsPage": "Le Gilde sono gruppi con interessi comuni. Cerca gli argomenti che più ti piacciono! Se conosci l'inglese, ti raccomandiamo la gilda \"The Newbies\".",
- "tourChallengesPage": "Partecipare ad una Sfida aggiungerà delle attività al tuo account. Competi con gli altri utenti per vincere un premio in gemme!",
+ "tourChallengesPage": "Le Sfide sono delle liste di attività a tema create dagli utenti! Quando ti unisci ad una sfida le sue attività verranno aggiunte al tuo account. Competi con gli altri utenti per vincere premi in gemme!",
"tourMarketPage": "A partire dal livello 4, potrai ricevere dei \"drop\" casuali di uova e pozioni di schiusura quando completi le tue attività. Appariranno qui - usale per far nascere degli animali! Puoi anche comprare degli oggetti nel Mercato."
}
\ No newline at end of file
diff --git a/common/locales/it/quests.json b/common/locales/it/quests.json
index 2a862d04a4..79cf486f11 100644
--- a/common/locales/it/quests.json
+++ b/common/locales/it/quests.json
@@ -6,8 +6,8 @@
"questSend": "Cliccando \"Invita\" manderai un invito ai membri della tua squadra. Quando tutti i membri avranno accettato o rifiutato, la missione inizierà. Vedi lo stato sotto Opzioni > Social > Squadra.",
"inviteParty": "Invita squadra",
"questInvitation": "Invito alla missione:",
- "questInvitationTitle": "Quest Invitation",
- "questInvitationInfo": "Invitation for the Quest <%= quest %>",
+ "questInvitationTitle": "Invito alla missione",
+ "questInvitationInfo": "Invito alla Missione <%= quest %>",
"askLater": "Chiedi più tardi",
"buyQuest": "Compra missione",
"accepted": "Accettata",
@@ -19,7 +19,7 @@
"bossStrength": "Forza del Boss",
"collect": "Raccogli",
"collected": "Collezionati",
- "bossDmg1": "Per ferire un boss, completa le tue Daily e i tuoi To-Do. Maggiore è il valore dell'attività, maggiore sarà il danno inflitto al boss (attività di colore rosso, gli incantesimi dei Maghi, gli attacchi dei Guerrieri, ecc.). Il boss infliggerà un danno ad ogni partecipante della missione per ogni Daily incompleta (moltiplicato per la Forza del boss), quindi prenditi cura della tua squadra completando le tue Daily! Tutto il danno inflitto e ricevuto da un boss viene calcolato al cambio di giorno (che avviene all'ora da te scelta nelle impostazioni).",
+ "bossDmg1": "Ogni Daily e To-Do completata e ogni Habit positivo danneggiano il boss. Puoi fare danni maggiori con le attività più rosse, con Attacco Brutale e con Fiammata. I boss danneggeranno ogni partecipante per le Daily mancate (moltiplicate per la Forza del boss) oltre al loro normale danno, quindi tieni in forze la tua squadra completando le tue Daily! I danni inflitti e ricevuti dal boss sono calcolati al cambio di giorno (all'ora da te impostata).",
"bossDmg2": "Solo i partecipanti potranno combattere il boss e condividere il bottino della missione.",
"tavernBossInfo": "Per ferire un boss mondiale, completa le tue Daily e i tuoi To-Do. Maggiore è il valore dell'attività, maggiore sarà il danno inflitto al boss (attività di colore rosso, gli incantesimi dei Maghi, gli attacchi dei Guerrieri, ecc.). La Furia del boss aumenterà per ogni Daily incompleta (moltiplicate per la Forza del boss). Quando la Furia raggiunge il massimo, accadrà qualcosa di davvero brutto - quindi completa le tue Daily! Tutto il danno inflitto e ricevuto da un boss viene calcolato al cambio di giorno (che avviene all'ora da te scelta nelle impostazioni).",
"bossColl1": "Per ottenere gli oggetti, completa delle attività positive. Gli oggetti delle missioni compaiono come quelli normali; non li vedrai però fino al giorno dopo, quando tutto quello che hai trovato verrà raccolto e aggiunto agli oggetti già trovati.",
diff --git a/common/locales/it/questscontent.json b/common/locales/it/questscontent.json
index 4d0f5cb6aa..128cd56a09 100644
--- a/common/locales/it/questscontent.json
+++ b/common/locales/it/questscontent.json
@@ -197,10 +197,10 @@
"questSlimeCompletion": "Con un colpo finale, intrappoli il Regente Gelatina in una ciambella gigante, portata in fretta da @Overomega, @LordDarkly, e @Shaner, i leader dal pensiero veloce del club di pasticceria. Mentre tutti di danno pacche sulle spalle, senti che qualcuno fa scivolare qualcosa nella tua tasca. È la ricompensa per la tua dolce vittoria: tre uova di Gelatina di Marshmallow. ",
"questSlimeDropSlimeEgg": "Gelatina di Marshmallow (Uovo)",
"questSlimeUnlockText": "Sblocca l'acquisto delle uova di gelatina di marshmallow nel Mercato",
- "questSheepText": "The Thunder Ram",
- "questSheepNotes": "As you wander the rural Taskan countryside with friends, taking a \"quick break\" from your obligations, you find a cozy yarn shop. You are so absorbed in your procrastination that you hardly notice the ominous clouds creep over the horizon. \"I've got a ba-a-a-ad feeling about this weather,\" mutters @Misceo, and you look up. The stormy clouds are swirling together, and they look a lot like a... \"We don't have time for cloud-gazing!\" @starsystemic shouts. \"It's attacking!\" The Thunder Ram hurtles forward, slinging bolts of lightning right at you!",
- "questSheepBoss": "Thunder Ram",
- "questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
- "questSheepDropSheepEgg": "Sheep (Egg)",
- "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market"
+ "questSheepText": "L'Ariete Tuonante",
+ "questSheepNotes": "Mentre vai in giro per le campagne di Taskan con degli amici, prendendoti una \"pausa veloce\" dai tuoi doveri, trovi un accogliente negozio di filati. Sei così assorbito dalla tua procrastinazione che ti accorgi a malapena delle nuvole minacciose che si alzano dall'orizzonte. \"Non ho per niente un be-e-e-el presentimento riguardo questo tempo,\" mormora @Misceo, e tu alzi gli occhi. Le nuvole di tempesta si intrecciano tra loro, e assomigliano molto a... \"Non c'è tempo per stare a guardare le nuvole!\" urla @starsystemic. \"Sta attaccando!\" L'Ariete Tuonante carica verso di voi, scagliandovi addosso fulmini e saette!",
+ "questSheepBoss": "Ariete Tuonante",
+ "questSheepCompletion": "Colpita dalla tua diligenza, l'Ariete Tuonante è prosciugata della sua furia. Lancia tre enormi chicchi di grandine nella tua direzione, e poi scompare con un cupo rombo. Guardandoli meglio, scopri che i chicchi di grandine sono in realtà tre uova morbide e pelose. Le raccogli, e ti incammini verso casa sotto un cielo azzurro.",
+ "questSheepDropSheepEgg": "Pecorella (Uovo)",
+ "questSheepUnlockText": "Sblocca l'acquisto delle uova di pecorella nel Mercato"
}
\ No newline at end of file
diff --git a/common/locales/it/settings.json b/common/locales/it/settings.json
index 208d42709d..b73cdde296 100644
--- a/common/locales/it/settings.json
+++ b/common/locales/it/settings.json
@@ -93,7 +93,7 @@
"wonChallenge": "Hai vinto una sfida",
"newPM": "Hai ricevuto un messaggio privato",
"giftedGems": "Ti vengono regalate delle Gemme",
- "giftedGemsInfo": "<%= amount %> Gems - by <%= name %>",
+ "giftedGemsInfo": "<%= amount %> Gemme - da <%= name %>",
"giftedSubscription": "Ti viene regalato un abbonamento",
"invitedParty": "Invitato in una squadra",
"invitedGuild": "Invitato in una Gilda",
@@ -113,7 +113,7 @@
"benefits": "Vantaggi",
"coupon": "Coupon",
"couponPlaceholder": "Inserisci codice coupon",
- "couponText": "A volte partecipiamo a degli eventi e distribuiamo dei codici promozionali per degli oggetti speciali. (Per esempio a chi passa al nostro stand al Wondercon)",
+ "couponText": "A volte partecipiamo a degli eventi e distribuiamo dei codici promozionali per degli oggetti speciali (per esempio a chi passa al nostro stand al Wondercon).",
"apply": "Applica",
"resubscribe": "Riabbonati",
"promoCode": "Codice promozionale",
diff --git a/common/locales/it/tasks.json b/common/locales/it/tasks.json
index f64b938a77..f693498a6a 100644
--- a/common/locales/it/tasks.json
+++ b/common/locales/it/tasks.json
@@ -14,7 +14,7 @@
"save": "Salva",
"addChecklist": "Aggiungi Checklist",
"checklist": "Checklist",
- "checklistText": "Riguardo le Dailies, le checklist parzialmente completate ridurranno il danno causato dalle Daily incomplete. Per esempio, una checklist con 3 elementi completati su 4 ti infliggerà il 25% del danno totale. Riguardo i To-Do invece, l'oro e l'esperienza guadagnati con il completamento verranno moltiplicati per il numero di elementi della checklist (3 elementi completati = guadagno x3).",
+ "checklistText": "Dividi un'attività in parti più piccole! Le checklist aumentano la quantità di Esperienza e Oro guadagnati da una To-Do, e riducono il danno causato da una Daily.",
"expandCollapse": "Espandi/Comprimi",
"text": "Testo",
"extraNotes": "Note",
@@ -22,7 +22,7 @@
"advancedOptions": "Avanzate",
"difficulty": "Difficoltà",
"difficultyHelpTitle": "Quanto è difficile questa attività?",
- "difficultyHelpContent": "La difficoltà moltiplica il suo valore in punti, ma usa questa funzione con parsimonia, a questo pensano già i nostri efficienti algoritmi di gestione dei punteggi. Tuttavia, alcune attività sono decisamente più impegnative di altre (\"Scrivi la tesi\" contro \"Lavati i denti\"). Clicca per avere maggiori informazioni.",
+ "difficultyHelpContent": "Più è difficile un'attività, più Esperienza e Oro ti darà quando la completi... Ma ti danneggerà di più se è una Daily o un Habit Negativo!",
"easy": "Facile",
"medium": "Medio",
"hard": "Difficile",
diff --git a/common/locales/ja/backgrounds.json b/common/locales/ja/backgrounds.json
index 014774d492..682c2b7991 100644
--- a/common/locales/ja/backgrounds.json
+++ b/common/locales/ja/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "山の湖",
"backgroundMountainLakeNotes": "慎重に山の湖につま先を浸す",
"backgroundPagodasText": "仏塔",
- "backgroundPagodasNotes": "仏塔の頂上に登る"
+ "backgroundPagodasNotes": "仏塔の頂上に登る",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/ja/challenge.json b/common/locales/ja/challenge.json
index d66c8a764c..11cd6b9c0b 100644
--- a/common/locales/ja/challenge.json
+++ b/common/locales/ja/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "優勝者を選び、チャレンジを終了する",
"deleteOrSelect": "消すか優勝者を選ぶ",
"endChallenge": "チャレンジを終了する",
- "challengeDiscription": "これがチャレンジのタスクです。ユーザーが参加すると色が変わり、進行過程を示すグラフが提示されます。",
+ "challengeDiscription": "これはチャレンジのタスクです。ユーザーが参加すると色が変わり、グループの進行過程を示すグラフが提示されます。",
"hows": "みんな元気かい？",
"filter": "フィルター",
"groups": "グループ",
@@ -33,7 +33,8 @@
"challengeTagPop": "チャレンジはタグ・リストとタスク・ツールチップにあります。題名を詳しく書く必要がありますが、短いタイトルも必要です。例：「三ヶ月で５キロを減らす」を「-5キロ」にする（詳細はこちら）。",
"challengeDescr": "説明",
"prize": "賞品",
- "prizePop": "自分が作成したチャレンジは勝利することが可能であれば、ジェムを賞品として設定できます。最大ジェム数は自分の所持しているジェム数（自分が当チャレンジのギルド創立者であればギルドのジェムも追加できます）。 注意：賞品が設定された後やチャレンジが取り消された場合は、変更不可となります。",
+ "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.",
+ "prizePopTavern": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
"publicChallenges": "公共のチャレンジは最小でジェムが１個必要です（スパムを減らすために助かる）。",
"officialChallenge": "HabitRPGの公式チャレンジ",
"by": "で",
@@ -43,6 +44,7 @@
"selectGroup": "グループを選択して下さい",
"challengeCreated": "チャレンジ作成終了",
"sureDelCha": "チャレンジが消されます。よろしいでしょうか？",
+ "sureDelChaTavern": "Delete challenge, are you sure? Your gems will not be refunded.",
"removeTasks": "タスクを消す",
"keepTasks": "タスクを残す",
"closeCha": "チャレンジを終了して・・・",
diff --git a/common/locales/ja/character.json b/common/locales/ja/character.json
index 798cffddcb..1e3f19f65e 100644
--- a/common/locales/ja/character.json
+++ b/common/locales/ja/character.json
@@ -52,9 +52,11 @@
"costume": "衣装",
"costumeText": "もし装備中のギアより他のギアがお好みでしたら、「衣装をつける」のボックスをチェックしてください。そうすると、バトルギアを下に見えながら衣装だけが表れます。",
"useCostume": "衣装をつける",
- "gearAchievement": "おめでとうございます！最高級のギアセットにアップグレードして「アルティメットギア」を獲得しました！",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "アルティメットギア",
- "ultimGearText": "さんは最高級の武器と鎧セットにアップグレードしました！",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "レベル",
"levelUp": "レベルアップ！",
"mana": "MP",
@@ -70,7 +72,7 @@
"allocatePerPop": "知覚にポイントを加える",
"allocateInt": "知能のポイント：",
"allocateIntPop": "知能にポイントを加える",
- "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue leveling up, or start a new adventure at level 1 by using the Orb of Rebirth, now available for free in the Market.",
+ "noMoreAllocate": "あなたは今やレベル100に到達し、これ以上能力値を獲得できません。レベルアップを続けることもできますし、もしくは市場で無料で手に入る転生のオーブを使ってレベル1から新しい冒険を始めることもできます。",
"stats": "ステータス",
"strength": "力",
"strengthText": "力はクリティカルヒットの確率を上昇させ、またゴールド、経験、ドロップ率にも影響します。またボスモンスターへのダメージも増加します。",
diff --git a/common/locales/ja/content.json b/common/locales/ja/content.json
index 840e2c15c2..6b18047217 100644
--- a/common/locales/ja/content.json
+++ b/common/locales/ja/content.json
@@ -1,6 +1,10 @@
{
"potionText": "体力回復ポーション",
"potionNotes": "体力を15回復(瞬時)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "狼",
"dropEggWolfAdjective": "忠実な",
"dropEggTigerCubText": "トラの子",
@@ -56,8 +60,8 @@
"questEggBunnyAdjective": "心地よい",
"questEggSlimeText": "マシュマロ スライム",
"questEggSlimeAdjective": "甘い",
- "questEggSheepText": "Sheep",
- "questEggSheepAdjective": "woolly",
+ "questEggSheepText": "羊",
+ "questEggSheepAdjective": "羊毛のような",
"eggNotes": "孵化ポーションを探し、このたまごに注ぐと、それが<%= eggAdjective(locale) %> <%= eggText(locale) %>に孵化します。",
"hatchingPotionBase": "普通の",
"hatchingPotionWhite": "白い",
diff --git a/common/locales/ja/front.json b/common/locales/ja/front.json
index b0f1878439..c1422777f2 100644
--- a/common/locales/ja/front.json
+++ b/common/locales/ja/front.json
@@ -4,20 +4,20 @@
"accept2Terms": "そして",
"alexandraQuote": "マドリードでのスピーチでHabitRPGについて話さずにはいられませんでした。まだ上司が必要なフリーランスにはどうしても欲しいツールです。",
"althaireQuote": "クエストをやると、日課とやるべきことに対するやる気が湧きます。パーティをがっかりさせないことが最大の動機です。",
- "andeeliaoQuote": "Awesome product, just started a few days ago and already more conscious and productive with my time!",
- "autumnesquirrelQuote": "I'm procrastinating less on work and housework and pay bills on time.",
- "businessSample1": "Confirm 1 page of Inventory",
+ "andeeliaoQuote": "素晴らしい製品です。まだ数日前にはじめたばかりですが、既に私の時間がより意識的で生産的になりました。",
+ "autumnesquirrelQuote": "私は、仕事や家事、期限までの請求の支払いを、先延ばしにすることが減りました。",
+ "businessSample1": "持ち物の1ページを確認する。",
"businessSample2": "20分間書類をファイルする",
- "businessSample3": "Sort and Process Inbox",
- "businessSample4": "Prepare 1 Document for Client",
- "businessSample5": "Call Clients/Put Off Phone Calls",
+ "businessSample3": "受信箱を並び替えて処理する。",
+ "businessSample4": "顧客向けの書類を1つ用意する。",
+ "businessSample5": "顧客や待たせた電話に電話をかける。",
"businessText": "仕事でHabitRPGを使う",
"choreSample1": "汚れた服を洗濯物入れに放り込む",
"choreSample2": "20分間の家事をする",
"choreSample3": "皿を洗う",
"choreSample4": "部屋を1つ掃除する",
- "choreSample5": "Wash and Dry a Load of Clothes",
- "chores": "Chores",
+ "choreSample5": "服を洗って乾かす。",
+ "chores": "雑用",
"communityBug": "バグを登録する",
"communityExtensions": "アドオン & 拡張機能",
"communityFacebook": "Facebook",
@@ -119,14 +119,14 @@
"marketing4Lead3Title": "全てをゲームにしよう",
"mobileAndroid": "Android",
"mobileIOS": "iOS",
- "motivate": "Motivate yourself and your team!",
- "motivate1": "Motivate yourself to do anything.",
- "motivate2": "Get Organized. Get Motivated. Get Gold.",
+ "motivate": "あなたやチームの動機付けをしましょう！",
+ "motivate1": "あなたが何かをやる動機付けをしましょう。",
+ "motivate2": "計画を得よう。動機を得よう。ゴールドを得よう。",
"passConfirm": "新しいパスワードを確認する",
"passMan": "パスワードマネージャー ( 1Passwordなど ) を使用していて、ログインに問題が生じた場合には、ユーザー名とパスワードを手動で入力してみてください。",
"password": "パスワード",
"playButton": "遊ぶ",
- "playButtonFull": "Play HabitRPG",
+ "playButtonFull": "HabitRPGで遊ぶ",
"presskit": "プレスキット",
"presskitDownload": "全ての画像をダウンロード",
"presskitText": "HabitRPGに興味を持っていただきありがとうございます。以下の画像はHabitRPGに関する記事や動画でお使いいただけます。より詳しい情報につきましてはSiena Leslie(leslie@habitrpg.com)までご連絡ください。",
@@ -172,5 +172,11 @@
"username": "ユーザー名",
"watchVideos": "ビデオを見る",
"work": "Work",
- "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!"
+ "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",
+ "reportAccountProblems": "アカウントの問題を報告する",
+ "reportCommunityIssues": "コミュニティの問題を報告する",
+ "generalQuestionsSite": "General Questions about the Site",
+ "businessInquiries": "Business Inquiries",
+ "merchandiseInquiries": "Merchandise Inquiries",
+ "marketingInquiries": "Marketing/Social Media Inquiries"
}
\ No newline at end of file
diff --git a/common/locales/ja/gear.json b/common/locales/ja/gear.json
index b8882c6c07..09e6f34f05 100644
--- a/common/locales/ja/gear.json
+++ b/common/locales/ja/gear.json
@@ -120,6 +120,8 @@
"weaponMystery201411Notes": "あなたの敵を突き刺したり、あなたの好きな食べ物のために掘る - この何にでも使える熊手がそれをすべてを行う！効果なし。2014年11月購読者アイテム。",
"weaponMystery201502Text": "愛ならびに真実の輝く羽の杖",
"weaponMystery201502Notes": "羽のために！愛のために！ならびに真実のために！効果なし。2015年2月購読者アイテム。",
+ "weaponMystery201505Text": "Green Knight Lance",
+ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "スチームパンク杖",
"weaponMystery301404Notes": "町でターンをするには最適だ。効果なし。3015年3月購読者アイテム。",
"armor": "鎧",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "誰がペンギンですか？効果がありません。2014年12月購読者アイテム。",
"headMystery201501Text": "星空の兜",
"headMystery201501Notes": "この兜のなかで星座が揺らめきぐるぐる回ります。身につけた者を精神集中へ導きます。効果なし。2015年1月購読者アイテム。",
+ "headMystery201505Text": "Green Knight Helm",
+ "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 2015 Subscriber Item.",
"headMystery301404Text": "ファンシートップハット",
"headMystery301404Notes": "最上の良家の人々のためのファンシートップハット！3015年1月購読者アイテム。効果なし。",
"headMystery301405Text": "ベーシックトップハット",
diff --git a/common/locales/ja/generic.json b/common/locales/ja/generic.json
index 9f0a00090c..7a26571bc5 100644
--- a/common/locales/ja/generic.json
+++ b/common/locales/ja/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitica",
"expandToolbar": "ツールバーを開く",
"collapseToolbar": "ツールバーを閉じる",
- "formattingMarkdown": "Markdown文法が使用できます",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*イタリック体*",
+ "bold": "**太字**",
+ "strikethrough": "~~取り消し線~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "業績",
"modalAchievement": "達成！",
"special": "スペシャル",
diff --git a/common/locales/ja/groups.json b/common/locales/ja/groups.json
index 4519e0a8c2..5dde80db0c 100644
--- a/common/locales/ja/groups.json
+++ b/common/locales/ja/groups.json
@@ -102,12 +102,19 @@
"messageWroteIn": "<%= user %> が <%= group %>に書きました",
"msgPreviewHeading": "メッセージプレビュー",
"leaderOnlyChallenges": "グループリーダーだけがチャレンジを作成できます",
- "sendGift": "Send Gift",
- "inviteFriends": "Invite Friends",
- "inviteAlertInfo": "Invite friends by User ID here.",
- "inviteExistUser": "Invite Existing User",
- "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
- "byColon": "By:",
- "inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "sendGift": "贈り物を送る",
+ "inviteFriends": "友達を招待する",
+ "inviteAlertInfo": " ユーザーID で友人をここに招待する",
+ "inviteExistUser": "既存のユーザーを招待する",
+ "inviteByEmail": "メールで友人を招待する。もし彼らがあなたのメール経由で参加したら、自動的にこのグループに招待されます。",
+ "byColon": "で",
+ "inviteNewUsers": "新しいユーザー(達)を招待する",
+ "inviteAlertInfo2": "もしくはこのリンクを共有する(コピー/ペースト):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/ja/npc.json b/common/locales/ja/npc.json
index f6c489af39..14efec95c2 100644
--- a/common/locales/ja/npc.json
+++ b/common/locales/ja/npc.json
@@ -2,8 +2,8 @@
"npc": "ＮＰＣ",
"npcText": "最大のレベルで Kickstarterプロジェクトを後援する!",
"mattBoch": "マット・バック",
- "mattShall": "<%= name %>さん、私があなたの馬をつれてきましょうか? 鞍を置く馬をクリックしてください。",
- "mattBochText1": "厩舎へようこそ! 私はマット、獣のマスターだよ。ここであなたの側で冒険するペットを選択してください。えさを与えれば、彼らは強力な軍馬に成長するだろう。",
+ "mattShall": "マウントを連れてきましょか、<%= name %>？ペットに十分なエサを与えたら、そのペットはマウントになって、ここに現れます。マウントをクリックして乗ってみたらどうですか？",
+ "mattBochText1": "ステーブルへようこそ！私はマット、獣のマスターだよ。レベルが4になったら、タマゴとポーションを使って、ペットを孵化させることができる。ペットをクリックして、アバターを飾ることもできる。エサを与えれば、強いマウントになるだろう。",
"daniel": "ダニエル",
"danielText": "酒場へようこそ！しばらく滞在して、地元の人と会いましょう。あなたに休息が必要な場合 (休暇? 病気?)、私が宿であなたを元気にします。チェックインしている間、あなたの日課は未実施でも一日の終わりにあなたを傷つけませんが、印を付けて実施済みにできます。",
"danielText2": "注意してください: あなたがボスの冒険に参加している場合は、あなたのパーティーの仲間が日課を逃したことで、ボスはまだあなたを傷つけます！ また、あなたがボスに与えるダメージ(もしくは集めたアイテム)は宿をチェックアウトするまでt適用されません。",
@@ -45,9 +45,9 @@
"tourScrollDown": "必ず一番下までスクロールして全てのオプションを見よう！アバターをもう一度クリックしてタスクページに戻ろう。",
"tourMuchMore": "タスクを実行したら、友達とパーティーを組んだり、共通の趣味のギルドでチャットしたり、チャレンジに参加できたり、他にもできます！",
"tourStatsPage": "これはあなたのステータスページです！タスクを完了して実績を受け取りましょう。",
- "tourTavernPage": "全年齢大正のチャットルームである酒場へようこそ！病気や旅行の場合には「宿で休む」をクリックすることでアカウントを凍結できます。挨拶してみてください！",
+ "tourTavernPage": "全年齢大正のチャットルームである酒場へようこそ！病気や旅行の場合には「宿で休む」をクリックすることで日課をしなくても痛い目に遭わなくてすみますよ。挨拶してみてください！",
"tourPartyPage": "パーティーはあなたが責任を果たす事を助けてくれるでしょう。友達を招待してクエストスクロールをアンロックしましょう！",
"tourGuildsPage": "ギルドは共通のテーマを持つ社会的グループです。興味のある件名で検索しましょう！我々は初心者ギルドをおすすめします。",
- "tourChallengesPage": "チャレンジへ参加するとあなたのアカウントにタスクが追加されます。他のユーザと競争して賞品のジェムを勝ち取りましょう！",
+ "tourChallengesPage": "チャレンジはユーザーが作ったテーマのあるタスクリストです！チャレンジへ参加するとあなたのアカウントにタスクが追加されます。他のユーザーと競争して賞品のジェムを勝ち取りましょう！",
"tourMarketPage": "レベル4の始めから、タスクを完了するとたまごと孵化ポーションがランダムにドロップします。それらはここに表示され、ペットを孵化するのに使いましょう！市場でアイテムを買う事もできます。"
}
\ No newline at end of file
diff --git a/common/locales/ja/quests.json b/common/locales/ja/quests.json
index 2831c05023..9f6efc8247 100644
--- a/common/locales/ja/quests.json
+++ b/common/locales/ja/quests.json
@@ -6,8 +6,8 @@
"questSend": "【招待】を押すとあなたのパーティメンバーを招待する事ができます。各メンバーが参加をするかどうかを選択すると、クエスト開始となります！現在の招待状況は オプション > ソーシャル > パーティで確認できます。",
"inviteParty": "パーティ招待",
"questInvitation": "クエストへの招待状：",
- "questInvitationTitle": "Quest Invitation",
- "questInvitationInfo": "Invitation for the Quest <%= quest %>",
+ "questInvitationTitle": "クエストへの招待",
+ "questInvitationInfo": "クエスト <%= quest %> への招待",
"askLater": "あとで質問する",
"buyQuest": "クエストを買います",
"accepted": "受け入れられました",
@@ -19,7 +19,7 @@
"bossStrength": "ボスの力",
"collect": "獲得",
"collected": "獲得済み",
- "bossDmg1": "ボスを傷つけるには日課とToDoを完了させてください。高いタスクダメージ(赤の完了や魔道士の呪文や戦士の攻撃など)はボスへのダメージが高いことを意味します。通常のダメージに加えて、ボスは(ボスの強さに乗じた)あなたが実行しなかった全ての日課について、クエスト参加者にダメージを与えます。ですので、日課を完了することがパーティの体力を維持します！全てのボスからのダメージとボスへのダメージはcron(あなたの一日の切り替え)で集計されます。",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "参加者だけがボスと戦い、クエストの勝利品を共有することができる",
"tavernBossInfo": "ワールドボスを傷つけるには、日課とToDoを完了させてください。高いタスクダメージ(赤の完了や魔道士の呪文や戦士の攻撃など)はボスへのダメージが高いことを意味します。あなたが実行しなかった全ての日課においてボスの強さに倍されて、ボスの怒りが増加するでしょう。いったんボスの怒りが最大に達すると、何か悪い事が起こるでしょう、ですから日課を完了させてください！全てのボスからのダメージとボスへのダメージはcron(あなたの一日の切り替え)で集計されます。",
"bossColl1": "アイテムを収集するには、良いタスクを実行します。クエストアイテムは通常のアイテムのようにドロップします。ただし、翌日までドロップは表示されません。その後あなたが見つけたものはすべて集計されて、山に寄与します。",
diff --git a/common/locales/ja/questscontent.json b/common/locales/ja/questscontent.json
index 6301a22aca..2d6b1baed0 100644
--- a/common/locales/ja/questscontent.json
+++ b/common/locales/ja/questscontent.json
@@ -197,10 +197,10 @@
"questSlimeCompletion": "最後の一突きで、あなたは大きすぎるドーナツにゼリー摂政を捕まえました。パン菓子クラブの機転が利くリーダー達である@Overomegaと@LordDarklyと@Shanerが突入したのです。みんながあなたの背中を叩くうち、誰かがあなたのポケットに何かを忍び込ませた気がしました。それはあなたの心地よい成功の報酬で、3つのマシュマロスライムの卵です。",
"questSlimeDropSlimeEgg": "マシュマロ スライム (卵)",
"questSlimeUnlockText": "市場でのスライムの卵購入のアンロック",
- "questSheepText": "The Thunder Ram",
- "questSheepNotes": "As you wander the rural Taskan countryside with friends, taking a \"quick break\" from your obligations, you find a cozy yarn shop. You are so absorbed in your procrastination that you hardly notice the ominous clouds creep over the horizon. \"I've got a ba-a-a-ad feeling about this weather,\" mutters @Misceo, and you look up. The stormy clouds are swirling together, and they look a lot like a... \"We don't have time for cloud-gazing!\" @starsystemic shouts. \"It's attacking!\" The Thunder Ram hurtles forward, slinging bolts of lightning right at you!",
- "questSheepBoss": "Thunder Ram",
- "questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
- "questSheepDropSheepEgg": "Sheep (Egg)",
- "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market"
+ "questSheepText": "雷雄羊",
+ "questSheepNotes": "「クイックブレイク」を手に入れる任務で田舎のTaskan地方を友人と放浪していると、あなたは居心地のいい編み糸屋を見つけます。あなたは引き延ばしに夢中で不吉な雲が地平線から忍び寄るのに気づきません。「この天気はいやーーな感じがする」と@Misceoがつぶやき、あなたは見上げます。嵐の雲が渦巻き、あれはまるで…「雲を見ている時間はない！」と@starsystemicが叫びます。「攻撃してくる！」雷雄羊が前進し、光る稲妻をあなたに投げかけてきます！",
+ "questSheepBoss": "雷雄羊",
+ "questSheepCompletion": "あなたの勤勉さに感銘をうけて、雷雄羊は怒りをおさめます。雷雄羊は3つのおおきなヒョウをあなたの方に放り、低いとどろきと共に消え去ります。近づいて調べると、実際にはヒョウは3つのふわふわした卵であることが分かります。あなたはそれを集め、青い空のした、家へぶらぶらと帰ります。",
+ "questSheepDropSheepEgg": "羊(卵)",
+ "questSheepUnlockText": "市場での羊の卵購入のアンロック"
}
\ No newline at end of file
diff --git a/common/locales/ja/settings.json b/common/locales/ja/settings.json
index 0a4a64d6bc..0938344dc3 100644
--- a/common/locales/ja/settings.json
+++ b/common/locales/ja/settings.json
@@ -93,7 +93,7 @@
"wonChallenge": "チャレンジに勝ちました",
"newPM": "プライベートメッセージが届きました",
"giftedGems": "貰ったジェム",
- "giftedGemsInfo": "<%= amount %> Gems - by <%= name %>",
+ "giftedGemsInfo": "<%= name %>から<%= amount %>ジェム",
"giftedSubscription": "貰った購読",
"invitedParty": "パーティへ招待されました",
"invitedGuild": "ギルドへ招待されました",
diff --git a/common/locales/ja/spells.json b/common/locales/ja/spells.json
index 9756212db4..c5bc77d571 100644
--- a/common/locales/ja/spells.json
+++ b/common/locales/ja/spells.json
@@ -1,14 +1,14 @@
{
"spellWizardFireballText": "炎のバースト",
- "spellWizardFireballNotes": "Flames burst from your hands. You gain XP, and you deal extra damage to Bosses! Click on a task to cast. (Based on: INT)",
+ "spellWizardFireballNotes": "炎が手から吹き出します。XPを手に入れ、ボスにさらにダメージを与えます！タスクをクリックすることで唱えます。(知性に基づく)",
"spellWizardMPHealText": "エーテル波動",
- "spellWizardMPHealNotes": "You sacrifice mana to help your friends. The rest of your party gains MP! (Based on: INT)",
+ "spellWizardMPHealNotes": "友人を助けるために、あなたのマナを犠牲にします。残りのパーティーのメンバー党は、MPを得ます！(知性に基づく)",
"spellWizardEarthText": "地震",
- "spellWizardEarthNotes": "Your mental power shakes the earth. Your whole party gains a buff to Intelligence! (Based on: Unbuffed INT)",
+ "spellWizardEarthNotes": "あなたの精神の力が地面を揺らします。パーティー全員が知性を得ます。(知性に基づく)",
"spellWizardFrostText": "酷寒の霜",
- "spellWizardFrostNotes": "Ice covers your tasks. None of your streaks will reset to zero tomorrow! (One cast affects all streaks.)",
+ "spellWizardFrostNotes": "氷があなたのタスクを覆う。あなたの連続実行のいずれも明日ゼロにリセットされません! (一度唱えると全ての連続実行に影響します)",
"spellWarriorSmashText": "ブルータルスマッシュ",
- "spellWarriorSmashNotes": "You hit a task with all of your might. It gets more blue/less red, and you deal extra damage to Bosses! Click on a task to cast. (Based on: STR)",
+ "spellWarriorSmashNotes": "全力でタスクを攻撃します。タスクはより青く、もしくは赤が薄くなり、ボスに追加ダメージを与えます! 唱える対象のタスクをクリックして下さい(力に基づく)",
"spellWarriorDefensiveStanceText": "守勢の体勢",
"spellWarriorDefensiveStanceNotes": "You prepare yourself for the onslaught of your tasks. You gain a buff to Constitution! (Based on: Unbuffed CON)",
"spellWarriorValorousPresenceText": "勇烈な貫禄",
@@ -26,7 +26,7 @@
"spellHealerHealText": "ヒール",
"spellHealerHealNotes": "Light covers your body, healing your wounds. You regain health! (Based on: CON and INT)",
"spellHealerBrightnessText": "焼けるように輝度",
- "spellHealerBrightnessNotes": "A burst of light dazzles your tasks. They become more blue and less red! (Based on: INT)",
+ "spellHealerBrightnessNotes": "あなたはすべてのタスクを隠す光のバーストを投げかけます。あなたのタスクの赤みが軽減されます。(知性に基づく)",
"spellHealerProtectAuraText": "防護のオーラ",
"spellHealerProtectAuraNotes": "You shield your party from damage. Your whole party gains a buff to Constitution! (Based on: Unbuffed CON)",
"spellHealerHealAllText": "恵み",
diff --git a/common/locales/ja/tasks.json b/common/locales/ja/tasks.json
index a68c8832e3..3df9805e3e 100644
--- a/common/locales/ja/tasks.json
+++ b/common/locales/ja/tasks.json
@@ -14,7 +14,7 @@
"save": "保存",
"addChecklist": "チェックリストを追加",
"checklist": "チェックリスト",
- "checklistText": "日課において、一部完了しているチェックリストはダメージを減少させます。例えば4つのうち、3つのアイテムが完了しているチェックリストは、全てを完了していないときと比べて25%のダメージとなります。\nやるべきことタスクにおいて、チェックリストの完了している要素は倍率を増加させます: 3つのチェックは経験値、ゴールド、マナを3倍増加させます(合計で4倍となります)。",
+ "checklistText": "タスクをより小さく分割しよう! チェックリストはToDoリストから得られる経験値とゴールドを増加し、日課を実行しなかった場合のダメージを減少させます。",
"expandCollapse": "展開する/折り畳む",
"text": "テキスト",
"extraNotes": "追記",
@@ -22,7 +22,7 @@
"advancedOptions": "拡張オプション",
"difficulty": "難易度",
"difficultyHelpTitle": "このタスクはどれくらい難しいですか？",
- "difficultyHelpContent": "これはポイントの価値を増加させます。実際はこの項目は控えめに使われていて、代わりに我々の有機的な価値調整アルゴリズムにより決定されています。しかしいくつかのタスクは極めて価値がある場合があります（例：論文を執筆する vs 歯磨き）。クリックすることで詳しい情報が得られます。",
+ "difficultyHelpContent": "より難しいタスクを実施済みにすると、より多くの経験値とゴールドを得ることができますが... それが未実施の日課や悪い習慣の場合には、より多くのダメージを受けます。",
"easy": "かんたん",
"medium": "ふつう",
"hard": "むずかしい",
diff --git a/common/locales/nl/backgrounds.json b/common/locales/nl/backgrounds.json
index dee1301408..f26288a323 100644
--- a/common/locales/nl/backgrounds.json
+++ b/common/locales/nl/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "Bergmeer",
"backgroundMountainLakeNotes": "Dompel je tenen in een Bergmeer",
"backgroundPagodasText": "Pagodes",
- "backgroundPagodasNotes": "Klim naar de top van de Pagodes"
+ "backgroundPagodasNotes": "Klim naar de top van de Pagodes",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/nl/challenge.json b/common/locales/nl/challenge.json
index 7dd1fa8f1f..b434eeef64 100644
--- a/common/locales/nl/challenge.json
+++ b/common/locales/nl/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Kies een winnaar en sluit de uitdaging af:",
"deleteOrSelect": "Verwijder of kies een winnaar",
"endChallenge": "Uitdaging beëindigen",
- "challengeDiscription": "Dit zijn de taken die bij de uitdaging horen. Naarmate meer gebruikers ze uitvoeren, veranderen de taken van kleur en krijgen ze grafieken om je de algemene voortgang van de groep te laten zien.",
+ "challengeDiscription": "These are the Challenge's tasks that will be added to your task dashboard when you join this Challenge. The sample Challenge tasks below will change color and gain graphs to show you the overall progress of the group.",
"hows": "Hoe gaat het met iedereen?",
"filter": "Filter",
"groups": "Groepen",
@@ -33,7 +33,8 @@
"challengeTagPop": "Uitdagingen zijn te zien op labellijsten en op taakomschrijvingen. Dus hoewel je een omschrijvende titel wil voor hierboven, heb je ook een 'korte naam' nodig. '5 kilo afvallen in drie maanden' kan bijvoorbeeld worden afgekort to '-5kg' (Klik voor meer informatie).",
"challengeDescr": "Beschrijving",
"prize": "Prijs",
- "prizePop": "Als jouw uitdaging een 'winnaar' kan hebben, kun je eventueel edelstenen beschikbaar stellen als prijs. Maximum = aantal edelstenen in jouw bezit (+gilde-edelstenen, als jij het gilde aangemaakt hebt waarin de uitdaging valt). Let op: deze prijs kan later niet veranderd worden en zal niet teruggestort worden als de uitdaging geannuleerd wordt.",
+ "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.",
+ "prizePopTavern": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
"publicChallenges": "Minimaal 1 edelsteen voor openbare uitdagingen (helpt spam voorkomen, echt).",
"officialChallenge": "Officiële HabitRPG-Uitdaging",
"by": "door",
@@ -43,6 +44,7 @@
"selectGroup": "Groep selecteren",
"challengeCreated": "Uitdaging aangemaakt",
"sureDelCha": "Uitdaging verwijderen; weet je het zeker?",
+ "sureDelChaTavern": "Delete challenge, are you sure? Your gems will not be refunded.",
"removeTasks": "Taken verwijderen",
"keepTasks": "Taken behouden",
"closeCha": "Uitdaging afsluiten en...",
diff --git a/common/locales/nl/character.json b/common/locales/nl/character.json
index cc8cb886ad..7bf64613fc 100644
--- a/common/locales/nl/character.json
+++ b/common/locales/nl/character.json
@@ -52,9 +52,11 @@
"costume": "Kostuum",
"costumeText": "Als een andere uitrusting mooier vindt dan de uitrusting die je gebruikt, vink dan \"Kostuum gebruiken\" aan om een andere uitrusting zichtbaar te maken terwijl je je strijduitrusting eronder draagt.",
"useCostume": "Kostuum gebruiken",
- "gearAchievement": "Je hebt de pretatie \"Hoogst haalbare uitrusting\" behaald door de hoogst haalbare uitrusting aan te schaffen!",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Hoogst haalbare uitrusting",
- "ultimGearText": "Heeft de hoogst haalbare uitrustings- en wapenset aangeschaft",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Niveau",
"levelUp": "Niveau erbij!",
"mana": "Mana",
@@ -140,5 +142,5 @@
"unequipBattleGear": "Gevechtsuitrusting uittrekken",
"unequipCostume": "Kostuum uittrekken",
"unequipPetMountBackground": "Huisdier, rijdier en achtergrond uitschakelen",
- "animalSkins": "Animal Skins"
+ "animalSkins": "Dierenhuiden"
}
\ No newline at end of file
diff --git a/common/locales/nl/content.json b/common/locales/nl/content.json
index 174c20aff1..255a57026c 100644
--- a/common/locales/nl/content.json
+++ b/common/locales/nl/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Gezondheidsdrankje",
"potionNotes": "Herwin 15 gezondheidspunten (direct gebruik)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "Wolf",
"dropEggWolfAdjective": "loyale",
"dropEggTigerCubText": "Tijgerwelp",
@@ -56,8 +60,8 @@
"questEggBunnyAdjective": "knuffelbaar",
"questEggSlimeText": "Marshmallowslijm",
"questEggSlimeAdjective": "zoete",
- "questEggSheepText": "Sheep",
- "questEggSheepAdjective": "woolly",
+ "questEggSheepText": "Schaap",
+ "questEggSheepAdjective": "wollig",
"eggNotes": "Vind een uitbroedtoverdrank om op dit ei te gieten, en er zal een <%= eggAdjective(locale) %> <%= eggText(locale) %> uitkomen.",
"hatchingPotionBase": "Normale",
"hatchingPotionWhite": "Witte",
diff --git a/common/locales/nl/front.json b/common/locales/nl/front.json
index 6436f54264..b0ddada3b4 100644
--- a/common/locales/nl/front.json
+++ b/common/locales/nl/front.json
@@ -172,5 +172,11 @@
"username": "Gebruikersnaam",
"watchVideos": "Video's bekijken",
"work": "werken",
- "zelahQuote": "Met HabitRPG kan ik overgehaald worden om op tijd naar bed te gaan doordat ik punten verdien als ik vroeg in bed kruip, en gezondheid verlies als ik lang op blijf!"
+ "zelahQuote": "Met HabitRPG kan ik overgehaald worden om op tijd naar bed te gaan doordat ik punten verdien als ik vroeg in bed kruip, en gezondheid verlies als ik lang op blijf!",
+ "reportAccountProblems": "Report Account Problems",
+ "reportCommunityIssues": "Report Community Issues",
+ "generalQuestionsSite": "General Questions about the Site",
+ "businessInquiries": "Business Inquiries",
+ "merchandiseInquiries": "Merchandise Inquiries",
+ "marketingInquiries": "Marketing/Social Media Inquiries"
}
\ No newline at end of file
diff --git a/common/locales/nl/gear.json b/common/locales/nl/gear.json
index f5cb2a7a95..c27e73e43e 100644
--- a/common/locales/nl/gear.json
+++ b/common/locales/nl/gear.json
@@ -120,6 +120,8 @@
"weaponMystery201411Notes": "Steek je vijanden neer of neem een schep van je favoriete eten - met deze hooivork kan het allemaal! Verleent geen voordelen. Abonnee-uitrusting november 2014.",
"weaponMystery201502Text": "Glimmende gevleugelde staff der liefde alsook wijsheid",
"weaponMystery201502Notes": "Voor VLEUGELS! Voor LIEFDE! EN OOK VOOR WAARHEID! Verleent geen voordelen. Abonnee-uitrusting februari 2015.",
+ "weaponMystery201505Text": "Green Knight Lance",
+ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "Steampunkstaf",
"weaponMystery301404Notes": "Perfect om door de stad te flaneren. Abonnee-uitrusting maart 3015. Verleent geen voordelen.",
"armor": "wapenrusting",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "Wie is een pinguïn? Verleent geen voordelen. Abonnee-uitrusting december 2014.",
"headMystery201501Text": "Sterrenhelm",
"headMystery201501Notes": "Sterrenbeelden flonkeren en wervelen in deze helm, en helpen de drager zijn gedachten te concentreren. Verleent geen voordelen. Abonnee-uitrusting januari 2015.",
+ "headMystery201505Text": "Green Knight Helm",
+ "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 2015 Subscriber Item.",
"headMystery301404Text": "Chique hoge hoed",
"headMystery301404Notes": "Een chique hoge hoed voor lieden van deftigen huize! Abonnee-uitrusting januari 3015. Verleent geen voordelen.",
"headMystery301405Text": "Standaard hoge hoed",
@@ -466,8 +470,8 @@
"bodySpecialSummerHealerText": "Kraag van koraal",
"bodySpecialSummerHealerNotes": "Een stijlvolle ketting van levend koraal! Verleent geen voordelen. Beperkte oplage zomeruitrusting 2014.",
"headAccessory": "hoofdaccessoire",
- "accessories": "Accessories",
- "animalEars": "Animal Ears",
+ "accessories": "Accessoires",
+ "animalEars": "Dieren Oren",
"headAccessoryBase0Text": "Geen hoofdaccessoire",
"headAccessoryBase0Notes": "Geen hoofdaccessoire.",
"headAccessorySpecialSpringRogueText": "Paarse kattenoren",
@@ -486,21 +490,21 @@
"headAccessorySpecialSpring2015MageNotes": "Deze oren luisteren scherp naar goochelaars die mogelijk geheimen onthullen. Verleent geen voordelen. Beperkte oplage lente-uitrusting 2015.",
"headAccessorySpecialSpring2015HealerText": "Groene kattenoren",
"headAccessorySpecialSpring2015HealerNotes": "Deze schattige kattenoren zullen anderen groen laten zien van jaloezie. Verleent geen voordelen. Beperkte oplage lente-uitrusting 2015.",
- "headAccessoryBearEarsText": "Bear Ears",
+ "headAccessoryBearEarsText": "Beren Oren",
"headAccessoryBearEarsNotes": "These ears make you look like a cuddly bear! Confers no benefit.",
- "headAccessoryCactusEarsText": "Cactus Ears",
+ "headAccessoryCactusEarsText": "Cactus Oren",
"headAccessoryCactusEarsNotes": "These ears make you look like a prickly cactus! Confers no benefit.",
- "headAccessoryFoxEarsText": "Fox Ears",
+ "headAccessoryFoxEarsText": "Vossen Oren",
"headAccessoryFoxEarsNotes": "These ears make you look like a wily fox! Confers no benefit.",
- "headAccessoryLionEarsText": "Lion Ears",
+ "headAccessoryLionEarsText": "Leeuwen Oren",
"headAccessoryLionEarsNotes": "These ears make you look like a regal lion! Confers no benefit.",
- "headAccessoryPandaEarsText": "Panda Ears",
+ "headAccessoryPandaEarsText": "Panda Oren",
"headAccessoryPandaEarsNotes": "These ears make you look like a gentle panda! Confers no benefit.",
- "headAccessoryPigEarsText": "Pig Ears",
+ "headAccessoryPigEarsText": "Varkens Oren",
"headAccessoryPigEarsNotes": "These ears make you look like a whimsical pig! Confers no benefit.",
- "headAccessoryTigerEarsText": "Tiger Ears",
+ "headAccessoryTigerEarsText": "Tijger Oren",
"headAccessoryTigerEarsNotes": "These ears make you look like a fierce tiger! Confers no benefit.",
- "headAccessoryWolfEarsText": "Wolf Ears",
+ "headAccessoryWolfEarsText": "Wolven Oren",
"headAccessoryWolfEarsNotes": "These ears make you look like a loyal wolf! Confers no benefit.",
"headAccessoryMystery201403Text": "Woudlopersgewei",
"headAccessoryMystery201403Notes": "Dit gewei glinstert van het mos en korstmos. Verleent geen voordelen. Abonnee-uitrusting maart 2014.",
diff --git a/common/locales/nl/generic.json b/common/locales/nl/generic.json
index d67b7ba0fd..4f49cbd3f5 100644
--- a/common/locales/nl/generic.json
+++ b/common/locales/nl/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitica",
"expandToolbar": "Werkbalk openen",
"collapseToolbar": "Werkbalk verkleinen",
- "formattingMarkdown": "Markdown formatting mogelijk",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*Italics*",
+ "bold": "**Bold**",
+ "strikethrough": "~~Strikethrough~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "Prestaties",
"modalAchievement": "Prestatie!",
"special": "Speciale artikelen",
diff --git a/common/locales/nl/groups.json b/common/locales/nl/groups.json
index 3305cff005..00a7d9d56f 100644
--- a/common/locales/nl/groups.json
+++ b/common/locales/nl/groups.json
@@ -2,7 +2,7 @@
"tavern": "Herberg",
"innCheckOut": "Uitchecken bij de herberg",
"innCheckIn": "Rusten in de herberg",
- "innText": "You're resting in the Inn! While checked-in, your Dailies won't hurt you at the day's end, but they will still refresh every day. Be warned: If you are participating in a Boss Quest, the Boss will still damage you for your party mates' missed Dailies unless they are also in the Inn! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
+ "innText": "Je ben aan het uitrusten in de Herberg! Zolang je hier verblijft, zullen je dagelijkse taken je geen pijn doen aan het eind van de dag, maar ze zullen wel elke dag verversen. Wees gewaarschuwd: Als je meedoet aan een queeste met een eindbaas, zal de eindbaas je nog steeds pijn doen voor de gemiste dagelijkse taken van je groepsgenoten, tenzij ze ook in de herberg verblijven! Je zult zelf ook geen schade toebrengen aan de eindbaas (of voorwerpen krijgen) totdat je de Herberg verlaat.",
"lfgPosts": "Berichten: groep gezocht",
"tutorial": "Handleiding",
"glossary": "Woordenlijst",
@@ -103,11 +103,18 @@
"msgPreviewHeading": "Bericht preview",
"leaderOnlyChallenges": "Alleen de groepsleider kan uitdagingen aanmaken",
"sendGift": "Send Gift",
- "inviteFriends": "Invite Friends",
+ "inviteFriends": "Vrienden Uitnodigen",
"inviteAlertInfo": "Invite friends by User ID here.",
"inviteExistUser": "Invite Existing User",
"inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
"byColon": "By:",
"inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "inviteAlertInfo2": "Or share this link (copy/paste):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/nl/npc.json b/common/locales/nl/npc.json
index 12942e12a6..aaf0546778 100644
--- a/common/locales/nl/npc.json
+++ b/common/locales/nl/npc.json
@@ -2,8 +2,8 @@
"npc": "NPC",
"npcText": "Heeft het Kickstarterproject op het maximale niveau gesteund!",
"mattBoch": "Matt Boch",
- "mattShall": "Zal ik je je rijdier brengen, <%= name %>? Klik op een rijdier om het te zadelen.",
- "mattBochText1": "Welkom in de stal! Ik ben Matt, de dierenmeester. Kies hier een dier om aan je zijde te houden tijdens je avonturen. Geef je huisdieren te eten zodat ze uitgroeien tot krachtige rijdieren!",
+ "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
+ "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
"daniel": "Daniël",
"danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
"danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
@@ -45,9 +45,9 @@
"tourScrollDown": "Zorg ervoor dat je helemaal naar beneden scrolt om alle opties te zien! Klik op je avatar om weer terug te gaan naar de pagina met de taken.",
"tourMuchMore": "Als je klaar bent met je taken kun je een groep vormen met vrienden, in gildes praten met mensen met dezelfde interesses, meedoen aan uitdagingen en meer!",
"tourStatsPage": "Dit is jouw statistiekenpagina! Je kunt prestaties verdienen door deze taken te volbrengen.",
- "tourTavernPage": "Welkom in de Herberg, een chatruimte voor alle leeftijden! Je kunt je account op inactief zetten als je ziek bent of als je op vakantie bent door op 'Rusten in de herberg' te klikken. Kom eens gedag zeggen!",
+ "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
"tourPartyPage": "Jouw groep helpt je verantwoordelijk te blijven. Nodig je vrienden uit en speel een queeste-perkamentrol vrij!",
"tourGuildsPage": "Gildes zijn sociale groepen met gemeenschappelijke thema's. Zoek de onderwerpen uit die je interesseren! We raden het newbiesgilde aan.",
- "tourChallengesPage": "Meedoen met een uitdaging voegt taken toe aan je account. Streef tegen andere gebruikers en win edelstenen!",
+ "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
"tourMarketPage": "Vanaf niveau 4 kun je eieren en uitbroedtoverdranken vinden als je een taak afvinkt. Ze verschijnen hier - gebruik ze om huisdieren te maken! Je kunt ook artikelen kopen in de markt."
}
\ No newline at end of file
diff --git a/common/locales/nl/quests.json b/common/locales/nl/quests.json
index de0f3e75ac..adb33af32f 100644
--- a/common/locales/nl/quests.json
+++ b/common/locales/nl/quests.json
@@ -19,7 +19,7 @@
"bossStrength": "Kracht eindbaas",
"collect": "Verzamel",
"collected": "Verzameld",
- "bossDmg1": "Om een eindbaas schade toe te brengen, moet je je Dagelijkse Taken en To-do's voltooien. Meer schade aan een taak betekent meer schade aan de eindbaas (rode taken voltooien, toverspreuken van de Magiër, aanvallen van de Krijger, etc.). De eindbaas brengt iedereen die meedoet aan de queeste schade toe voor iedere Dagelijkse Taak die je gemist hebt (vermenigvuldigd met de Kracht van de eindbaas), bovenop je normale schade, dus houd je groep gezond door je dagelijkse taken te doen! Alle schade van en aan een eindbaas wordt verrekend tijdens cron (je dagelijkse nieuwe start).",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "Alleen deelnemers bevechten de eindbaas en delen de buit.",
"tavernBossInfo": "Om een wereldbaas schade toe te brengen, moet je je Dagelijkse Taken en To-do's afvinken. Meer schade aan een taak betekent meer schade aan de eindbaas (rode taken voltooien, spreuken van de Magiër, aanvallen van de Krijger, enz). Voor elke Dagelijkse Taak die je mist (vermenigvuldigd met de Kracht van de eindbaas) neemt de Woede van de eindbaas toe. Als die Woede zijn maximum bereikt, gebeurt er iets naars - dus zorg ervoor dat je die dagelijkse taken doet! Alle schade aan en van een eindbaas wordt verrekend tijdens cron (je dagelijkse nieuwe start).",
"bossColl1": "Om vondsten te verzamelen moet je positieve taken doen. De vondsten van de queeste werken hetzelfde als normale vondsten; je zult de vondsten echter niet zien tot de volgende dag, wanneer alles wat je hebt gevonden wordt opgeteld en aan de buit wordt toegevoegd.",
diff --git a/common/locales/nl/questscontent.json b/common/locales/nl/questscontent.json
index 6869ae2213..b27ad37ca5 100644
--- a/common/locales/nl/questscontent.json
+++ b/common/locales/nl/questscontent.json
@@ -201,6 +201,6 @@
"questSheepNotes": "As you wander the rural Taskan countryside with friends, taking a \"quick break\" from your obligations, you find a cozy yarn shop. You are so absorbed in your procrastination that you hardly notice the ominous clouds creep over the horizon. \"I've got a ba-a-a-ad feeling about this weather,\" mutters @Misceo, and you look up. The stormy clouds are swirling together, and they look a lot like a... \"We don't have time for cloud-gazing!\" @starsystemic shouts. \"It's attacking!\" The Thunder Ram hurtles forward, slinging bolts of lightning right at you!",
"questSheepBoss": "Thunder Ram",
"questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
- "questSheepDropSheepEgg": "Sheep (Egg)",
+ "questSheepDropSheepEgg": "Schaap (ei)",
"questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market"
}
\ No newline at end of file
diff --git a/common/locales/nl/spells.json b/common/locales/nl/spells.json
index 6e39068756..c3055c87b3 100644
--- a/common/locales/nl/spells.json
+++ b/common/locales/nl/spells.json
@@ -1,6 +1,6 @@
{
"spellWizardFireballText": "Uiteenspatting van Vlammen",
- "spellWizardFireballNotes": "Flames burst from your hands. You gain XP, and you deal extra damage to Bosses! Click on a task to cast. (Based on: INT)",
+ "spellWizardFireballNotes": "Vlammen spatten van je handen. Je krijgt ervaringspunten en deelt extra schade uit aan eindbazen! Klik op een taak om uit te spreken. (Gebaseerd op Intelligentie.)",
"spellWizardMPHealText": "Golf van Ether",
"spellWizardMPHealNotes": "Je offert magische energie op om je vrienden te redden. Je groep krijgt er manapunten bij! (Gebaseerd op Intelligentie.)",
"spellWizardEarthText": "Aardbeving",
diff --git a/common/locales/nl/tasks.json b/common/locales/nl/tasks.json
index 5bd113636c..9e38288bb5 100644
--- a/common/locales/nl/tasks.json
+++ b/common/locales/nl/tasks.json
@@ -14,7 +14,7 @@
"save": "Opslaan",
"addChecklist": "Checklijst toevoegen",
"checklist": "Checklijst",
- "checklistText": "Deels afgevinkte checklijsten verminderen de schade van Dagelijkse Taken. Een checklijst van 4 taken waarvan er 3 zijn afgevinkt, bijvoorbeeld, vermindert de schade voor die incomplete Dagelijkse Taak tot 25%. Voltooide taken op de checklijst van een To-do vermenigvuldigen de beloning: 3 voltooide taken betekent +3x (totaal 4x) de ervaringspunten, goud en mana.",
+ "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
"expandCollapse": "Uitklappen/Inklappen",
"text": "Tekst",
"extraNotes": "Extra aantekeningen",
@@ -22,7 +22,7 @@
"advancedOptions": "Geavanceerde opties",
"difficulty": "Moeilijkheidsgraad",
"difficultyHelpTitle": "Hoe moeilijk is deze taak?",
- "difficultyHelpContent": "Dit verhoogt de puntwaarde. Gebruik de optie met mate; vertrouw in plaats daarvan op ons organische punten-aanpassingssysteem. Maar sommige taken zijn nu eenmaal veel meer waard dan andere (scriptie schrijven tegenover tanden flossen). Klik voor meer informatie.",
+ "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!",
"easy": "Gemakkelijk",
"medium": "Gemiddeld",
"hard": "Moeilijk",
diff --git a/common/locales/pl/backgrounds.json b/common/locales/pl/backgrounds.json
index 9d69b39f1f..4938f982f2 100644
--- a/common/locales/pl/backgrounds.json
+++ b/common/locales/pl/backgrounds.json
@@ -34,7 +34,7 @@
"backgroundHauntedHouseText": "Nawiedzony dom",
"backgroundHauntedHouseNotes": "Przekradnij się przez nawiedzony dom.",
"backgroundPumpkinPatchText": "Dyniowa grządka",
- "backgroundPumpkinPatchNotes": "Rzeźb latarnie z wydrążonej dyni na dyniowej grządce.",
+ "backgroundPumpkinPatchNotes": "Rzeźb latarnie z na dyniowej grządce.",
"backgrounds112014": "ZESTAW 6: Opublikowany w listopadzie 2014",
"backgroundHarvestFeastText": "Urodzajna uczta",
"backgroundHarvestFeastNotes": "Rozkoszuj się urodzajną ucztą.",
@@ -50,38 +50,45 @@
"backgroundSouthPoleText": "Biegun południowy",
"backgroundSouthPoleNotes": "Odwiedź lodowy biegun południowy.",
"backgrounds012015": "ZESTAW 8: Opublikowany w styczniu 2015",
- "backgroundIceCaveText": "Lodowa Jaskinia",
+ "backgroundIceCaveText": "Lodowa jaskinia",
"backgroundIceCaveNotes": "Zapuść się w głąb lodowej jaskini.",
"backgroundFrigidPeakText": "Lodowaty szczyt",
"backgroundFrigidPeakNotes": "Zdobądź lodowaty szczyt.",
"backgroundSnowyPinesText": "Ośnieżone sosny",
"backgroundSnowyPinesNotes": "Schroń się pośród ośnieżonych sosen.",
- "backgrounds022015": "ZESTAW 9: Opublikowany w styczniu 2015",
+ "backgrounds022015": "ZESTAW 9: Opublikowany w lutym 2015",
"backgroundBlacksmithyText": "Kowalstwo",
"backgroundBlacksmithyNotes": "Pracuj w Kuźni.",
- "backgroundCrystalCaveText": "Kryształowa Jaskinia",
- "backgroundCrystalCaveNotes": "Zbadaj Kryształową Jaskinię.",
- "backgroundDistantCastleText": "Odległy Zamek",
- "backgroundDistantCastleNotes": "Obroń Odległy Zamek.",
+ "backgroundCrystalCaveText": "Kryształowa jaskinia",
+ "backgroundCrystalCaveNotes": "Zbadaj kryształową jaskinię.",
+ "backgroundDistantCastleText": "Odległy zamek",
+ "backgroundDistantCastleNotes": "Broń odległego zamku.",
"backgrounds032015": "ZESTAW 10: Opublikowany w marcu 2015",
- "backgroundSpringRainText": "Wiosenny Deszcz",
- "backgroundSpringRainNotes": "Zatańcz w jesiennym deszczu.",
+ "backgroundSpringRainText": "Wiosenny deszcz",
+ "backgroundSpringRainNotes": "Zatańcz w wiosennym deszczu.",
"backgroundStainedGlassText": "Witraż",
- "backgroundStainedGlassNotes": "Podziwiaj Witraże",
- "backgroundRollingHillsText": "Pofalowane wzgórza",
- "backgroundRollingHillsNotes": "Hasaj przez pofalowane wzgórza",
+ "backgroundStainedGlassNotes": "Podziwiaj witraże.",
+ "backgroundRollingHillsText": "Faliste wzgórza",
+ "backgroundRollingHillsNotes": "Hasaj przez faliste wzgórza.",
"backgrounds042015": "ZESTAW 11: Opublikowany w kwietniu 2015",
"backgroundCherryTreesText": "Drzewa wiśni",
- "backgroundCherryTreesNotes": "Podziwiaj drzewa wiśni w rozkwicie",
+ "backgroundCherryTreesNotes": "Podziwiaj drzewa wiśni w rozkwicie.",
"backgroundFloralMeadowText": "Kwiecista łąka",
- "backgroundFloralMeadowNotes": "Piknik na kwiecistej łące",
+ "backgroundFloralMeadowNotes": "Piknikuj na kwiecistej łące.",
"backgroundGumdropLandText": "Żelkowa kraina",
- "backgroundGumdropLandNotes": "Skub scenerię żelkowej krainy",
+ "backgroundGumdropLandNotes": "Skub scenerię żelkowej krainy.",
"backgrounds052015": "ZESTAWA 12: Opublikowany w maju 2015",
"backgroundMarbleTempleText": "Marmurowa świątynia",
- "backgroundMarbleTempleNotes": "Pozuj na tle marmurowej świątyni",
+ "backgroundMarbleTempleNotes": "Pozuj na tle marmurowej świątyni.",
"backgroundMountainLakeText": "Górskie jezioro",
- "backgroundMountainLakeNotes": "Zanurz palce w górskim jeziorze",
+ "backgroundMountainLakeNotes": "Zanurz palce w górskim jeziorze.",
"backgroundPagodasText": "Pagody",
- "backgroundPagodasNotes": "Wspinaj się na szczyty pagód"
+ "backgroundPagodasNotes": "Wspinaj się na szczyty pagód.",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/pl/challenge.json b/common/locales/pl/challenge.json
index 20beefe96e..586b4d8866 100644
--- a/common/locales/pl/challenge.json
+++ b/common/locales/pl/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Wybierz zwycięzcę i zakończ wyzwanie:",
"deleteOrSelect": "Usuń lub wybierz zwycięzcę",
"endChallenge": "Zakończ wyzwanie",
- "challengeDiscription": "Oto zadania, jakie należy wypełnić podczas wyzwania. W miarę jak gracze będą czynić postępy, kolory zadań będą się zmieniać. Pojawią się także wykresy, które wykażą ogólny postęp grupy.",
+ "challengeDiscription": "Oto zadania, które zostaną dodane do twojej tablicy zadań, gdy dołączysz do wyzwania. Ogólny postęp grupy będzie pokazywany przez zmianę koloru poniższych przykładowych zadań oraz wzrost wykresów.",
"hows": "Jak wam idzie?",
"filter": "Filtruj",
"groups": "Grupy",
@@ -33,7 +33,8 @@
"challengeTagPop": "Wyzwania pojawiają się na liście tagów oraz w opisach zadań. Dlatego oprócz pełnej nazwy, wpisanej wyżej, potrzebny będzie także jej \"skrót\". Na przykład \"Schudnąć 5 kilogramów w 3 miesiące\" może dostać skrót \"−5kg\" (Kliknij, by dowiedzieć się więcej).",
"challengeDescr": "Opis",
"prize": "Nagroda",
- "prizePop": "Jeśli Twoje wyzwanie można wygrać, możesz nagrodzić zwycięzcę Klejnotami. Maksymalna nagroda to liczba posiadanych przez Ciebie klejnotów (plus liczba Klejnotów w Banku Gildii, jeśli to Ty stworzyłeś gildię przypisaną do wyzwania). Uwaga: Raz ogłoszonej nagrody nie można już zmienić a Klejnoty nie zostaną zwrócone w przypadku anulowania wyzwania.",
+ "prizePop": "Jeśli twoje wyzwanie można wygrać, możesz opcjonalnie nagrodzić zwycięzcę klejnotami. Maksymalna nagroda to liczba posiadanych przez ciebie klejnotów (plus liczba klejnotów w banku gildii, jeśli to ty stworzyłeś gildię przypisaną do wyzwania). Uwaga: Raz ogłoszonej nagrody nie można później zmienić.",
+ "prizePopTavern": "Jeśli twoje wyzwanie można wygrać, możesz opcjonalnie nagrodzić zwycięzcę klejnotami. Maksymalna nagroda to liczba posiadanych przez ciebie klejnotów (plus liczba klejnotów w banku gildii, jeśli to ty stworzyłeś gildię przypisaną do wyzwania). Uwaga: Raz ogłoszonej nagrody nie można później zmienić, a klejnoty w wyzwaniach Karczmy nie zostaną zwrócone w przypadku anulowania wyzwania.",
"publicChallenges": "Przy publicznych wyzwaniach minimalna nagroda to 1 klejnot (metoda antyspamowa, naprawdę działa).",
"officialChallenge": "Oficjalne wyzwanie HabitRPG",
"by": "stworzone przez",
@@ -43,6 +44,7 @@
"selectGroup": "Wybierz grupę",
"challengeCreated": "Wyzwanie zostało stworzone",
"sureDelCha": "Jesteś pewien, że chcesz usunąć wyzwanie?",
+ "sureDelChaTavern": "Czy na pewno usunąć wyzwanie? Twoje klejnoty nie zostaną zwrócone.",
"removeTasks": "Usuń zadania",
"keepTasks": "Zachowaj zadania",
"closeCha": "Zakończ wyzwanie i...",
diff --git a/common/locales/pl/character.json b/common/locales/pl/character.json
index cc73302580..541c25b8d5 100644
--- a/common/locales/pl/character.json
+++ b/common/locales/pl/character.json
@@ -28,7 +28,7 @@
"hairBangs": "Grzywka",
"hairBase": "Spód",
"hairSet1": "Zestaw fryzur 1",
- "hairSet2": "Drugi zestaw fryzur",
+ "hairSet2": "Zestaw fryzur 2",
"bodyFacialHair": "Zarost",
"beard": "Broda",
"mustache": "Wąsy",
@@ -52,9 +52,11 @@
"costume": "Kostium",
"costumeText": "Jeśli podoba Ci się inny strój, niż ten, w którym chcesz walczyć, zaznacz \"Załóż kostium\". Odziana w kostium, Twoja postać będzie nadal miała pod spodem wybrany strój bojowy.",
"useCostume": "Załóż kostium",
- "gearAchievement": "Zdobyłeś osiągnięcie \"Uzbrojony po zęby\" za ulepszenie wyposażenia do najwyższego poziomu!",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Uzbrojony po zęby",
- "ultimGearText": "Ulepszył maksymalnie broń i zbroję",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Poziom",
"levelUp": "Zyskujesz poziom!",
"mana": "Mana",
@@ -70,7 +72,7 @@
"allocatePerPop": "Dodaj punkt do Percepcji",
"allocateInt": "Punkty przydzielone do Inteligencji:",
"allocateIntPop": "Dodaj punkt do Inteligencji",
- "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue leveling up, or start a new adventure at level 1 by using the Orb of Rebirth, now available for free in the Market.",
+ "noMoreAllocate": "Teraz gdy osiągniesz poziom 100, nie będziesz już zyskiwać punktów atrybutów. Możesz dalej podnosić poziom lub zacząć przygodę nową od poziomu 1 używając Kuli Odrodzenia, dostępnej teraz za darmo na Targu.",
"stats": "Statystyki",
"strength": "Siła",
"strengthText": "Siła zwiększa szansę na losowe \"trafienia krytyczne\", a także wpływa na ilość otrzymanego za nie Złota, Doświadczenia i prawdopodobieństwa łupów. Pomaga także zadawać obrażenia bossom.",
@@ -137,8 +139,8 @@
"displayNameDescription1": "Ta nazwa pojawia się przy wiadomościach, które publikujesz w czatach Karczmy, gildii i drużyny, a także widoczna jest na Twoim avatarze. Idź do",
"displayNameDescription2": "Ustawienia → Strona",
"displayNameDescription3": "i zjedź do sekcji „Rejestracja”, by zmienić swoją nazwę użytkownika.",
- "unequipBattleGear": "Zdejmij Wyposażenie Bojowe",
- "unequipCostume": "Zdejmij Kostium",
+ "unequipBattleGear": "Zdejmij wyposażenie bojowe",
+ "unequipCostume": "Zdejmij kostium",
"unequipPetMountBackground": "Odeślij Chowańca, Wierzchowca, Tło",
"animalSkins": "Zwierzęce kolory"
}
\ No newline at end of file
diff --git a/common/locales/pl/content.json b/common/locales/pl/content.json
index a1cb49cc79..e106837f2e 100644
--- a/common/locales/pl/content.json
+++ b/common/locales/pl/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Eliksir uzdrawiający",
"potionNotes": "Odnawia 15 punktów zdrowia (działa natychmiastowo)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "wilk",
"dropEggWolfAdjective": "lojalnego",
"dropEggTigerCubText": "tygrysiątko",
@@ -30,7 +34,7 @@
"questEggDeerText": "jeleń",
"questEggDeerAdjective": "elegancki",
"questEggEggText": "jajo",
- "questEggEggMountText": "Koszyk na jajka",
+ "questEggEggMountText": "koszyk na jajka",
"questEggEggAdjective": "kolorowe",
"questEggRatText": "szczur",
"questEggRatAdjective": "brudny",
@@ -48,16 +52,16 @@
"questEggOwlAdjective": "mądra",
"questEggPenguinText": "Pingwin",
"questEggPenguinAdjective": "przenikliwy",
- "questEggTRexText": "Tyranozaur",
- "questEggTRexAdjective": "mało-uzbrojony",
- "questEggRockText": "Kamień",
+ "questEggTRexText": "tyranozaur",
+ "questEggTRexAdjective": "krótkołapy",
+ "questEggRockText": "kamień",
"questEggRockAdjective": "żwawy",
- "questEggBunnyText": "Króliczek",
+ "questEggBunnyText": "króliczek",
"questEggBunnyAdjective": "przytulny",
- "questEggSlimeText": "Piankowy Śluz",
- "questEggSlimeAdjective": "słodycz",
- "questEggSheepText": "Sheep",
- "questEggSheepAdjective": "woolly",
+ "questEggSlimeText": "piankowy śluz",
+ "questEggSlimeAdjective": "słodki",
+ "questEggSheepText": "owca",
+ "questEggSheepAdjective": "wełniana",
"eggNotes": "Znajdź eliksir wyklucia i wylej go na to jajo, a wykluje się z niego <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
"hatchingPotionBase": "Zwyczajny",
"hatchingPotionWhite": "Biały",
@@ -69,7 +73,7 @@
"hatchingPotionCottonCandyPink": "Cukierkoworóżowy",
"hatchingPotionCottonCandyBlue": "Cukierkowoniebieski",
"hatchingPotionGolden": "Złoty",
- "hatchingPotionNotes": "Wylej to na jajku, a wykluje się z niego <%=potText(locale)%>.",
+ "hatchingPotionNotes": "Wylej go na jajko, a wykluje się z niego <%=potText(locale)%>.",
"foodMeat": "Mięso",
"foodMilk": "Mleko",
"foodPotatoe": "Ziemniak",
diff --git a/common/locales/pl/contrib.json b/common/locales/pl/contrib.json
index a7d8b55ef0..f10f89f151 100644
--- a/common/locales/pl/contrib.json
+++ b/common/locales/pl/contrib.json
@@ -42,7 +42,7 @@
"moreDetails2": "więcej szczegółów (8-9)",
"contributions": "Wkład",
"admin": "Admin",
- "notGems": "w dolarach amerykańskich, a nie w klejnotach. Tzn. cyfra 1 oznacza 4 klejnoty. Korzystaj z tej opcji tylko jeśli chcesz ręcznie przydzielić graczom klejnoty. Nie stosuj jej przy przyznawaniu rang pomocnika – rangi pomocnika przydzielają klejnoty automatycznie.",
+ "notGems": "w dolarach amerykańskich, a nie w Klejnotach. Tzn. cyfra 1 oznacza 4 klejnoty. Korzystaj z tej opcji tylko jeśli chcesz ręcznie przydzielić graczom klejnoty. Nie stosuj jej przy przyznawaniu rang pomocnika – klejnoty zostaną przydzielone automatycznie wraz z rangą.",
"hideAds": "Ukryj reklamy",
"gamemaster": "Mistrz Gry (pracownik/moderator)",
"backerTier": "Ranga wspieracza",
@@ -61,5 +61,5 @@
"surveysSingle": "Pomógł rozwinąć HabitRPG poprzez wypełnienie ankiety. Brak aktywnych ankiet.",
"surveysMultiple": "Pomógł rozwinąć HabitRPG poprzez wypełnienie <%=surveys %> ankiet. Brak aktywnych ankiet.",
"currentSurvey": "Bieżąca ankieta.",
- "surveyWhen": "Odznaki zostaną przyznane wszystkim biorącym udział, gdy zgłoszenia zostaną przetworzone pod koniec Marca."
+ "surveyWhen": "Odznaki zostaną przyznane wszystkim biorącym udział, gdy zgłoszenia zostaną przetworzone pod koniec marca."
}
\ No newline at end of file
diff --git a/common/locales/pl/defaulttasks.json b/common/locales/pl/defaulttasks.json
index d50d71227e..818508a089 100644
--- a/common/locales/pl/defaulttasks.json
+++ b/common/locales/pl/defaulttasks.json
@@ -1,10 +1,10 @@
{
- "defaultHabit1Text": "Dobry nawyk",
- "defaultHabit1Notes": "Przykładowe Dobre Nawyki: +Zjedz warzywa +15 minut produktywnej pracy",
- "defaultHabit2Text": "Zły nawyk",
- "defaultHabit2Notes": "Przykładowe Złe Nawyki: - Palenie - Odkładanie na później",
- "defaultHabit3Text": "Dobry lub zły nawyk",
- "defaultHabit3Notes": "Przykładowe Dobre i Złe Nawyki: +/- Użyto Schodów/Windy ; +/- Wypito Wodę/Napój Gazowany",
+ "defaultHabit1Text": "Dobry Nawyk",
+ "defaultHabit1Notes": "Przykładowe dobre Nawyki: +Zjedz warzywo +15 minut produktywnej pracy",
+ "defaultHabit2Text": "Zły Nawyk",
+ "defaultHabit2Notes": "Przykładowe złe Nawyki: - Palenie - Odkładanie na później",
+ "defaultHabit3Text": "Dobry lub zły Nawyk",
+ "defaultHabit3Notes": "Przykładowe dobre i złe Nawyki: +/- Użyj schodów/windy ; +/- Wypij wodę/napój gazowany",
"defaultDaily1Text": "1h pracy nad projektem",
"defaultDaily1Notes": "Po utworzeniu wszystkie zadania są domyślnie żółte. To znaczy, że za ich pominięcie otrzymasz średnie obrażenia, a także średnie nagrody, gdy je wypełnisz.",
"defaultDaily2Text": "Posprzątaj mieszkanie",
@@ -20,16 +20,16 @@
"defaultTodo1Text": "Dołączyć do HabitRPG (Odhacz mnie!)",
"defaultTodo2Text": "Wyznacz nowy Nawyk",
"defaultTodo2Checklist1": "stwórz Nawyk",
- "defaultTodo2Checklist2": "w polu Edycji określ, czy ma być na \"+\", \"-\" czy \"+/-\"",
- "defaultTodo2Checklist3": "wyznacz trudność w Zaawansowanych Opcjach",
+ "defaultTodo2Checklist2": "w polu edycji określ, czy ma być na \"+\", \"-\" czy \"+/-\"",
+ "defaultTodo2Checklist3": "wyznacz trudność w opcjach zaawansowanych",
"defaultTodo3Text": "Wyznacz Codzienne zadanie",
"defaultTodo3Checklist1": "zdecyduj, czy używać Codziennych (ranią cię, jeśli nie robisz ich codziennie)",
"defaultTodo3Checklist2": "jeśli tak, stwórz Codzienne (nie za wiele naraz!)",
- "defaultTodo3Checklist3": "wyznacz dni wykonywania w polu Edycji",
+ "defaultTodo3Checklist3": "wyznacz dni wykonywania w polu edycji",
"defaultTodo4Text": "Wyznacz zadanie Do-Zrobienia (może być ukończone bez odhaczenia wszystkich pól)",
"defaultTodo4Checklist1": "stwórz Do-Zrobienia",
- "defaultTodo4Checklist2": "wyznacz trudność w Zaawansowanych Opcjach",
- "defaultTodo4Checklist3": "opcjonalnie: wyznacz Do Kiedy",
+ "defaultTodo4Checklist2": "wyznacz trudność w opcjach zaawansowanych",
+ "defaultTodo4Checklist3": "opcjonalnie: wyznacz termin",
"defaultTodo5Text": "Załóż drużynę (prywatną grupę) z przyjaciółmi (Społeczność → Drużyna)",
"defaultReward1Text": "1 odcinek \"Gry o Tron\"",
"defaultReward1Notes": "Twoje własne nagrody mogą przybrać wiele form. Niektórzy wstrzymują się od oglądania ulubionego serialu, dopóki nie mają wystarczająco złota.",
diff --git a/common/locales/pl/front.json b/common/locales/pl/front.json
index f505b232b1..d661a8b1ac 100644
--- a/common/locales/pl/front.json
+++ b/common/locales/pl/front.json
@@ -172,5 +172,11 @@
"username": "Nazwa użytkownika",
"watchVideos": "Obejrzyj wideo",
"work": "Pracą",
- "zelahQuote": "Dzięki HabitRPG przez myśl o zdobyciu punktów mogę siebie przekonać do wczesnego pójścia spać lub stracić zdrowie za późne pójście!"
+ "zelahQuote": "Dzięki HabitRPG przez myśl o zdobyciu punktów mogę siebie przekonać do wczesnego pójścia spać lub stracić zdrowie za późne pójście!",
+ "reportAccountProblems": "Zgłoś problem z kontem",
+ "reportCommunityIssues": "Zgłoś problem społecznościowy",
+ "generalQuestionsSite": "Ogólne pytania na temat strony",
+ "businessInquiries": "Zapytania biznesowe",
+ "merchandiseInquiries": "Zapytania handlowe",
+ "marketingInquiries": "Zapytania marketingowe/społecznościowe"
}
\ No newline at end of file
diff --git a/common/locales/pl/gear.json b/common/locales/pl/gear.json
index 0550a03fbc..c598a3b8cc 100644
--- a/common/locales/pl/gear.json
+++ b/common/locales/pl/gear.json
@@ -120,6 +120,8 @@
"weaponMystery201411Notes": "Dźgaj swoich wrogów lub rzuć się na ulubione potrawy - te wielofunkcyjne widły nadają się do wszystkiego! Brak dodatkowych korzyści. Listopad 2014 Przedmiot abonencki",
"weaponMystery201502Text": "Lśniąca Skrzydlata Laska Miłości oraz Prawdy",
"weaponMystery201502Notes": "Za SKRZYDŁA! Za MIŁOŚĆ! Za PRAWDĘ RÓWNIEŻ! Nie daje żadnych korzyści. Luty 2015 Przedmiot abonencki.",
+ "weaponMystery201505Text": "Lanca zielonego rycerza",
+ "weaponMystery201505Notes": "Ta zielona i srebrna lanca zdjęła z siodeł ich wierzchowców wielu przeciwników. Brak dodatkowych korzyści. Przedmiot Abonencki maj 2015.",
"weaponMystery301404Text": "Steampunkowa laska",
"weaponMystery301404Notes": "Doskonały by stać się światowcem. Przedmiot Abonencki Marzec 3015. Brak dodatkowych korzyści.",
"armor": "zbroja",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "Kto jest pingwinem? Brak dodatkowych korzyści. Przedmiot Abonencki Grudzien 2014.",
"headMystery201501Text": "Gwiaździsty Hełm",
"headMystery201501Notes": "Konstelacje migoczą i wirują na tym hełmie, prowadząc myśli noszącego w kierunku skupienia. Brak dodatkowych korzyści. Przedmiot Abonencki styczeń 2015.",
+ "headMystery201505Text": "Hełm zielonego rycerza",
+ "headMystery201505Notes": "Zielony pióropusz dumnie powiewa na tym żelaznym hełmie. Brak dodatkowych korzyści. Przedmiot Abonencki maj 2015.",
"headMystery301404Text": "Szykowny cylinder",
"headMystery301404Notes": "Fantazyjny cylinder dla najwyżej urodzonych. Przedmiot Abonencki Styczeń 3015. Brak dodatkowych korzyści.",
"headMystery301405Text": "Klasyczny cylinder",
diff --git a/common/locales/pl/generic.json b/common/locales/pl/generic.json
index c1cfbbd7ed..334aa07073 100644
--- a/common/locales/pl/generic.json
+++ b/common/locales/pl/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitica",
"expandToolbar": "Rozwiń pasek narzędzi",
"collapseToolbar": "Zwiń pasek narzędzi",
- "formattingMarkdown": "Formatowanie Markdown dozwolone",
+ "markdownBlurb": "Przy formatowaniu wiadomości, HabitRPG używa języka markdown. Więcej informacji znajdziesz na ściądze markdown.",
+ "showFormattingHelp": "Pokaż pomoc do formatowania",
+ "hideFormattingHelp": "Ukryj pomoc do formatowania",
+ "youType": "Piszesz:",
+ "youSee": "Widzisz:",
+ "italics": "*Kursywa*",
+ "bold": "**Pogrubienie**",
+ "strikethrough": "~~Skreślenie~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG jest super!](https://habitrpg.com)",
+ "markdownImageEx": "![obowiązkowy alt text](https://habitrpg.com/cake.png \"dodatkowy tekst po najechaniu myszą\")",
+ "unorderedListHTML": "+ Pierwszy punkt + Drugi punkt + Trzeci punkt",
+ "unorderedListMarkdown": "+ Pierwszy punkt\n+ Drugi punkt\n+ Trzeci punkt",
+ "code": "`kod`",
"achievements": "Osiągnięcia",
"modalAchievement": "Osiągnięcie!",
"special": "Specjalne",
@@ -39,7 +52,7 @@
"delete": "Usuń",
"gemsPopoverTitle": "Klejnoty",
"gems": "Klejnoty",
- "gemButton": "Masz <%= number %> klejnotów.",
+ "gemButton": "Masz <%= number %> Klejnotów.",
"moreInfo": "Więcej informacji",
"gemsWhatFor": "Kupione za prawdziwe pieniądze. Są używane do kupowania specjalnych przedmiotów i usług (jaja, eliksiry wyklucia, Wzmocnienie itp.). Musisz najpierw odblokować te funkcje zanim będziesz w stanie użyć Klejnotów.",
"veteran": "Weteran",
diff --git a/common/locales/pl/groups.json b/common/locales/pl/groups.json
index 325a7d44b3..0fb57f6979 100644
--- a/common/locales/pl/groups.json
+++ b/common/locales/pl/groups.json
@@ -102,12 +102,19 @@
"messageWroteIn": "<%= user %> napisał w <%= group %>",
"msgPreviewHeading": "Podgląd wiadomości",
"leaderOnlyChallenges": "Tylko przywódca grupy może tworzyć wyzwania",
- "sendGift": "Send Gift",
- "inviteFriends": "Invite Friends",
- "inviteAlertInfo": "Invite friends by User ID here.",
- "inviteExistUser": "Invite Existing User",
- "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
- "byColon": "By:",
- "inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "sendGift": "Wyślij prezent",
+ "inviteFriends": "Zaproś znajomych",
+ "inviteAlertInfo": "Zaproś tutaj znajomych za pomocą ID użytkownika.",
+ "inviteExistUser": "Zaproś istniejącego użytkownika",
+ "inviteByEmail": "Zaproś znajomych przez e-maila. Jeśli dołączą się przez twojego e-maila, to zostaną automatycznie zaproszeni do tej grupy.",
+ "byColon": "Przez:",
+ "inviteNewUsers": "Zaproś nowych użytkowników",
+ "inviteAlertInfo2": "Lub podziel się tym odnośnikiem (kopiuj/wklej):",
+ "sendGiftHeading": "Wyślij prezent dla <%= name %> ",
+ "sendGiftGemsBalance": "Posiadanych Klejnotów: <%= number %>",
+ "sendGiftCost": "Suma: <%= cost %> $",
+ "sendGiftFromBalance": "Z posiadanych",
+ "sendGiftPurchase": "Kup nowe",
+ "sendGiftMessagePlaceholder": "Osobista wiadomość (opcjonalnie)",
+ "sendGiftSubscription": "<%= months %> miesięcy: <%= price %> $"
}
\ No newline at end of file
diff --git a/common/locales/pl/limited.json b/common/locales/pl/limited.json
index ae2063d8e7..ea9bc26aff 100644
--- a/common/locales/pl/limited.json
+++ b/common/locales/pl/limited.json
@@ -6,7 +6,7 @@
"annoyingFriendsText": "Dostał <%= snowballs %> razy śnieżką od członków Drużyny.",
"alarmingFriends": "Niepokojący przyjaciele",
"alarmingFriendsText": "Przestraszony <%= spookDust %> razy przez członków drużyny.",
- "agriculturalFriends": "Rolniczy Przyjaciele",
+ "agriculturalFriends": "Rolniczy przyjaciele",
"agriculturalFriendsText": "Został przemieniony w kwiata <%= seeds %> razy przez członków drużyny.",
"valentineCard": "Kartka Walentynkowa",
"valentineCardNotes": "Wyślij Kartkę Walentynkową do członka drużyny.",
@@ -20,7 +20,7 @@
"turkey": "Indor",
"polarBearPup": "Niedźwiadek polarny",
"jackolantern": "Jack-O-Lantern",
- "seasonalShop": "Sklepik Sezonowy",
+ "seasonalShop": "Sklepik sezonowy",
"seasonalShopClosedTitle": "<%= linkStart %>Siena Leslie<%= linkEnd %>",
"seasonalShopTitle": "<%= linkStart %>Sezonowe Czary<%= linkEnd %>",
"seasonalShopClosedText": "Sklepik sezonowy jest zamknięty! Nie wiemy gdzie obecnie znajduje się Sezonowa Wróżka, ale na pewno zjawi się na kolejną <%= linkStart %>Wielką Galę<%= linkEnd %>!",
@@ -38,11 +38,11 @@
"newYear0": "Szczęśliwego Nowego Roku! Obyś zgładził wiele złych Nawyków.",
"newYear1": "Szczęśliwego Nowego Roku! Obyś zebrał wiele Nagród.",
"newYear2": "Szczęśliwego Nowego Roku! Obyś zdobył wiele Doskonałych Dni.",
- "newYear3": "Szczęśliwego Nowego Roku! Niech twoja lista zadań Do-Zrobienie pozostanie krótka.",
+ "newYear3": "Szczęśliwego Nowego Roku! Niech twoja lista zadań Do-Zrobienia pozostanie krótka.",
"newYear4": "Szczęśliwego Nowego Roku! Obyś nie został zaatakowany przez rozwścieczonego hipogryfa.",
"holidayCard": "Dostałeś Wakacyjną Kartkę!",
- "mightyBunnySet": "Poteżny Króliczek (Wojownik)",
+ "mightyBunnySet": "Poteżny króliczek (Wojownik)",
"magicMouseSet": "Magiczna myszka (Mag)",
- "lovingPupSet": "Kochane Szczenię (Uzdrowiciel)",
- "stealthyKittySet": "Skradająca się Kotka (Łotrzyk)"
+ "lovingPupSet": "Kochane szczenię (Uzdrowiciel)",
+ "stealthyKittySet": "Skradający się kotek (Łotrzyk)"
}
\ No newline at end of file
diff --git a/common/locales/pl/npc.json b/common/locales/pl/npc.json
index c52c1b616a..932c2dd54e 100644
--- a/common/locales/pl/npc.json
+++ b/common/locales/pl/npc.json
@@ -2,8 +2,8 @@
"npc": "NPC",
"npcText": "Wsparł projekt Kickstarter na maksymalnym poziomie!",
"mattBoch": "Matt Boch",
- "mattShall": "Czy przyprowadzić wierzchowca, <%= name %>? Kliknij wybranego wierzchowca, a ja go osiodłam.",
- "mattBochText1": "Witaj w stajni! Mam na imię Matt i opiekuję się chowańcami. Wybierz jednego z nich, a będzie Ci wiernie towarzyszył. Karm swoje chowańce, by wyrosły z nich potężne wierzchowce.",
+ "mattShall": "Czy przyprowadzić wierzchowca, <%= name %>? Gdy nakarmisz chowańca wystarczającą ilością jedzenia, by zamienił się w wierzchowca, to pojawi się tutaj. Kliknij wybranego wierzchowca, by go osiodłać.",
+ "mattBochText1": "Witaj w stajni! Mam na imię Matt i jestem władcą chowańców. Od poziomu 4 możesz za pomocą jaj i eliksirów wykluwać chowańce. Gdy na Targu wyklujesz chowańca, to pojawi się on tutaj! Kliknij na obrazek jednego z nich, by pojawił się na twoim awatarze. Karm chowańce jedzeniem znajdowanym od poziomu 4, by wyrosły z nich potężne wierzchowce.",
"daniel": "Daniel",
"danielText": "Witaj w Karczmie! Zostań na chwilę i porozmawiaj z mieszkańcami. Jeśli potrzebujesz odpoczynku (wakacje? choroba?), znajdę dla Ciebie pokój w Gospodzie. Kiedy odpoczywasz, twoje Codzienne nie skrzywdzą ciebie na koniec dnia, jednak nadal możesz je odhaczać.",
"danielText2": "Uważaj: Jeśli uczestniczysz w walce z bossem, wciąż może on zadać tobie obrażenia, jeśli członkowie twojej drużyny ominą Codzienne! Również twoje obrażenia dla bossa (lub zebrane przedmioty) nie zostaną zaaplikowane, dopóki nie zakończysz odpoczynku w Gospodzie.",
@@ -45,9 +45,9 @@
"tourScrollDown": "Zobacz całą stronę aby upewnić się, że widziałeś wszystkie opcje! Kliknij ponownie na swój awatar aby wrócić do strony zadań.",
"tourMuchMore": "Gdy zakończysz zadania, możesz wraz z przyjaciółmi stworzyć Drużynę, czatować o wspólnych zainteresowaniach w Gildiach, dołączyć do Wyzwań i więcej!",
"tourStatsPage": "To jest twoja strona Statystyki! Zdobądź osiągnięcia wykonując wymienione zadania.",
- "tourTavernPage": "Witaj w Karczmie, wielowiekowym czacie! Możesz tutaj zamrozić swoje konto w przypadku choroby lub podróży, klikając \"Odpoczywaj w karczmie\". Przywitaj się!",
+ "tourTavernPage": "Witaj w Karczmie, wielowiekowym czacie! W przypadku choroby lub podróży możesz tutaj powstrzymać swoje Codzienne od zadawania ci obrażeń klikając \"Odpoczywaj w Gospodzie\". Przywitaj się!",
"tourPartyPage": "Twoja drużyna pomoże Ci zostać odpowiedzialnym. Zaproś przyjaciół aby odblokować zwój misji!",
"tourGuildsPage": "Gildie to grupy społeczne ze wspólnym motywem. Szukaj tematu, który Cię interesuje! Polecamy Gildię Świeżaków.",
- "tourChallengesPage": "Podjęcie Wyzwania spowoduje dodanie zadań do Twojego konta. Rywalizuj z innymi graczami i wygrywaj Klejnoty!",
+ "tourChallengesPage": "Wyzwania są to tematyczne listy zadań stworzone przez użytkowników! Dołączenie do wyzwania doda je do listy zadań na twoim koncie. Rywalizuj z innymi użytkownikami, by wygrywać nagrody w postaci klejnotów!",
"tourMarketPage": "Od poziomu 4, jaja i eliksiry wyklucia zdobywasz losowo po ukończeniu zadań. Pojawiają się one tutaj - użyj ich, a wyklują się chowańce! Możesz także kupować przedmioty na Targu."
}
\ No newline at end of file
diff --git a/common/locales/pl/quests.json b/common/locales/pl/quests.json
index 9b63b4bd0c..6d476f4a7a 100644
--- a/common/locales/pl/quests.json
+++ b/common/locales/pl/quests.json
@@ -6,8 +6,8 @@
"questSend": "Naciśnięcie \"Zaproś\" wyśle zaproszenie do członków twojej drużyny. Gdy już wszyscy członkowie zaakceptują lub odrzucą zaproszenie, misja zostanie rozpoczęta. Możesz zobaczyć jej status pod Opcje > Społeczne > Drużyna.",
"inviteParty": "Zaproś drużynę",
"questInvitation": "Zaproszenie do misji:",
- "questInvitationTitle": "Quest Invitation",
- "questInvitationInfo": "Invitation for the Quest <%= quest %>",
+ "questInvitationTitle": "Zaproszenie do misji",
+ "questInvitationInfo": "Zaproszenie do misji <%= quest %>",
"askLater": "Zapytaj później",
"buyQuest": "Kup misję",
"accepted": "Zaakceptowano",
@@ -19,7 +19,7 @@
"bossStrength": "Siła bossa",
"collect": "Zebrano",
"collected": "Zebrano",
- "bossDmg1": "Aby zranić bossa, wykonuj swoje Codzienne oraz Do-Zrobienia. Wyższe obrażenia zadań oznaczają wyższe obrażenia wobec bossa (wypełnianie czerwonych zadań, zaklęcia Maga, ataki Wojownika itd). Boss zada obrażenia każdemu, kto bierze udział w misji, za każde Codzienne, które pominiesz (pomnożone przez siłę bossa), więc utrzymuj swoją drużynę w zdrowiu przez wypełnianie swoich Codziennych! Wszystkie obrażenia zadane bossowi i przez niego, będą podsumowane przy cronie (zmianie Twojego dnia).",
+ "bossDmg1": "Każde zakończone Codzienne i Do-Zrobienia oraz każdy pozytywny Nawyk rani bossa. Zrań go bardziej czerwieńszymi zadaniami lub Brutalnym uderzeniem i Eksplozją płomieni. Boss zada obrażenia każdemu uczestnikowi misji za każde pominięte Codzienne (pomnożone przez siłę bossa) jako dodatek do standardowych obrażeń, więc utrzymuj swoją drużynę w zdrowiu przez wypełnianie swoich Codziennych! Wszystkie obrażenia zadane bossowi i przez niego będą podsumowane przez crona (twoje przejście do następnego dnia).",
"bossDmg2": "Tylko uczestnicy będą mogli walczyć z bossem i brać udział w podziale łupów.",
"tavernBossInfo": "Aby zranić światowego bossa, wykonuj swoje Codzienne oraz Do-Zrobienia. Wyższe obrażenia od zadań oznaczają wyższe obrażenia zadane bossowi (wypełnianie czerwonych zadań, zaklęcia Czarodzieja, ataki Wojownika, itd). Za każdy Codzienny obowiązek, który pominiesz (pomnożony przez Siłę bossa), jego Furia wzrośnie. Kiedy Furia osiągnie maksimum, stanie się coś złego – więc wypełniaj swoje Codzienne! Wszystkie obrażenia zadane bossowi i przez niego, będą podsumowane przy cronie (podczas zmiany twojego dnia).",
"bossColl1": "Aby zbierać przedmioty, wykonuj pozytywne zadania. Przedmioty misyjne znajdujesz tak samo jak zwykłe, jednakże nie zobaczysz łupów aż do końca dnia – wtedy to wszystkie przedmioty zostaną wyszczególnione i dodane do sterty.",
diff --git a/common/locales/pl/questscontent.json b/common/locales/pl/questscontent.json
index 0368cd4330..4e847c7b63 100644
--- a/common/locales/pl/questscontent.json
+++ b/common/locales/pl/questscontent.json
@@ -197,10 +197,10 @@
"questSlimeCompletion": "Ostatecznym dziabnięciem, więzisz Galaretkowego Regenta w przerośniętym pączku, zrobionego naprędce przez @Overomega, @LordDarkly i @Shaner, błyskotliwych liderów klubu cukierniczego. Gdy wszyscy klepią ciebie po plecach, czujesz że ktoś wsuwa coś do twojej kieszeni. To nagroda za twój słodki sukces: trzy jaja Piankowego Śluzu.",
"questSlimeDropSlimeEgg": "Piankowy Śluz (jajo)",
"questSlimeUnlockText": "Odblokowuje dostęp do kupna śluzowych jaj na Targu",
- "questSheepText": "The Thunder Ram",
- "questSheepNotes": "As you wander the rural Taskan countryside with friends, taking a \"quick break\" from your obligations, you find a cozy yarn shop. You are so absorbed in your procrastination that you hardly notice the ominous clouds creep over the horizon. \"I've got a ba-a-a-ad feeling about this weather,\" mutters @Misceo, and you look up. The stormy clouds are swirling together, and they look a lot like a... \"We don't have time for cloud-gazing!\" @starsystemic shouts. \"It's attacking!\" The Thunder Ram hurtles forward, slinging bolts of lightning right at you!",
- "questSheepBoss": "Thunder Ram",
- "questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
- "questSheepDropSheepEgg": "Sheep (Egg)",
- "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market"
+ "questSheepText": "Burzowy Baran",
+ "questSheepNotes": "Podczas wędrówki z przyjaciółmi przez wiejskie tereny Taskani, robiąc sobie \"krótką przerwę\" od swoich obowiązków, znajdujesz przytulną pasmanterię. Jesteś tak pochłonięty swoją prokrastynacją, że prawie nie zauważasz złowrogich chmur skradających się nad horyzontem. \"Mam złe-e-e-e przeczucie co do tej pogody,\" mruczy @Misceo, a ty spoglądasz w górę. Chmury burzowe kłębią się i wyglądają prawie jak... \"Nie mamy czasu na wpatrywanie się w chmury!\" krzyczy @starsystemic. \"To atakuje!\" Burzowy Baran gna przed siebie, ciskając pioruny i błyskawice prosto w ciebie!",
+ "questSheepBoss": "Burzowy Baran",
+ "questSheepCompletion": "Będąc pod wrażeniem twej pracowitości, Burzowy Baran osycha ze swej furii. Wypuszcza trzy ogromne kule gradowe w twoim kierunku, a potem znika z cichym dudnieniem. Po bliższym przyjrzeniu się odkrywasz, że kule gradowe to właściwie trzy puchate jaja. Zabierasz je, a następnie udajesz się na spacer do domu pod błękitnym niebem.",
+ "questSheepDropSheepEgg": "Owca (jajo)",
+ "questSheepUnlockText": "Odblokowuje dostęp do kupna owczych jaj na Targu"
}
\ No newline at end of file
diff --git a/common/locales/pl/settings.json b/common/locales/pl/settings.json
index 4b61f71531..58780f9a9c 100644
--- a/common/locales/pl/settings.json
+++ b/common/locales/pl/settings.json
@@ -93,7 +93,7 @@
"wonChallenge": "Wygrałeś wyzwanie",
"newPM": "Otrzymane wiadomości prywatne",
"giftedGems": "Podarowane klejnoty",
- "giftedGemsInfo": "<%= amount %> Gems - by <%= name %>",
+ "giftedGemsInfo": "<%= amount %> klejnotów - przez <%= name %>",
"giftedSubscription": "Podarowane abonamenty",
"invitedParty": "Zaproszony do Drużyny",
"invitedGuild": "Zaproszony do Gildii",
diff --git a/common/locales/pl/spells.json b/common/locales/pl/spells.json
index 1f2fb641ea..1c1174e072 100644
--- a/common/locales/pl/spells.json
+++ b/common/locales/pl/spells.json
@@ -40,7 +40,7 @@
"spellSpecialOpaquePotionText": "Nieprzejrzysty eliksir",
"spellSpecialOpaquePotionNotes": "Anuluje efekt strasznych iskierek.",
"spellSpecialShinySeedText": "Lśniące nasiono",
- "spellSpecialShinySeedNotes": "Zamień przyjaciela w radosnego kwiata!",
+ "spellSpecialShinySeedNotes": "Zamień przyjaciela w radosnego kwiatka!",
"spellSpecialPetalFreePotionText": "Eliksir antypłatkowy",
"spellSpecialPetalFreePotionNotes": "Anuluj skutki lśniącego nasiona."
}
\ No newline at end of file
diff --git a/common/locales/pl/tasks.json b/common/locales/pl/tasks.json
index 520ebd2400..c09a2d9692 100644
--- a/common/locales/pl/tasks.json
+++ b/common/locales/pl/tasks.json
@@ -7,14 +7,14 @@
"addsingle": "Dodaj pojedyncze",
"habits": "Nawyki",
"newHabit": "Nowy Nawyk",
- "newHabitBulk": "Nowe Przyzwyczajenia (jedno na linię)",
+ "newHabitBulk": "Nowe Nawyki (po jednym na linię)",
"yellowred": "Słabe",
"greenblue": "Mocne",
"edit": "Edytuj",
"save": "Zapisz",
"addChecklist": "Dodaj Listę",
"checklist": "Lista",
- "checklistText": "Dla Codziennych, częściowo ukończone zadania z list obniżają obrażenia. Na przykład: lista z 3 ukończonymi zadaniami na 4 obniża obrażenia za to nieukończone Codzienne do 25%. Ukończone zadania z listy w Do-Zrobienia dają mnożnik: 3 odznaczone to +3x (w sumie 4 x) więcej Doświadczenia, Złota i Many.",
+ "checklistText": "Rozbij zadanie na mniejsze części! Listy kontrolne zwiększają zdobyte w Do-Zrobienia doświadczenie i złoto, a także redukują obrażenia powodowane przez Codzienne.",
"expandCollapse": "Rozwiń/zwiń",
"text": "Treść",
"extraNotes": "Dodatkowe notatki",
@@ -22,7 +22,7 @@
"advancedOptions": "Zaawansowane opcje",
"difficulty": "Trudność",
"difficultyHelpTitle": "Jak trudne jest to zadane?",
- "difficultyHelpContent": "Pomnaża to ilość zdobywanych punktów. Używaj oszczędnie, powinieneś polegać na na naszym algorytmie dostosowywania uzyskiwanych punktów. Jednakże niektóre zadania są zdecydowane bardziej wartościowe (np. pisanie Pracy Dyplomowej kontra szczotkowanie zębów). Kliknij po więcej informacji.",
+ "difficultyHelpContent": "Im trudniejsze zadanie, tym więcej doświadczenia i złota otrzymasz, gdy je odhaczysz... jednak otrzymasz więcej obrażeń, jeśli jest to Codzienne lub zły Nawyk!",
"easy": "Łatwe",
"medium": "Średnie",
"hard": "Trudne",
@@ -33,13 +33,13 @@
"progress": "Postęp",
"dailies": "Codzienne",
"newDaily": "Nowe Codzienne",
- "newDailyBulk": "Nowe Zadania Codzienne (jedno na linię)",
+ "newDailyBulk": "Nowe Codzienne (po jednym na linię)",
"streakCounter": "Licznik serii",
"repeat": "Powtórz",
"restoreStreak": "Przywróć serię",
"todos": "Do-Zrobienia",
"newTodo": "Nowe Do-Zrobienia",
- "newTodoBulk": "Nowe Zadania Do Zrobienia (jedno na linię)",
+ "newTodoBulk": "Nowe Do-Zrobienia (po jednym na linię)",
"dueDate": "Planowana data",
"remaining": "Aktywne",
"complete": "Skończone",
@@ -52,7 +52,7 @@
"gold": "Złoto",
"silver": "Srebro (100 srebra = 1 złota)",
"newReward": "Nowa Nagroda",
- "newRewardBulk": "Nowe Wynagrodzenia (jedno na linię)",
+ "newRewardBulk": "Nowe Nagrody (po jednej na linię)",
"price": "Cena",
"tags": "Tagi",
"editTags": "Edytuj",
diff --git a/common/locales/pt/backgrounds.json b/common/locales/pt/backgrounds.json
index c5b115a94d..7b1b777b5c 100644
--- a/common/locales/pt/backgrounds.json
+++ b/common/locales/pt/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "Lago da Montanha",
"backgroundMountainLakeNotes": "Molhe seus dedos num Lago da Montanha",
"backgroundPagodasText": "Pagodas",
- "backgroundPagodasNotes": "Escale até o topo das Pagodas"
+ "backgroundPagodasNotes": "Escale até o topo das Pagodas",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/pt/challenge.json b/common/locales/pt/challenge.json
index 396e439ccf..310091b85f 100644
--- a/common/locales/pt/challenge.json
+++ b/common/locales/pt/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Selecione um vencedor e termine o desafio:",
"deleteOrSelect": "Deletar ou selecionar vencedor",
"endChallenge": "Terminar Desafio",
- "challengeDiscription": "Essas são as tarefas do desafio. Conforme usuários participarem, elas mudarão de cor e ganharão gráficos para lhe mostrar o progresso geral do grupo.",
+ "challengeDiscription": "Estas são as tarefas do desafio que serão adicionadas ao seu painel de tarefas quando você começá-lo. As amostras de tarefas de Desafio abaixo mudarão de cor e ganharão gráficos para lhe mostrar o progresso geral do grupo.",
"hows": "Como Todos Estão Indo?",
"filter": "Filtro",
"groups": "Grupos",
@@ -33,7 +33,8 @@
"challengeTagPop": "Desafios aparecem nas listas de etiqueta e descrições de tarefa. Então, mesmo querendo um título descritivo acima, você também precisará de um 'nome curto'. Ex.: 'Perder 10 kilos em 3 meses' pode virar '-10kg' (Clique para mais informações).",
"challengeDescr": "Descrição",
"prize": "Prêmio",
- "prizePop": "Se alguém puder \"vencer\" o seu desafio, você pode presentear o vencedor com Gemas. Máximo = #gemas que possui (+ número de gemas na guilda, se você criou este desafio para guilda). Nota: Este prêmio não pode ser alterado depois e nem reembolsado se o desafio for cancelado.",
+ "prizePop": "Se alguém conseguir 'vencer' o seu Desafio, você pode escolher recompensar esta pessoa com Gemas. Máximo = #gemas que possui (+ gemas da guilda, se você criou este desafio para a guilda). Nota: Este prêmio não pode ser alterado depois.",
+ "prizePopTavern": "Se alguém conseguir 'vencer' o seu Desafio, você pode escolher recompensar esta pessoa com Gemas. Máximo = #gemas que possui (+ gemas da guilda, se você criou este desafio para a guilda). Nota: Este prêmio não pode ser alterado depois e desafios da Taverna não poderão ser reembolsados se o desafio for cancelado.",
"publicChallenges": "Mínimo de 1 Gema para desafios públicos (realmente ajuda a prevenir spam).",
"officialChallenge": "Desafio Oficial do HabitRPG",
"by": "por",
@@ -43,6 +44,7 @@
"selectGroup": "Favor selecionar grupo",
"challengeCreated": "Desafio criado",
"sureDelCha": "Tem certeza de que deseja deletar o desafio?",
+ "sureDelChaTavern": "Tem certeza que quer deletar este Desafio? Suas gemas não serão reembolsadas.",
"removeTasks": "Remover Tarefas",
"keepTasks": "Manter Tarefas",
"closeCha": "Terminar desafio e...",
diff --git a/common/locales/pt/character.json b/common/locales/pt/character.json
index 60152c0613..d07a4042e6 100644
--- a/common/locales/pt/character.json
+++ b/common/locales/pt/character.json
@@ -52,9 +52,11 @@
"costume": "Traje",
"costumeText": "Se preferir a aparência de outro equipamento em vez do que estiver usando, marque a opção \"Usar Traje\" para vestir um traje enquanto usa seu equipamento de batalha por baixo.",
"useCostume": "Usar Traje ",
- "gearAchievement": "Você ganhou a conquista \"Equipamento Final\" por evoluir seu equipamento até o último conjunto!",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Equipamento Final",
- "ultimGearText": "Evoluiu até a última arma e último conjunto de equipamento",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Nível",
"levelUp": "Subiu de Nível!",
"mana": "Mana",
@@ -70,7 +72,7 @@
"allocatePerPop": "Adicionar um ponto em Percepção",
"allocateInt": "Pontos distribuídos em Inteligência:",
"allocateIntPop": "Adicionar um ponto em Inteligência",
- "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue leveling up, or start a new adventure at level 1 by using the Orb of Rebirth, now available for free in the Market.",
+ "noMoreAllocate": "Agora que você chegou no nível 100, não receberá mais Pontos de Atributo. Você pode continuar subindo de nível ou começar uma nova aventura no nível 1 usando um Orbe do Renascimento, agora disponível de graça no Mercado.",
"stats": "Estatísticas",
"strength": "Força",
"strengthText": "Força aumenta a chance de \"golpes críticos\" aleatórios e o bônus de Ouro, Experiência e chance de drop. Também ajuda a causar dano aos chefões.",
diff --git a/common/locales/pt/communityguidelines.json b/common/locales/pt/communityguidelines.json
index 5f774acfb8..f6f42b1721 100644
--- a/common/locales/pt/communityguidelines.json
+++ b/common/locales/pt/communityguidelines.json
@@ -115,8 +115,8 @@
"commGuidePara059": "Similarmente, todas infrações tem consequências diretas.alguns exemplos de consequências estão listados abaixo.",
"commGuidePara060": "Se a sua infração tiver uma consequencia moderada ou severa, você vai receber um email explicando:",
"commGuideList08A": "Qual foi sua infração",
- "commGuideList08B": "Qual será a consequência",
- "commGuideList08C": "O que fazer para corrigir sua situação e restaurar seu status, se possível.",
+ "commGuideList08B": "Qual é a consequência",
+ "commGuideList08C": "O que fazer para corrigir a situação e restaurar seu status, se possível.",
"commGuideHeadingSevereConsequences": "Exemplos de Consequências Severas",
"commGuideList09A": "Banimento de Conta",
"commGuideList09B": "Anulação de Conta",
diff --git a/common/locales/pt/content.json b/common/locales/pt/content.json
index 8a9169056a..78694a37be 100644
--- a/common/locales/pt/content.json
+++ b/common/locales/pt/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Poção de Vida",
"potionNotes": "Recupera 15 de Vida (Uso instantâneo)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "Lobo",
"dropEggWolfAdjective": "leal",
"dropEggTigerCubText": "Tigre Filhote",
@@ -56,8 +60,8 @@
"questEggBunnyAdjective": "confortável",
"questEggSlimeText": "Gosma de Marshmallow",
"questEggSlimeAdjective": "doce",
- "questEggSheepText": "Sheep",
- "questEggSheepAdjective": "woolly",
+ "questEggSheepText": "Ovelha",
+ "questEggSheepAdjective": "felpuda",
"eggNotes": "Ache uma poção de eclosão para usá-la nesse ovo, e ele irá eclodir em um <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
"hatchingPotionBase": "Base",
"hatchingPotionWhite": "Branco",
diff --git a/common/locales/pt/front.json b/common/locales/pt/front.json
index d081ed47f9..5fb24f6a64 100644
--- a/common/locales/pt/front.json
+++ b/common/locales/pt/front.json
@@ -172,5 +172,11 @@
"username": "Usuário",
"watchVideos": "Veja Vídeos",
"work": "Trabalhe",
- "zelahQuote": "Com o HabitRPG eu sou persuadido a ir para a cama na hora pelos pontos que ganho por dormir cedo ou pela vida que perco dormindo tarde!"
+ "zelahQuote": "Com o HabitRPG eu sou persuadido a ir para a cama na hora pelos pontos que ganho por dormir cedo ou pela vida que perco dormindo tarde!",
+ "reportAccountProblems": "Reportar Problemas com Conta",
+ "reportCommunityIssues": "Reportar Problemas com a Comunidade",
+ "generalQuestionsSite": "Perguntas Gerais sobre o Site",
+ "businessInquiries": "Consultas de Negócios",
+ "merchandiseInquiries": "Consultas de Merchandise",
+ "marketingInquiries": "Consultas de Marketing/Mídias Sociais"
}
\ No newline at end of file
diff --git a/common/locales/pt/gear.json b/common/locales/pt/gear.json
index 2c7f46b4ee..9990abc1d4 100644
--- a/common/locales/pt/gear.json
+++ b/common/locales/pt/gear.json
@@ -120,6 +120,8 @@
"weaponMystery201411Notes": "Apunhale seus inimigos ou cave pelas suas comidas favoritas - esse garfo versátil faz de tudo! Não confere benefícios. Item de Assinante de Novembro 2014.",
"weaponMystery201502Text": "Cajado Brilhante Alado do Amor e Também Verdade.",
"weaponMystery201502Notes": "Por ASAS! Por AMOR! Por VERDADE TAMBÉM! Não concede benefícios. Item de Assinante de Fevereiro 2015.",
+ "weaponMystery201505Text": "Lança do Cabaleiro Verde",
+ "weaponMystery201505Notes": "Esta lança verde e prateada já derrubou muitos oponentes de suas montarias. Não concede benefícios. Item de Assinante de Maio de 2015.",
"weaponMystery301404Text": "Bengala Steampunk",
"weaponMystery301404Notes": "Excelente para dar uma volta pela cidade. Item de Assinante de Março 3015. Não concede benefícios.",
"armor": "armadura",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "Quem é um Pinguim? Não concede benefícios. Item de Assinante de Dezembro 2014.",
"headMystery201501Text": "Elmo Estrelado",
"headMystery201501Notes": "As constelações brilham e rodopiam neste elmo, guiando o foco dos pensamentos de quem o vestir. Não confere benefício. Item de Assinante de Janeiro de 2015.",
+ "headMystery201505Text": "Elmo do Cavaleiro Verde",
+ "headMystery201505Notes": "A pluma verde neste elmo de ferro balança orgulhosamente. Não concede benefícios. Item de Assinante de Maio de 2015.",
"headMystery301404Text": "Cartola Chique",
"headMystery301404Notes": "Uma cartola chique para as damas e cavalheiros mais finos! Item de Assinante de Janeiro 3015. Não concede benefícios.",
"headMystery301405Text": "Cartola Básica",
@@ -495,7 +499,7 @@
"headAccessoryLionEarsText": "Orelhas de Leão",
"headAccessoryLionEarsNotes": "Estas orelhas te deixam parecendo com um majestoso leão! Não concede benefícios.",
"headAccessoryPandaEarsText": "Orelhas de Panda",
- "headAccessoryPandaEarsNotes": "Estas orelhas te deixam parecendo com um panda gentil! Não concede benefícios.",
+ "headAccessoryPandaEarsNotes": "Estas orelhas te deixam parecendo com um gentil panda! Não concede benefícios.",
"headAccessoryPigEarsText": "Orelhas de Porco",
"headAccessoryPigEarsNotes": "Estas orelhas te deixam parecendo com um porco extravagante! Não concede benefícios.",
"headAccessoryTigerEarsText": "Orelhas de Tigre",
diff --git a/common/locales/pt/generic.json b/common/locales/pt/generic.json
index b906056c28..cfe1942487 100644
--- a/common/locales/pt/generic.json
+++ b/common/locales/pt/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitica",
"expandToolbar": "Expandir Barra de Ferramentas",
"collapseToolbar": "Retrair Barra de Ferramentas",
- "formattingMarkdown": "Formatação Markdown permitida",
+ "markdownBlurb": "O HabitRPG usa markdown para formatar as mensagens. Veja a Planilha de Códigos Markdown para mais informações.",
+ "showFormattingHelp": "Mostrar ajuda de formatação",
+ "hideFormattingHelp": "Esconder ajuda de formatação",
+ "youType": "Você digita:",
+ "youSee": "Você vê:",
+ "italics": "*Itálico*",
+ "bold": "**Negrito**",
+ "strikethrough": "~~Riscar~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[O HabitRPG é incrível!](https://habitrpg.com)",
+ "markdownImageEx": "![texto alternativo obrigatório](https://habitrpg.com/cake.png \"título opcional de passar o mouse sobre\")",
+ "unorderedListHTML": "+ Primeiro item + Segundo item + Terceiro item",
+ "unorderedListMarkdown": "+ Primeiro item\n+ Segundo item\n+ Terceiro item",
+ "code": "`código`",
"achievements": "Conquistas",
"modalAchievement": "Conquista!",
"special": "Especial",
diff --git a/common/locales/pt/groups.json b/common/locales/pt/groups.json
index 578470f9c7..457d0537ff 100644
--- a/common/locales/pt/groups.json
+++ b/common/locales/pt/groups.json
@@ -2,7 +2,7 @@
"tavern": "Taverna",
"innCheckOut": "Sair da Pousada",
"innCheckIn": "Descansar na Pousada",
- "innText": "Você está descansando na Pousada! Enquanto estiver hospedado por aqui, suas Tarefas Diárias não lhe causarão dano na virada do dia, mas serão atualizadas normalmente todos os dias. Mas atenção: Se você estiver participando de uma Missão, Chefões continuarão a castigá-lo pelas Tarefas Perdidas de seus companheiros de equipe, a não ser que eles também estejam na Pousada! Além disso, seu dano no Chefão (ou itens coletados) não serão aplicados enquanto você não sair da Pousada.",
+ "innText": "Você está descansando na Pousada! Enquanto estiver hospedado por aqui, suas Tarefas Diárias não lhe causarão dano na virada do dia, mas serão atualizadas normalmente todos os dias. Mas atenção: Se você estiver participando de uma Missão, Chefões continuarão a machucá-lo pelas Tarefas Perdidas de seus companheiros de equipe, a não ser que eles também estejam na Pousada! Além disso, seu dano no Chefão (ou itens coletados) não serão aplicados enquanto você não sair da Pousada.",
"lfgPosts": "Mensagens de Procura de Grupo (Equipe Desejada)",
"tutorial": "Tutorial",
"glossary": "Glossário",
@@ -102,12 +102,19 @@
"messageWroteIn": "<%= user %> escreveu em <%= group %>",
"msgPreviewHeading": "Prévia da Mensagem",
"leaderOnlyChallenges": "Somente o líder do grupo pode criar desafios",
- "sendGift": "Send Gift",
- "inviteFriends": "Invite Friends",
- "inviteAlertInfo": "Invite friends by User ID here.",
- "inviteExistUser": "Invite Existing User",
- "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
- "byColon": "By:",
- "inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "sendGift": "Enviar Presente",
+ "inviteFriends": "Convidar Amigos",
+ "inviteAlertInfo": "Convidar amigos por User ID aqui.",
+ "inviteExistUser": "Convidar Utilizador Existente",
+ "inviteByEmail": "Convidar amigos por email. Se eles se juntarem através do seu email, então serão automaticamente convidados para este grupo.",
+ "byColon": "Por:",
+ "inviteNewUsers": "Convidar Novo Utilizador(es)",
+ "inviteAlertInfo2": "Ou partilhe este link (copiar/colar):",
+ "sendGiftHeading": "Enviar Presente para <%= name %>",
+ "sendGiftGemsBalance": "De <%= number %> Gemas",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "Do Saldo",
+ "sendGiftPurchase": "Compra",
+ "sendGiftMessagePlaceholder": "Mensagem Pessoal (opcional)",
+ "sendGiftSubscription": "<%= months %> Mês(es): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/pt/npc.json b/common/locales/pt/npc.json
index cc96bdee23..e6f8cf5b6f 100644
--- a/common/locales/pt/npc.json
+++ b/common/locales/pt/npc.json
@@ -2,8 +2,8 @@
"npc": "NPC",
"npcText": "Apoiou o projeto do Kickstarter ao nível máximo!",
"mattBoch": "Matt Boch",
- "mattShall": "Devo trazer seu corcel, <%= name %>? Clique em uma montaria para selá-la.",
- "mattBochText1": "Bem-vindo ao meu Estábulo! Sou Matt, o mestre das bestas. Escolha um mascote para acompanhá-lo. Alimente-o e ele crescerá em um corcel poderoso.",
+ "mattShall": "Devo trazer seu corcel, <%= name %>? Uma vez que você alimentou o seu mascote o suficiente para torná-lo uma montaria, ele aparecerá aqui. Clique em uma montaria para montá-la.",
+ "mattBochText1": "Bem-vindo ao meu Estábulo! Sou Matt, o mestre das bestas. Depois do nível 4, você pode chocar mascotes usando ovos e poções. Quanto você choca um mascote no Mercado, ele aparecerá aqui! Clique na imagem de um mascote para adicioná-lo ao seu avatar. Alimente-os usando a comida que você encontrar depois do nível 4 e eles se transformarão em poderosas montarias.",
"daniel": "Daniel",
"danielText": "Bem vindo à Taverna! Fique um pouco e conheça os locais. Se precisares descansar (férias? problemas de saúde?), eu me encarregarei de deixá-lo à vontade na Pousada. Enquanto descansa, suas Tarefas Diárias não lhe causarão dano na virada do dia, mas você ainda pode marcá-las como realizadas.",
"danielText2": "Tenha cuidado: Se estiver participando de uma missão contra um Chefão, ele ainda lhe causará danos pelas Tarefas Diárias perdidas dos seus companheiros de equipe! Além disso, o seu dano no chefão (ou itens coletados) não serão aplicados até que você saia da Pousada.",
@@ -45,9 +45,9 @@
"tourScrollDown": "Certifique-se de rolar a página até o final para ver todas as opções! Clique no seu avatar novamente para retornar à página de tarefas.",
"tourMuchMore": "Quando tiver terminado suas tarefas, você pode formar uma equipe com amigos, conversar as guildas temáticas, participar de desafios, e mais!",
"tourStatsPage": "Essa é a página de Atributos! Conquiste medalhas completando as tarefas listadas,",
- "tourTavernPage": "Bem vindo à Taverna, uma sala de bate-pato para todas as idades! Você pode congelar sua conta no caso de doença ou viagem, clicando em \"Descansar na Pousada.\" Venha dizer oi!",
+ "tourTavernPage": "Bem vindo à Taverna, uma sala de bate-papo para todas as idades! Você pode congelar sua conta no caso de doença ou viagem clicando em \"Descansar na Pousada\". Venha dizer oi!",
"tourPartyPage": "Sua Equipe vai te ajudar a se manter responsável. Convide amigos para destravar um Pergaminho de Missão!",
"tourGuildsPage": "Guildas são grupos sociais com temas em comum. Procure por assuntos que te interessam! Nós recomendamos a Guilda dos Novatos.",
- "tourChallengesPage": "Participar de um Desafio vai adicionar tarefas à sua conta. Compita contra outros usuários para ganhar gemas como prêmio!",
+ "tourChallengesPage": "Desafios são listas de tarefas temáticas criadas por usuários! Participar de um Desafio adicionará tarefas à sua conta. Compita contra outros usuários para ganhar prêmios em gemas!",
"tourMarketPage": "A partir do level 4, você pode encontrar ovos e poções de eclosão aleatoriamente quando você completa tarefas. Elas aparecem aqui - use-as para chocar mascotes! Você também pode comprar items do Mercado."
}
\ No newline at end of file
diff --git a/common/locales/pt/quests.json b/common/locales/pt/quests.json
index 04b0c9be0d..a9fd483cbf 100644
--- a/common/locales/pt/quests.json
+++ b/common/locales/pt/quests.json
@@ -6,8 +6,8 @@
"questSend": "Clicar em \"Convidar\" enviará um convite para os membros da sua equipe. Quando todos membros aceitarem ou rejeitarem, a missão começará. Veja o estado da missão em Opções > Social > Equipe.",
"inviteParty": "Convidar Equipe",
"questInvitation": "Convite de Missão:",
- "questInvitationTitle": "Quest Invitation",
- "questInvitationInfo": "Invitation for the Quest <%= quest %>",
+ "questInvitationTitle": "Convite para Missão",
+ "questInvitationInfo": "Convite para a Missão <%= quest %>",
"askLater": "Perguntar Depois",
"buyQuest": "Comprar Missão",
"accepted": "Aceito",
@@ -19,7 +19,7 @@
"bossStrength": "Força do Chefão",
"collect": "Coletar",
"collected": "Coletado",
- "bossDmg1": "Para machucar um Chefão, complete suas tarefas diárias e afazeres. Maior dano de tarefas significa maior dano ao Chefão (completar tarefas vermelhas, feitiços de Mago, ataques de Guerreiro, etc). O Chefão causará dano para cada participante da missão por cada tarefa diária que você perdeu (multiplicado pela força do Chefão) somado com seu dano normal, então mantenha a saúde de sua equipe completando suas tarefas diárias! Todo dano causado ou recebido de um Chefão é calculado no cron (sua virada do dia).",
+ "bossDmg1": "Todos os Afazeres e Tarefas Diárias completadas e cada Hábito positivo causa dando no Chefão. Cause mais dano com tarefas mais vermelhas, com Destruição Brutal ou com Explosão de Chamas. O Chefão causará dano em todos os participantes da missão por cada Tarefa Diária perdida (multiplicada pela Força do Chefão) em adição ao seu dano normal, então mantenha a saúde da sua equipe completando suas Tarefas Diárias. Todo o dano recebido ou inflingido ao Chefão é computado no seu Cron (virada do dia).",
"bossDmg2": "Apenas participantes lutarão contra o chefão e dividirão as recompensas da missão.",
"tavernBossInfo": "Para ferir um chefão de mundo, complete suas Tarefas Diárias e Afazeres. Dano alto de tarefa significa maior dano ao chefão (completar tarefas vermelhas, feitiços de Magos, ataques de Guerreiros, etc). Para cada Tarefa Diária que você perder (multiplicada pela Força do chefão), a Ira do chefão irá aumentar. Uma vez que sua Ira chegar ao máximo, alguma coisa ruim irá acontecer - então, complete suas Tarefas Diárias! Todo dano causado para e pelo chefão é registrado no cron (na sua virada do dia).",
"bossColl1": "Para coletar itens, complete suas tarefas positivas. Itens de missão aparecem assim como itens normais; entretanto, você não verá a coleta até o dia seguinte, então tudo que você encontrou será registrado e contribuído à pilha.",
diff --git a/common/locales/pt/questscontent.json b/common/locales/pt/questscontent.json
index fe23977282..1ef20cb43a 100644
--- a/common/locales/pt/questscontent.json
+++ b/common/locales/pt/questscontent.json
@@ -88,7 +88,7 @@
"questMoonstone3DropRottenMeat": "Carne Estragada (Comida)",
"questMoonstone3DropZombiePotion": "Poção de Eclosão Zumbi",
"questGoldenknight1Text": "Uma conversa séria",
- "questGoldenknight1Notes": "
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. Hora, 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 acumular alguns depoimentos de Habiticanos abatidos e dar à Cavaleira Dourada a bronca que ela merece!
",
+ "questGoldenknight1Notes": "
A Amazona 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 à Amazona Dourada a bronca que ela merece!
",
"questGoldenknight1CollectTestimony": "Testemunhos",
"questGoldenknight1DropGoldenknight2Quest": "Arco da Cavaleira Dourada, Parte 2: Ouro Deslustrado (Pergaminho)",
"questGoldenknight2Text": "Cavaleira Dourada",
@@ -197,10 +197,10 @@
"questSlimeCompletion": "Com um soco final, você tranca o Regente Geléia em uma rosquinha gigante, auxiliado por @Overomega, @LordDarkly e @Shaner, os espertos lideres do clube da confeitaria. Enquanto todos estão lhe parabenizando, você sente algo escorregar para dentro de seu bolso. É a recompensa por seu doce sucesso: três ovos de Gosma Marshmallow. ",
"questSlimeDropSlimeEgg": "Gosma Marshmallow (Ovo)",
"questSlimeUnlockText": "Destranca ovos de gosma para compra no Mercado",
- "questSheepText": "The Thunder Ram",
- "questSheepNotes": "As you wander the rural Taskan countryside with friends, taking a \"quick break\" from your obligations, you find a cozy yarn shop. You are so absorbed in your procrastination that you hardly notice the ominous clouds creep over the horizon. \"I've got a ba-a-a-ad feeling about this weather,\" mutters @Misceo, and you look up. The stormy clouds are swirling together, and they look a lot like a... \"We don't have time for cloud-gazing!\" @starsystemic shouts. \"It's attacking!\" The Thunder Ram hurtles forward, slinging bolts of lightning right at you!",
- "questSheepBoss": "Thunder Ram",
- "questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
- "questSheepDropSheepEgg": "Sheep (Egg)",
- "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market"
+ "questSheepText": "O Carneiro do Trovão",
+ "questSheepNotes": "Enquanto perambula pela zona rural Tarefana com seus amigos, dando uma \"pausa rápida\" em suas obrigações, você encontra uma loja aconchegante de linhas para costura. Você está tão absorvido em sua procrastinação que mal percebe as nuvens sinistras que se arrastam sobre o horizonte. \"Eu tenho um ma-a-a-al pressentimento sobre este tempo,\" murmura @Misceo, e você olha para cima. As nuvens tempestuosas se unem e giram em um turbilhão, e elas se parecem muito com um... \"Nós não temos tempo para contemplar nuvens!\" @starsystemic grita. \"Está atacando!\" O Carneiro do Trovão se move, correndo rapidamente e violentamente, lançando raios bem na sua direção!",
+ "questSheepBoss": "Carneiro do Trovão",
+ "questSheepCompletion": "Impressionado pela sua diligência, o Carneiro do Trovão deixa a raiva ir embora. Ele atira três enormes pedras de granizo na sua direção; e então, lentamente, desaparece, emitindo um estrondo grave. Ao olhar mais atentamente, você descobre que as pedras de granizo eram, na verdade, três ovos macios e peludos. Você os recolhe, e depois caminha calmamente de volta para casa sob um céu azul.",
+ "questSheepDropSheepEgg": "Ovelha (Ovo)",
+ "questSheepUnlockText": "Desbloqueia ovos de ovelha para comprar no Mercado"
}
\ No newline at end of file
diff --git a/common/locales/pt/settings.json b/common/locales/pt/settings.json
index 0a47dfe71c..7cec019b18 100644
--- a/common/locales/pt/settings.json
+++ b/common/locales/pt/settings.json
@@ -93,7 +93,7 @@
"wonChallenge": "Você ganhou um Desafio",
"newPM": "Recebeu Mensagem Privada",
"giftedGems": "Gemas Presenteadas",
- "giftedGemsInfo": "<%= amount %> Gems - by <%= name %>",
+ "giftedGemsInfo": "<%= amount %> Gemas - por <%= name %>",
"giftedSubscription": "Assinaturas Presenteadas",
"invitedParty": "Convidado para Equipe",
"invitedGuild": "Convidado para Guilda",
diff --git a/common/locales/pt/tasks.json b/common/locales/pt/tasks.json
index c9c6f16d6d..de8208fa92 100644
--- a/common/locales/pt/tasks.json
+++ b/common/locales/pt/tasks.json
@@ -14,7 +14,7 @@
"save": "Salvar",
"addChecklist": "Adicionar Lista",
"checklist": "Lista",
- "checklistText": "Para Tarefas Diárias, listas parcialmente completas reduzirão o dano. Por exemplo, uma lista de 4 itens com 3 completos reduzirá o dano daquela Tarefa Diária para 25%. Itens completos numa lista de Afazeres adiciona um multiplicador: 3 completos significa +3x (total 4x) Experiência, Ouro e Mana.",
+ "checklistText": "Divida uma tarefa em partes menores! Listas aumentam a Experiência e Ouro recebidos de um Afazer e reduzem o dano causado por uma Tarefa Diária.",
"expandCollapse": "Expandir/Fechar",
"text": "Texto",
"extraNotes": "Notas Extras",
@@ -22,7 +22,7 @@
"advancedOptions": "Opções Avançadas",
"difficulty": "Dificuldade",
"difficultyHelpTitle": "Quão difícil é essa tarefa?",
- "difficultyHelpContent": "Isso multiplica o valor de pontos. Use com moderação, conte com nosso algoritmo orgânico de ajuste de valor. Mas algumas tarefas são grosseiramente mais valiosas (Escrever Tese vs. Escovar Dentes). Clique para mais informações.",
+ "difficultyHelpContent": "Quanto mais difícil é uma tarefa, mais Experiência e Ouro dará quando você a completa... mas lhe causará mais dano se for uma Tarefa Diária ou Hábito Ruim.",
"easy": "Fácil",
"medium": "Médio",
"hard": "Difícil",
@@ -78,5 +78,5 @@
"pushTaskToTop": "Enviar tarefa para o topo",
"pushTaskToBottom": "Enviar tarefa para o fundo",
"emptyTask": "Insira o título da tarefa primeiro.",
- "dailiesRestingInInn": "Você está descansando na Pousada! Suas Tarefas Diárias NÃO vão lhe causar dano esta noite, mas elas VÃO atualizar normalmente todos os dias. Se você está em uma missão, você não causará dano ou coletará itens até que saia da Pousada, mas ainda pode receber dano de um Chefão se os membros de sua Equipe não completarem Tarefas Diárias."
+ "dailiesRestingInInn": "Você está descansando na Pousada! Suas Tarefas Diárias NÃO vão lhe causar dano esta noite, mas elas ainda IRÃO atualizar normalmente todos os dias. Se você está em uma missão, você não causará dano ou coletará itens até que saia da Pousada, mas ainda poderá receber dano de um Chefão se os membros de sua Equipe não completarem as suas Tarefas Diárias."
}
\ No newline at end of file
diff --git a/common/locales/ro/backgrounds.json b/common/locales/ro/backgrounds.json
index 3498a30cc9..49d987891e 100644
--- a/common/locales/ro/backgrounds.json
+++ b/common/locales/ro/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "Mountain Lake",
"backgroundMountainLakeNotes": "Dip your toes in a Mountain Lake.",
"backgroundPagodasText": "Pagodas",
- "backgroundPagodasNotes": "Climb to the top of Pagodas."
+ "backgroundPagodasNotes": "Climb to the top of Pagodas.",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/ro/challenge.json b/common/locales/ro/challenge.json
index a1911d247d..806b8dab28 100644
--- a/common/locales/ro/challenge.json
+++ b/common/locales/ro/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Alege un câștigător și închide provocarea:",
"deleteOrSelect": "Șterge sau alege un câștigător",
"endChallenge": "Termină provocarea",
- "challengeDiscription": "Aceastea sunt țelurile provocării. Pe măsură ce utilizatorii participă, ele îți vor schimba culoarea și vor apărea grafice care îți vor arăta progresul general al grupului.",
+ "challengeDiscription": "These are the Challenge's tasks that will be added to your task dashboard when you join this Challenge. The sample Challenge tasks below will change color and gain graphs to show you the overall progress of the group.",
"hows": "Cum progresează fiecare?",
"filter": "Filtru",
"groups": "Grupuri",
@@ -33,7 +33,8 @@
"challengeTagPop": "Provocările apar în listele de etichete și țeluri. Așa că, deși trebuie să ai un titlu descriptiv mai sus, vei avea nevoie și de un „nume scurt”. Ex. „Scapă de 5 kilograme în 3 luni” va deveni „-5kg” (Clic pentru mai multe informații)",
"challengeDescr": "Descriere",
"prize": "Premiu",
- "prizePop": "Dacă cineva poate câştiga provocarea ta ai opţiunea să-l premiezi cu nestemate. Limita maximă a premiului este numărul de nestemate pe care le ai (+ nestematele breslei dacă este o provocare în interiorul ei). Notă: Acest premiul nu poate fi modificat mai târziu şi nici returnat dacă renunţi la provocare.",
+ "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.",
+ "prizePopTavern": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
"publicChallenges": "Minim 1 Nestemată pentru provocări publice (ajută la prevenirea spamului, pe bune).",
"officialChallenge": "Provocare oficială HabitRPG",
"by": "de",
@@ -43,6 +44,7 @@
"selectGroup": "Te rog alege un grup",
"challengeCreated": "Provocare creată",
"sureDelCha": "Șterge provocarea, ești sigur(ă)?",
+ "sureDelChaTavern": "Delete challenge, are you sure? Your gems will not be refunded.",
"removeTasks": "Șterge Țelurile",
"keepTasks": "Păstrează Țelurile",
"closeCha": "Închide provocarea și...",
diff --git a/common/locales/ro/character.json b/common/locales/ro/character.json
index be8017cca0..ea48d13947 100644
--- a/common/locales/ro/character.json
+++ b/common/locales/ro/character.json
@@ -52,9 +52,11 @@
"costume": "Costum",
"costumeText": "Dacă preferi aspectul altui echipament în loc de ce ai echipat, bifează cutiuța \"Poartă Costum\" ca să îmbraci la vedere un costum în timp ce porți îmbrăcămintea de luptă pe dedesubt.",
"useCostume": "Poartă costum",
- "gearAchievement": "Ai obţinut titlul \"Armură Maximală\" pentru achiziţionarea setului maxim posibil de armură!",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Armură Maximală",
- "ultimGearText": "A achiziţionat setul maxim posibil de arme şi armură.",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Nivel",
"levelUp": "Creştere de nivel!",
"mana": "Mana",
diff --git a/common/locales/ro/communityguidelines.json b/common/locales/ro/communityguidelines.json
index 32313c93e9..d77d040bbd 100644
--- a/common/locales/ro/communityguidelines.json
+++ b/common/locales/ro/communityguidelines.json
@@ -34,20 +34,20 @@
"commGuidePara017": "Respect each other. Be courteous, kind, friendly, and helpful. Remember: Habiticans come from all backgrounds and have had wildly divergent experiences. This is part of what makes HabitRPG so cool! Building a community means respecting and celebrating our differences as well as our similarities. Here are some easy ways to respect each other:",
"commGuideList02A": "Respectă toate Termenele şi Condiţiile.",
"commGuideList02B": "Do not post images or text that are violent, threatening, or sexually explicit/suggestive, or that promote discrimination, bigotry, racism, sexism, hatred, harassment or harm against any individual or group. Not even as a joke. This includes slurs as well as statements. Not everyone has the same sense of humor, and so something that you consider a joke may be hurtful to another. Attack your Dailies, not each other.",
- "commGuideList02C": "Keep discussions appropriate for all ages. We have many young Habiticans who use the site! Let's not tarnish any innocents or hinder any Habiticans in their goals.",
- "commGuideList02D": "Avoid profanity. This includes milder, religious-based oaths that may be acceptable elsewhere-we have people from all religious and cultural backgrounds, and we want to make sure that all of them feel comfortable in public spaces. Additionally, slurs will be dealt with very severely, as they are also a violation of the Terms of Service.",
- "commGuideList02E": "Avoid extended discussions of divisive topics outside of the Back Corner. If you feel that someone has said something rude or hurtful, do not engage them. A single, polite comment, such as \"That joke makes me feel uncomfortable,\" is fine, but being harsh or unkind in response to harsh or unkind comments heightens tensions and makes HabitRPG a more negative space. Kindness and politeness helps others understand where you are coming from.",
- "commGuideList02F": "Comply immediately with any Mod request to cease a discussion or move it to the Back Corner. Last words, parting shots and conclusive zingers should all be delivered (courteously) at your \"table\" in the Back Corner, if allowed.",
- "commGuideList02G": "Take time to reflect instead of responding in anger if someone tells you that something you said or did made them uncomfortable. There is great strength in being able to sincerely apologize to someone. If you feel that the way they responded to you was inappropriate, contact a mod rather than calling them out on it publicly.",
- "commGuideList02H": "Divisive/contentious conversations should be reported to mods. If you feel that a conversation is getting heated, overly emotional, or hurtful, cease to engage. Instead, email leslie@habitrpg.com to let us know about it. It's our job to keep you safe.",
- "commGuideList02I": "Do not spam. Spamming may include, but is not limited to: posting the same comment or query in multiple places, posting links without explanation or context, posting nonsensical messages, or posting many messages in a row. Repeatedly begging for gems or a subscription may also be considered spamming.",
- "commGuidePara019": "In private spaces, users have more freedom to discuss whatever topics they would like, but they still may not violate the Terms and Conditions, including posting any discriminatory, violent, or threatening content.",
- "commGuidePara020": "Private Messages (PMs) have some additional guidelines. If someone has blocked you, do not contact them elsewhere to ask them to unblock you. Additionally, you should not send PMs to someone asking for support (since public answers to support questions are helpful to the community). Finally, do not send anyone PMs begging for a gift of gems or a subscription, as this can be considered spamming.",
+ "commGuideList02C": "Păstrţi discuţiile potrivite pentru toate vârstele. Avem mulţi habiticani tineri care folosesc site-ul! Să nu murdărim inocenţe sau să punem beţe în roate vreunui habitican în scopurile sale.",
+ "commGuideList02D": "Evitaţi înjurăturile. Asta include înjurături mai blânde, bazate pe religie care ar putea fi acceptabile altundeva - avem oameni din toate religiile şi culturile şi vrem să ne asigurăm că toţi se simt confortabil în spaţiile publice. De asemenea, insultele vor fi pedepsite foarte sever, din moment ce sunt şi o violare a Terms of Service.",
+ "commGuideList02E": "Evitaţi discuţiile extinse pe teme care pot crea păreri împărţite în afara Back Corner. Dacă simţi că o persoană a spus ceva nepoliticos sau care răneşte, nu o confrunta. Un singur comentariu politicos precum \"Nu mă simt confortabil cu gluma asta\" este în regulă, dar a fi dur şi rău ca răspuns la comentariile dure şi rele creşte tensiunea şi face HabitRPG un spaţiu mai negativ. Bunătatea şi politeţea îi ajută pe alţii să înţeleagă punctul tău de vedere.",
+ "commGuideList02F": "Ascultă imediat orice cerere a unui Moderator de încetare a unei discuţii sau de mutare a ei în Back Corner. Ultimele cuvinte, lovituri de despărţire sau glumiţe de final ar trebui date (politicos) la \"masa\" ta din Back Corner, dacă îţi este permis.",
+ "commGuideList02G": "Reflectă un timp în loc să răspunzi cu furie dacă o persoană îţi spune că un lucru pe care l-ai zis îi face incomfortabili. Este nevoie de multă forţă pentru a putea să-ţi ceri scuye sincer de la cineva. Dacp simţi că modul în care ţi-a răspuns a fost nepotrivit, contactează un moderator în loc să îi confrunţi în public.",
+ "commGuideList02H": "Conversațiile care dezbină sau sunt litigioase ar trebui să fie raportate moderatorilor. Dacă simţi că o conversaţie devine încinsă, mult prea emoţională sau te răneşte, opreşte-te din a răspunde. În loc de asta, trimite un e-mail la leslie@habitrpg.com pentru a ne anunţa. Siguranţa ta este treaba noastră.",
+ "commGuideList02I": "Nu spama. Spamul poate include dar nu e limitat la: postarea aceluiaşi comentariu sau întrebare în mai multe locuri, postarea de link-uri fără explicaţie sau context, postarea de mesaje fără sens sau postarea multor mesaje unul după altul. A cerşi repetat nestemate sau o abonare poate fi de asemenea considerat spam.",
+ "commGuidePara019": "În spaţiile private, utilizatorii au mai multă libertate de a discuta orice temă doresc, dar în continuare nu pot viola Termenii şi Condiţiile, incluzînd postând conţinut discriminatoriu, violent sau ameninţător.",
+ "commGuidePara020": "Mesajele Private au reguli adiţionale. Dacă o persoană te-a blocat, nu o contacta altundeva să o rogi să te deblocheze. Nu ar trebui să trimiţi mesaje private cuiva pentru a-i ruga să te susţină (din moment ce răspunsurile publice la întrebările legate de suport ajută comunitatea). În cele din urmă, nu trimite nimănui mesaj cerşind nestemate sau o abonare, deoarece pot fi considerate spam.",
"commGuidePara021": "În plus,în anumite spaţii publice în Habitica se aplică reguli suplimentare.",
"commGuideHeadingTavern": "Cârciuma",
- "commGuidePara022": "The Tavern is the main spot for Habiticans to mingle. Daniel the Barkeep keeps the place spic-and-span, and Lemoness will happily conjure up some lemonade while you sit and chat. Just keep in mind...",
+ "commGuidePara022": "Cârciuma este locul principal de socializare pentru habiticani. Cârciumarul Daniel păszrează locul curat şi Lemoness va conjura cu plăcere nişte limonadă cât voi staţi şi vorbiţi. Doar reţine...",
"commGuidePara023": "Discuţiile tind să fie obişnuite şi cu sfaturi pentru productivitate despre îmbunătăţirea vieţii.",
- "commGuidePara024": "Because the Tavern chat can only hold 200 messages, it isn't a good place for prolonged conversations on topics, especially sensitive ones (ex. politics, religion, depression, whether or not goblin-hunting should be banned, etc.). These conversations should be taken to an applicable guild or the Back Corner (more information below).",
+ "commGuidePara024": "Deoarece chatul Cârciumii nu poate ţine decât 200 de mesaje, nu e un loc potrivit pentru conversaţii îndelungate pe o temă, mai ales unele sensibile (spre exemplu:politică, religie, depresie, dacă vânătoarea de goblini ar trebui interzisă etc.). Aceste conversaţii ar trebui continuate în breasla corespunzătoare sau în Back Corner (mai multe informaţii în cele ce urmează)",
"commGuidePara027": "Don't discuss anything addictive in the Tavern. Many people use HabitRPG to try to quit their bad Habits. Hearing people talk about addictive/illegal substances may make this much harder for them! Respect your fellow Tavern-goers and take this into consideration. This includes, but is not exclusive to: smoking, alcohol, pornography, gambling, and drug use/abuse.",
"commGuideHeadingPublicGuilds": "Breslele Publice",
"commGuidePara029": "Public guilds are much like the Tavern, except that instead of being centered around general conversation, they have a focused theme. Public guild chat should focus on this theme. For example, members of the Wordsmiths guild might be cross if they found the conversation suddenly focusing on gardening instead of writing, and a Dragon-Fanciers guild might not have any interest in deciphering ancient runes. Some guilds are more lax about this than others, but in general, try to stay on topic!",
diff --git a/common/locales/ro/content.json b/common/locales/ro/content.json
index c0a41e9727..7e3a78862b 100644
--- a/common/locales/ro/content.json
+++ b/common/locales/ro/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Poțiune de sănătate",
"potionNotes": "Vindecă 15 puncte de sănătate (instantaneu)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "Lup",
"dropEggWolfAdjective": "loial",
"dropEggTigerCubText": "Pui de tigru",
diff --git a/common/locales/ro/front.json b/common/locales/ro/front.json
index d8baaa6295..40fd605b0a 100644
--- a/common/locales/ro/front.json
+++ b/common/locales/ro/front.json
@@ -172,5 +172,11 @@
"username": "Nume de utilizator",
"watchVideos": "Priveşte filme",
"work": "Work",
- "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!"
+ "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",
+ "reportAccountProblems": "Report Account Problems",
+ "reportCommunityIssues": "Report Community Issues",
+ "generalQuestionsSite": "General Questions about the Site",
+ "businessInquiries": "Business Inquiries",
+ "merchandiseInquiries": "Merchandise Inquiries",
+ "marketingInquiries": "Marketing/Social Media Inquiries"
}
\ No newline at end of file
diff --git a/common/locales/ro/gear.json b/common/locales/ro/gear.json
index c708623830..cb9ae0befe 100644
--- a/common/locales/ro/gear.json
+++ b/common/locales/ro/gear.json
@@ -120,6 +120,8 @@
"weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
"weaponMystery201502Text": "Toiagul înnaripat strălucitor al iubirii şi totodată al adevărului",
"weaponMystery201502Notes": "For WINGS! For LOVE! For ALSO TRUTH! Confers no benefit. February 2015 Subscriber Item.",
+ "weaponMystery201505Text": "Green Knight Lance",
+ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "Baston Steampunk",
"weaponMystery301404Notes": "Excelent pentru a da o tură prin oraș. Obiect de abonat din colecția martie 3015. Nu oferă beneficii.",
"armor": "armură",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "Who's a penguin? Confers no benefit. December 2014 Subscriber Item.",
"headMystery201501Text": "Starry Helm",
"headMystery201501Notes": "The constellations flicker and swirl in this helm, guiding the wearer's thoughts towards focus. Confers no benefit. January 2015 Subscriber Item.",
+ "headMystery201505Text": "Green Knight Helm",
+ "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 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",
diff --git a/common/locales/ro/generic.json b/common/locales/ro/generic.json
index 108bd621db..5634775d05 100644
--- a/common/locales/ro/generic.json
+++ b/common/locales/ro/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitica",
"expandToolbar": "Desfășoară Bara de unelte",
"collapseToolbar": "Restrânge Bara de unelte",
- "formattingMarkdown": "Formatarea cu Markdown este permisă",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*Italics*",
+ "bold": "**Bold**",
+ "strikethrough": "~~Strikethrough~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "Realizări",
"modalAchievement": "Realizare!",
"special": "Special",
diff --git a/common/locales/ro/groups.json b/common/locales/ro/groups.json
index b6be89a0a9..d0c3f3e52c 100644
--- a/common/locales/ro/groups.json
+++ b/common/locales/ro/groups.json
@@ -109,5 +109,12 @@
"inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
"byColon": "By:",
"inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "inviteAlertInfo2": "Or share this link (copy/paste):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/ro/npc.json b/common/locales/ro/npc.json
index 5e6a076a7a..65a169d12b 100644
--- a/common/locales/ro/npc.json
+++ b/common/locales/ro/npc.json
@@ -2,8 +2,8 @@
"npc": "PNJ",
"npcText": "A contribuit în Kickstarter la proiect cu suma maximă!",
"mattBoch": "Matt Boch",
- "mattShall": "Să vă aduc armăsarul, <%= name %>? Alege un animal de călărit pentru a-l înșeua.",
- "mattBochText1": "Bine ai venit la Grajduri! Eu sunt Matt, stăpânul fiarelor. Alege un companion de aici pentru a ți se alătura. Hrănește-i și vor crește în armăsari puternici.",
+ "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
+ "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
"daniel": "Daniel",
"danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
"danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
@@ -45,9 +45,9 @@
"tourScrollDown": "Be sure to scroll all the way down to see all the options! Click on your avatar again to return to the tasks page.",
"tourMuchMore": "When you're done with tasks, you can form a Party with friends, chat in the shared-interest Guilds, join Challenges, and more!",
"tourStatsPage": "This is your Stats page! Earn achievements by completing the listed tasks.",
- "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can freeze your account in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
+ "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
"tourPartyPage": "Your Party will help you stay accountable. Invite friends to unlock a Quest Scroll!",
"tourGuildsPage": "Guilds are social groups with common themes. Search for the subjects that interest you! We recommend the Newbies Guild.",
- "tourChallengesPage": "Joining a Challenge will add tasks to your account. Compete against other users to win gem prizes!",
+ "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
"tourMarketPage": "Starting at Level 4, eggs and hatching potions drop randomly when you complete tasks. They appear here - use them to hatch pets! You can also buy items from the Market."
}
\ No newline at end of file
diff --git a/common/locales/ro/quests.json b/common/locales/ro/quests.json
index 88dbcfff00..e6942449ca 100644
--- a/common/locales/ro/quests.json
+++ b/common/locales/ro/quests.json
@@ -19,7 +19,7 @@
"bossStrength": "Boss Strength",
"collect": "Collect",
"collected": "Adunate",
- "bossDmg1": "To hurt a boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "Doar participanții se vor lupta cu monstrul și vor împărți prada aventurii.",
"tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossColl1": "Pentru a aduna obiecte, îndeplinește țeluri pozitive. Obiectele specifice aventurii apar la fel ca obiectele obișnuite; totuși, nu le vei vedea decât a doua zi, atunci tot ce vei fi adunat va fi socotit și adăugat grămezii.",
diff --git a/common/locales/ro/spells.json b/common/locales/ro/spells.json
index bb9d4ea371..999a0f3d01 100644
--- a/common/locales/ro/spells.json
+++ b/common/locales/ro/spells.json
@@ -1,6 +1,6 @@
{
"spellWizardFireballText": "Rafală de flăcări",
- "spellWizardFireballNotes": "Flames burst from your hands. You gain XP, and you deal extra damage to Bosses! Click on a task to cast. (Based on: INT)",
+ "spellWizardFireballNotes": "Flăcări ţâşnesc din mâinile tale. Obţii experienţă şi răneşti mai puternic Boşii. Apasă pe o sarcină pentru a o vrăji. (Bazat pe:INT)",
"spellWizardMPHealText": "Val eteric",
"spellWizardMPHealNotes": "You sacrifice mana to help your friends. The rest of your party gains MP! (Based on: INT)",
"spellWizardEarthText": "Cutremur",
diff --git a/common/locales/ro/tasks.json b/common/locales/ro/tasks.json
index 9386ded59d..b45c6f8b0f 100644
--- a/common/locales/ro/tasks.json
+++ b/common/locales/ro/tasks.json
@@ -14,7 +14,7 @@
"save": "Salvează",
"addChecklist": "Adaugă listă bife",
"checklist": "Listă bife",
- "checklistText": "Pentru Cotidiene, listele bifate parțial reduc vătămarea. De exemplu, o listă de 4 bife cu 3 bifate reduce vătămarea pentru acea Cotidiană neterminată cu 25%. Părţile bifate din lista unei Sarcini adaugă un multiplicator: 3 bife înseamnă +3x (4x în total) de Experiență, Aur și Mana.",
+ "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
"expandCollapse": "Desfășoară/Restrânge",
"text": "Text",
"extraNotes": "Alte note",
@@ -22,7 +22,7 @@
"advancedOptions": "Opțiuni avansate",
"difficulty": "Dificultate",
"difficultyHelpTitle": "Cât de dificil e acest țel?",
- "difficultyHelpContent": "Multiplică valoarea în puncte. Folosește cu grijă, contează în schimb pe algoritmii noștri organici de ajustare a valorii. Totuși, unele țeluri sunt vădit mai valoroase (scrisul unei dizertații vs. spălatul pe dinți). Click pentru mai multe informații.",
+ "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!",
"easy": "Ușor",
"medium": "Mediu",
"hard": "Greu",
diff --git a/common/locales/ru/backgrounds.json b/common/locales/ru/backgrounds.json
index 35979bd2c1..0f267940ab 100644
--- a/common/locales/ru/backgrounds.json
+++ b/common/locales/ru/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "Горное озеро",
"backgroundMountainLakeNotes": "Проверьте, как водичка в Горном озере.",
"backgroundPagodasText": "Пагоды",
- "backgroundPagodasNotes": "Заберитесь на вершины Пагод."
+ "backgroundPagodasNotes": "Заберитесь на вершины Пагод.",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/ru/challenge.json b/common/locales/ru/challenge.json
index 3eb7794e74..7e8bf22623 100644
--- a/common/locales/ru/challenge.json
+++ b/common/locales/ru/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Выбрать победителя и закрыть испытание:",
"deleteOrSelect": "Удалить или выбрать победителя",
"endChallenge": "Завершить испытание",
- "challengeDiscription": "Это задания, входящие в испытание. По мере выполнения участниками, их цвет будет меняться, станут доступны графики, что позволит вам отслеживать общие достижения группы.",
+ "challengeDiscription": "These are the Challenge's tasks that will be added to your task dashboard when you join this Challenge. The sample Challenge tasks below will change color and gain graphs to show you the overall progress of the group.",
"hows": "Как идут дела?",
"filter": "Фильтр",
"groups": "Группы",
@@ -33,7 +33,8 @@
"challengeTagPop": "Испытания появляются в списке тегов и в описании заданий. Поэтому кроме содержательного названия, указанного выше, потребуется также «короткое имя». Например, «Сбросить 10 килограммов за 3 месяца» может стать «-10кг» (Нажмите здесь, чтобы узнать подробнее).",
"challengeDescr": "Описание",
"prize": "Приз",
- "prizePop": "Если в испытании можно «победить», победителя при желании можно наградить самоцветами. Максимальный приз — количество ваших самоцветов (плюс самоцветы гильдии, если вы создали гильдию этого испытания). Обратите внимание: приз нельзя будет изменить позже и самоцветы не будут возвращены в случае отмены испытания. ",
+ "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.",
+ "prizePopTavern": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
"publicChallenges": "Для общедоступных испытаний минимум составляет 1 самоцвет (действенная мера против спама).",
"officialChallenge": "Официальное испытание HabitRPG",
"by": "от",
@@ -43,6 +44,7 @@
"selectGroup": "Пожалуйста, выберите группу",
"challengeCreated": "Испытание создано",
"sureDelCha": "Вы уверены, что хотите удалить испытание?",
+ "sureDelChaTavern": "Delete challenge, are you sure? Your gems will not be refunded.",
"removeTasks": "Удалить задания",
"keepTasks": "Оставить задания",
"closeCha": "Закрыть испытание и...",
diff --git a/common/locales/ru/character.json b/common/locales/ru/character.json
index 83de4c882f..cc2696db70 100644
--- a/common/locales/ru/character.json
+++ b/common/locales/ru/character.json
@@ -17,7 +17,7 @@
"bodySize": "Телосложение",
"bodySlim": "Стройное",
"bodyBroad": "Тучное",
- "unlockSet": "Разблокировать набор - <%= cost %>",
+ "unlockSet": "Разблокировать набор – <%= cost %>",
"locked": "закрытые",
"shirts": "Рубашки",
"specialShirts": "Особые рубашки",
@@ -52,9 +52,11 @@
"costume": "Костюм",
"costumeText": "Если внешний вид какой-либо экипировки вам нравится больше, чем надетой сейчас, можете отметить «Использовать костюм» для того, чтобы визуально предстать в желаемом костюме поверх боевой экипировки.",
"useCostume": "Использовать костюм",
- "gearAchievement": "Вы заработали достижение «Превосходная экипировка» за усовершенствование экипировки до комплекта максимального уровня!",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Превосходная экипировка",
- "ultimGearText": "Оружие и комплект экипировки усовершенствованы до максимального уровня",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Уровень",
"levelUp": "Новый уровень!",
"mana": "Мана",
@@ -70,7 +72,7 @@
"allocatePerPop": "Добавить очко к восприятию",
"allocateInt": "Очки, распределенные на интеллект:",
"allocateIntPop": "Добавить очко к интеллекту",
- "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue leveling up, or start a new adventure at level 1 by using the Orb of Rebirth, now available for free in the Market.",
+ "noMoreAllocate": "Теперь, после достижения 100-го уровня, вы больше не будете получать Очки Характеристик. Вы можете продолжить повышать свой уровень или же начать новое приключение с первого уровня, воспользовавшись Шаром возрождения, доступным бесплатно на Рынке.",
"stats": "Характеристики",
"strength": "Сила",
"strengthText": "Сила увеличивает шанс случайных «критических ударов» и количество золота, опыта и вещей, которые вы за них получите. Она также помогает наносить больший урон монстрам-боссам.",
diff --git a/common/locales/ru/communityguidelines.json b/common/locales/ru/communityguidelines.json
index 1a9c020de6..b69bf5f4d1 100644
--- a/common/locales/ru/communityguidelines.json
+++ b/common/locales/ru/communityguidelines.json
@@ -52,30 +52,30 @@
"commGuideHeadingPublicGuilds": "Открытые гильдии",
"commGuidePara029": "Публичные гильдии в отличие от Таверны сосредоточены на определенной теме в обсуждениях. Чат гильдии должен быть сфокусирован именно на ней. Например, члены гильдии писателей не должны обсуждать садоводство вместо писательства, а Драконоборцы не должны интересоваться расшифровкой древних рун. Некоторые гильдии менее строги на этот счет, другие более, но всё же, старайтесь не отдаляться от темы!",
"commGuidePara031": "В некоторых публичных гильдиях обсуждаются деликатные темы, такие как депрессия, религия, политика и т.д. Это нормально до тех пор, пока участники обсуждений не нарушают Правила и Условия или Нормы Поведения в Общественных Местах, и до тех пор, пока они не отвлекаются от основной темы.",
- "commGuidePara033": "Публичные гильдии не должны содержать контент 18+. Если планируется регулярно обсуждать деликатные темы, это должно быть отражено в названии гильдии. Это нужно для спокойствия и комфорта каждого в стране Habitica. Если в гильдии обсуждаются разного рода деликатные вопросы, то следует предупреждать ваших сограждан (например, «Внимание: контент не для слабонервных!»). Более того, такой контент должен быть уместен -- например в гильдии для борьбы с депрессией подходит по основную тему то, что явно не подойдет гильдии музыкантов. Если Вы видите, что кто-то систематически нарушает это правило, даже после просьб прекратить это делать, сообщите об этом на email leslie@habitrpg.com и приложите скриншоты.",
+ "commGuidePara033": "Публичные гильдии не должны содержать контент 18+. Если планируется регулярно обсуждать деликатные темы, это должно быть отражено в названии гильдии. Это нужно для спокойствия и комфорта каждого в стране Habitica. Если в гильдии обсуждаются разного рода деликатные вопросы, то следует предупреждать ваших сограждан (например, «Внимание: контент не для слабонервных!»). Более того, такой контент должен быть уместен – например в гильдии для борьбы с депрессией подходит по основную тему то, что явно не подойдет гильдии музыкантов. Если Вы видите, что кто-то систематически нарушает это правило, даже после просьб прекратить это делать, сообщите об этом на email leslie@habitrpg.com и приложите скриншоты.",
"commGuidePara035": "Гильдии, открытые или закрытые, не должны создаваться с целью нападок на любую группу или индивидуума. Создание подобной Гильдии будет служить основанием для немедленного бана аккаунта. Сражайтесь с плохими привычками, а с не другими искателями приключений!",
"commGuidePara037": "Все Вызовы в Таверне и Вызовы Открытых гильдий также должны подчиняться этим правилам.",
"commGuideHeadingBackCorner": "Задний Угол",
"commGuidePara038": "Иногда разговоры становятся слишком длинными, развязными и деликатными и начинают раздражать посетителей общественных мест. В таком случае обсуждение перенаправляется в гильдию Задний Угол. Обратите внимание, что отправка в Угол не является наказанием в полном смысле слова. Фактически, многие граждане страны Habitica любят потусоваться там и поразглагольствовать.",
"commGuidePara039": "В гильдии Задний Угол любой может свободно обсуждать любые темы и сколько угодно долго. Это место тщательно модерируется. Все Правила и Условия, а также Публичные Инструкции работают здесь как и в любом другом месте. То, что мы носим длинные плащи и кучкуемся за углом, еще не говорит о том, что всё дозволено! А теперь передайте мне эту тусклую свечу, будьте любезны.",
"commGuideHeadingTrello": "Доски Trello",
- "commGuidePara040": "Trello служит открытым форумом для предложений и обсуждений возможностей сайта. Habitica управляется ее народом в форме совместного участия -- все мы создаем этот сайт вместе. Trello - это система, которая позволяет нам излить все свои мысли. Исходя из этого, постарайтесь умещать все свои мысли в один комментарий, не нужно много раз комментировать одну и ту же карточку. Если Вам в голову пришло что-то новое, не стесняйтесь редактировать свои старые комментарии. Пожалуйста, пожалейте тех, кому приходят оповещения о каждом новом комментарии. Наши почтовые ящики от этого чудом не ломятся.",
+ "commGuidePara040": "Trello служит открытым форумом для предложений и обсуждений возможностей сайта. Habitica управляется ее народом в форме совместного участия – все мы создаем этот сайт вместе. Trello – это система, которая позволяет нам излить все свои мысли. Исходя из этого, постарайтесь умещать все свои мысли в один комментарий, не нужно много раз комментировать одну и ту же карточку. Если Вам в голову пришло что-то новое, не стесняйтесь редактировать свои старые комментарии. Пожалуйста, пожалейте тех, кому приходят оповещения о каждом новом комментарии. Наши почтовые ящики от этого чудом не ломятся.",
"commGuidePara041": "HabitRPG использует пять разных досок Trello:",
- "commGuideList03A": "Главная доска - это место для просьб о новых функциях сайта и голосования по ним.",
- "commGuideList03B": "Мобильная доска - это место для просьб о новых функциях мобильного приложения и голосования по ним.",
- "commGuideList03C": "Доска пиксель арта - это место для обсуждения и размещения вашей пиксельной графики.",
- "commGuideList03D": "Доска квестов - это место для обсуждения и предложения квестов.",
- "commGuideList03E": "Wiki-доска - это место для улучшения, обсуждения и запроса нового контента wiki.",
+ "commGuideList03A": "Главная доска – это место для просьб о новых функциях сайта и голосования по ним.",
+ "commGuideList03B": "Мобильная доска – это место для просьб о новых функциях мобильного приложения и голосования по ним.",
+ "commGuideList03C": "Доска пиксель арта – это место для обсуждения и размещения вашей пиксельной графики.",
+ "commGuideList03D": "Доска квестов – это место для обсуждения и предложения квестов.",
+ "commGuideList03E": "Wiki-доска – это место для улучшения, обсуждения и запроса нового контента wiki.",
"commGuidePara042": "Всем изложены основные принципы и правила поведения в общественных местах. Пользователи не должны отклоняться от темы на любой доске или карточке. Поверьте на слово, там и так базар-вокзал! Затянувшиеся обсуждения должны быть перенесены в Задний Угол.",
"commGuideHeadingGitHub": "GitHub",
- "commGuidePara043": "HabitRPG использует GitHub для отслеживания багов и доработки кода. Это своего рода кузница, где неутомимые Кузнецы куют новый функционал! Здесь действуют все правила поведения в публичных местах. Будьте вежливы с Кузнецами - у них очень много работы по поддержанию сайта! Ура, Кузнецам!",
+ "commGuidePara043": "HabitRPG использует GitHub для отслеживания багов и доработки кода. Это своего рода кузница, где неутомимые Кузнецы куют новый функционал! Здесь действуют все правила поведения в публичных местах. Будьте вежливы с Кузнецами – у них очень много работы по поддержанию сайта! Ура, Кузнецам!",
"commGuidePara044": "Пользователи, которые являются членами репозитория HabitRPG:",
"commGuideHeadingWiki": "Wiki",
"commGuidePara045": "HabitRPG wiki собирает информацию об этом сайте. Также там размещаются несколько форумов аналогичных форумам гильдий в HabitRPG. Следовательно, здесь также действуют все правила поведения в Публичных местах.",
"commGuidePara046": "Wiki HabitRPG может рассматриваться, как единая база данных всех вещей, которые существуют в HabitRPG. Она обеспечивает информацию о функционале сайта, руководства по игре, советы о том, как вы можете внести вклад в HabitRPG, а также дает вам возможность продвигать вашу гильдию или партию, и участвовать в опросах.",
"commGuidePara047": "Так как хостинг для wiki обеспечивается сервисом Wikia, то условия использования сервиса Wika также обязательные к соблюдению в дополнение к правилам действующим в HabitRPG и в wiki HabitRPG.",
"commGuidePara048": "Вики — это прежде всего сотрудничество между всеми ее редакторами, поэтому вот некоторые дополнительные правила:",
- "commGuideList04A": "Чтобы открыть новую страницу или кардинально изменить старую - оставьте запрос на доске Wiki Trello.",
+ "commGuideList04A": "Чтобы открыть новую страницу или кардинально изменить старую – оставьте запрос на доске Wiki Trello.",
"commGuideList04B": "Будьте готовы принять мнения других людей по поводу вашего редакторского труда.",
"commGuideList04C": "Обсуждение любого спорного вопроса по редактированию конкретной страницы должно проходить на специальной странице обсуждений для этой самой страницы.",
"commGuideList04D": "Любой нерешенный естественным путем вопрос предоставляется на рассмотрение вики-администраторам.",
@@ -135,11 +135,11 @@
"commGuideList11D": "Удаления (Модератор/Сотрудники могут удалить проблемный контент)",
"commGuideList11E": "Правки (Модераторы/Сотрудники могут редактировать проблемный контент)",
"commGuideHeadingRestoration": "Восстановление",
- "commGuidePara061": "Habitica - это страна самосовершенствования и здесь верят во второй шанс. Если Вы совершили нарушение и получили наказание, воспринимайте это как второй шанс осознать свои поступки и улучшить свое положение в сообществе.",
+ "commGuidePara061": "Habitica – это страна самосовершенствования и здесь верят во второй шанс. Если Вы совершили нарушение и получили наказание, воспринимайте это как второй шанс осознать свои поступки и улучшить свое положение в сообществе.",
"commGuidePara062": "Последствия Ваших нарушений разъясняются Вам через email или через сообщение от модератора или админа (в случае мелких нарушений). Примите наложенные на Вас ограничения и прилагайте усилия, чтобы Вам простили ваши огрехи.",
"commGuidePara063": "Если Вы не понимаете последствий ваших действий или природу нарушений, попросите модераторов или админов вам это разъяснить, дабы не нарушать в будущем.",
"commGuideHeadingContributing": "Вклад в развитие страны Habitica",
- "commGuidePara064": "HabitRPG - это открытый проект, что означает возможность любому участнику внести свой вклад! Те, кто хорошо с этим справляются, получают вознаграждение в соответствии с рангом:",
+ "commGuidePara064": "HabitRPG – это открытый проект, что означает возможность любому участнику внести свой вклад! Те, кто хорошо с этим справляются, получают вознаграждение в соответствии с рангом:",
"commGuideList12A": "Значок участника HabitRPG, плюс 3 самоцвета",
"commGuideList12B": "Броня участника HabitRPG, плюс 3 самоцвета",
"commGuideList12C": "Шлем участника HabitRPG, плюс 3 самоцвета",
@@ -151,10 +151,10 @@
"commGuidePara066": "О рангах участников стоит сказать несколько важных вещей:",
"commGuideList13A": "Ранги присваиваются не просто так. Они устанавливаются по усмотрению модераторов. На их решение влияют разные факторы, включая их восприятие Вашей работы и ее значимости для сайта и сообщества. Мы оставляем за собой право менять специальные уровни, звания и награды по своему усмотрению.",
"commGuideList13B": "Чем выше ранг, тем сложнее получить следующий. Если Вы создали одного монстра или исправили один баг, то этого может быть достаточно для присвоения Вам первого ранга участника, но не достаточно для следующего. Как и в любой хорошей RPG при повышении уровня повышается и сложность!",
- "commGuideList13C": "Ранги - общее понятие, присвоение ранга не зависит от той сферы, в которой участник оставил свой вклад. Для оценки сложности мы смотрим на все Ваши заслуги, чтобы люди, которые сначала что-то нарисовали, потом пофиксили маленький баг, а затем написали пару строк в вики, не развивались быстрее, чем те, которые долго работают в одном деле. Так достигается справедливость!",
+ "commGuideList13C": "Ранги – общее понятие, присвоение ранга не зависит от той сферы, в которой участник оставил свой вклад. Для оценки сложности мы смотрим на все Ваши заслуги, чтобы люди, которые сначала что-то нарисовали, потом пофиксили маленький баг, а затем написали пару строк в вики, не развивались быстрее, чем те, которые долго работают в одном деле. Так достигается справедливость!",
"commGuideList13D": "Пользователи на испытательном сроке не могут быть подняты в ранге. Модераторы имеют право замораживать достижения пользователя из-за его нарушений. В этом случае пользователя оповестят о принятом решении и о том, как исправить положение. Ранг может быть и вовсе снят благодаря нарушениям и испытательному сроку.",
"commGuideHeadingFinal": "Заключительный раздел",
- "commGuidePara067": "Вот ты и прочел это, храбрый житель страны Habitica - Руководство по использованию сообщества! Утри этот пот со своих бровей и вознагради себя опытом за то, что прочел все от начала и до конца. Если у тебя есть любые вопросы или беспокойства насчет Руководства по использованию сообщества, то пожалуйста напиши письмо Lemoness (leslie@habitrpg.com) и она будет рада помочь тебе их прояснить.",
+ "commGuidePara067": "Вот ты и прочел это, храбрый житель страны Habitica – Руководство по использованию сообщества! Утри этот пот со своих бровей и вознагради себя опытом за то, что прочел все от начала и до конца. Если у тебя есть любые вопросы или беспокойства насчет Руководства по использованию сообщества, то пожалуйста напиши письмо Lemoness (leslie@habitrpg.com) и она будет рада помочь тебе их прояснить.",
"commGuidePara068": "А сейчас вперёд, храбрый искатель приключений, повергни несколько Ежедневных заданий!",
"commGuideHeadingLinks": "Полезные ссылки",
"commGuidePara069": "Ниже приведены имена талантливых художников, участвовавших в создании иллюстраций к данной статье",
diff --git a/common/locales/ru/content.json b/common/locales/ru/content.json
index 16662958ef..546a3bb2d2 100644
--- a/common/locales/ru/content.json
+++ b/common/locales/ru/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Эликсир здоровья",
"potionNotes": "Восстанавливает 15 здоровья (мгновенно)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "Волк",
"dropEggWolfAdjective": "преданный",
"dropEggTigerCubText": "Тигренок",
@@ -56,8 +60,8 @@
"questEggBunnyAdjective": "прилипчивый",
"questEggSlimeText": "Зефирный слизень",
"questEggSlimeAdjective": "милый",
- "questEggSheepText": "Sheep",
- "questEggSheepAdjective": "woolly",
+ "questEggSheepText": "Овца",
+ "questEggSheepAdjective": "Шерстистая",
"eggNotes": "Найдите инкубационный эликсир, чтобы полить им яйцо и из него вылупится <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
"hatchingPotionBase": "Обыкновенный",
"hatchingPotionWhite": "Белый",
diff --git a/common/locales/ru/contrib.json b/common/locales/ru/contrib.json
index e31910b9be..8eb91ed65d 100644
--- a/common/locales/ru/contrib.json
+++ b/common/locales/ru/contrib.json
@@ -7,7 +7,7 @@
"eliteFourth": "Когда будет принят ваш четвертый вклад, в лавке наград вам станет доступен для покупки хрустальный меч. В качестве вознаграждения за ваши труды вы также получите 4 самоцвета.",
"champion": "Подвижник",
"championFifth": "Когда ваш пятый вклад будет принят, вам станет доступен для покупки в лавке наград хрустальный щит. В качестве вознаграждения за продолжение работы вы также получите 4 самоцвета.",
- "championSixth": "Когда ваш шестой вклад будет принят, вы получите нового питомца - Гидру. Также вы получите 4 самоцвета.",
+ "championSixth": "Когда ваш шестой вклад будет принят, вы получите нового питомца – Гидру. Также вы получите 4 самоцвета.",
"legendary": "Легенда",
"legSeventh": "Когда ваш седьмой вклад будет принят, вы получите 4 самоцвета и станете членом почетной Гильдии участников, т.е. будете допущены в закулисье HabitRPG! Дальнейший вклад не будет увеличивать ваш ранг, но вы можете продолжить получать в дар самоцветы и титулы.",
"moderator": "Модератор",
diff --git a/common/locales/ru/defaulttasks.json b/common/locales/ru/defaulttasks.json
index e9e21c86c5..0cba6eac14 100644
--- a/common/locales/ru/defaulttasks.json
+++ b/common/locales/ru/defaulttasks.json
@@ -2,7 +2,7 @@
"defaultHabit1Text": "Полезная привычка",
"defaultHabit1Notes": "Примеры полезных привычек: + Съесть овощ +15 минут полезной работы",
"defaultHabit2Text": "Вредная привычка",
- "defaultHabit2Notes": "Примеры вредных привычек: - Курить - Прокрастинировать",
+ "defaultHabit2Notes": "Примеры вредных привычек: – Курить – Прокрастинировать",
"defaultHabit3Text": "Полезная или вредная привычка",
"defaultHabit3Notes": "Примеры полезных или вредных привычек: +/- Подняться по лестнице/поехать на лифте; +/- Выпить воду/газировку",
"defaultDaily1Text": "1 час работы над личным проектом",
diff --git a/common/locales/ru/front.json b/common/locales/ru/front.json
index 7cba307a82..33b9b2c9d7 100644
--- a/common/locales/ru/front.json
+++ b/common/locales/ru/front.json
@@ -3,7 +3,7 @@
"accept1Terms": "Нажимая кнопку ниже, я принимаю ",
"accept2Terms": " и ",
"alexandraQuote": "Не мог НЕ рассказать о HabitRPG во время выступления в Мадриде. Незаменимый инструмент для фрилансеров, кому еще нужен босс.",
- "althaireQuote": "Постоянное участие в квестах мотивирует меня на выполнение всех ежедневных заданий и задач. Самый сильный стимул для меня - не подвести мою команду.",
+ "althaireQuote": "Постоянное участие в квестах мотивирует меня на выполнение всех ежедневных заданий и задач. Самый сильный стимул для меня – не подвести мою команду.",
"andeeliaoQuote": "Супер! Только начал несколько дней назад и уже более сознательно и продуктивно отношусь к моему времени!",
"autumnesquirrelQuote": "Я меньше откладываю на потом на работе и дома и вовремя плачу по счетам.",
"businessSample1": "Подтвердить 1 стр. инвентаря",
@@ -33,12 +33,12 @@
"companyTerms": "Условия использования",
"companyVideos": "Видео",
"contribUse": "Участники, помогающие развитию HabitRPG, используют",
- "dragonsilverQuote": "Не могу сказать вам, сколько планировщиков времени и задач я испробовал за десятилетия... HRPG - единственная система из тех, что я использовал, которая действительно помогает мне выполнять задачи, а не просто вносить их в список дел.",
+ "dragonsilverQuote": "Не могу сказать вам, сколько планировщиков времени и задач я испробовал за десятилетия... HRPG – единственная система из тех, что я использовал, которая действительно помогает мне выполнять задачи, а не просто вносить их в список дел.",
"dreimQuote": "Когда я открыл для себя HabitRPG прошлым летом, я только что провалил где-то половину своих экзаменов. Благодаря ежедневным заданиям… я смог организовать и дисциплинировать себя и месяц назад все-таки сдал все экзамены с хорошими оценками.",
"elmiQuote": "Каждое утро я встаю в нетерпении, предвкушая, что смогу заработать немного золота!",
"email": "Email",
"emailNewPass": "Отправить новый пароль по Email",
- "evagantzQuote": "Мой первый прием у дантиста, когда ассистент - специалист по гигиене полости рта - был поражен результаты моей привычки пользоваться зубной нитью. Спасибо Habitrpg!",
+ "evagantzQuote": "Мой первый прием у дантиста, когда ассистент - специалист по гигиене полости рта – был поражен результаты моей привычки пользоваться зубной нитью. Спасибо Habitrpg!",
"examplesHeading": "Игроки используют HabitRPG, чтобы организовывать работу...",
"featureAchievementByline": "Делаете что-то по-настоящему потрясающе? Получите значок и похвастайтесь им!",
"featureAchievementHeading": "Значки достижений",
@@ -75,7 +75,7 @@
"invalidEmail": "Для изменения пароля необходимо указать существующий адрес электронной почты.",
"irishfeet123Quote": "У меня была ужасная привычка после еды повсюду оставлять посуду. HabitRPG меня от этого полностью избавила!",
"joinOthers": "Присоединяйтесь к 200.000 человек, превращающим движение к цели в развлечение!",
- "kazuiQuote": "До HabitRPG я никак не продвигался с диссертацией. Кроме того, вызывала недовольство моя недисциплинированность в отношении работы по дому и таких задач, как изучение новых слов и обучение игре Го. Оказывается, разбивка этих задач на контрольные списки небольших заданий - как раз то, что нужно, чтобы сохранять мою мотивацию и постоянную работоспособность.",
+ "kazuiQuote": "До HabitRPG я никак не продвигался с диссертацией. Кроме того, вызывала недовольство моя недисциплинированность в отношении работы по дому и таких задач, как изучение новых слов и обучение игре Го. Оказывается, разбивка этих задач на контрольные списки небольших заданий – как раз то, что нужно, чтобы сохранять мою мотивацию и постоянную работоспособность.",
"landingadminlink": "административные пакеты,",
"landingend": "Еще не уверены?",
"landingend2": "Читайте более подробный список ",
@@ -89,7 +89,7 @@
"landingp3header": "Последствия",
"landingp4": "С помощью активного сообщества, HabitRPG стимулирует индивидуальную ответственность, которая нужна, чтобы завершать задания. Благодаря возможности создавать команды, вы можете пригласить группу своих близких друзей, которые будут поддерживать вас. Система гильдий позволяет находить людей с похожими интересами или затруднениями, чтобы вы могли делиться своими целями и обмениваться советами по решению ваших проблем. В HabitRPG сообщество — это и поддержка, и индивидуальная ответственность, которые нужны для достижения успеха.",
"landingp4header": "Ответственность",
- "leadText": "HabitRPG - бесплатное приложение для выработки привычек и повышения личной эффективности, которое превратит вашу жизнь в игру. Игровые награды и наказания мотивируют, а сильная социальная составляющая вдохновляет – благодаря этому HabitRPG поможет вам стать здоровым, трудолюбивым и счастливым.",
+ "leadText": "HabitRPG – бесплатное приложение для выработки привычек и повышения личной эффективности, которое превратит вашу жизнь в игру. Игровые награды и наказания мотивируют, а сильная социальная составляющая вдохновляет – благодаря этому HabitRPG поможет вам стать здоровым, трудолюбивым и счастливым.",
"login": "Вход",
"loginAndReg": "Вход / Регистрация",
"loginFacebookAlt": "Вход / Регистрация с помощью Facebook",
@@ -172,5 +172,11 @@
"username": "Имя",
"watchVideos": "Смотреть видео",
"work": "Работа",
- "zelahQuote": "С HabitRPG пойти спать вовремя меня может убедить мысль получить очки за то, что лег рано, или потерять здоровье за то, что лег поздно."
+ "zelahQuote": "С HabitRPG пойти спать вовремя меня может убедить мысль получить очки за то, что лег рано, или потерять здоровье за то, что лег поздно.",
+ "reportAccountProblems": "Report Account Problems",
+ "reportCommunityIssues": "Report Community Issues",
+ "generalQuestionsSite": "General Questions about the Site",
+ "businessInquiries": "Business Inquiries",
+ "merchandiseInquiries": "Merchandise Inquiries",
+ "marketingInquiries": "Marketing/Social Media Inquiries"
}
\ No newline at end of file
diff --git a/common/locales/ru/gear.json b/common/locales/ru/gear.json
index a100632e61..cd202f6bc7 100644
--- a/common/locales/ru/gear.json
+++ b/common/locales/ru/gear.json
@@ -109,7 +109,7 @@
"weaponSpecialWinter2015HealerText": "Скипетр успокоения",
"weaponSpecialWinter2015HealerNotes": "Этот скипетр согревает больные мышцы и успокаивает от стресса. Увеличивает интеллект на <%= int %>. Экипировка ограниченного выпуска зимы 2014-2015",
"weaponSpecialSpring2015RogueText": "Взрывной Писк",
- "weaponSpecialSpring2015RogueNotes": "Не дайте звуку обмануть вас - эта взрывчатка просто сбивает с ног. Увеличивает силу на <%= str %>. Экипировка ограниченного выпуска весны 2015.",
+ "weaponSpecialSpring2015RogueNotes": "Не дайте звуку обмануть вас – эта взрывчатка просто сбивает с ног. Увеличивает силу на <%= str %>. Экипировка ограниченного выпуска весны 2015.",
"weaponSpecialSpring2015WarriorText": "Костяная дубина",
"weaponSpecialSpring2015WarriorNotes": "Настоящая костяная дубина для настоящих яростных псов! Нет-нет, это совершенно точно не жевательная игрушка, которую Сезонная Волшебница дала вам потому что... а кто тут славный песик? Кто славный песик? Вы! Вы славный песик! Увеличивает силу на <%= str %>. Экипировка ограниченного выпуска весны 2015.",
"weaponSpecialSpring2015MageText": "Волшебная палочка фокусника",
@@ -117,9 +117,11 @@
"weaponSpecialSpring2015HealerText": "Кошачья Погремушка",
"weaponSpecialSpring2015HealerNotes": "Стоит только взмахнуть погремушкой, и чарующий треск этой штуки займет КОГО УГОДНО очень надолго. Увеличивает интеллект на <%= int %>. Экипировка ограниченного выпуска весны 2015.",
"weaponMystery201411Text": "Вилы пиршества",
- "weaponMystery201411Notes": "Многофункциональные вилы - вонзайте их во врагов, или в свои любимые блюда! Преимуществ не дают. Подарок подписчикам ноября 2014.",
+ "weaponMystery201411Notes": "Многофункциональные вилы – вонзайте их во врагов, или в свои любимые блюда! Преимуществ не дают. Подарок подписчикам ноября 2014.",
"weaponMystery201502Text": "Сверкающий крылатый посох Любви-а-также-Правды",
"weaponMystery201502Notes": "Ради КРЫЛЬЕВ! Ради ЛЮБВИ! Ради ТАКЖЕ-ПРАВДЫ! Преимуществ не дает. Подарок подписчикам в феврале 2015.",
+ "weaponMystery201505Text": "Green Knight Lance",
+ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "Стимпанковская трость",
"weaponMystery301404Notes": "Отлично подходит для прогулки по городу. Подарок подписчикам марта 3015. Преимуществ не дает.",
"armor": "Броня",
@@ -234,7 +236,7 @@
"armorMystery201406Text": "Мантия осьминога.",
"armorMystery201406Notes": "Эта гибкая мантия позволит ее носителю пролезать через мельчайшие трещины. Преимуществ не дает. Подарок подписчикам июня 2014.",
"armorMystery201407Text": "Костюм исследователя морских глубин",
- "armorMystery201407Notes": "Известный также, как \"хлюпкий\", \"слишком плотный\" и \"честно говоря, довольно громоздкий\", этот костюм -- лучший друг любого бесстрашного исследователя морских глубин. Преимуществ не дает. Подарок подписчикам июля 2014.",
+ "armorMystery201407Notes": "Известный также, как \"хлюпкий\", \"слишком плотный\" и \"честно говоря, довольно громоздкий\", этот костюм – лучший друг любого бесстрашного исследователя морских глубин. Преимуществ не дает. Подарок подписчикам июля 2014.",
"armorMystery201408Text": "Солнечная Мантия",
"armorMystery201408Notes": "Эта мантия соткана из золота и солнечного света. Преимуществ не дает. Подарок подписчикам августа 2014.",
"armorMystery201409Text": "Жилет Странника",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "Кто пингвин? Преимуществ не дает. Подарок подписчикам декабря 2014.",
"headMystery201501Text": "Звездный шлем",
"headMystery201501Notes": "Мерцающие созвездия, крутясь, направляют мысли владельца в нужное русло. Преимуществ не дает. Подарок подписчикам в январе 2015.",
+ "headMystery201505Text": "Green Knight Helm",
+ "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 2015 Subscriber Item.",
"headMystery301404Text": "Модный цилиндр",
"headMystery301404Notes": "Модный цилиндр для самых уважаемых господ! Подарок подписчикам января 3015. Преимуществ не дает.",
"headMystery301405Text": "Обычный цилиндр",
@@ -432,7 +436,7 @@
"shieldSpecialWinter2015HealerText": "Щит успокоения",
"shieldSpecialWinter2015HealerNotes": "Этот щит отражает леденящий ветер. Увеличивает телосложение на <%= con %>. Экипировка ограниченного выпуска зимы 2014-2015.",
"shieldSpecialSpring2015RogueText": "Взрывной Писк",
- "shieldSpecialSpring2015RogueNotes": "Не дайте звуку обмануть вас - эта взрывчатка просто сбивает с ног. Увеличивает силу на <%= str %>. Экипировка ограниченного выпуска весны 2015.",
+ "shieldSpecialSpring2015RogueNotes": "Не дайте звуку обмануть вас – эта взрывчатка просто сбивает с ног. Увеличивает силу на <%= str %>. Экипировка ограниченного выпуска весны 2015.",
"shieldSpecialSpring2015WarriorText": "Метательная Тарелка",
"shieldSpecialSpring2015WarriorNotes": "Швырните ей во врага! Ну или оставьте себе, потому что к обеду в ней будет полно вкусного корма. Увеличивает телосложение на <%= con %>. Экипировка ограниченного выпуска весны 2015.",
"shieldSpecialSpring2015HealerText": "Узорчатая подушка",
diff --git a/common/locales/ru/generic.json b/common/locales/ru/generic.json
index c5f1ab3a30..9c07450249 100644
--- a/common/locales/ru/generic.json
+++ b/common/locales/ru/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitica",
"expandToolbar": "Показать панель",
"collapseToolbar": "Скрыть панель",
- "formattingMarkdown": "Разрешено форматирование Markdown",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*Italics*",
+ "bold": "**Bold**",
+ "strikethrough": "~~Strikethrough~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "Достижения",
"modalAchievement": "Достижение!",
"special": "Особый",
@@ -54,7 +67,7 @@
"costumeContest": "Конкурс костюмов 2014",
"costumeContestText": "Участвовал в Костюмированном Фестивале на Хэллоуине 2014. Вы можете увидеть некоторые из записей в blog.habitrpg.com/tagged/cosplay!",
"memberSince": " - Участник с ",
- "lastLoggedIn": " - Последний вход",
+ "lastLoggedIn": "- Последний вход",
"notPorted": "Эта функция еще не перенесена со старого сайта.",
"buyThis": "Купить <%= text %> за <%= price %> из ваших <%= gems %> самоцветов?",
"untilNoFace": "Пока мы не добавим Facebook, используйте ваш UUID и API Token для входа (смотрите https://habitrpg.com > Опции > Настройки).",
diff --git a/common/locales/ru/groups.json b/common/locales/ru/groups.json
index f6d0e6ec86..e41476b767 100644
--- a/common/locales/ru/groups.json
+++ b/common/locales/ru/groups.json
@@ -102,12 +102,19 @@
"messageWroteIn": "Cообщение от <%= user %> в чате: <%= group %>",
"msgPreviewHeading": "Предварительный просмотр сообщения",
"leaderOnlyChallenges": "Только лидер группы может создавать испытания",
- "sendGift": "Send Gift",
- "inviteFriends": "Invite Friends",
- "inviteAlertInfo": "Invite friends by User ID here.",
- "inviteExistUser": "Invite Existing User",
- "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
- "byColon": "By:",
- "inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "sendGift": "Отправить подарок",
+ "inviteFriends": "Пригласить друзей",
+ "inviteAlertInfo": "Здесь можно пригласить друзей по ID пользователя.",
+ "inviteExistUser": "Пригласить существующего пользователя",
+ "inviteByEmail": "пригласить друзей по почте. Если они присоединятся по ссылке из вашего письма, они будут автоматически приглашены в эту группу.",
+ "byColon": "От:",
+ "inviteNewUsers": "Пригласить Новых Пользователей",
+ "inviteAlertInfo2": "Or share this link (copy/paste):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/ru/limited.json b/common/locales/ru/limited.json
index 639e252eed..8dca3d250f 100644
--- a/common/locales/ru/limited.json
+++ b/common/locales/ru/limited.json
@@ -3,17 +3,17 @@
"seasonalEdition": "Сезонный выпуск",
"winterColors": "Зимние цвета",
"annoyingFriends": "Вредные друзья",
- "annoyingFriendsText": "Прилетело снежков в спину от членов команды: <%= snowballs %>.",
+ "annoyingFriendsText": "Прилетело снежков от членов команды: <%= snowballs %>.",
"alarmingFriends": "Пугающие друзья",
- "alarmingFriendsText": "Напуган членами команды <%= spookDust %> раз.",
+ "alarmingFriendsText": "Напуган членами команды <%= spookDust %> раз(а).",
"agriculturalFriends": "Сельскохозяйственные друзья",
- "agriculturalFriendsText": "Превращен в цветок членами команды <%= seeds %> раз.",
+ "agriculturalFriendsText": "Превращен в цветок членами команды <%= seeds %> раз(а).",
"valentineCard": "Валентинка",
"valentineCardNotes": "Отправьте валентинку члену команды.",
- "valentine0": "Розы красны <%= lineBreak %> \"Ежедневные\" сини.<%= lineBreak %>Тем, кто со мною в команде, - <%= lineBreak %>Спасибо!",
- "valentine1": "Розы алеют, <%= lineBreak %> Белеет сирень<%= lineBreak %>Вместе поборем<%= lineBreak %>Пороки и лень!",
- "valentine2": "Розы красны. <%= lineBreak %>Этот старый куплет,<%= lineBreak %>Надеюсь, оценишь - <%= lineBreak %>Он стоил десять монет!",
- "valentine3": "Розы красны,<%= lineBreak %>Синь Дракон Ледяной,<%= lineBreak %>Нет лучше сокровищ,<%= lineBreak %>Чем время с тобой!",
+ "valentine0": "«Розы ярко-алые,<%= lineBreak %>А мои задачи – синие,<%= lineBreak %>Мы друзья в команде славные –<%= lineBreak %>Вот такое мое мнение!»",
+ "valentine1": "«Розы алеют,<%= lineBreak %>Белеет сирень,<%= lineBreak %>Вместе поборем<%= lineBreak %>Пороки и лень!»",
+ "valentine2": "«Розы алеют –<%= lineBreak %>Это старый куплет<%= lineBreak %>Надеюсь, оценишь –<%= lineBreak %>Он стоит десять монет!»",
+ "valentine3": "«Розы алеют,<%= lineBreak %>Синь Дракон Ледяной,<%= lineBreak %>Нет лучше сокровищ,<%= lineBreak %>Чем время с тобой!»",
"adoringFriends": "Любимые друзья",
"adoringFriendsText": "Вы так внимательны друг к другу! Отправлено и получено валентинок: <%= cards %>.",
"polarBear": "Белый медведь",
@@ -25,9 +25,9 @@
"seasonalShopTitle": "<%= linkStart %>Сезонная Волшебница<%= linkEnd %>",
"seasonalShopClosedText": "Сезонная лавка сейчас закрыта!! Я не знаю где сейчас Сезонная Чародейка, но она уж точно вернется к следующему большому празднику.",
"seasonalShopText": "Добро пожаловать в Сезонную лавку! Сейчас мы предлагаем товары весеннего сезонного выпуска. Товары будут доступны ежегодно в дни Весенней Веселухи, но мы открыты только до 30 апреля, так что спешите закупиться сейчас, иначе придется ждать целый год!",
- "seasonalShopRebirth": "Использовав шар возрождения, вы сможете повторно купить это снаряжение в колонке наград после того, как разблокируете лавку предметов. Изначально вы сможете купить только предметы для вашего текущего класса (класс по умолчанию - воин), но не волнуйтесь: после смены класса вам станут доступны другие классовые предметы.",
+ "seasonalShopRebirth": "Использовав шар возрождения, вы сможете повторно купить это снаряжение в колонке наград после того, как разблокируете лавку предметов. Изначально вы сможете купить только предметы для вашего текущего класса (класс по умолчанию – воин), но не волнуйтесь: после смены класса вам станут доступны другие классовые предметы.",
"candycaneSet": "Карамельная палочка (Маг)",
- "skiSet": "Лыжник-ассасин (Жулик)",
+ "skiSet": "Лыжник-ассасин (Разбойник)",
"snowflakeSet": "Снежинка (Знахарь)",
"yetiSet": "Укротитель Йети (Воин)",
"nyeCard": "Новогодняя открытка",
diff --git a/common/locales/ru/npc.json b/common/locales/ru/npc.json
index 2844966a82..998b012974 100644
--- a/common/locales/ru/npc.json
+++ b/common/locales/ru/npc.json
@@ -2,8 +2,8 @@
"npc": "NPC",
"npcText": "Оказал максимальную спонсорскую помощь проекту на Kickstarter",
"mattBoch": "Мэтт Бош",
- "mattShall": "Мне вывести вашего боевого товарища для прогулки верхом, <%= name %>? Выберите скакуна, чтобы оседлать его.",
- "mattBochText1": "Добро пожаловать, подходите к стойлам! Я Мэтт, повелитель зверей. Здесь можно выбрать питомца, который будет вас сопровождать. Хорошо кормите своих питомцев, и они вырастут в могучих скакунов.",
+ "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
+ "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
"daniel": "Даниэль ",
"danielText": "Добро пожаловать в Таверну! Задержитесь немного и поболтайте с местными жителями. Вам нужен отдых: (отпуск или больничный)? Я размещу вас в Гостинице. Пропущенные Ежедневные задания при этом не будут причинять вам вреда в конце дня, но вы так же сможете отмечать их выполнение.",
"danielText2": "Будьте осторожны: если ваша команда сражается с Боссом, он все же будет наносить вам урон за Ежедневные задания, пропущенные вашими товарищами! Кроме того, нанесенный вами урон Боссу или найденные предметы не будут зарегистрированы, пока вы не покинете Гостиницу.",
@@ -45,9 +45,9 @@
"tourScrollDown": "Обязательно пролистайте страницу вниз до конца, чтобы просмотреть все доступные возможности! Чтобы вернуться к странице заданий, еще раз кликните на аватаре.",
"tourMuchMore": "Когда с заданиями покончено, вы можете собрать команду с друзьями, пообщаться в гильдиях по интересам, присоединиться к испытаниям и многое другое!",
"tourStatsPage": "Это страница характеристик. Достижения можно заработать, выполняя задания из списка.",
- "tourTavernPage": "Добро пожаловать в таверну, где игроки всех возрастов собираются, чтобы поболтать. Здесь вы можете временно заморозить свой аккаунт на время болезни или путешествия, выбрав опцию \"В гостинницу\". Заходите!",
+ "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
"tourPartyPage": "Команда поможет вам быть ответственней. Пригласите друзей, чтобы разблокировать свиток квеста.",
- "tourGuildsPage": "Гильдии - это группы для общения по интересам. Выбирайте тематики, которые вас интересуют. Рекомендуем изучить Гильдию новичков.",
- "tourChallengesPage": "Когда вы присоединяетесь к испытанию, в вашем аккаунте появляются дополнительные задачи. Состязайтесь с другими пользователями и получайте самоцветы за победу!",
+ "tourGuildsPage": "Гильдии – это группы для общения по интересам. Выбирайте тематики, которые вас интересуют. Рекомендуем изучить Гильдию новичков.",
+ "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
"tourMarketPage": "Начиная с уровня 4, после завершения заданий вы можете получить случайным образом выпавшее яйцо или инкубационный эликсир. Используйте их для того, чтобы вырастить питомцев! Также эти предметы можно купить на рынке."
}
\ No newline at end of file
diff --git a/common/locales/ru/pets.json b/common/locales/ru/pets.json
index 10e50497ba..dd9f9f2ad1 100644
--- a/common/locales/ru/pets.json
+++ b/common/locales/ru/pets.json
@@ -56,8 +56,8 @@
"petKeyBegin": "Ключ от Вольеров: поборитесь за звание <%= title %> ещё раз!",
"petKeyInfo": "Пропал восторг от собирания питомцев? Теперь вы можете отпустить их и вновь привнести смысл в получение предметов!",
"petKeyInfo2": "Используйте Ключ от Вольеров, чтобы сбросить количество ваших неквестовых питомцев и/или скакунов до нуля. (Квестовые и Редкие питомцы и скакуны не сбрасываются)",
- "petKeyInfo3": "Существует три разных Ключа от Вольеров, которые позволяют: выпустить только питомцев (за 4 самоцвета), выпустить только скакунов (за 4 самоцвета) или выпустить и питомцев, и скакунов одновременно (за 6 самоцветов). Использование ключа позволит вам повторить достижения Властелин зверей и Повелитель скакунов. Для того, чтобы повторить достижение Тройное Бинго, используйте ключ \"Освободить и питомцев, и скакунов\", и соберите все 90 питомцев во второй раз. Покажите миру, что Вы - настоящий мастер - коллекционер! Но принимайте решение мудро: открыв вольеры или стойла, вы уже не сможете вернуть своих питомцев кроме, как собрав их всех заново...",
- "petKeyInfo4": "Существует три разных Ключа от Вольеров, которые позволяют: выпустить только питомцев (за 4 самоцвета), выпустить только скакунов (за 4 самоцвета) или выпустить и питомцев, и скакунов одновременно. Использование ключа позволит вам повторить достижения Властелин зверей и Повелитель скакунов. Для того, чтобы повторить достижение Тройное Бинго, используйте ключ \"Освободить и питомцев, и скакунов\", и соберите все 90 питомцев во второй раз. Покажите миру, что Вы - настоящий мастер - коллекционер! Но принимайте решение мудро: открыв вольеры или стойла, вы уже не сможете вернуть своих питомцев кроме, как собрав их всех заново...",
+ "petKeyInfo3": "Существует три разных Ключа от Вольеров, которые позволяют: выпустить только питомцев (за 4 самоцвета), выпустить только скакунов (за 4 самоцвета) или выпустить и питомцев, и скакунов одновременно (за 6 самоцветов). Использование ключа позволит вам повторить достижения Властелин зверей и Повелитель скакунов. Для того, чтобы повторить достижение Тройное Бинго, используйте ключ \"Освободить и питомцев, и скакунов\", и соберите все 90 питомцев во второй раз. Покажите миру, что Вы – настоящий мастер - коллекционер! Но принимайте решение мудро: открыв вольеры или стойла, вы уже не сможете вернуть своих питомцев кроме, как собрав их всех заново...",
+ "petKeyInfo4": "Существует три разных Ключа от Вольеров, которые позволяют: выпустить только питомцев (за 4 самоцвета), выпустить только скакунов (за 4 самоцвета) или выпустить и питомцев, и скакунов одновременно. Использование ключа позволит вам повторить достижения Властелин зверей и Повелитель скакунов. Для того, чтобы повторить достижение Тройное Бинго, используйте ключ \"Освободить и питомцев, и скакунов\", и соберите все 90 питомцев во второй раз. Покажите миру, что Вы – настоящий мастер - коллекционер! Но принимайте решение мудро: открыв вольеры или стойла, вы уже не сможете вернуть своих питомцев кроме, как собрав их всех заново...",
"petKeyPets": "Освободить моих питомцев",
"petKeyMounts": "Освободить моих скакунов",
"petKeyBoth": "Освободить всех",
diff --git a/common/locales/ru/quests.json b/common/locales/ru/quests.json
index 1a746ff6e3..07c5406e71 100644
--- a/common/locales/ru/quests.json
+++ b/common/locales/ru/quests.json
@@ -6,8 +6,8 @@
"questSend": "После нажатия «Пригласить» членам вашей команды будет отправлено приглашение. Квест начнется, когда все члены команды примут или отклонят приглашение. Статус приглашения можно посмотреть в Параметры > Общение > Команда.",
"inviteParty": "Пригласить команду",
"questInvitation": "Приглашение на участие в квесте",
- "questInvitationTitle": "Quest Invitation",
- "questInvitationInfo": "Invitation for the Quest <%= quest %>",
+ "questInvitationTitle": "Приглашение на квест",
+ "questInvitationInfo": "Приглашение на квест \"<%= quest %>\"",
"askLater": "Спросить позже",
"buyQuest": "Купить квест",
"accepted": "Принято",
@@ -19,7 +19,7 @@
"bossStrength": "Сила босса",
"collect": "Собрать",
"collected": "Собрано",
- "bossDmg1": "Чтобы нанести урон боссу, выполняйте свои задачи и ежедневные задания. Чем больше урон от задания, тем больший урон вы нанесете боссу, выполнив его (красные задания, заклинания магов, атаки воинов и так далее). Босс будет наносить урон команде за каждое невыполненное ежедневное задание (урон задания, помноженный на силу босса), поэтому помогайте своим друзьям, выполняя свои ежедневные задания! Весь урон боссу и от босса подсчитывается по расписанию (в ваш момент смены суток).",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "Только участники будут сражаться с боссом и разделят квестовые трофеи.",
"tavernBossInfo": "Чтобы нанести урон боссу, выполняйте свои задачи и ежедневные задания. Чем сложнее задание, тем больший урон вы нанесете боссу выполняя его (красные задания, заклинания магов, атаки воинов и так далее). Ярость босса будет увеличиваться за каждое невыполненное ежедневное задание (урон от него умножается на силу босса). Когда его ярость достигнет максимума произойдёт что-то плохое, поэтому выполняйте свои ежедневные задания! Весь урон боссу и от босса подсчитывается по расписанию (в ваш момент смены суток).",
"bossColl1": "Чтобы собирать предметы, выполняйте положительные задания. Квестовые предметы падают точно так же, как обычные; однако, вы не увидите, что упало, до начала следующего дня — тогда всё, что вы нашли, будет посчитано и сложено в общую стопку.",
diff --git a/common/locales/ru/questscontent.json b/common/locales/ru/questscontent.json
index 9597399ad3..6f5b01a5d5 100644
--- a/common/locales/ru/questscontent.json
+++ b/common/locales/ru/questscontent.json
@@ -54,7 +54,7 @@
"questRoosterUnlockText": "Позволяет покупать на рынке петуха в яйце.",
"questSpiderText": "Ледяной Арахнид",
"questSpiderNotes": "На улице становится все прохладнее, аккуратный морозец уже украшает инеевыми узорами окна Хаббитанцев... Кроме @Arcosine, чьи окна полностью заморожены Ледяным Пауком, который обосновался в его доме. О, Господи.",
- "questSpiderCompletion": "Ледяной паук рассыпается на кусочки, оставляя за собой небольшую кучку снежинок и несколько зачарованных яиц. @Arcosine поспешно предлагает вам их в качестве награды - возможно, вы сможете самостоятельно вырастить немного неопасных пауков в качестве своих питомцев?",
+ "questSpiderCompletion": "Ледяной паук рассыпается на кусочки, оставляя за собой небольшую кучку снежинок и несколько зачарованных яиц. @Arcosine поспешно предлагает вам их в качестве награды – возможно, вы сможете самостоятельно вырастить немного неопасных пауков в качестве своих питомцев?",
"questSpiderBoss": "Паук",
"questSpiderDropSpiderEgg": "Паук (яйцо)",
"questSpiderUnlockText": "Позволяет покупать на рынке паука в яйце.",
@@ -74,16 +74,16 @@
"questVice3DropDragonEgg": "Дракон (яйцо)",
"questVice3DropShadeHatchingPotion": "Сумрачный инкубационный эликсир",
"questMoonstone1Text": "Ожерелье Лунных камней",
- "questMoonstone1Notes": "
Страшная болезнь поразила Хаббитанцев. Давно забытые плохие Привычки растут с удвоенной силой. Тарелки лежат немытые, учебники не прочитаны и прокрастинация достигает угрожающего размаха!
Вы проследили, как некоторые из ваших плохих привычек вернулись на Болота Застоя и обнаружили виновника: призрачная Некромантша, Рецидивина. Вы ринулись вперед, размахивая оружием, но они их удары не причиняют призраку вреда.
\"Не беспокоить\", - прошипела она с сухим треском. \"Без ожеоелья лунных камней, ничто не может причинить мне вред, а мастер-ювелир @aurakami давно разбросал все лунные камни по Хаббитике!\" Задыхаясь, вы отступаете... но вы знаете, что нужно сделать.
",
+ "questMoonstone1Notes": "
Страшная болезнь поразила Хаббитанцев. Давно забытые плохие Привычки растут с удвоенной силой. Тарелки лежат немытые, учебники не прочитаны и прокрастинация достигает угрожающего размаха!
Вы проследили, как некоторые из ваших плохих привычек вернулись на Болота Застоя и обнаружили виновника: призрачная Некромантша, Рецидивина. Вы ринулись вперед, размахивая оружием, но они их удары не причиняют призраку вреда.
\"Не беспокоить\", – прошипела она с сухим треском. \"Без ожеоелья лунных камней, ничто не может причинить мне вред, а мастер-ювелир @aurakami давно разбросал все лунные камни по Хаббитике!\" Задыхаясь, вы отступаете... но вы знаете, что нужно сделать.
Отважный оружейник @Inventrix помог вам сковать зачарованные лунные камни в ожерелье. Теперь вы готовы противостоять Рецидивине, но как только вы зашли в Болота Застоя, страшный холод окутал вас.
Гнилое дыхание прошептало вам на ухо. \"Вернулся? Какая прелесть...\" Вы попятились и сделали выпод, под светом ожерелья лунных камней, ваше оружие поразило твердую плоть. \"Вы еще призовете меня обратно в мир\", - огрызнулась Рецидивина, - \"но сейчас твое время распрощаться с ним!\"
",
+ "questMoonstone2Notes": "
Отважный оружейник @Inventrix помог вам сковать зачарованные лунные камни в ожерелье. Теперь вы готовы противостоять Рецидивине, но как только вы зашли в Болота Застоя, страшный холод окутал вас.
Гнилое дыхание прошептало вам на ухо. \"Вернулся? Какая прелесть...\" Вы попятились и сделали выпод, под светом ожерелья лунных камней, ваше оружие поразило твердую плоть. \"Вы еще призовете меня обратно в мир\", – огрызнулась Рецидивина, – \"но сейчас твое время распрощаться с ним!\"
Рецидивина упала на землю, и вы ударили ее ожерельем лунным камней. К вашему ужасу Рецидивина схватила самоцветы, ее взгляд наполнился торжеством.
\"Глупое создание из плоти!\"- закричала она. \"Эти лунные камни восстановят физическую оболочку, правда, не так, как ты себе представляешь. Как только полная луна появится из темноты - это наполнит меня силой. Из теней я призываю призрак твоего самого страшного врага!\"
Болезненный зеленый туман поднимается из болота, и тело Рецидивины содрогается, принимая форму, которая поднимает в вас волну ужаса, - неживое тело Вайса, ужасного возрожденного.
",
- "questMoonstone3Completion": "
Вам становится сложнее дышать, пот щиплет глаза, когда умирает восставший Змей. Остатки Рецидивины рассеиваются в прозрачный серый туман, который быстро уносит освежающий ветерок. Вы слышите отдаленные восторженные крики Хаббитанцев, которые победили свои вредные Привычки раз и навсегда.
@Baconsaur Повелитель зверей приземляется на грифоне. \"Я видел конец вашей битвы с неба, и я был глубоко тронут. Пожалуйста, примите эту зачарованную тунику - ваша храбрость говорит о благородном сердце, и я верю, что вы должны получить ее\".
",
+ "questMoonstone3Notes": "
Рецидивина упала на землю, и вы ударили ее ожерельем лунным камней. К вашему ужасу Рецидивина схватила самоцветы, ее взгляд наполнился торжеством.
\"Глупое создание из плоти!\" – закричала она. \"Эти лунные камни восстановят физическую оболочку, правда, не так, как ты себе представляешь. Как только полная луна появится из темноты – это наполнит меня силой. Из теней я призываю призрак твоего самого страшного врага!\"
Болезненный зеленый туман поднимается из болота, и тело Рецидивины содрогается, принимая форму, которая поднимает в вас волну ужаса, – неживое тело Вайса, ужасного возрожденного.
",
+ "questMoonstone3Completion": "
Вам становится сложнее дышать, пот щиплет глаза, когда умирает восставший Змей. Остатки Рецидивины рассеиваются в прозрачный серый туман, который быстро уносит освежающий ветерок. Вы слышите отдаленные восторженные крики Хаббитанцев, которые победили свои вредные Привычки раз и навсегда.
@Baconsaur Повелитель зверей приземляется на грифоне. \"Я видел конец вашей битвы с неба, и я был глубоко тронут. Пожалуйста, примите эту зачарованную тунику – ваша храбрость говорит о благородном сердце, и я верю, что вы должны получить ее\".
@Jon Arinbjorn пытается привлечь ваше внимание. После битвы новая фигура предстает пред вашим взором. Это закованный в черную сталь рыцарь с обнаженным мечом в руке. И он медленно приближается. \"Нет, отец!\"- кричит ему Золотой Рыцарь, но без толку - новый противник движется вперед. \n\"Прости меня, герой,- сокрушенно говорит Золотой Рыцарь,- я не осознавала, что обратила свои добрые помыслы в жестокость. Но пред тобой мой отец - рыцарь с самым черным и жестоким сердцем. Если ты не сразишь его, то все мы обречены! Вот! Возьми мой верный моргенштерн и победи Железного Рыцаря!\"
",
- "questGoldenknight3Completion": "
С лязгом и звоном Железный Рыцарь падает на колени. \"Ты силён,- выдыхает он,- я сражен и унижен.\" Золотой Рыцарь приближается к вам. \"Благодарю тебя, герой. Мы извлекли урок из этих событий. Я переговорю с отцом. И, возможно, нам стоит принести свои извинения обитателям страны Habitica.\" Золотой Рыцарь на мгновение задумывается и принимает решение. \"Возьми мой моргенштерн. Он служил мне верой и правдой, так пусть же теперь у него будет более достойный владелец!\"
",
+ "questGoldenknight3Notes": "
@Jon Arinbjorn пытается привлечь ваше внимание. После битвы новая фигура предстает пред вашим взором. Это закованный в черную сталь рыцарь с обнаженным мечом в руке. И он медленно приближается. \"Нет, отец!\" – кричит ему Золотой Рыцарь, но без толку – новый противник движется вперед. \n\"Прости меня, герой, – сокрушенно говорит Золотой Рыцарь, – я не осознавала, что обратила свои добрые помыслы в жестокость. Но пред тобой мой отец – рыцарь с самым черным и жестоким сердцем. Если ты не сразишь его, то все мы обречены! Вот! Возьми мой верный моргенштерн и победи Железного Рыцаря!\"
",
+ "questGoldenknight3Completion": "
С лязгом и звоном Железный Рыцарь падает на колени. \"Ты силён, – выдыхает он, – я сражен и унижен.\" Золотой Рыцарь приближается к вам. \"Благодарю тебя, герой. Мы извлекли урок из этих событий. Я переговорю с отцом. И, возможно, нам стоит принести свои извинения обитателям страны Habitica.\" Золотой Рыцарь на мгновение задумывается и принимает решение. \"Возьми мой моргенштерн. Он служил мне верой и правдой, так пусть же теперь у него будет более достойный владелец!\"
Иссиня-черные сверкающие глаза. Древняя чешуя. Массивные челюсти и острые зубы. Мы пробудили что-то ужасающее, что никогда не должно было покидать своей расщелины:Ужасный Дракон Промедления! Кричащие жители Habitica рассыпаются во всех направлениях, когда его извивающаяся шея длиной в десятки метров рассекает водную гладью, а дикий рёв заставляет дрожать окна близлежащих домов.
«Мы должны положить конец Промедлению!», — кричит Lemoness. «Именно откладываемые задачи и красные ежедневные задания привлекли его внимание!»
«Он излучает магическую энергию!» — кричит @Baconsaur. «Живя так долго, он научился исцелять себя! Как мы сможем побороть его?»
Очень просто: так же, как и всех Боссов -- продуктивностью! Быстрее, Habitica, объединяйся и сражай свои задачи, вместе мы победим этого монстра. (Нет нужды бросать начатые квесты, мы уверены в ваших возможностях сражаться на двух фронтах). Он не нападет на мирных жителей, но чем больше ежедневных заданий мы пропускаем, тем больше сил он получает для Незамедлительной Атаки! И мне не нравится, как он поглядывает на Таверну...",
+ "questDilatoryNotes": "
Мы были слепы к предзнаменованиям.
Иссиня-черные сверкающие глаза. Древняя чешуя. Массивные челюсти и острые зубы. Мы пробудили что-то ужасающее, что никогда не должно было покидать своей расщелины:Ужасный Дракон Промедления! Кричащие жители Habitica рассыпаются во всех направлениях, когда его извивающаяся шея длиной в десятки метров рассекает водную гладью, а дикий рёв заставляет дрожать окна близлежащих домов.
«Мы должны положить конец Промедлению!», — кричит Lemoness. «Именно откладываемые задачи и красные ежедневные задания привлекли его внимание!»
«Он излучает магическую энергию!» — кричит @Baconsaur. «Живя так долго, он научился исцелять себя! Как мы сможем побороть его?»
Очень просто: так же, как и всех Боссов – продуктивностью! Быстрее, Habitica, объединяйся и сражай свои задачи, вместе мы победим этого монстра. (Нет нужды бросать начатые квесты, мы уверены в ваших возможностях сражаться на двух фронтах). Он не нападет на мирных жителей, но чем больше ежедневных заданий мы пропускаем, тем больше сил он получает для Незамедлительной Атаки! И мне не нравится, как он поглядывает на Таверну...",
"questDilatoryBoss": "Ужасный Дракон Промедления",
"questDilatoryBossRageTitle": "Незамедлительная атака",
"questDilatoryBossRageDescription": "Как только эта полоса заполнится полностью, Ужасный Дракон Промедления обрушит свою ярость на местность Habitica.",
@@ -143,18 +143,18 @@
"questAtom3DropPotion": "Простой инкубационный эликсир",
"questOwlText": "Сова-Полуночник",
"questOwlNotes": "В Таверне свет горит всю ночь. Но вдруг пропал! Как тут помочь? Как друга друг теперь найдет? Но @Twitching уж бойцов зовет: Сова, враг звезд, закрыла свет. Сражайтесь! Времени ждать нет! Сову прогоним от дверей, Чтоб снова стала ночь светлей!\"",
- "questOwlCompletion": "С рассветом прочь летит Сова, Герои ж - на ногах едва. Пора, пожалуй, и поспать... Но кто гнездо принес в кровать? Мы часто любим, как Сова, Сидеть всю ночь и до утра. Но тихий писк совят даст знать: Пора заканчивать и спать.",
+ "questOwlCompletion": "С рассветом прочь летит Сова, Герои ж – на ногах едва. Пора, пожалуй, и поспать... Но кто гнездо принес в кровать? Мы часто любим, как Сова, Сидеть всю ночь и до утра. Но тихий писк совят даст знать: Пора заканчивать и спать.",
"questOwlBoss": "Сова-Полуночник",
"questOwlDropOwlEgg": "Филин (яйцо)",
"questOwlUnlockText": "Позволяет покупать на рынке сову в яйце.",
"questPenguinText": "Птичий холод",
- "questPenguinNotes": "Хотя южная часть страны Habitica и наслаждается жарким летним днем, на окрестности Жизнерадостного Озера опустился неестественный холод. И вот уже сильный морозный ветер поднимается над замерзшим побережьем. Ледяные пики как будто вырастают из земли. @Melynnrose и @Breadstrings бегут к вам.
\"Помогите!\" - восклицает @Melynnrose. \"Мы завели гигантского пингвина, чтобы он заморозил озеро и сделал из него каток, но у нас кончилась рыба, которую он ел!\"
\"Теперь он и зол и замораживает все вокруг своим ледяным дыханием!\" - вторит @Breadstrings. - \"Пожалуйста, усмирите его, пока он тут нас всех не заморозил!\" Похоже, пора помочь этому пингвину немного... остыть.",
- "questPenguinCompletion": "Пингвин повержен, и лед начинает таять. Гигантский пингвин устраивается на солнышке, заглатывая целое ведро рыбы, что вы собрали. Прокатываясь вдоль озера, он слегка дует на него, создавая гладкую, сверкающую ледяную поверхность. Что за странная птица! \"Похоже, он оставил несколько яиц\", - говорит @Painter de Cluster.
@Rattify смеется. \"Может, хоть эти пингвины окажутся... с холодной головой?\"",
+ "questPenguinNotes": "Хотя южная часть страны Habitica и наслаждается жарким летним днем, на окрестности Жизнерадостного Озера опустился неестественный холод. И вот уже сильный морозный ветер поднимается над замерзшим побережьем. Ледяные пики как будто вырастают из земли. @Melynnrose и @Breadstrings бегут к вам.
\"Помогите!\" – восклицает @Melynnrose. \"Мы завели гигантского пингвина, чтобы он заморозил озеро и сделал из него каток, но у нас кончилась рыба, которую он ел!\"
\"Теперь он и зол и замораживает все вокруг своим ледяным дыханием!\" – вторит @Breadstrings. – \"Пожалуйста, усмирите его, пока он тут нас всех не заморозил!\" Похоже, пора помочь этому пингвину немного... остыть.",
+ "questPenguinCompletion": "Пингвин повержен, и лед начинает таять. Гигантский пингвин устраивается на солнышке, заглатывая целое ведро рыбы, что вы собрали. Прокатываясь вдоль озера, он слегка дует на него, создавая гладкую, сверкающую ледяную поверхность. Что за странная птица! \"Похоже, он оставил несколько яиц\", – говорит @Painter de Cluster.
@Rattify смеется. \"Может, хоть эти пингвины окажутся... с холодной головой?\"",
"questPenguinBoss": "Морозный пингвин",
"questPenguinDropPenguinEgg": "Пингвин (яйцо)",
"questPenguinUnlockText": "Позволяет покупать на рынке пингвина в яйце.",
"questStressbeastText": "Отвратительный Стрессозверь из Стойкальмских степей",
- "questStressbeastNotes": "Выполняйте ежедневные задания и задачи, чтобы наносить урон Мировому боссу! Незавершенные ежедневные задания заполняют полоску Стрессового удара. Когда индикатор полностью заполнится, Мировой босс атакует неигрового персонажа. Мировой босс никогда не наносит вреда отдельным игрокам и никак не влияет на их аккаунты. Учитываются только достижения активных игроков, которые не отдыхают в Гостинице.
~*~
Первое, что мы слышим, – это шаги, напоминающие шум спасающегося бегством стада, но более медленные и грохочущие. Один за другим, жители страны Habitica выглядывают из своих домов и не находят слов, чтобы описать увиденное.
Мы все уже, конечно, видели Стрессозверей – мелких злобных существ, которые атакуют в непростое время. Но это? Эта громадина возвышается над зданиями. Лапы же существа моли бы с легкостью раздавить дракона. От его зловонного меха веет холодом, а его рык превращается в ледяной порыв, срывающий крыши домов. Монстры такой величины раньше никогда не покидали пределы старинных легенд.
«Берегитесь, жители страны Habitica! – кричит SabreCat – Забаррикадируйтесь внутри домов, это сам Ужасный Стрессозверь!»
«Этот зверь, наверняка, сделан из веков стресса», - говорит Kiwibot, крепко запирая дверь Таверны и захлопывая ставни.
«Стойкальмские степи, – говорит Lemoness мрачно – всё это время мы думали, что там все спокойно и безмятежно, но они, наверное, скрывали свой стресс где-то. Поколения спустя, он вырос в этого зверя, который сейчас вырвался на свободу и атаковал их – и нас!»
Есть только один способ отогнать Стрессозверя, Ужасного или любого другого, – и это атаковать его выполненными ежедневными заданиями и задачами! Давайте объединимся и отобьёмся от этого зловещего супостата – но убедитесь в том, что не дадите слабину, разбираясь с задачами, или же невыполненные ежедневные задания могут взбесить его настолько, что он может вскипеть и выплеснуть гнев…",
+ "questStressbeastNotes": "Выполняйте ежедневные задания и задачи, чтобы наносить урон Мировому боссу! Незавершенные ежедневные задания заполняют полоску Стрессового удара. Когда индикатор полностью заполнится, Мировой босс атакует неигрового персонажа. Мировой босс никогда не наносит вреда отдельным игрокам и никак не влияет на их аккаунты. Учитываются только достижения активных игроков, которые не отдыхают в Гостинице.
~*~
Первое, что мы слышим, – это шаги, напоминающие шум спасающегося бегством стада, но более медленные и грохочущие. Один за другим, жители страны Habitica выглядывают из своих домов и не находят слов, чтобы описать увиденное.
Мы все уже, конечно, видели Стрессозверей – мелких злобных существ, которые атакуют в непростое время. Но это? Эта громадина возвышается над зданиями. Лапы же существа моли бы с легкостью раздавить дракона. От его зловонного меха веет холодом, а его рык превращается в ледяной порыв, срывающий крыши домов. Монстры такой величины раньше никогда не покидали пределы старинных легенд.
«Берегитесь, жители страны Habitica! – кричит SabreCat – Забаррикадируйтесь внутри домов, это сам Ужасный Стрессозверь!»
«Этот зверь, наверняка, сделан из веков стресса», – говорит Kiwibot, крепко запирая дверь Таверны и захлопывая ставни.
«Стойкальмские степи, – говорит Lemoness мрачно – всё это время мы думали, что там все спокойно и безмятежно, но они, наверное, скрывали свой стресс где-то. Поколения спустя, он вырос в этого зверя, который сейчас вырвался на свободу и атаковал их – и нас!»
Есть только один способ отогнать Стрессозверя, Ужасного или любого другого, – и это атаковать его выполненными ежедневными заданиями и задачами! Давайте объединимся и отобьёмся от этого зловещего супостата – но убедитесь в том, что не дадите слабину, разбираясь с задачами, или же невыполненные ежедневные задания могут взбесить его настолько, что он может вскипеть и выплеснуть гнев…",
"questStressbeastBoss": "Отвратительный Стрессозверь",
"questStressbeastBossRageTitle": "Стресс-атака",
"questStressbeastBossRageDescription": "Когда этот датчик заполнится, Отвратительный Стрессозверь выпустит на страну Habitica ярость своей стресс-атаки!",
@@ -163,7 +163,7 @@
"questStressbeastBossRageStables": "`Ужасный Стрессозверь использует СТРЕССОВЫЙ УДАР!`\n\nВсплеск стресса восстанавливает здоровье Ужасного Стрессозверя!\n\nО, нет! Несмотря на все наши старания, мы упустили некоторые ежедневные задания из виду и их красный цвет привел Ужасного Стрессозверя в ярость, восполнив его здоровье! Вселяющее ужас создание бросается к Стойлам, но Мэтт, повелитель зверей, по-геройски бросается на защиту питомцев и скакунов. Стрессозверь стискивает Мэтта жесткой хваткой, но, по крайней мере, он отвлекся на какой-то момент. Скорей! Давайте держать наши ежедневные задания в порядке, чтобы победить этого монстра, пока он не атаковал вновь!",
"questStressbeastBossRageBailey": "`Отвратительный Стрессозверь применяет СТРЕСС-АТАКУ!`\n\nНарастающий стресс исцеляет Отвратительного Стрессозверя!\n\nААААА!!! Наши незаверешенные ежедневные задания раздражают Стрессозверя больше обычного и он восстанавливает часть здоровья! Глашатай Бэйли раздавала горожанам указания по безопасности, но зверь схватил ее свободной рукой. Только посмотрите, как отважно она сообщает последние новости, пока Стрессозверь вращает ее по кругу... Давайте докажем, что достойны подобной смелости и сделаем все, что в наших силах, чтобы спасти наших NPC!",
"questStressbeastBossRageGuide": "`Отвратительный Стрессозверь применяет СТРЕСС-АТАКУ!`\n\nНарастающий стресс исцеляет Отвратительного Стрессозверя!\n\nОсторожнее! Проводник Justin пытается отвлечь Стрессозверя, бегая вокруг его лодыжек и выкрикивая полезные советы по повышению работоспособности! Отвратительный Стрессозверь бешено топчется на месте, но похоже, мы его действительно измотали. Сомневаюсь, что ему хватит сил на очередной удар. Не сдавайтесь... скоро мы с ним разберемся!",
- "questStressbeastDesperation": "`Здоровье Ужасного Стрессозверя достигает 500 тыс.! Ужасный Стрессозверь использует Отчаянную защиту!`\n\nМы почти у цели, жители страны Habitica! Благодаря усердию и выполенным ежедневным заданиям мы опустили здоровье Стрессозверя до 500 тыс.! Существо рычит и бьется в отчаянии, его ярость растет, как никогда. Бэйли и Мэтт кричат в ужасе - зверь поднял их в воздух и крутит с ужасающей скоростью, вызывая снежную бурю. Теперь наносить ему удары его гораздо сложнее.\n\nМы должны удвоить наши усилия, но не унывайте - это знак того, что Стрессозверь понимает, что вот-вот будет побежден. Не время сдаваться!",
+ "questStressbeastDesperation": "`Здоровье Ужасного Стрессозверя достигает 500 тыс.! Ужасный Стрессозверь использует Отчаянную защиту!`\n\nМы почти у цели, жители страны Habitica! Благодаря усердию и выполенным ежедневным заданиям мы опустили здоровье Стрессозверя до 500 тыс.! Существо рычит и бьется в отчаянии, его ярость растет, как никогда. Бэйли и Мэтт кричат в ужасе – зверь поднял их в воздух и крутит с ужасающей скоростью, вызывая снежную бурю. Теперь наносить ему удары его гораздо сложнее.\n\nМы должны удвоить наши усилия, но не унывайте – это знак того, что Стрессозверь понимает, что вот-вот будет побежден. Не время сдаваться!",
"questStressbeastCompletion": "Ужасный Стрессозверь ПОБЕЖДЁН!
Мы это сделали! Издав последний вопль, Ужасный Стрессозверь рассеивается облаком снега. Снежинки, сверкая, опускаются на землю, а воодушевленные жители страны Habitica обнимаются со своими питомцами и скакунами. Наши животные и наши неигровые персонажи вновь в безопасности
Стойкальм спасён!
SabreCat мягко говорит маленькому саблезубику: «Пожалуйста, найди жителей Стойкальма и приведи их к нам». Спустя несколько часов саблезубик возвращается с группой наездников мамонтов, которые следуют за ним. Вы узнаете в первом наезднике Lady Glaciate, главу Стойкальма.
«Могущественные жители страны Habitica – говорит она – мои люди и я должны от души вас поблагодарить и принести глубочайшие извинения. Пытаясь защитить наши Степи от паники, мы стали скрытно изгонять весь наш стресс в ледяные горы. Мы даже не представляли, что за поколения он превратится в Стрессозверя, которого вы видели! Когда он вырвался на свободу, он загнал нас в ловушку в горах, в своей вотчине и стал срывать ярость на наших любимых животных». Её грустный взгляд следит за падающим снегом. «Своей глупостью мы подвергли всех опасности. Будьте уверены, что в будущем мы придем к вам при появлении проблем до того, как наши проблемы придут к вам.»
Она поворачивается туда, где @Baconsaur удобно устроился с некоторыми мамонтятами. «Мы пришли с предложением еды для ваших животных в качестве извинений за ужас, который они испытали. Также, как символ доверия, мы оставим некоторых наших питомцев и скакунов у вас. Мы уверены, что вы хорошо о них позаботитесь».",
"questStressbeastCompletionChat": "`Ужасный Стрессозверь ПОБЕЖДЁН!`\n\nМы это сделали! Издав последний вопль, Ужасный Стрессозверь рассеивается облаком снега. Снежинки, сверкая, опускаются на землю, а воодушевленные жители страны Habitica обнимаются со своими питомцами и скакунами. Наши животные и наши неигровые персонажи вновь в безопасности!\n\n`Стойкальм спасён!`\n\nSabreCat мягко говорит маленькому саблезубику: «Пожалуйста, найди жителей Стойкальма и приведи их к нам». Спустя несколько часов саблезубик возвращается с группой наездников мамонтов, которые следуют за ним. Вы узнаете в первом наезднике Lady Glaciate, главу Стойкальма.\n\n«Могущественные жители страны Habitica – говорит она – мои люди и я должны от души вас поблагодарить и принести глубочайшие извинения. Пытаясь защитить наши Степи от паники, мы стали скрытно изгонять весь наш стресс в ледяные горы. Мы даже не представляли, что за поколения он превратится в Стрессозверя, которого вы видели! Когда он вырвался на свободу, он загнал нас в ловушку в горах, в своей вотчине и стал срывать ярость на наших любимых животных». Её грустный взгляд следит за падающим снегом. «Своей глупостью мы подвергли всех опасности. Будьте уверены, что в будущем мы придем к вам при появлении проблем до того, как наши проблемы придут к вам.»\n\nОна поворачивается туда, где @Baconsaur удобно устроился с некоторыми мамонтятами. «Мы пришли с предложением еды для ваших животных в качестве извинений за ужас, который они испытали. Также, как символ доверия, мы оставим некоторых наших питомцев и скакунов у вас. Мы уверены, что вы хорошо о них позаботитесь».",
"questTRexText": "Король динозавров",
@@ -172,7 +172,7 @@
"questTRexBoss": "Огромный Тиранозавр",
"questTRexUndeadText": "Динозавра раскопали!",
"questTRexUndeadNotes": "Пока древние динозавры из Стойкальмских степей разбегаются по Habit City, из Большого Музея доносится вопль ужаса. @Baconsaur кричит: \"Скелет тираннозавра в музее шевелится! Должно быть, он почуял сородичей!\" Костлявое чудище обнажает зубы и бросается, гремя костями, в вашу сторону. Как убить того, кто уже мертв? Бейте, пока он не исцелился!",
- "questTRexUndeadCompletion": "Блеск в глазах тираннозавра гаснет, и он взбирается обратно на свой пьедестал. Все облегченно вздыхают. \"Смотрите! - говорит @Baconsaur. - Некоторые из окаменелых яиц теперь блестящие и новые. Может, из них кто-то вылупится?\"",
+ "questTRexUndeadCompletion": "Блеск в глазах тираннозавра гаснет, и он взбирается обратно на свой пьедестал. Все облегченно вздыхают. \"Смотрите! – говорит @Baconsaur. – Некоторые из окаменелых яиц теперь блестящие и новые. Может, из них кто-то вылупится?\"",
"questTRexUndeadBoss": "Костяной тираннозавр",
"questTRexUndeadRageTitle": "Костяное лечение",
"questTRexUndeadRageDescription": "Эта полоска заполняется, когда вы не выполняете ежедневные задания. Когда полоска заполнится, Костяной тираннозавр восстановится на 30% oт своего оставшегося здоровья!",
@@ -180,15 +180,15 @@
"questTRexDropTRexEgg": "Тираннозавр (яйцо)",
"questTRexUnlockText": "Позволяет покупать на рынке тираннозавра в яйце.",
"questRockText": "Побег от пещерного чудища",
- "questRockNotes": "Пересекая с друзьями Бесцельные Горы страны Habitica, вы остановились на ночь в прекрасной пещере, усыпанной сверкающими минералами. Однако, проснувшись утром, вы обнаруживаете, что вход исчез, а пол под вами движется!
\"Гора живая!\" - кричит ваш спутник @pfeffernusse. - \"Это не кристаллы - это зубы!\"
@Painter de Cluster хватает вас за руку. \"Нужно найти другой путь наружу - не отходи от меня и не отвлекайся, иначе мы застрянем тут навечно!\"",
+ "questRockNotes": "Пересекая с друзьями Бесцельные Горы страны Habitica, вы остановились на ночь в прекрасной пещере, усыпанной сверкающими минералами. Однако, проснувшись утром, вы обнаруживаете, что вход исчез, а пол под вами движется!
\"Гора живая!\" – кричит ваш спутник @pfeffernusse. – \"Это не кристаллы – это зубы!\"
@Painter de Cluster хватает вас за руку. \"Нужно найти другой путь наружу – не отходи от меня и не отвлекайся, иначе мы застрянем тут навечно!\"",
"questRockBoss": "Кристальный колосс",
"questRockCompletion": "Благодаря усердию вы отыскали безопасный путь через живую гору. Выйдя на свет, ваш друг @intune замечает странный блеск на земле возле выхода из пещеры. Остановившись, вы подбираете небольшой камень с золотой прожилкой. Вокруг много других камней довольно необычной формы. Они похожи на... яйца?",
"questRockDropRockEgg": "Камень (яйцо)",
"questRockUnlockText": "Позволяет покупать на рынке камень в яйце.",
"questBunnyText": "Крольчиха-убийца",
- "questBunnyNotes": "Много непростых дней спустя вы достигли вершины Пика Прокрастинации и теперь стоите перед внушительными дверьми Крепости Пренебрежения. Надпись на камне гласит: \"Внутри обитает чудовище, воплощающее ваши самые большие страхи - причина вашего бездействия. Стучите и встретьтесь с ним лицом к лицу!\" Вы дрожите, представляя ужас, ожидающий внутри, и готовы вот-вот сбежать, как уже делали не раз. @Draayder удерживает вас. \"Спокойно, друг мой! Время пришло. Вы должны это сделать!\"
Вы стучите, и двери открываются внутрь. Из темноты доносится оглушительный рев. Вы обнажаете оружие.",
+ "questBunnyNotes": "Много непростых дней спустя вы достигли вершины Пика Прокрастинации и теперь стоите перед внушительными дверьми Крепости Пренебрежения. Надпись на камне гласит: \"Внутри обитает чудовище, воплощающее ваши самые большие страхи – причина вашего бездействия. Стучите и встретьтесь с ним лицом к лицу!\" Вы дрожите, представляя ужас, ожидающий внутри, и готовы вот-вот сбежать, как уже делали не раз. @Draayder удерживает вас. \"Спокойно, друг мой! Время пришло. Вы должны это сделать!\"
Вы стучите, и двери открываются внутрь. Из темноты доносится оглушительный рев. Вы обнажаете оружие.",
"questBunnyBoss": "Крольчиха-убийца",
- "questBunnyCompletion": "С последним ударом крольчиха-убийца падает навзничь. Искрящийся туман поднимается от ее тела, которое сжимается до размеров крольчонка - ничего общего с ужасным монстром, с которым вы только что сразились. Крольчиха очаровательно морщит носик и прыгает прочь, оставив несколько яиц. @Gully смеется. \"Пик Прокрастинации даже простые задачи заставляет казаться непреодолимыми. Собирайте яйца, и пойдем домой\".",
+ "questBunnyCompletion": "С последним ударом крольчиха-убийца падает навзничь. Искрящийся туман поднимается от ее тела, которое сжимается до размеров крольчонка – ничего общего с ужасным монстром, с которым вы только что сразились. Крольчиха очаровательно морщит носик и прыгает прочь, оставив несколько яиц. @Gully смеется. \"Пик Прокрастинации даже простые задачи заставляет казаться непреодолимыми. Собирайте яйца, и пойдем домой\".",
"questBunnyDropBunnyEgg": "Кролик (яйцо)",
"questBunnyUnlockText": "Позволяет покупать на рынке кролика в яйце.",
"questSlimeText": "Желейный Регент",
@@ -197,10 +197,10 @@
"questSlimeCompletion": "Нанеся последний удар, вам удается поймать Желейного Регента в ловушку – гигантский пончик, который поспешили подкатить скорые на ум лидеры клуба выпечки @Overomega, @LordDarkly и @Shaner. Пока все стремятся одобрительно похлопать вас по спине, вы чувствуете, как кто-то сунул что-то вам в карман. Эта награда за ваш сладкий успех: три зефирных слизня в яйце.",
"questSlimeDropSlimeEgg": "Зефирный слизень (яйцо)",
"questSlimeUnlockText": "Позволяет покупать на рынке слизня в яйце",
- "questSheepText": "The Thunder Ram",
+ "questSheepText": "Грозовой Баран",
"questSheepNotes": "As you wander the rural Taskan countryside with friends, taking a \"quick break\" from your obligations, you find a cozy yarn shop. You are so absorbed in your procrastination that you hardly notice the ominous clouds creep over the horizon. \"I've got a ba-a-a-ad feeling about this weather,\" mutters @Misceo, and you look up. The stormy clouds are swirling together, and they look a lot like a... \"We don't have time for cloud-gazing!\" @starsystemic shouts. \"It's attacking!\" The Thunder Ram hurtles forward, slinging bolts of lightning right at you!",
- "questSheepBoss": "Thunder Ram",
+ "questSheepBoss": "Грозовой Баран",
"questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.",
- "questSheepDropSheepEgg": "Sheep (Egg)",
- "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market"
+ "questSheepDropSheepEgg": "Овца (яйцо)",
+ "questSheepUnlockText": "Позволяет покупать на рынке овцу в яйце."
}
\ No newline at end of file
diff --git a/common/locales/ru/tasks.json b/common/locales/ru/tasks.json
index d9069ae09f..e01913cc86 100644
--- a/common/locales/ru/tasks.json
+++ b/common/locales/ru/tasks.json
@@ -14,7 +14,7 @@
"save": "Сохранить",
"addChecklist": "Добавить список",
"checklist": "Список",
- "checklistText": "В ежедневных заданиях для частично выполненных заданий уменьшается урон (напр., со списком из 4 дел, 3 из которых окончены, ежедневное задание нанесет вам 25% урона). При выполнении обычной задачи, ваши очки будут умножены на количество дел в списке (напр., при списке из 4 дел вы получите в 4 раза больше опыта и золота).",
+ "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
"expandCollapse": "Развернуть/свернуть",
"text": "Текст",
"extraNotes": "Дополнительные заметки",
@@ -22,7 +22,7 @@
"advancedOptions": "Дополнительные параметры",
"difficulty": "Сложность",
"difficultyHelpTitle": "Насколько трудно это задание?",
- "difficultyHelpContent": "Это увеличивает ценность задачи. Используйте в меру, лучше положитесь на штатные алгоритмы регулировки важности задач. Но всё же некоторые задачи гораздо ценнее других (сравните: написать дипломную и почистить зубы). Щелкните, чтобы узнать подробности.",
+ "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!",
"easy": "Легко",
"medium": "Нормально",
"hard": "Сложно",
diff --git a/common/locales/sk/backgrounds.json b/common/locales/sk/backgrounds.json
index 9f3223159c..d2e5ab9435 100644
--- a/common/locales/sk/backgrounds.json
+++ b/common/locales/sk/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "Mountain Lake",
"backgroundMountainLakeNotes": "Dip your toes in a Mountain Lake.",
"backgroundPagodasText": "Pagodas",
- "backgroundPagodasNotes": "Climb to the top of Pagodas."
+ "backgroundPagodasNotes": "Climb to the top of Pagodas.",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/sk/challenge.json b/common/locales/sk/challenge.json
index 66f4ac7246..3b0c60e32c 100644
--- a/common/locales/sk/challenge.json
+++ b/common/locales/sk/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Vyber víťaza a uzavri výzvu:",
"deleteOrSelect": "Zmaž alebo vyber víťaza",
"endChallenge": "Ukončiť výzvu",
- "challengeDiscription": "Toto sú úlohy výzvy. Keď sa budú používatelia zapájať, ich farba sa bude postupne meniť a zobrazia sa grafy s celkovým pokrokom skupiny.",
+ "challengeDiscription": "These are the Challenge's tasks that will be added to your task dashboard when you join this Challenge. The sample Challenge tasks below will change color and gain graphs to show you the overall progress of the group.",
"hows": "Ako sa všetkým darí?",
"filter": "Filter",
"groups": "Skupiny",
@@ -33,7 +33,8 @@
"challengeTagPop": "Výzvy sa zobrazujú v zozname štítkov a v popise úlohy. Takže oficiálny názov výzvy môže byť dlhší a výstižný, no potrebuješ aj krátku verziu. Napr výzva s názvom \"Schudnúť 10 kíl za 3 mesiace\" môže používať štítok \"-10kg\" (Pre viac informácií klikni na \"?\").",
"challengeDescr": "Popis",
"prize": "Odmena",
- "prizePop": "Ak niekto môže \"vyhrať\" tvoju výzvu, môžeš toho víťaza odmeniť drahokamami. Maximálny počet drahokamov = drahokamy ktoré vlastníš (+ drahokamy cechu, ak si vytvoril výzvu v rámci cechu). Poznámka: Túto odmenu neskôr už nemôžeš zmeniť.",
+ "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.",
+ "prizePopTavern": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
"publicChallenges": "Minimum je 1 drahokam pre verejné výzvy (pomáha predísť spamu, naozaj).",
"officialChallenge": "Oficiálna výzva HabitRPG",
"by": "od",
@@ -43,6 +44,7 @@
"selectGroup": "Prosím, vyber skupinu",
"challengeCreated": "Výzva bola úspešne vytvorená",
"sureDelCha": "Zmazať výzvu. Si si istý?",
+ "sureDelChaTavern": "Delete challenge, are you sure? Your gems will not be refunded.",
"removeTasks": "Odstrániť úlohy",
"keepTasks": "Ponechať úlohy",
"closeCha": "Uzavrieť výzvu a...",
diff --git a/common/locales/sk/character.json b/common/locales/sk/character.json
index fb1d8350b8..60ec3d5934 100644
--- a/common/locales/sk/character.json
+++ b/common/locales/sk/character.json
@@ -52,9 +52,11 @@
"costume": "Kostým",
"costumeText": "Ak chceš radšej vyzerať inak, než vyzeráš so svojou aktuálnou bojovou výzbrojou, zaškrtni \"použiť kostým\", aby si si mohol zvoliť oblečenie, ktoré sa ti páči, no zároveň získavať bonusy za svoju najlepšiu bojovú výzbroj.",
"useCostume": "Použiť kostým",
- "gearAchievement": "Získal si odznak \"Najúžasnejší výstroj\" za zakúpenie najlepšieho a najdrahšieho výstroja pre svoje povolanie!",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Najúžasnejší výstroj",
- "ultimGearText": "Vlastní najlepšiu zbraň a brnenie.",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Level",
"levelUp": "Získal si nový level!",
"mana": "Mana",
diff --git a/common/locales/sk/content.json b/common/locales/sk/content.json
index 342f2dd80a..c419731b7a 100644
--- a/common/locales/sk/content.json
+++ b/common/locales/sk/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Elixír zdravia",
"potionNotes": "Vylieči 15 bodov zdravia (okamžité použitie)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "Vlk",
"dropEggWolfAdjective": "verný",
"dropEggTigerCubText": "Tigríček",
diff --git a/common/locales/sk/front.json b/common/locales/sk/front.json
index 59bb1d3271..3103971de9 100644
--- a/common/locales/sk/front.json
+++ b/common/locales/sk/front.json
@@ -172,5 +172,11 @@
"username": "Používateľské meno",
"watchVideos": "Pozri si videá",
"work": "Work",
- "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!"
+ "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",
+ "reportAccountProblems": "Report Account Problems",
+ "reportCommunityIssues": "Report Community Issues",
+ "generalQuestionsSite": "General Questions about the Site",
+ "businessInquiries": "Business Inquiries",
+ "merchandiseInquiries": "Merchandise Inquiries",
+ "marketingInquiries": "Marketing/Social Media Inquiries"
}
\ No newline at end of file
diff --git a/common/locales/sk/gear.json b/common/locales/sk/gear.json
index 7de254b45c..fb22b080bb 100644
--- a/common/locales/sk/gear.json
+++ b/common/locales/sk/gear.json
@@ -120,6 +120,8 @@
"weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
"weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
"weaponMystery201502Notes": "For WINGS! For LOVE! For ALSO TRUTH! Confers no benefit. February 2015 Subscriber Item.",
+ "weaponMystery201505Text": "Green Knight Lance",
+ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "Steampunk Cane",
"weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",
"armor": "armor",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "Who's a penguin? Confers no benefit. December 2014 Subscriber Item.",
"headMystery201501Text": "Starry Helm",
"headMystery201501Notes": "The constellations flicker and swirl in this helm, guiding the wearer's thoughts towards focus. Confers no benefit. January 2015 Subscriber Item.",
+ "headMystery201505Text": "Green Knight Helm",
+ "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 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",
diff --git a/common/locales/sk/generic.json b/common/locales/sk/generic.json
index 54519d20f1..f9d3ab82ef 100644
--- a/common/locales/sk/generic.json
+++ b/common/locales/sk/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitika",
"expandToolbar": "Rozbaliť lištu",
"collapseToolbar": "Zrolovať lištu",
- "formattingMarkdown": "Markdown formátovanie povolené",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*Italics*",
+ "bold": "**Bold**",
+ "strikethrough": "~~Strikethrough~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "Odznaky",
"modalAchievement": "Odznak!",
"special": "Špeciálne",
diff --git a/common/locales/sk/groups.json b/common/locales/sk/groups.json
index 8a9c12af13..581bcce83c 100644
--- a/common/locales/sk/groups.json
+++ b/common/locales/sk/groups.json
@@ -109,5 +109,12 @@
"inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
"byColon": "By:",
"inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "inviteAlertInfo2": "Or share this link (copy/paste):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/sk/npc.json b/common/locales/sk/npc.json
index a7fd56a79d..0630f5a43b 100644
--- a/common/locales/sk/npc.json
+++ b/common/locales/sk/npc.json
@@ -2,8 +2,8 @@
"npc": "NPC",
"npcText": "Podporil projekt na Kickstarteri na najvyššej úrovni!",
"mattBoch": "Matt Boch",
- "mattShall": "Mám priviesť tvojho tátoša, <%= name %>? Klikni na toho, ktorého chceš osedlať.",
- "mattBochText1": "Vitaj v Stajni! Som Matt, pán šeliem. Vyber si zvieratko, ktoré bude stáť po tvojom boku. Ak budeš svoje zvieratká poctivo kŕmiť, raz z nich vyrastú mocné tátoše.",
+ "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
+ "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
"daniel": "Daniel",
"danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
"danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
@@ -45,9 +45,9 @@
"tourScrollDown": "Be sure to scroll all the way down to see all the options! Click on your avatar again to return to the tasks page.",
"tourMuchMore": "When you're done with tasks, you can form a Party with friends, chat in the shared-interest Guilds, join Challenges, and more!",
"tourStatsPage": "This is your Stats page! Earn achievements by completing the listed tasks.",
- "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can freeze your account in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
+ "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
"tourPartyPage": "Your Party will help you stay accountable. Invite friends to unlock a Quest Scroll!",
"tourGuildsPage": "Guilds are social groups with common themes. Search for the subjects that interest you! We recommend the Newbies Guild.",
- "tourChallengesPage": "Joining a Challenge will add tasks to your account. Compete against other users to win gem prizes!",
+ "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
"tourMarketPage": "Starting at Level 4, eggs and hatching potions drop randomly when you complete tasks. They appear here - use them to hatch pets! You can also buy items from the Market."
}
\ No newline at end of file
diff --git a/common/locales/sk/quests.json b/common/locales/sk/quests.json
index a735114646..d6e310c31c 100644
--- a/common/locales/sk/quests.json
+++ b/common/locales/sk/quests.json
@@ -19,7 +19,7 @@
"bossStrength": "Boss Strength",
"collect": "Collect",
"collected": "Nazbieraných",
- "bossDmg1": "To hurt a boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "Len tí, čo sú na výprave môžu bojovať s bossom a podeliť sa o korisť.",
"tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossColl1": "Pre získanie predmetov musíš plniť svoje dobré návyky. Predmety za ukončenie výpravy padajú ako normálne predmety, ale uvidíš ich až nasledujúci deň. Vtedy sa všetko sčíta a pridá na hromadu.",
diff --git a/common/locales/sk/tasks.json b/common/locales/sk/tasks.json
index ee7e0a773b..38a7d1b3f9 100644
--- a/common/locales/sk/tasks.json
+++ b/common/locales/sk/tasks.json
@@ -14,7 +14,7 @@
"save": "Uložiť",
"addChecklist": "Pridať kontrolný zoznam",
"checklist": "Kontrolný zoznam",
- "checklistText": "Pri denných úlohách čiastočne hotové zoznamy redukujú poškodenie. Napríklad: zoznam so 4 položkami, kde sú 3 hotové, zníži poranenie za nesplnenú dennú úlohu, na 25%. Pri jednorázových úlohách zase odfajknuté zoznamy zvyšujú odmenu: 3 odškrtnuté znamená +3x (celkovo 4X) skúseností, zlata a many.",
+ "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
"expandCollapse": "Rozbaliť/zbaliť",
"text": "Text",
"extraNotes": "Poznámky",
@@ -22,7 +22,7 @@
"advancedOptions": "Pokročilé možnosti",
"difficulty": "Obtiažnosť",
"difficultyHelpTitle": "Ako náročná je úloha?",
- "difficultyHelpContent": "Vynásobí hodnotu bodov. Používaj výnimočne, radšej sa spoľahni na náš algoritmy, ktoré organicky upravujú hodnotu. Niektoré úlohy sú ale oveľa cennejšie (Napísať seminárnu prácu vs. Vyčistiť si zuby). Klikni pre viac info.",
+ "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!",
"easy": "Ľahké",
"medium": "Stredné",
"hard": "Ťažké",
diff --git a/common/locales/sr/backgrounds.json b/common/locales/sr/backgrounds.json
index 57aee14d69..03cd18bacc 100644
--- a/common/locales/sr/backgrounds.json
+++ b/common/locales/sr/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "Planinsko jezero",
"backgroundMountainLakeNotes": "Uživajte u lepoti planinskog jezera.",
"backgroundPagodasText": "Pagode",
- "backgroundPagodasNotes": "Popnite se na vrh pagode."
+ "backgroundPagodasNotes": "Popnite se na vrh pagode.",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/sr/challenge.json b/common/locales/sr/challenge.json
index cac5699278..e01930d2db 100644
--- a/common/locales/sr/challenge.json
+++ b/common/locales/sr/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Odaberite pobednika i završite izazov:",
"deleteOrSelect": "Obrisati ili odabrati pobednika",
"endChallenge": "Završiti izazov",
- "challengeDiscription": "Ovo su zadaci izazova. Korisnicima koji ostvare napredak promeniće se boja i dobiće grafikone na kojima možete pratiti uspeh grupe.",
+ "challengeDiscription": "These are the Challenge's tasks that will be added to your task dashboard when you join this Challenge. The sample Challenge tasks below will change color and gain graphs to show you the overall progress of the group.",
"hows": "Kako nam ide?",
"filter": "Filter",
"groups": "Grupe",
@@ -33,7 +33,8 @@
"challengeTagPop": "Izazovi treba da se vide na spiskovima tagova i na opisima zadataka. Zato Vam je, pored jasnog naziva u polju „Naziv izazova“, potreban i kratki naziv. Npr. „Skinuti 10 funti za 3 meseca“ mogli biste da skratite u „-10lb“. (Kliknite za detaljniji opis)",
"challengeDescr": "Opis",
"prize": "Nagrada",
- "prizePop": "Ako neko „pobedi“, možete mu dati dragulje kao nagradu. Maksimalna vrednost nagrade je broj draguljia u Vašem inventaru (+dragulji Vašeg udruženja, ako ste Vi osnivač). Napomena: Vrednost nagrade ne možete kasnije promeniti, niti će Vam dragulji biti vraćeni ako poništite izazov.",
+ "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.",
+ "prizePopTavern": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
"publicChallenges": "Minimalno 1 dragulj za javne izazove . Pomaže da se spreči spam (zaista pomaže).",
"officialChallenge": "Zvanični HabitRPG izazov",
"by": "Izazivač: ",
@@ -43,6 +44,7 @@
"selectGroup": "Izaberite grupu",
"challengeCreated": "Izazov napravljen",
"sureDelCha": "Jeste li sigurni da želite da obrišete izazov?",
+ "sureDelChaTavern": "Delete challenge, are you sure? Your gems will not be refunded.",
"removeTasks": "Obriši zadatak",
"keepTasks": "Zadrži zadatak",
"closeCha": "Zatvori izazov i...",
diff --git a/common/locales/sr/character.json b/common/locales/sr/character.json
index a4667b1f79..1bbed76942 100644
--- a/common/locales/sr/character.json
+++ b/common/locales/sr/character.json
@@ -52,9 +52,11 @@
"costume": "Kostim",
"costumeText": "Ako niste zadovoljni izgledom svoje opreme, izaberite „Koristi kostim“ da biste obukli kostim preko borbene opreme.",
"useCostume": "Kostim",
- "gearAchievement": "Osvojili ste odlikovanje „Vrhunska oprema“ jer ste obukli najjaču opremu.",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Vrhunska oprema",
- "ultimGearText": "Unapredili ste oružje i oklop do maksimalnog nivoa.",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Nivo",
"levelUp": "Novi nivo!",
"mana": "Mana",
@@ -70,7 +72,7 @@
"allocatePerPop": "Dodaj poen Opažanju",
"allocateInt": "Poeni dodeljeni Inteligenciji:",
"allocateIntPop": "Dodaj poen Inteligenciji",
- "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue leveling up, or start a new adventure at level 1 by using the Orb of Rebirth, now available for free in the Market.",
+ "noMoreAllocate": "Dostigli ste 100. nivo, i više nećete dobijati poene koje biste dodeljivali svojim osobinama. Možete i dalje da dobijate nivoe, ili da upotrebite Sferu za Reinkarnaciju, koju ćete naći na Pijaci, i da započnete novu avanturu od 1. nivoa.",
"stats": "Karakteristike",
"strength": "Snaga",
"strengthText": "Snaga povećava šansu da zadate kritični udarac, kao i Zlato, Iskustvo i predmete koje od takvih udaraca dobijate. Takođe pomaže u borbi protiv bosova.",
diff --git a/common/locales/sr/content.json b/common/locales/sr/content.json
index 1b190a5d5e..2381dc523d 100644
--- a/common/locales/sr/content.json
+++ b/common/locales/sr/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Napitak zdravlja",
"potionNotes": "Vraća 15 poena zdravlja (koristi se odmah)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "Vuk",
"dropEggWolfAdjective": "odani",
"dropEggTigerCubText": "Mladunče tigra",
@@ -56,8 +60,8 @@
"questEggBunnyAdjective": "mekani",
"questEggSlimeText": "Beli slez",
"questEggSlimeAdjective": "slatki",
- "questEggSheepText": "Sheep",
- "questEggSheepAdjective": "woolly",
+ "questEggSheepText": "Ovca",
+ "questEggSheepAdjective": "vunasta",
"eggNotes": "Nađite napitak, pospite ga po ovom jajetu, i iz njega će se izleći <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
"hatchingPotionBase": "Običan",
"hatchingPotionWhite": "Beli",
diff --git a/common/locales/sr/front.json b/common/locales/sr/front.json
index 45340d927c..e30632f4a2 100644
--- a/common/locales/sr/front.json
+++ b/common/locales/sr/front.json
@@ -172,5 +172,11 @@
"username": "Korisničko ime",
"watchVideos": "Video prezentacija",
"work": "Posao",
- "zelahQuote": "Pomisao da ću dobiti poene ako na vreme završim dan, ili izgubiti zdravlje ako ostanem budan do u kasne sate, pomaže mi da na vreme odem na spavanje."
+ "zelahQuote": "Pomisao da ću dobiti poene ako na vreme završim dan, ili izgubiti zdravlje ako ostanem budan do u kasne sate, pomaže mi da na vreme odem na spavanje.",
+ "reportAccountProblems": "Report Account Problems",
+ "reportCommunityIssues": "Report Community Issues",
+ "generalQuestionsSite": "General Questions about the Site",
+ "businessInquiries": "Business Inquiries",
+ "merchandiseInquiries": "Merchandise Inquiries",
+ "marketingInquiries": "Marketing/Social Media Inquiries"
}
\ No newline at end of file
diff --git a/common/locales/sr/gear.json b/common/locales/sr/gear.json
index ee53e2088e..6cc48f5b87 100644
--- a/common/locales/sr/gear.json
+++ b/common/locales/sr/gear.json
@@ -120,6 +120,8 @@
"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",
"weaponMystery201502Notes": "Za KRILA! Za LJUBAV! Za ISTINU, TAKOĐE! Ne daje nikakav bonus. Predmet za pretplatnike februar 2015.",
+ "weaponMystery201505Text": "Green Knight Lance",
+ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "Stimpank štap",
"weaponMystery301404Notes": "Odličan za šetnju po gradu. Predmet za pretplatnike mart 3015. Ne daje nikakav bonus.",
"armor": "oklop",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "Ko je to postao pingvin? Ne daje nikakav bonus. Predmet za pretplatnike decembar 2014.",
"headMystery201501Text": "Zvezdani šlem",
"headMystery201501Notes": "Sazvežđa trepere i kovitlaju se unutar ovog šlema, i usmeravaju vlanikove misli da bi lakše mogao da se koncentriše. Predmet za pretplatnike Januar 2015.",
+ "headMystery201505Text": "Green Knight Helm",
+ "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 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",
diff --git a/common/locales/sr/generic.json b/common/locales/sr/generic.json
index 41fc09c497..d26c6c29be 100644
--- a/common/locales/sr/generic.json
+++ b/common/locales/sr/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitika",
"expandToolbar": "Pokaži traku s alatima",
"collapseToolbar": "Sakrij traku s alatima",
- "formattingMarkdown": "Dozvoljeno Markdown formatiranje",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*Italics*",
+ "bold": "**Bold**",
+ "strikethrough": "~~Strikethrough~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "Odlikovanja",
"modalAchievement": "Odlikovanje!",
"special": "Specijalno",
diff --git a/common/locales/sr/groups.json b/common/locales/sr/groups.json
index b07db0f113..5e931164e2 100644
--- a/common/locales/sr/groups.json
+++ b/common/locales/sr/groups.json
@@ -102,12 +102,19 @@
"messageWroteIn": "<%= user %> je napisao u <%= group %>",
"msgPreviewHeading": "Pregled poruke",
"leaderOnlyChallenges": "Samo vođa grupe može da napravi izazov",
- "sendGift": "Send Gift",
- "inviteFriends": "Invite Friends",
- "inviteAlertInfo": "Invite friends by User ID here.",
- "inviteExistUser": "Invite Existing User",
- "inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
- "byColon": "By:",
- "inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "sendGift": "Poslati poklon",
+ "inviteFriends": "Pozvati prijatelje",
+ "inviteAlertInfo": "Ovde možete pozvati prijatelje ako znate njihov UID",
+ "inviteExistUser": "Pozvati registrovanog korisnika",
+ "inviteByEmail": "Pozovite prijatelje imejlom. Ako se registruju preko linka iz poruke, automatski će biti pozvani u ovu grupu.",
+ "byColon": "Od:",
+ "inviteNewUsers": "Pozvati nove korisnike",
+ "inviteAlertInfo2": "Ili pošaljilte ovaj link (copy/paste):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/sr/npc.json b/common/locales/sr/npc.json
index a3aabce92a..787c29d675 100644
--- a/common/locales/sr/npc.json
+++ b/common/locales/sr/npc.json
@@ -2,8 +2,8 @@
"npc": "NPC",
"npcText": "Pružio maksimalnu podršku na Kickstarter-u!",
"mattBoch": "Met Bok",
- "mattShall": "Želite li da jašete, <%= name %>? Odaberite zver, i spremni ste.",
- "mattBochText1": "Dobro došli u Štalu! Ja sam Met, krotitelj zveri. Odaberite zver koja će putovati uz Vas. Ako je budete hranili, izrašće u veliku životinju, koju ćete moći da jašete.",
+ "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
+ "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
"daniel": "Danijel",
"danielText": "Dobro došli u Krčmu! Smestite se i upoznajte se s meštanima. Ako poželite da se odmorite (ako idete na put, ili se razbolite), naći ću Vam slobodnu sobu u Gostionici. Dok ste naš gost, nećete trpeti štetu od neurađenih zadataka, ali ćete i dalje moći da ih obeležite kao urađene.",
"danielText2": "Upozorenje: Ako učestvujete u borbi protiv bosa, trpećete štetu zbog propuštenih zadataka ostalih članova Vaše družine! Takođe, šteta koju nanesete bosu neće se videti dok ne napustite Gostionicu, niti će se predmeti koje nađete pojaviti u Vašem inventaru.",
@@ -45,9 +45,9 @@
"tourScrollDown": "Pregledajte celu stranicu i upoznajte se s opcijama. Kliknite na avatar da biste se vratili na stranicu sa zadacima.",
"tourMuchMore": "Kad završite sa zadacima, možete da organizujete Družinu sa prijateljima, da četujete u Udruženjima koja Vas interesuju, da učestvujete u izazovima, i još mnogo toga!",
"tourStatsPage": "Ovo je stranica sa karakteristikama Vašeg avatara. Osvojite odlikovanja izvršavanjem zadataka sa spiska.",
- "tourTavernPage": "Dobro došli u Krčmu, čet sobu za sve uzraste. Ako krenete na put, ili se razbolite, klikom na „Odmorite se u Gostionici” možete da zamrznete svoj nalog. Uđite i predstavite se ostalim igračima!",
+ "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
"tourPartyPage": "Družina će Vam pomoći da ostanete posvećeni svojim ciljevima. Pozovite prijatelje da biste otključali svitke s misijama.",
"tourGuildsPage": "Udruženja su grupe ljudi sa zajedničkim interesovanjima. Nađite udruženja koja Vam se dopadaju. Preporučujemo Vam Udruženje početnika (Newbies Guild).",
- "tourChallengesPage": "Kad se priključite nekom izazovu, na Vaš nalog će biti dodati zadaci. Takmičite se s ostalim korisnicima i osvojite dragulje!",
+ "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
"tourMarketPage": "Kad dostignete 4. nivo, počećete da nalazite jaja i napitke za izleganje kad budete završavali zadatke. Oni će se pojaviti ovde – koristite ih da biste dobili zveri! Iste te predmete možete kupiti na Pijaci."
}
\ No newline at end of file
diff --git a/common/locales/sr/quests.json b/common/locales/sr/quests.json
index 70ac1767d1..446fa6beaa 100644
--- a/common/locales/sr/quests.json
+++ b/common/locales/sr/quests.json
@@ -6,8 +6,8 @@
"questSend": "Klikom na „Pozvati“ poslaćete pozivnice članovima svoje družine. Misija počinje kad svi članovi odgovore. Pogledajte stanje u Opcije > Zajednica > Družina.",
"inviteParty": "Pozvati družinu",
"questInvitation": "Poziv u misiju:",
- "questInvitationTitle": "Quest Invitation",
- "questInvitationInfo": "Invitation for the Quest <%= quest %>",
+ "questInvitationTitle": "Poziv u misiju",
+ "questInvitationInfo": "Poziv u misiju <%= quest %>",
"askLater": "Pitati kasnije",
"buyQuest": "Kupiti misiju",
"accepted": "Prihvaćeno",
@@ -19,7 +19,7 @@
"bossStrength": "Snaga Bosa",
"collect": "Sakupiti",
"collected": "Sakupljeno",
- "bossDmg1": "Završavajte svoje Svakodnevne i Jednokratne zadatke da biste naneli štetu bosu. Zadaci sa većom štetom više će povrediti bosa (crveni zadaci, magije Čarobnjaka, napadi Ratnika, itd). Za svaki propušten Svakodnevni zadatak bos nanosi štetu svakom učesniku misije (šteta od zadatka pomnožena sa snagom bosa) povrh normalne štete od zadatka. Završavajte Svakodnevne zadatke kako bi vaša družina bila zdrava. Sva šteta koju bos primi i nanese obračunava se na kraju dana.(odnosno u trenutku smene između dva dana).",
+ "bossDmg1": "Završavajte svoje Svakodnevne i Jednokratne zadatke da biste naneli štetu bosu. Crveni zadaci, Vatra, i Divlji udarac načiniće još veću štetu. Za svaki propušten Svakodnevni zadatak bos nanosi štetu svakom učesniku misije (šteta od zadatka pomnožena sa snagom bosa) povrh normalne štete od zadatka. Završavajte Svakodnevne zadatke kako bi vaša družina bila zdrava. Sva šteta koju bos primi i nanese obračunava se na kraju dana.(odnosno u trenutku smene između dva dana).",
"bossDmg2": "Samo učesnici će se boriti protiv bosa i dobiti deo plena.",
"tavernBossInfo": "Završavajte svoje Svakodnevne i Jednokrate zadatke da biste naneli štetu bosu. Zadaci sa većom štetom više će povrediti bosa (crveni zadaci, magije Čarobnjaka, napadi Ratnika, itd). Bos dobija Bes za svaki propušten Svakodnevni zadatak (pomnoženo sa snagom bosa). Kad Bes dostigne maksimalnu vrednost, desiće se nešto loše. Zato završavajte Svakodnevne zadatke. Sva šteta koju bos primi i nanese obračunava se na kraju dana.(odnosno u trenutku smene između dva dana).",
"bossColl1": "Da biste dobili predmete, radite pozitivne zadatke.Na misiji predmeti padaju na isti način kao i inače, ali nećete moći da ih vidite do sledećeg dana, kad će svi nađeni predmeti biti sakupljeni na gomilu.",
diff --git a/common/locales/sr/settings.json b/common/locales/sr/settings.json
index ac8235764b..a273b476ec 100644
--- a/common/locales/sr/settings.json
+++ b/common/locales/sr/settings.json
@@ -93,7 +93,7 @@
"wonChallenge": "Savladali ste izazov",
"newPM": "Primljena privatna poruka",
"giftedGems": "Poklonjeni dragulji",
- "giftedGemsInfo": "<%= amount %> Gems - by <%= name %>",
+ "giftedGemsInfo": "<%= amount %> Dragulja - od <%= name %>",
"giftedSubscription": "Poklonjena pretplata",
"invitedParty": "Poziv u družinu",
"invitedGuild": "Poziv u udruženje",
diff --git a/common/locales/sr/tasks.json b/common/locales/sr/tasks.json
index 1d12317895..248f2f5da7 100644
--- a/common/locales/sr/tasks.json
+++ b/common/locales/sr/tasks.json
@@ -14,7 +14,7 @@
"save": "Sačuvati",
"addChecklist": "Dodati spisak",
"checklist": "Spisak",
- "checklistText": "Izgubićete manje zdravlja ako uradite deo svakodnevnog zadatka, nego ako ne uradite ništa. Npr. ako sa spiska od 4 stavke uradite 3, šteta koju ćete pretrpeti biće smanjena na 25%. Kod jednokratnih zadataka, svaka završena stavka uvećava koeficijent s kojim se množi nagrada, tako da se kod spiska sa 3 izvršene stavke koeficijent uvećava za 3 (posle čega iznosi 4).",
+ "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
"expandCollapse": "Otvoriti/Zatvoriti",
"text": "Tekst",
"extraNotes": "Objašnjenje",
@@ -22,7 +22,7 @@
"advancedOptions": "Napredna podešavanja",
"difficulty": "Težina",
"difficultyHelpTitle": "Koliko je težak ovaj zadatak?",
- "difficultyHelpContent": "Ove opcije umnožavaju vrednost nagrade. Uglavnom nije potrebno da ih koristite, jer HabitRPG ima algoritme koji proračunavaju težinu zadatka. Koristite ove opcije kod zadataka koji su mnogo vredniji od ostalih (npr. „Napisati diplomski rad“ mnogo je teži zadatak nego „oprati zube“).",
+ "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!",
"easy": "Lako",
"medium": "Normalno",
"hard": "Teško",
diff --git a/common/locales/sv/backgrounds.json b/common/locales/sv/backgrounds.json
index 101b12a9f1..3054553781 100644
--- a/common/locales/sv/backgrounds.json
+++ b/common/locales/sv/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "Bergsjö",
"backgroundMountainLakeNotes": "Doppa tårna i Bergssjön.",
"backgroundPagodasText": "Pagoder",
- "backgroundPagodasNotes": "Klättra till toppen av Pagoderna."
+ "backgroundPagodasNotes": "Klättra till toppen av Pagoderna.",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/sv/challenge.json b/common/locales/sv/challenge.json
index 1d8677e47a..300facc3bb 100644
--- a/common/locales/sv/challenge.json
+++ b/common/locales/sv/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Välj en vinnare och avsluta utmaningen:",
"deleteOrSelect": "Ta bort eller välj vinnare",
"endChallenge": "Avsluta utmaning",
- "challengeDiscription": "Det här är utmaningens uppgifter. Allt eftersom användare deltar kommer de att ändra färg och få diagram som visar gruppens samlade framsteg.",
+ "challengeDiscription": "These are the Challenge's tasks that will be added to your task dashboard when you join this Challenge. The sample Challenge tasks below will change color and gain graphs to show you the overall progress of the group.",
"hows": "Hur går det för alla?",
"filter": "Filter",
"groups": "Grupper",
@@ -33,7 +33,8 @@
"challengeTagPop": "Utmaningar syns på tagglistor och uppgiftens verktygstips. Så du behöver en beskrivande titel, men även ett 'kort namn'. T.ex. 'Gå ner 5 kilo på 3 månader' som kan förkortas till '-5kg' (Klicka för mer information).",
"challengeDescr": "Beskrivning",
"prize": "Vinst",
- "prizePop": "Om någon kan 'vinna' din utmaning kan du valfritt tilldela den vinnaren ett pris i Juveler. Max = #Juveler du äger (+ Gillets Juveler om du skapade Gillet som håller utmaningen) Notera: Detta pris kan inte ändras senare och kommer inte återbetalas om utmaningen är inställd.",
+ "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.",
+ "prizePopTavern": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
"publicChallenges": "Minst 1 Juvel för offentliga utmaningar (motverkar spam).",
"officialChallenge": "Officiell HabitRPG-utmaning",
"by": "av",
@@ -43,6 +44,7 @@
"selectGroup": "Var vänlig välj grupp",
"challengeCreated": "Utmaning skapad",
"sureDelCha": "Är du säker på att du vill ta bort utmaningen?",
+ "sureDelChaTavern": "Delete challenge, are you sure? Your gems will not be refunded.",
"removeTasks": "Ta bort uppgifter",
"keepTasks": "Ha kvar uppgifter",
"closeCha": "Avsluta utmaning och...",
diff --git a/common/locales/sv/character.json b/common/locales/sv/character.json
index ec778cb128..ce81825644 100644
--- a/common/locales/sv/character.json
+++ b/common/locales/sv/character.json
@@ -52,9 +52,11 @@
"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",
- "gearAchievement": "Du har förtjänat prestationen \"Ultimat Urustning\" för att ha uppgraderat din utrustning till max!",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Ultimat Utrustning",
- "ultimGearText": "Har uppgraderat till den maximala vapen- och rustningsuppsättningen.",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Level",
"levelUp": "Level upp!",
"mana": "Mana",
diff --git a/common/locales/sv/content.json b/common/locales/sv/content.json
index 4f30d3207e..7152b78c1f 100644
--- a/common/locales/sv/content.json
+++ b/common/locales/sv/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Hälsodryck",
"potionNotes": "Återställ 15 Hälsopoäng (Omedelbar Användning)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "Varg",
"dropEggWolfAdjective": "lojal",
"dropEggTigerCubText": "Tigerunge",
diff --git a/common/locales/sv/front.json b/common/locales/sv/front.json
index 154aa650a7..d5c3e92b5d 100644
--- a/common/locales/sv/front.json
+++ b/common/locales/sv/front.json
@@ -172,5 +172,11 @@
"username": "Användarnamn",
"watchVideos": "Se videor",
"work": "Work",
- "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!"
+ "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",
+ "reportAccountProblems": "Report Account Problems",
+ "reportCommunityIssues": "Report Community Issues",
+ "generalQuestionsSite": "General Questions about the Site",
+ "businessInquiries": "Business Inquiries",
+ "merchandiseInquiries": "Merchandise Inquiries",
+ "marketingInquiries": "Marketing/Social Media Inquiries"
}
\ No newline at end of file
diff --git a/common/locales/sv/gear.json b/common/locales/sv/gear.json
index 88cc01918f..ac873fba78 100644
--- a/common/locales/sv/gear.json
+++ b/common/locales/sv/gear.json
@@ -114,12 +114,14 @@
"weaponSpecialSpring2015WarriorNotes": "It is a real bone club for real fierce doggies and is definitely not a chew toy that the Seasonal Sorceress gave you because who's a good doggy? Whoooo's a good doggy?? It's you!!! You're a good doggy!!! Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.",
"weaponSpecialSpring2015MageText": "Magikerns stav",
"weaponSpecialSpring2015MageNotes": "Conjure yourself up a carrot with this fancy wand. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Spring Gear.",
- "weaponSpecialSpring2015HealerText": "Cat Rattle",
- "weaponSpecialSpring2015HealerNotes": "When you wave it, it makes a fascinating clickety noise that would keep ANYONE entertained for hours. Increases Intelligence by <%= int %>. Limited Edition 2015 Spring Gear.",
+ "weaponSpecialSpring2015HealerText": "Katt skallra",
+ "weaponSpecialSpring2015HealerNotes": "Når du skakar den har den ett fascinerande clickande ljud som skulle kunna hålla VEM SOM HELST underhållen i timtal. Ökar intelligens med <%= int %>. Begränsad vår utgåva 2015 av vår utrustning.",
"weaponMystery201411Text": "Måltidernas högaffel",
"weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
"weaponMystery201502Text": "Glittrig Bevingad Stav av Kärlek och Också Sanning",
- "weaponMystery201502Notes": "For WINGS! For LOVE! For ALSO TRUTH! Confers no benefit. February 2015 Subscriber Item.",
+ "weaponMystery201502Notes": "För VINGAR! För KÄRLEK! För OCKSÅ SANNING! Ger ingen fördel. Februari 2015 prenumerantobjekt.",
+ "weaponMystery201505Text": "Green Knight Lance",
+ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "Steampunk-käpp.",
"weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",
"armor": "utrustning",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "Who's a penguin? Confers no benefit. December 2014 Subscriber Item.",
"headMystery201501Text": "Tindrande hjälm",
"headMystery201501Notes": "The constellations flicker and swirl in this helm, guiding the wearer's thoughts towards focus. Confers no benefit. January 2015 Subscriber Item.",
+ "headMystery201505Text": "Green Knight Helm",
+ "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 2015 Subscriber Item.",
"headMystery301404Text": "Stilig cylinderhatt",
"headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
"headMystery301405Text": "Vanlig cylinderhatt",
@@ -466,8 +470,8 @@
"bodySpecialSummerHealerText": "Korallkrage",
"bodySpecialSummerHealerNotes": "Ett stiligt halsband av levande korall! Ger inga fördelar. Begränsad utgåva 2014 sommarutrustning.",
"headAccessory": "huvudtillbehör",
- "accessories": "Accessories",
- "animalEars": "Animal Ears",
+ "accessories": "Accessoarer",
+ "animalEars": "Djur öron",
"headAccessoryBase0Text": "Inget huvudtillbehör",
"headAccessoryBase0Notes": "Inget huvudtillbehör.",
"headAccessorySpecialSpringRogueText": "Lila kattöron",
@@ -483,25 +487,25 @@
"headAccessorySpecialSpring2015WarriorText": "Lila hundöron",
"headAccessorySpecialSpring2015WarriorNotes": "De är lila. De är hundöron. Slösa inte din tid med ytterligare fånigheter. Ger ingen fördel. Begränsad utgåva 2015 Vårutrustning.",
"headAccessorySpecialSpring2015MageText": "Blåa kaninöron",
- "headAccessorySpecialSpring2015MageNotes": "These ears listen keenly, in case somewhere a magician is revealing secrets. Confers no benefit. Limited Edition 2015 Spring Gear.",
+ "headAccessorySpecialSpring2015MageNotes": "De här öronen lyssnar ivrigt ifall någon magiker skulle avslöjar hemligheter någonstans. Ger ingen fördel. Begränsad utgåva 2015 vår utrustning.",
"headAccessorySpecialSpring2015HealerText": "Gröna kattöron",
- "headAccessorySpecialSpring2015HealerNotes": "These cute kitty ears will make others green with envy. Confers no benefit. Limited Edition 2015 Spring Gear.",
- "headAccessoryBearEarsText": "Bear Ears",
- "headAccessoryBearEarsNotes": "These ears make you look like a cuddly bear! Confers no benefit.",
- "headAccessoryCactusEarsText": "Cactus Ears",
- "headAccessoryCactusEarsNotes": "These ears make you look like a prickly cactus! Confers no benefit.",
- "headAccessoryFoxEarsText": "Fox Ears",
- "headAccessoryFoxEarsNotes": "These ears make you look like a wily fox! Confers no benefit.",
- "headAccessoryLionEarsText": "Lion Ears",
- "headAccessoryLionEarsNotes": "These ears make you look like a regal lion! Confers no benefit.",
- "headAccessoryPandaEarsText": "Panda Ears",
- "headAccessoryPandaEarsNotes": "These ears make you look like a gentle panda! Confers no benefit.",
- "headAccessoryPigEarsText": "Pig Ears",
- "headAccessoryPigEarsNotes": "These ears make you look like a whimsical pig! Confers no benefit.",
- "headAccessoryTigerEarsText": "Tiger Ears",
- "headAccessoryTigerEarsNotes": "These ears make you look like a fierce tiger! Confers no benefit.",
- "headAccessoryWolfEarsText": "Wolf Ears",
- "headAccessoryWolfEarsNotes": "These ears make you look like a loyal wolf! Confers no benefit.",
+ "headAccessorySpecialSpring2015HealerNotes": "De här kattunge-öronen kommer göra andra gröna av avund! Ger ingen fördel. Begränsad utgåva 2015 vår utrustning.",
+ "headAccessoryBearEarsText": "Björn öron",
+ "headAccessoryBearEarsNotes": "De här öronen får dig att se ut som en gosig björn! Ger ingen fördel.",
+ "headAccessoryCactusEarsText": "Kaktus öron",
+ "headAccessoryCactusEarsNotes": "De här öronen får dig att se ut som en stickig kaktus! Ger ingen fördel.",
+ "headAccessoryFoxEarsText": "Räv öron",
+ "headAccessoryFoxEarsNotes": "De här öronen får dig att se ut som en listig räv! Ger ingen fördel.",
+ "headAccessoryLionEarsText": "Lejon öron",
+ "headAccessoryLionEarsNotes": "De här öronen får dig att se ut som ett kungligt lejon! Ger ingen fördel.",
+ "headAccessoryPandaEarsText": "Panda öron",
+ "headAccessoryPandaEarsNotes": "De här öronen får dig att se ut som en vänlig panda! Ger ingen fördel.",
+ "headAccessoryPigEarsText": "Gris öron",
+ "headAccessoryPigEarsNotes": "De här öronen får dig att se ut som en egendomlig gris! Ger ingen fördel.",
+ "headAccessoryTigerEarsText": "Tiger öron",
+ "headAccessoryTigerEarsNotes": "De här öronen får dig att se ut som en vildsint tiger! Ger ingen fördel.",
+ "headAccessoryWolfEarsText": "Varg öron",
+ "headAccessoryWolfEarsNotes": "De här öronen får dig att se ur som en lojal varg! Ger ingen fördel.",
"headAccessoryMystery201403Text": "Skogsvandrarhorn",
"headAccessoryMystery201403Notes": "These antlers shimmer with moss and lichen. Confers no benefit. March 2014 Subscriber Item.",
"headAccessoryMystery201404Text": "Twilight Butterfly Antennae",
@@ -519,11 +523,11 @@
"eyewearSpecialSummerWarriorText": "Dashing Eyepatch",
"eyewearSpecialSummerWarriorNotes": "It doesn't take a rapscallion to see how stylish this is! Confers no benefit. Limited Edition 2014 Summer Gear.",
"eyewearSpecialWonderconRedText": "Mäktig mask",
- "eyewearSpecialWonderconRedNotes": "What a powerful face accessory! Confers no benefit. Special Edition Convention Item.",
+ "eyewearSpecialWonderconRedNotes": "Vilket kraftfullt ansikts tillbehör! Ger ingen fördel. ???",
"eyewearSpecialWonderconBlackText": "Lömsk mask",
"eyewearSpecialWonderconBlackNotes": "Your motives are definitely legitimate. Confers no benefit. Special Edition Convention Item.",
"eyewearMystery201503Text": "Aquamarine Eyewear",
- "eyewearMystery201503Notes": "Don't get poked in the eye by these shimmering gems! Confers no benefit. March 2015 Subscriber Item.",
+ "eyewearMystery201503Notes": "Bli inte petad i ögat av de här shimrande juvelerna! Ger ingen fördel. Mars 2015 prenumerantobjekt.",
"eyewearMystery301404Text": "Eyewear Goggles",
"eyewearMystery301404Notes": "Inget ögonskydd skulle kunna vara stiligare än ett par glasögon - förutom, möjligtvis, en monokel. Ger inga fördelar. April 2015 prenumerationsföremål.",
"eyewearMystery301405Text": "Monokel",
diff --git a/common/locales/sv/generic.json b/common/locales/sv/generic.json
index 5c0f1efb82..136dfbba2b 100644
--- a/common/locales/sv/generic.json
+++ b/common/locales/sv/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitica",
"expandToolbar": "Expandera Verktygsfält",
"collapseToolbar": "Fäll ihop Verktygsfält",
- "formattingMarkdown": "Markdown-formattering tillåten",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*Italics*",
+ "bold": "**Bold**",
+ "strikethrough": "~~Strikethrough~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "Prestationer",
"modalAchievement": "Prestation!",
"special": "Special",
diff --git a/common/locales/sv/groups.json b/common/locales/sv/groups.json
index 117b7982a7..f8521d599d 100644
--- a/common/locales/sv/groups.json
+++ b/common/locales/sv/groups.json
@@ -109,5 +109,12 @@
"inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
"byColon": "By:",
"inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "inviteAlertInfo2": "Or share this link (copy/paste):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/sv/npc.json b/common/locales/sv/npc.json
index 774638d4b1..e625777cc3 100644
--- a/common/locales/sv/npc.json
+++ b/common/locales/sv/npc.json
@@ -2,8 +2,8 @@
"npc": "NPC",
"npcText": "Stödde Kickstarter-projektet på högsta nivån!",
"mattBoch": "Matt Boch",
- "mattShall": "Ska jag hämta din springare, <%= name %>? Klicka på ett riddjur för att sadla upp.",
- "mattBochText1": "Välkommen till Stallet! Jag är Matt, Djurmästaren. Välj ett husdjur att ha bredvid dig på din resa. Mata dem så växer de till kraftfulla springare.",
+ "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
+ "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
"daniel": "Daniel",
"danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
"danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
@@ -45,9 +45,9 @@
"tourScrollDown": "Scrolla hela vägen ner för att se alla alternativ! Klicka på din avatar igen för att återvända till uppdragen.",
"tourMuchMore": "When you're done with tasks, you can form a Party with friends, chat in the shared-interest Guilds, join Challenges, and more!",
"tourStatsPage": "This is your Stats page! Earn achievements by completing the listed tasks.",
- "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can freeze your account in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
+ "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
"tourPartyPage": "Ditt sällskap kommer hjälpa dig att hålla dig ansvarfull. Bjud in vänner för att låsa upp en uppdragsskriftrulle.",
"tourGuildsPage": "Gillen är sociala grupper med gemensamma teman. Sök på ämnen som intresserar dig! Vi rekommenderar Nybörjargillet.",
- "tourChallengesPage": "Joining a Challenge will add tasks to your account. Compete against other users to win gem prizes!",
+ "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
"tourMarketPage": "Från och med Level 4 kommer ägg och kläckningsbrygder droppa slumpmässigt när du klarar av uppgifter. De syns här - använd de till att kläcka husdjur! Du kan även köpa föremål på Marknaden."
}
\ No newline at end of file
diff --git a/common/locales/sv/quests.json b/common/locales/sv/quests.json
index 5ca7745708..f8c15c4b85 100644
--- a/common/locales/sv/quests.json
+++ b/common/locales/sv/quests.json
@@ -19,7 +19,7 @@
"bossStrength": "Bossstyrka",
"collect": "Samla",
"collected": "Samlade",
- "bossDmg1": "To hurt a boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "Bara deltagare kommer strida mot bossen och dela på uppdragsbytet.",
"tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossColl1": "För att samla föremål, fullborda dina positiva uppgifter. Uppdragsföremål droppar precis som vanliga föremål, men du kommer inte se dem innan nästa dag. Då kommer allt du hittat att räknas ihop och läggas på högen.",
diff --git a/common/locales/sv/tasks.json b/common/locales/sv/tasks.json
index 281129663b..9eabee36d8 100644
--- a/common/locales/sv/tasks.json
+++ b/common/locales/sv/tasks.json
@@ -14,7 +14,7 @@
"save": "Spara",
"addChecklist": "Lägg till Checklista",
"checklist": "Checklista",
- "checklistText": "För Dagliga Uppgifter så kommer delvis färdiga checklistor minska skada. Till exempel, en lista med 3 av 4 avbockade uppgifter reducerar skadan för den ofullbordade Dagliga Uppgiften till 25%. Fullbordade uppgifter på en Att-Göra-lista ger en multiplikator: 3 avbockade uppgifter betyder +3x (totalt 4x) Erfarenhet, Guld och Mana.",
+ "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
"expandCollapse": "Expandera/Förminska",
"text": "Text",
"extraNotes": "Extra Anteckningar",
@@ -22,7 +22,7 @@
"advancedOptions": "Avancerade Alternativ",
"difficulty": "Svårighetsgrad",
"difficultyHelpTitle": "Hur svår är den här uppgiften?",
- "difficultyHelpContent": "Detta multiplicerar dess poängvärde. Använd sparsamt, förlita dig istället på våra organiska värdesjusteringsalgoritmer. Men vissa uppgifter är otroligt mycket mer värdefulla (\"Skriv Avhandling\" vs \"Borsta Tänderna\"). Klicka för mer info.",
+ "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!",
"easy": "Lätt",
"medium": "Medium",
"hard": "Svår",
diff --git a/common/locales/uk/backgrounds.json b/common/locales/uk/backgrounds.json
index b927173dd9..a70d7de7fd 100644
--- a/common/locales/uk/backgrounds.json
+++ b/common/locales/uk/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "Гірське озеро",
"backgroundMountainLakeNotes": "Перевірте, як водичка в Гірському озері.",
"backgroundPagodasText": "Пагоди",
- "backgroundPagodasNotes": "Вилізьте на вершини Пагод."
+ "backgroundPagodasNotes": "Вилізьте на вершини Пагод.",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/uk/challenge.json b/common/locales/uk/challenge.json
index b6ac28604b..a47ea21e48 100644
--- a/common/locales/uk/challenge.json
+++ b/common/locales/uk/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "Обрати переможця та закрити випробування:",
"deleteOrSelect": "Вилучити або обрати переможця",
"endChallenge": "Закінчити випробування",
- "challengeDiscription": "Це завдання з випробування. Залежно від дій користувачів, змінюватиметься колір завдань та з'являться ґрафіки, які покажуть поступ гурту.",
+ "challengeDiscription": "These are the Challenge's tasks that will be added to your task dashboard when you join this Challenge. The sample Challenge tasks below will change color and gain graphs to show you the overall progress of the group.",
"hows": "Як там усі маєте?",
"filter": "Вибірка",
"groups": "Ватагами",
@@ -33,7 +33,8 @@
"challengeTagPop": "Випробування з'являються у переліках з ярликами та панелях. Згори йде опис, а знизу — скорочення. Наприклад: „скинути 10 фунтів за 3 місяці“ позначиться „-10 фнт.“ (Клацніть для довідки).",
"challengeDescr": "Опис",
"prize": "Винагорода",
- "prizePop": "Якщо хтось може „перемогти“ у вашому випробуванні, ви можете призначити переможцеві винагороду у самоцвітах. Max = #gems ваших власних (+ guild.gems, якщо ви створили випробування в гільдії). Зауважте: цю винагороду не можна буде потім змінити і, у разі відхилення випробування, її не буде відшкодовано.",
+ "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.",
+ "prizePopTavern": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
"publicChallenges": "Щонайменше 1 самоцвіт для громадських випробувань (допомагає запобігти спаму, справді).",
"officialChallenge": "Офіційне випробування HabitRPG",
"by": "від",
@@ -43,6 +44,7 @@
"selectGroup": "Будь ласка, оберіть групу",
"challengeCreated": "Випробування створено",
"sureDelCha": "Справді вилучити випробування?",
+ "sureDelChaTavern": "Delete challenge, are you sure? Your gems will not be refunded.",
"removeTasks": "Вилучити завдання",
"keepTasks": "Залишити завдання",
"closeCha": "Закрити випробування та...",
diff --git a/common/locales/uk/character.json b/common/locales/uk/character.json
index 9d345b7d4d..38ccc92ea6 100644
--- a/common/locales/uk/character.json
+++ b/common/locales/uk/character.json
@@ -52,9 +52,11 @@
"costume": "Костюм",
"costumeText": "Якщо зовнішній вигляд іншого спорядженням Вам подобається більше, оберіть „Надягти костюм“, аби зовні постати у костюмі, допоки бойове спорядження вдягнене під низ.",
"useCostume": "Надягти костюм",
- "gearAchievement": "Ви отримали досягнення „Найкраще спорядження“ за вдосконалення до набору максимального рівня!",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "Найкраще спорядження",
- "ultimGearText": "Зброя та набір спорядження вдосконалено до максимального рівня",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "Рівень",
"levelUp": "Новий рівень!",
"mana": "Мана",
diff --git a/common/locales/uk/content.json b/common/locales/uk/content.json
index f783ed44dd..e43a6cdfaf 100644
--- a/common/locales/uk/content.json
+++ b/common/locales/uk/content.json
@@ -1,6 +1,10 @@
{
"potionText": "Цілюще зілля",
"potionNotes": "Відновлює 15 здоров'я (Необмежене використання)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "Вовк",
"dropEggWolfAdjective": "вірний",
"dropEggTigerCubText": "Тигрик",
diff --git a/common/locales/uk/contrib.json b/common/locales/uk/contrib.json
index ebf886ae9d..3d9599b429 100644
--- a/common/locales/uk/contrib.json
+++ b/common/locales/uk/contrib.json
@@ -12,10 +12,10 @@
"legSeventh": "Коли сьомий цикл вашої роботи буде запроваджено, ви отримаєте 4 Самоцвіти і станете членом поважної Гільдії Співавторів, і зможете побачити всі приховані деталі HabitRPG! Додаткові внески не збільшать ваш рівень, але ви зможете отримувати Самоцвіти і звання.",
"moderator": "Модератор",
"guardian": "Вартовий",
- "guardianText": "Moderators were selected carefully from high tier contributors, so please give them your respect and listen to their suggestions.",
+ "guardianText": "Модератори були уважно відібрані з числа тих, хто досяг максимального рівня внеску, тож, будь ласка, поважайте їх і прислухайтесь до їхніх пропозицій.",
"staff": "Персонал",
"heroic": "Герой",
- "heroicText": "The Heroic tier contains HabitRPG staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).",
+ "heroicText": "Рівень Героя мають розробники HabitRPG та найпалкіші співавтори. Якщо Ви здобули цей титул, отже Ви гідні цього (або ж Вас найняли на роботу!).",
"npcText": "НІПи найбільше підтримали HabitRPG на Kickstarter. Ви можете знайти їхні аватари на нашому сайті!",
"modalContribAchievement": "Досягнення вкладника!",
"contribModal": "<%= name %>, you awesome person! You're now a tier <%= level %> contributor for helping HabitRPG. See",
diff --git a/common/locales/uk/defaulttasks.json b/common/locales/uk/defaulttasks.json
index 78929a8fce..5c62687fd2 100644
--- a/common/locales/uk/defaulttasks.json
+++ b/common/locales/uk/defaulttasks.json
@@ -4,7 +4,7 @@
"defaultHabit2Text": "Погана звичка",
"defaultHabit2Notes": "Приклади поганих звичок: - Паління - Прокрастинація",
"defaultHabit3Text": "Гарна чи Погана звичка",
- "defaultHabit3Notes": "Приклади Гарних чи Поганих звичок: +/- Користування сходами/ліфтом; +/- Випив Воду/Газований напій",
+ "defaultHabit3Notes": "Приклади Гарних чи Поганих звичок: +/- Користування сходами/ліфтом; +/- Пити воду/Газований напій",
"defaultDaily1Text": "1г. для свого проєкту",
"defaultDaily1Notes": "Усі завдання мають жовтий колір після створення. Це означає, що Ви будете отримувати помірне ушкодження при пропусках, та помірну винагороду при виконанні.",
"defaultDaily2Text": "Прибрати в хаті",
@@ -12,12 +12,12 @@
"defaultDaily3Text": "45 хв. читання",
"defaultDaily3Notes": "Якщо ви часто не виконуєте Щоденні завдання, вони ставатимуть темнішають відтінками помаранчеовго та червоного. Чим червоніше завдання, тим більше досіду та золота ви отримаєте за виконання та більше ушкодження за невиконання. Це заохочує зосередитися на своїх недоліках - червоних завданнях.",
"defaultDaily4Text": "Вправлятися",
- "defaultDaily4Notes": "You can add checklists to Dailies and To-Dos. As you progress through the checklist, you will get a proportionate reward.",
+ "defaultDaily4Notes": "Ви можете додавати списки до Щоденних та звичайних завдань. Залежно від того як Ви просуваєтесь по списку, Ви отримуватимете відповідну нагороду.",
"defaultDaily4Checklist1": "Розтяжка",
"defaultDaily4Checklist2": "Присідання",
"defaultDaily4Checklist3": "Відтискання",
- "defaultTodoNotes": "You can either complete this To-Do, edit it, or remove it.",
- "defaultTodo1Text": "Join HabitRPG (Check me off!)",
+ "defaultTodoNotes": "Ви можете завершити це завдання, відредагувати або видалити його.",
+ "defaultTodo1Text": "Приєднатись до HabitRPG (Познач мене, як виконане!)",
"defaultTodo2Text": "Set up a Habit",
"defaultTodo2Checklist1": "Створити \"звичку\"",
"defaultTodo2Checklist2": "make it \"+\" only, \"-\" only, or \"+/-\" under Edit",
diff --git a/common/locales/uk/front.json b/common/locales/uk/front.json
index 99373976f2..5e0f141924 100644
--- a/common/locales/uk/front.json
+++ b/common/locales/uk/front.json
@@ -6,17 +6,17 @@
"althaireQuote": "Мати квест постійно - дійсно мотивує мене виконувати всі мої щоденні та звичайні завдання. Моя набільша мотвація - не дати \"впасти\" моїй групі.",
"andeeliaoQuote": "Надзвичайний продукт, тільки-но почала користуватись декілька днів тому та вже більш усвідомлено та продуктивно ставлюся до свого часу!",
"autumnesquirrelQuote": "Я менше прокрастиную на роботі та вдома. А також оплачую рахунки вчасно.",
- "businessSample1": "Confirm 1 page of Inventory",
- "businessSample2": "20 mins Filing",
+ "businessSample1": "Підтвердити 1 сторінку Інвентаря",
+ "businessSample2": "20 хвилин обробки інформації",
"businessSample3": "Відсортувати та обробити Вхідну пошту",
"businessSample4": "Підготувати 1 документ для Клієнта",
"businessSample5": "Подзвонити Клієнтам/Відкласти дзвінки",
"businessText": "Використовуйте HabitRPG для вашого бізнесу",
- "choreSample1": "Put Dirty Clothes in Hamper",
- "choreSample2": "20 mins of Housework",
- "choreSample3": "Wash a Load of Dishes",
+ "choreSample1": "Покласти брудний одяг у кошик для брудної білизни",
+ "choreSample2": "20 хвилин роботи по дому",
+ "choreSample3": "Вимити посуд",
"choreSample4": "Tidy One Room",
- "choreSample5": "Wash and Dry a Load of Clothes",
+ "choreSample5": "Випрати та висушити купу одягу",
"chores": "Chores",
"communityBug": "Повідомити про баґ",
"communityExtensions": "Застосунки та розширення",
@@ -172,5 +172,11 @@
"username": "Псевдо",
"watchVideos": "Переглядай відео",
"work": "Work",
- "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!"
+ "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",
+ "reportAccountProblems": "Report Account Problems",
+ "reportCommunityIssues": "Report Community Issues",
+ "generalQuestionsSite": "General Questions about the Site",
+ "businessInquiries": "Business Inquiries",
+ "merchandiseInquiries": "Merchandise Inquiries",
+ "marketingInquiries": "Marketing/Social Media Inquiries"
}
\ No newline at end of file
diff --git a/common/locales/uk/gear.json b/common/locales/uk/gear.json
index cff8caa999..7c24750ab0 100644
--- a/common/locales/uk/gear.json
+++ b/common/locales/uk/gear.json
@@ -120,6 +120,8 @@
"weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
"weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
"weaponMystery201502Notes": "For WINGS! For LOVE! For ALSO TRUTH! Confers no benefit. February 2015 Subscriber Item.",
+ "weaponMystery201505Text": "Green Knight Lance",
+ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "Steampunk Cane",
"weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",
"armor": "броня",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "Who's a penguin? Confers no benefit. December 2014 Subscriber Item.",
"headMystery201501Text": "Зоряний шолом",
"headMystery201501Notes": "The constellations flicker and swirl in this helm, guiding the wearer's thoughts towards focus. Confers no benefit. January 2015 Subscriber Item.",
+ "headMystery201505Text": "Green Knight Helm",
+ "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 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",
diff --git a/common/locales/uk/generic.json b/common/locales/uk/generic.json
index 9aeb95387b..6f0d4566c0 100644
--- a/common/locales/uk/generic.json
+++ b/common/locales/uk/generic.json
@@ -5,7 +5,20 @@
"habitica": "Звичанія",
"expandToolbar": "Розгорнути панель",
"collapseToolbar": "Згорнути панель",
- "formattingMarkdown": "Дозволене форматування Markdown ",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*Italics*",
+ "bold": "**Bold**",
+ "strikethrough": "~~Strikethrough~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "Досягнення",
"modalAchievement": "Досягнення!",
"special": "Особливе",
diff --git a/common/locales/uk/groups.json b/common/locales/uk/groups.json
index 29f303d457..1bfd7f690f 100644
--- a/common/locales/uk/groups.json
+++ b/common/locales/uk/groups.json
@@ -2,7 +2,7 @@
"tavern": "Таверна",
"innCheckOut": "Зайти до господи",
"innCheckIn": "Відпочити у господі",
- "innText": "Ви відпочиваєтє в господі! Доки ви залишаєтеь тут, ваші Щоденні задання не будуть наносити ушкоджень в кінці дня, але вони все одно будуть щоденно оновлюватись. Будьте уважні: якщо ви приймаєте участь у Квесті на Боса, Бос буде наносити вам ушкодження за пропущені Щоденні завдання ваших товарищів по групі, якщо вони також не відпочиватимуть в господі! До того ж ви не будете наносити ушкоджень Босу (та отримувати речі) до виходу з господи.",
+ "innText": "Ви відпочиваєтє в господі! Доки ви залишаєтеь тут, ваші Щоденні задання не будуть наносити ушкоджень в кінці дня, але вони все одно будуть щоденно оновлюватись. Будьте уважні: якщо ви приймаєте участь у Квесті на Боса, Бос буде наносити вам ушкодження за пропущені Щоденні завдання ваших товаришів по групі, якщо вони також не відпочиватимуть в господі! До того ж ви не будете наносити ушкоджень Босу (та отримувати речі) до виходу з господи.",
"lfgPosts": "Повідомлення про пошук групи (гурту)",
"tutorial": "Навчання",
"glossary": "Ґлосарій",
@@ -109,5 +109,12 @@
"inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
"byColon": "By:",
"inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "inviteAlertInfo2": "Or share this link (copy/paste):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/uk/limited.json b/common/locales/uk/limited.json
index ec0b436ecd..442bead8bc 100644
--- a/common/locales/uk/limited.json
+++ b/common/locales/uk/limited.json
@@ -12,8 +12,8 @@
"valentineCardNotes": "Відправити Валентинку члену гурту.",
"valentine0": "Троянди червоні, мої завдання є сині. Я щасливий, що я з тобою",
"valentine1": "\"Троянди червоні<%= lineBreak %>Фіалки гарні<%= lineBreak %>Разом зберемось<%= lineBreak %>Недоліка здолаємо!\"",
- "valentine2": "\"Roses are red<%= lineBreak %>This poem style is old<%= lineBreak %>I hope that you like this<%= lineBreak %>'Cause it cost ten Gold.\"",
- "valentine3": "\"Roses are red<%= lineBreak %>Ice Drakes are blue<%= lineBreak %>No treasure is better<%= lineBreak %>Than time spent with you!\"",
+ "valentine2": "Троянди червоні<%= lineBreak %>Ці вірші як старі<%= lineBreak %>Сподіваюсь Вам подобається<%= lineBreak %>Бо вони коштують десять Золотих",
+ "valentine3": "\"Троянди червоні<%= lineBreak %>Льодяні Дракони сині<%= lineBreak %>Жодні скарби кращі<%= lineBreak %>Часу проведеного з вами!\"",
"adoringFriends": "Любі друзі",
"adoringFriendsText": "Ооо, Ви та Ваш друг, певно, дуже любі одне одному! Надіслано/отримано валентинок: <%= cards %> ",
"polarBear": "Білий ведмідь",
diff --git a/common/locales/uk/npc.json b/common/locales/uk/npc.json
index 29c8eb1f4f..683c5525cc 100644
--- a/common/locales/uk/npc.json
+++ b/common/locales/uk/npc.json
@@ -2,8 +2,8 @@
"npc": "НІП",
"npcText": "Підтримав проєкт на Kickstarter на максимальний рівень!",
"mattBoch": "Митько Боч",
- "mattShall": "Привести Вашого скакуна, <%= name %>? Клацніть на ньому, аби осідлати.",
- "mattBochText1": "Ласкаво прошу до стайні! Я Митько, звіролов. Оберіть улюбленця, який усюди вештатиметься з Вами. Годуйте улюбленців і вони виростуть могутніми скакунами. ",
+ "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
+ "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
"daniel": "Данило",
"danielText": "Ласкаво просимо до Таверни! Залиштеся трохи та познайомтеся з тутешніми. Якщо вам потрібно відпочити (відпустка? хвороба?), я облаштую вас у господі. Доки ви перебуватимете в господі, ваші Щоденні завдання не наноситимуть ушкоджень в кінці дня, але ви все одно можете їх виконувати.",
"danielText2": "Будьте уважні: якщо ви приймаєте участь у Квесті на Боса, Бос буде наносити вам ушкодження за пропущені Щоденні завдання вашими товаришами по групі! До того ж ви не будете наносити ушкоджень Босу (та отримувати речі) до виходу з господи.",
@@ -45,9 +45,9 @@
"tourScrollDown": "Be sure to scroll all the way down to see all the options! Click on your avatar again to return to the tasks page.",
"tourMuchMore": "When you're done with tasks, you can form a Party with friends, chat in the shared-interest Guilds, join Challenges, and more!",
"tourStatsPage": "This is your Stats page! Earn achievements by completing the listed tasks.",
- "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can freeze your account in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
+ "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
"tourPartyPage": "Your Party will help you stay accountable. Invite friends to unlock a Quest Scroll!",
"tourGuildsPage": "Guilds are social groups with common themes. Search for the subjects that interest you! We recommend the Newbies Guild.",
- "tourChallengesPage": "Joining a Challenge will add tasks to your account. Compete against other users to win gem prizes!",
+ "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
"tourMarketPage": "Starting at Level 4, eggs and hatching potions drop randomly when you complete tasks. They appear here - use them to hatch pets! You can also buy items from the Market."
}
\ No newline at end of file
diff --git a/common/locales/uk/quests.json b/common/locales/uk/quests.json
index 2ea4b0cf3c..98dce7678a 100644
--- a/common/locales/uk/quests.json
+++ b/common/locales/uk/quests.json
@@ -6,8 +6,8 @@
"questSend": "Клацнувши „Запросити“, усі гравці гурту отримають запрошення. Коли всі запрошення прийнято або відхилено, розпочнеться квест. Перегляньте його стан за Різне > Громада > Гурт.",
"inviteParty": "Зібрати гурт",
"questInvitation": "Запрошення до квесту:",
- "questInvitationTitle": "Quest Invitation",
- "questInvitationInfo": "Invitation for the Quest <%= quest %>",
+ "questInvitationTitle": "Запрошення до квесту",
+ "questInvitationInfo": "Запрошення до Квесту: <%= quest %>",
"askLater": "На потім",
"buyQuest": "Придбати квест",
"accepted": "Прийнято",
@@ -16,10 +16,10 @@
"questStart": "Як тільки всі учасники погодяться або відмовляться, квест починається. Тільки ті, хто натиснув „прийняти“ зможуть взяти участь у квесті і отримати винагороду. Якщо участники очікують надто довго (неактивні?), власник квесту може почати його без них, натиснувши „Почати“. Власник квесту, також може скасувати його і отримати квестовий сувій, натиснувши „Скасувати“.",
"begin": "Почати",
"bossHP": "Здоров'я боса",
- "bossStrength": "Boss Strength",
+ "bossStrength": "Сила Боса",
"collect": "Collect",
"collected": "Зібрано",
- "bossDmg1": "To hurt a boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "Тільки учасники битимуться з босом та розділять квестові трофеї.",
"tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossColl1": "Аби зібрати всі предмети, виконуйте позитивні завдання. Квестові предмети випадають так само часто, як і звичайні, але Ви не побачите, що випало, до початку наступного дня, лише після цього все, що було знайдено, буде підраховано та складено до загальної купи.",
diff --git a/common/locales/uk/questscontent.json b/common/locales/uk/questscontent.json
index 94d7b07339..79165e9c10 100644
--- a/common/locales/uk/questscontent.json
+++ b/common/locales/uk/questscontent.json
@@ -12,7 +12,7 @@
"questEvilSanta2DropBearCubPolarPet": "Білий ведмідь (улюбленець)",
"questGryphonText": "Полум’яний ґрифон",
"questGryphonNotes": "Великий звіролов, baconsaur, прийшов до Вашої групи, шукаючи допомоги. \"Прошу вас, шукачі пригод, Ви повинні мені допомогти! Мій найцінніший ґрифон вирвався на волю й тероризує Звичанію. Якщо зможеш зупинити його, я міг би винагородити тебе кількома її яйцями!\"",
- "questGryphonCompletion": "Defeated, the mighty beast ashamedly slinks back to its master. \"My word! Well done, adventurers!\" baconsaur exclaims, \"Please, have some of the gryphon's eggs. I am sure you will raise these young ones well!\"",
+ "questGryphonCompletion": "Переможене могутнє чудовисько присоромлено плентається назад до свого господаря.\"А бодай мені! Добра робота, шукачі пригод!\" — вигукує baconsaur, \"Прошу, візьміть кілька грифонових яєць. Я впевнений, що вам вдасться як слід виростити цю малечу!\"",
"questGryphonBoss": "Полум’яний ґрифон",
"questGryphonDropGryphonEgg": "Ґрифон (яйце)",
"questGryphonUnlockText": "Відкриває можливість покупки яйця грифона на ринку",
diff --git a/common/locales/uk/settings.json b/common/locales/uk/settings.json
index 79edb3d8af..6703ea466d 100644
--- a/common/locales/uk/settings.json
+++ b/common/locales/uk/settings.json
@@ -1,7 +1,7 @@
{
"settings": "Налаштування",
"language": "Мова",
- "americanEnglishGovern": "У разі невідповідності в перекладі, американська англійська версія головна.",
+ "americanEnglishGovern": "У разі невідповідності в перекладі, американська англійська версія є головною.",
"helpWithTranslation": "Хочете допомогти у перекладі HabitRPG? Чудово! Перейдіть до цієї картки в Trello.",
"showHeaderPop": "Показувати Ваш аватар, здоров'я/досвід і гурт.",
"stickyHeader": "Закріпити заголовок",
diff --git a/common/locales/uk/spells.json b/common/locales/uk/spells.json
index 04388ebbf6..6e3f79370f 100644
--- a/common/locales/uk/spells.json
+++ b/common/locales/uk/spells.json
@@ -14,9 +14,9 @@
"spellWarriorValorousPresenceText": "Присутність доблесті",
"spellWarriorValorousPresenceNotes": "Ваша присутність надає сміливості вашій групі. Вся група отримує підвищення Сили! (Залежить від: базова Сила)",
"spellWarriorIntimidateText": "Страхітливий погляд",
- "spellWarriorIntimidateNotes": "Your gaze strikes fear into your enemies. Your whole party gains a buff to Constitution! (Based on: Unbuffed CON)",
+ "spellWarriorIntimidateNotes": "Ваш погляд наводить жах на ваших ворогів. Вся ваша група отримує підсилення Комплекції! (Залежить від: базова Комплекція)",
"spellRoguePickPocketText": "Кишенькова крадіжка",
- "spellRoguePickPocketNotes": "You rob a nearby task. You gain gold! Click on a task to cast. (Based on: PER)",
+ "spellRoguePickPocketNotes": "Ви пограбували сусіднє завдяння. Ви отримали золото! Клікніть по завданню, щоб накласти закляття. (Залежить від: Сприйняття)",
"spellRogueBackStabText": "Удар зі спини",
"spellRogueBackStabNotes": "You betray a foolish task. You gain gold and XP! Click on a task to cast. (Based on: STR)",
"spellRogueToolsOfTradeText": "Знаряддя торгівлі",
diff --git a/common/locales/uk/tasks.json b/common/locales/uk/tasks.json
index e3b09ff347..eb69a64a79 100644
--- a/common/locales/uk/tasks.json
+++ b/common/locales/uk/tasks.json
@@ -1,5 +1,5 @@
{
- "clearCompleted": "Вилучення виконано",
+ "clearCompleted": "Вилучити виконані",
"lotOfToDos": "Завершені Щоденні завдання автоматично архівуються через 3 дні. Ви можете отримати їх через Налаштування > Экспорт.",
"deleteToDosExplanation": "Якщо натиснути на кнопку внизу, то всі з виконаних Зробити та архівних Зробити будуть остаточно вилучені. Якщо хочете зберегти запис про них, спершу експортуйте їх.",
"beeminderDeleteWarning": "Шановні учасники: Спершу прочитайте Видалення Виконаних Завдань Без Збиваючих З Пантелику Ситуацій!",
@@ -14,7 +14,7 @@
"save": "Зберегти",
"addChecklist": "Додати перелік",
"checklist": "Перелік",
- "checklistText": "Частково виконані переліки щоденних завдань зменшують ушкодження. Наприклад, перелік, виконаний на 3/4, зменшує ушкодження на 25%. Виконаний перелік у „Зробити“ працює так: +3 виконаних із переліку помножать на 3 (4 найбільше) отримані досвід, золото та ману.",
+ "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
"expandCollapse": "Показати/Приховати",
"text": "Текст",
"extraNotes": "Додаткові примітки",
@@ -22,7 +22,7 @@
"advancedOptions": "Додатково",
"difficulty": "Рівень складності",
"difficultyHelpTitle": "Наскільки важке це завдання?",
- "difficultyHelpContent": "Це примножує цінність завдання. Використовуйте з розумом, краще покластися на наші алґоритми підлаштування цінності завдань. Але цінність буває різна (Написати дипломну чи Почистити зуби). Клацніть, аби довідатися більше.",
+ "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!",
"easy": "Легко",
"medium": "Середньо",
"hard": "Важко",
diff --git a/common/locales/zh/backgrounds.json b/common/locales/zh/backgrounds.json
index 98491cad62..4dc230ee30 100644
--- a/common/locales/zh/backgrounds.json
+++ b/common/locales/zh/backgrounds.json
@@ -83,5 +83,12 @@
"backgroundMountainLakeText": "高山湖泊",
"backgroundMountainLakeNotes": "用脚趾沾沾冰凉的湖水",
"backgroundPagodasText": "宝塔",
- "backgroundPagodasNotes": "欲穷千里目，更上一层楼"
+ "backgroundPagodasNotes": "欲穷千里目，更上一层楼",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/zh/challenge.json b/common/locales/zh/challenge.json
index 00b227b3cf..1f096def15 100644
--- a/common/locales/zh/challenge.json
+++ b/common/locales/zh/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "选择一位赢家然后结束挑战：",
"deleteOrSelect": "删除或选择赢家",
"endChallenge": "结束挑战",
- "challengeDiscription": "这些是挑战的任务。玩家参与挑战后，它们会更变颜色并通过图表来显示小组的整体进度。",
+ "challengeDiscription": "These are the Challenge's tasks that will be added to your task dashboard when you join this Challenge. The sample Challenge tasks below will change color and gain graphs to show you the overall progress of the group.",
"hows": "大家做得怎么样？",
"filter": "过滤器",
"groups": "小组",
@@ -33,7 +33,8 @@
"challengeTagPop": "挑战名会显示在在标签列表和任务中。所以挑战名要短。例如用”-10磅“代替”在3个月内减掉10磅“ (点击查看详细信息)。",
"challengeDescr": "详细描述",
"prize": "战利品",
- "prizePop": "如果有有人能够“赢得”你的挑战，你可以选择奖励胜者一些宝石作为奖品。最大值 = 你拥有的宝石数 (+ 公会宝石数，如果你创建了这个挑战所属的公会)。注意：这个奖励以后不能被修改，并且如果挑战被取消了宝石也无法退回。",
+ "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.",
+ "prizePopTavern": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
"publicChallenges": " 公共挑战 需要至少1个宝石 (为了防止垃圾信息)。",
"officialChallenge": "HabitRPG 的官方挑战",
"by": "发起自",
@@ -43,6 +44,7 @@
"selectGroup": "请选择小组",
"challengeCreated": "挑战创建成功",
"sureDelCha": "确定 删除挑战 吗？",
+ "sureDelChaTavern": "Delete challenge, are you sure? Your gems will not be refunded.",
"removeTasks": "移除任务",
"keepTasks": "保留任务",
"closeCha": "关闭挑战并且……",
diff --git a/common/locales/zh/character.json b/common/locales/zh/character.json
index d5e273cfd5..06e4208a55 100644
--- a/common/locales/zh/character.json
+++ b/common/locales/zh/character.json
@@ -52,9 +52,11 @@
"costume": "服装",
"costumeText": "如果你更喜欢其它装备的样子，勾选\"显示服装\"的按钮，在装备战斗装备的情况下换一个造型。",
"useCostume": "显示服装",
- "gearAchievement": "因为你已升级到最高等级的装备，你获得了”终极装备“这个成就！",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "终极装备",
- "ultimGearText": "已升级到最高级的武器和装甲",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "级",
"levelUp": "升级了！",
"mana": "魔法值",
diff --git a/common/locales/zh/content.json b/common/locales/zh/content.json
index 5e82629882..cf8db5a4e2 100644
--- a/common/locales/zh/content.json
+++ b/common/locales/zh/content.json
@@ -1,6 +1,10 @@
{
"potionText": "治疗药水",
"potionNotes": "回复15点生命值 （立即生效）",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "狼",
"dropEggWolfAdjective": "忠诚的",
"dropEggTigerCubText": "老虎幼崽",
diff --git a/common/locales/zh/front.json b/common/locales/zh/front.json
index b8de07bd30..63a62be6a0 100644
--- a/common/locales/zh/front.json
+++ b/common/locales/zh/front.json
@@ -172,5 +172,11 @@
"username": "用户名",
"watchVideos": "观看视频",
"work": "工作",
- "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!"
+ "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",
+ "reportAccountProblems": "Report Account Problems",
+ "reportCommunityIssues": "Report Community Issues",
+ "generalQuestionsSite": "General Questions about the Site",
+ "businessInquiries": "Business Inquiries",
+ "merchandiseInquiries": "Merchandise Inquiries",
+ "marketingInquiries": "Marketing/Social Media Inquiries"
}
\ No newline at end of file
diff --git a/common/locales/zh/gear.json b/common/locales/zh/gear.json
index 47116f07ed..c2d86acd11 100644
--- a/common/locales/zh/gear.json
+++ b/common/locales/zh/gear.json
@@ -120,6 +120,8 @@
"weaponMystery201411Notes": "刺伤你的仇敌或是插进你最爱的食物——这把多才多艺的叉子可是无所不能！没有属性加成。2014年11月捐助者物品。",
"weaponMystery201502Text": "爱与真理之微光翅膀法杖",
"weaponMystery201502Notes": "为了翅膀！为了爱！也为了真理！没有属性加成。2015年2月捐赠者物品。",
+ "weaponMystery201505Text": "Green Knight Lance",
+ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "蒸汽朋克手杖",
"weaponMystery301404Notes": "特别适合在城里散步。3015年3月订阅者物品。没有属性加成。",
"armor": "护甲",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "谁是企鹅？没有属性加成。2014年12月订阅者物品。",
"headMystery201501Text": "繁星头盔",
"headMystery201501Notes": "头盔上闪烁摇曳的星座指引着佩戴者的思绪向目标前进。没有属性加成。2015年1月捐赠者物品。",
+ "headMystery201505Text": "Green Knight Helm",
+ "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 2015 Subscriber Item.",
"headMystery301404Text": "华丽礼帽",
"headMystery301404Notes": "上流社会佼佼者的华丽礼帽！3015年1月捐赠者物品。没有属性加成。",
"headMystery301405Text": "基础礼帽",
diff --git a/common/locales/zh/generic.json b/common/locales/zh/generic.json
index 6a6afd5054..3e902dd638 100644
--- a/common/locales/zh/generic.json
+++ b/common/locales/zh/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitica",
"expandToolbar": "展开列表",
"collapseToolbar": "隐藏列表",
- "formattingMarkdown": "支持标记语言",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*Italics*",
+ "bold": "**Bold**",
+ "strikethrough": "~~Strikethrough~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "成就",
"modalAchievement": "获得成就！",
"special": "特殊",
diff --git a/common/locales/zh/groups.json b/common/locales/zh/groups.json
index c9522d89f7..ecc90b474f 100644
--- a/common/locales/zh/groups.json
+++ b/common/locales/zh/groups.json
@@ -109,5 +109,12 @@
"inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
"byColon": "By:",
"inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "inviteAlertInfo2": "Or share this link (copy/paste):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/zh/npc.json b/common/locales/zh/npc.json
index 5ac6417c2b..0fabb29a77 100644
--- a/common/locales/zh/npc.json
+++ b/common/locales/zh/npc.json
@@ -2,8 +2,8 @@
"npc": "NPC",
"npcText": "用尽全力支持了我们的Kickstarter项目！",
"mattBoch": "Matt Boch",
- "mattShall": "<%= name %>，需要我把你的坐骑带出来吗？点击一只坐骑来上鞍。",
- "mattBochText1": "欢迎来到马厩！我是驯兽师Matt。你可以在这里选择一只宠物陪你冒险。经过一番喂养，他们可以长成强而有力的坐骑哦！",
+ "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
+ "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
"daniel": "Daniel",
"danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
"danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
@@ -45,9 +45,9 @@
"tourScrollDown": "一定要滚动菜单看完所有的选项！再次点击你的角色形象回到任务界面。",
"tourMuchMore": "完成新手指导后，你可以与小伙伴一起成立队伍，在兴趣相投的公会里聊天，参与挑战，还有更多的乐趣等着你！",
"tourStatsPage": "这是你的属性点界面！完成列表任务来获得成就。",
- "tourTavernPage": "欢迎来到酒馆，一个全年龄段聊天室！如果你生病了或外出旅行，通过点击“在客栈休息”可以冻结账号。",
+ "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
"tourPartyPage": "你的队伍会使你保持责任心。邀请朋友来解锁任务卷轴！",
"tourGuildsPage": "公会是有着共同主题的社交团体。找找你感兴趣的的主题！我们推荐the Newbies Guild。",
- "tourChallengesPage": "加入一项挑战意味着在你的账号上增加一些任务。通过与其它用户竞争来赢取宝石奖励！",
+ "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
"tourMarketPage": "从4级开始，当你完成任务时，蛋和孵化药水会随机掉落。他们会出现在这里——使用它们来孵化宠物！你也可以从集市购买物品。"
}
\ No newline at end of file
diff --git a/common/locales/zh/quests.json b/common/locales/zh/quests.json
index 8f480e2e73..baaaef4821 100644
--- a/common/locales/zh/quests.json
+++ b/common/locales/zh/quests.json
@@ -19,7 +19,7 @@
"bossStrength": "Boss的力量",
"collect": "收集",
"collected": "已收集",
- "bossDmg1": "为了对boss造成伤害，请完成你的日常任务和待办事项。更高的任务伤害意味着更高的boss伤害( 完成红色任务，法师技能，战士攻击等等)。boss会以你未完成日常个数 (乘以boss的力量)减去你的常规伤害的伤害值对每个任务玩家造成伤害，所以请完成你的日常任务来保证你队伍的生命值！所有对boss和来自boss的伤害会在重置时间进行结算 (你的日常重置时间)",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "只有参与者会跟boss战斗并共享任务掉落。",
"tavernBossInfo": "为了对世界boss造成伤害，请完成你的日常任务和待办事项。更高的任务伤害意味着更高的boss伤害( 完成红色任务，法师技能，战士攻击等等)。你的每个未完成日常个数 (乘以boss的力量)，boss的怒气都会增加。一旦他的怒气达到上限，后果不堪设想——所以请完成你的日常任务。所有对boss和来自boss的伤害会在重置时间进行结算 (你的日常重置时间)",
"bossColl1": "为了收集物品，做那些正的任务。任务物品会像正常物品一样掉落；但是你直到第二天才能看得见这些掉落，然后找到的所有物品会被结算然后堆叠到一起。",
diff --git a/common/locales/zh/settings.json b/common/locales/zh/settings.json
index e5d166a624..0ef595532f 100644
--- a/common/locales/zh/settings.json
+++ b/common/locales/zh/settings.json
@@ -41,7 +41,7 @@
"json": "(JSON)",
"customDayStart": "自定义起始日期",
"24HrClock": "24小时表",
- "customDayStartInfo1": "HabitRPG defaults to check and reset your Dailies at midnight in your own time zone each day. It is recommended that you read the following information before changing it:",
+ "customDayStartInfo1": "HabitRPG默认在午夜时分（当然是在你所在地区的时区内）检查并且重置你的日常事项。我们推荐你在改变它之前先读读下面这些信息：",
"customDayStartInfo2": "(展开)",
"customDayStartInfo3": "(收起)",
"customDayStartInfo4": "Complete all your Dailies before changing the Custom Day Start or Rest in the Inn that day. Changing your Custom Day Start may cause Cron to run immediately, but after the first day it works as expected.
Allow a window of two hours for the change to take effect. For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.
Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.",
@@ -93,12 +93,12 @@
"wonChallenge": "你赢得了挑战",
"newPM": "收到悄悄话",
"giftedGems": "自然宝石",
- "giftedGemsInfo": "<%= amount %> Gems - by <%= name %>",
+ "giftedGemsInfo": "<%= amount %> 宝石 - 来自 <%= name %>",
"giftedSubscription": "捐助有礼",
"invitedParty": "队伍邀请",
"invitedGuild": "公会邀请",
"inactivityEmails": "你的账号处于失效状态",
- "weeklyRecaps": "Summaries of your account activity in the past week",
+ "weeklyRecaps": "过去几周内你账户活动的总结",
"questStarted": "你的任务已经开始",
"invitedQuest": "任务邀请",
"kickedGroup": "从小组踢出",
@@ -114,8 +114,8 @@
"coupon": "优惠券",
"couponPlaceholder": "输入优惠券代码",
"couponText": "We sometimes have events and give out promo codes for special gear. (eg, those who stop by our Wondercon booth)",
- "apply": "Apply",
- "resubscribe": "Resubscribe",
+ "apply": "申请",
+ "resubscribe": "重新订阅",
"promoCode": "优惠码",
"promoCodeApplied": "优惠码已生效！请查看物品栏",
"promoPlaceholder": "输入优惠码"
diff --git a/common/locales/zh/tasks.json b/common/locales/zh/tasks.json
index b17227a5e9..0daf9f7b33 100644
--- a/common/locales/zh/tasks.json
+++ b/common/locales/zh/tasks.json
@@ -14,7 +14,7 @@
"save": "保存",
"addChecklist": "新增清单",
"checklist": "清单",
- "checklistText": "对于每日任务，部分完成任务清单会降低受到的伤害。例如，一个包含4项的任务清单，如果完成了其中的3项，那么未完成这个每日任务只收到25%的伤害。完成待办事项的任务清单会加倍收益：3个完成项意味着+3倍 (算上任务本身总共4倍) 的经验，金币和魔法。",
+ "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
"expandCollapse": "展开 / 折叠",
"text": "文字",
"extraNotes": "额外注解",
@@ -22,7 +22,7 @@
"advancedOptions": "高级选项",
"difficulty": "难度",
"difficultyHelpTitle": "这任务有多难？",
- "difficultyHelpContent": "难易度会按比例改变点数。尽量少用它，用我们的任务值调整算法来代替。但是有些任务本身更有价值 (例如写论文跟清理牙齿相比)。点这里获得更多信息。",
+ "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!",
"easy": "简单",
"medium": "中等",
"hard": "困难",
diff --git a/common/locales/zh_TW/backgrounds.json b/common/locales/zh_TW/backgrounds.json
index c99b204d8a..680d722abf 100644
--- a/common/locales/zh_TW/backgrounds.json
+++ b/common/locales/zh_TW/backgrounds.json
@@ -77,11 +77,18 @@
"backgroundFloralMeadowNotes": "在開滿花的草原上野餐",
"backgroundGumdropLandText": "糖果世界",
"backgroundGumdropLandNotes": "品嘗糖果世界的景色。",
- "backgrounds052015": "SET 12: Released May 2015",
- "backgroundMarbleTempleText": "Marble Temple",
- "backgroundMarbleTempleNotes": "Pose in front of a Marble Temple.",
- "backgroundMountainLakeText": "Mountain Lake",
- "backgroundMountainLakeNotes": "Dip your toes in a Mountain Lake.",
- "backgroundPagodasText": "Pagodas",
- "backgroundPagodasNotes": "Climb to the top of Pagodas."
+ "backgrounds052015": "第 12 組：2015 年五月推出",
+ "backgroundMarbleTempleText": "大理石神廟",
+ "backgroundMarbleTempleNotes": "展現在大理石神廟之前",
+ "backgroundMountainLakeText": "山脈之湖",
+ "backgroundMountainLakeNotes": "把你的腳指浸在山脈之湖裡面",
+ "backgroundPagodasText": "佛塔",
+ "backgroundPagodasNotes": "爬到佛塔的頂端",
+ "backgrounds062015": "SET 13: Released June 2015",
+ "backgroundDriftingRaftText": "Drifting Raft",
+ "backgroundDriftingRaftNotes": "Paddle a Drifting Raft.",
+ "backgroundShimmeryBubblesText": "Shimmery Bubbles",
+ "backgroundShimmeryBubblesNotes": "Float through a sea of Shimmery Bubbles.",
+ "backgroundIslandWaterfallsText": "Island Waterfalls",
+ "backgroundIslandWaterfallsNotes": "Picnic near Island Waterfalls."
}
\ No newline at end of file
diff --git a/common/locales/zh_TW/challenge.json b/common/locales/zh_TW/challenge.json
index f475ea7cce..6abe8eda27 100644
--- a/common/locales/zh_TW/challenge.json
+++ b/common/locales/zh_TW/challenge.json
@@ -16,7 +16,7 @@
"selectWinner": "選一位贏家然後結束挑戰：",
"deleteOrSelect": "刪除或選擇贏家",
"endChallenge": "結束挑戰",
- "challengeDiscription": "這些是該挑戰的任務。玩家參與挑戰後，它們會改變顏色並通過圖表來顯示該群組的整體進度。",
+ "challengeDiscription": "These are the Challenge's tasks that will be added to your task dashboard when you join this Challenge. The sample Challenge tasks below will change color and gain graphs to show you the overall progress of the group.",
"hows": "看看其他人的進度如何？",
"filter": "篩選條件",
"groups": "群組",
@@ -33,7 +33,8 @@
"challengeTagPop": "挑戰名會顯示在在標籤列表和任務的工具提示中。所以挑戰名要盡量短。例如用「-10 磅」代替「在 3 個月內減掉 10 磅」 (點選查看詳細資訊)。",
"challengeDescr": "詳細說明",
"prize": "戰利品",
- "prizePop": "如果有人「贏得」了你的挑戰，你可以獎勵贏家一些寶石。最大值 = 你擁有的寶石數(+ 公會寶石數，如果你建立了是這個公會的挑戰)。注意：獎勵設定好之後就不能修改，如果取消挑戰寶石也不能退回。",
+ "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later.",
+ "prizePopTavern": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. Max = #gems you own (+ guild.gems, if you created this challenge's guild). Note: This prize can't be changed later and Tavern challenges will not be refunded if the challenge is cancelled.",
"publicChallenges": "公開挑戰 最少需要 1 個寶石作為獎勵 (為了防止有人拿來打廣告。)",
"officialChallenge": "HabitRPG 官方挑戰",
"by": "發起人",
@@ -43,6 +44,7 @@
"selectGroup": "請選擇群組",
"challengeCreated": "挑戰已建立",
"sureDelCha": "確定「刪除挑戰」嗎？",
+ "sureDelChaTavern": "Delete challenge, are you sure? Your gems will not be refunded.",
"removeTasks": "移除任務",
"keepTasks": "保留任務",
"closeCha": "關閉挑戰並且……",
diff --git a/common/locales/zh_TW/character.json b/common/locales/zh_TW/character.json
index 5ad91d303a..d487acccfd 100644
--- a/common/locales/zh_TW/character.json
+++ b/common/locales/zh_TW/character.json
@@ -52,9 +52,11 @@
"costume": "服裝",
"costumeText": "如果你喜歡其他裝備的外觀更勝於你現在的裝備，勾選\"使用服裝\"框穿上想被看到的服裝，而你的戰鬥裝備會穿在裡面。",
"useCostume": "使用服裝",
- "gearAchievement": "你已達成「終極裝備」成就：升級到最高裝備！",
+ "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:",
+ "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!",
+ "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.",
"ultimGearName": "終極裝備",
- "ultimGearText": "已升級到最高武器和盔甲",
+ "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:",
"level": "等級",
"levelUp": " 升級了！",
"mana": "魔力",
@@ -70,7 +72,7 @@
"allocatePerPop": "增加一點感知",
"allocateInt": "分配給智力的屬性點：",
"allocateIntPop": "增加一點智力",
- "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue leveling up, or start a new adventure at level 1 by using the Orb of Rebirth, now available for free in the Market.",
+ "noMoreAllocate": "恭喜您！您的角色已經達到了最高的等級 100，所以往後的等級提升您將不會再獲得屬性點。您可以使用這個角色續續升級，又或者透過巿集取得免費的重生之球，從等級 1 開始一場嶄新的冒險。",
"stats": "屬性",
"strength": "力量",
"strengthText": "力量會增加「會心一擊」的機率，而會心一擊時會提升金幣、經驗和物品掉落的機率。力量還能幫助你傷害 BOSS。",
@@ -140,5 +142,5 @@
"unequipBattleGear": "卸下戰鬥裝備",
"unequipCostume": "卸下服裝",
"unequipPetMountBackground": "卸下寵物、座騎、背景",
- "animalSkins": "Animal Skins"
+ "animalSkins": "動物膚色"
}
\ No newline at end of file
diff --git a/common/locales/zh_TW/communityguidelines.json b/common/locales/zh_TW/communityguidelines.json
index da0f482040..c150f0df2f 100644
--- a/common/locales/zh_TW/communityguidelines.json
+++ b/common/locales/zh_TW/communityguidelines.json
@@ -174,5 +174,5 @@
"commGuideLink07description": "用於提交像素畫。",
"commGuideLink08": "Quest Trello",
"commGuideLink08description": "提交任務作品。",
- "lastUpdated": "Last updated"
+ "lastUpdated": "最後更新"
}
\ No newline at end of file
diff --git a/common/locales/zh_TW/content.json b/common/locales/zh_TW/content.json
index 41700bb675..7e3684d454 100644
--- a/common/locales/zh_TW/content.json
+++ b/common/locales/zh_TW/content.json
@@ -1,6 +1,10 @@
{
"potionText": "治療藥水",
"potionNotes": "回復15點生命值(立即使用)",
+ "armoireText": "Enchanted Armoire",
+ "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:",
+ "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.",
+ "armoireNotesEmpty": "The Armoire will have new Equipment every month. Until then, keep clicking for Experience and Food!",
"dropEggWolfText": "狼",
"dropEggWolfAdjective": "忠誠的",
"dropEggTigerCubText": "小老虎",
@@ -56,8 +60,8 @@
"questEggBunnyAdjective": "舒服地",
"questEggSlimeText": "棉花糖史萊姆",
"questEggSlimeAdjective": "甜甜的",
- "questEggSheepText": "Sheep",
- "questEggSheepAdjective": "woolly",
+ "questEggSheepText": "羊",
+ "questEggSheepAdjective": "羊毛製的",
"eggNotes": "把孵化藥水倒在寵物蛋上會把它孵化成一隻<%= eggAdjective(locale) %><%= eggText(locale) %>。",
"hatchingPotionBase": "普通",
"hatchingPotionWhite": "白色",
diff --git a/common/locales/zh_TW/front.json b/common/locales/zh_TW/front.json
index c258dfd18e..e31efe5b8f 100644
--- a/common/locales/zh_TW/front.json
+++ b/common/locales/zh_TW/front.json
@@ -172,5 +172,11 @@
"username": "使用者名稱",
"watchVideos": "觀看影片",
"work": "Work",
- "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!"
+ "zelahQuote": "With HabitRPG, I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!",
+ "reportAccountProblems": "Report Account Problems",
+ "reportCommunityIssues": "Report Community Issues",
+ "generalQuestionsSite": "General Questions about the Site",
+ "businessInquiries": "Business Inquiries",
+ "merchandiseInquiries": "Merchandise Inquiries",
+ "marketingInquiries": "Marketing/Social Media Inquiries"
}
\ No newline at end of file
diff --git a/common/locales/zh_TW/gear.json b/common/locales/zh_TW/gear.json
index 52e3376ebb..00633d7abe 100644
--- a/common/locales/zh_TW/gear.json
+++ b/common/locales/zh_TW/gear.json
@@ -120,6 +120,8 @@
"weaponMystery201411Notes": "刺傷你的仇敵或是插進你最愛的食物——這把多才多藝的叉子可是無所不能！沒有屬性加成。2014年11月訂閱者物品",
"weaponMystery201502Text": "愛與真理之微光翅膀法杖",
"weaponMystery201502Notes": "為了翅膀！為了愛！也為了真理！沒有屬性加成。2015年2月訂閱者物品。",
+ "weaponMystery201505Text": "Green Knight Lance",
+ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.",
"weaponMystery301404Text": "蒸氣龐克風拐杖",
"weaponMystery301404Notes": "特別適合在城裡散步。3015年3月訂閱者物品。沒有屬性加成。",
"armor": "盔甲",
@@ -370,6 +372,8 @@
"headMystery201412Notes": "誰是企鵝？沒有屬性加成。2014年12月訂閱者物品。",
"headMystery201501Text": "繁星頭盔",
"headMystery201501Notes": "頭盔上閃爍搖曳的星座指引著佩戴者的思緒向目標前進。沒有屬性加成。2015年1月訂閱者物品。",
+ "headMystery201505Text": "Green Knight Helm",
+ "headMystery201505Notes": "The green plume on this iron helm waves proudly. Confers no benefit. May 2015 Subscriber Item.",
"headMystery301404Text": "華麗禮帽",
"headMystery301404Notes": "上流社會佼佼者的華麗禮帽！3015年1月訂閱者物品。沒有屬性加成。",
"headMystery301405Text": "基礎禮帽",
diff --git a/common/locales/zh_TW/generic.json b/common/locales/zh_TW/generic.json
index 11fe6e783a..4a1cbc9462 100644
--- a/common/locales/zh_TW/generic.json
+++ b/common/locales/zh_TW/generic.json
@@ -5,7 +5,20 @@
"habitica": "Habitica",
"expandToolbar": "展開列表",
"collapseToolbar": "隱藏列表",
- "formattingMarkdown": "支持標記語言",
+ "markdownBlurb": "HabitRPG uses markdown for message formatting. See the Markdown Cheat Sheet for more info.",
+ "showFormattingHelp": "Show formatting help",
+ "hideFormattingHelp": "Hide formatting help",
+ "youType": "You type:",
+ "youSee": "You see:",
+ "italics": "*Italics*",
+ "bold": "**Bold**",
+ "strikethrough": "~~Strikethrough~~",
+ "emojiExample": ":smile:",
+ "markdownLinkEx": "[HabitRPG is great!](https://habitrpg.com)",
+ "markdownImageEx": "![mandatory alt text](https://habitrpg.com/cake.png \"optional mouseover title\")",
+ "unorderedListHTML": "+ First item + Second item + Third item",
+ "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item",
+ "code": "`code`",
"achievements": "成就",
"modalAchievement": "獲得成就！",
"special": "特殊",
diff --git a/common/locales/zh_TW/groups.json b/common/locales/zh_TW/groups.json
index 4984c17b1d..41c71ec53c 100644
--- a/common/locales/zh_TW/groups.json
+++ b/common/locales/zh_TW/groups.json
@@ -109,5 +109,12 @@
"inviteByEmail": "Invite friends by email. If they join via your email, they'll automatically be invited to this group.",
"byColon": "By:",
"inviteNewUsers": "Invite New User(s)",
- "inviteAlertInfo2": "Or share this link (copy/paste):"
+ "inviteAlertInfo2": "Or share this link (copy/paste):",
+ "sendGiftHeading": "Send Gift to <%= name %>",
+ "sendGiftGemsBalance": "From <%= number %> Gems",
+ "sendGiftCost": "Total: $<%= cost %> USD",
+ "sendGiftFromBalance": "From Balance",
+ "sendGiftPurchase": "Purchase",
+ "sendGiftMessagePlaceholder": "Personal message (optional)",
+ "sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
}
\ No newline at end of file
diff --git a/common/locales/zh_TW/npc.json b/common/locales/zh_TW/npc.json
index 075a69449d..29dc557901 100644
--- a/common/locales/zh_TW/npc.json
+++ b/common/locales/zh_TW/npc.json
@@ -2,8 +2,8 @@
"npc": "NPC",
"npcText": "全力支持了我們的Kickstarter項目！",
"mattBoch": "Matt Boch",
- "mattShall": "<%= name %>，需要我把你的坐騎帶出來嗎？點擊一隻坐騎來騎上牠。",
- "mattBochText1": "歡迎來到馬廄！我是馴獸師Matt。你可以在這裡選擇一隻寵物陪你冒險。經過餵養，牠們可以長成強而有力的坐騎哦！",
+ "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
+ "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. After level 4, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 4, and they'll grow into powerful mounts.",
"daniel": "Daniel",
"danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
"danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
@@ -45,9 +45,9 @@
"tourScrollDown": "一定要滾動看完所有的選單的選項喔！再次點擊你的角色回到任務界面。",
"tourMuchMore": "完成新手教學後，你可以與朋友一起成立隊伍，在興趣相投的公會裡聊天，參與挑戰，還有更多的樂趣等著你！",
"tourStatsPage": "這是你的屬性點界面！完成任務列表來獲得成就。",
- "tourTavernPage": "歡迎來到酒館，一個全年齡段聊天室！如果你生病了或外出旅行，通過點擊\"在客棧休息\"可以凍結賬號。來跟大家問好吧！",
+ "tourTavernPage": "Welcome to the Tavern, an all-ages chatroom! You can keep your Dailies from hurting you in case of illness or travel by clicking \"Rest in the Inn.\" Come say hi!",
"tourPartyPage": "你的隊伍會使你保持責任心。邀請朋友來解鎖任務捲軸！",
"tourGuildsPage": "公會是有著共同主題的社交團體。找找你感興趣的的主題！我們推薦the Newbies Guild。",
- "tourChallengesPage": "加入一項挑戰意味著在你的帳號上增加一些任務。通過與其它用戶競爭來贏取寶石獎勵！",
+ "tourChallengesPage": "Challenges are themed task lists created by users! Joining a Challenge will add its tasks to your account. Compete against other users to win gem prizes!",
"tourMarketPage": "從4級開始，當你完成任務時，蛋和孵化藥水會隨機掉落。他們會出現在這裡—使用它們來孵化寵物！你也可以從集市購買物品。"
}
\ No newline at end of file
diff --git a/common/locales/zh_TW/quests.json b/common/locales/zh_TW/quests.json
index d44f6f92b1..61fd3be04e 100644
--- a/common/locales/zh_TW/quests.json
+++ b/common/locales/zh_TW/quests.json
@@ -19,7 +19,7 @@
"bossStrength": "Boss的力量",
"collect": "收集",
"collected": "已收集",
- "bossDmg1": "想要攻擊魔王，你必須完成你的每日任務和待辦事項。任務傷害越高，你對魔王的傷害也越大(達成紅色事項、法師的法術、戰士的攻擊等等)。如果你未能完成每日任務，除了本來就會遭受的傷害，魔王會針對你遺漏的事項(乘上魔王的力量)額外再傷害你和你的隊友。所以想要保持隊伍健康，就去完成你的每日任務！ 所有從魔王和你攻擊的傷害將在跨日(一天結束)時結算。 ",
+ "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! All damage to and from a boss is tallied on cron (your day roll-over).",
"bossDmg2": "只有參與者會跟魔王戰鬥，並共享任務獎勵。",
"tavernBossInfo": "想要攻擊世界Boss，你必須完成你的每日任務和待辦事項。任務傷害越高，你對魔王的傷害也越大(達成紅色事項、法師的法術、戰士的攻擊等等)。如果你未能完成每日任務，除了本來就會遭受的傷害，魔王會針對你遺漏的事項(乘上魔王的力量)累積憤怒值。一旦憤怒值達到上限，將會發生相當糟糕的事情─所以好好完成你的每日任務！ 所有從魔王和你攻擊的傷害將在跨日(一天結束)時結算。 ",
"bossColl1": "要撿到物品，你必須完成你的「正向」任務。任務獎勵品會像普通物品一樣掉落；但要在隔天才看到。你撿到的物品會被計算並累積到戰利品堆當中。",
diff --git a/common/locales/zh_TW/spells.json b/common/locales/zh_TW/spells.json
index b6ff8afd4d..7c6fb57408 100644
--- a/common/locales/zh_TW/spells.json
+++ b/common/locales/zh_TW/spells.json
@@ -1,6 +1,6 @@
{
"spellWizardFireballText": "火焰爆轟",
- "spellWizardFireballNotes": "Flames burst from your hands. You gain XP, and you deal extra damage to Bosses! Click on a task to cast. (Based on: INT)",
+ "spellWizardFireballNotes": "你的手中冒出爆裂火焰。你會獲得經驗值，並且額外對Boss造成傷害！在任務上點擊後施放(加成：智力 )",
"spellWizardMPHealText": "澎湃靈泉",
"spellWizardMPHealNotes": "你犧牲魔力來幫助你的朋友。隊伍的其他人會獲得MP！(加成：智力)",
"spellWizardEarthText": "地震",
@@ -8,7 +8,7 @@
"spellWizardFrostText": "極寒霜凍",
"spellWizardFrostNotes": "以冰雪覆蓋任務。沒任何的連擊會在明天變成零！(使用後套用全部的任務)",
"spellWarriorSmashText": "致命一擊",
- "spellWarriorSmashNotes": "You hit a task with all of your might. It gets more blue/less red, and you deal extra damage to Bosses! Click on a task to cast. (Based on: STR)",
+ "spellWarriorSmashNotes": "你盡全力打一個任務。它變得更藍或更不紅，並且額外對Boss造成傷害！在任務上點擊後施放(加成：力量 )",
"spellWarriorDefensiveStanceText": "防禦姿態",
"spellWarriorDefensiveStanceNotes": "你準備好受到未完任務的反衝。你獲得一個體質的增益效果！(加成：體質－不加增益效果)",
"spellWarriorValorousPresenceText": "英勇現身",
@@ -16,9 +16,9 @@
"spellWarriorIntimidateText": "威懾凝視",
"spellWarriorIntimidateNotes": "你用目光恐嚇你的敵人。全隊獲得一個體質的增益效果！(加成：體質－不加增益效果)",
"spellRoguePickPocketText": "扒竊",
- "spellRoguePickPocketNotes": "You rob a nearby task. You gain gold! Click on a task to cast. (Based on: PER)",
+ "spellRoguePickPocketNotes": "你偷了附近的任務以獲得金幣！在任務上點擊後施放(加成：感知)",
"spellRogueBackStabText": "背刺",
- "spellRogueBackStabNotes": "You betray a foolish task. You gain gold and XP! Click on a task to cast. (Based on: STR)",
+ "spellRogueBackStabNotes": "你背叛了一個愚蠢的任務。你獲得金幣和經驗值！在任務上點擊後施放(加成：力量)",
"spellRogueToolsOfTradeText": "社交手段",
"spellRogueToolsOfTradeNotes": "你與朋友分享自己的才華。你隊伍獲得一個感知的增益效果！(加成：感知－不加增益效果)",
"spellRogueStealthText": "潛行",
diff --git a/common/locales/zh_TW/tasks.json b/common/locales/zh_TW/tasks.json
index 923b06f94a..a3b3b9ecc8 100644
--- a/common/locales/zh_TW/tasks.json
+++ b/common/locales/zh_TW/tasks.json
@@ -14,7 +14,7 @@
"save": "儲存",
"addChecklist": "增加清單",
"checklist": "清單",
- "checklistText": "將每日任務分成數個小事項後，完成部分小事項可以降低每日任務未完成的懲罰傷害。例如，一個 4 事項任務，完成其中3個的話，傷害會減低到 25%。\n至於待辦事項，小事項可以帶來增幅，例如，3 個小事項代表額外的 3 份（總共 4 份）的經驗值、金幣和魔力。",
+ "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.",
"expandCollapse": "展開 / 縮合",
"text": " 標題",
"extraNotes": "說明",
@@ -22,7 +22,7 @@
"advancedOptions": "進階選項",
"difficulty": "難度",
"difficultyHelpTitle": "此項任務有多難？",
- "difficultyHelpContent": "這將獲得加成的經驗值。建議儘量少用，你大可放心地相信我們對任務難度報酬的計算。不過有些任務的確更有價值 ( 寫論文 vs. 剔牙縫 )。 點擊此處以了解更多資訊。",
+ "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!",
"easy": "簡單",
"medium": "中等",
"hard": "困難",
diff --git a/common/script/content.coffee b/common/script/content.coffee
index cc415e054d..30a0760b87 100644
--- a/common/script/content.coffee
+++ b/common/script/content.coffee
@@ -140,6 +140,9 @@ gear =
201502: text: t('weaponMystery201502Text'), notes: t('weaponMystery201502Notes'), mystery:'201502', value: 0
201505: text: t('weaponMystery201505Text'), notes: t('weaponMystery201505Notes'), mystery:'201505', value: 0
301404: text: t('weaponMystery301404Text'), notes: t('weaponMystery301404Notes'), mystery:'301404', value: 0
+ armoire:
+ basicCrossbow: text: t('weaponArmoireBasicCrossbowText'), notes: t('weaponArmoireBasicCrossbowNotes', {str: 5, per: 5, con: 5}), value: 100, str: 5, per: 5, con: 5, canOwn: ((u)-> u.items.gear.owned.weapon_armoire_basicCrossbow?)
+ lunarSceptre: text: t('weaponArmoireLunarSceptreText'), notes: t('weaponArmoireLunarSceptreNotes', {con: 7, int: 7}), value: 100, con: 7, int: 7, set: 'soothing', canOwn: ((u)-> u.items.gear.owned.weapon_armoire_lunarSceptre?)
armor:
base:
@@ -224,6 +227,9 @@ gear =
201503: text: t('armorMystery201503Text'), notes: t('armorMystery201503Notes'), mystery:'201503', value: 0
201504: text: t('armorMystery201504Text'), notes: t('armorMystery201504Notes'), mystery:'201504', value: 0
301404: text: t('armorMystery301404Text'), notes: t('armorMystery301404Notes'), mystery:'301404', value: 0
+ armoire:
+ lunarArmor: text: t('armorArmoireLunarArmorText'), notes: t('armorArmoireLunarArmorNotes', {str: 7, int: 7}), value: 100, str: 7, int: 7, set: 'soothing', canOwn: ((u)-> u.items.gear.owned.armor_armoire_lunarArmor?)
+ gladiatorArmor: text: t('armorArmoireGladiatorArmorText'), notes: t('armorArmoireGladiatorArmorNotes', {str: 7, per: 7}), value: 100, str: 7, per: 7, set: 'gladiator', canOwn: ((u)-> u.items.gear.owned.armor_armoire_gladiatorArmor?)
head:
base:
@@ -306,6 +312,12 @@ gear =
201505: text: t('headMystery201505Text'), notes: t('headMystery201505Notes'), mystery:'201505', value: 0
301404: text: t('headMystery301404Text'), notes: t('headMystery301404Notes'), mystery:'301404', value: 0
301405: text: t('headMystery301405Text'), notes: t('headMystery301405Notes'), mystery:'301405', value: 0
+ armoire:
+ lunarCrown: text: t('headArmoireLunarCrownText'), notes: t('headArmoireLunarCrownNotes', {con: 7, per: 7}), value: 100, con: 7, per: 7, set: 'soothing', canOwn: ((u)-> u.items.gear.owned.head_armoire_lunarCrown?)
+ redHairbow: text: t('headArmoireRedHairbowText'), notes: t('headArmoireRedHairbowNotes', {str: 5, int: 5, con: 5}), value: 100, str: 5, int: 5, con: 5, canOwn: ((u)-> u.items.gear.owned.head_armoire_redHairbow?)
+ violetFloppyHat: text: t('headArmoireVioletFloppyHatText'), notes: t('headArmoireVioletFloppyHatNotes', {per: 5, int: 5, con: 5}), value: 100, per: 5, int: 5, con: 5, canOwn: ((u)-> u.items.gear.owned.head_armoire_violetFloppyHat?)
+ gladiatorHelm: text: t('headArmoireGladiatorHelmText'), notes: t('headArmoireGladiatorHelmNotes', {per: 7, int: 7}), value: 100, per: 7, int: 7, set: 'gladiator', canOwn: ((u)-> u.items.gear.owned.head_armoire_gladiatorHelm?)
+ rancherHat: text: t('headArmoireRancherHatText'), notes: t('headArmoireRancherHatNotes', {str: 5, per: 5, int: 5}), value: 100, str: 5, per: 5, int: 5, canOwn: ((u)-> u.items.gear.owned.head_armoire_rancherHat?)
shield:
base:
@@ -365,6 +377,8 @@ gear =
spring2015Healer: event: events.spring2015, specialClass: 'healer', text: t('shieldSpecialSpring2015HealerText'), notes: t('shieldSpecialSpring2015HealerNotes', {con: 9}), value: 70, con: 9
mystery:
301405: text: t('shieldMystery301405Text'), notes: t('shieldMystery301405Notes'), mystery:'301405', value: 0
+ armoire:
+ gladiatorShield: text: t('shieldArmoireGladiatorShieldText'), notes: t('shieldArmoireGladiatorShieldNotes', {con: 5, str: 5}), value: 100, con: 5, str: 5, set: 'gladiator', canOwn: ((u)-> u.items.gear.owned.shield_armoire_gladiatorShield?)
back:
base:
@@ -442,7 +456,7 @@ api.gear =
flat: {}
_.each gearTypes, (type) ->
- _.each classes.concat(['base', 'special', 'mystery']), (klass) ->
+ _.each classes.concat(['base', 'special', 'mystery', 'armoire']), (klass) ->
# add "type" to each item, so we can reference that as "weapon" or "armor" in the html
_.each gear[type][klass], (item, i) ->
key = "#{type}_#{klass}_#{i}"
@@ -475,11 +489,12 @@ api.timeTravelerStore = (owned) ->
###
---------------------------------------------------------------
- Potion
+ Unique Rewards: Potion and Armoire
---------------------------------------------------------------
###
api.potion = type: 'potion', text: t('potionText'), notes: t('potionNotes'), value: 25, key: 'potion'
+api.armoire = type: 'armoire', text: t('armoireText'), notes: t('armoireNotesEmpty'), value: 100, key: 'armoire', canOwn: ((u)-> _.contains(u.achievements.ultimateGearSets, true))
###
---------------------------------------------------------------
@@ -1840,6 +1855,16 @@ api.backgrounds =
pagodas:
text: t('backgroundPagodasText')
notes: t('backgroundPagodasNotes')
+ backgrounds062015:
+ drifting_raft:
+ text: t('backgroundDriftingRaftText')
+ notes: t('backgroundDriftingRaftNotes')
+ shimmery_bubbles:
+ text: t('backgroundShimmeryBubblesText')
+ notes: t('backgroundShimmeryBubblesNotes')
+ island_waterfalls:
+ text: t('backgroundIslandWaterfallsText')
+ notes: t('backgroundIslandWaterfallsNotes')
api.subscriptionBlocks =
basic_earned: months:1, price:5
@@ -1852,9 +1877,9 @@ _.each api.subscriptionBlocks, (b,k)->b.key = k
repeat = {m:true,t:true,w:true,th:true,f:true,s:true,su:true}
api.userDefaults =
habits: [
- {type: 'habit', text: t('defaultHabit1Text'), notes: t('defaultHabit1Notes'), value: 0, up: true, down: false, attribute: 'str' }
- {type: 'habit', text: t('defaultHabit2Text'), notes: t('defaultHabit2Notes'), value: 0, up: false, down: true, attribute: 'str'}
- {type: 'habit', text: t('defaultHabit3Text'), notes: t('defaultHabit3Notes'), value: 0, up: true, down: true, attribute: 'str'}
+ {type: 'habit', text: t('defaultHabit1Text'), value: 0, up: true, down: false, attribute: 'per' }
+ {type: 'habit', text: t('defaultHabit2Text'), value: 0, up: false, down: true, attribute: 'str'}
+ {type: 'habit', text: t('defaultHabit3Text'), value: 0, up: true, down: true, attribute: 'str'}
]
dailys: [
@@ -1873,7 +1898,7 @@ api.userDefaults =
]
rewards: [
-# {type: 'reward', text: t('defaultReward1Text'), notes: t('defaultReward1Notes'), value: 20 }
+ {type: 'reward', text: t('defaultReward1Text'), value: 10 }
# {type: 'reward', text: t('defaultReward2Text'), notes: t('defaultReward2Notes'), value: 10 }
]
diff --git a/common/script/index.coffee b/common/script/index.coffee
index 29833b0fc2..e18df3dd3f 100644
--- a/common/script/index.coffee
+++ b/common/script/index.coffee
@@ -72,13 +72,37 @@ api.daysSince = (yesterday, options = {}) ->
Math.abs api.startOfDay(_.defaults {now:yesterday}, o).diff(api.startOfDay(_.defaults {now:o.now}, o), 'days')
###
- Should the user do this taks on this date, given the task's repeat options and user.preferences.dayStart?
+ Should the user do this task on this date, given the task's repeat options and user.preferences.dayStart?
###
-api.shouldDo = (day, repeat, options={}) ->
- return false unless repeat
+api.shouldDo = (day, dailyTask, options = {}) ->
+ return false unless dailyTask.type == 'daily' && dailyTask.repeat
+ if !dailyTask.startDate
+ dailyTask.startDate = moment().toDate()
+ if dailyTask.startDate instanceof String
+ dailyTask.startDate = moment(dailyTask.startDate).toDate()
o = sanitizeOptions options
- selected = repeat[api.dayMapping[api.startOfDay(_.defaults {now:day}, o).day()]]
- return selected
+ day = api.startOfDay(_.defaults {now:day}, o)
+ dayOfWeekNum = day.day() # e.g. 1 for Monday if week starts on Mon
+
+ # check if event is today or in the future
+ hasStartedCheck = day >= api.startOfDay(_.defaults {now:dailyTask.startDate}, o)
+
+ if dailyTask.frequency == 'daily'
+ daysSinceTaskStart = api.numDaysApart(day.startOf('day'), dailyTask.startDate, o)
+ everyXCheck = (daysSinceTaskStart % dailyTask.everyX == 0)
+ return everyXCheck && hasStartedCheck
+ else if dailyTask.frequency == 'weekly'
+ dayOfWeekCheck = dailyTask.repeat[api.dayMapping[dayOfWeekNum]]
+ return dayOfWeekCheck && hasStartedCheck
+ else
+ # unexpected frequency string
+ return false
+
+api.numDaysApart = (day1, day2, o) ->
+ startOfDay1 = api.startOfDay(_.defaults {now:day1}, o)
+ startOfDay2 = api.startOfDay(_.defaults {now:day2}, o)
+ numDays = Math.abs(startOfDay1.diff(startOfDay2, 'days'))
+ return numDays
###
------------------------------------------------------
@@ -164,8 +188,9 @@ api.updateStore = (user) ->
true
# Add special items (contrib gear, backer gear, etc)
changes = changes.concat _.filter content.gear.flat, (v) ->
- v.klass in ['special','mystery'] and !user.items.gear.owned[v.key] and v.canOwn?(user)
+ v.klass in ['special','mystery','armoire'] and !user.items.gear.owned[v.key] and v.canOwn?(user)
changes.push content.potion
+ if user.flags.armoireEnabled then changes.push content.armoire
# Return sorted store (array)
_.sortBy changes, (c)->sortOrder[c.type]
@@ -210,7 +235,7 @@ api.taskDefaults = (task={}) ->
_.defaults(task, {up:true,down:true}) if task.type is 'habit'
_.defaults(task, {history: []}) if task.type in ['habit', 'daily']
_.defaults(task, {completed:false}) if task.type in ['daily', 'todo']
- _.defaults(task, {streak:0, repeat: {su:1,m:1,t:1,w:1,th:1,f:1,s:1}}) if task.type is 'daily'
+ _.defaults(task, {streak:0, repeat: {su:1,m:1,t:1,w:1,th:1,f:1,s:1}}, startDate: new Date(), everyX: 1, frequency: 'weekly') if task.type is 'daily'
task._id = task.id # may need this for TaskSchema if we go back to using it, see http://goo.gl/a5irq4
task.value ?= if task.type is 'reward' then 10 else 0
task.priority = 1 unless _.isNumber(task.priority) # hotfix for apiv1. once we're off apiv1, we can remove this
@@ -280,7 +305,7 @@ api.taskClasses = (task, filters=[], dayStart=0, lastCron=+new Date, showComplet
# show as completed if completed (naturally) or not required for today
if type in ['todo', 'daily']
- if completed or (type is 'daily' and !api.shouldDo(+new Date, task.repeat, {dayStart}))
+ if completed or (type is 'daily' and !api.shouldDo(+new Date, task, {dayStart}))
classes += " completed"
else
classes += " uncompleted"
@@ -361,6 +386,10 @@ api.countTriad = (pets) ->
if pets[egg + "-" + potion] > 0 then count3++
count3
+api.countArmoire = (gear) ->
+ count = _.size(_.filter(content.gear.flat, ((i)->i.klass is 'armoire' and !gear[i.key])))
+ count
+
###
------------------------------------------------------
User (prototype wrapper to give it ops, helper funcs, and virtuals
@@ -441,7 +470,7 @@ api.wrap = (user, main=true) ->
if v
itm = content.gear.flat[''+k]
if itm
- if (itm.value > 0 || k == 'weapon_warrior_0') && ( itm.klass == cl || ( itm.klass == 'special' && (! itm.specialClass || itm.specialClass == cl) ) )
+ if (itm.value > 0 || k == 'weapon_warrior_0') && ( itm.klass == cl || ( itm.klass == 'special' && (! itm.specialClass || itm.specialClass == cl) ) || itm.klass == 'armoire' )
losableItems[''+k]=''+k
lostItem = user.fns.randomVal losableItems
if item = content.gear.flat[lostItem]
@@ -449,6 +478,7 @@ api.wrap = (user, main=true) ->
user.items.gear.equipped[item.type] = "#{item.type}_base_0" if user.items.gear.equipped[item.type] is lostItem
user.items.gear.costume[item.type] = "#{item.type}_base_0" if user.items.gear.costume[item.type] is lostItem
user.markModified? 'items.gear'
+ mixpanel?.track('Death',{'lostItem':lostItem})
cb? (if item then {code:200,message: i18n.t('messageLostItem', {itemText: item.text(req.language)}, req.language)} else null), user
reset: (req, cb) ->
@@ -483,6 +513,7 @@ api.wrap = (user, main=true) ->
task.value = 0
user.stats.hp = 50
cb? null, user
+ mixpanel?.track("Acquire Item",{'itemName':'Fortify','acquireMethod':'Gems','gemCost':4})
ga?.event('behavior', 'gems', 'reroll').send()
rebirth: (req, cb, ga) ->
@@ -492,6 +523,8 @@ api.wrap = (user, main=true) ->
# only charge people if they are under the max level - ryan
if user.stats.lvl < api.maxLevel
user.balance -= 2
+ mixpanel?.track("Acquire Item",{'itemName':'Rebirth','acquireMethod':'Gems','gemCost':8})
+ ga?.event('behavior', 'gems', 'rebirth').send()
# Save off user's level, for calculating achievement eligibility later
lvl = api.capByLevel(user.stats.lvl)
# Turn tasks yellow, zero out streaks
@@ -525,7 +558,7 @@ api.wrap = (user, main=true) ->
user.preferences.costume = false
# Remove unlocked features
flags = user.flags
- if not (user.achievements.ultimateGear or user.achievements.beastMaster)
+ if not user.achievements.beastMaster
flags.rebirthEnabled = false
flags.itemsEnabled = false
flags.dropsEnabled = false
@@ -541,7 +574,6 @@ api.wrap = (user, main=true) ->
user.stats.buffs = {}
# user.markModified? 'stats'
cb? null, user
- ga?.event('behavior', 'gems', 'rebirth').send()
allocateNow: (req, cb) ->
_.times user.stats.points, user.fns.autoAllocate
@@ -588,6 +620,7 @@ api.wrap = (user, main=true) ->
addTask: (req, cb) ->
task = api.taskDefaults(req.body)
+ return cb?({code:409,message:i18n.t('messageDuplicateTaskID', req.language)}) if user.tasks[task.id]?
user["#{task.type}s"].unshift(task)
if user.preferences.newTaskEdit then task._editing = true
if user.preferences.tagsCollapsed then task._tags = true
@@ -752,7 +785,8 @@ api.wrap = (user, main=true) ->
user.balance += .25
user.purchased.plan.gemsBought++
user.stats.gp -= convRate
- return cb? {code:200,message:"+1 Gems"}, _.pick(user,$w 'stats balance')
+ mixpanel?.track("Acquire Item",{'itemName':key,'acquireMethod':'Gold','goldCost':convRate})
+ return cb? {code:200,message:"+1 Gem"}, _.pick(user,$w 'stats balance')
return cb?({code:404,message:":type must be in [eggs,hatchingPotions,food,quests,gear]"},req) unless type in ['eggs','hatchingPotions','food','quests','gear']
if type is 'gear'
@@ -769,6 +803,7 @@ api.wrap = (user, main=true) ->
else
user.items[type][key] = 0 unless user.items[type][key] > 0
user.items[type][key]++
+ mixpanel?.track("Acquire Item",{'itemName':key,'acquireMethod':'Gems','gemCost':item.value})
cb? null, _.pick(user,$w 'items balance')
ga?.event('behavior', 'gems', key).send()
@@ -784,6 +819,7 @@ api.wrap = (user, main=true) ->
user.achievements.beastMasterCount++
user.items.currentPet = ""
cb? null, user
+ mixpanel?.track("Acquire Item",{'itemName':'Kennel Key','acquireMethod':'Gems','gemCost':4})
releaseMounts: (req, cb) ->
if user.balance < 1
@@ -797,6 +833,7 @@ api.wrap = (user, main=true) ->
user.achievements.mountMasterCount = 0
user.achievements.mountMasterCount++
cb? null, user
+ mixpanel?.track("Acquire Item",{'itemName':'Kennel Key','acquireMethod':'Gems','gemCost':4})
releaseBoth: (req, cb) ->
if user.balance < 1.5 and not user.achievements.triadBingo
@@ -804,6 +841,7 @@ api.wrap = (user, main=true) ->
else
giveTriadBingo = true
if not user.achievements.triadBingo
+ mixpanel?.track("Acquire Item",{'itemName':'Kennel Key','acquireMethod':'Gems','gemCost':6})
user.balance -= 1.5
user.items.currentMount = ""
user.items.currentPet = ""
@@ -827,22 +865,45 @@ api.wrap = (user, main=true) ->
buy: (req, cb) ->
{key} = req.params
- item = if key is 'potion' then content.potion else content.gear.flat[key]
+ item = if key is 'potion' then content.potion
+ else if key is 'armoire' then content.armoire
+ else content.gear.flat[key]
return cb?({code:404, message:"Item '#{key} not found (see https://github.com/HabitRPG/habitrpg-shared/blob/develop/script/content.coffee)"}) unless item
return cb?({code:401, message: i18n.t('messageNotEnoughGold', req.language)}) if user.stats.gp < item.value
- return cb?({code:401, message: "You can't own this item"}) if item.canOwn? and !item.canOwn(user)
+ return cb?({code:401, message: "You can't buy this item"}) if item.canOwn? and !item.canOwn(user)
if item.key is 'potion'
user.stats.hp += 15
user.stats.hp = 50 if user.stats.hp > 50
+ else if item.key is 'armoire'
+ armoireResult = user.fns.predictableRandom(user.stats.gp)
+ # We use a different seed to choose the Armoire action than we use
+ # to choose the sub-action, otherwise only some of the foods can
+ # be given. E.g., if a seed gives armoireResult < .5 (food) then
+ # the same seed would give one of the first five foods only.
+ eligibleEquipment = _.filter(content.gear.flat, ((i)->i.klass is 'armoire' and !user.items.gear.owned[i.key]))
+ if !_.isEmpty(eligibleEquipment) and (armoireResult < .6 or !user.flags.armoireOpened)
+ drop = user.fns.randomVal(eligibleEquipment)
+ user.items.gear.owned[drop.key] = true
+ user.flags.armoireOpened = true
+ message = i18n.t('armoireEquipment', {image: '', dropText: drop.text(req.language)}, req.language)
+ if api.countArmoire(user.items.gear.owned) is 0 then user.flags.armoireEmpty = true
+ else if (!_.isEmpty(eligibleEquipment) and armoireResult < .8) or armoireResult < .5
+ drop = user.fns.randomVal _.where(content.food, {canDrop:true})
+ user.items.food[drop.key] ?= 0
+ user.items.food[drop.key] += 1
+ message = i18n.t('armoireFood', {image: '', dropArticle: drop.article, dropText: drop.text(req.language)}, req.language)
+ else
+ user.stats.exp += Math.floor(user.fns.predictableRandom(user.stats.exp) * 40 + 10)
+ message = i18n.t('armoireExp', req.language)
else
user.items.gear.equipped[item.type] = item.key
user.items.gear.owned[item.key] = true
message = user.fns.handleTwoHanded(item, null, req)
message ?= i18n.t('messageBought', {itemText: item.text(req.language)}, req.language)
- if not user.achievements.ultimateGear and item.last
- user.fns.ultimateGear()
+ if item.last then user.fns.ultimateGear()
user.stats.gp -= item.value
- cb? {code:200, message}, _.pick(user,$w 'items achievements stats')
+ mixpanel?.track("Acquire Item",{'itemName':key,'acquireMethod':'Gold','goldCost':item.value})
+ cb? {code:200, message}, _.pick(user,$w 'items achievements stats flags')
buyMysterySet: (req, cb)->
return cb?({code:401, message:"You don't have enough Mystic Hourglasses"}) unless user.purchased.plan.consecutive.trinkets>0
@@ -850,7 +911,9 @@ api.wrap = (user, main=true) ->
if window?.confirm?
return unless window.confirm("Buy this full set of items for 1 Mystic Hourglass?")
return cb?({code:404, message:"Mystery set not found, or set already owned"}) unless mysterySet
- _.each mysterySet.items, (i)->user.items.gear.owned[i.key]=true
+ _.each mysterySet.items, (i)->
+ user.items.gear.owned[i.key]=true
+ mixpanel?.track("Acquire Item",{'itemName':i.key,'acquireMethod':'Hourglass'})
user.purchased.plan.consecutive.trinkets--
cb? null, _.pick(user,$w 'items purchased.plan.consecutive')
@@ -922,6 +985,7 @@ api.wrap = (user, main=true) ->
user.balance -= cost
if ~path.indexOf('gear.') then user.markModified? 'gear.owned' else user.markModified? 'purchased'
cb? null, _.pick(user,$w 'purchased preferences items')
+ mixpanel?.track("Acquire Item",{'itemName':'Customizations','acquireMethod':'Gems','gemCost':(cost / .25)})
ga?.event('behavior', 'gems', path).send()
# ------
@@ -961,6 +1025,7 @@ api.wrap = (user, main=true) ->
user.balance -= .75
_.merge user.stats, {str: 0, con: 0, per: 0, int: 0, points: api.capByLevel(user.stats.lvl)}
user.flags.classSelected = false
+ mixpanel?.track("Acquire Item",{'itemName':klass,'acquireMethod':'Gems','gemCost':3})
ga?.event('behavior', 'gems', 'changeClass').send()
#'stats.points': this is handled on the server
cb? null, _.pick(user,$w 'stats flags items preferences')
@@ -1444,10 +1509,11 @@ api.wrap = (user, main=true) ->
user.items.quests[k]++
(user.flags.levelDrops ?= {})[k] = true
user.markModified? 'flags.levelDrops'
+ mixpanel?.track("Acquire Item",{'itemName':k,'acquireMethod':'Drop'})
user._tmp.drop = _.defaults content.quests[k],
type: 'Quest'
dialog: i18n.t('messageFoundQuest', {questText: content.quests[k].text(req.language)}, req.language)
- if !user.flags.rebirthEnabled and (user.stats.lvl >= 50 or user.achievements.ultimateGear or user.achievements.beastMaster)
+ if !user.flags.rebirthEnabled and (user.stats.lvl >= 50 or user.achievements.beastMaster)
user.flags.rebirthEnabled = true
if user.stats.lvl >= api.maxLevel and !user.flags.freeRebirth
user.flags.freeRebirth = true
@@ -1523,7 +1589,7 @@ api.wrap = (user, main=true) ->
{completed, repeat} = daily
thatDay = moment(now).subtract({days: 1})
- if api.shouldDo(thatDay, repeat, user.preferences) || completed
+ if api.shouldDo(thatDay.toDate(), daily, user.preferences) || completed
_.each daily.checklist, ((box)->box.completed=false;true)
daily.completed = false
return
@@ -1550,7 +1616,7 @@ api.wrap = (user, main=true) ->
scheduleMisses = 0
_.times daysMissed, (n) ->
thatDay = moment(now).subtract({days: n + 1})
- if api.shouldDo(thatDay, repeat, user.preferences)
+ if api.shouldDo(thatDay.toDate(), task, user.preferences)
scheduleMisses++
if user.stats.buffs.stealth
user.stats.buffs.stealth--
@@ -1621,6 +1687,7 @@ api.wrap = (user, main=true) ->
# Analytics
user.flags.cronCount?=0
user.flags.cronCount++
+ options.mixpanel?.track('Cron',{'distinct_id':user._id,'resting':user.preferences.sleep})
options.ga?.event('behavior', 'cron', 'cron', user.flags.cronCount).send(); #TODO userId for cohort
# After all is said and done, progress up user's effect on quest, return those values & reset the user's
@@ -1645,32 +1712,20 @@ api.wrap = (user, main=true) ->
# ----------------------------------------------------------------------
# Achievements
# ----------------------------------------------------------------------
- ultimateGear: () ->
- # on the server this is a LoDash transform, on the client its an object
- gear = if window? then user.items.gear.owned else user.items.gear.owned.toObject()
- ownedLastGear = _.chain(content.gear.flat)
- .pick(_.keys gear)
- .values()
- .filter (gear) -> gear.last
-
- lastGearClassTypeMatrix = {}
- _.each content.classes, (klass) ->
- lastGearClassTypeMatrix[klass] = {}
- #_.each content.gearTypes, (type) ->
- _.each ['armor', 'weapon', 'shield', 'head'], (type) ->
- lastGearClassTypeMatrix[klass][type] = false
- return true # false exits the each loop early
-
- ownedLastGear.each (gear) ->
- lastGearClassTypeMatrix[gear.klass]["shield"] = true if gear.twoHanded
- lastGearClassTypeMatrix[gear.klass][gear.type] = true
-
- shouldGrant = _(lastGearClassTypeMatrix)
- .values()
- .reduce(((ans, klass) -> ans or _(klass).values().reduce(((ans, gearType) -> ans and gearType), true)), false)
- .valueOf()
-
- user.achievements.ultimateGear = shouldGrant
+ ultimateGear: ->
+ # on the server this is a Lodash transform, on the client its an object
+ owned = if window? then user.items.gear.owned else user.items.gear.owned.toObject()
+ user.achievements.ultimateGearSets ?= {healer: false, wizard: false, rogue: false, warrior: false}
+ content.classes.forEach (klass) ->
+ if user.achievements.ultimateGearSets[klass] is not true
+ user.achievements.ultimateGearSets[klass] = _.reduce ['armor', 'shield', 'head', 'weapon'], (soFarGood, type) ->
+ found = _.find content.gear.tree[type][klass], {last:true}
+ soFarGood and (!found or owned[found.key]==true) #!found only true when weapon is two-handed (mages)
+ , true # start with true, else `and` will fail right away
+ user.markModified? 'achievements.ultimateGearSets'
+ if _.contains(user.achievements.ultimateGearSets, true) and user.flags.armoireEnabled != true
+ user.flags.armoireEnabled = true
+ user.markModified? 'flags'
nullify: ->
user.ops = null
diff --git a/config.json.example b/config.json.example
index fd72ea4ce9..5bc26812d0 100644
--- a/config.json.example
+++ b/config.json.example
@@ -21,7 +21,8 @@
"NEW_RELIC_APPLICATION_ID":"NEW_RELIC_APPLICATION_ID",
"NEW_RELIC_API_KEY":"NEW_RELIC_API_KEY",
"GA_ID": "GA_ID",
- "FLAG_REPORT_EMAIL": "email@mod.com",
+ "MP_ID": "MP_ID",
+ "FLAG_REPORT_EMAIL": ["email@mod.com"],
"EMAIL_SERVER": {
"url": "http://example.com",
"authUser": "user",
diff --git a/gulpfile.js b/gulpfile.js
new file mode 100644
index 0000000000..cfb10a3e9e
--- /dev/null
+++ b/gulpfile.js
@@ -0,0 +1,11 @@
+/*
+ * Note: You probably don't need to edit this file. Instead, add your gulp
+ * tasks with the ./tasks directory, where tasks are grouped by their
+ * particular purpose. If you feel like your task doesn't fit within the
+ * existing files, feel free to create a "gulp-thing.js" file within that
+ * directory, and it will automatically be included.
+ */
+
+require('babel/register');
+require('glob').sync('./tasks/gulp-*').forEach(require);
+require('gulp').task('default', ['test']);
diff --git a/karma.conf.js b/karma.conf.js
index 46144335c2..86b5da0a27 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -12,6 +12,7 @@ module.exports = function(config) {
// list of files / patterns to load in the browser
files: [
'website/public/bower_components/jquery/dist/jquery.js',
+ 'website/public/bower_components/pnotify/jquery.pnotify.js',
'website/public/bower_components/angular/angular.js',
'website/public/bower_components/angular-loading-bar/build/loading-bar.min.js',
'website/public/bower_components/angular-resource/angular-resource.min.js',
@@ -34,7 +35,7 @@ module.exports = function(config) {
'website/public/bower_components/js-emoji/emoji.js',
'common/dist/scripts/habitrpg-shared.js',
- "test/spec/translations.js",
+ "test/spec/mocks/translations.js",
"website/public/js/env.js",
@@ -51,9 +52,20 @@ module.exports = function(config) {
"website/public/js/services/challengeServices.js",
"website/public/js/services/paymentServices.js",
- "website/public/js/filters/filters.js",
+ "website/public/js/filters/money.js",
+ "website/public/js/filters/roundLargeNumbers.js",
+ "website/public/js/filters/taskOrdering.js",
- "website/public/js/directives/directives.js",
+ "website/public/js/directives/focus-me.directive.js",
+ "website/public/js/directives/from-now.directive.js",
+ "website/public/js/directives/habitrpg-tasks.directive.js",
+ "website/public/js/directives/hrpg-sort-checklist.directive.js",
+ "website/public/js/directives/hrpg-sort-tags.directive.js",
+ "website/public/js/directives/hrpg-sort-tasks.directive.js",
+ "website/public/js/directives/popover-html-popup.directive.js",
+ "website/public/js/directives/popover-html.directive.js",
+ "website/public/js/directives/task-focus.directive.js",
+ "website/public/js/directives/when-scrolled.directive.js",
"website/public/js/controllers/authCtrl.js",
"website/public/js/controllers/notificationCtrl.js",
@@ -68,10 +80,9 @@ module.exports = function(config) {
"website/public/js/controllers/footerCtrl.js",
"website/public/js/controllers/challengesCtrl.js",
"website/public/js/controllers/hallCtrl.js",
- // @TODO where did this directory go?
- //'test/mock/**/*.js',
+ 'test/spec/mocks/**/*.js',
'test/spec/specHelper.js',
- 'test/spec/*.js'
+ 'test/spec/**/*.js'
],
// list of files / patterns to exclude
@@ -99,8 +110,17 @@ module.exports = function(config) {
// - IE (only Windows)
browsers: ['PhantomJS'],
+ preprocessors: {
+ 'website/public/js/**/*.js': ['coverage']
+ },
+
+ coverageReporter: {
+ type: 'lcov',
+ dir: 'coverage/karma'
+ },
+
// Enable mocha-style reporting, for better test visibility
- reporters: ['mocha'],
+ reporters: ['mocha', 'coverage'],
// Continuous Integration mode
// if true, it capture browsers, run tests and exit
diff --git a/migrations/20150604_ultimateGearSets.js b/migrations/20150604_ultimateGearSets.js
new file mode 100644
index 0000000000..2a060dcb68
--- /dev/null
+++ b/migrations/20150604_ultimateGearSets.js
@@ -0,0 +1,118 @@
+/**
+ * Created by Sabe on 6/3/2015.
+ */
+
+var migrationName = '20150604_ultimateGearSets';
+var authorName = process.env.AUTHOR_NAME || 'Sabe'; // in case script author needs to know when their ...
+var authorUuid = process.env.AUTHOR_UUID || '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done
+
+/*
+ * grant the new ultimateGearSets achievement for existing users' collected equipment
+ */
+
+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');
+
+var fields = {
+ 'achievements.ultimateGearSets':1,
+ 'items.gear.owned':1
+};
+
+var query = {
+ // 'auth.timestamps.loggedin':{$lte:new Date('2015-05-22')},
+ $or: [
+ {'items.gear.owned.weapon_wizard_6': {$exists: true}},
+ {'items.gear.owned.armor_wizard_5': {$exists: true}},
+ {'items.gear.owned.head_wizard_5': {$exists: true}},
+ {'items.gear.owned.weapon_warrior_6': {$exists: true}},
+ {'items.gear.owned.armor_warrior_5': {$exists: true}},
+ {'items.gear.owned.head_warrior_5': {$exists: true}},
+ {'items.gear.owned.shield_warrior_5': {$exists: true}},
+ {'items.gear.owned.weapon_healer_6': {$exists: true}},
+ {'items.gear.owned.armor_healer_5': {$exists: true}},
+ {'items.gear.owned.head_healer_5': {$exists: true}},
+ {'items.gear.owned.shield_healer_5': {$exists: true}},
+ {'items.gear.owned.weapon_rogue_6': {$exists: true}},
+ {'items.gear.owned.armor_rogue_5': {$exists: true}},
+ {'items.gear.owned.head_rogue_5': {$exists: true}},
+ {'items.gear.owned.shield_rogue_6': {$exists: true}}
+ ]
+};
+
+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++;
+
+ var achievements = {};
+ var changeUser = false;
+ if ( (typeof user.items.gear.owned.weapon_wizard_6 !== 'undefined')
+ && (typeof user.items.gear.owned.armor_wizard_5 !== 'undefined')
+ && (typeof user.items.gear.owned.head_wizard_5 !== 'undefined')
+ ) {
+ achievements['wizard'] = true;
+ changeUser = true;
+ }
+ if ( (typeof user.items.gear.owned.weapon_warrior_6 !== 'undefined')
+ && (typeof user.items.gear.owned.armor_warrior_5 !== 'undefined')
+ && (typeof user.items.gear.owned.head_warrior_5 !== 'undefined')
+ && (typeof user.items.gear.owned.shield_warrior_5 !== 'undefined')
+ ) {
+ achievements['warrior'] = true;
+ changeUser = true;
+ }
+ if ( (typeof user.items.gear.owned.weapon_healer_6 !== 'undefined')
+ && (typeof user.items.gear.owned.armor_healer_5 !== 'undefined')
+ && (typeof user.items.gear.owned.head_healer_5 !== 'undefined')
+ && (typeof user.items.gear.owned.shield_healer_5 !== 'undefined')
+ ) {
+ achievements['healer'] = true;
+ changeUser = true;
+ }
+ if ( (typeof user.items.gear.owned.weapon_rogue_6 !== 'undefined')
+ && (typeof user.items.gear.owned.armor_rogue_5 !== 'undefined')
+ && (typeof user.items.gear.owned.head_rogue_5 !== 'undefined')
+ && (typeof user.items.gear.owned.shield_rogue_6 !== 'undefined')
+ ) {
+ achievements['rogue'] = true;
+ changeUser = true;
+ }
+
+ if (changeUser) {
+ var set = {'migration':migrationName, 'achievements.ultimateGearSets':achievements, 'flags.armoireEnabled':true};
+ dbUsers.update({_id:user._id}, {$set:set});
+ }
+
+ if (count%progressCount == 0) console.warn(count + ' ' + user._id);
+ if (user._id == authorUuid) console.warn(authorName + ' processed');
+ if (user._id == '9' ) console.warn('lefnire' + ' 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/package.json b/package.json
index 04655f1101..8ba1ff5cb2 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
"dependencies": {
"async": "~0.9.0",
"aws-sdk": "^2.0.25",
+ "babel": "^5.5.4",
"bower": "~1.3.12",
"browserify": "~3.30.2",
"coffee-script": "1.6.x",
@@ -30,6 +31,7 @@
"grunt-karma": "~0.6.2",
"grunt-nodemon": "~0.3.0",
"grunt-spritesmith": "~3.5.0",
+ "gulp": "^3.9.0",
"icalendar": "git://github.com/lefnire/node-icalendar#master",
"image-size": "~0.3.2",
"in-app-purchase": "^0.2.0",
@@ -38,6 +40,7 @@
"lodash": "~2.4.1",
"loggly": "~1.0.8",
"method-override": "~2.2.0",
+ "mixpanel": "^0.2.1",
"moment": "~2.8.3",
"mongoose": "~3.8.23",
"mongoose-id-autoinc": "~2013.7.14-4",
@@ -51,7 +54,9 @@
"paypal-ipn": "2.1.0",
"paypal-rest-sdk": "^1.2.1",
"pretty-data": "git://github.com/vkiryukhin/pretty-data#master",
+ "ps-tree": "^1.0.0",
"push-notify": "^1.1.1",
+ "q": "^1.4.1",
"qs": "^2.3.2",
"request": "~2.44.0",
"s3-upload-stream": "^1.0.6",
@@ -73,7 +78,7 @@
"node": "0.10.x"
},
"scripts": {
- "test": "./node_modules/coffee-script/bin/coffee ./test/runTests.coffee -n",
+ "test": "./node_modules/.bin/gulp test",
"start": "grunt run:dev",
"postinstall": "./node_modules/bower/bin/bower --config.interactive=false install -f; ./node_modules/.bin/grunt;",
"coverage": "COVERAGE=true mocha --require register-handlers.js --reporter html-cov > coverage.html; open coverage.html"
@@ -81,15 +86,18 @@
"devDependencies": {
"chai": "^2.3.0",
"coffee-coverage": "~0.4.2",
+ "coveralls": "^2.11.2",
"csv": "~0.3.6",
"deep-diff": "~0.1.4",
"event-stream": "^3.2.2",
"expect.js": "~0.2.0",
"glob": "^4.3.5",
+ "istanbul": "^0.3.14",
"karma": "~0.10.2",
"karma-chai-plugins": "~0.1.0",
"karma-chrome-launcher": "~0.1.0",
"karma-coffee-preprocessor": "~0.1.0",
+ "karma-coverage": "^0.3.1",
"karma-firefox-launcher": "~0.1.0",
"karma-html2js-preprocessor": "~0.1.0",
"karma-jasmine": "~0.1.3",
@@ -99,6 +107,7 @@
"karma-phantomjs-launcher": "~0.1.0",
"karma-requirejs": "~0.2.0",
"karma-script-launcher": "~0.1.0",
+ "lcov-result-merger": "^1.0.2",
"mocha": "~1.12.1",
"mongoskin": "~0.6.1",
"phantomjssmith": "~0.5.4",
diff --git a/protractor.conf.js b/protractor.conf.js
index 024aab666c..ab91fc074b 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -19,6 +19,8 @@ exports.config = {
// Options to be passed to Jasmine-node.
jasmineNodeOpts: {
showColors: true,
- defaultTimeoutInterval: 90000
+ defaultTimeoutInterval: 90000,
+ isVerbose: true,
+ displayPendingSpec: true
}
};
diff --git a/tasks/gulp-tests.js b/tasks/gulp-tests.js
new file mode 100644
index 0000000000..f6ce872271
--- /dev/null
+++ b/tasks/gulp-tests.js
@@ -0,0 +1,157 @@
+import { pipe, awaitPort, kill } from './taskHelper';
+import { server as karma } from 'karma';
+import mongoose from 'mongoose';
+import { exec } from 'child_process';
+import psTree from 'ps-tree';
+import gulp from 'gulp';
+import Q from 'q';
+
+const TEST_SERVER_PORT = 3001
+const TEST_DB = 'habitrpg_test'
+
+const TEST_DB_URI = `mongodb://localhost/${TEST_DB}`
+
+/* Helper methods for reporting test summary */
+let testResults = [];
+let testCount = (stdout, regexp) => {
+ let match = stdout.match(regexp);
+ return parseInt(match && match[1] || 0);
+}
+
+let testBin = (string) => {
+ return `NODE_ENV=testing ./node_modules/.bin/${string}`;
+};
+
+gulp.task('test:prepare:mongo', (cb) => {
+ mongoose.connect(TEST_DB_URI, () => {
+ mongoose.connection.db.dropDatabase();
+ mongoose.connection.close();
+ cb();
+ });
+});
+
+gulp.task('test:prepare:build', (cb) => {
+ exec(testBin('grunt build:test'), cb);
+});
+
+gulp.task('test:prepare:webdriver', (cb) => {
+ exec('./node_modules/protractor/bin/webdriver-manager update', cb);
+});
+
+gulp.task('test:prepare', [
+ 'test:prepare:build',
+ 'test:prepare:mongo',
+ 'test:prepare:webdriver'
+]);
+
+gulp.task('test:common', ['test:prepare:build'], (cb) => {
+ let runner = exec(
+ testBin('mocha test/common'),
+ (err, stdout, stderr) => {
+ testResults.push({
+ suite: 'Common Specs\t',
+ pass: testCount(stdout, /(\d+) passing/),
+ fail: testCount(stderr, /(\d+) failing/),
+ pend: testCount(stdout, /(\d+) pending/)
+ });
+ cb(err);
+ }
+ );
+ pipe(runner);
+});
+
+
+gulp.task('test:api', ['test:prepare:mongo'], (cb) => {
+ let runner = exec(
+ testBin("istanbul cover -i 'website/src/**' --dir coverage/api ./node_modules/.bin/_mocha -- test/api"),
+ (err, stdout, stderr) => {
+ testResults.push({
+ suite: 'API Specs\t',
+ pass: testCount(stdout, /(\d+) passing/),
+ fail: testCount(stderr, /(\d+) failing/),
+ pend: testCount(stdout, /(\d+) pending/)
+ });
+ cb(err);
+ }
+ );
+ pipe(runner);
+});
+
+gulp.task('test:karma', ['test:prepare:build'], (cb) => {
+ let runner = exec(
+ testBin('karma start --single-run'),
+ (err, stdout) => {
+ testResults.push({
+ suite: 'Karma Specs\t',
+ pass: testCount(stdout, /(\d+) tests completed/),
+ fail: testCount(stdout, /(\d+) tests failed/),
+ pend: testCount(stdout, /(\d+) tests skipped/)
+ });
+ cb(err);
+ }
+ );
+ pipe(runner);
+});
+
+gulp.task('test:e2e', ['test:prepare'], (cb) => {
+ let support = [
+ 'Xvfb :99 -screen 0 1024x768x24 -extension RANDR',
+ `NODE_DB_URI="${TEST_DB_URI}" PORT="${TEST_SERVER_PORT}" node ./website/src/server.js`,
+ './node_modules/protractor/bin/webdriver-manager start',
+ ].map(exec);
+
+ Q.all([
+ awaitPort(3001),
+ awaitPort(4444)
+ ]).then(() => {
+ let runner = exec(
+ 'DISPLAY=:99 NODE_ENV=testing ./node_modules/protractor/bin/protractor protractor.conf.js',
+ (err, stdout, stderr) => {
+ /*
+ * Note: As it stands, protractor wont report pending specs
+ */
+ let match = stdout.match(/(\d+) tests?.*(\d) failures?/);
+ testResults.push({
+ suite: 'End-to-End Specs',
+ pass: parseInt(match[1]) - parseInt(match[2]),
+ fail: parseInt(match[2]),
+ pend: 0
+ });
+ support.forEach(kill);
+ cb(err);
+ }
+ );
+ pipe(runner);
+ });
+});
+
+gulp.task('test', [
+ 'test:common',
+ 'test:karma',
+ 'test:api',
+ 'test:e2e'
+], () => {
+ let totals = [0,0,0];
+
+ console.log('\n\x1b[36m\x1b[4mHabitica Test Summary\x1b[0m\n');
+ testResults.forEach((s) => {
+ totals[0] = totals[0] + s.pass;
+ totals[1] = totals[1] + s.fail;
+ totals[2] = totals[2] + s.pend;
+ console.log(
+ `\x1b[33m\x1b[4m${s.suite}\x1b[0m\t`,
+ `\x1b[32mPassing: ${s.pass},\t`,
+ `\x1b[31mFailed: ${s.fail},\t`,
+ `\x1b[36mPending: ${s.pend}\t`
+ );
+ });
+
+ console.log(
+ '\n\x1b[33m\x1b[4mTotal:\x1b[0m\t\t\t',
+ `\x1b[32mPassing: ${totals[0]},\t`,
+ `\x1b[31mFailed: ${totals[1]},\t`,
+ `\x1b[36mPending: ${totals[2]}\t`
+ );
+
+ console.log('\n\x1b[36mThanks for helping keep Habitica clean!\x1b[0m');
+});
diff --git a/tasks/taskHelper.js b/tasks/taskHelper.js
new file mode 100644
index 0000000000..177b3b9f6f
--- /dev/null
+++ b/tasks/taskHelper.js
@@ -0,0 +1,60 @@
+import { exec } from 'child_process';
+import psTree from 'ps-tree';
+import net from 'net';
+import Q from 'q';
+
+/*
+ * Kill a child process and any sub-children that process may have spawned.
+ * This is necessary to ensure that Gulp will terminate when it has completed
+ * its tasks.
+ */
+export function kill(proc) {
+ ((pid) => {
+ psTree(pid, (_, pids) => {
+ if(pids.length) {
+ pids.forEach(kill); return
+ }
+ try {
+ exec(/^win/.test(process.platform)
+ ? `taskkill /PID ${pid} /T /F`
+ : `kill -9 ${pid}`)
+ }
+ catch(e) { console.log(e) }
+ });
+ }(proc.PID || proc.pid));
+};
+
+/*
+ * Return a promise that will execute when Node is able to connect on a
+ * specific port. For example, this can be used to halt tasks until Selenium
+ * has fully spun up. Optionally provide a maximum number of seconds to wait
+ * before failing.
+ */
+export function awaitPort(port, max=60) {
+ let socket, timeout, interval;
+ let deferred = Q.defer();
+
+ timeout = setTimeout(() => {
+ clearInterval(interval);
+ deferred.reject(`Timed out after ${max} seconds`);
+ }, max * 1000);
+
+ interval = setInterval(() => {
+ socket = net.connect({port: port}, () => {
+ clearInterval(interval);
+ clearTimeout(timeout);
+ socket.destroy();
+ deferred.resolve();
+ }).on('error', () => { socket.destroy });
+ }, 1000);
+
+ return deferred.promise
+};
+
+/*
+ * Pipe the child's stdin and stderr to the parent process.
+ */
+export function pipe(child) {
+ child.stdout.on('data', (data) => { process.stdout.write(data) });
+ child.stderr.on('data', (data) => { process.stderr.write(data) });
+};
diff --git a/test/api/chat.coffee b/test/api/chat.coffee
new file mode 100644
index 0000000000..62d60d9b64
--- /dev/null
+++ b/test/api/chat.coffee
@@ -0,0 +1,100 @@
+'use strict'
+
+diff = require("deep-diff")
+
+Group = require("../../website/src/models/group").model
+app = require("../../website/src/server")
+
+describe "Chat", ->
+ group = undefined
+ before (done) ->
+ async.waterfall [
+ (cb) ->
+ registerNewUser(cb, true)
+
+ (user, cb) ->
+ request.post(baseURL + "/groups").send(
+ name: "TestGroup"
+ type: "party"
+ ).end (res) ->
+ expectCode res, 200
+ group = res.body
+ expect(group.members.length).to.equal 1
+ expect(group.leader).to.equal user._id
+ cb()
+
+ ], done
+
+ chat = undefined
+ it "posts a message to party chat", (done) ->
+ msg = "TestMsg"
+ request.post(baseURL + "/groups/" + group._id + "/chat?message=" + msg).end (res) ->
+ expectCode res, 200
+ chat = res.body.message
+ expect(chat.id).to.be.ok
+ expect(chat.text).to.equal msg
+ expect(chat.timestamp).to.be.exist
+ expect(chat.likes).to.be.empty
+ expect(chat.flags).to.be.empty
+ expect(chat.flagCount).to.equal 0
+ expect(chat.uuid).to.be.exist
+ expect(chat.contributor).to.be.empty
+ expect(chat.backer).to.be.empty
+ expect(chat.uuid).to.equal user._id
+ expect(chat.user).to.equal user.profile.name
+ done()
+
+ it "does not post an empty message", (done) ->
+ msg = ""
+ request.post(baseURL + "/groups/" + group._id + "/chat?message=" + msg).send(
+ ).end (res) ->
+ expectCode res, 400
+ expect(res.body.err).to.equal 'You cannot send a blank message'
+ done()
+
+ it "can not like own chat message", (done) ->
+ request.post(baseURL + "/groups/" + group._id + "/chat/" + chat.id + "/like").send(
+ ).end (res) ->
+ expectCode res, 401
+ body = res.body
+ expect(body.err).to.equal "Can't like your own message. Don't be that person."
+ done()
+
+ it "can not flag own message", (done) ->
+ request.post(baseURL + "/groups/" + group._id + "/chat/" + chat.id + "/flag").send(
+ ).end (res) ->
+ expectCode res, 401
+ body = res.body
+ expect(body.err).to.equal "Can't report your own message."
+ done()
+
+ it "gets chat messages from party chat", (done) ->
+ request.get(baseURL + "/groups/" + group._id + "/chat").send(
+ ).end (res) ->
+ expectCode res, 200
+ message = res.body[0]
+ expect(message.id).to.equal chat.id
+ expect(message.timestamp).to.equal chat.timestamp
+ expect(message.likes).to.deep.equal chat.likes
+ expect(message.flags).to.deep.equal chat.flags
+ expect(message.flagCount).to.equal chat.flagCount
+ expect(message.uuid).to.equal chat.uuid
+ expect(message.contributor).to.deep.equal chat.contributor
+ expect(message.backer).to.deep.equal chat.backer
+ expect(message.user).to.equal chat.user
+ done()
+
+ it "deletes a chat messages from party chat", (done) ->
+ request.del(baseURL + "/groups/" + group._id + "/chat/" + chat.id).send(
+ ).end (res) ->
+ expectCode res, 204
+ expect(res.body).to.be.empty
+ done()
+
+ it "can not delete already deleted message", (done) ->
+ request.del(baseURL + "/groups/" + group._id + "/chat/" + chat.id).send(
+ ).end (res) ->
+ expectCode res, 404
+ body = res.body
+ expect(body.err).to.equal "Message not found!"
+ done()
diff --git a/test/api/groups.coffee b/test/api/groups.coffee
index 23d79fcf98..6c2d922476 100644
--- a/test/api/groups.coffee
+++ b/test/api/groups.coffee
@@ -5,560 +5,314 @@ diff = require("deep-diff")
Group = require("../../website/src/models/group").model
app = require("../../website/src/server")
-describe "Groups", ->
-
- describe "Guilds", ->
-
+describe "Guilds", ->
+ context "creating groups", ->
before (done) ->
registerNewUser ->
User.findByIdAndUpdate user._id,
$set:
- "balance": 4
+ "balance": 10
, (err, _user) ->
done()
, true
- describe "Private Guilds", ->
- guild = undefined
- before (done) ->
+ it "can create a public guild", (done) ->
+ request.post(baseURL + "/groups").send(
+ name: "TestGroup"
+ type: "guild",
+ privacy: "public"
+ ).end (res) ->
+ expectCode res, 200
+ guild = res.body
+ expect(guild.members.length).to.equal 1
+ expect(guild.leader).to.equal user._id
+ done()
+
+ it "can create a private guild", (done) ->
+ request.post(baseURL + "/groups").send(
+ name: "TestGroup"
+ type: "guild",
+ privacy: "private"
+ ).end (res) ->
+ expectCode res, 200
+ guild = res.body
+ expect(guild.members.length).to.equal 1
+ expect(guild.leader).to.equal user._id
+ done()
+
+ it "prevents user from creating a guild when the user has 0 gems", (done) ->
+ registerNewUser (err, user_with_0_gems) ->
request.post(baseURL + "/groups").send(
- name: "TestPrivateGroup"
- type: "guild"
- privacy: "private"
- ).end (res) ->
- expectCode res, 200
- guild = res.body
- expect(guild.members.length).to.equal 1
- expect(guild.leader).to.equal user._id
- #Add members to guild
- async.waterfall [
- (cb) ->
- registerManyUsers 15, cb
-
- (_members, cb) ->
- members = _members
-
- joinGuild = (member, callback) ->
- request.post(baseURL + "/groups/" + guild._id + "/join")
- .set("X-API-User", member._id)
- .set("X-API-Key", member.apiToken)
- .end ->
- callback(null, null)
-
- async.map members, joinGuild, (err, results) -> cb()
-
- ], done
-
- it "includes user in private group member list when user is a member", (done) ->
-
- request.get(baseURL + "/groups/" + guild._id)
+ name: "TestGroup"
+ type: "guild",
+ )
+ .set("X-API-User", user_with_0_gems._id)
+ .set("X-API-Key", user_with_0_gems.apiToken)
.end (res) ->
- g = res.body
- userInGroup = _.find g.members, (member) -> return member._id == user._id
- expect(userInGroup).to.exist
+ expectCode res, 401
+ done()
+ , false
+
+ context "get guilds", ->
+ guild = undefined
+
+ beforeEach (done)->
+ request.post(baseURL + "/groups").send(
+ name: "TestGroup2"
+ type: "guild"
+ ).end (res) ->
+ guild = res.body
+ done()
+
+ it "can find a guild", (done) ->
+ request.get(baseURL + "/groups/" + guild._id)
+ .end (res) ->
+ expectCode res, 200
+ expect(res.body._id).to.equal res.body._id
done()
- it "excludes user from viewing private group member list when user is not a member", (done) ->
-
- request.post(baseURL + "/groups/" + guild._id + "/leave")
- .end (res) ->
- request.get(baseURL + "/groups/" + guild._id)
- .end (res) ->
- expect res, 404
- done()
-
- describe "Public Guilds", ->
- guild = undefined
- before (done) ->
- request.post(baseURL + "/groups").send(
- name: "TestPublicGroup"
- type: "guild"
- privacy: "public"
- ).end (res) ->
+ it "transforms members array to an arrray of user objects", (done) ->
+ request.get(baseURL + "/groups/" + guild._id)
+ .end (res) ->
expectCode res, 200
- guild = res.body
- expect(guild.members.length).to.equal 1
- expect(guild.leader).to.equal user._id
- #Add members to guild
- async.waterfall [
- (cb) ->
- registerManyUsers 15, cb
+ members = res.body.members
+ # @TODO: would be more instructive if it had more members in guild :(
+ _(members).each (member) ->
+ expect(member).to.be.an 'object'
+ expect(member.profile.name).to.exist
+ done()
- (_members, cb) ->
- members = _members
+ it "transforms leader id to a user object", (done) ->
+ request.get(baseURL + "/groups/" + guild._id)
+ .end (res) ->
+ expectCode res, 200
+ leader = res.body.leader
+ expect(leader).to.be.an 'object'
+ expect(leader.profile.name).to.exist
+ done()
- joinGuild = (member, callback) ->
- request.post(baseURL + "/groups/" + guild._id + "/join")
- .set("X-API-User", member._id)
- .set("X-API-Key", member.apiToken)
- .end ->
- callback(null, null)
+ it "can list guilds", (done) ->
+ request.get(baseURL + "/groups").send()
+ .end (res) ->
+ expectCode res, 200
+ guild = res.body[0]
+ expect(guild).to.exist
+ done()
- async.map members, joinGuild, (err, results) -> cb()
- ], done
+ context "updating groups", ->
+ groupToUpdate = undefined
+ before (done) ->
+ request.post(baseURL + "/groups").send(
+ name: "TestGroup"
+ type: "guild"
+ description: "notUpdatedDesc"
+ ).end (res) ->
+ groupToUpdate = res.body
+ done()
- context "is a member", ->
- before (done) ->
- registerNewUser ->
- request.post(baseURL + "/groups/" + guild._id + "/join")
- .end ->
- done()
- , true
+ it "prevents user from updating a party when they aren't the leader", (done) ->
+ registerNewUser (err, tmpUser) ->
+ request.post(baseURL + "/groups/" + groupToUpdate._id).send(
+ name: "TestGroupName"
+ description: "updatedDesc"
+ )
+ .set("X-API-User", tmpUser._id)
+ .set("X-API-Key", tmpUser.apiToken)
+ .end (res) ->
+ expectCode res, 401
+ expect(res.body.err).to.equal "Only the group leader can update the group!"
+ done()
+ , false
- it "includes user in public group member list", (done) ->
+ it "allows user to update a group", (done) ->
+ request.post(baseURL + "/groups/" + groupToUpdate._id).send(
+ description: "updatedDesc"
+ )
+ .end (res) ->
+ expectCode res, 204
+ request.get(baseURL + "/groups/" + groupToUpdate._id).send()
+ .end (res) ->
+ updatedGroup = res.body
+ expect(updatedGroup.description).to.equal "updatedDesc"
+ done()
- request.get(baseURL + "/groups/" + guild._id)
+ context "leaving groups", ->
+ it "can leave a guild", (done) ->
+ guildToLeave = undefined
+ request.post(baseURL + "/groups").send(
+ name: "TestGroupToLeave"
+ type: "guild"
+ ).end (res) ->
+ guildToLeave = res.body
+ request.post(baseURL + "/groups/" + guildToLeave._id + "/leave")
+ .send()
+ .end (res) ->
+ expectCode res, 204
+ done()
+
+ context "removing users groups", ->
+ it "allows guild leaders to remove a member", (done) ->
+ guildToRemoveMember = undefined
+ members = undefined
+ userToRemove = undefined
+ request.post(baseURL + "/groups").send(
+ name: "TestGuildToRemoveMember"
+ type: "guild"
+ ).end (res) ->
+ guildToRemoveMember = res.body
+ #Add members to guild
+ async.waterfall [
+ (cb) ->
+ registerManyUsers 1, cb
+
+ (_members, cb) ->
+ userToRemove = _members[0]
+ members = _members
+ inviteURL = baseURL + "/groups/" + guildToRemoveMember._id + "/invite"
+ request.post(inviteURL).send(
+ uuids: [userToRemove._id]
+ )
+ .end ->
+ cb()
+
+ (cb) ->
+ request.post(baseURL + "/groups/" + guildToRemoveMember._id + "/join")
+ .set("X-API-User", userToRemove._id)
+ .set("X-API-Key", userToRemove.apiToken)
+ .end (res) ->
+ cb()
+
+ (cb) ->
+ request.post(baseURL + "/groups/" + guildToRemoveMember._id + "/removeMember?uuid=" + userToRemove._id)
+ .send().end (res) ->
+ expectCode res, 204
+ cb()
+
+ (cb) ->
+ request.get(baseURL + "/groups/" + guildToRemoveMember._id)
+ .send()
.end (res) ->
g = res.body
- expect(g.members.length).to.equal 15
- userInGroup = _.find g.members, (member) -> return member._id == user._id
- expect(userInGroup).to.be.ok
- done()
+ userInGroup = _.find g.members, (member) -> return member._id == userToRemove._id
+ expect(userInGroup).to.not.exist
+ cb()
+ ], done
- context "is not a member", ->
+ describe "Private Guilds", ->
+ guild = undefined
+ before (done) ->
+ request.post(baseURL + "/groups").send(
+ name: "TestPrivateGroup"
+ type: "guild"
+ privacy: "private"
+ ).end (res) ->
+ expectCode res, 200
+ guild = res.body
+ expect(guild.members.length).to.equal 1
+ expect(guild.leader).to.equal user._id
+ #Add members to guild
+ async.waterfall [
+ (cb) ->
+ registerManyUsers 15, cb
- before (done) ->
- registerNewUser done, true
+ (_members, cb) ->
+ members = _members
- it "excludes user in public group member list", (done) ->
+ joinGuild = (member, callback) ->
+ request.post(baseURL + "/groups/" + guild._id + "/join")
+ .set("X-API-User", member._id)
+ .set("X-API-Key", member.apiToken)
+ .end ->
+ callback(null, null)
+
+ async.map members, joinGuild, (err, results) -> cb()
+
+ ], done
+
+ it "includes user in private group member list when user is a member", (done) ->
+
+ request.get(baseURL + "/groups/" + guild._id)
+ .end (res) ->
+ g = res.body
+ userInGroup = _.find g.members, (member) -> return member._id == user._id
+ expect(userInGroup).to.exist
+ done()
+
+ it "excludes user from viewing private group member list when user is not a member", (done) ->
+
+ request.post(baseURL + "/groups/" + guild._id + "/leave")
+ .end (res) ->
request.get(baseURL + "/groups/" + guild._id)
- .end (res) ->
- g = res.body
- expect(g.members.length).to.equal 15
- userInGroup = _.find g.members, (member) -> return member._id == user._id
- expect(userInGroup).to.not.be.ok
- done()
+ .end (res) ->
+ expect res, 404
+ done()
- describe "Party", ->
-
- group = undefined
+ describe "Public Guilds", ->
+ guild = undefined
before (done) ->
async.waterfall [
(cb) ->
- registerNewUser(cb, true)
- , (user, cb) ->
+ registerNewUser ->
+ User.findByIdAndUpdate user._id, {$set: { "balance": 10 } }, (err, _user) ->
+ cb()
+ , true
+ (cb) ->
request.post(baseURL + "/groups").send(
- name: "TestGroup"
- type: "party"
+ name: "TestPublicGroup"
+ type: "guild"
+ privacy: "public"
).end (res) ->
- expectCode res, 200
- group = res.body
- expect(group.members.length).to.equal 1
- expect(group.leader).to.equal user._id
- done()
- ]
+ guild = res.body
+ expect(guild.members.length).to.equal 1
+ expect(guild.leader).to.equal user._id
+ #Add members to guild
+ cb()
- it "can be found by querying for party", (done) ->
- request.get(baseURL + "/groups/").send(
- type: "party"
- ).end (res) ->
- expectCode res, 200
+ (cb) ->
+ registerManyUsers 15, cb
- party = res.body[0]
- expect(party._id).to.equal group._id
- expect(party.leader).to.equal user._id
- expect(party.name).to.equal group.name
- expect(party.quest).to.deep.equal { progress: {} }
- expect(party.memberCount).to.equal group.memberCount
- done()
+ (_members, cb) ->
+ members = _members
- describe "Chat", ->
- chat = undefined
- it "Posts a message to party chat", (done) ->
- msg = "TestMsg"
- request.post(baseURL + "/groups/" + group._id + "/chat?message=" + msg).send(
- ).end (res) ->
- expectCode res, 200
- chat = res.body.message
- expect(chat.id).to.be.ok
- expect(chat.text).to.equal msg
- expect(chat.timestamp).to.be.ok
- expect(chat.likes).to.be.empty
- expect(chat.flags).to.be.empty
- expect(chat.flagCount).to.equal 0
- expect(chat.uuid).to.be.ok
- expect(chat.contributor).to.be.empty
- expect(chat.backer).to.be.empty
- expect(chat.uuid).to.equal user._id
- expect(chat.user).to.equal user.profile.name
- done()
+ joinGuild = (member, callback) ->
+ request.post(baseURL + "/groups/" + guild._id + "/join")
+ .set("X-API-User", member._id)
+ .set("X-API-Key", member.apiToken)
+ .end ->
+ callback(null, null)
- it "Does not post an empty message", (done) ->
- msg = ""
- request.post(baseURL + "/groups/" + group._id + "/chat?message=" + msg).send(
- ).end (res) ->
- expectCode res, 400
- expect(res.body.err).to.equal 'You cannot send a blank message'
- done()
+ async.map members, joinGuild, (err, results) -> cb()
- it "can not like own chat message", (done) ->
- request.post(baseURL + "/groups/" + group._id + "/chat/" + chat.id + "/like").send(
- ).end (res) ->
- expectCode res, 401
- body = res.body
- expect(body.err).to.equal "Can't like your own message. Don't be that person."
- done()
+ ], done
- it "can not flag own message", (done) ->
- request.post(baseURL + "/groups/" + group._id + "/chat/" + chat.id + "/flag").send(
- ).end (res) ->
- expectCode res, 401
- body = res.body
- expect(body.err).to.equal "Can't report your own message."
- done()
-
- it "Gets chat messages from party chat", (done) ->
- request.get(baseURL + "/groups/" + group._id + "/chat").send(
- ).end (res) ->
- expectCode res, 200
- message = res.body[0]
- expect(message.id).to.equal chat.id
- expect(message.timestamp).to.equal chat.timestamp
- expect(message.likes).to.deep.equal chat.likes
- expect(message.flags).to.deep.equal chat.flags
- expect(message.flagCount).to.equal chat.flagCount
- expect(message.uuid).to.equal chat.uuid
- expect(message.contributor).to.deep.equal chat.contributor
- expect(message.backer).to.deep.equal chat.backer
- expect(message.user).to.equal chat.user
- done()
-
- it "Deletes a chat messages from party chat", (done) ->
- request.del(baseURL + "/groups/" + group._id + "/chat/" + chat.id).send(
- ).end (res) ->
- expectCode res, 204
- expect(res.body).to.be.empty
- done()
-
- it "Can not delete already deleted message", (done) ->
- request.del(baseURL + "/groups/" + group._id + "/chat/" + chat.id).send(
- ).end (res) ->
- expectCode res, 404
- body = res.body
- expect(body.err).to.equal "Message not found!"
- done()
-
- describe "Quests", ->
- party = undefined
- participating = []
- notParticipating = []
+ context "is a member", ->
before (done) ->
- # Tavern boss, side-by-side
- Group.update(
- _id: "habitrpg"
- ,
- $set:
- quest:
- key: "dilatory"
- active: true
- progress:
- hp: shared.content.quests.dilatory.boss.hp
- rage: 0
- ).exec()
+ registerNewUser ->
+ request.post(baseURL + "/groups/" + guild._id + "/join")
+ .end (res)->
+ done()
+ , true
- # Tally some progress for later. Later we want to test that progress made before the quest began gets
- # counted after the quest starts
- async.waterfall [
- (cb) ->
- request.post(baseURL + '/user/tasks').send({
- type: 'daily'
- text: 'daily one'
- }).end (res) ->
- cb()
- (cb) ->
- request.post(baseURL + '/user/tasks').send({
- type: 'daily'
- text: 'daily two'
- }).end (res) ->
- cb()
- (cb) ->
- User.findByIdAndUpdate user._id,
- $set:
- "stats.lvl": 50
- , (err, _user) ->
- cb(null, _user)
- (_user, cb) ->
- user = _user
- request.post(baseURL + "/user/batch-update").send([
- {
- op: "score"
- params:
- direction: "up"
- id: user.dailys[0].id
- }
- {
- op: "score"
- params:
- direction: "up"
- id: user.dailys[0].id
- }
- {
- op: "update"
- body:
- "stats.lvl": 50
- }
- ]).end (res) ->
- user = res.body
- expect(user.party.quest.progress.up).to.be.above 0
+ it "includes user in public group member list", (done) ->
+ request.get(baseURL + "/groups/" + guild._id)
+ .end (res) ->
+ g = res.body
+ expect(g.members.length).to.equal 15
+ userInGroup = _.find g.members, (member) -> return member._id == user._id
+ expect(userInGroup).to.exist
+ done()
- # Invite some members
- async.waterfall [
- # Register new users
- (cb) ->
- registerManyUsers 3, cb
+ context "is not a member", ->
+ before (done) ->
+ registerNewUser done, true
- # Send them invitations
- (_party, cb) ->
- party = _party
- inviteURL = baseURL + "/groups/" + group._id + "/invite"
- async.parallel [
- (cb2) ->
- request.post(inviteURL).send(
- uuids: [party[0]._id]
- ).end ->
- cb2()
- (cb2) ->
- request.post(inviteURL).send(
- uuids: [party[1]._id]
- ).end ->
- cb2()
- (cb2) ->
- request.post(inviteURL).send(
- uuids: [party[2]._id]
- ).end (res)->
- cb2()
- ], cb
-
- # Accept / Reject
- (results, cb) ->
-
- # series since they'll be modifying the same group record
- series = _.reduce(party, (m, v, i) ->
- m.push (cb2) ->
- request.post(baseURL + "/groups/" + group._id + "/join").set("X-API-User", party[i]._id).set("X-API-Key", party[i].apiToken).end ->
- cb2()
- m
- , [])
- async.series series, cb
-
- # Make sure the invites stuck
- (whatever, cb) ->
- Group.findById group._id, (err, g) ->
- group = g
- expect(g.members.length).to.equal 4
- cb()
-
- ], ->
-
- # Start the quest
- async.waterfall [
- (cb) ->
- request.post(baseURL + "/groups/" + group._id + "/questAccept?key=vice3").end (res) ->
- expectCode res, 400
- User.findByIdAndUpdate user._id,
- $set:
- "items.quests.vice3": 1
- , cb
-
- (_user, cb) ->
- request.post(baseURL + "/groups/" + group._id + "/questAccept?key=vice3").end (res) ->
- expectCode res, 200
- Group.findById group._id, cb
-
- (_group, cb) ->
- expect(_group.quest.key).to.equal "vice3"
- expect(_group.quest.active).to.equal false
- request.post(baseURL + "/groups/" + group._id + "/questAccept").set("X-API-User", party[0]._id).set("X-API-Key", party[0].apiToken).end ->
- request.post(baseURL + "/groups/" + group._id + "/questAccept").set("X-API-User", party[1]._id).set("X-API-Key", party[1].apiToken).end (res) ->
- request.post(baseURL + "/groups/" + group._id + "/questReject").set("X-API-User", party[2]._id).set("X-API-Key", party[2].apiToken).end (res) ->
- group = res.body
- expect(group.quest.active).to.equal true
- cb()
-
- ], done
- ]
-
- it "Casts a spell", (done) ->
- mp = user.stats.mp
- request.get(baseURL + "/members/" + party[0]._id).end (res) ->
- party[0] = res.body
- request.post(baseURL + "/user/class/cast/snowball?targetType=user&targetId=" + party[0]._id).end (res) ->
-
- #expect(res.body.stats.mp).to.be.below(mp);
- request.get(baseURL + "/members/" + party[0]._id).end (res) ->
- member = res.body
- expect(member.achievements.snowball).to.equal 1
- expect(member.stats.buffs.snowball).to.exist
- difference = diff(member, party[0])
- expect(_.size(difference)).to.equal 2
-
- # level up user so str is > 0
- request.put(baseURL + "/user").send("stats.lvl": 5).end (res) ->
-
- # Refill mana so user can cast
- request.put(baseURL + "/user").send("stats.mp": 100).end (res) ->
- request.post(baseURL + "/user/class/cast/valorousPresence?targetType=party").end (res) ->
- request.get(baseURL + "/members/" + member._id).end (res) ->
- expect(res.body.stats.buffs.str).to.be.above 0
- expect(diff(res.body, member).length).to.equal 1
- done()
-
- it "Doesn't include people who aren't participating", (done) ->
- request.get(baseURL + "/groups/" + group._id).end (res) ->
- expect(_.size(res.body.quest.members)).to.equal 3
- done()
-
- xit "Hurts the boss", (done) ->
- request.post(baseURL + "/user/batch-update").end (res) ->
- user = res.body
- up = user.party.quest.progress.up
- expect(up).to.be.above 0
-
- #{op:'score',params:{direction:'up',id:user.dailys[3].id}}, // leave one daily undone so Trapper hurts party
- # set day to yesterday, cron will then be triggered on next action
- request.post(baseURL + "/user/batch-update").send([
- {
- op: "score"
- params:
- direction: "up"
- id: user.dailys[0].id
- }
- {
- op: "update"
- body:
- lastCron: moment().subtract(1, "days")
- }
- ]).end (res) ->
- expect(res.body.party.quest.progress.up).to.be.above up
- request.post(baseURL + "/user/batch-update").end ->
- request.get(baseURL + "/groups/party").end (res) ->
-
- # Check boss damage
- async.waterfall [
- (cb) ->
- async.parallel [
-
- #tavern boss
- (cb2) ->
- Group.findById "habitrpg",
- quest: 1
- , (err, tavern) ->
- expect(tavern.quest.progress.hp).to.be.below shared.content.quests.dilatory.boss.hp
- expect(tavern.quest.progress.rage).to.be.above 0
- cb2()
-
- # party boss
- (cb2) ->
- expect(res.body.quest.progress.hp).to.be.below shared.content.quests.vice3.boss.hp
- _party = res.body.members
- expect(_.find(_party,
- _id: party[0]._id
- ).stats.hp).to.be.below 50
- expect(_.find(_party,
- _id: party[1]._id
- ).stats.hp).to.be.below 50
- expect(_.find(_party,
- _id: party[2]._id
- ).stats.hp).to.be 50
- cb2()
- ], cb
-
- # Kill the boss
- (whatever, cb) ->
- async.waterfall [
-
- # tavern boss
- (cb2) ->
- expect(user.items.pets["MantisShrimp-Base"]).to.not.be.ok()
- Group.update
- _id: "habitrpg"
- ,
- $set:
- "quest.progress.hp": 0
- , cb2
-
- # party boss
- (arg1, arg2, cb2) ->
- expect(user.items.gear.owned.weapon_special_2).to.not.be.ok()
- Group.findByIdAndUpdate group._id,
- $set:
- "quest.progress.hp": 0
- , cb2
- ], cb
- (_group, cb) ->
- # set day to yesterday, cron will then be triggered on next action
- request.post(baseURL + "/user/batch-update").send([
- {
- op: "score"
- params:
- direction: "up"
- id: user.dailys[1].id
- }
- {
- op: "update"
- body:
- lastCron: moment().subtract(1, "days")
- }
- ]).end ->
- cb()
-
- (cb) ->
- request.post(baseURL + "/user/batch-update").end (res) ->
- cb null, res.body
-
- (_user, cb) ->
-
- # need to load the user again, since tavern boss does update after user's cron
- User.findById _user._id, cb
- (_user, cb) ->
- user = _user
- Group.findById group._id, cb
- (_group, cb) ->
- cummExp = shared.content.quests.vice3.drop.exp + shared.content.quests.dilatory.drop.exp
- cummGp = shared.content.quests.vice3.drop.gp + shared.content.quests.dilatory.drop.gp
-
- #//FIXME check that user got exp, but user is leveling up making the exp check difficult
- # expect(user.stats.exp).to.be.above(cummExp);
- # expect(user.stats.gp).to.be.above(cummGp);
- async.parallel [
-
- # Tavern Boss
- (cb2) ->
- Group.findById "habitrpg", (err, tavern) ->
-
- #use an explicit get because mongoose wraps the null in an object
- expect(_.isEmpty(tavern.get("quest"))).to.equal true
- expect(user.items.pets["MantisShrimp-Base"]).to.equal 5
- expect(user.items.mounts["MantisShrimp-Base"]).to.equal true
- expect(user.items.eggs.Dragon).to.equal 2
- expect(user.items.hatchingPotions.Shade).to.equal 2
- cb2()
-
- # Party Boss
- (cb2) ->
-
- #use an explicit get because mongoose wraps the null in an object
- expect(_.isEmpty(_group.get("quest"))).to.equal true
- expect(user.items.gear.owned.weapon_special_2).to.equal true
- expect(user.items.eggs.Dragon).to.equal 2
- expect(user.items.hatchingPotions.Shade).to.equal 2
-
- # need to fetch users to get updated data
- async.parallel [
- (cb3) ->
- User.findById party[0].id, (err, mbr) ->
- expect(mbr.items.gear.owned.weapon_special_2).to.equal true
- cb3()
- (cb3) ->
- User.findById party[1].id, (err, mbr) ->
- expect(mbr.items.gear.owned.weapon_special_2).to.equal true
- cb3()
- (cb3) ->
- User.findById party[2].id, (err, mbr) ->
- expect(mbr.items.gear.owned.weapon_special_2).to.not.be.ok()
- cb3()
- ], cb2
- ], cb
- ], done
+ it "excludes user in public group member list", (done) ->
+ request.get(baseURL + "/groups/" + guild._id)
+ .end (res) ->
+ g = res.body
+ expect(g.members.length).to.equal 15
+ userInGroup = _.find g.members, (member) -> return member._id == user._id
+ expect(userInGroup).to.not.exist
+ done()
diff --git a/test/api/party.coffee b/test/api/party.coffee
new file mode 100644
index 0000000000..152ac98ab9
--- /dev/null
+++ b/test/api/party.coffee
@@ -0,0 +1,464 @@
+'use strict'
+
+diff = require("deep-diff")
+
+Group = require("../../website/src/models/group").model
+app = require("../../website/src/server")
+
+describe "Party", ->
+ context "creating a party", ->
+ it "creates a party", (done) ->
+ async.waterfall [
+ (cb) ->
+ registerNewUser(cb, true)
+
+ (user, cb) ->
+ request.post(baseURL + "/groups").send(
+ name: "TestGroup"
+ type: "party"
+ ).end (res) ->
+ expectCode res, 200
+ group = res.body
+ expect(group.members.length).to.equal 1
+ expect(group.leader).to.equal user._id
+ cb()
+ ], done
+
+ it "prevents user from creating a second party", (done) ->
+ request.post(baseURL + "/groups").send(
+ name: "TestGroup"
+ type: "party"
+ ).end (res) ->
+ expectCode res, 400
+ expect(res.body.err).to.equal "Already in a party, try refreshing."
+ done()
+
+ context "Searching for a party", ->
+ group = undefined
+ beforeEach (done) ->
+ async.waterfall [
+ (cb) ->
+ registerNewUser(cb, true)
+
+ (user, cb) ->
+ request.post(baseURL + "/groups").send(
+ name: "TestGroup"
+ type: "party"
+ ).end (res) ->
+ expectCode res, 200
+ group = res.body
+ expect(group.members.length).to.equal 1
+ expect(group.leader).to.equal user._id
+ cb()
+ ], done
+
+ it "can be found by querying for group type party", (done) ->
+ request.get(baseURL + "/groups/").send(
+ type: "party"
+ ).end (res) ->
+ expectCode res, 200
+ party = _.find res.body, (g) -> return g._id == group._id
+ expect(party._id).to.equal group._id
+ expect(party.leader).to.equal user._id
+ expect(party.name).to.equal group.name
+ expect(party.quest).to.deep.equal { progress: {} }
+ expect(party.memberCount).to.equal group.memberCount
+ done()
+
+ context "joining a party", ->
+ group = undefined
+ beforeEach (done) ->
+ async.waterfall [
+ (cb) ->
+ registerNewUser(cb, true)
+
+ (user, cb) ->
+ request.post(baseURL + "/groups").send(
+ name: "TestGroup"
+ type: "party"
+ ).end (res) ->
+ expectCode res, 200
+ group = res.body
+ expect(group.members.length).to.equal 1
+ expect(group.leader).to.equal user._id
+ cb()
+ ], done
+
+ it "prevents user from joining a party when they haven't been invited", (done) ->
+ registerNewUser (err, user) ->
+ request.post(baseURL + "/groups/" + group._id + "/join").send()
+ .set("X-API-User", user._id)
+ .set("X-API-Key", user.apiToken)
+ .end (res) ->
+ expectCode res, 401
+ expect(res.body.err).to.equal "Can't join a group you're not invited to."
+ done()
+ , false
+
+ it "allows users to join a party when they have been invited", (done) ->
+ tmpUser = undefined
+ async.waterfall [
+ (cb) ->
+ registerNewUser(cb, false)
+
+ (user, cb) ->
+ tmpUser = user
+ inviteURL = baseURL + "/groups/" + group._id + "/invite"
+ request.post(inviteURL).send(
+ uuids: [tmpUser._id]
+ )
+ .end ->
+ cb()
+
+ (cb) ->
+ request.post(baseURL + "/groups/" + group._id + "/join")
+ .set("X-API-User", tmpUser._id)
+ .set("X-API-Key", tmpUser.apiToken)
+ .end (res) ->
+ expectCode res, 200
+ cb()
+
+ (cb) ->
+ Group.findById group._id, (err, grp) ->
+ expect(grp.members).to.include(tmpUser._id)
+ cb()
+ ], done
+
+ context "Quests", ->
+ party = undefined
+ group = undefined
+ participating = []
+ notParticipating = []
+ before (done) ->
+ # Tavern boss, side-by-side
+ Group.update(
+ _id: "habitrpg"
+ ,
+ $set:
+ quest:
+ key: "dilatory"
+ active: true
+ progress:
+ hp: shared.content.quests.dilatory.boss.hp
+ rage: 0
+ ).exec()
+
+ # Tally some progress for later. Later we want to test that progress made before the quest began gets
+ # counted after the quest starts
+ async.waterfall [
+ (cb) ->
+ registerNewUser(cb, true)
+
+ (user, cb) ->
+ request.post(baseURL + "/groups").send(
+ name: "TestGroup"
+ type: "party"
+ ).end (res) ->
+ expectCode res, 200
+ group = res.body
+ expect(group.members.length).to.equal 1
+ expect(group.leader).to.equal user._id
+ cb()
+
+ (cb) ->
+ request.post(baseURL + '/user/tasks').send({
+ type: 'daily'
+ text: 'daily one'
+ }).end (res) ->
+ cb()
+ (cb) ->
+ request.post(baseURL + '/user/tasks').send({
+ type: 'daily'
+ text: 'daily two'
+ }).end (res) ->
+ cb()
+ (cb) ->
+ User.findByIdAndUpdate user._id,
+ $set:
+ "stats.lvl": 50
+ , (err, _user) ->
+ cb(null, _user)
+ (_user, cb) ->
+ user = _user
+ request.post(baseURL + "/user/batch-update").send([
+ {
+ op: "score"
+ params:
+ direction: "up"
+ id: user.dailys[0].id
+ }
+ {
+ op: "score"
+ params:
+ direction: "up"
+ id: user.dailys[0].id
+ }
+ {
+ op: "update"
+ body:
+ "stats.lvl": 50
+ }
+ ]).end (res) ->
+ user = res.body
+ expect(user.party.quest.progress.up).to.be.above 0
+
+ # Invite some members
+ async.waterfall [
+
+ # Register new users
+ (cb) ->
+ registerManyUsers 3, cb
+
+ # Send them invitations
+ (_party, cb) ->
+ party = _party
+ inviteURL = baseURL + "/groups/" + group._id + "/invite"
+ async.parallel [
+ (cb2) ->
+ request.post(inviteURL).send(
+ uuids: [party[0]._id]
+ ).end ->
+ cb2()
+ (cb2) ->
+ request.post(inviteURL).send(
+ uuids: [party[1]._id]
+ ).end ->
+ cb2()
+ (cb2) ->
+ request.post(inviteURL).send(
+ uuids: [party[2]._id]
+ ).end (res)->
+ cb2()
+ ], cb
+
+ # Accept / Reject
+ (results, cb) ->
+
+ # series since they'll be modifying the same group record
+ series = _.reduce(party, (m, v, i) ->
+ m.push (cb2) ->
+ request.post(baseURL + "/groups/" + group._id + "/join").set("X-API-User", party[i]._id).set("X-API-Key", party[i].apiToken).end ->
+ cb2()
+ m
+ , [])
+ async.series series, cb
+
+ # Make sure the invites stuck
+ (whatever, cb) ->
+ Group.findById group._id, (err, g) ->
+ group = g
+ expect(g.members.length).to.equal 4
+ cb()
+
+ ], ->
+
+ # Start the quest
+ async.waterfall [
+ (cb) ->
+ request.post(baseURL + "/groups/" + group._id + "/questAccept?key=vice3").end (res) ->
+ expectCode res, 400
+ User.findByIdAndUpdate user._id,
+ $set:
+ "items.quests.vice3": 1
+ , cb
+
+ (_user, cb) ->
+ request.post(baseURL + "/groups/" + group._id + "/questAccept?key=vice3").end (res) ->
+ expectCode res, 200
+ Group.findById group._id, cb
+
+ (_group, cb) ->
+ expect(_group.quest.key).to.equal "vice3"
+ expect(_group.quest.active).to.equal false
+ request.post(baseURL + "/groups/" + group._id + "/questAccept").set("X-API-User", party[0]._id).set("X-API-Key", party[0].apiToken).end ->
+ request.post(baseURL + "/groups/" + group._id + "/questAccept").set("X-API-User", party[1]._id).set("X-API-Key", party[1].apiToken).end (res) ->
+ request.post(baseURL + "/groups/" + group._id + "/questReject").set("X-API-User", party[2]._id).set("X-API-Key", party[2].apiToken).end (res) ->
+ group = res.body
+ expect(group.quest.active).to.equal true
+ cb()
+
+ ], done
+ ]
+
+ it "Casts a spell", (done) ->
+ mp = user.stats.mp
+ request.get(baseURL + "/members/" + party[0]._id).end (res) ->
+ party[0] = res.body
+ request.post(baseURL + "/user/class/cast/snowball?targetType=user&targetId=" + party[0]._id).end (res) ->
+
+ #expect(res.body.stats.mp).to.be.below(mp);
+ request.get(baseURL + "/members/" + party[0]._id).end (res) ->
+ member = res.body
+ expect(member.achievements.snowball).to.equal 1
+ expect(member.stats.buffs.snowball).to.exist
+ difference = diff(member, party[0])
+ expect(_.size(difference)).to.equal 2
+
+ # level up user so str is > 0
+ request.put(baseURL + "/user").send("stats.lvl": 5).end (res) ->
+
+ # Refill mana so user can cast
+ request.put(baseURL + "/user").send("stats.mp": 100).end (res) ->
+ request.post(baseURL + "/user/class/cast/valorousPresence?targetType=party").end (res) ->
+ request.get(baseURL + "/members/" + member._id).end (res) ->
+ expect(res.body.stats.buffs.str).to.be.above 0
+ expect(diff(res.body, member).length).to.equal 1
+ done()
+
+ it "Doesn't include people who aren't participating", (done) ->
+ request.get(baseURL + "/groups/" + group._id).end (res) ->
+ expect(_.size(res.body.quest.members)).to.equal 3
+ done()
+
+ xit "Hurts the boss", (done) ->
+ request.post(baseURL + "/user/batch-update").end (res) ->
+ user = res.body
+ up = user.party.quest.progress.up
+ expect(up).to.be.above 0
+
+ #{op:'score',params:{direction:'up',id:user.dailys[3].id}}, // leave one daily undone so Trapper hurts party
+ # set day to yesterday, cron will then be triggered on next action
+ request.post(baseURL + "/user/batch-update").send([
+ {
+ op: "score"
+ params:
+ direction: "up"
+ id: user.dailys[0].id
+ }
+ {
+ op: "update"
+ body:
+ lastCron: moment().subtract(1, "days")
+ }
+ ]).end (res) ->
+ expect(res.body.party.quest.progress.up).to.be.above up
+ request.post(baseURL + "/user/batch-update").end ->
+ request.get(baseURL + "/groups/party").end (res) ->
+
+ # Check boss damage
+ async.waterfall [
+ (cb) ->
+ async.parallel [
+
+ #tavern boss
+ (cb2) ->
+ Group.findById "habitrpg",
+ quest: 1
+ , (err, tavern) ->
+ expect(tavern.quest.progress.hp).to.be.below shared.content.quests.dilatory.boss.hp
+ expect(tavern.quest.progress.rage).to.be.above 0
+ cb2()
+
+ # party boss
+ (cb2) ->
+ expect(res.body.quest.progress.hp).to.be.below shared.content.quests.vice3.boss.hp
+ _party = res.body.members
+ expect(_.find(_party,
+ _id: party[0]._id
+ ).stats.hp).to.be.below 50
+ expect(_.find(_party,
+ _id: party[1]._id
+ ).stats.hp).to.be.below 50
+ expect(_.find(_party,
+ _id: party[2]._id
+ ).stats.hp).to.be 50
+ cb2()
+ ], cb
+
+ # Kill the boss
+ (whatever, cb) ->
+ async.waterfall [
+
+ # tavern boss
+ (cb2) ->
+ expect(user.items.pets["MantisShrimp-Base"]).to.not.be.ok()
+ Group.update
+ _id: "habitrpg"
+ ,
+ $set:
+ "quest.progress.hp": 0
+ , cb2
+
+ # party boss
+ (arg1, arg2, cb2) ->
+ expect(user.items.gear.owned.weapon_special_2).to.not.be.ok()
+ Group.findByIdAndUpdate group._id,
+ $set:
+ "quest.progress.hp": 0
+ , cb2
+ ], cb
+ (_group, cb) ->
+ # set day to yesterday, cron will then be triggered on next action
+ request.post(baseURL + "/user/batch-update").send([
+ {
+ op: "score"
+ params:
+ direction: "up"
+ id: user.dailys[1].id
+ }
+ {
+ op: "update"
+ body:
+ lastCron: moment().subtract(1, "days")
+ }
+ ]).end ->
+ cb()
+
+ (cb) ->
+ request.post(baseURL + "/user/batch-update").end (res) ->
+ cb null, res.body
+
+ (_user, cb) ->
+
+ # need to load the user again, since tavern boss does update after user's cron
+ User.findById _user._id, cb
+ (_user, cb) ->
+ user = _user
+ Group.findById group._id, cb
+ (_group, cb) ->
+ cummExp = shared.content.quests.vice3.drop.exp + shared.content.quests.dilatory.drop.exp
+ cummGp = shared.content.quests.vice3.drop.gp + shared.content.quests.dilatory.drop.gp
+
+ #//FIXME check that user got exp, but user is leveling up making the exp check difficult
+ # expect(user.stats.exp).to.be.above(cummExp);
+ # expect(user.stats.gp).to.be.above(cummGp);
+ async.parallel [
+
+ # Tavern Boss
+ (cb2) ->
+ Group.findById "habitrpg", (err, tavern) ->
+
+ #use an explicit get because mongoose wraps the null in an object
+ expect(_.isEmpty(tavern.get("quest"))).to.equal true
+ expect(user.items.pets["MantisShrimp-Base"]).to.equal 5
+ expect(user.items.mounts["MantisShrimp-Base"]).to.equal true
+ expect(user.items.eggs.Dragon).to.equal 2
+ expect(user.items.hatchingPotions.Shade).to.equal 2
+ cb2()
+
+ # Party Boss
+ (cb2) ->
+
+ #use an explicit get because mongoose wraps the null in an object
+ expect(_.isEmpty(_group.get("quest"))).to.equal true
+ expect(user.items.gear.owned.weapon_special_2).to.equal true
+ expect(user.items.eggs.Dragon).to.equal 2
+ expect(user.items.hatchingPotions.Shade).to.equal 2
+
+ # need to fetch users to get updated data
+ async.parallel [
+ (cb3) ->
+ User.findById party[0].id, (err, mbr) ->
+ expect(mbr.items.gear.owned.weapon_special_2).to.equal true
+ cb3()
+ (cb3) ->
+ User.findById party[1].id, (err, mbr) ->
+ expect(mbr.items.gear.owned.weapon_special_2).to.equal true
+ cb3()
+ (cb3) ->
+ User.findById party[2].id, (err, mbr) ->
+ expect(mbr.items.gear.owned.weapon_special_2).to.not.be.ok()
+ cb3()
+ ], cb2
+ ], cb
+ ], done
diff --git a/test/api/pushNotifications.coffee b/test/api/pushNotifications.coffee
index 4a1cd97fca..e1f42dd87e 100644
--- a/test/api/pushNotifications.coffee
+++ b/test/api/pushNotifications.coffee
@@ -1,4 +1,7 @@
'use strict'
+#@TODO: Have to mock most things to get to the parts that
+#call pushNotify. Consider refactoring group controller
+#so things are easier to test
app = require("../../website/src/server")
rewire = require('rewire')
@@ -78,7 +81,6 @@ describe "Push-Notifications", ->
recipient = null
groups = rewire("../../website/src/controllers/groups")
- groups.__set__('questStart', -> true)
groups.__set__('pushNotify', pushSpy)
before (done) ->
@@ -152,6 +154,7 @@ describe "Push-Notifications", ->
group = { _id: 'party-id', name: 'party-name', type: 'party', members: [user._id, recipient._id], invites: [], quest: {}}
user.items.quests.hedgehog = 5
group.save = (cb) -> cb(null, group)
+ group.markModified = -> true
req = {
body: { uuids: [recipient._id] }
query: { key: 'hedgehog' }
@@ -173,6 +176,51 @@ describe "Push-Notifications", ->
done()
, 100
+ it "sends a push notification to participating members when quest starts", (done) ->
+ group = { _id: 'party-id', name: 'party-name', type: 'party', members: [user._id, recipient._id], invites: []}
+ group.quest = {
+ key: 'hedgehog'
+ progress: { hp: 100 }
+ members: {}
+ }
+ group.quest.members[recipient._id] = true
+ group.save = (cb) -> cb(null, group)
+ group.markModified = -> true
+ req = {
+ body: { uuids: [recipient._id] }
+ query: { }
+ # force: true
+ }
+ res = {
+ locals: { group: group, user: user }
+ json: -> return true
+ }
+ userMock = {
+ findOne: (arg, arg2, cb) ->
+ cb(null, recipient)
+ update: (arg, arg2, cb) ->
+ cb(null, user)
+ }
+ groups.__set__('User', userMock)
+ groups.__set__('populateQuery',
+ (arg, arg2, arg3) ->
+ return {
+ exec: -> group.members
+ }
+ )
+
+ groups.questAccept req, res
+
+ setTimeout -> # Allow questAccept to finish
+ expect(pushSpy.sendNotify).to.have.been.calledTwice
+ expect(pushSpy.sendNotify).to.have.been.calledWith(
+ recipient,
+ 'HabitRPG',
+ 'Your Quest has Begun: The Hedgebeast'
+ )
+ done()
+ , 100
+
describe "Gifts", ->
recipient = null
diff --git a/test/api/todos.coffee b/test/api/todos.coffee
index 78271134ae..b5f8d7fe3e 100644
--- a/test/api/todos.coffee
+++ b/test/api/todos.coffee
@@ -97,6 +97,27 @@ describe "Todos", ->
expect(todo.value).to.equal 0
done()
+ it "Does not create a todo with an id that already exists", (done) ->
+ original_todo = {
+ type: "todo"
+ text: "original todo"
+ id: "custom-id"
+ }
+ duplicate_id_todo = {
+ type: "todo"
+ text: "not original todo"
+ id: "custom-id"
+ }
+ request.post(baseURL + "/user/tasks").send(
+ original_todo
+ ).end (res) ->
+ request.post(baseURL + "/user/tasks").send(
+ duplicate_id_todo
+ ).end (res) ->
+ expectCode res, 409
+ expect(res.body.err).to.eql('A task with that ID already exists.')
+ done()
+
describe "Updating todos", ->
it "Does not update id of todo", (done) ->
request.put(baseURL + "/user/tasks/" + todo.id).send(
diff --git a/test/common/algos.mocha.coffee b/test/common/algos.mocha.coffee
index 66bc8aaae4..44ff5d0f72 100644
--- a/test/common/algos.mocha.coffee
+++ b/test/common/algos.mocha.coffee
@@ -24,6 +24,7 @@ newUser = (addTasks=true)->
gear:
equipped: {}
costume: {}
+ owned: {}
party:
quest:
progress:
@@ -33,7 +34,8 @@ newUser = (addTasks=true)->
todos: []
rewards: []
flags: {}
- achievements: {}
+ achievements:
+ ultimateGearSets: {}
contributor:
level: 2
@@ -157,7 +159,7 @@ describe 'User', ->
it 'handles perfect days', ->
user = newUser()
user.dailys = []
- _.times 3, ->user.dailys.push shared.taskDefaults({type:'daily'})
+ _.times 3, ->user.dailys.push shared.taskDefaults({type:'daily', startDate: moment().subtract(7, 'days')})
cron = -> user.lastCron = moment().subtract(1,'days');user.fns.cron()
cron()
@@ -191,7 +193,7 @@ describe 'User', ->
user.preferences.sleep = true
cron = -> user.lastCron = moment().subtract(1, 'days');user.fns.cron()
user.dailys = []
- _.times 2, -> user.dailys.push shared.taskDefaults({type:'daily'})
+ _.times 2, -> user.dailys.push shared.taskDefaults({type:'daily', startDate: moment().subtract(7, 'days')})
it 'remains in the inn on cron', ->
cron()
@@ -432,7 +434,6 @@ describe 'User', ->
expect(spell.lvl).to.be.above(0)
expect(spell.cast).to.be.a('function')
-
describe 'drop system', ->
user = null
@@ -481,6 +482,88 @@ describe 'User', ->
user.fns.randomVal.restore()
user.fns.predictableRandom.restore()
+ describe 'Enchanted Armoire', ->
+ user = newUser()
+ fullArmoire = {'weapon_warrior_0': true, 'armor_armoire_gladiatorArmor':true,'armor_armoire_lunarArmor':true,'head_armoire_gladiatorHelm':true,'head_armoire_lunarCrown':true,'head_armoire_rancherHat':true,'head_armoire_redHairbow':true,'head_armoire_violetFloppyHat':true,'shield_armoire_gladiatorShield':true,'weapon_armoire_basicCrossbow':true,'weapon_armoire_lunarSceptre':true}
+
+ beforeEach ->
+ # too many predictableRandom calls to stub, let's return the last element
+ sinon.stub(user.fns, 'randomVal', (obj)->
+ result = undefined
+ for key, val of obj
+ result = val
+ result
+ )
+
+ it 'counts all available equipment before any are claimed', ->
+ sinon.stub(user.fns, 'predictableRandom').returns 0
+ expect(shared.countArmoire(user.items.gear.owned)).to.eql (_.size(fullArmoire) - 1)
+
+ it 'does not open without paying', ->
+ sinon.stub(user.fns, 'predictableRandom').returns 0
+ user.ops.buy({params: {key: 'armoire'}})
+ expect(user.items.gear.owned).to.eql {'weapon_warrior_0': true}
+ expect(user.items.food).to.eql {}
+ expect(user.stats.exp).to.eql 0
+
+ it 'does not open without Ultimate Gear achievement', ->
+ sinon.stub(user.fns, 'predictableRandom').returns 0
+ user.stats.gp = 500
+ user.ops.buy({params: {key: 'armoire'}})
+ user.achievements.ultimateGearSets = {'healer':false,'wizard':false,'rogue':false,'warrior':false}
+ user.ops.buy({params: {key: 'armoire'}})
+ expect(user.items.gear.owned).to.eql {'weapon_warrior_0': true}
+ expect(user.items.food).to.eql {}
+ expect(user.stats.exp).to.eql 0
+
+ it 'always drops equipment the first time', ->
+ sinon.stub(user.fns, 'predictableRandom', cycle [.9,.5])
+ user.achievements.ultimateGearSets = {'healer':false,'wizard':false,'rogue':true,'warrior':false}
+ user.ops.buy({params: {key: 'armoire'}})
+ expect(user.items.gear.owned).to.eql {'weapon_warrior_0': true, 'shield_armoire_gladiatorShield':true}
+ expect(shared.countArmoire(user.items.gear.owned)).to.eql (_.size(fullArmoire) - 2)
+ expect(user.items.food).to.eql {}
+ expect(user.stats.exp).to.eql 0
+ expect(user.stats.gp).to.eql 400
+
+ it 'gives Experience', ->
+ sinon.stub(user.fns, 'predictableRandom', cycle [.9,.5])
+ user.ops.buy({params: {key: 'armoire'}})
+ expect(user.items.gear.owned).to.eql {'weapon_warrior_0': true, 'shield_armoire_gladiatorShield':true}
+ expect(user.items.food).to.eql {}
+ expect(user.stats.exp).to.eql 30
+ expect(user.stats.gp).to.eql 300
+
+ it 'gives food', ->
+ sinon.stub(user.fns, 'predictableRandom', cycle [.7,.5])
+ user.ops.buy({params: {key: 'armoire'}})
+ expect(user.items.gear.owned).to.eql {'weapon_warrior_0': true, 'shield_armoire_gladiatorShield':true}
+ expect(user.items.food).to.eql {'Honey': 1}
+ expect(user.stats.exp).to.eql 30
+ expect(user.stats.gp).to.eql 200
+
+ it 'gives more equipment', ->
+ sinon.stub(user.fns, 'predictableRandom', cycle [.5,.5])
+ user.ops.buy({params: {key: 'armoire'}})
+ expect(user.items.gear.owned).to.eql {'weapon_warrior_0': true, 'shield_armoire_gladiatorShield':true,'head_armoire_rancherHat':true}
+ expect(shared.countArmoire(user.items.gear.owned)).to.eql (_.size(fullArmoire) - 3)
+ expect(user.items.food).to.eql {'Honey': 1}
+ expect(user.stats.exp).to.eql 30
+ expect(user.stats.gp).to.eql 100
+
+ it 'does not give equipment if all equipment has been found', ->
+ sinon.stub(user.fns, 'predictableRandom', cycle [.5,.5])
+ user.items.gear.owned = fullArmoire
+ user.ops.buy({params: {key: 'armoire'}})
+ expect(user.items.gear.owned).to.eql fullArmoire
+ expect(shared.countArmoire(user.items.gear.owned)).to.eql 0
+ expect(user.items.food).to.eql {'Honey': 1}
+ expect(user.stats.exp).to.eql 60
+ expect(user.stats.gp).to.eql 0
+
+ afterEach ->
+ user.fns.randomVal.restore()
+ user.fns.predictableRandom.restore()
describe 'Quests', ->
_.each shared.content.quests, (quest)->
@@ -510,11 +593,19 @@ describe 'User', ->
_.each [1..5], (i) ->
user.ops.buy {params:'#{type}_#{klass}_#{i}'}
it 'does not get ultimateGear ' + klass, ->
- expect(user.achievements.ultimateGear).to.not.be.ok()
+ expect(user.achievements.ultimateGearSets[klass]).to.not.be.ok()
_.each shared.content.gearTypes, (type) ->
user.ops.buy {params:'#{type}_#{klass}_6'}
xit 'gets ultimateGear ' + klass, ->
- expect(user.achievements.ultimateGear).to.be.ok()
+ expect(user.achievements.ultimateGearSets[klass]).to.be.ok()
+
+ it 'does not remove existing Ultimate Gear achievements', ->
+ user = newUser()
+ user.achievements.ultimateGearSets = {'healer':true,'wizard':true,'rogue':true,'warrior':true}
+ user.items.gear.owned.shield_warrior_5 = false
+ user.items.gear.owned.weapon_rogue_6 = false
+ user.ops.buy {params:'shield_warrior_5'}
+ expect(user.achievements.ultimateGearSets).to.eql {'healer':true,'wizard':true,'rogue':true,'warrior':true}
it 'does not get beastMaster if user has less than 90 drop pets', ->
user = newUser()
@@ -792,8 +883,9 @@ describe 'Cron', ->
before.dailys[0].repeat = after.dailys[0].repeat = options.repeat if options.repeat
before.dailys[0].streak = after.dailys[0].streak = 10
before.dailys[0].completed = after.dailys[0].completed = true if options.checked
+ before.dailys[0].startDate = after.dailys[0].startDate = moment().subtract(30, 'days')
if options.shouldDo
- expect(shared.shouldDo(now, options.repeat, {timezoneOffset, dayStart:options.dayStart, now})).to.be.ok()
+ expect(shared.shouldDo(now.toDate(), after.dailys[0], {timezoneOffset, dayStart:options.dayStart, now})).to.be.ok()
after.fns.cron {now}
before.stats.mp=after.stats.mp #FIXME
switch options.expect
diff --git a/test/common/dailies.coffee b/test/common/dailies.coffee
new file mode 100644
index 0000000000..d26c8d012e
--- /dev/null
+++ b/test/common/dailies.coffee
@@ -0,0 +1,330 @@
+_ = require 'lodash'
+expect = require 'expect.js'
+sinon = require 'sinon'
+moment = require 'moment'
+shared = require '../../common/script/index.coffee'
+shared.i18n.translations = require('../../website/src/i18n.js').translations
+
+repeatWithoutLastWeekday = ()->
+ repeat = {su:1,m:1,t:1,w:1,th:1,f:1,s:1}
+ if shared.startOfWeek(moment().zone(0)).isoWeekday() == 1 # Monday
+ repeat.su = false
+ else
+ repeat.s = false
+ {repeat: repeat}
+
+### Helper Functions ####
+# @TODO: Refactor into helper file
+newUser = (addTasks=true)->
+ buffs = {per:0, int:0, con:0, str:0, stealth: 0, streaks: false}
+ user =
+ auth:
+ timestamps: {}
+ stats: {str:1, con:1, per:1, int:1, mp: 32, class: 'warrior', buffs: buffs}
+ items:
+ lastDrop:
+ count: 0
+ hatchingPotions: {}
+ eggs: {}
+ food: {}
+ gear:
+ equipped: {}
+ costume: {}
+ party:
+ quest:
+ progress:
+ down: 0
+ preferences: {}
+ dailys: []
+ todos: []
+ rewards: []
+ flags: {}
+ achievements: {}
+ contributor:
+ level: 2
+ shared.wrap(user)
+ user.ops.reset(null, ->)
+ if addTasks
+ _.each ['habit', 'todo', 'daily'], (task)->
+ user.ops.addTask {body: {type: task, id: shared.uuid()}}
+ user
+
+cron = (usr) ->
+ usr.lastCron = moment().subtract(1,'days')
+ usr.fns.cron()
+
+describe 'daily/weekly that repeats everyday (default)', ->
+ user = null
+ daily = null
+ weekly = null
+
+ describe 'when startDate is in the future', ->
+
+ beforeEach ->
+ user = newUser()
+ user.dailys = [
+ shared.taskDefaults({type:'daily', startDate: moment().add(7, 'days'), frequency: 'daily'})
+ shared.taskDefaults({type:'daily', startDate: moment().add(7, 'days'), frequency: 'weekly', repeat: {su:1,m:1,t:1,w:1,th:1,f:1,s:1}})
+ ]
+ daily = user.dailys[0]
+ weekly = user.dailys[1]
+
+ it 'does not damage user for not completing it', ->
+ cron(user)
+ expect(user.stats.hp).to.be 50
+
+ it 'does not change value on cron if daily is incomplete', ->
+ cron(user)
+ expect(daily.value).to.be 0
+ expect(weekly.value).to.be 0
+
+ it 'does not reset checklists if daily is not marked as complete', ->
+ checklist = [
+ {
+ 'text' : '1',
+ 'id' : 'checklist-one',
+ 'completed' : true
+ },
+ {
+ 'text' : '2',
+ 'id' : 'checklist-two',
+ 'completed' : true
+ },
+ {
+ 'text' : '3',
+ 'id' : 'checklist-three',
+ 'completed' : false
+ }
+ ]
+ daily.checklist = checklist
+ weekly.checklist = checklist
+ cron(user)
+
+ expect(daily.checklist[0].completed).to.be true
+ expect(daily.checklist[1].completed).to.be true
+ expect(daily.checklist[2].completed).to.be false
+
+ expect(weekly.checklist[0].completed).to.be true
+ expect(weekly.checklist[1].completed).to.be true
+ expect(weekly.checklist[2].completed).to.be false
+
+ it 'resets checklists if daily is marked as complete', ->
+ checklist = [
+ {
+ 'text' : '1',
+ 'id' : 'checklist-one',
+ 'completed' : true
+ },
+ {
+ 'text' : '2',
+ 'id' : 'checklist-two',
+ 'completed' : true
+ },
+ {
+ 'text' : '3',
+ 'id' : 'checklist-three',
+ 'completed' : false
+ }
+ ]
+ daily.checklist = checklist
+ weekly.checklist = checklist
+ daily.completed = true
+ weekly.completed = true
+ cron(user)
+
+ _.each daily.checklist, (box)->
+ expect(box.completed).to.be false
+
+ _.each weekly.checklist, (box)->
+ expect(box.completed).to.be false
+
+ it 'is due on startDate', ->
+ daily_due_today = shared.shouldDo moment(), daily
+ daily_due_on_start_date = shared.shouldDo moment().add(7, 'days'), daily
+
+ expect(daily_due_today).to.be false
+ expect(daily_due_on_start_date).to.be true
+
+ weekly_due_today = shared.shouldDo moment(), weekly
+ weekly_due_on_start_date = shared.shouldDo moment().add(7, 'days'), weekly
+
+ expect(weekly_due_today).to.be false
+ expect(weekly_due_on_start_date).to.be true
+
+ describe 'when startDate is in the past', ->
+ completeDaily = null
+
+ beforeEach ->
+ user = newUser()
+ user.dailys = [
+ shared.taskDefaults({type:'daily', startDate: moment().subtract(7, 'days'), frequency: 'daily'})
+ shared.taskDefaults({type:'daily', startDate: moment().subtract(7, 'days'), frequency: 'weekly'})
+ ]
+ daily = user.dailys[0]
+ weekly = user.dailys[1]
+
+ it 'does damage user for not completing it', ->
+ cron(user)
+ expect(user.stats.hp).to.be.lessThan 50
+
+ it 'decreases value on cron if daily is incomplete', ->
+ cron(user)
+ expect(daily.value).to.be.lessThan 0
+ expect(weekly.value).to.be.lessThan 0
+
+ it 'resets checklists if daily is not marked as complete', ->
+ checklist = [
+ {
+ 'text' : '1',
+ 'id' : 'checklist-one',
+ 'completed' : true
+ },
+ {
+ 'text' : '2',
+ 'id' : 'checklist-two',
+ 'completed' : true
+ },
+ {
+ 'text' : '3',
+ 'id' : 'checklist-three',
+ 'completed' : false
+ }
+ ]
+ daily.checklist = checklist
+ weekly.checklist = checklist
+ cron(user)
+
+ _.each daily.checklist, (box)->
+ expect(box.completed).to.be false
+
+ _.each weekly.checklist, (box)->
+ expect(box.completed).to.be false
+
+ it 'resets checklists if daily is marked as complete', ->
+ checklist = [
+ {
+ 'text' : '1',
+ 'id' : 'checklist-one',
+ 'completed' : true
+ },
+ {
+ 'text' : '2',
+ 'id' : 'checklist-two',
+ 'completed' : true
+ },
+ {
+ 'text' : '3',
+ 'id' : 'checklist-three',
+ 'completed' : false
+ }
+ ]
+ daily.checklist = checklist
+ daily.completed = true
+ weekly.checklist = checklist
+ weekly.completed = true
+ cron(user)
+
+ _.each daily.checklist, (box)->
+ expect(box.completed).to.be false
+
+ _.each weekly.checklist, (box)->
+ expect(box.completed).to.be false
+
+ describe 'when startDate is today', ->
+ completeDaily = null
+
+ beforeEach ->
+ user = newUser()
+ user.dailys = [
+ # Must set start date to yesterday, because cron mock sets last cron to yesterday
+ shared.taskDefaults({type:'daily', startDate: moment().subtract(1, 'days'), frequency: 'daily'})
+ shared.taskDefaults({type:'daily', startDate: moment().subtract(1, 'days'), frequency: 'weekly'})
+ ]
+ daily = user.dailys[0]
+ weekly = user.dailys[1]
+
+ it 'does damage user for not completing it', ->
+ cron(user)
+ expect(user.stats.hp).to.be.lessThan 50
+
+ it 'decreases value on cron if daily is incomplete', ->
+ cron(user)
+ expect(daily.value).to.be.lessThan 0
+ expect(weekly.value).to.be.lessThan 0
+
+ it 'resets checklists if daily is not marked as complete', ->
+ checklist = [
+ {
+ 'text' : '1',
+ 'id' : 'checklist-one',
+ 'completed' : true
+ },
+ {
+ 'text' : '2',
+ 'id' : 'checklist-two',
+ 'completed' : true
+ },
+ {
+ 'text' : '3',
+ 'id' : 'checklist-three',
+ 'completed' : false
+ }
+ ]
+ daily.checklist = checklist
+ weekly.checklist = checklist
+ cron(user)
+
+ _.each daily.checklist, (box)->
+ expect(box.completed).to.be false
+
+ _.each weekly.checklist, (box)->
+ expect(box.completed).to.be false
+
+ it 'resets checklists if daily is marked as complete', ->
+ checklist = [
+ {
+ 'text' : '1',
+ 'id' : 'checklist-one',
+ 'completed' : true
+ },
+ {
+ 'text' : '2',
+ 'id' : 'checklist-two',
+ 'completed' : true
+ },
+ {
+ 'text' : '3',
+ 'id' : 'checklist-three',
+ 'completed' : false
+ }
+ ]
+ daily.checklist = checklist
+ daily.completed = true
+ weekly.checklist = checklist
+ weekly.completed = true
+ cron(user)
+
+ _.each daily.checklist, (box)->
+ expect(box.completed).to.be false
+
+ _.each weekly.checklist, (box)->
+ expect(box.completed).to.be false
+
+describe 'daily that repeats every x days', ->
+ user = null
+ daily = null
+
+ beforeEach ->
+ user = newUser()
+ user.dailys = [ shared.taskDefaults({type:'daily', startDate: moment(), frequency: 'daily'}) ]
+ daily = user.dailys[0]
+
+ _.times 11, (due) ->
+
+ it 'where x equals ' + due, ->
+ daily.everyX = due
+
+ _.times 30, (day) ->
+ isDue = shared.shouldDo moment().add(day, 'days'), daily
+ expect(isDue).to.be true if day % due == 0
+ expect(isDue).to.be false if day % due != 0
diff --git a/test/migrations/20150605_ultimate_achievement_backfill.coffee b/test/migrations/20150605_ultimate_achievement_backfill.coffee
new file mode 100644
index 0000000000..b5646020b0
--- /dev/null
+++ b/test/migrations/20150605_ultimate_achievement_backfill.coffee
@@ -0,0 +1,74 @@
+'use strict'
+TEST_DB = process.env.DB_NAME = 'habitrpg_migration_test'
+process.env.NODE_DB_URI = 'mongodb://localhost/' + TEST_DB
+
+app = require('../../website/src/server')
+sh = require('shelljs')
+
+runMigration = ->
+ sh.exec 'node ./migrations/20150604_ultimateGearSets.js'
+
+describe 'Backfill for granting ultimate gear sets achievement', ->
+ before (done) ->
+ sh.exec "mongo \"#{TEST_DB}\" --eval \"db.dropDatabase()\""
+ done()
+
+ context 'User without any purchased equipment', ->
+ before (done) ->
+ registerNewUser done, true
+
+ it 'does not update user', (done)->
+ user_gear = user.items.gear.owned
+ expect(user_gear.weapon_wizard_6).to.not.exist
+ expect(user.achievements.ultimateGearSets).to.not.exist
+
+ runMigration()
+ User.findById user._id, (err, _user) ->
+ user = _user
+ expect(user.achievements.ultimateGearSets).to.not.exist
+ done()
+
+ context 'User with all but one needed piece of equipment', ->
+ before (done) ->
+ registerNewUser ->
+ items = {
+ weapon_wizard_6: true
+ armor_wizard_5: true
+ }
+
+ User.findByIdAndUpdate user._id, {'items.gear.owned': items}, (err, _user) ->
+ user = _user
+ done()
+ , true
+
+ it 'does not update user', (done)->
+
+ runMigration()
+
+ User.findById user._id, (err, _user) ->
+ user = _user
+ expect(user.achievements.ultimateGearSets).to.not.exist
+ done()
+
+ context 'User with all necessary equipment', ->
+ before (done) ->
+ registerNewUser ->
+ items = {
+ weapon_wizard_6: true
+ armor_wizard_5: true
+ head_wizard_5: true
+ }
+
+ User.findByIdAndUpdate user._id, {'items.gear.owned': items}, (err, _user) ->
+ user = _user
+ done()
+ , true
+
+ it 'grants user ultimate gear', (done)->
+
+ runMigration()
+
+ User.findById user._id, (err, _user) ->
+ user = _user
+ expect(user.achievements.ultimateGearSets.wizard).to.exist
+ done()
diff --git a/test/runTests.coffee b/test/runTests.coffee
deleted file mode 100644
index a1cbec49f0..0000000000
--- a/test/runTests.coffee
+++ /dev/null
@@ -1,99 +0,0 @@
-sh = require('shelljs')
-async = require('async')
-TEST_DB = 'habitrpg_test'
-TEST_DB_URI = "mongodb://localhost/#{TEST_DB}"
-TEST_SERVER_PORT = 3001
-MAX_WAIT = 60
-
-announce = (msg) ->
- sh.echo '\x1b[36m%s\x1b[0m', "TEST SUITE: #{msg}"
-
-Suite =
- # Primary Task
- run: ->
- announce "Preparing the test environment."
- Suite.prepareEnvironment ->
- announce "Test prep complete. Waiting for server availability."
- Suite.awaitServers ->
- announce "Servers are ready. Beginning tests."
- Suite.summarize
- "API Specs": Suite.runApiSpecs()
- "Common Specs": Suite.runCommonSpecs()
- "End-to-End Specs": Suite.runE2ESpecs()
- "Karma Specs": Suite.runKarmaSpecs()
-
- # Output summary report when tests are done.
- summarize: (results) ->
- anyFailed = 0
- sh.echo ""
- announce "Tests complete!\n\nSummary\n-------\n"
- for name, result of results
- if result is 0
- sh.echo '\x1b[36m%s\x1b[0m', "#{name}: \x1b[32mpassing"
- else
- anyFailed = 1
- sh.echo '\x1b[36m%s\x1b[0m', "#{name}: \x1b[31mfailing"
- sh.echo ""
- announce "Thanks for helping keep Habitica clean!"
- process.exit(anyFailed)
-
- # Prepare files, db, and spin up servers.
- prepareEnvironment: (cb) ->
- sh.exec "grunt build:test"
- sh.exec "mongo \"#{TEST_DB}\" --eval \"db.dropDatabase()\""
- sh.exec "./node_modules/protractor/bin/webdriver-manager update"
-
- # Spin this up even if we're not in a headless environment. Shouldn't matter.
- sh.exec "Xvfb :99 -screen 0 1024x768x24 -extension RANDR", silent: true, async: true
-
- sh.exec "./node_modules/protractor/bin/webdriver-manager start", silent: true, async: true
- sh.exec "NODE_DB_URI=\"#{TEST_DB_URI}\" PORT=\"#{TEST_SERVER_PORT}\" node ./website/src/server.js", silent: true, async: true
- cb()
-
- # Ensure both the selenium and node servers are available
- awaitServers: (cb) ->
- async.parallel [Suite.awaitSelenium, Suite.awaitNode], (err, results) ->
- throw err if err?
- cb()
-
- awaitSelenium: (cb) ->
- waited = 0
- interval = setInterval ->
- if sh.exec('nc -z localhost 4444').code is 0
- clearInterval(interval)
- cb()
- waited += 1
- if waited > MAX_WAIT
- clearInterval(interval)
- cb(new Error("Timed out waiting for Selenium"))
- , 1000
-
- awaitNode: (cb) ->
- waited = 0
- interval = setInterval ->
- if sh.exec('nc -z localhost 3001').code is 0
- clearInterval(interval)
- cb()
- waited += 1
- if waited > MAX_WAIT
- clearInterval(interval)
- cb(new Error("Timed out waiting for Node server"))
- , 1000
-
- runApiSpecs: ->
- announce "Running API Specs (Mocha)"
- sh.exec("NODE_ENV=testing ./node_modules/mocha/bin/mocha test/api").code
-
- runCommonSpecs: ->
- announce "Running Common Specs (Mocha)"
- sh.exec("NODE_ENV=testing ./node_modules/mocha/bin/mocha test/common").code
-
- runE2ESpecs: ->
- announce "Running End-to-End Specs (Protractor)"
- sh.exec("DISPLAY=:99 NODE_ENV=testing ./node_modules/protractor/bin/protractor protractor.conf.js").code
-
- runKarmaSpecs: ->
- announce "Running Karma Specs"
- sh.exec("NODE_ENV=testing grunt karma:continuous").code
-
-Suite.run()
diff --git a/test/spec/app.js b/test/spec/app.js
new file mode 100644
index 0000000000..6567bf9ef6
--- /dev/null
+++ b/test/spec/app.js
@@ -0,0 +1,36 @@
+'use strict';
+
+describe('AppJS', function() {
+ describe('Automatic page refresh', function(){
+ var clock;
+ beforeEach(function () {
+ clock = sinon.useFakeTimers();
+ sinon.stub(window, "refresher", function(){return true});
+ });
+
+ afterEach(function () {
+ clock.restore();
+ window.refresher.restore();
+ });
+
+ it('should not call refresher if idle time is less than 6 hours', function() {
+ window.awaitIdle();
+ clock.tick(21599999);
+ expect(window.refresher).to.not.be.called;
+ });
+
+ it('should not call refresher if awaitIdle is called within 6 hours', function() {
+ window.awaitIdle();
+ clock.tick(21500000);
+ window.awaitIdle();
+ clock.tick(21500000);
+ expect(window.refresher).to.not.be.called;
+ });
+
+ it('should call refresher if idle time is 6 hours or greater', function() {
+ window.awaitIdle();
+ clock.tick(21600000);
+ expect(window.refresher).to.be.called;
+ });
+ });
+});
diff --git a/test/spec/authCtrlSpec.js b/test/spec/controllers/authCtrlSpec.js
similarity index 100%
rename from test/spec/authCtrlSpec.js
rename to test/spec/controllers/authCtrlSpec.js
diff --git a/test/spec/controllers/challengesCtrlSpec.js b/test/spec/controllers/challengesCtrlSpec.js
new file mode 100644
index 0000000000..417095c152
--- /dev/null
+++ b/test/spec/controllers/challengesCtrlSpec.js
@@ -0,0 +1,177 @@
+'use strict';
+
+describe('Challenges Controller', function() {
+ var $rootScope, scope, user, ctrl, challenges, groups;
+
+ beforeEach(function() {
+ module(function($provide) {
+ $provide.value('User', {});
+ });
+
+ inject(function($rootScope, $controller, Challenges, Groups){
+ user = specHelper.newUser();
+ user._id = "unique-user-id";
+
+ scope = $rootScope.$new();
+
+ // Load RootCtrl to ensure shared behaviors are loaded
+ $controller('RootCtrl', {$scope: scope, User: {user: user}});
+
+ ctrl = $controller('ChallengesCtrl', {$scope: scope, User: {user: user}});
+
+ challenges = Challenges;
+ groups = Groups;
+ });
+ });
+
+ describe('filterChallenges', function() {
+ var ownMem, ownNotMem, notOwnMem, notOwnNotMem;
+
+ beforeEach(function() {
+ ownMem = new challenges.Challenge({
+ name: 'test',
+ description: 'You are the owner and member',
+ habits: [],
+ dailys: [],
+ todos: [],
+ rewards: [],
+ leader: user._id,
+ group: "test",
+ timestamp: +(new Date),
+ members: [user],
+ official: false,
+ _isMember: true
+ });
+
+ ownNotMem = new challenges.Challenge({
+ name: 'test',
+ description: 'You are the owner, but not a member',
+ habits: [],
+ dailys: [],
+ todos: [],
+ rewards: [],
+ leader: user._id,
+ group: "test",
+ timestamp: +(new Date),
+ members: [],
+ official: false,
+ _isMember: false
+ });
+
+ notOwnMem = new challenges.Challenge({
+ name: 'test',
+ description: 'Not owner but a member',
+ habits: [],
+ dailys: [],
+ todos: [],
+ rewards: [],
+ leader: {_id:"test"},
+ group: "test",
+ timestamp: +(new Date),
+ members: [user],
+ official: false,
+ _isMember: true
+ });
+
+ notOwnNotMem = new challenges.Challenge({
+ name: 'test',
+ description: 'Not owner or member',
+ habits: [],
+ dailys: [],
+ todos: [],
+ rewards: [],
+ leader: {_id:"test"},
+ group: "test",
+ timestamp: +(new Date),
+ members: [],
+ official: false,
+ _isMember: false
+ });
+
+ scope.search = {
+ group: _.transform(groups, function(m,g){m[g._id]=true;})
+ };
+ });
+
+ it('displays challenges that match membership: either and owner: either', function() {
+ scope.search._isMember = 'either';
+ scope.search._isOwner = 'either';
+ expect(scope.filterChallenges(ownMem)).to.eql(true);
+ expect(scope.filterChallenges(ownNotMem)).to.eql(true);
+ expect(scope.filterChallenges(notOwnMem)).to.eql(true);
+ expect(scope.filterChallenges(notOwnNotMem)).to.eql(true);
+ });
+
+ it('displays challenges that match membership: either and owner: true', function() {
+ scope.search._isMember = 'either';
+ scope.search._isOwner = true;
+ expect(scope.filterChallenges(ownMem)).to.eql(true);
+ expect(scope.filterChallenges(ownNotMem)).to.eql(true);
+ expect(scope.filterChallenges(notOwnMem)).to.eql(false);
+ expect(scope.filterChallenges(notOwnNotMem)).to.eql(false);
+ });
+
+ it('displays challenges that match membership: either and owner: false', function() {
+ scope.search._isMember = 'either';
+ scope.search._isOwner = false;
+ expect(scope.filterChallenges(ownMem)).to.eql(false);
+ expect(scope.filterChallenges(ownNotMem)).to.eql(false);
+ expect(scope.filterChallenges(notOwnMem)).to.eql(true);
+ expect(scope.filterChallenges(notOwnNotMem)).to.eql(true);
+ });
+
+ it('displays challenges that match membership: true and owner: either', function() {
+ scope.search._isMember = true;
+ scope.search._isOwner = 'either';
+ expect(scope.filterChallenges(ownMem)).to.eql(true);
+ expect(scope.filterChallenges(ownNotMem)).to.eql(false);
+ expect(scope.filterChallenges(notOwnMem)).to.eql(true);
+ expect(scope.filterChallenges(notOwnNotMem)).to.eql(false);
+ });
+
+ it('displays challenges that match membership: true and owner: true', function() {
+ scope.search._isMember = true;
+ scope.search._isOwner = true;
+ expect(scope.filterChallenges(ownMem)).to.eql(true);
+ expect(scope.filterChallenges(ownNotMem)).to.eql(false);
+ expect(scope.filterChallenges(notOwnMem)).to.eql(false);
+ expect(scope.filterChallenges(notOwnNotMem)).to.eql(false);
+ });
+
+ it('displays challenges that match membership: true and owner: false', function() {
+ scope.search._isMember = true;
+ scope.search._isOwner = false;
+ expect(scope.filterChallenges(ownMem)).to.eql(false);
+ expect(scope.filterChallenges(ownNotMem)).to.eql(false);
+ expect(scope.filterChallenges(notOwnMem)).to.eql(true);
+ expect(scope.filterChallenges(notOwnNotMem)).to.eql(false);
+ });
+
+ it('displays challenges that match membership: false and owner: either', function() {
+ scope.search._isMember = false;
+ scope.search._isOwner = 'either';
+ expect(scope.filterChallenges(ownMem)).to.eql(false);
+ expect(scope.filterChallenges(ownNotMem)).to.eql(true);
+ expect(scope.filterChallenges(notOwnMem)).to.eql(false);
+ expect(scope.filterChallenges(notOwnNotMem)).to.eql(true);
+ });
+
+ it('displays challenges that match membership: false and owner: true', function() {
+ scope.search._isMember = false;
+ scope.search._isOwner = true;
+ expect(scope.filterChallenges(ownMem)).to.eql(false);
+ expect(scope.filterChallenges(ownNotMem)).to.eql(true);
+ expect(scope.filterChallenges(notOwnMem)).to.eql(false);
+ expect(scope.filterChallenges(notOwnNotMem)).to.eql(false);
+ });
+
+ it('displays challenges that match membership: false and owner: false', function() {
+ scope.search._isMember = false;
+ scope.search._isOwner = false;
+ expect(scope.filterChallenges(ownMem)).to.eql(false);
+ expect(scope.filterChallenges(ownNotMem)).to.eql(false);
+ expect(scope.filterChallenges(notOwnMem)).to.eql(false);
+ expect(scope.filterChallenges(notOwnNotMem)).to.eql(true);
+ });
+ });
+});
diff --git a/test/spec/controllers/filtersCtrlSpec.js b/test/spec/controllers/filtersCtrlSpec.js
new file mode 100644
index 0000000000..bbebce3cfd
--- /dev/null
+++ b/test/spec/controllers/filtersCtrlSpec.js
@@ -0,0 +1,39 @@
+'use strict';
+
+describe('Filters Controller', function() {
+ var scope, user;
+
+ beforeEach(inject(function($rootScope, $controller, Shared) {
+ user = specHelper.newUser();
+ Shared.wrap(user);
+ scope = $rootScope.$new();
+ $controller('FiltersCtrl', {$scope: scope, User: {user: user}});
+ }));
+
+ describe('tags', function(){
+ it('creates a tag', function(){
+ scope._newTag = {name:'tagName'}
+ scope.createTag();
+ expect(user.tags).to.have.length(1);
+ expect(user.tags[0].name).to.eql('tagName');
+ expect(user.tags[0]).to.have.property('id');
+ });
+
+ it('toggles tag filtering', inject(function(Shared){
+ var tag = {id: Shared.uuid(), name: 'myTag'};
+ scope.toggleFilter(tag);
+ expect(user.filters[tag.id]).to.eql(true);
+ scope.toggleFilter(tag);
+ expect(user.filters[tag.id]).to.eql(false);
+ }));
+ });
+
+ describe('updateTaskFilter', function(){
+ it('updatest user\'s filter query with the value of filterQuery', function () {
+ scope.filterQuery = 'task';
+ scope.updateTaskFilter();
+
+ expect(user.filterQuery).to.eql(scope.filterQuery);
+ });
+ });
+});
diff --git a/test/spec/groupCtrlSpec.js b/test/spec/controllers/groupCtrlSpec.js
similarity index 100%
rename from test/spec/groupCtrlSpec.js
rename to test/spec/controllers/groupCtrlSpec.js
diff --git a/test/spec/hallCtrlSpec.js b/test/spec/controllers/hallCtrlSpec.js
similarity index 100%
rename from test/spec/hallCtrlSpec.js
rename to test/spec/controllers/hallCtrlSpec.js
diff --git a/test/spec/controllers/headerCtrlSpec.js b/test/spec/controllers/headerCtrlSpec.js
new file mode 100644
index 0000000000..4060519fde
--- /dev/null
+++ b/test/spec/controllers/headerCtrlSpec.js
@@ -0,0 +1,56 @@
+'use strict';
+
+describe('Header Controller', function() {
+ var scope, ctrl, user, $location, $rootScope;
+
+ beforeEach(function() {
+ module(function($provide) {
+ $provide.value('User', {});
+ });
+
+ inject(function(_$rootScope_, _$controller_, _$location_){
+ user = specHelper.newUser();
+ user._id = "unique-user-id"
+
+ scope = _$rootScope_.$new();
+ $rootScope = _$rootScope_;
+
+ $location = _$location_;
+
+ // Load RootCtrl to ensure shared behaviors are loaded
+ _$controller_('RootCtrl', {$scope: scope, User: {user: user}});
+
+ ctrl = _$controller_('HeaderCtrl', {$scope: scope, User: {user: user}});
+ });
+ });
+
+ context('inviteOrStartParty', function(){
+ beforeEach(function(){
+ sinon.stub($location, 'path');
+ sinon.stub($rootScope, 'openModal');
+ });
+
+ afterEach(function(){
+ $location.path.restore();
+ $rootScope.openModal.restore();
+ });
+
+ it('redirects to party page if user does not have a party', function(){
+ var group = {};
+ scope.inviteOrStartParty(group);
+
+ expect($location.path).to.be.calledWith("/options/groups/party");
+ expect($rootScope.openModal).to.not.be.called;
+ });
+
+ it('Opens invite-friends modal if user has a party', function(){
+ var group = {
+ type: 'party'
+ };
+ scope.inviteOrStartParty(group);
+
+ expect($rootScope.openModal).to.be.calledOnce;
+ expect($location.path).to.not.be.called;
+ });
+ });
+});
diff --git a/test/spec/inventoryCtrlSpec.js b/test/spec/controllers/inventoryCtrlSpec.js
similarity index 92%
rename from test/spec/inventoryCtrlSpec.js
rename to test/spec/controllers/inventoryCtrlSpec.js
index 65e36911fc..d41a8708f6 100644
--- a/test/spec/inventoryCtrlSpec.js
+++ b/test/spec/controllers/inventoryCtrlSpec.js
@@ -10,8 +10,12 @@ describe('Inventory Controller', function() {
inject(function($rootScope, $controller, Shared){
user = specHelper.newUser();
- user.balance = 4,
- user.items = {eggs: {Cactus: 1}, hatchingPotions: {Base: 1}, food: {Meat: 1}, pets: {}, mounts: {}};
+ user.balance = 4;
+ user.items.eggs = {Cactus: 1};
+ user.items.hatchingPotions = {Base: 1};
+ user.items.food = {Meat: 1};
+ user.items.pets = {}
+ user.items.mounts = {};
Shared.wrap(user);
var mockWindow = {
confirm: function(msg){
diff --git a/test/spec/controllers/rootCtrlSpec.js b/test/spec/controllers/rootCtrlSpec.js
new file mode 100644
index 0000000000..15ee64e1cf
--- /dev/null
+++ b/test/spec/controllers/rootCtrlSpec.js
@@ -0,0 +1,194 @@
+'use strict';
+
+describe('Root Controller', function() {
+ var scope, rootscope, user, User, notification, ctrl, $httpBackend;
+
+ beforeEach(function () {
+ module(function($provide) {
+ $provide.value('User', {});
+ $provide.service('$templateCache', function () {
+ return {
+ get: function () {},
+ put: function () {}
+ }
+ });
+ });
+
+ inject(function($rootScope, $controller, _$httpBackend_, Notification) {
+ scope = $rootScope.$new();
+ scope.loginUsername = 'user';
+ scope.loginPassword = 'pass';
+
+ rootscope = $rootScope;
+
+ $httpBackend = _$httpBackend_;
+
+ notification = Notification;
+ sinon.stub(notification, 'text');
+ sinon.stub(notification, 'markdown');
+
+ user = specHelper.newUser();
+ User = {user: user};
+ User.save = sinon.spy();
+ User.sync = sinon.spy();
+
+ $httpBackend.whenGET(/partials/).respond();
+
+ ctrl = $controller('RootCtrl', {$scope: scope, User: User});
+ });
+ });
+
+ afterEach(function() {
+ notification.text.reset();
+ notification.markdown.reset();
+ User.save.reset();
+ User.sync.reset();
+ });
+
+ describe('contribText', function(){
+ it('shows contributor level text', function(){
+ expect(scope.contribText()).to.eql(undefined);
+ expect(scope.contribText(null, {npc: 'NPC'})).to.eql('NPC');
+ expect(scope.contribText({level: 0, text: 'Blacksmith'})).to.eql(undefined);
+ expect(scope.contribText({level: 1, text: 'Blacksmith'})).to.eql('Friend Blacksmith');
+ expect(scope.contribText({level: 2, text: 'Blacksmith'})).to.eql('Friend Blacksmith');
+ expect(scope.contribText({level: 3, text: 'Blacksmith'})).to.eql('Elite Blacksmith');
+ expect(scope.contribText({level: 4, text: 'Blacksmith'})).to.eql('Elite Blacksmith');
+ expect(scope.contribText({level: 5, text: 'Blacksmith'})).to.eql('Champion Blacksmith');
+ expect(scope.contribText({level: 6, text: 'Blacksmith'})).to.eql('Champion Blacksmith');
+ expect(scope.contribText({level: 7, text: 'Blacksmith'})).to.eql('Legendary Blacksmith');
+ expect(scope.contribText({level: 8, text: 'Blacksmith'})).to.eql('Guardian Blacksmith');
+ expect(scope.contribText({level: 9, text: 'Blacksmith'})).to.eql('Heroic Blacksmith');
+ expect(scope.contribText({level: 9, text: 'Blacksmith'}, {npc: 'NPC'})).to.eql('NPC');
+ });
+ });
+
+ describe('castEnd', function(){
+ var task_target, type;
+
+ beforeEach(function(){
+ task_target = {
+ id: 'task-id',
+ text: 'task'
+ };
+ type = 'task';
+ scope.spell = {
+ target: 'task',
+ key: 'fireball',
+ mana: 10,
+ text: function() { return env.t('spellWizardFireballText') },
+ cast: function(){}
+ };
+ rootscope.applyingAction = true;
+ });
+
+ context('fails', function(){
+ it('exits early if there is no applying action', function(){
+ rootscope.applyingAction = null;
+ expect(scope.castEnd(task_target, type)).to.be.eql('No applying action');
+ });
+
+ it('sends notification if target is invalid', function(){
+ scope.spell.target = 'not_the_same_target';
+
+ scope.castEnd(task_target, type);
+
+ notification.text.should.have.been.calledWith(window.env.t('invalidTarget'));
+ });
+ });
+
+ context('succeeds', function(){
+ it('sets scope.spell and rootScope.applyingAction to falsy values', function(){
+
+ scope.castEnd(task_target, type);
+
+ expect(rootscope.applyingAction).to.eql(false);
+ expect(scope.spell).to.eql(null);
+ });
+
+ it('calls $scope.spell.cast', function(){
+ // Kind of a hack, would prefer to use sinon.spy,
+ // but scope.spell gets turned to null in scope.castEnd
+ var spellWasCast = false;
+ scope.spell.cast = function(){ spellWasCast = true };
+
+ scope.castEnd(task_target, type);
+
+ expect(spellWasCast).to.eql(true);
+ });
+
+ it('calls cast endpoint', function() {
+ $httpBackend.expectPOST(/cast/).respond(201);
+ scope.castEnd(task_target, type);
+
+ $httpBackend.flush();
+ });
+
+ it('sends notification that spell was cast on task', function() {
+ $httpBackend.expectPOST(/cast/).respond(201);
+ scope.castEnd(task_target, type);
+ $httpBackend.flush();
+
+ expect(notification.markdown).to.be.calledOnce;
+ expect(notification.markdown).to.be.calledWith('You cast Burst of Flames on task.');
+ expect(User.sync).to.be.calledOnce;
+ });
+
+ it('sends notification that spell was cast on user', function() {
+ var user_target = {
+ profile: { name: 'Lefnire' }
+ };
+ scope.spell = {
+ target: 'user',
+ key: 'snowball',
+ mana: 0,
+ text: function() { return env.t('spellSpecialSnowballAuraText') },
+ cast: function(){}
+ };
+ $httpBackend.expectPOST(/cast/).respond(201);
+ scope.castEnd(user_target, 'user');
+ $httpBackend.flush();
+
+ expect(notification.markdown).to.be.calledOnce;
+ expect(notification.markdown).to.be.calledWith('You cast Snowball on Lefnire.');
+ expect(User.sync).to.be.calledOnce;
+ });
+
+ it('sends notification that spell was cast on party', function() {
+ var party_target = {};
+ scope.spell = {
+ target: 'party',
+ key: 'healAll',
+ mana: 25,
+ text: function() { return env.t('spellHealerHealAllText') },
+ cast: function(){}
+ };
+ $httpBackend.expectPOST(/cast/).respond(201);
+ scope.castEnd(party_target, 'party');
+ $httpBackend.flush();
+
+ expect(notification.markdown).to.be.calledOnce;
+ expect(notification.markdown).to.be.calledWith('You cast Blessing for the party.');
+ expect(User.sync).to.be.calledOnce;
+ });
+
+ it('sends notification that spell was cast on self', function() {
+ var self_target = {};
+ scope.spell = {
+ target: 'self',
+ key: 'stealth',
+ mana: 45,
+ text: function() { return env.t('spellRogueStealthText') },
+ cast: function(){}
+ };
+ $httpBackend.expectPOST(/cast/).respond(201);
+ scope.castEnd(self_target, 'self');
+ $httpBackend.flush();
+
+ expect(notification.markdown).to.be.calledOnce;
+ expect(notification.markdown).to.be.calledWith('You cast Stealth.');
+ expect(User.sync).to.be.calledOnce;
+ });
+ });
+ });
+});
diff --git a/test/spec/directives/focus-me.directive.spec.js b/test/spec/directives/focus-me.directive.spec.js
new file mode 100644
index 0000000000..ed016949c3
--- /dev/null
+++ b/test/spec/directives/focus-me.directive.spec.js
@@ -0,0 +1,28 @@
+'use strict';
+
+describe('focusMe Directive', function() {
+ var element, scope;
+
+ beforeEach(module('habitrpg'));
+
+ beforeEach(inject(function($rootScope, $compile) {
+ scope = $rootScope.$new();
+
+ element = "";
+
+ element = $compile(element)(scope);
+ scope.$digest();
+ }));
+
+ it('focuses the element when appended to the DOM', function() {
+ inject(function($timeout) {
+ var focusSpy = sinon.spy();
+
+ element.appendTo(document.body);
+ element.on('focus', focusSpy);
+
+ $timeout.flush();
+ expect(focusSpy).to.have.been.called;
+ });
+ });
+});
diff --git a/test/spec/directives/from-now.directive.spec.js b/test/spec/directives/from-now.directive.spec.js
new file mode 100644
index 0000000000..a197f2c331
--- /dev/null
+++ b/test/spec/directives/from-now.directive.spec.js
@@ -0,0 +1,89 @@
+'use strict';
+
+describe('fromNow Directive', function() {
+ var element, scope;
+ var fromNow = 'recently';
+ var diff = 0;
+
+ beforeEach(module('habitrpg'));
+
+ beforeEach(inject(function($rootScope, $compile) {
+ scope = $rootScope.$new();
+ scope.message = {};
+
+ sinon.stub(window, 'moment').returns({
+ fromNow: function() { return fromNow },
+ diff: function() { return diff }
+ });
+
+ element = "
Join 200,000 players making it fun to achieve goals!
-
-
-
-
Featured in
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
HabitRPG is a free habit building and productivity app that treats your real life like a game. With in-game rewards and punishments to motivate you and a strong social network to inspire you, HabitRPG can help you achieve your goals to become healthy, hard-working, and happy.
-
-
-
-
-
-
-
What people say...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
I can't tell you how many time and task tracking systems I've tried over the decades... HRPG is the only thing I've used that actually helps me get things done rather than just list them.
- Drag0nsilver
-
-
-
-
-
-
-
-
-
-
HabitRPG is the reason I got a killer, high-paying job... and even more miraculous, I'm now a daily flosser!
- frabjabulous
-
-
-
-
-
-
-
-
-
-
Awesome product, just started a few days ago and already more conscious and productive with my time!
- AndeeLiao
-
-
-
-
-
-
-
-
-
Couldn't NOT talk about HabitRPG during my speech in Madrid. Must-have tool for freelancers who still need a boss.
Eggs and items drop when you complete your tasks. Be as productive as possible to collect pets and mounts!
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Achievement Badges
-
Do something totally awesome? Get a badge and show it off!
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Equipment and extras
-
Buy limited edition equipment, potions, and other virtual goodies in our Market with your task rewards!
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Social play
-
Join common-interest groups with like-minded people.
Create Challenges to compete against other users.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/website/public/front/more-info.html b/website/public/front/more-info.html
deleted file mode 100644
index 5189db93c1..0000000000
--- a/website/public/front/more-info.html
+++ /dev/null
@@ -1,28 +0,0 @@
-HabitRPG | Gamify Your Life
-
-
-
-
-
-
-
-
-
-
-
-
-
-
A free habit building app that treats your life like a game.
The problem with most productivity apps on the market is that they provide no incentive to continue using them. HabitRPG fixes this by making habit building fun! By rewarding you for your successes and penalizing you for slip-ups, HabitRPG provides external motivation for completing your day-to-day activities.
Instant Gratification
Whenever you reinforce a positive habit, complete a daily task, or take care of an old to-do, HabitRPG immediately rewards you with experience points and gold. As you gain experience, you can level up, increasing your stats and unlocking more features, like classes and pets. Gold can be spent on in-game items that change your experience or personalized rewards you've created for motivation. When even the smallest successes provide you with an immediate reward, you're less likely to procrastinate.
Consequences
Whenever you indulge in a bad habit or fail to complete one of your daily tasks, you lose health. If your health drops too low, you die and lose some of the progress you've made. By providing immediate consequences, HabitRPG can help break bad habits and procrastination cycles before they cause real-world problems.
Accountability
With an active community, HabitRPG provides the accountability you need to stay on task. With the party system, you can bring in a group of your closest friends to cheer you on. The guild system allows you to find people with similar interests or obstacles, so you can share your goals and swap tips on how to tackle your problems. On HabitRPG, the community means that you have both the support and the accountability you need to succeed.
- 
- 
- 
- 
- 
- 
- 
-
- 
- 
- 
-
- 
-
-
- 
-
-
- 
-
- 
- 
-
- 
- 
- 
- 
- 
-
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
