diff --git a/translation/pofiles/es.po b/translation/pofiles/es.po
index da914f0f8f..7bdee5d4d0 100644
--- a/translation/pofiles/es.po
+++ b/translation/pofiles/es.po
@@ -375,7 +375,8 @@ msgstr "Permisos insuficientes para guardar el archivo '%s'."
#: pcb_calculator/calculator_panels/panel_fusing_current.cpp:176
#: pcb_calculator/calculator_panels/panel_fusing_current.cpp:188
#: pcb_calculator/calculator_panels/panel_fusing_current.cpp:200
-#: pcbnew/pcb_marker.cpp:205
+#: pcbnew/pcb_marker.cpp:205 eeschema/files-io.cpp:842
+#: eeschema/files-io.cpp:914
msgid "Error"
msgstr "Error"
@@ -1242,12 +1243,14 @@ msgstr "Salir del conversor de imágenes"
#: bitmap2component/bitmap2cmp_gui.cpp:374
#: eeschema/tools/sch_drawing_tools.cpp:572
#: pagelayout_editor/pl_editor_frame.cpp:842 pcbnew/tools/drawing_tool.cpp:665
+#: eeschema/tools/sch_drawing_tools.cpp:570
msgid "Choose Image"
msgstr "Elegir imagen"
#: bitmap2component/bitmap2cmp_gui.cpp:375
#: eeschema/tools/sch_drawing_tools.cpp:573
#: pagelayout_editor/pl_editor_frame.cpp:843 pcbnew/tools/drawing_tool.cpp:666
+#: eeschema/tools/sch_drawing_tools.cpp:571
msgid "Image Files"
msgstr "Archivos de imagen"
@@ -1567,6 +1570,7 @@ msgstr "Si no los guarda, todos los cambios se perderán de forma permanente."
#: eeschema/symbol_editor/symbol_editor.cpp:550
#: eeschema/widgets/tuner_slider_base.cpp:75
#: pcbnew/footprint_libraries_utils.cpp:1059
+#: eeschema/widgets/tuner_slider_base.cpp:66
msgid "Save"
msgstr "Guardar"
@@ -1861,6 +1865,7 @@ msgid "Report"
msgstr "Informe"
#: common/dialogs/dialog_assign_netclass.cpp:104
+#: common/dialogs/dialog_assign_netclass.cpp:92
msgid "Currently matching nets:"
msgstr "Redes actualmente coincidentes:"
@@ -2019,7 +2024,7 @@ msgstr "Variables de entorno"
#: pcbnew/dialogs/dialog_net_inspector.cpp:964
#: pcbnew/dialogs/panel_fp_lib_table.cpp:460
#: pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp:38 pcbnew/zone.cpp:589
-#: pcbnew/zone.cpp:1414
+#: pcbnew/zone.cpp:1414 eeschema/widgets/tuner_slider_base.cpp:20
msgid "Name"
msgstr "Nombre"
@@ -3199,13 +3204,12 @@ msgid "Remember open files for next project launch"
msgstr "Recordar archivos abiertos en la próxima apertura del proyecto"
#: common/dialogs/panel_common_settings_base.cpp:230
-#, fuzzy
msgid ""
"If checked, launching a project will also launch tools such as the schematic "
"and board editors with previously open files"
msgstr ""
"Si se selecciona, al lanzar un proyecto también se abrirán herramientas como "
-"Eeschema o Pcbnew con los archivos abiertos previamente"
+"los editores de esquemas y placas con los archivos abiertos previamente"
#: common/dialogs/panel_common_settings_base.cpp:243
msgid "&Auto save:"
@@ -3797,7 +3801,7 @@ msgstr "Estilo de línea"
#: eeschema/sch_textbox.cpp:449 include/stroke_params.h:80
#: pcbnew/fp_text.cpp:309 pcbnew/fp_textbox.cpp:315
#: pcbnew/pcb_dimension.cpp:329 pcbnew/pcb_text.cpp:142
-#: pcbnew/pcb_textbox.cpp:309
+#: pcbnew/pcb_textbox.cpp:309 eeschema/dialogs/dialog_sim_model.cpp:457
msgid "Default"
msgstr "Por defecto"
@@ -4114,7 +4118,7 @@ msgstr "Plantillas de nombres de campos"
#: common/eda_base_frame.cpp:1065 common/tool/actions.cpp:610
#: kicad/tools/kicad_manager_actions.cpp:98 pcbnew/footprint_edit_frame.cpp:914
-#: pcbnew/menubar_footprint_editor.cpp:92
+#: pcbnew/menubar_footprint_editor.cpp:92 pcbnew/footprint_edit_frame.cpp:912
msgid "Footprint Editor"
msgstr "Editor de huellas"
@@ -4126,7 +4130,7 @@ msgstr "Valores por defecto"
#: common/eda_base_frame.cpp:1074 common/hotkey_store.cpp:74
#: kicad/tools/kicad_manager_actions.cpp:92 pcbnew/menubar_pcb_editor.cpp:185
#: pcbnew/pcb_edit_frame.cpp:182 pcbnew/pcb_edit_frame.cpp:1528
-#: pcbnew/tools/zone_filler_tool.cpp:272
+#: pcbnew/tools/zone_filler_tool.cpp:272 pcbnew/pcb_edit_frame.cpp:1539
msgid "PCB Editor"
msgstr "Editor de placas"
@@ -4341,11 +4345,12 @@ msgid "Zone"
msgstr "Zona"
#: common/eda_item.cpp:340 common/eda_item.cpp:341 pcbnew/pcb_track.cpp:822
+#: pcbnew/pcb_track.cpp:827
msgid "Track"
msgstr "Pista"
#: common/eda_item.cpp:342 pcbnew/dialogs/dialog_board_statistics.cpp:501
-#: pcbnew/pcb_track.cpp:902
+#: pcbnew/pcb_track.cpp:902 pcbnew/pcb_track.cpp:899
msgid "Via"
msgstr "Vía"
@@ -4516,7 +4521,7 @@ msgstr "Forma"
#: common/eda_shape.cpp:637 common/eda_shape.cpp:644
#: pcbnew/dialogs/dialog_graphic_item_properties.cpp:213
-#: pcbnew/pcb_track.cpp:842
+#: pcbnew/pcb_track.cpp:842 pcbnew/pcb_track.cpp:839
msgid "Radius"
msgstr "Radio"
@@ -4547,7 +4552,9 @@ msgstr "Puntos"
#: pcbnew/fp_text.cpp:311 pcbnew/fp_text_grid_table.cpp:102 pcbnew/pad.cpp:1002
#: pcbnew/pcb_bitmap.cpp:211 pcbnew/pcb_target.cpp:156
#: pcbnew/pcb_target.cpp:201 pcbnew/pcb_text.cpp:144 pcbnew/pcb_track.cpp:837
-#: pcbnew/pcb_track.cpp:1243 pcbnew/pcb_track.cpp:1273
+#: pcbnew/pcb_track.cpp:1243 pcbnew/pcb_track.cpp:1273 pcbnew/pcb_track.cpp:834
+#: pcbnew/pcb_track.cpp:1240 pcbnew/pcb_track.cpp:1261
+#: pcbnew/pcb_track.cpp:1291
msgid "Width"
msgstr "Ancho"
@@ -4570,22 +4577,26 @@ msgid "Bezier"
msgstr "Bezier"
#: common/eda_shape.cpp:1693 pcbnew/pcb_textbox.cpp:529
-#: pcbnew/pcb_track.cpp:1246
+#: pcbnew/pcb_track.cpp:1246 pcbnew/pcb_track.cpp:1243
+#: pcbnew/pcb_track.cpp:1265
msgid "Start X"
msgstr "Inicio X"
#: common/eda_shape.cpp:1696 pcbnew/pcb_textbox.cpp:530
-#: pcbnew/pcb_track.cpp:1250
+#: pcbnew/pcb_track.cpp:1250 pcbnew/pcb_track.cpp:1247
+#: pcbnew/pcb_track.cpp:1270
msgid "Start Y"
msgstr "Inicio Y"
#: common/eda_shape.cpp:1699 pcbnew/pcb_textbox.cpp:531
-#: pcbnew/pcb_track.cpp:1253
+#: pcbnew/pcb_track.cpp:1253 pcbnew/pcb_track.cpp:1250
+#: pcbnew/pcb_track.cpp:1274
msgid "End X"
msgstr "Final X"
#: common/eda_shape.cpp:1702 pcbnew/pcb_textbox.cpp:532
-#: pcbnew/pcb_track.cpp:1256
+#: pcbnew/pcb_track.cpp:1256 pcbnew/pcb_track.cpp:1253
+#: pcbnew/pcb_track.cpp:1278
msgid "End Y"
msgstr "Final Y"
@@ -4983,7 +4994,7 @@ msgstr "No puede copiarse al archivo '%s'."
#: common/grid_tricks.cpp:325 common/tool/actions.cpp:153
#: eeschema/tools/ee_actions.cpp:157 pcbnew/dialogs/panel_setup_rules.cpp:111
-#: pcbnew/tools/edit_tool.cpp:1973
+#: pcbnew/tools/edit_tool.cpp:1973 pcbnew/tools/edit_tool.cpp:1971
msgid "Cut"
msgstr "Cortar"
@@ -5014,6 +5025,7 @@ msgstr "Pegar celdas del portapapeles a la matriz en la celda activa"
#: common/grid_tricks.cpp:331 common/tool/actions.cpp:192
#: kicad/project_tree_pane.cpp:762 pcbnew/dialogs/panel_setup_rules.cpp:114
#: pcbnew/plugins/kicad/pcb_parser.cpp:923 pcbnew/tools/edit_tool.cpp:1975
+#: pcbnew/tools/edit_tool.cpp:1973
msgid "Delete"
msgstr "Eliminar"
@@ -5054,7 +5066,7 @@ msgstr "Añadir a la selección"
#: common/hotkey_store.cpp:47 eeschema/tools/ee_actions.cpp:582
#: gerbview/tools/gerbview_actions.cpp:119 pcbnew/tools/pcb_actions.cpp:790
-#: pcbnew/tools/pcb_actions.cpp:810
+#: pcbnew/tools/pcb_actions.cpp:810 eeschema/tools/ee_actions.cpp:583
msgid "Highlight Net"
msgstr "Resaltar red"
@@ -5468,6 +5480,7 @@ msgstr "Desactivar seleccionado"
#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:201
#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:212
#: pcbnew/dialogs/dialog_track_via_properties_base.cpp:223
+#: eeschema/dialogs/dialog_sim_model.cpp:456
msgid "Unit"
msgstr "Unidad"
@@ -5771,15 +5784,15 @@ msgstr "Error: "
msgid "Unable to open %s for reading."
msgstr "No puede abrirse al archivo '%s' para lectura."
-#: common/richio.cpp:226 common/richio.cpp:324
+#: common/richio.cpp:226 common/richio.cpp:324 common/richio.cpp:322
msgid "Maximum line length exceeded"
msgstr "Se ha sobrepasado la longitud máxima de línea"
-#: common/richio.cpp:289
+#: common/richio.cpp:289 common/richio.cpp:288
msgid "Line length exceeded"
msgstr "Longitud máxima de línea excedida"
-#: common/richio.cpp:573
+#: common/richio.cpp:573 common/richio.cpp:571
msgid "OUTPUTSTREAM_OUTPUTFORMATTER write error"
msgstr "Error al escribir OUTPUTSTREAM_OUTPUTFORMATTER"
@@ -5970,13 +5983,12 @@ msgid "Delete clicked items"
msgstr "Eliminar elementos clicados"
#: common/tool/actions.cpp:204
-#, fuzzy
msgid "Cycle arc editing mode"
-msgstr "Alternar modo realista"
+msgstr "Alternar modo de edición de arco"
#: common/tool/actions.cpp:205
msgid "Switch to a different method of editing arcs"
-msgstr ""
+msgstr "Cambiar a un método distinto de editar arcos"
#: common/tool/actions.cpp:210
msgid "Show Search Panel"
@@ -6082,17 +6094,18 @@ msgstr "Zoom menos en el cursor"
#: common/tool/actions.cpp:325 common/widgets/mathplot.cpp:1678
#: eeschema/sim/sim_plot_frame_base.cpp:87
-#: pcbnew/dialogs/panel_setup_rules.cpp:122
+#: pcbnew/dialogs/panel_setup_rules.cpp:122 common/widgets/mathplot.cpp:1667
msgid "Zoom In"
msgstr "Más zoom"
#: common/tool/actions.cpp:331 common/widgets/mathplot.cpp:1679
#: eeschema/sim/sim_plot_frame_base.cpp:91
-#: pcbnew/dialogs/panel_setup_rules.cpp:123
+#: pcbnew/dialogs/panel_setup_rules.cpp:123 common/widgets/mathplot.cpp:1668
msgid "Zoom Out"
msgstr "Menos zoom"
#: common/tool/actions.cpp:337 common/widgets/mathplot.cpp:1676
+#: common/widgets/mathplot.cpp:1665
msgid "Center on Cursor"
msgstr "Centrar en el cursor"
@@ -6248,6 +6261,7 @@ msgid "Use millimeters"
msgstr "Utilizar milímetros"
#: common/tool/actions.cpp:518 common/widgets/lib_tree.cpp:674
+#: common/widgets/lib_tree.cpp:665
msgid "Select Columns"
msgstr "Seleccionar columnas"
@@ -6671,23 +6685,24 @@ msgstr "Seleccionar ruta"
msgid "recent searches"
msgstr "búsquedas recientes"
-#: common/widgets/mathplot.cpp:1676
+#: common/widgets/mathplot.cpp:1676 common/widgets/mathplot.cpp:1665
msgid "Center plot view to this position"
msgstr "Centrar la vista de trazado en este punto"
#: common/widgets/mathplot.cpp:1677 eeschema/sim/sim_plot_frame_base.cpp:95
+#: common/widgets/mathplot.cpp:1666
msgid "Fit on Screen"
msgstr "Ajustar a pantalla"
-#: common/widgets/mathplot.cpp:1677
+#: common/widgets/mathplot.cpp:1677 common/widgets/mathplot.cpp:1666
msgid "Set plot view to show all items"
msgstr "Configurar la vista del trazado para ver todos los elementos"
-#: common/widgets/mathplot.cpp:1678
+#: common/widgets/mathplot.cpp:1678 common/widgets/mathplot.cpp:1667
msgid "Zoom in plot view."
msgstr "Aumentar zoom de vista de trazado."
-#: common/widgets/mathplot.cpp:1679
+#: common/widgets/mathplot.cpp:1679 common/widgets/mathplot.cpp:1668
msgid "Zoom out plot view."
msgstr "Disminuir zoom de vista de trazado."
@@ -6723,15 +6738,18 @@ msgstr "Restablecer %s a predeterminados"
#: common/widgets/properties_panel.cpp:69
#: common/widgets/properties_panel.cpp:147
+#: common/widgets/properties_panel.cpp:141
msgid "No objects selected"
msgstr "Ningún objeto seleccionado"
#: common/widgets/properties_panel.cpp:161
+#: common/widgets/properties_panel.cpp:155
#, c-format
msgid "%d objects selected"
msgstr "%d objetos seleccionados"
#: common/widgets/properties_panel.cpp:280
+#: common/widgets/properties_panel.cpp:274
msgid "Basic Properties"
msgstr "Propiedades básicas"
@@ -7287,7 +7305,7 @@ msgid "Configuration Error"
msgstr "Error de configuración"
#: cvpcb/cvpcb_mainframe.cpp:910 pcbnew/footprint_edit_frame.cpp:939
-#: pcbnew/load_select_footprint.cpp:225
+#: pcbnew/load_select_footprint.cpp:225 pcbnew/footprint_edit_frame.cpp:937
msgid "Loading Footprint Libraries"
msgstr "Cargando librerías de huellas"
@@ -7716,14 +7734,14 @@ msgid ""
msgstr ""
"La red %s está conectada gráficamente al bus %s pero no a un miembro del bus"
-#: eeschema/connection_graph.cpp:3266
+#: eeschema/connection_graph.cpp:3266 eeschema/connection_graph.cpp:3259
#, c-format
msgid "Sheet pin %s has no matching hierarchical label inside the sheet"
msgstr ""
"El puerto de hoja %s no tiene una etiqueta jerárquica correspondiente en la "
"hoja"
-#: eeschema/connection_graph.cpp:3283
+#: eeschema/connection_graph.cpp:3283 eeschema/connection_graph.cpp:3276
#, c-format
msgid "Hierarchical label %s has no matching sheet pin in the parent sheet"
msgstr "La etiqueta jerárquica %s no está conectada a la hoja pricipal"
@@ -7927,8 +7945,8 @@ msgid ""
"Set this option to show the window of the running command."
msgstr ""
"De forma predeterminada, la línea de comandos se ejecuta con la ventana de "
-"consola oculta y la salida se redirige al campo \"Información del "
-"complemento\".\n"
+"consola oculta y la salida se redirige al campo \"Información del complemento"
+"\".\n"
"Establezca esta opción para mostrar la ventana del comando en ejecución."
#: eeschema/dialogs/dialog_bom_base.cpp:118
@@ -8005,12 +8023,12 @@ msgid ""
"python