Merge branch 'dev' into 'myrion211-master-patch-79898'

# Conflicts: # system/lang/en-en.json
2021-01-24 12:22:06 +00:00
parent ec0ff5c44c dbe628d022
commit 1928897a49
57 changed files with 4922 additions and 1203 deletions
--- a/system/lang/en-en.json
+++ b/system/lang/en-en.json
@@ -1,5 +1,5 @@
 {
-    "i18n": {
+    "I18N": {
        "Language": "English",
        "Maintainers": ["Team L5R"]
    },
@@ -78,7 +78,7 @@
            "successes": "Successes",
            "explosives": "Explosions",
            "opportunities": "Opportunities",
-            "strives": "Strife",
+            "strife": "Strife",
            "difficulty": "TN",
            "difficulty_hidden": "TN ???",
            "dicepicker": "Dice Picker",
@@ -141,6 +141,7 @@
            "type": "Allowed Techniques",
            "kata": "Kata",
            "kiho": "Kihõ",
+            "inversion": "Inversion",
            "invocation": "Invocation",
            "ritual": "Ritual",
            "shuji": "Shuji",