diff --git a/po/ChangeLog b/po/ChangeLog
index 6d1baaac34443ec36d4294f6bafd31c7deb99d45..43993913354ac7b0ebedb9323ac903c9e00b6a69 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,5 +1,7 @@
 2006-03-21  Daichi Kawahata <daichi@xfce.org>
 
+	* es.po: Updated Spanish translations by Miguel Angel Ruiz
+	  Manzano <debianized@gmail.com>.
 	* ja.po: Updated Japanese translations.
 	* nl.po: Updated Dutch translations by Vincent Tunru
 	  <imnotb@gmail.com>.
diff --git a/po/es.po b/po/es.po
index 5a83889a9d2023ed69cbde22e1ed2041a7d7024a..b8e465d4a937ea707da913033de00b2f1511f5c4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,8 @@
 # Spanish translations for Thunar.
 # Copyright (C) 2004-2006 Benedikt Meurer.
 # This file is distributed under the same license as the Thunar package.
-# Pablo Hernández-M. Saiz <homeless3d@gmail.com>, 2005
+# Pablo Hernández-M. Saiz <homeless3d@gmail.com>, 2005.
+# Miguel Angel Ruiz Manzano <debianized@gmail.com>, 2006.
 #
 msgid ""
 msgstr ""
@@ -9,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-03-21 22:27+0900\n"
 "PO-Revision-Date: 2005-10-14 23:57+0900\n"
-"Last-Translator: Pablo Hernández-M. Saiz <homeless3d@gmail.com>\n"
+"Last-Translator: Miguel Angel Ruiz Manzano <debianized@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -65,7 +66,7 @@ msgstr "Imposible renombrar %s."
 #, c-format
 msgid ""
 "The file \"%s\" already exists. Do you want to replace it with an empty file?"
-msgstr ""
+msgstr "El archivo \"%s\" existe. ¿Desea reemplazarlo?"
 
 #. ask the user whether to skip this path
 #: ../thunar-vfs/thunar-vfs-creat-job.c:199
@@ -100,7 +101,7 @@ msgstr ""
 #: ../thunar-vfs/thunar-vfs-volume-hal.c:436
 #: ../thunar-vfs/thunar-vfs-volume-hal.c:476
 msgid "Unknown error"
-msgstr ""
+msgstr "Error desconocido"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
 #: ../thunar-vfs/thunar-vfs-info.c:381
@@ -160,7 +161,7 @@ msgstr ""
 
 #: ../thunar-vfs/thunar-vfs-mime-handler.c:134
 msgid "Command"
-msgstr ""
+msgstr "Comando"
 
 #: ../thunar-vfs/thunar-vfs-mime-handler.c:135
 msgid "The command to run the mime handler"
@@ -402,7 +403,7 @@ msgstr "Imposible renombrar %s."
 #: ../thunar/main.c:101
 #, fuzzy, c-format
 msgid "Thunar: %s\n"
-msgstr "Thunar"
+msgstr "Thunar: %s\n"
 
 #. display an error message to the user
 #: ../thunar/thunar-application.c:334
@@ -470,7 +471,7 @@ msgstr ""
 #: ../thunar/thunar-chooser-button.c:514
 #, fuzzy
 msgid "_Other Application..."
-msgstr "Otra aplicación..."
+msgstr "_Otra Aplicación..."
 
 #: ../thunar/thunar-chooser-dialog.c:216 ../thunar/thunar-launcher.c:123
 msgid "Open With"
@@ -479,24 +480,26 @@ msgstr "Abrir con"
 #. create the "Custom command" expand
 #: ../thunar/thunar-chooser-dialog.c:280
 msgid "Use a _custom command:"
-msgstr ""
+msgstr "Ocupar un _determinado comando:"
 
 #: ../thunar/thunar-chooser-dialog.c:281
 msgid ""
 "Use a custom command for an application that is not available from the above "
 "application list."
 msgstr ""
+"Use un comando determinado para una aplicación que no se encuentre "
+"disponible dentro de la siguiente lista de aplicaciones."
 
 #. create the "Custom command" button
 #: ../thunar/thunar-chooser-dialog.c:300
 #, fuzzy
 msgid "_Browse..."
-msgstr "_Cerrar"
+msgstr "_Buscar..."
 
 #. create the "Use as default for this kind of file" button
 #: ../thunar/thunar-chooser-dialog.c:306
 msgid "Use as _default for this kind of file"
-msgstr ""
+msgstr "Ocupar como comando por _defecto para este tipo de archivo"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:488
@@ -514,7 +517,7 @@ msgstr "Imposible renombrar %s."
 #: ../thunar/thunar-chooser-dialog.c:650
 #, c-format
 msgid "Open <i>%s</i> and other files of type \"%s\" with:"
-msgstr ""
+msgstr "Abrir <i>%s</i> y otros archivos del tipo \"%s\" con: "
 
 #. update the "Browse..." tooltip
 #: ../thunar/thunar-chooser-dialog.c:657
@@ -522,6 +525,8 @@ msgstr ""
 msgid ""
 "Browse the file system to select an application to open files of type \"%s\"."
 msgstr ""
+"Buscar en el sistema de archivos y seleccionar una aplicación para abrir "
+"archivos del tipo \"%s\"."
 
 #. update the "Use as default for this kind of file" tooltip
 #: ../thunar/thunar-chooser-dialog.c:663
@@ -530,45 +535,47 @@ msgid ""
 "Change the default application for files of type \"%s\" to the selected "
 "application."
 msgstr ""
+"Cambiar la aplicación por defecto para archivos del tipo \"%s\" ala "
+"aplicación elegida."
 
 #: ../thunar/thunar-chooser-dialog.c:684
 #: ../plugins/thunar-uca/thunar-uca-editor.c:491
 #, fuzzy
 msgid "Select an Application"
-msgstr "Otra aplicación..."
+msgstr "Seleccionar otra Aplicación..."
 
 #: ../thunar/thunar-chooser-dialog.c:694
 #: ../plugins/thunar-uca/thunar-uca-editor.c:501
 #: ../plugins/thunar-uca/thunar-uca-editor.c:660
 #, fuzzy
 msgid "All Files"
-msgstr "Archivos"
+msgstr "Todos los Archivos"
 
 #: ../thunar/thunar-chooser-dialog.c:699
 #: ../plugins/thunar-uca/thunar-uca-editor.c:506
 #, fuzzy
 msgid "Executable Files"
-msgstr "Seleccionar _todos los archivos"
+msgstr "Archivos Ejecutables"
 
 #: ../thunar/thunar-chooser-dialog.c:714
 #: ../plugins/thunar-uca/thunar-uca-editor.c:521
 msgid "Perl Scripts"
-msgstr ""
+msgstr "Scripts en Perl"
 
 #: ../thunar/thunar-chooser-dialog.c:720
 #: ../plugins/thunar-uca/thunar-uca-editor.c:527
 msgid "Python Scripts"
-msgstr ""
+msgstr "Scripts en Python"
 
 #: ../thunar/thunar-chooser-dialog.c:726
 #: ../plugins/thunar-uca/thunar-uca-editor.c:533
 msgid "Ruby Scripts"
-msgstr ""
+msgstr "Scripts en Ruby"
 
 #: ../thunar/thunar-chooser-dialog.c:732
 #: ../plugins/thunar-uca/thunar-uca-editor.c:539
 msgid "Shell Scripts"
-msgstr ""
+msgstr "Scripts en Shell"
 
 #: ../thunar/thunar-chooser-model.c:339
 msgid "None available"
@@ -578,7 +585,7 @@ msgstr ""
 #: ../thunar/thunar-chooser-model.c:383
 #, fuzzy
 msgid "Recommended Applications"
-msgstr "Otra aplicación..."
+msgstr "Aplicaciones Recomendadas..."
 
 #. append the "Other Applications:" category
 #: ../thunar/thunar-chooser-model.c:386
@@ -597,7 +604,7 @@ msgstr ""
 
 #: ../thunar/thunar-column-editor.c:164
 msgid "Visible Columns"
-msgstr ""
+msgstr "Columnas Visibles"
 
 #. create the top label for the column editor dialog
 #: ../thunar/thunar-column-editor.c:177
@@ -609,23 +616,23 @@ msgstr ""
 #. create the "Move Up" button
 #: ../thunar/thunar-column-editor.c:218
 msgid "Move _Up"
-msgstr ""
+msgstr "Mover hacia _Arriba"
 
 #. create the "Move Down" button
 #: ../thunar/thunar-column-editor.c:228
 msgid "Move Dow_n"
-msgstr ""
+msgstr "Moven hacia _Abajo"
 
 #. create the "Show" button
 #: ../thunar/thunar-column-editor.c:238
 msgid "_Show"
-msgstr ""
+msgstr "_Mostrar"
 
 #. create the "Hide" button
 #: ../thunar/thunar-column-editor.c:244
 #, fuzzy
 msgid "Hi_de"
-msgstr "_Oculto/a"
+msgstr "_Ocultar"
 
 #. create the "Use Default" button
 #: ../thunar/thunar-column-editor.c:255
@@ -648,7 +655,7 @@ msgstr ""
 #. create the "Automatically expand columns as needed" button
 #: ../thunar/thunar-column-editor.c:286
 msgid "Automatically _expand columns as needed"
-msgstr ""
+msgstr "Automáticamente _expandir las columnas según se requiera"
 
 #: ../thunar/thunar-column-model.c:894 ../thunar/thunar-list-model.c:702
 #: ../thunar/thunar-list-model.c:731
@@ -658,7 +665,7 @@ msgstr ""
 
 #: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2242
 msgid "Enter the new name:"
-msgstr ""
+msgstr "Ingrese el nuevo nombre"
 
 #. display an error message
 #: ../thunar/thunar-create-dialog.c:523
@@ -777,7 +784,7 @@ msgstr "Raíz"
 #. create the "back" action
 #: ../thunar/thunar-history.c:179
 msgid "Back"
-msgstr ""
+msgstr "Atrás"
 
 #: ../thunar/thunar-history.c:179
 msgid "Go to the previous visited folder"
@@ -786,7 +793,7 @@ msgstr ""
 #. create the "forward" action
 #: ../thunar/thunar-history.c:184
 msgid "Forward"
-msgstr ""
+msgstr "Adelante"
 
 #: ../thunar/thunar-history.c:184
 msgid "Go to the next visited folder"
@@ -1617,7 +1624,7 @@ msgstr "Menú contextual de carpeta"
 #. append the "Create Folder" menu action
 #: ../thunar/thunar-standard-view.c:306 ../thunar/thunar-tree-view.c:922
 msgid "Create _Folder..."
-msgstr ""
+msgstr "Crear _Carpeta"
 
 #: ../thunar/thunar-standard-view.c:306
 msgid "Create an empty folder within the current folder"
@@ -1626,7 +1633,7 @@ msgstr ""
 #: ../thunar/thunar-standard-view.c:307
 #, fuzzy
 msgid "_Properties..."
-msgstr "_Propiedades"
+msgstr "_Propiedades..."
 
 #: ../thunar/thunar-standard-view.c:307
 #, fuzzy
@@ -1711,7 +1718,7 @@ msgstr "Renombra el elemento seleccionado"
 #. add the "Create Document" sub menu action
 #: ../thunar/thunar-standard-view.c:573
 msgid "Create _Document"
-msgstr ""
+msgstr "Crear _Documento"
 
 #: ../thunar/thunar-standard-view.c:1220
 msgid "Loading folder contents..."
@@ -1900,7 +1907,7 @@ msgstr "_Ver"
 
 #: ../thunar/thunar-window.c:245
 msgid "_Reload"
-msgstr ""
+msgstr "_Actualizar"
 
 #: ../thunar/thunar-window.c:245
 #, fuzzy
@@ -1956,7 +1963,7 @@ msgstr "Abre la carpeta anterior"
 #: ../thunar/thunar-window.c:253
 #, fuzzy
 msgid "_Home"
-msgstr "Casa"
+msgstr "_Inicio"
 
 #: ../thunar/thunar-window.c:253
 #, fuzzy
@@ -1986,7 +1993,7 @@ msgstr "A_yuda"
 
 #: ../thunar/thunar-window.c:257
 msgid "_Contents"
-msgstr ""
+msgstr "_Contenidos"
 
 #: ../thunar/thunar-window.c:257
 msgid "Display Thunar user manual"
@@ -2007,7 +2014,7 @@ msgstr "Mostrar los archivos _ocultos"
 
 #: ../thunar/thunar-window.c:263
 msgid "Toggles the display of hidden files in the current window"
-msgstr ""
+msgstr "Habilita la visibilidad de archivos ocultos en la ventana actual"
 
 #: ../thunar/thunar-window.c:264
 msgid "_Shortcuts"
@@ -2019,7 +2026,7 @@ msgstr ""
 
 #: ../thunar/thunar-window.c:265
 msgid "_Tree"
-msgstr ""
+msgstr "_Árbol"
 
 #: ../thunar/thunar-window.c:265
 msgid "Toggles the visibility of the tree pane"
@@ -2032,7 +2039,7 @@ msgstr "Texto de la barra de estado"
 
 #: ../thunar/thunar-window.c:266
 msgid "Change the visibility of this window's statusbar"
-msgstr ""
+msgstr "Cambia la disposición de la barra de estado de la ventana."
 
 #.
 #. * add the location selector options