Merge branch 'dev' into dev_skillslist

# Conflicts:
#	CHANGELOG.md
#	system/lang/en-en.json
#	system/lang/fr-fr.json
#	system/scripts/actor.js
#	system/scripts/actors/base-character-sheet.js
#	system/scripts/combat.js
#	system/scripts/config.js
#	system/scripts/dice/dice-picker-dialog.js
#	system/scripts/dice/roll-n-keep-dialog.js
#	system/scripts/gm/gm-monitor.js
#	system/scripts/gm/gm-toolbox.js
#	system/scripts/hooks.js
#	system/scripts/items/technique-sheet.js
#	system/scripts/main-l5r5e.js
#	system/scripts/migration.js
#	system/scripts/preloadTemplates.js
#	system/scripts/settings.js
#	system/scripts/socket-handler.js
#	system/styles/l5r5e.css
#	system/system.json
#	system/templates/actors/character-sheet.html

system/lang/es-es.json

@@ -17,30 +17,37 @@
         "CustomTechniques": {
             "Title": "Use custom techniques",
             "Hint": "Add 'Specificity' technique type to serve as a catch-all."
+        },
+        "CustomCompendiumName": {
+            "Title": "Custom Compendium Name",
+            "Hint": "For advanced users that want to change the name of the custom compendiums (Used to disables the embedded ones).",
+            "Notification": "Unable set Custom Compendium: '{name}'. Is it activated and registered with Babele?"
         }
     },
-    "ACTOR": {
-        "TypeCharacter": "Personaje jugador",
-        "TypeNpc": "Personaje no jugador",
-        "TypeArmy": "Ejército"
-    },
-    "ITEM": {
-        "TypeItem": "Objeto",
-        "TypeArmor": "Armadura",
-        "TypeWeapon": "Arma",
-        "TypeTechnique": "Técnica",
-        "TypeProperty": "Propiedad",
-        "TypePeculiarity": "Peculiaridad",
-        "TypeAdvancement": "Mejora",
-        "TypeTitle": "Título",
-        "TypeBond": "Vínculo",
-        "TypeSignature_scroll": "Pergamino especial",
-        "TypeItem_pattern": "Patrón de objeto",
-        "TypeArmy_fortification": "Fortificación",
-        "TypeArmy_cohort": "Cohorte"
-    },
-    "JOURNAL": {
-        "TypeJournal": "Diario"
+    "TYPES": {
+        "Actor": {
+            "character": "Personaje jugador",
+            "npc": "Personaje no jugador",
+            "army": "Ejército"
+        },
+        "Item": {
+            "item": "Objeto",
+            "armor": "Armadura",
+            "weapon": "Arma",
+            "technique": "Técnica",
+            "property": "Propiedad",
+            "peculiarity": "Peculiaridad",
+            "advancement": "Mejora",
+            "title": "Título",
+            "bond": "Vínculo",
+            "signature_scroll": "Pergamino especial",
+            "item_pattern": "Patrón de objeto",
+            "army_fortification": "Fortificación",
+            "army_cohort": "Cohorte"
+        },
+        "Journal": {
+            "journal": "Diario"
+        }
     },
     "l5r5e": {
         "global": {
@@ -173,6 +180,7 @@
             "monitor": {
                 "title": "Pantalla del DJ",
                 "switch_view": "Cambiar vista",
+                "add_selected_tokens": "Add selected tokens",
                 "honor_glory_status": "H/G/E",
                 "focus_vigilance": "Con./Ale.",
                 "mouse_control": "Right click +1, left: -1, middle: reset to 0"
@@ -473,7 +481,7 @@
                 "honor": "Honor",
                 "access": "Tipos de técnicas disponibles",
                 "school_ability": "Capacidad de escuela",
-                "starting_techniques": "Técnicas iniciales (2-5)",
+                "starting_techniques": "Técnicas iniciales (2-6)",
                 "outfit": "Equipo inicial",
                 "q4": "4. ¿De qué manera destaca tu personaje dentro de su escuela? (p. 88)",
                 "q4_pow": "4. What gets your character in and out of trouble? (p. 60)"