From 576cf1f58b5157aa6bfaa3bffdcfe45ba6e4d1ee Mon Sep 17 00:00:00 2001 From: Marcelo Sizer Date: Thu, 23 Jan 2014 22:00:12 -0200 Subject: [PATCH 1/2] Fix spacing errors --- locales/en/main.json | 185 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 179 insertions(+), 6 deletions(-) diff --git a/locales/en/main.json b/locales/en/main.json index 5e338086f3..f7c5be21f6 100644 --- a/locales/en/main.json +++ b/locales/en/main.json @@ -548,13 +548,13 @@ "changeclass" : "Change Class, Refund Attribute Points", "levelpopover" : "Each level earns you one point to assign to an attribute of your choice. You can do so manually, or let the game decide for you using one of the Automatic Allocation options.", "unallocated" : "Unallocated Attribute Points", -"automaticallocation" : "Automatic Allocation ", +"automaticallocation" : "Automatic Allocation ", "automaticallocationpopover" : "Places points into attributes according to your preferences, when you level up.", -"evenallocation" : "Distribute attribute points evenly ", +"evenallocation" : "Distribute attribute points evenly ", "evenallocationpopover" : "Assigns the same number of points to each attribute.", -"classallocation" : "Distribute attribute points based on Class ", +"classallocation" : "Distribute attribute points based on Class ", "classallocationpopover" : "Assigns more points to the attributes important to your Class.", -"taskallocation" : "Distribute attribute points based on task activity ", +"taskallocation" : "Distribute attribute points based on task activity ", "taskallocationpopover" : "Assigns points based on the Physical (STR), Mental (INT), Social (CON), and Other (PER) categories associated with the tasks you complete.", "allocatestr" : "Points allocated to STR:", "allocatestrpop" : "Add a point to Strength", @@ -621,7 +621,7 @@ "base" : "Base", "costume" : "Costume", "costumeText" : "But if you prefer the look of other gear to what you have equipped, check this box to visually don a costume while wearing your battle gear underneath.", -"useCostume" : "Use Costume ", +"useCostume" : "Use Costume ", "inventoryText" : "Click an egg to see usable potions highlighted in green and then click one of the highlighted potions to hatch your pet. If no potions are highlighted, click that egg again to deselect it, and instead click a potion first to have the usable eggs highlighted. You can also sell unwanted drops to Alexander the Merchant.", "scrolls" : "Quest Scrolls", "noScrolls" : "You don't have any quest scrolls.", @@ -737,6 +737,7 @@ "inviteParty" : "Invite Party", "questInvitation" : "Quest Invitation: ", "askLater" : "Ask Later", + "buyQuest" : "Buy Quest", "_commentrebirth" : "REBIRTH MODALS", @@ -754,6 +755,7 @@ "rebirthInList2" : "Challenge, Guild, and Party memberships remain.", "rebirthInList3" : "Gems, backer tiers, and contributor levels remain.", "rebirthInList4" : "Items obtained from Gems or drops (such as pets and mounts) remain, though you cannot access them until you unlock them again.", + "rebirthInList5" : "Limited edition equipment you've purchased can be repurchased, even if its event has ended.", "rebirthEarnAchievement" : "You also earn an Achievement for beginning a new adventure!", "neverMind" : "Never mind", "buyMoreGems" : "Buy More Gems", @@ -779,6 +781,177 @@ "fix21Streaks" : "21-Day Streaks", "triggerDay" : "Trigger New Day", "discardChanges" : "Discard Changes", - "deleteDo" : "Do it, delete my account!" + "deleteDo" : "Do it, delete my account!", + + +"_optionssocialchallenge-box" : "CHALLENGE-BOX", +"challenges" : "Challenges", +"noChallenges": "No challenges yet, visit ", +"toCreate" : " to create one.", + +"_optionssocialchallenges" : "CHALLENGES", +"minusOr" : "- Or -", +"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 color and gain graphs to show you the overall progress of the group.", +"hows" : "How's Everyone Doing?", +"filter" : "Filter", +"groups" : "Groups", +"all" : "All", +"noNone" : "None", +"membership" : "Membership", +"participating" : "Participating", +"notParticipating" : "Not Participating", +"either" : "Either", +"createChallenge" : "Create Challenge", +"discard" : "Discard", +"challengeTitle" : "Challenge Title", +"challengeTag" : "Tag Name", +"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 the '?' for more info).", +"challengeDescr" : "Description", +"prize" : "Prize", +"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.", +"min1Gem" : "Minimum 1 Gem for", +"publicChallenges" : "public challenges", +"helpsPrevent" : "(helps prevent spam, it really does).", +"officialChallenge" : "Official HabitRPG Challenge", +"by" : "by", +"participants" : "Participants", +"join" : "Join", +"exportChallengeCSV": "Export to CSV", + +"_optionssocialchat-box" : "CHAT-BOX", +"sendChat" : "Send Chat", +"toolTipMsg" : "Fetch Recent MEssages", + +"_optionssocialchat-message" : "CHAT-MESSAGE", + +"_optionssocialcreategroup" : "CREATE GROUP", +"name" : "Name", +"description" : "Description", +"public" : "Public", +"inviteOnly" : "Invite Only", +"gemCost" : "The Gem cost promotes high quality Guilds, and is transferred into your Guild's bank for use as prizes in Guild Challenges!", + +"_optionssocialgroup" : "GROUP", +"guildBankPop1" : "Guild Bank", +"guildBankPop2" : "Gems which your guild leader can use for challenge prizes.", +"guildGems" : "Guild Gems", +"questInv" : "Quest Invitation:", +"accepted" : "Accepted", +"rejected" : "Rejected", +"pending" : "Pending", +"questStart" : "Once all members have either accepted or rejected, the quest begins. Only those that clicked \"accept\" will be able to participate in the quest and recieve the drops. If members are pending too long (inactive?), you can start without them by clicking \"Begin\".", +"begin" : "Begin", +"bossHP" : "Boss Health", +"collected" : "Collected", +"bossDmg1" : "To hurt a boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Wizard spells, Warrior attacks, etc). The boss will deal damage to the party for every Daily you've missed (multiplied by the boss's Strength), so help your friends by completing your dailies!", +"bossDmg2" : "All damage to and from a boss is tallied on cron (your day roll-over).", +"bossDmg3" : "Only participants will fight the boss and share in the quest loot. If you die during a boss-battle, you get booted from the battle. If everyone dies once, the quest fails.", +"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.", +"bossColl2" : "Only participants can collect items and share in the quest loot. If you die during a quest, you get booted from the quest. If everyone dies once, the quest fails.", +"abort" : "Abort", +"editGroup" : "EditGroup", +"groupName" : "Group Name", +"groupdescr" : "Description shown in public Guilds list (Markdown OK)", +"logoUrl" : "Logo URL", +"assignLeader" : "Assign Group Leader", +"members" : "Members", +"partyList" : "Party Members list ordering ", +"banTip" : "Boot Member", +"moremembers" : "more members", +"invited" : "Invited", +"leaderMsg" : "Message from group leader (Markdown OK)", + +"_optionssocialhall" : "HALL", +"hallHeroes" : "Hall of Heroes", +"hallPatrons" : "Hall of Patrons", +"rewardUser" : "Reward User", +"UUID" : "UUID", +"loadUser" : "Load User", +"conTitle" : "Contributor Title (eg, \"Blacksmith\")", +"conLevel" : "Contrib Level", +"conText" : "[1-7] this determines which items, pets, and mounts are available. Also determines name-tag coloring.", +"title": "Title", +"moreDetails" : "More details", +"contributions" : "Contributions", +"admin" : "Admin", +"USD1" : "is in USD,", +"not" : "not", +"USD2" : "in Gems. Aka, if this number is 1, it means 4 gems. Only use this option when manually granting gems to players, don't use it when granting contributor levels. Contrib levels will automatically add 2G/lvl.", +"hideAds" : "Hide Ads", +"gamemaster" : "Game Master", +"backerTier" : "Backer Tier", + +"_optionssocialindex" : "INDEX", +"search" : "Search", +"memberss" : "member(s)", +"publicGuilds" : "Public Guilds", +"createGuild" : "Create Guild", +"guilds" : "Guilds", +"hall" : "Hall", + +"_optionssocialtavern" : "TAVERN", +"daniel" : "Daniel", +"danielText" : "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (going on vacation? sudden illness?), I'll set you up at the inn - Dailies won't hurt you while you're resting.", +"innCheckOut" : "Check Out of Inn", +"innCheckIn" : "Rest in the Inn", +"innText" : "Whilst resting, your dailies are saved and aren't affected by day turn-over. Whether you check out tomorrow or in a week's time, you'll continue in the same state as when you checked in. Beware, though: if you are in a Quest, Bosses will still punish you for your fellow party members' mistakes!", +"lfgPosts" : "Looking for Group (Party Wanted) Posts", +"tutorial" : "Tutorial", +"glossary" : "Glossary", +"reportAP" : "Report a Problem", +"requestAF" : " Request a Feature", +"community" : "Community Forum", +"tierPop" : "Click tier labels for details.", +"playerTiers" : "Player Tiers", +"visitHeroes" : "Visit the Hall of Heroes (contributors and backers)", +"conLearn" : "Learn more about contributor rewards", +"conLearnHow" : "Learn how to contribute to HabitRPG", +"taverntalk" : "Tavern Talk", +"tavernalert1" : " Note: if you're reporting a bug, the developers won't see it here. Please", +"tavernalert2" : "use Github instead", + +"_optionssocialtavernconbadges" : "BADGES", +"friendBadge" : "Friend (1-2)", +"friendText" : "When your", +"first" : "first", +"second" : "second", +"third" : "third", +"fourth" : "fourth", +"fifth" : "fifth", +"sixth" : "sixth", +"seventh" : "seventh", +"friend1Text" : "submission is deployed, you will receive the HabitRPG Contributor's badge. Your name in Tavern chat will proudly display that you are a contributor. As a bounty for your work, you will also receive", +"2gems" : "2 Gems", +"friendText2" : "submission is deployed, the", +"crystalArmor" : "Crystal Armor", +"crystalHelmet" : "Crystal Helmet", +"crystalSword" : "Crystal Sword", +"crystalShield" : "Crystal Shield", +"hydraPet" : "Hydra Pet", +"friendText3" : "will be available for purchase in the Rewards shop. As a bounty for your continued work, you will also receive", +"eliteBadge" : "Elite (3-4)", +"championBadge" : "Champion (5-6)", +"friendText2b" : "submission is deployed, you will receive a", +"friendText3b" : ". You will also receive", +"legendaryBadge" : "Legendary (7)", +"friendText2c" : "submission is deployed, you will receive", +"friendText3c" : "and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your level, but you may continue to earn Gem bounties and titles.", +"heroicBadge" : "Heroic", +"heroicText" : "The Heroic level contains HabitRPG staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).", +"npcBadge" : "NPC", +"npcText" : "NPCs backed HabitRPG's Kickstarter at the highest tier. You can find their avatars watching over site features!", + + +"_sharedheaderavatar" : "HEADER AVATAR", +"lvl" : "Lvl ", +"buffed" : "Buffed", +"reborn" : "Reborn, max level", + + +"_commentlimitededition" : "LIMITED EDITION", + "limited31Jan" : "Available for purchase until January 31st (but permanently in your options if purchased)." } From fd8e67e236ac5e59c13329639eab9d56aca58f24 Mon Sep 17 00:00:00 2001 From: Marcelo Sizer Date: Fri, 24 Jan 2014 07:24:29 -0200 Subject: [PATCH 2/2] Fix version conflicts --- locales/en/main.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/en/main.json b/locales/en/main.json index f7c5be21f6..603b6bd107 100644 --- a/locales/en/main.json +++ b/locales/en/main.json @@ -552,9 +552,9 @@ "automaticallocationpopover" : "Places points into attributes according to your preferences, when you level up.", "evenallocation" : "Distribute attribute points evenly ", "evenallocationpopover" : "Assigns the same number of points to each attribute.", -"classallocation" : "Distribute attribute points based on Class ", +"classallocation" : "Distribute points based on Class ", "classallocationpopover" : "Assigns more points to the attributes important to your Class.", -"taskallocation" : "Distribute attribute points based on task activity ", +"taskallocation" : "Distribute points based on task activity ", "taskallocationpopover" : "Assigns points based on the Physical (STR), Mental (INT), Social (CON), and Other (PER) categories associated with the tasks you complete.", "allocatestr" : "Points allocated to STR:", "allocatestrpop" : "Add a point to Strength",