mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-18 07:59:03 +01:00
Fix conflict
This commit is contained in:
commit
d9ef062ce2
60 changed files with 879 additions and 133 deletions
33
lang/en.json
33
lang/en.json
|
|
@ -279,6 +279,11 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"HUD": {
|
||||
"tokenHUD": {
|
||||
"genericEffects": "Foundry Effects"
|
||||
}
|
||||
},
|
||||
"Levelup": {
|
||||
"actions": {
|
||||
"creatureComfort": {
|
||||
|
|
@ -672,6 +677,10 @@
|
|||
"name": "Dice Set"
|
||||
}
|
||||
},
|
||||
"SelectAction": {
|
||||
"selectType": "Select Action Type",
|
||||
"selectAction": "Select Action"
|
||||
},
|
||||
"Traits": {
|
||||
"agility": {
|
||||
"name": "Agility",
|
||||
|
|
@ -968,6 +977,10 @@
|
|||
"singular": "Character",
|
||||
"plural": "Characters"
|
||||
},
|
||||
"Cost": {
|
||||
"single": "Cost",
|
||||
"plural": "Costs"
|
||||
},
|
||||
"Damage": {
|
||||
"severe": "Severe",
|
||||
"major": "Major",
|
||||
|
|
@ -1078,6 +1091,7 @@
|
|||
"specialization": "Specialization",
|
||||
"mastery": "Mastery",
|
||||
"optional": "Optional",
|
||||
"recovery": "Recovery",
|
||||
"setup": "Setup",
|
||||
"equipment": "Equipment"
|
||||
},
|
||||
|
|
@ -1099,6 +1113,8 @@
|
|||
"burden": "Burden",
|
||||
"check": "{check} Check",
|
||||
"criticalSuccess": "Critical Success",
|
||||
"damage": "Damage",
|
||||
"damageType": "Damage Type",
|
||||
"description": "Description",
|
||||
"duality": "Duality",
|
||||
"dualityRoll": "Duality Roll",
|
||||
|
|
@ -1111,17 +1127,25 @@
|
|||
"inactiveEffects": "Inactive Effects",
|
||||
"inventory": "Inventory",
|
||||
"level": "Level",
|
||||
"max": "Max",
|
||||
"modifier": "Modifier",
|
||||
"multiclass": "Multiclass",
|
||||
"none": "None",
|
||||
"quantity": "Quantity",
|
||||
"range": "Range",
|
||||
"recovery": "Recovery",
|
||||
"scalable": "Scalable",
|
||||
"stress": "Stress",
|
||||
"take": "Take",
|
||||
"target": "Target",
|
||||
"title": "Title",
|
||||
"true": "True",
|
||||
"type": "Type",
|
||||
"unarmored": "Unarmored",
|
||||
"use": "Use"
|
||||
"use": "Use",
|
||||
"used": "Used",
|
||||
"uses": "Uses",
|
||||
"value": "Value"
|
||||
},
|
||||
"ITEMS": {
|
||||
"Armor": {
|
||||
|
|
@ -1178,6 +1202,7 @@
|
|||
"spellcastingTrait": "Spellcasting Trait"
|
||||
},
|
||||
"Weapon": {
|
||||
"weaponType": "Weapon Type",
|
||||
"primaryWeapon": "Primary Weapon",
|
||||
"secondaryWeapon": "Secondary Weapon"
|
||||
}
|
||||
|
|
@ -1185,7 +1210,8 @@
|
|||
"SETTINGS": {
|
||||
"Appearance": {
|
||||
"FIELDS": {
|
||||
"displayFear": { "label": "Fear Display" }
|
||||
"displayFear": { "label": "Fear Display" },
|
||||
"showGenericStatusEffects": { "label": "Show Foundry Status Effects" }
|
||||
},
|
||||
"fearDisplay": {
|
||||
"token": "Tokens",
|
||||
|
|
@ -1385,7 +1411,8 @@
|
|||
"unequip": "Unequip",
|
||||
"sendToVault": "Send to Vault",
|
||||
"sendToLoadout": "Send to Loadout",
|
||||
"makeDeathMove": "Make a Death Move"
|
||||
"makeDeathMove": "Make a Death Move",
|
||||
"rangeAndTarget": "Range & Target"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue