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

# Conflicts:
#   system/lang/en-en.json

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",

system/lang/es-es.json

@@ -1,5 +1,5 @@
 {
-    "i18n": {
+    "I18N": {
         "Language": "Español",
         "Maintainers": ["Team L5R"]
     },
@@ -78,7 +78,7 @@
             "successes": "Éxitos",
             "explosives": "Relanzables",
             "opportunities": "Oportunidades",
-            "strives": "Conflictos",
+            "strife": "Conflictos",
             "difficulty": "NO",
             "difficulty_hidden": "NO ???",
             "dicepicker": "Dice Picker",
@@ -141,6 +141,7 @@
             "title_new": "Nueva Técnica",
             "kata": "Kata",
             "kiho": "Kihõ",
+            "inversion": "Inversion",
             "invocation": "Invocación",
             "ritual": "Ritual",
             "shuji": "Shuji",

system/lang/fr-fr.json

@@ -1,5 +1,5 @@
 {
-    "i18n": {
+    "I18N": {
         "Language": "Français",
         "Maintainers": ["Team L5R"]
     },
@@ -78,7 +78,7 @@
             "successes": "Succès",
             "explosives": "Explosifs",
             "opportunities": "Aubaines",
-            "strives": "Conflits",
+            "strife": "Conflits",
             "difficulty": "ND",
             "difficulty_hidden": "ND ???",
             "dicepicker": "Dice Picker",
@@ -141,6 +141,7 @@
             "type": "Type accessible",
             "kata": "Kata",
             "kiho": "Kihõ",
+            "inversion": "Inversion",
             "invocation": "Invocation",
             "ritual": "Rituel",
             "shuji": "Shuji",