diff --git a/po/es.po b/po/es.po
index 180301ab6..5d5faca65 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,15 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 4.7.4\n"
-"Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2010-11-01 15:58+0200\n"
-"PO-Revision-Date: 2010-07-09 11:00+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-04 12:12+0100\n"
+"PO-Revision-Date: 2010-11-04 12:15+0100\n"
 "Last-Translator: David Martín <dmartina@excite.com\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #, c-format
@@ -233,13 +233,11 @@ msgstr "Tecla F23"
 msgid "Function key 24"
 msgstr "Tecla F24"
 
-#, fuzzy
 msgid "A1 key"
-msgstr "Tecla Fin"
+msgstr "Tecla A1"
 
-#, fuzzy
 msgid "C1 key"
-msgstr "Tecla Fin"
+msgstr "Tecla C1"
 
 msgid "Plus"
 msgstr "Suma"
@@ -340,6 +338,10 @@ msgstr "Contrabarra"
 msgid "Number sign #"
 msgstr "Sostenido"
 
+#. TRANSLATORS: Please translate as in "at sign" (@).
+msgid "At sign"
+msgstr "@"
+
 msgid "Ctrl"
 msgstr "Ctrl"
 
@@ -452,13 +454,13 @@ msgstr "El cache para %s ha expirado"
 msgid "Starting linear transfer..."
 msgstr "Iniciando transferencia en línea..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s: %s %3d%% (%ju bytes transferred)"
-msgstr "%s: %s: %s %3d%% (%lu bytes transferidos)"
+msgstr "%s: %s: %s %3d%% (%ju bytes transferidos)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s: %s %ju bytes transferred"
-msgstr "%s: %s: %s %lu bytes transferidos"
+msgstr "%s: %s: %s %ju bytes transferidos"
 
 msgid "Getting file"
 msgstr "Trayendo archivo"
@@ -530,9 +532,9 @@ msgstr "fish: guardar %s: enviando comando..."
 msgid "fish: Local read failed, sending zeros"
 msgstr "fish: Fallo de lectura local, enviando ceros"
 
-#, fuzzy, c-format
+#, c-format
 msgid "fish: storing %s %d (%ju)"
-msgstr "fish: guardando %s %d (%lu)"
+msgstr "fish: guardando %s %d (%ju)"
 
 msgid "zeros"
 msgstr "ceros"
@@ -644,9 +646,9 @@ msgstr "(chdir)"
 msgid "ftpfs: failed; nowhere to fallback to"
 msgstr "ftpfs: Falló; no hay dónde replegarse"
 
-#, fuzzy, c-format
+#, c-format
 msgid "ftpfs: storing file %ju (%ju)"
-msgstr "ftpfs: Guardando archivo %lu (%lu)"
+msgstr "ftpfs: Guardando archivo %ju (%ju)"
 
 msgid ""
 "~/.netrc file has incorrect mode\n"
@@ -927,7 +929,6 @@ msgid "Show mc with specified skin"
 msgstr "Mostrar mc con la careta (skin) indicada"
 
 #. TRANSLATORS: don't translate keywords and names of colors
-#, fuzzy
 msgid ""
 "--colors KEYWORD={FORE},{BACK}\n"
 "\n"
@@ -948,13 +949,12 @@ msgstr ""
 "{FRENTE} y {FONDO} se pueden omitir y se utilizará el valor estándar\n"
 "\n"
 "Contextos:\n"
-"   Globales:           errors, reverse, gauge, viewunderline\n"
+"   Globales:           errors, disabled, reverse, gauge, viewunderline\n"
 "                       input, inputmark, inputunchanged, commandlinemark\n"
 "   Visor de archivos:  normal, selected, marked, markselect\n"
-"   Diálogos:           dnormal, dfocus, dhotnormal, dhotfocus,\n"
-"                       errdhotnormal, errdhotfocus\n"
-"   Menús:              menunormal, menuhot, menusel, menuhotsel, "
-"menuinactive\n"
+"   Diálogos:           dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n"
+"                       errdhotfocus\n"
+"   Menús:              menunormal, menuhot, menusel, menuhotsel, menuinactive\n"
 "   Editor:             editnormal, editbold, editmarked, editwhitespace,\n"
 "                       editlinestate\n"
 
@@ -1076,7 +1076,6 @@ msgstr "Confirmación"
 msgid "Confirmation|&History cleanup"
 msgstr "borrar &Historia"
 
-#, fuzzy
 msgid "Confirmation|Di&rectory hotlist delete"
 msgstr "borrar &Favoritos"
 
@@ -1192,9 +1191,8 @@ msgstr "Usuario:"
 msgid "Password for \\\\%s\\%s"
 msgstr "Contraseña para \\\\%s\\%s"
 
-#, fuzzy
 msgid "Warning: cannot load codepages list"
-msgstr "Atención: imposible abrir el directorio %s\n"
+msgstr "Atención: imposible cargar lista de codificaciones"
 
 msgid "7-bit ASCII"
 msgstr "ASCII (7 bit)"
@@ -1637,7 +1635,7 @@ msgid "Cannot read directory contents"
 msgstr "Imposible leer directorio"
 
 msgid "Choose syntax highlighting"
-msgstr "Coloreado de sintaxis"
+msgstr "Sintaxis coloreada"
 
 msgid "< Auto >"
 msgstr "< Auto >"
@@ -1648,20 +1646,16 @@ msgstr "< Releer sintaxis >"
 msgid "About"
 msgstr "Acerca de..."
 
-#, fuzzy
 msgid ""
 "Copyright (C) 1996-2010 the Free Software Foundation\n"
 "\n"
 "            A user friendly text editor\n"
 "         written for the Midnight Commander"
 msgstr ""
+"Copyright (C) 1996-2010 the Free Software Foundation\n"
 "\n"
-"                Cooledit  v3.11.5\n"
-"\n"
-" Copyright (C) 1996 the Free Software Foundation\n"
-"\n"
-"       Un editor de texto amigable escrito\n"
-"           para el Midnight Commander.\n"
+"            Un editor de texto amigable\n"
+"              para Midnight Commander"
 
 #, c-format
 msgid "Cannot open %s for reading"
@@ -2069,9 +2063,8 @@ msgstr "&Numeración de líneas"
 msgid "Go to matching &bracket"
 msgstr "buscar pare&Ja del operador"
 
-#, fuzzy
 msgid "Toggle s&yntax highlighting"
-msgstr "Coloreado de sintaxis"
+msgstr "poner/quitar sinta&Xis"
 
 msgid "&Find declaration"
 msgstr "buscar &Declaración"
@@ -2134,7 +2127,7 @@ msgid "Learn &keys..."
 msgstr "redefinir &Teclas..."
 
 msgid "Syntax &highlighting..."
-msgstr "coloreado de sinta&Xis..."
+msgstr "sinta&Xis coloreada..."
 
 msgid "S&yntax file"
 msgstr "editar archivo de &Sintaxis"
@@ -2828,6 +2821,9 @@ msgstr "saltar &Ocultos"
 msgid "&All charsets"
 msgstr "cualquier co&Dificación"
 
+msgid "Searc&h for content"
+msgstr "buscar co&Ntenido"
+
 msgid "Case sens&itive"
 msgstr "distinguir &May/min"