Merge pull request #84 from zeedif/patch-2

Change showConflicts and showNone

src/main/resources/assets/controlling/lang/es_es.json

@@ -1,8 +1,8 @@
 {
   "options.search": "Buscar por",
   "options.showAll": "Mostrar todo",
-  "options.showConflicts": "Mostrar conflictos",
-  "options.showNone": "Mostrar no asignados",
+  "options.showConflicts": "Conflictos",
+  "options.showNone": "No asignados",
   "options.availableKeys": "Teclas Disponibles",
   "options.sort": "Ordenar",
   "options.category": "Categoría",