diff --git a/modules/po/admindebug.es_ES.po b/modules/po/admindebug.es_ES.po
index 57619c29..9ba9aac0 100644
--- a/modules/po/admindebug.es_ES.po
+++ b/modules/po/admindebug.es_ES.po
@@ -14,40 +14,40 @@ msgstr ""
 
 #: admindebug.cpp:30
 msgid "Enable Debug Mode"
-msgstr ""
+msgstr "Habilitar modo de depuración"
 
 #: admindebug.cpp:32
 msgid "Disable Debug Mode"
-msgstr ""
+msgstr "Desactivar modo de depuración"
 
 #: admindebug.cpp:34
 msgid "Show the Debug Mode status"
-msgstr ""
+msgstr "Muestra el estado del modo de depuración"
 
 #: admindebug.cpp:40 admindebug.cpp:49
 msgid "Access denied!"
-msgstr ""
+msgstr "¡Acceso denegado!"
 
 #: admindebug.cpp:61
 msgid "Already enabled."
-msgstr ""
+msgstr "Ya está habilitado."
 
 #: admindebug.cpp:63
 msgid "Already disabled."
-msgstr ""
+msgstr "Ya está deshabilitado."
 
 #: admindebug.cpp:88
 msgid "Debugging mode is on."
-msgstr ""
+msgstr "Modo depuración activado."
 
 #: admindebug.cpp:90
 msgid "Debugging mode is off."
-msgstr ""
+msgstr "Modo depuración desactivado."
 
 #: admindebug.cpp:92
 msgid "Logging to: stdout."
-msgstr ""
+msgstr "Registrando a: stdout."
 
 #: admindebug.cpp:101
 msgid "Enable Debug mode dynamically."
-msgstr ""
+msgstr "Habilita el modo de depuración dinámicamente."
diff --git a/modules/po/certauth.es_ES.po b/modules/po/certauth.es_ES.po
index 0adda4e4..df82efae 100644
--- a/modules/po/certauth.es_ES.po
+++ b/modules/po/certauth.es_ES.po
@@ -14,95 +14,96 @@ msgstr ""
 
 #: modules/po/../data/certauth/tmpl/index.tmpl:7
 msgid "Add a key"
-msgstr ""
+msgstr "Añadir una clave"
 
 #: modules/po/../data/certauth/tmpl/index.tmpl:11
 msgid "Key:"
-msgstr ""
+msgstr "Clave:"
 
 #: modules/po/../data/certauth/tmpl/index.tmpl:15
 msgid "Add Key"
-msgstr ""
+msgstr "Añadir clave"
 
 #: modules/po/../data/certauth/tmpl/index.tmpl:23
 msgid "You have no keys."
-msgstr ""
+msgstr "No tienes claves."
 
 #: modules/po/../data/certauth/tmpl/index.tmpl:30
 msgctxt "web"
 msgid "Key"
-msgstr ""
+msgstr "Clave"
 
 #: modules/po/../data/certauth/tmpl/index.tmpl:36
 msgid "del"
-msgstr ""
+msgstr "borrar"
 
 #: certauth.cpp:31
 msgid "[pubkey]"
-msgstr ""
+msgstr "[pubkey]"
 
 #: certauth.cpp:32
 msgid "Add a public key. If key is not provided will use the current key"
 msgstr ""
+"Añadir una clave pública. Si no se proporciona una clave se usará la actual"
 
 #: certauth.cpp:35
 msgid "id"
-msgstr ""
+msgstr "id"
 
 #: certauth.cpp:35
 msgid "Delete a key by its number in List"
-msgstr ""
+msgstr "Borrar una clave por su número en la lista"
 
 #: certauth.cpp:37
 msgid "List your public keys"
-msgstr ""
+msgstr "Muestra tus claves públicas"
 
 #: certauth.cpp:39
 msgid "Print your current key"
-msgstr ""
+msgstr "Muestra tu claves actual"
 
 #: certauth.cpp:142
 msgid "You are not connected with any valid public key"
-msgstr ""
+msgstr "No estás conectado con ninguna clave pública válida"
 
 #: certauth.cpp:144
 msgid "Your current public key is: {1}"
-msgstr ""
+msgstr "Tu clave pública actual es: {1}"
 
 #: certauth.cpp:157
 msgid "You did not supply a public key or connect with one."
-msgstr ""
+msgstr "No has proporcionado una clave pública."
 
 #: certauth.cpp:160
 msgid "Key '{1}' added."
-msgstr ""
+msgstr "Clave '{1}' añadida."
 
 #: certauth.cpp:162
 msgid "The key '{1}' is already added."
-msgstr ""
+msgstr "La clave '{1}' ya está añadida."
 
 #: certauth.cpp:170 certauth.cpp:182
 msgctxt "list"
 msgid "Id"
-msgstr ""
+msgstr "Id"
 
 #: certauth.cpp:171 certauth.cpp:183
 msgctxt "list"
 msgid "Key"
-msgstr ""
+msgstr "Clave"
 
 #: certauth.cpp:175 certauth.cpp:189 certauth.cpp:198
 msgid "No keys set for your user"
-msgstr ""
+msgstr "No hay claves configuradas para tu usuario"
 
 #: certauth.cpp:203
 msgid "Invalid #, check \"list\""
-msgstr ""
+msgstr "Código # inválido, comprueba la lista con \"list\""
 
 #: certauth.cpp:215
 msgid "Removed"
-msgstr ""
+msgstr "Eliminado"
 
 #: certauth.cpp:290
 msgid "Allows users to authenticate via SSL client certificates."
-msgstr ""
+msgstr "Permite a los usuarios autenticarse vía certificados SSL."
diff --git a/modules/po/controlpanel.es_ES.po b/modules/po/controlpanel.es_ES.po
index 7b23875c..1c2a2355 100644
--- a/modules/po/controlpanel.es_ES.po
+++ b/modules/po/controlpanel.es_ES.po
@@ -182,7 +182,7 @@ msgstr ""
 #: controlpanel.cpp:725
 msgid "Channel {1} is deleted from network {2} of user {3}"
 msgid_plural "Channels {1} are deleted from network {2} of user {3}"
-msgstr[0] ""
+msgstr[0] "Borrado canal {1} de la red {2} del usuario {3}"
 msgstr[1] "Borrados canales {1} de la red {2} del usuario {3}"
 
 #: controlpanel.cpp:740
@@ -251,215 +251,225 @@ msgstr "Uso: AddUser <usuario> <contraseña>"
 
 #: controlpanel.cpp:925
 msgid "Error: User {1} already exists!"
-msgstr ""
+msgstr "Error: el usuario {1} ya existe"
 
 #: controlpanel.cpp:937 controlpanel.cpp:1012
 msgid "Error: User not added: {1}"
-msgstr ""
+msgstr "Error: usuario no añadido: {1}"
 
 #: controlpanel.cpp:941 controlpanel.cpp:1016
 msgid "User {1} added!"
-msgstr ""
+msgstr "¡Usuario {1} añadido!"
 
 #: controlpanel.cpp:948
 msgid "Error: You need to have admin rights to delete users!"
 msgstr ""
+"Error: tienes que tener permisos administrativos para eliminar usuarios"
 
 #: controlpanel.cpp:954
 msgid "Usage: DelUser <username>"
-msgstr ""
+msgstr "Uso: DelUser <usuario>"
 
 #: controlpanel.cpp:966
 msgid "Error: You can't delete yourself!"
-msgstr ""
+msgstr "Error: no puedes borrarte a ti mismo"
 
 #: controlpanel.cpp:972
 msgid "Error: Internal error!"
-msgstr ""
+msgstr "Error: error interno"
 
 #: controlpanel.cpp:976
 msgid "User {1} deleted!"
-msgstr ""
+msgstr "Usuario {1} eliminado"
 
 #: controlpanel.cpp:991
 msgid "Usage: CloneUser <old username> <new username>"
-msgstr ""
+msgstr "Uso: CloneUser <antiguo usuario> <nuevo usuario>"
 
 #: controlpanel.cpp:1006
 msgid "Error: Cloning failed: {1}"
-msgstr ""
+msgstr "Error: clonación fallida: {1}"
 
 #: controlpanel.cpp:1035
 msgid "Usage: AddNetwork [user] network"
-msgstr ""
+msgstr "Uso: AddNetwork [usuario] red"
 
 #: controlpanel.cpp:1041
 msgid ""
 "Network number limit reached. Ask an admin to increase the limit for you, or "
 "delete unneeded networks using /znc DelNetwork <name>"
 msgstr ""
+"Limite de redes alcanzado. Píde a un administrador que te incremente el "
+"límite, o elimina redes innecesarias usando /znc DelNetwork <nombre>"
 
 #: controlpanel.cpp:1049
 msgid "Error: User {1} already has a network with the name {2}"
-msgstr ""
+msgstr "Error: el usuario {1} ya tiene una red llamada {2}"
 
 #: controlpanel.cpp:1056
 msgid "Network {1} added to user {2}."
-msgstr ""
+msgstr "Red {1} añadida al usuario {2}."
 
 #: controlpanel.cpp:1060
 msgid "Error: Network [{1}] could not be added for user {2}: {3}"
-msgstr ""
+msgstr "Error: la red [{1}] no se ha podido añadir al usuario {2}: {3}"
 
 #: controlpanel.cpp:1080
 msgid "Usage: DelNetwork [user] network"
-msgstr ""
+msgstr "Uso: DelNetwork [usuario] red"
 
 #: controlpanel.cpp:1091
 msgid "The currently active network can be deleted via {1}status"
-msgstr ""
+msgstr "La red activa actual puede ser eliminada vía {1}status"
 
 #: controlpanel.cpp:1097
 msgid "Network {1} deleted for user {2}."
-msgstr ""
+msgstr "Red {1} eliminada al usuario {2}."
 
 #: controlpanel.cpp:1101
 msgid "Error: Network {1} could not be deleted for user {2}."
-msgstr ""
+msgstr "Error: la red {1} no se ha podido eliminar al usuario {2}."
 
 #: controlpanel.cpp:1120 controlpanel.cpp:1128
 msgctxt "listnetworks"
 msgid "Network"
-msgstr ""
+msgstr "Red"
 
 #: controlpanel.cpp:1121 controlpanel.cpp:1130 controlpanel.cpp:1138
 msgctxt "listnetworks"
 msgid "OnIRC"
-msgstr ""
+msgstr "EnIRC"
 
 #: controlpanel.cpp:1122 controlpanel.cpp:1131
 msgctxt "listnetworks"
 msgid "IRC Server"
-msgstr ""
+msgstr "Servidor IRC"
 
 #: controlpanel.cpp:1123 controlpanel.cpp:1133
 msgctxt "listnetworks"
 msgid "IRC User"
-msgstr ""
+msgstr "Usuario IRC"
 
 #: controlpanel.cpp:1124 controlpanel.cpp:1135
 msgctxt "listnetworks"
 msgid "Channels"
-msgstr ""
+msgstr "Canales"
 
 #: controlpanel.cpp:1143
 msgid "No networks"
-msgstr ""
+msgstr "No hay redes"
 
 #: controlpanel.cpp:1154
 msgid "Usage: AddServer <username> <network> <server> [[+]port] [password]"
-msgstr ""
+msgstr "Uso: AddServer <usuario> <red> <servidor> [[+]puerto] [contraseña]"
 
 #: controlpanel.cpp:1168
 msgid "Added IRC Server {1} to network {2} for user {3}."
-msgstr ""
+msgstr "Añadido servidor IRC {1} a la red {2} al usuario {3}."
 
 #: controlpanel.cpp:1172
 msgid "Error: Could not add IRC server {1} to network {2} for user {3}."
 msgstr ""
+"Error: no se ha podido añadir el servidor IRC {1} a la red {2} del usuario "
+"{3}."
 
 #: controlpanel.cpp:1185
 msgid "Usage: DelServer <username> <network> <server> [[+]port] [password]"
-msgstr ""
+msgstr "Uso: DelServer <usuario> <red> <servidor> [[+]puerto] [contraseña]"
 
 #: controlpanel.cpp:1200
 msgid "Deleted IRC Server {1} from network {2} for user {3}."
-msgstr ""
+msgstr "Eliminado servidor IRC {1} de la red {2} al usuario {3}."
 
 #: controlpanel.cpp:1204
 msgid "Error: Could not delete IRC server {1} from network {2} for user {3}."
 msgstr ""
+"Error: no se ha podido eliminar el servidor IRC {1} de la red {2} al usuario "
+"{3}."
 
 #: controlpanel.cpp:1214
 msgid "Usage: Reconnect <username> <network>"
-msgstr ""
+msgstr "Uso: Reconnect <usuario> <red>"
 
 #: controlpanel.cpp:1241
 msgid "Queued network {1} of user {2} for a reconnect."
-msgstr ""
+msgstr "Red {1} del usuario {2} puesta en cola para reconectar."
 
 #: controlpanel.cpp:1250
 msgid "Usage: Disconnect <username> <network>"
-msgstr ""
+msgstr "Uso: Disconnect <usuario> <red>"
 
 #: controlpanel.cpp:1265
 msgid "Closed IRC connection for network {1} of user {2}."
-msgstr ""
+msgstr "Cerrada la conexión IRC de la red {1} al usuario {2}."
 
 #: controlpanel.cpp:1280 controlpanel.cpp:1284
 msgctxt "listctcp"
 msgid "Request"
-msgstr ""
+msgstr "Solicitud"
 
 #: controlpanel.cpp:1281 controlpanel.cpp:1285
 msgctxt "listctcp"
 msgid "Reply"
-msgstr ""
+msgstr "Respuesta"
 
 #: controlpanel.cpp:1289
 msgid "No CTCP replies for user {1} are configured"
-msgstr ""
+msgstr "No hay respuestas CTCP configuradas para el usuario {1}"
 
 #: controlpanel.cpp:1292
 msgid "CTCP replies for user {1}:"
-msgstr ""
+msgstr "Respuestas CTCP del usuario {1}:"
 
 #: controlpanel.cpp:1308
 msgid "Usage: AddCTCP [user] [request] [reply]"
-msgstr ""
+msgstr "Uso: AddCTCP [usuario] [solicitud] [respuesta]"
 
 #: controlpanel.cpp:1310
 msgid ""
 "This will cause ZNC to reply to the CTCP instead of forwarding it to clients."
 msgstr ""
+"Esto hará que ZNC responda a los CTCP en vez de reenviarselos a los clientes."
 
 #: controlpanel.cpp:1313
 msgid "An empty reply will cause the CTCP request to be blocked."
-msgstr ""
+msgstr "Una respuesta vacía hará que la solicitud CTCP sea bloqueada."
 
 #: controlpanel.cpp:1322
 msgid "CTCP requests {1} to user {2} will now be blocked."
-msgstr ""
+msgstr "Las solicitudes CTCP {1} del usuario {2} serán bloqueadas."
 
 #: controlpanel.cpp:1326
 msgid "CTCP requests {1} to user {2} will now get reply: {3}"
-msgstr ""
+msgstr "Las solicitudes CTCP {1} del usuario {2} se responderán con: {3}"
 
 #: controlpanel.cpp:1343
 msgid "Usage: DelCTCP [user] [request]"
-msgstr ""
+msgstr "Uso: DelCTCP [usuario] [solicitud]"
 
 #: controlpanel.cpp:1349
 msgid "CTCP requests {1} to user {2} will now be sent to IRC clients"
-msgstr ""
+msgstr "Las solicitudes CTCP {1} del usuario {2} serán enviadas a los clientes"
 
 #: controlpanel.cpp:1353
 msgid ""
 "CTCP requests {1} to user {2} will be sent to IRC clients (nothing has "
 "changed)"
 msgstr ""
+"Las solicitudes CTCP {1} del usuario {2} serán enviadas a los clientes (no "
+"se ha cambiado nada)"
 
 #: controlpanel.cpp:1363 controlpanel.cpp:1437
 msgid "Loading modules has been disabled."
-msgstr ""
+msgstr "La carga de módulos ha sido deshabilitada."
 
 #: controlpanel.cpp:1372
 msgid "Error: Unable to load module {1}: {2}"
-msgstr ""
+msgstr "Error: no se ha podido cargar el módulo {1}: {2}"
 
 #: controlpanel.cpp:1375
 msgid "Loaded module {1}"
-msgstr ""
+msgstr "Cargado módulo {1}"
 
 #: controlpanel.cpp:1380
 msgid "Error: Unable to reload module {1}: {2}"
@@ -666,70 +676,72 @@ msgstr "Quita un módulo de un usuario"
 
 #: controlpanel.cpp:1612
 msgid "Get the list of modules for a user"
-msgstr ""
+msgstr "Obtiene la lista de módulos de un usuario"
 
 #: controlpanel.cpp:1615
 msgid "<username> <network> <modulename> [args]"
-msgstr ""
+msgstr "<usuario> <red> <nombremodulo> [args]"
 
 #: controlpanel.cpp:1616
 msgid "Loads a Module for a network"
-msgstr ""
+msgstr "Carga un módulo para una red"
 
 #: controlpanel.cpp:1619
 msgid "<username> <network> <modulename>"
-msgstr ""
+msgstr "<usuario> <red> <nombremodulo>"
 
 #: controlpanel.cpp:1620
 msgid "Removes a Module of a network"
-msgstr ""
+msgstr "Elimina el módulo de una red"
 
 #: controlpanel.cpp:1623
 msgid "Get the list of modules for a network"
-msgstr ""
+msgstr "Obtiene la lista de módulos de una red"
 
 #: controlpanel.cpp:1626
 msgid "List the configured CTCP replies"
-msgstr ""
+msgstr "Muestra las respuestas CTCP configuradas"
 
 #: controlpanel.cpp:1628
 msgid "<username> <ctcp> [reply]"
-msgstr ""
+msgstr "<usuario> <ctcp> [respuesta]"
 
 #: controlpanel.cpp:1629
 msgid "Configure a new CTCP reply"
-msgstr ""
+msgstr "Configura una nueva respuesta CTCP"
 
 #: controlpanel.cpp:1631
 msgid "<username> <ctcp>"
-msgstr ""
+msgstr "<usuario> <ctcp>"
 
 #: controlpanel.cpp:1632
 msgid "Remove a CTCP reply"
-msgstr ""
+msgstr "Elimina una respuesta CTCP"
 
 #: controlpanel.cpp:1636 controlpanel.cpp:1639
 msgid "[username] <network>"
-msgstr ""
+msgstr "[usuario] <red>"
 
 #: controlpanel.cpp:1637
 msgid "Add a network for a user"
-msgstr ""
+msgstr "Añade una red a un usuario"
 
 #: controlpanel.cpp:1640
 msgid "Delete a network for a user"
-msgstr ""
+msgstr "Borra la red de un usuario"
 
 #: controlpanel.cpp:1642
 msgid "[username]"
-msgstr ""
+msgstr "[usuario]"
 
 #: controlpanel.cpp:1643
 msgid "List all networks for a user"
-msgstr ""
+msgstr "Muestra las redes de un usuario"
 
 #: controlpanel.cpp:1656
 msgid ""
 "Dynamic configuration through IRC. Allows editing only yourself if you're "
 "not ZNC admin."
 msgstr ""
+"Configuración dinámica a través de IRC. Permite la edición solo sobre ti si "
+"no eres un admin de ZNC."
diff --git a/modules/po/ctcpflood.es_ES.po b/modules/po/ctcpflood.es_ES.po
index 37659fe8..091315bb 100644
--- a/modules/po/ctcpflood.es_ES.po
+++ b/modules/po/ctcpflood.es_ES.po
@@ -43,13 +43,13 @@ msgstr "Uso: Lines <límite>"
 #: ctcpflood.cpp:125
 msgid "1 CTCP message"
 msgid_plural "{1} CTCP messages"
-msgstr[0] ""
+msgstr[0] "1 mensaje CTCP"
 msgstr[1] "{1} mensajes CTCP"
 
 #: ctcpflood.cpp:127
 msgid "every second"
 msgid_plural "every {1} seconds"
-msgstr[0] ""
+msgstr[0] "cada segundo"
 msgstr[1] "cada {1} segundos"
 
 #: ctcpflood.cpp:129
diff --git a/modules/po/flooddetach.es_ES.po b/modules/po/flooddetach.es_ES.po
index 459918f5..b9f22249 100644
--- a/modules/po/flooddetach.es_ES.po
+++ b/modules/po/flooddetach.es_ES.po
@@ -43,13 +43,13 @@ msgstr "El canal {1} ha sido inundado, has sido separado"
 #: flooddetach.cpp:187
 msgid "1 line"
 msgid_plural "{1} lines"
-msgstr[0] ""
+msgstr[0] "1 línea"
 msgstr[1] "{1} líneas"
 
 #: flooddetach.cpp:188
 msgid "every second"
 msgid_plural "every {1} seconds"
-msgstr[0] ""
+msgstr[0] "cada segundo"
 msgstr[1] "cada {1} segundos"
 
 #: flooddetach.cpp:190
diff --git a/modules/po/kickrejoin.es_ES.po b/modules/po/kickrejoin.es_ES.po
index a21cfed9..f87b385c 100644
--- a/modules/po/kickrejoin.es_ES.po
+++ b/modules/po/kickrejoin.es_ES.po
@@ -35,8 +35,8 @@ msgstr "Tiempos de espera en negativo no tienen sentido!"
 #: kickrejoin.cpp:98
 msgid "Rejoin delay set to 1 second"
 msgid_plural "Rejoin delay set to {1} seconds"
-msgstr[0] ""
-msgstr[1] "Tiempo de espera de rejoin establecido a {1} segundos"
+msgstr[0] "Tiempo de espera de reentrada establecido a 1 segundo"
+msgstr[1] "Tiempo de espera de reentrada establecido a {1} segundos"
 
 #: kickrejoin.cpp:101
 msgid "Rejoin delay disabled"
@@ -45,7 +45,7 @@ msgstr "Tiempo de espera de rejoin desactivado"
 #: kickrejoin.cpp:106
 msgid "Rejoin delay is set to 1 second"
 msgid_plural "Rejoin delay is set to {1} seconds"
-msgstr[0] ""
+msgstr[0] "Tiempo de espera de reentrada establecido a 1 segundo"
 msgstr[1] "Tiempo de espera de rejoin establecido a {1} segundos"
 
 #: kickrejoin.cpp:109
diff --git a/modules/po/log.es_ES.po b/modules/po/log.es_ES.po
index a8cbef2b..29548df5 100644
--- a/modules/po/log.es_ES.po
+++ b/modules/po/log.es_ES.po
@@ -55,7 +55,7 @@ msgstr "No hay reglas de logueo. Se registra todo."
 #: log.cpp:161
 msgid "1 rule removed: {2}"
 msgid_plural "{1} rules removed: {2}"
-msgstr[0] ""
+msgstr[0] "Borrada regla: {2}"
 msgstr[1] "Borradas {1} reglas: {2}"
 
 #: log.cpp:168 log.cpp:173
diff --git a/modules/po/sample.es_ES.po b/modules/po/sample.es_ES.po
index 2749d997..c5e6480c 100644
--- a/modules/po/sample.es_ES.po
+++ b/modules/po/sample.es_ES.po
@@ -46,74 +46,74 @@ msgstr "Has sido desconectado."
 
 #: sample.cpp:116
 msgid "{1} {2} set mode on {3} {4}{5} {6}"
-msgstr ""
+msgstr "{1} {2} cambia modo en {3} {4}{5} {6}"
 
 #: sample.cpp:123
 msgid "{1} {2} opped {3} on {4}"
-msgstr ""
+msgstr "{1} {2} da op a {3} en {4}"
 
 #: sample.cpp:129
 msgid "{1} {2} deopped {3} on {4}"
-msgstr ""
+msgstr "{1} {2} quita op a {3} en {4}"
 
 #: sample.cpp:135
 msgid "{1} {2} voiced {3} on {4}"
-msgstr ""
+msgstr "{1} {2} da voz a {3} en {4}"
 
 #: sample.cpp:141
 msgid "{1} {2} devoiced {3} on {4}"
-msgstr ""
+msgstr "{1} {2} quita voz a {3} en {4}"
 
 #: sample.cpp:147
 msgid "* {1} sets mode: {2} {3} on {4}"
-msgstr ""
+msgstr "* {1} cambia modo: {2} {3} en {4}"
 
 #: sample.cpp:163
 msgid "{1} kicked {2} from {3} with the msg {4}"
-msgstr ""
+msgstr "{1} ha expulsado a {2} de {3} por {4}"
 
 #: sample.cpp:169
 msgid "* {1} ({2}@{3}) quits ({4}) from channel: {6}"
 msgid_plural "* {1} ({2}@{3}) quits ({4}) from {5} channels: {6}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "* {1} ({2}@{3}) se desconecta ({4}) del canal: {6}"
+msgstr[1] "* {1} ({2}@{3}) se desconecta ({4}) de {5} canales: {6}"
 
 #: sample.cpp:177
 msgid "Attempting to join {1}"
-msgstr ""
+msgstr "Intentando entrar {1}"
 
 #: sample.cpp:182
 msgid "* {1} ({2}@{3}) joins {4}"
-msgstr ""
+msgstr "* {1} ({2}@{3}) entra {4}"
 
 #: sample.cpp:189
 msgid "* {1} ({2}@{3}) parts {4}"
-msgstr ""
+msgstr "* {1} ({2}@{3}) sale {4}"
 
 #: sample.cpp:196
 msgid "{1} invited us to {2}, ignoring invites to {2}"
-msgstr ""
+msgstr "{1} te invita a {2}, ignorando invites a {2}"
 
 #: sample.cpp:201
 msgid "{1} invited us to {2}"
-msgstr ""
+msgstr "{1} te invita a {2}"
 
 #: sample.cpp:207
 msgid "{1} is now known as {2}"
-msgstr ""
+msgstr "{1} es ahora {2}"
 
 #: sample.cpp:269 sample.cpp:276
 msgid "{1} changes topic on {2} to {3}"
-msgstr ""
+msgstr "{1} cambia el topic de {2} a {3}"
 
 #: sample.cpp:317
 msgid "Hi, I'm your friendly sample module."
-msgstr ""
+msgstr "Hola, soy tu módulo amigable de muestra."
 
 #: sample.cpp:330
 msgid "Description of module arguments goes here."
-msgstr ""
+msgstr "La descripción de los argumentos del módulo va aquí."
 
 #: sample.cpp:333
 msgid "To be used as a sample for writing modules"
-msgstr ""
+msgstr "Para ser usado como muestra para escribir módulos"
diff --git a/modules/po/simple_away.es_ES.po b/modules/po/simple_away.es_ES.po
index 3078f283..cdbee958 100644
--- a/modules/po/simple_away.es_ES.po
+++ b/modules/po/simple_away.es_ES.po
@@ -60,7 +60,7 @@ msgstr "El motivo de ausencia quedaría como: {1}"
 #: simple_away.cpp:144
 msgid "Current timer setting: 1 second"
 msgid_plural "Current timer setting: {1} seconds"
-msgstr[0] ""
+msgstr[0] "Tiempo establecido: 1 segundo"
 msgstr[1] "Tiempo establecido: {1} segundos"
 
 #: simple_away.cpp:153 simple_away.cpp:161
@@ -70,7 +70,7 @@ msgstr "Temporizador deshabilitado"
 #: simple_away.cpp:155
 msgid "Timer set to 1 second"
 msgid_plural "Timer set to: {1} seconds"
-msgstr[0] ""
+msgstr[0] "Temporizador establecido a 1 segundo"
 msgstr[1] "Temporizador establecido a {1} segundos"
 
 #: simple_away.cpp:166
diff --git a/modules/po/watch.es_ES.po b/modules/po/watch.es_ES.po
index 3ad172a0..813745de 100644
--- a/modules/po/watch.es_ES.po
+++ b/modules/po/watch.es_ES.po
@@ -14,236 +14,238 @@ msgstr ""
 
 #: watch.cpp:334
 msgid "All entries cleared."
-msgstr ""
+msgstr "Todas las entradas eliminadas."
 
 #: watch.cpp:344
 msgid "Buffer count is set to {1}"
-msgstr ""
+msgstr "Límite de búfer configurada a {1}"
 
 #: watch.cpp:348
 msgid "Unknown command: {1}"
-msgstr ""
+msgstr "Comando desconocido: {1}"
 
 #: watch.cpp:397
 msgid "Disabled all entries."
-msgstr ""
+msgstr "Deshabilitadas todas las entradas."
 
 #: watch.cpp:398
 msgid "Enabled all entries."
-msgstr ""
+msgstr "Habilitadas todas las entradas."
 
 #: watch.cpp:405 watch.cpp:437 watch.cpp:470 watch.cpp:570 watch.cpp:585
 msgid "Invalid Id"
-msgstr ""
+msgstr "Id no válido"
 
 #: watch.cpp:414
 msgid "Id {1} disabled"
-msgstr ""
+msgstr "Id {1} deshabilitado"
 
 #: watch.cpp:416
 msgid "Id {1} enabled"
-msgstr ""
+msgstr "Id {1} habilitado"
 
 #: watch.cpp:428
 msgid "Set DetachedClientOnly for all entries to Yes"
-msgstr ""
+msgstr "Define DetachedClientOnly para todas las entradas a Yes"
 
 #: watch.cpp:430
 msgid "Set DetachedClientOnly for all entries to No"
-msgstr ""
+msgstr "Define DetachedClientOnly para todas las entradas a No"
 
 #: watch.cpp:446 watch.cpp:479
 msgid "Id {1} set to Yes"
-msgstr ""
+msgstr "Id {1} ajustado a Sí"
 
 #: watch.cpp:448 watch.cpp:481
 msgid "Id {1} set to No"
-msgstr ""
+msgstr "Id {1} ajustado a No"
 
 #: watch.cpp:461
 msgid "Set DetachedChannelOnly for all entries to Yes"
-msgstr ""
+msgstr "Define DetachedChannelOnly para todas las entradas a Yes"
 
 #: watch.cpp:463
 msgid "Set DetachedChannelOnly for all entries to No"
-msgstr ""
+msgstr "Define DetachedChannelOnly para todas las entradas a No"
 
 #: watch.cpp:487 watch.cpp:503
 msgid "Id"
-msgstr ""
+msgstr "Id"
 
 #: watch.cpp:488 watch.cpp:504
 msgid "HostMask"
-msgstr ""
+msgstr "Máscara"
 
 #: watch.cpp:489 watch.cpp:505
 msgid "Target"
-msgstr ""
+msgstr "Objetivo"
 
 #: watch.cpp:490 watch.cpp:506
 msgid "Pattern"
-msgstr ""
+msgstr "Patrón"
 
 #: watch.cpp:491 watch.cpp:507
 msgid "Sources"
-msgstr ""
+msgstr "Fuentes"
 
 #: watch.cpp:492 watch.cpp:508 watch.cpp:509
 msgid "Off"
-msgstr ""
+msgstr "Desactivado"
 
 #: watch.cpp:493 watch.cpp:511
 msgid "DetachedClientOnly"
-msgstr ""
+msgstr "DetachedClientOnly"
 
 #: watch.cpp:494 watch.cpp:514
 msgid "DetachedChannelOnly"
-msgstr ""
+msgstr "DetachedChannelOnly"
 
 #: watch.cpp:512 watch.cpp:515
 msgid "Yes"
-msgstr ""
+msgstr "Sí"
 
 #: watch.cpp:512 watch.cpp:515
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: watch.cpp:521 watch.cpp:527
 msgid "You have no entries."
-msgstr ""
+msgstr "No tienes entradas."
 
 #: watch.cpp:578
 msgid "Sources set for Id {1}."
-msgstr ""
+msgstr "Fuentes definidas para el id {1}."
 
 #: watch.cpp:593
 msgid "Id {1} removed."
-msgstr ""
+msgstr "Id {1} eliminado."
 
 #: watch.cpp:600 watch.cpp:604 watch.cpp:609 watch.cpp:614 watch.cpp:620
 #: watch.cpp:625 watch.cpp:629 watch.cpp:633 watch.cpp:638 watch.cpp:645
 #: watch.cpp:652 watch.cpp:658 watch.cpp:664
 msgid "Command"
-msgstr ""
+msgstr "Comando"
 
 #: watch.cpp:601 watch.cpp:605 watch.cpp:610 watch.cpp:616 watch.cpp:621
 #: watch.cpp:626 watch.cpp:630 watch.cpp:634 watch.cpp:641 watch.cpp:648
 #: watch.cpp:654 watch.cpp:660 watch.cpp:665
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #: watch.cpp:604
 msgid "Add <HostMask> [Target] [Pattern]"
-msgstr ""
+msgstr "Add <máscara> [objetivo] [patrón]"
 
 #: watch.cpp:606
 msgid "Used to add an entry to watch for."
-msgstr ""
+msgstr "Se usa para añadir una entrada a la lista de watch."
 
 #: watch.cpp:609
 msgid "List"
-msgstr ""
+msgstr "Lista"
 
 #: watch.cpp:611
 msgid "List all entries being watched."
-msgstr ""
+msgstr "Listar todas las entradas vigiladas."
 
 #: watch.cpp:614
 msgid "Dump"
-msgstr ""
+msgstr "Volcado"
 
 #: watch.cpp:617
 msgid "Dump a list of all current entries to be used later."
-msgstr ""
+msgstr "Volcar una lista de todas las entradas para usar luego."
 
 #: watch.cpp:620
 msgid "Del <Id>"
-msgstr ""
+msgstr "Del <Id>"
 
 #: watch.cpp:622
 msgid "Deletes Id from the list of watched entries."
-msgstr ""
+msgstr "Elimina un id de la lista de entradas a vigilar."
 
 #: watch.cpp:625
 msgid "Clear"
-msgstr ""
+msgstr "Borrar"
 
 #: watch.cpp:626
 msgid "Delete all entries."
-msgstr ""
+msgstr "Borrar todas las entradas."
 
 #: watch.cpp:629
 msgid "Enable <Id | *>"
-msgstr ""
+msgstr "Enable <Id | *>"
 
 #: watch.cpp:630
 msgid "Enable a disabled entry."
-msgstr ""
+msgstr "Habilita un entrada deshabilitada."
 
 #: watch.cpp:633
 msgid "Disable <Id | *>"
-msgstr ""
+msgstr "Disable <Id | *>"
 
 #: watch.cpp:635
 msgid "Disable (but don't delete) an entry."
-msgstr ""
+msgstr "Deshabilita (pero no elimina) una entrada."
 
 #: watch.cpp:639
 msgid "SetDetachedClientOnly <Id | *> <True | False>"
-msgstr ""
+msgstr "SetDetachedClientOnly <Id | *> <True | False>"
 
 #: watch.cpp:642
 msgid "Enable or disable detached client only for an entry."
-msgstr ""
+msgstr "Habilita o deshabilita clientes desvinculados solo para una entrada."
 
 #: watch.cpp:646
 msgid "SetDetachedChannelOnly <Id | *> <True | False>"
-msgstr ""
+msgstr "SetDetachedChannelOnly <Id | *> <True | False>"
 
 #: watch.cpp:649
 msgid "Enable or disable detached channel only for an entry."
-msgstr ""
+msgstr "Habilita o deshabilita canales desvinculados solo para una entrada."
 
 #: watch.cpp:652
 msgid "Buffer [Count]"
-msgstr ""
+msgstr "Búfer [Count]"
 
 #: watch.cpp:655
 msgid "Show/Set the amount of buffered lines while detached."
 msgstr ""
+"Muestra/define la cantidad de líneas almacenadas en búfer mientras se está "
+"desvinculado."
 
 #: watch.cpp:659
 msgid "SetSources <Id> [#chan priv #foo* !#bar]"
-msgstr ""
+msgstr "SetSources <Id> [#canal privado #canal* !#canal]"
 
 #: watch.cpp:661
 msgid "Set the source channels that you care about."
-msgstr ""
+msgstr "Establece los canales fuente a controlar."
 
 #: watch.cpp:664
 msgid "Help"
-msgstr ""
+msgstr "Ayuda"
 
 #: watch.cpp:665
 msgid "This help."
-msgstr ""
+msgstr "Esta ayuda."
 
 #: watch.cpp:681
 msgid "Entry for {1} already exists."
-msgstr ""
+msgstr "La entrada para {1} ya existe."
 
 #: watch.cpp:689
 msgid "Adding entry: {1} watching for [{2}] -> {3}"
-msgstr ""
+msgstr "Añadiendo entrada: {1} controlando {2} -> {3}"
 
 #: watch.cpp:695
 msgid "Watch: Not enough arguments.  Try Help"
-msgstr ""
+msgstr "Watch: no hay suficientes argumentos, Prueba Help"
 
 #: watch.cpp:764
 msgid "WARNING: malformed entry found while loading"
-msgstr ""
+msgstr "ATENCIÓN: entrada no válida encontrada durante la carga"
 
 #: watch.cpp:778
 msgid "Copy activity from a specific user into a separate window"
-msgstr ""
+msgstr "Copia la actividad de un usuario específico en una ventana separada"
diff --git a/src/Client.cpp b/src/Client.cpp
index cec976c5..c0efd628 100644
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -103,7 +103,8 @@ void CClient::ReadLine(const CString& sData) {
     CLanguageScope user_lang(GetUser() ? GetUser()->GetLanguage() : "");
     CString sLine = sData;
 
-    sLine.TrimRight("\n\r");
+    sLine.Replace("\n", "");
+    sLine.Replace("\r", "");
 
     DEBUG("(" << GetFullName() << ") CLI -> ZNC ["
         << CDebug::Filter(sLine) << "]");
diff --git a/src/Config.cpp b/src/Config.cpp
index 2543d6ee..0730b894 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -174,9 +174,14 @@ bool CConfig::Parse(CFile& file, CString& sErrorMsg) {
 void CConfig::Write(CFile& File, unsigned int iIndentation) {
     CString sIndentation = CString(iIndentation, '\t');
 
+    auto SingleLine = [](const CString& s) {
+        return s.Replace_n("\r", "").Replace_n("\n", "");
+    };
+
     for (const auto& it : m_ConfigEntries) {
         for (const CString& sValue : it.second) {
-            File.Write(sIndentation + it.first + " = " + sValue + "\n");
+            File.Write(SingleLine(sIndentation + it.first + " = " + sValue) +
+                       "\n");
         }
     }
 
@@ -184,9 +189,11 @@ void CConfig::Write(CFile& File, unsigned int iIndentation) {
         for (const auto& it2 : it.second) {
             File.Write("\n");
 
-            File.Write(sIndentation + "<" + it.first + " " + it2.first + ">\n");
+            File.Write(SingleLine(sIndentation + "<" + it.first + " " +
+                                  it2.first + ">") +
+                       "\n");
             it2.second.m_pSubConfig->Write(File, iIndentation + 1);
-            File.Write(sIndentation + "</" + it.first + ">\n");
+            File.Write(SingleLine(sIndentation + "</" + it.first + ">") + "\n");
         }
     }
 }
diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp
index e9db5447..259881dc 100644
--- a/src/IRCSock.cpp
+++ b/src/IRCSock.cpp
@@ -156,7 +156,8 @@ void CIRCSock::Quit(const CString& sQuitMsg) {
 void CIRCSock::ReadLine(const CString& sData) {
     CString sLine = sData;
 
-    sLine.TrimRight("\n\r");
+    sLine.Replace("\n", "");
+    sLine.Replace("\r", "");
 
     DEBUG("(" << m_pNetwork->GetUser()->GetUserName() << "/"
               << m_pNetwork->GetName() << ") IRC -> ZNC [" << sLine << "]");
diff --git a/src/WebModules.cpp b/src/WebModules.cpp
index 19ece50a..a5841987 100644
--- a/src/WebModules.cpp
+++ b/src/WebModules.cpp
@@ -557,13 +557,15 @@ CWebSock::EPageReqResult CWebSock::PrintTemplate(const CString& sPageName,
 }
 
 CString CWebSock::GetSkinPath(const CString& sSkinName) {
-    CString sRet = CZNC::Get().GetZNCPath() + "/webskins/" + sSkinName;
+    const CString sSkin = sSkinName.Replace_n("/", "_").Replace_n(".", "_");
+
+    CString sRet = CZNC::Get().GetZNCPath() + "/webskins/" + sSkin;
 
     if (!CFile::IsDir(sRet)) {
-        sRet = CZNC::Get().GetCurPath() + "/webskins/" + sSkinName;
+        sRet = CZNC::Get().GetCurPath() + "/webskins/" + sSkin;
 
         if (!CFile::IsDir(sRet)) {
-            sRet = CString(_SKINDIR_) + "/" + sSkinName;
+            sRet = CString(_SKINDIR_) + "/" + sSkin;
         }
     }
 
diff --git a/src/po/znc.es_ES.po b/src/po/znc.es_ES.po
index 8ca0f565..101ffb55 100644
--- a/src/po/znc.es_ES.po
+++ b/src/po/znc.es_ES.po
@@ -262,13 +262,13 @@ msgstr "Uso: /attach <#canales>"
 #: Client.cpp:1336 Client.cpp:1358 ClientCommand.cpp:129 ClientCommand.cpp:151
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
-msgstr[0] ""
+msgstr[0] "Hay {1} canal que coincide con [{2}]"
 msgstr[1] "Hay {1} canales que coinciden con [{2}]"
 
 #: Client.cpp:1339 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
-msgstr[0] ""
+msgstr[0] "Vinculado a {1} canal"
 msgstr[1] "Unido a {1} canales"
 
 #: Client.cpp:1351
@@ -278,7 +278,7 @@ msgstr "Uso: /detach <#canales>"
 #: Client.cpp:1361 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
-msgstr[0] ""
+msgstr[0] "Desvinculado {1} canal"
 msgstr[1] "Separados {1} canales"
 
 #: Chan.cpp:638
@@ -321,7 +321,7 @@ msgstr "No se ha encontrado el módulo {1}"
 
 #: Modules.cpp:1659
 msgid "Module {1} does not support module type {2}."
-msgstr ""
+msgstr "El módulo {1} no soporta el tipo de módulo {2}."
 
 #: Modules.cpp:1666
 msgid "Module {1} requires a user."
@@ -1045,7 +1045,7 @@ msgstr "Uso: ClearBuffer <#canal|privado>"
 #: ClientCommand.cpp:1395
 msgid "{1} buffer matching {2} has been cleared"
 msgid_plural "{1} buffers matching {2} have been cleared"
-msgstr[0] ""
+msgstr[0] "{1} búfer coincidente con {2} ha sido borrado"
 msgstr[1] "{1} búfers coincidentes con {2} han sido borrados"
 
 #: ClientCommand.cpp:1408