diff --git a/website/themes/beastie/i18n/es.toml b/website/themes/beastie/i18n/es.toml
index e109ba3bf6..af8945edef 100644
--- a/website/themes/beastie/i18n/es.toml
+++ b/website/themes/beastie/i18n/es.toml
@@ -1,534 +1,537 @@
 # Global
 [freebsd]
 other = "FreeBSD"
 
 [freebsdProject]
 other = "El Proyecto FreeBSD"
 
 [freebsdPowerServe]
 other = "FreeBSD The Power to Serve"
 
 [freebsdFoundation]
-other = "The FreeBSD Foundation"
+other = "La Fundación FreeBSD"
 
 [downloadFreeBSD]
 other = "Descargar FreeBSD"
 
 [production]
 other = "Producción"
 
 # Header
 [donate]
 other = "Donar a FreeBSD"
 
 [donateFoundation]
-other = "Donar a la FreeBSD Foundation"
+other = "Donar a la Fundación FreeBSD"
 
 [search]
 other = "Buscar"
 
 # Navigation
 [home]
 other = "Inicio"
 
 [about]
 other = "Acerca de FreeBSD"
 
 [introduction]
 other = "Introduccion"
 
 [features]
 other = "Características"
 
 [advocacy]
-other = "Proselitismo"
+other = "Apoyo"
 
 [marketing]
 other = "Marketing"
 
 [privacyPolicy]
 other = "Política de privacidad"
 
 [getFreeBSD]
 other = "Descargar FreeBSD"
 
 [releaseInformation]
-other = "Release Information"
+other = "Información de Versiones"
 
 [releaseEngineering]
-other = "Release Engineering"
+other = "Ingeniería de Versiones"
 
 [documentation]
 other = "Documentación"
 
 [faq]
 other = "FAQ"
 
 [handbook]
-other = "Handbook"
+other = "Manual"
 
 [porterHandbook]
-other = "Porter's Handbook"
+other = "Manual del Porter"
 
 [developerHandbook]
-other = "Developer's Handbook"
+other = "Manual del desarrollador"
+
+[committersGuide]
+other = "Guía del Committer"
 
 [manualPages]
 other = "Manuales en línea"
 
 [documentationProjectPrimer]
-other = "Documentation Project Primer"
+other = "Introducción al Proyecto de Documentación"
 
 [allBooksArticles]
 other = "Todos los libros y artículos"
 
 [community]
 other = "Comunidad"
 
 [mailingLists]
 other = "Listas de correo"
 
 [forums]
 other = "Foros"
 
 [userGroups]
 other = "Grupos de usuarios"
 
 [events]
 other = "Eventos"
 
 [FreeBSDJournal]
 other = "FreeBSD Journal"
 
 [QA]
 other = "Q&A (externo)"
 
 [developers]
 other = "Desarrolladores"
 
 [projectIdeas]
 other = "Ideas para proyectos"
 
 [subversionRepository]
 other = "Repositorio Subversion"
 
 [gitMirror]
 other = "Git Mirror"
 
 [phabricator]
-other = "Code Review (Phabricator)"
+other = "Revisiones de Código (Phabricator)"
 
 [wiki]
 other = "Wiki"
 
 [CI]
 other = "Servicio de integración continua"
 
 [support]
 other = "Soporte"
 
 [vendors]
 other = "Distribuidores comerciales"
 
 [securityInformation]
-other = "Información seguridad"
+other = "Información de seguridad"
 
 [bugReports]
-other = "Informes errores"
+other = "Informes de errores"
 
 [submittingBugReports]
-other = "Envío informe errores"
+other = "Envío informes de error"
 
 [foundation]
 other = "Fundación"
 
 [monetaryDonations]
 other = "Donaciones monetarias"
 
 [hardwareDonations]
 other = "Donaciones hardware"
 
 #Main
 [freebsdDescription]
-other = "FreeBSD es un sistema operativo para servidores, equipos de escritorio y plataformase embebidas. Una gran comunidad lo ha desarrollado de manera continuada durante más de treinta años. Sus avanzadas funciones de red, seguridad y almacenamiento han hecho de FreeBSD la plataforma elegida por muchos de los sitios web más concurridos y los dispositivos de red y almacenamiento más generalizados."
+other = "FreeBSD es un sistema operativo para servidores, equipos de escritorio y plataformas embebidas. Una gran comunidad lo ha desarrollado de manera continuada durante más de treinta años. Sus avanzadas funciones de red, seguridad y almacenamiento han hecho de FreeBSD la plataforma elegida por muchos de los sitios web más concurridos y los dispositivos de red y almacenamiento más generalizados."
 
 [learnMore]
 other = "Más información"
 
 [getThe]
 other = "Obtener el"
 
 [journal]
 other = "FreeBSD Journal"
 
 [supportedReleases]
-other = "Supported Releases"
+other = "Versiones soportadas"
 
 [supportLifecycle]
-other = "Support Lifecycle"
+other = "Ciclo de vida de Soporte"
 
 [upcoming]
-other = "Upcoming"
+other = "Próximo"
 
 [newFreeBSD]
 other= "¿Nuevo en FreeBSD?"
 
 [shortcuts]
 other = "ENLACES RÁPIDOS"
 
 [reportingProblems]
-other = "Enviar un fallo"
+other = "Reportar un fallo"
 
 [ports]
 other = "Ports"
 
 [latestNews]
 other = "ÚLTIMAS NOTICIAS"
 
 [upcomingEvents]
 other = "PRÓXIMOS EVENTOS"
 
 [press]
 other = "EN LOS MEDIOS"
 
 [securityAdvisories]
 other = "AVISOS DE SEGURIDAD"
 
 [errataNotices]
 other = "AVISOS SOBRE ERRORES"
 
 [moreNews]
 other = "Más noticias"
 
 [moreEvents]
 other = "Más eventos"
 
 [moreMedia]
 other = "Más medios"
 
 [more]
 other = "Más"
 
 #404
 [notFoundTitle]
-other = "We could not find the page you requested."
+other = "No hemos podido encontrar la página solicitada"
 
 [notFoundDesc]
-other = "Please try your request again, use one of the links in the navigation menu, or the search box at the top of the page."
+other = "Por favor vuelva a intentarlo, use algo de los enlaces del menú de navegación, o la caja de búsqueda en la parte superior de la página."
 
 # Footer
 [copyright]
-other = "All rights reserved."
+other = "Todos los derechos reservados."
 
 [trademark]
-other = "The mark FreeBSD is a registered trademark of The FreeBSD Foundation and is used by The FreeBSD Project with the permission of"
+other = "La marca FreeBSD es una marca registrada de la Fundación FreeBSD es es utilizada por el Proyecto FreeBSD con su permiso"
 
 # Months
 [1]
-other = "January"
+other = "Enero"
 
 [2]
-other = "February"
+other = "Febrero"
 
 [3]
-other = "March"
+other = "Marzo"
 
 [4]
-other = "April"
+other = "Abril"
 
 [5]
-other = "May"
+other = "Mayo"
 
 [6]
-other = "June"
+other = "Junio"
 
 [7]
-other = "July"
+other = "Julio"
 
 [8]
-other = "August"
+other = "Agosto"
 
 [9]
-other = "September"
+other = "Septiembre"
 
 [10]
-other = "October"
+other = "Octubre"
 
 [11]
-other = "November"
+other = "Noviembre"
 
 [12]
-other = "December"
+other = "Diciembre"
 
 # Security section
 [data]
-other = "Data"
+other = "Datos"
 
 [errataNoticeName]
-other = "Errata Notice name"
+other = "Nombre del Aviso de Errata"
 
 [advisoryName]
-other = "Advisory name"
+other = "Nombre de la Advertencia"
 
 # Events section
 [currentEvents]
-other = "Current/Upcoming Events:"
+other = "Actuales/Próximos Eventos:"
 
 [pastEvents]
-other = "Past Events:"
+other = "Eventos Pasados:"
 
 [upcomingFreeBSDEvents]
-other = "Upcoming FreeBSD Events"
+other = "Próximos Eventos de FreeBSD"
 
 # Continents, countries
 [europe]
-other = "Europe"
+other = "Europa"
 
 [africa]
-other = "Africa"
+other = "África"
 
 [australia]
 other = "Australia"
 
 [newZealand]
-other = "New Zealand"
+other = "Nueva Zelanda"
 
 [northAmerica]
-other = "North America"
+other = "Norte América"
 
 [asia]
 other = "Asia"
 
 [southAmerica]
-other = "South America"
+other = "Sur América"
 
 [oceania]
-other = "Oceania"
+other = "Oceanía"
 
 [global]
 other = "Global"
 
 # Commercial software
 [databases]
-other = "Databases"
+other = "Bases de datos"
 
 [developmentTools]
-other = "Development Tools"
+other = "Herramientas de Desarrollo"
 
 [ecommerce]
-other = "E-Commerce Solutions and Tools"
+other = "Herramientas y Soluciones de E-Commerce"
 
 [email]
-other = "Electronic Mail Software"
+other = "Software de Correo Electrónico"
 
 [misc]
-other = "Miscellaneous"
+other = "Miscelánea"
 
 [network]
-other = "Network Systems and Applications"
+other = "Aplicaciones y Sistemas de Red"
 
 [scientific]
-other = "Scientific and Language Tools"
+other = "Herramientas y Lenguajes Científicos"
 
 [security]
-other = "Security"
+other = "Seguridad"
 
 [isp]
-other = "System Administration / ISP"
+other = "Administración de Sistemas / ISP"
 
 # sidenav
 [applications]
-other = "Applications"
+other = "Aplicaciones"
 
 [administration]
-other = "Administration"
+other = "Administración"
 
 [news]
-other = "News"
+other = "Noticias"
 
 [pressSidenav]
-other = "Press"
+other = "Prensa"
 
 [multimedia]
 other = "Multimedia"
 
 [art]
-other = "Artwork"
+other = "Material gráfico"
 
 [logo]
-other = "Logo"
+other = "Logotipo"
 
 [donations]
-other = "Donations"
+other = "Donaciones"
 
 [privacy]
-other = "Privacy Policy"
+other = "Política de Privacidad"
 
 [mailinglists]
-other = "Mailing Lists"
+other = "Listas de Correo"
 
 [newsgroups]
-other = "Newsgroups"
+other = "Grupos de Noticias"
 
 [usergroups]
-other = "User Groups"
+other = "Grupos de Usuarios"
 
 [sourceCodeRepositories]
-other = "Source code repositories"
+other = "Repositorios de código fuente"
 
 [releng]
-other = "Release Engineering"
+other = "Ingeniería de Versiones"
 
 [platforms]
-other = "Platforms"
+other = "Plataformas"
 
 [ideas]
-other = "Project Ideas"
+other = "Ideas del Proyecto"
 
 [contributing]
-other = "Contributing"
+other = "Contribuir"
 
 [FAQ]
 other = "FAQ"
 
 [man]
-other = "Manual Pages"
+other = "Páginas del Manual"
 
 [papers]
-other = "Presentations and Papers"
+other = "Presentaciones y Trabajos"
 
 [booksArticles]
-other = "Books and Articles Online"
+other = "Libros y Artículos en línea"
 
 [publications]
-other = "Publications"
+other = "Publicaciones"
 
 [newbies]
-other = "For Newbies"
+other = "Para Principiantes"
 
 [docproj]
-other = "Documentation Project"
+other = "Proyecto de Documentación"
 
 [archive]
-other = "Archive"
+other = "Archivo"
 
 [releases]
-other = "Release Information"
+other = "Información de Versiones"
 
 [productionRelease]
-other = "Production Release"
+other = "Versiones de Producción"
 
 [upcomingRelease]
-other = "Upcoming Release"
+other = "Próxima Versión"
 
 [snapshotReleases]
-other = "Snapshot Releases"
+other = "Versiones Instantáneas"
 
 [portedApplications]
-other = "Ported Applications"
+other = "Aplicaciones Portadas"
 
 [gnome]
 other = "GNOME"
 
 [installationInstructions]
-other = "Installation Instructions"
+other = "Instrucciones de Instalación"
 
 [upgradeInstructions]
-other = "Upgrade Instructions"
+other = "Instrucciones de Actualización"
 
 [availableApplications]
-other = "Available Applications"
+other = "Aplicaciones Disponibles"
 
 [howHelp]
-other = "How to Help"
+other = "Cómo Ayudar"
 
 [reportingBug]
-other = "Reporting a Bug"
+other = "Reportar un error"
 
 [screenshots]
-other = "Screenshots"
+other = "Capturas de pantalla"
 
 [contactUs]
-other = "Contact Us"
+other = "Contáctanos"
 
 [HALFAQ]
 other = "HAL FAQ"
 
 [upgradeFAQ]
-other = "2.30 to 2.32 Upgrade FAQ"
+other = "FAQ de actualización de 2.30 a 2.32"
 
 [developmentBranchFAQ]
-other = "Development Branch FAQ"
+other = "FAQ de Ramas de Desarrollo"
 
 [creatingPorts]
-other = "Creating Ports"
+other = "Creando Ports"
 
 [knownIssues]
-other = "Known Issues"
+other = "Problemas Conocidos"
 
 [aboutPorts]
-other = "About ports"
+other = "Acerca de los ports"
 
 [installing]
-other = "Installing"
+other = "Instalación"
 
 [updating]
-other = "Updating"
+other = "Actualización"
 
 [searching]
-other = "Searching"
+other = "Búsqueda"
 
 [categories]
-other = "Categories"
+other = "Categorías"
 
 [alphabetically]
-other = "listed alphabetically"
+other = "listado alfabéticamente"
 
 [logicalGroup]
-other = "listed by logical group"
+other = "listado por grupo lógico"
 
 [allPorts]
-other = "List of All Ports"
+other = "Lista de Todos los Ports"
 
 [moreInformation]
-other = "For More Information"
+other = "Para Más Información"
 
 [software]
 other = "Software"
 
 [hardware]
 other = "Hardware"
 
 [consulting]
-other = "Consulting"
+other = "Consultoría"
 
 [ispCommercial]
-other = "Internet Service Providers"
+other = "Proveedores de Servicios de Internet"
 
 [securityInfo]
-other = "Security Information"
+other = "Información de Seguridad"
 
 [advisories]
-other = "Advisories"
+other = "Advertencias"
 
 [errataNoticesSidenav]
-other = "Errata Notices"
+other = "Avisos de Errata"
 
 [unsupportedReleases]
-other = "Unsupported Releases"
+other = "Versiones No Soportadas"
 
 [readSecurityAdvisories]
-other = "How to read FreeBSD Security Advisories"
+other = "Cómo leer las advertencias de seguridad de FreeBSD"
 
 [charterSecurityOfficerTeam]
-other = "Charter for the Security Officer and Team"
+other = "Carta para el Director y el Equipo de Seguridad"
 
 [bugreports]
-other = "Bug Reports"
+other = "Informes de Error"
 
 [submitPR]
-other = "Submit a Problem Report"
+other = "Informar de un problema"
 
 [webresources]
-other = "Web Resources"
+other = "Recursos Web"