Merge branch 'master' into dev_gennpc

# Conflicts: # system/styles/l5r5e.css
2021-12-19 16:21:30 +01:00
parent 36795e7b48 c41ed6e1a6
commit f04f0a0b4e
84 changed files with 3183 additions and 226 deletions
--- a/system/lang/en-en.json
+++ b/system/lang/en-en.json
@@ -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": {