diff --git a/po/es.po b/po/es.po
index 092ccbe23..561b62255 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,12 +33,11 @@ msgstr ""
 
 #: capplets/background-properties/app-background.c:13
 msgid "Set background image."
-msgstr ""
+msgstr "Definir la imágen de fondo."
 
 #: capplets/background-properties/app-background.c:13
-#, fuzzy
 msgid "IMAGE-FILE"
-msgstr "IMÁGEN"
+msgstr "ARCHIVO-IMÁGEN"
 
 #: capplets/background-properties/property-background.c:244
 msgid "Disabled"
@@ -283,17 +282,15 @@ msgstr "Editar"
 #. we initialize everything
 #: capplets/mime-type/edit-window.c:238
 msgid "Set actions for "
-msgstr ""
+msgstr "Definir las acciones para "
 
 #: capplets/mime-type/mime-data.c:354
-#, fuzzy
 msgid "Mime Type"
-msgstr "Tipo MIME:"
+msgstr "Tipo Mime"
 
 #: capplets/mime-type/mime-data.c:355
-#, fuzzy
 msgid "Extension"
-msgstr "Extensiones"
+msgstr "Extensión"
 
 #: capplets/mime-type/mime-data.c:449
 msgid "You must enter a mime-type"
@@ -400,7 +397,6 @@ msgid "Extension:"
 msgstr "Extensión:"
 
 #: capplets/mime-type/new-mime-window.c:51
-#, fuzzy
 msgid "Regular Expressions"
 msgstr "Expresiones regulares"
 
@@ -687,22 +683,20 @@ msgid "Always started on every login."
 msgstr "Siempre iniciado en cada sesión."
 
 #: capplets/session-properties/gsm-protocol.c:503
-#, fuzzy
 msgid "Remove Program"
-msgstr "Programa"
+msgstr "Quitar programa"
 
 #: capplets/session-properties/session-properties.c:149
 msgid "Prompt on logout"
-msgstr ""
+msgstr "Preguntar al salir de la sesión"
 
 #: capplets/session-properties/session-properties.c:156
 msgid "Automatically save changes to session"
-msgstr ""
+msgstr "Guardar automáticamente los cambios de la sesión"
 
 #: capplets/session-properties/session-properties.c:183
-#, fuzzy
 msgid "Priority"
-msgstr "Prioridad:"
+msgstr "Prioridad"
 
 #: capplets/session-properties/session-properties.c:184
 #: capplets/url-properties/url-properties.c:71
@@ -711,7 +705,7 @@ msgstr "Comando"
 
 #: capplets/session-properties/session-properties.c:213
 msgid "Browse Currently Running Programs..."
-msgstr ""
+msgstr "Lista de programas ejecutándose actualmente..."
 
 #: capplets/session-properties/session-properties.c:379
 msgid "Only display warnings."
@@ -722,19 +716,21 @@ msgid ""
 "Programs with smaller values are started before programs with higher values. "
 "The default value should be OK"
 msgstr ""
+"Los programas con valores más pequeños serán lanzados antes que aquellos "
+"con valores más grandes. El valor por omisión debería ser funcionar en "
+"la mayoría de los casos"
 
 #: capplets/session-properties/startup-programs.c:338
-#, fuzzy
 msgid "The startup command cannot be empty"
-msgstr "El comando no puede quedar en blanco"
+msgstr "El comando de inicio no puede quedar en blanco"
 
 #: capplets/session-properties/startup-programs.c:378
 msgid "Add Startup Program"
-msgstr ""
+msgstr "Añadir programa de inicio"
 
 #: capplets/session-properties/startup-programs.c:396
 msgid "Edit Startup Program"
-msgstr ""
+msgstr "Editar programa de inicio"
 
 #: capplets/sound-properties/sound-properties.c:191
 msgid "Category"
@@ -918,20 +914,20 @@ msgstr "Usar una fuente personalizada."
 
 #: capplets/theme-switcher/install.c:26
 msgid "Home directory doesn't exist!\n"
-msgstr ""
+msgstr "¡El directorio personal no existe!\n"
 
 #: capplets/theme-switcher/install.c:36
 msgid "Theme does not exist"
-msgstr ""
+msgstr "El tema no existe"
 
 #: capplets/theme-switcher/install.c:68
 #, c-format
 msgid "Command '%s' failed"
-msgstr ""
+msgstr "Falló el comando '%s'"
 
 #: capplets/theme-switcher/install.c:73
 msgid "Unknown file format"
-msgstr ""
+msgstr "Formato de archivo desconocido"
 
 #: capplets/ui-properties/ui-properties.c:53
 msgid "Default Gtk setting"
@@ -1033,6 +1029,8 @@ msgid "Can detach and move menubars"
 msgstr "Barras de menúes desprendibles y desplazables"
 
 #: capplets/ui-properties/ui-properties.c:269
+# torn ??
+#, fuzzy
 msgid "Menus can be torn off"
 msgstr ""
 
@@ -1082,7 +1080,7 @@ msgstr "Posici
 
 #: capplets/url-properties/url-properties.c:48
 msgid "Error initializing the `url-properties' capplet."
-msgstr ""
+msgstr "Error al inicializar el capplet 'url-properties'."
 
 #: capplets/url-properties/url-properties.c:71
 msgid "Protocol"
@@ -1318,23 +1316,3 @@ msgstr ""
 msgid "Control Center"
 msgstr "Centro de Control"
 
-#~ msgid "Program:"
-#~ msgstr "Programa:"
-
-#~ msgid "Session"
-#~ msgstr "Sesión"
-
-#~ msgid "Session Chooser"
-#~ msgstr "Seleccionador de Sesiones"
-
-#~ msgid "Start Session"
-#~ msgstr "Iniciar Sesión"
-
-#~ msgid "Cancel Login"
-#~ msgstr "Cancelar Login"
-
-#~ msgid "First Regular Expresion: "
-#~ msgstr "Primera expresión regular: "
-
-#~ msgid "Second Regular Expresion: "
-#~ msgstr "Segunda expresión regular: "