diff --git a/po/es.po b/po/es.po
index 30ff7b4e2..692e5a2b0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -66,7 +66,7 @@ msgstr "Selecci
 
 #: capplets/background-properties/property-background.c:882
 msgid "Can't find an hbox, using a normal file selection"
-msgstr ""
+msgstr "No puedo encontrar una hbox, usando una selección de archivos normal"
 
 #: capplets/background-properties/property-background.c:887
 #: capplets/screensaver-properties/screensaver-dialog.c:25
@@ -305,7 +305,7 @@ msgstr "Par
 
 #: capplets/screensaver-properties/screensaver-properties-capplet.c:36
 msgid "RANDOM SCREENSAVER"
-msgstr ""
+msgstr "SALVAPANTALLAS AL AZAR"
 
 #: capplets/screensaver-properties/screensaver-properties-capplet.c:47
 msgid "Screen Saver"
@@ -354,7 +354,7 @@ msgstr " minutos despu
 
 #: capplets/screensaver-properties/screensaver-properties-capplet.c:149
 msgid "Screen Saver Demo"
-msgstr "Demostración de protector de pantalla"
+msgstr "Demostración del protector de pantalla"
 
 #: capplets/session-properties/session-properties.c:147
 msgid "Program:"
@@ -362,25 +362,24 @@ msgstr "Programa:"
 
 #: capplets/session-properties/session-properties.c:171
 msgid "Session"
-msgstr ""
+msgstr "Sesión"
 
 #. dialog
 #: capplets/session-properties/session-properties.c:207
 msgid "Session Chooser"
-msgstr ""
+msgstr "Seleccionador de Sesiones"
 
 #: capplets/session-properties/session-properties.c:210
 msgid "Start Session"
-msgstr ""
+msgstr "Iniciar Sesión"
 
 #: capplets/session-properties/session-properties.c:213
-#, fuzzy
 msgid "Cancel Login"
-msgstr "Cancelar"
+msgstr "Cancelar Login"
 
 #: capplets/session-properties/session-properties.c:236
 msgid "Only display warnings."
-msgstr ""
+msgstr "Solo mostrar las advertencias."
 
 #: capplets/sound-properties/sound-properties.c:191
 msgid "Category"
@@ -434,14 +433,14 @@ msgid "The sound file for this event does not exist."
 msgstr "El archivo de sonido para este evento no existe."
 
 #: capplets/sound-properties/sound-properties.c:759
-#, fuzzy
 msgid ""
 "The sound file for this event does not exist.\n"
 "You may want to install the gnome-audio package\n"
 "for a set of default sounds."
 msgstr ""
-"El archivo de sonido para este evento no existe. Quizás desee instalar el "
-"paquete gnome-audio para un conjunto de sonidos de base."
+"El archivo de sonido para este evento no existe.\n"
+"Quizás desee instalar el paquete gnome-audio para\n"
+"un conjunto de sonidos de base."
 
 #: capplets/sound-properties/sound-properties.c:765
 msgid "Close"
@@ -486,11 +485,11 @@ msgstr ""
 #.
 #: capplets/theme-switcher/gui.c:234
 msgid "User Font"
-msgstr ""
+msgstr "Fuente del Usuario"
 
 #: capplets/theme-switcher/gui.c:255
 msgid "Use custom font."
-msgstr ""
+msgstr "Usar una fuente personalizada."
 
 #: capplets/ui-properties/ui-properties.c:53
 msgid "Default Gtk setting"
@@ -757,7 +756,7 @@ msgstr "Ayuda con centro de control de GNOME."
 #. we create the widgets
 #: control-center/main.c:58
 msgid "Warning:"
-msgstr ""
+msgstr "Advertencia:"
 
 #: control-center/main.c:58
 msgid "Discard all changes"
@@ -769,14 +768,11 @@ msgid ""
 "The following modules have had changes made, but not committed.  If you "
 "would like to edit them, please double click on the appropriate entry."
 msgstr ""
+"Los módulos siguientes han hecho cambios, pero no fueron aprobados. Si "
+"desea editarlos por favor haga un doble-clic en la entrada apropriada."
 
 #. create the app
 #: control-center/main.c:162
 msgid "Control Center"
 msgstr "Centro de Control"
 
-#~ msgid "Theme Information"
-#~ msgstr "Información tema"
-
-#~ msgid "Default Gtk setting [FIXME - Describe this better]"
-#~ msgstr "Valores de Gtk por omisión [FIXME - Describirlo mejor]"