Merge branch 'dev' into dev_gennpc

# Conflicts:
#	system/styles/l5r5e.css
#	system/templates/actors/character/identity.html

system/lang/en-en.json

@@ -39,6 +39,9 @@
         "TypeArmy_fortification": "Fortification",
         "TypeArmy_cohort": "Cohort"
     },
+    "JOURNAL": {
+        "TypeJournal": "Journal"
+    },
     "l5r5e": {
         "global": {
             "add": "Add",
@@ -46,6 +49,8 @@
             "delete_confirm": "Are you sure you want to delete '{name}' ?",
             "drop_here": "Drop here",
             "send_to_chat": "To Chat",
+            "locked": "Locked",
+            "unlocked": "Unlocked",
             "edge_translation_disclaimer": ""
         },
         "logo": {
@@ -144,7 +149,8 @@
             "title": "GM Monitor",
             "switch_view": "Switch View",
             "honor_glory_status": "H/G/S",
-            "focus_vigilance": "Foc./Vig."
+            "focus_vigilance": "Foc./Vig.",
+            "mouse_control": "Right click +1, left: -1, middle: reset to 0"
         },
         "max": "Max",
         "current": "Current",