mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-12 03:31:07 +01:00
Merge conflict fix
This commit is contained in:
commit
908db2a2b3
27 changed files with 1071 additions and 521 deletions
35
lang/en.json
35
lang/en.json
|
|
@ -333,7 +333,8 @@
|
|||
"label": { "label": "Label", "hint": "Used for custom" },
|
||||
"value": { "label": "Value" }
|
||||
}
|
||||
}
|
||||
},
|
||||
"type": { "label": "Countdown Type" }
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -348,6 +349,26 @@
|
|||
"encounter": "Encounter"
|
||||
}
|
||||
},
|
||||
"CountdownEdit": {
|
||||
"title": "Countdown Edit",
|
||||
"viewTitle": "Countdowns",
|
||||
"editTitle": "Edit Countdowns",
|
||||
"newCountdown": "New Countdown",
|
||||
"removeCountdownTitle": "Remove Countdown",
|
||||
"removeCountdownText": "Are you sure you want to remove the countdown: {name}?",
|
||||
"current": "Current",
|
||||
"max": "Max",
|
||||
"currentCountdownValue": "Current: {value}",
|
||||
"currentCountdownMax": "Max: {value}",
|
||||
"category": "Category",
|
||||
"type": "Type",
|
||||
"defaultOwnershipTooltip": "The default player ownership of countdowns",
|
||||
"hideNewCountdowns": "Hide New Countdowns"
|
||||
},
|
||||
"DaggerheartMenu": {
|
||||
"title": "GM Tools",
|
||||
"countdowns": "Edit Countdowns"
|
||||
},
|
||||
"DeleteConfirmation": {
|
||||
"title": "Delete {type} - {name}",
|
||||
"text": "Are you sure you want to delete {name}?"
|
||||
|
|
@ -1886,6 +1907,10 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"SpotlightRequests": {
|
||||
"singular": "Spotlight Request",
|
||||
"plural": "Spotlight Requests"
|
||||
},
|
||||
"Tabs": {
|
||||
"details": "Details",
|
||||
"attack": "Attack",
|
||||
|
|
@ -2453,6 +2478,11 @@
|
|||
"playerMessage": "{user} rerolled their {name}"
|
||||
}
|
||||
},
|
||||
"Countdowns": {
|
||||
"title": "Countdowns",
|
||||
"toggleIconMode": "Toggle Icon Only",
|
||||
"noPlayerAccess": "This countdown isn't visible to any players"
|
||||
},
|
||||
"ItemBrowser": {
|
||||
"title": "Daggerheart Compendium Browser",
|
||||
"hint": "Select a Folder in sidebar to start browsing through the compendium",
|
||||
|
|
@ -2560,7 +2590,8 @@
|
|||
"subclassesAlreadyPresent": "You already have a class and multiclass subclass",
|
||||
"noDiceSystem": "Your selected dice {system} does not have a {faces} dice",
|
||||
"gmMenuRefresh": "You refreshed all actions and resources {types}",
|
||||
"subclassAlreadyLinked": "{name} is already a subclass in the class {class}. Remove it from there if you want it to be a subclass to this class."
|
||||
"subclassAlreadyLinked": "{name} is already a subclass in the class {class}. Remove it from there if you want it to be a subclass to this class.",
|
||||
"gmRequired": "This action requires an online GM"
|
||||
},
|
||||
"Sidebar": {
|
||||
"daggerheartMenu": {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue