Merge branch 'dev' into dev_skillslist
# Conflicts: # CHANGELOG.md # system/lang/en-en.json # system/lang/fr-fr.json # system/scripts/actor.js # system/scripts/actors/base-character-sheet.js # system/scripts/combat.js # system/scripts/config.js # system/scripts/dice/dice-picker-dialog.js # system/scripts/dice/roll-n-keep-dialog.js # system/scripts/gm/gm-monitor.js # system/scripts/gm/gm-toolbox.js # system/scripts/hooks.js # system/scripts/items/technique-sheet.js # system/scripts/main-l5r5e.js # system/scripts/migration.js # system/scripts/preloadTemplates.js # system/scripts/settings.js # system/scripts/socket-handler.js # system/styles/l5r5e.css # system/system.json # system/templates/actors/character-sheet.html
This commit is contained in:
Vlyan
@@ -18,35 +18,42 @@
|
||||
"Title": "Use custom techniques",
|
||||
"Hint": "Add 'Specificity' technique type to serve as a catch-all."
|
||||
},
|
||||
"CustomCompendiumName": {
|
||||
"Title": "Custom Compendium Name",
|
||||
"Hint": "For advanced users that want to change the name of the custom compendiums (Used to disables the embedded ones).",
|
||||
"Notification": "Unable set Custom Compendium: '{name}'. Is it activated and registered with Babele?"
|
||||
},
|
||||
"DefaultSkillsList": {
|
||||
"Title": "Skills",
|
||||
"Label": "Set Default Skills",
|
||||
"Hint": "Set default skills list for new characters."
|
||||
}
|
||||
},
|
||||
"ACTOR": {
|
||||
"TypeCharacter": "Player Character",
|
||||
"TypeNpc": "Non-Player Character",
|
||||
"TypeArmy": "Army"
|
||||
},
|
||||
"ITEM": {
|
||||
"TypeSkill": "Skill",
|
||||
"TypeItem": "Item",
|
||||
"TypeArmor": "Armor",
|
||||
"TypeWeapon": "Weapon",
|
||||
"TypeTechnique": "Technique",
|
||||
"TypeProperty": "Property",
|
||||
"TypePeculiarity": "Peculiarity",
|
||||
"TypeAdvancement": "Advancement",
|
||||
"TypeTitle": "Title",
|
||||
"TypeBond": "Bond",
|
||||
"TypeSignature_scroll": "Signature Scroll",
|
||||
"TypeItem_pattern": "Item Pattern",
|
||||
"TypeArmy_fortification": "Fortification",
|
||||
"TypeArmy_cohort": "Cohort"
|
||||
},
|
||||
"JOURNAL": {
|
||||
"TypeJournal": "Journal"
|
||||
"TYPES": {
|
||||
"Actor": {
|
||||
"character": "Player Character",
|
||||
"npc": "Non-Player Character",
|
||||
"army": "Army"
|
||||
},
|
||||
"Item": {
|
||||
"skill": "Skill",
|
||||
"item": "Item",
|
||||
"armor": "Armor",
|
||||
"weapon": "Weapon",
|
||||
"technique": "Technique",
|
||||
"property": "Property",
|
||||
"peculiarity": "Peculiarity",
|
||||
"advancement": "Advancement",
|
||||
"title": "Title",
|
||||
"bond": "Bond",
|
||||
"signature_scroll": "Signature Scroll",
|
||||
"item_pattern": "Item Pattern",
|
||||
"army_fortification": "Fortification",
|
||||
"army_cohort": "Cohort"
|
||||
},
|
||||
"Journal": {
|
||||
"journal": "Journal"
|
||||
}
|
||||
},
|
||||
"l5r5e": {
|
||||
"global": {
|
||||
@@ -179,6 +186,7 @@
|
||||
"monitor": {
|
||||
"title": "GM Monitor",
|
||||
"switch_view": "Switch View",
|
||||
"add_selected_tokens": "Add selected tokens",
|
||||
"honor_glory_status": "H/G/S",
|
||||
"focus_vigilance": "Foc./Vig.",
|
||||
"mouse_control": "Right click +1, left: -1, middle: reset to 0"
|
||||
@@ -479,7 +487,7 @@
|
||||
"honor": "Honor",
|
||||
"access": "Technique types available",
|
||||
"school_ability": "School ability",
|
||||
"starting_techniques": "Starting techniques (2-5)",
|
||||
"starting_techniques": "Starting techniques (2-6)",
|
||||
"outfit": "Starting outfit",
|
||||
"q4": "4. How does your character stand out within their school? (p. 88)",
|
||||
"q4_pow": "4. What gets your character in and out of trouble? (p. 60)"
|
||||
|
||||
@@ -17,30 +17,37 @@
|
||||
"CustomTechniques": {
|
||||
"Title": "Use custom techniques",
|
||||
"Hint": "Add 'Specificity' technique type to serve as a catch-all."
|
||||
},
|
||||
"CustomCompendiumName": {
|
||||
"Title": "Custom Compendium Name",
|
||||
"Hint": "For advanced users that want to change the name of the custom compendiums (Used to disables the embedded ones).",
|
||||
"Notification": "Unable set Custom Compendium: '{name}'. Is it activated and registered with Babele?"
|
||||
}
|
||||
},
|
||||
"ACTOR": {
|
||||
"TypeCharacter": "Personaje jugador",
|
||||
"TypeNpc": "Personaje no jugador",
|
||||
"TypeArmy": "Ejército"
|
||||
},
|
||||
"ITEM": {
|
||||
"TypeItem": "Objeto",
|
||||
"TypeArmor": "Armadura",
|
||||
"TypeWeapon": "Arma",
|
||||
"TypeTechnique": "Técnica",
|
||||
"TypeProperty": "Propiedad",
|
||||
"TypePeculiarity": "Peculiaridad",
|
||||
"TypeAdvancement": "Mejora",
|
||||
"TypeTitle": "Título",
|
||||
"TypeBond": "Vínculo",
|
||||
"TypeSignature_scroll": "Pergamino especial",
|
||||
"TypeItem_pattern": "Patrón de objeto",
|
||||
"TypeArmy_fortification": "Fortificación",
|
||||
"TypeArmy_cohort": "Cohorte"
|
||||
},
|
||||
"JOURNAL": {
|
||||
"TypeJournal": "Diario"
|
||||
"TYPES": {
|
||||
"Actor": {
|
||||
"character": "Personaje jugador",
|
||||
"npc": "Personaje no jugador",
|
||||
"army": "Ejército"
|
||||
},
|
||||
"Item": {
|
||||
"item": "Objeto",
|
||||
"armor": "Armadura",
|
||||
"weapon": "Arma",
|
||||
"technique": "Técnica",
|
||||
"property": "Propiedad",
|
||||
"peculiarity": "Peculiaridad",
|
||||
"advancement": "Mejora",
|
||||
"title": "Título",
|
||||
"bond": "Vínculo",
|
||||
"signature_scroll": "Pergamino especial",
|
||||
"item_pattern": "Patrón de objeto",
|
||||
"army_fortification": "Fortificación",
|
||||
"army_cohort": "Cohorte"
|
||||
},
|
||||
"Journal": {
|
||||
"journal": "Diario"
|
||||
}
|
||||
},
|
||||
"l5r5e": {
|
||||
"global": {
|
||||
@@ -173,6 +180,7 @@
|
||||
"monitor": {
|
||||
"title": "Pantalla del DJ",
|
||||
"switch_view": "Cambiar vista",
|
||||
"add_selected_tokens": "Add selected tokens",
|
||||
"honor_glory_status": "H/G/E",
|
||||
"focus_vigilance": "Con./Ale.",
|
||||
"mouse_control": "Right click +1, left: -1, middle: reset to 0"
|
||||
@@ -473,7 +481,7 @@
|
||||
"honor": "Honor",
|
||||
"access": "Tipos de técnicas disponibles",
|
||||
"school_ability": "Capacidad de escuela",
|
||||
"starting_techniques": "Técnicas iniciales (2-5)",
|
||||
"starting_techniques": "Técnicas iniciales (2-6)",
|
||||
"outfit": "Equipo inicial",
|
||||
"q4": "4. ¿De qué manera destaca tu personaje dentro de su escuela? (p. 88)",
|
||||
"q4_pow": "4. What gets your character in and out of trouble? (p. 60)"
|
||||
|
||||
@@ -18,35 +18,42 @@
|
||||
"Title": "Utiliser les techniques personnalisées",
|
||||
"Hint": "Ajoute un type de technique 'Particularités' pour servir de fourre-tout."
|
||||
},
|
||||
"CustomCompendiumName": {
|
||||
"Title": "Nom du CustomCompendium",
|
||||
"Hint": "Pour les utilisateurs avancés qui souhaitent modifier le nom du compendium personnalisé (utilisé pour désactiver ceux intégrés).",
|
||||
"Notification": "Impossible de définir le compendium personnalisé : '{name}'. Est-il activé et enregistré auprès de Babele ?"
|
||||
},
|
||||
"DefaultSkillsList": {
|
||||
"Title": "Compétences",
|
||||
"Label": "Définir les compétences par défaut",
|
||||
"Hint": "Définie la liste des compétences par défaut pour les nouveaux personnages."
|
||||
}
|
||||
},
|
||||
"ACTOR": {
|
||||
"TypeCharacter": "Personnage Joueur",
|
||||
"TypeNpc": "Personnage non Joueur",
|
||||
"TypeArmy": "Armée"
|
||||
},
|
||||
"ITEM": {
|
||||
"TypeSkill": "Compétence",
|
||||
"TypeItem": "Objet",
|
||||
"TypeArmor": "Armure",
|
||||
"TypeWeapon": "Arme",
|
||||
"TypeTechnique": "Technique",
|
||||
"TypeProperty": "Propriété",
|
||||
"TypePeculiarity": "Particularité",
|
||||
"TypeAdvancement": "Progression",
|
||||
"TypeTitle": "Titre",
|
||||
"TypeBond": "Lien",
|
||||
"TypeSignature_scroll": "Rouleau de marque",
|
||||
"TypeItem_pattern": "Procédé de fabrication",
|
||||
"TypeArmy_fortification": "Fortification",
|
||||
"TypeArmy_cohort": "Régiment"
|
||||
},
|
||||
"JOURNAL": {
|
||||
"TypeJournal": "Journal"
|
||||
"TYPES": {
|
||||
"Actor": {
|
||||
"character": "Personnage Joueur",
|
||||
"npc": "Personnage non Joueur",
|
||||
"army": "Armée"
|
||||
},
|
||||
"Item": {
|
||||
"skill": "Compétence",
|
||||
"item": "Objet",
|
||||
"armor": "Armure",
|
||||
"weapon": "Arme",
|
||||
"technique": "Technique",
|
||||
"property": "Propriété",
|
||||
"peculiarity": "Particularité",
|
||||
"advancement": "Progression",
|
||||
"title": "Titre",
|
||||
"bond": "Lien",
|
||||
"signature_scroll": "Rouleau de marque",
|
||||
"item_pattern": "Procédé de fabrication",
|
||||
"army_fortification": "Fortification",
|
||||
"army_cohort": "Régiment"
|
||||
},
|
||||
"Journal": {
|
||||
"journal": "Journal"
|
||||
}
|
||||
},
|
||||
"l5r5e": {
|
||||
"global": {
|
||||
@@ -179,6 +186,7 @@
|
||||
"monitor": {
|
||||
"title": "GM Monitor",
|
||||
"switch_view": "Switch View",
|
||||
"add_selected_tokens": "Ajouter les tokens sélectionnés",
|
||||
"honor_glory_status": "H/G/S",
|
||||
"focus_vigilance": "Att./Vig.",
|
||||
"mouse_control": "Click Droit +1, Gauche: -1, Milieu: Remise à 0"
|
||||
@@ -479,7 +487,7 @@
|
||||
"honor": "Honneur",
|
||||
"access": "Types de techniques accessibles",
|
||||
"school_ability": "Capacité d'école",
|
||||
"starting_techniques": "Techniques de départ (2-5)",
|
||||
"starting_techniques": "Techniques de départ (2-6)",
|
||||
"outfit": "Équipement de départ",
|
||||
"q4": "4. De quelle manière votre personnage se démarque-t-il au sein de son école ? (p. 88)",
|
||||
"q4_pow": "4. Qu'est-ce qui attire des ennuis à votre personnage dans ou l'en sort ? (p. 60)"
|
||||
|
||||
@@ -17,30 +17,37 @@
|
||||
"CustomTechniques": {
|
||||
"Title": "Usa tecniche custom",
|
||||
"Hint": "Aggiunge il tipo 'Speciale' come termine generale."
|
||||
},
|
||||
"CustomCompendiumName": {
|
||||
"Title": "Custom Compendium Name",
|
||||
"Hint": "For advanced users that want to change the name of the custom compendiums (Used to disables the embedded ones).",
|
||||
"Notification": "Unable set Custom Compendium: '{name}'. Is it activated and registered with Babele?"
|
||||
}
|
||||
},
|
||||
"ACTOR": {
|
||||
"TypeCharacter": "Personaggio Giocante",
|
||||
"TypeNpc": "Personaggio Non Giocante",
|
||||
"TypeArmy": "Esercito"
|
||||
},
|
||||
"ITEM": {
|
||||
"TypeItem": "Oggetto",
|
||||
"TypeArmor": "Armatura",
|
||||
"TypeWeapon": "Arma",
|
||||
"TypeTechnique": "Tecnica",
|
||||
"TypeProperty": "Proprietà",
|
||||
"TypePeculiarity": "Peculiarità",
|
||||
"TypeAdvancement": "Avanzamento",
|
||||
"TypeTitle": "Titolo",
|
||||
"TypeBond": "Legame",
|
||||
"TypeSignature_scroll": "Signature Scroll",
|
||||
"TypeItem_pattern": "Item Pattern",
|
||||
"TypeArmy_fortification": "Fortezza",
|
||||
"TypeArmy_cohort": "Coorte"
|
||||
},
|
||||
"JOURNAL": {
|
||||
"TypeJournal": "Diario"
|
||||
"TYPES": {
|
||||
"Actor": {
|
||||
"character": "Personaggio Giocante",
|
||||
"npc": "Personaggio Non Giocante",
|
||||
"army": "Esercito"
|
||||
},
|
||||
"Item": {
|
||||
"item": "Oggetto",
|
||||
"armor": "Armatura",
|
||||
"weapon": "Arma",
|
||||
"technique": "Tecnica",
|
||||
"property": "Proprietà",
|
||||
"peculiarity": "Peculiarità",
|
||||
"advancement": "Avanzamento",
|
||||
"title": "Titolo",
|
||||
"bond": "Legame",
|
||||
"signature_scroll": "Signature Scroll",
|
||||
"item_pattern": "Item Pattern",
|
||||
"army_fortification": "Fortezza",
|
||||
"army_cohort": "Coorte"
|
||||
},
|
||||
"Journal": {
|
||||
"journal": "Diario"
|
||||
}
|
||||
},
|
||||
"l5r5e": {
|
||||
"global": {
|
||||
@@ -173,6 +180,7 @@
|
||||
"monitor": {
|
||||
"title": "Schermo del GM",
|
||||
"switch_view": "Cambia vista",
|
||||
"add_selected_tokens": "Add selected tokens",
|
||||
"honor_glory_status": "O/G/S",
|
||||
"focus_vigilance": "Foc./Vig.",
|
||||
"mouse_control": "Click destro +1, sinistro: -1, centrale: resetta a 0"
|
||||
@@ -473,7 +481,7 @@
|
||||
"honor": "Onore",
|
||||
"access": "Tecniche Disponibili",
|
||||
"school_ability": "Abilità di Scuola",
|
||||
"starting_techniques": "Tecniche di Partenza (2-5)",
|
||||
"starting_techniques": "Tecniche di Partenza (2-6)",
|
||||
"outfit": "Dotazione di Partenza",
|
||||
"q4": "4. Come si distingue il personaggio all’interno della sua scuola? (p. 88)",
|
||||
"q4_pow": "4. Che cosa mette nei guai il personaggio, e che cosa lo tira fuori dai guai? (p. 60)"
|
||||
|
||||
Reference in New Issue
Block a user