Skip to content

Commit

Permalink
Merge branch 'encounter-participant' into 'master'
Browse files Browse the repository at this point in the history
Change "Combat" and "Combatant" language in Combat Tracker to "Encounter" and "Participant"

See merge request hooking/foundry-vtt---pathfinder-2e!4564
  • Loading branch information
nikolaj-a committed Aug 9, 2021
2 parents 5c30b1e + 1b3e726 commit c2ba51d
Showing 1 changed file with 20 additions and 1 deletion.
21 changes: 20 additions & 1 deletion static/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,22 @@
"TypeTreasure": "Treasure",
"TypeWeapon": "Weapon"
},
"COMBAT": {
"Begin": "Begin Encounter",
"CombatantNotInScene": "The participant {name} is not present in your currently viewed scene.",
"CombatantRemove": "Remove Participant",
"CombatantStatus": "Participant Status",
"CombatantUpdate": "Update Participant",
"Settings": "Encounter Tracker Settings",
"End": "End Encounter",
"EndConfirmation": "End this encounter and empty the turn tracker?",
"EndTitle": "End Encounter?",
"NoneActive": "There is no active Encounter in your currently viewed Scene.",
"NoneRemaining": "There are no participants remaining in this Encounter that are not defeated.",
"ResourceHint": "Choose an attribute to track for each participant.",
"SkipDefeatedHint": "Automatically bypass participants marked as defeated?",
"UnknownCombatant": "Unknown Participant"
},
"COMPENDIUM": {
"ImportAllHint": "All of the content from this Compendium pack will be imported into your World to a Folder, which you may name. <p class=\"notes\"><strong>WARNING</strong>: It is strongly recommended that this <span style=\"text-decoration: underline\">not</span> be done with larger compendia. Doing so has no benefit and will adversely impact loading this world for both yourself and your players.</p>",
"Search": "Search Compendia"
Expand All @@ -37,6 +53,9 @@
"EffectPanel": "Effect Panel",
"WorldClock": "World Clock"
},
"SIDEBAR": {
"TabCombat": "Encounter Tracker"
},
"PF2E": {
"AbilityBoost": "Ability Boost",
"AbilityBoostLevels": "Ability Boost Levels",
Expand Down Expand Up @@ -2098,7 +2117,7 @@
"TabInventoryLabel": "Inventory",
"TabPathfinderSociety": "Pathfinder Society",
"TabSkillsLabel": "Proficiencies",
"TabSpellbookLabel": "Spellbook",
"TabSpellbookLabel": "Spellcasting",
"TargetFlatFootedLabel": "Enable abilities that require a flat-footed target",
"TempHPTitle": "The amount of temporary hit points you have",
"TempHitPointsShortLabel": "Temp HP",
Expand Down

0 comments on commit c2ba51d

Please sign in to comment.