Merge branch 'master' into dev_gennpc

# Conflicts:
#	system/styles/l5r5e.css
This commit is contained in:
Vlyan
2021-12-19 16:21:30 +01:00
84 changed files with 3183 additions and 226 deletions

View File

@@ -142,6 +142,7 @@
},
"gm_monitor": {
"title": "GM Monitor",
"switch_view": "Switch View",
"honor_glory_status": "H/G/S",
"focus_vigilance": "Foc./Vig."
},
@@ -386,8 +387,8 @@
"past_battles": "Past Battles",
"cohort": {
"tab": "Cohorts",
"title": "Cohorts",
"leader": "Battle Readiness",
"title": "Cohort",
"leader": "Leader",
"abilities": "Abilities"
},
"fortification": {

View File

@@ -142,6 +142,7 @@
},
"gm_monitor": {
"title": "GM Monitor",
"switch_view": "Switch View",
"honor_glory_status": "H/G/S",
"focus_vigilance": "Foc./Vig."
},
@@ -386,8 +387,8 @@
"past_battles": "Past Battles",
"cohort": {
"tab": "Cohorts",
"title": "Cohorts",
"leader": "Battle Readiness",
"title": "Cohort",
"leader": "Leader",
"abilities": "Abilities"
},
"fortification": {

View File

@@ -142,6 +142,7 @@
},
"gm_monitor": {
"title": "GM Monitor",
"switch_view": "Switch View",
"honor_glory_status": "H/G/S",
"focus_vigilance": "Att./Vig."
},
@@ -387,14 +388,14 @@
"cohort": {
"tab": "Régiments",
"title": "Régiment",
"leader": "Aptitude au combat",
"leader": "Lieutenant",
"abilities": "Capacités"
},
"fortification": {
"tab": "Fortifications",
"title": "Fortifications",
"title": "Fortification",
"difficulty": "Difficulté",
"attrition_reduction": "Attrition Reduction"
"attrition_reduction": "Usure"
}
},
"twenty_questions": {