diff --git a/po/es.po b/po/es.po
index fe4d51e12..f577a33e8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: gnome-control-center.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "control-center&component=general\n"
-"POT-Creation-Date: 2011-01-27 15:43+0000\n"
-"PO-Revision-Date: 2011-01-28 17:05+0100\n"
+"POT-Creation-Date: 2011-01-28 19:05+0000\n"
+"PO-Revision-Date: 2011-01-28 20:07+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -945,6 +945,11 @@ msgstr "Configurar los soportes y preferencias de autoejecución"
 msgid "Removable Media"
 msgstr "Soporte extraíble"
 
+#. Translators: those are keywords for the media control-center panel
+#: ../panels/media/gnome-media-panel.desktop.in.in.h:4
+msgid "cd;dvd;usb;audio;video;disc;"
+msgstr "cd;dvd;usb;sonido;vídeo;disco;"
+
 #. Translators: The printer is low on toner
 #: ../panels/printers/cc-printers-panel.c:210
 msgid "Low on toner"
@@ -955,163 +960,165 @@ msgstr "Tóner bajo"
 msgid "Out of toner"
 msgstr "Sin tóner"
 
-#. Translators: "Developer" like on photo development context
-#: ../panels/printers/cc-printers-panel.c:214
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/cc-printers-panel.c:215
 msgid "Low on developer"
 msgstr "Nivel de revelador bajo"
 
-#. Translators: "Developer" like on photo development context
-#: ../panels/printers/cc-printers-panel.c:216
+#. Translators: "Developer" is a chemical for photo development,
+#. * http://en.wikipedia.org/wiki/Photographic_developer
+#: ../panels/printers/cc-printers-panel.c:218
 msgid "Out of developer"
 msgstr "Sin revelador"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:218
+#: ../panels/printers/cc-printers-panel.c:220
 msgid "Low on a marker supply"
 msgstr "Marcador bajo"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:220
+#: ../panels/printers/cc-printers-panel.c:222
 msgid "Out of a marker supply"
 msgstr "Sin marcador"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:222
+#: ../panels/printers/cc-printers-panel.c:224
 msgid "Open cover"
 msgstr "Abrir cubierta"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:224
+#: ../panels/printers/cc-printers-panel.c:226
 msgid "Open door"
 msgstr "Abrir puerta"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:226
+#: ../panels/printers/cc-printers-panel.c:228
 msgid "Low on paper"
 msgstr "Nivel de papel bajo"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:228
+#: ../panels/printers/cc-printers-panel.c:230
 msgid "Out of paper"
 msgstr "Sin papel"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:230
+#: ../panels/printers/cc-printers-panel.c:232
 msgid "Offline"
 msgstr "Desconectada"
 
 #. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:232
+#: ../panels/printers/cc-printers-panel.c:234
 msgid "Paused"
 msgstr "Pausada"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:234
+#: ../panels/printers/cc-printers-panel.c:236
 msgid "Waste receptacle almost full"
 msgstr "Recipiente de residuos casi lleno"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:236
+#: ../panels/printers/cc-printers-panel.c:238
 msgid "Waste receptacle full"
 msgstr "Receptáculo de residuos lleno"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:238
+#: ../panels/printers/cc-printers-panel.c:240
 msgid "The optical photo conductor is near end of life"
 msgstr "El conductor óptico está cerca del final de su vida"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:240
+#: ../panels/printers/cc-printers-panel.c:242
 msgid "The optical photo conductor is no longer functioning"
 msgstr "El conductor óptico ya no funciona"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:329
+#: ../panels/printers/cc-printers-panel.c:331
 msgid "Idle"
 msgstr "Inactiva"
 
 #. Translators: Printer's state (jobs are processing)
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/cc-printers-panel.c:333
-#: ../panels/printers/cc-printers-panel.c:726
+#: ../panels/printers/cc-printers-panel.c:335
+#: ../panels/printers/cc-printers-panel.c:728
 msgid "Processing"
 msgstr "Procesando"
 
 #. Translators: Printer's state (no jobs can be processed)
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/cc-printers-panel.c:337
-#: ../panels/printers/cc-printers-panel.c:730
+#: ../panels/printers/cc-printers-panel.c:339
+#: ../panels/printers/cc-printers-panel.c:732
 msgid "Stopped"
 msgstr "Detenida"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/cc-printers-panel.c:718
+#: ../panels/printers/cc-printers-panel.c:720
 msgid "Pending"
 msgstr "Pendiente"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/cc-printers-panel.c:722
+#: ../panels/printers/cc-printers-panel.c:724
 msgid "Held"
 msgstr "Retenido"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/cc-printers-panel.c:734
+#: ../panels/printers/cc-printers-panel.c:736
 msgid "Canceled"
 msgstr "Cancelado"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/cc-printers-panel.c:738
+#: ../panels/printers/cc-printers-panel.c:740
 msgid "Aborted"
 msgstr "Abortado"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/cc-printers-panel.c:742
+#: ../panels/printers/cc-printers-panel.c:744
 msgid "Completed"
 msgstr "Completado"
 
 #. Translators: Name of column showing titles of print jobs
-#: ../panels/printers/cc-printers-panel.c:837
+#: ../panels/printers/cc-printers-panel.c:839
 msgid "Job Title"
 msgstr "Título del trabajo"
 
 #. Translators: Name of column showing statuses of print jobs
-#: ../panels/printers/cc-printers-panel.c:845
+#: ../panels/printers/cc-printers-panel.c:847
 msgid "Job State"
 msgstr "Estado del trabajo"
 
 #. Translators: Name of column showing names of creators of print jobs
-#: ../panels/printers/cc-printers-panel.c:851
+#: ../panels/printers/cc-printers-panel.c:853
 msgid "User"
 msgstr "Usuario"
 
 #. Translators: Name of column showing times of creation of print jobs
-#: ../panels/printers/cc-printers-panel.c:857
+#: ../panels/printers/cc-printers-panel.c:859
 msgid "Time"
 msgstr "Hora"
 
 #. Translators: Program cannot connect to DBus' system bus
-#: ../panels/printers/cc-printers-panel.c:1047
+#: ../panels/printers/cc-printers-panel.c:1049
 #, c-format
 msgid "Could not connect to system bus: %s"
 msgstr "No se pudo conectar con el bus del sistema: %s"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:1657
+#: ../panels/printers/cc-printers-panel.c:1659
 msgid "Test page"
 msgstr "Página de prueba"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: ../panels/printers/cc-printers-panel.c:1665
+#: ../panels/printers/cc-printers-panel.c:1667
 msgid "Clean print heads"
 msgstr "Limpiar cabezales de la impresora"
 
 #. Translators: An error has occured during execution of a CUPS maintenance command
-#: ../panels/printers/cc-printers-panel.c:1670
+#: ../panels/printers/cc-printers-panel.c:1672
 msgid "An error has occured during a maintenance command."
 msgstr "Ocurrió un error durante un comando de mantenimiento."
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:1709
+#: ../panels/printers/cc-printers-panel.c:1711
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "No se pudo cargar la IU: %s"
@@ -1198,56 +1205,32 @@ msgstr "Estado:"
 msgid "Supply:"
 msgstr "Suministro:"
 
-#: ../panels/printers/printers.ui.h:26
-msgid "pause-toolbutton"
-msgstr "pause-toolbutton"
-
-#: ../panels/printers/printers.ui.h:27
-msgid "resume-toolbutton"
-msgstr "resume-toolbutton"
-
-#: ../panels/printers/printers.ui.h:28
-msgid "stop-toolbutton"
-msgstr "stop-toolbutton"
-
-#: ../panels/printers/printers.ui.h:29
-msgid "toolbutton1"
-msgstr "toolbutton1"
-
-#: ../panels/printers/printers.ui.h:30
-msgid "toolbutton2"
-msgstr "toolbutton2"
-
 #: ../panels/region/gnome-region-panel.ui.h:1
 msgid "Install languages..."
 msgstr "Instalar idiomas…"
 
 #: ../panels/region/gnome-region-panel.ui.h:2
-msgid "Keyboard _model:"
-msgstr "_Modelo del teclado:"
-
-#: ../panels/region/gnome-region-panel.ui.h:3
 msgid "Language"
 msgstr "Idioma"
 
-#: ../panels/region/gnome-region-panel.ui.h:4
+#: ../panels/region/gnome-region-panel.ui.h:3
 msgid "Layouts"
 msgstr "Distribuciones"
 
-#: ../panels/region/gnome-region-panel.ui.h:5
+#: ../panels/region/gnome-region-panel.ui.h:4
 msgid "List of keyboard layouts selected for usage"
 msgstr "Lista de distribuciones de teclado seleccionadas para su uso"
 
-#: ../panels/region/gnome-region-panel.ui.h:6
+#: ../panels/region/gnome-region-panel.ui.h:5
 msgid "New windows u_se active window's layout"
 msgstr "Las ventanas nuevas u_san la distribución de la ventana activa"
 
-#: ../panels/region/gnome-region-panel.ui.h:7
+#: ../panels/region/gnome-region-panel.ui.h:6
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:4
 msgid "Region and Language"
 msgstr "Región e idioma"
 
-#: ../panels/region/gnome-region-panel.ui.h:8
+#: ../panels/region/gnome-region-panel.ui.h:7
 msgid ""
 "Replace the current keyboard layout settings with the\n"
 "default settings"
@@ -1255,23 +1238,23 @@ msgstr ""
 "Reemplazar la configuración de distribución de teclado actual\n"
 "con la configuración predeterminada"
 
-#: ../panels/region/gnome-region-panel.ui.h:10
+#: ../panels/region/gnome-region-panel.ui.h:9
 msgid "Reset to De_faults"
 msgstr "Restablecer valores _predeterminados"
 
-#: ../panels/region/gnome-region-panel.ui.h:11
+#: ../panels/region/gnome-region-panel.ui.h:10
 msgid "Select a display language"
 msgstr "Seleccionar el idioma que mostrar"
 
-#: ../panels/region/gnome-region-panel.ui.h:12
+#: ../panels/region/gnome-region-panel.ui.h:11
 msgid "View and edit keyboard layout options"
 msgstr "Ver y editar las opciones de distribución de teclado"
 
-#: ../panels/region/gnome-region-panel.ui.h:13
+#: ../panels/region/gnome-region-panel.ui.h:12
 msgid "_Options..."
 msgstr "_Opciones…"
 
-#: ../panels/region/gnome-region-panel.ui.h:14
+#: ../panels/region/gnome-region-panel.ui.h:13
 msgid "_Separate layout for each window"
 msgstr "Separar la _distribución para cada ventana"
 
@@ -1303,41 +1286,14 @@ msgstr "_Idioma:"
 msgid "_Variants:"
 msgstr "_Variantes:"
 
-#: ../panels/region/gnome-region-panel-model-chooser.ui.h:1
-msgid "Choose a Keyboard Model"
-msgstr "Elija un modelo de teclado"
-
-#: ../panels/region/gnome-region-panel-model-chooser.ui.h:2
-msgid "_Models:"
-msgstr "_Modelos:"
-
-#: ../panels/region/gnome-region-panel-model-chooser.ui.h:3
-msgid "_Vendors:"
-msgstr "_Fabricantes:"
-
 #: ../panels/region/gnome-region-panel-options-dialog.ui.h:1
 msgid "Keyboard Layout Options"
 msgstr "Opciones de distribución del teclado"
 
-#. TRANSLATORS: device type
-#. TRANSLATORS: AP type
-#: ../panels/region/gnome-region-panel-xkb.c:70
-#: ../panels/network/panel-common.c:65 ../panels/network/panel-common.c:138
-msgid "Unknown"
-msgstr "Desconocido"
-
 #: ../panels/region/gnome-region-panel-xkblt.c:220
 msgid "Layout"
 msgstr "Distribución"
 
-#: ../panels/region/gnome-region-panel-xkbmc.c:163
-msgid "Vendors"
-msgstr "Fabricantes"
-
-#: ../panels/region/gnome-region-panel-xkbmc.c:229
-msgid "Models"
-msgstr "Modelos"
-
 #: ../panels/region/gnome-region-panel.desktop.in.in.h:1
 msgid "Change your region and language settings"
 msgstr "Cambiar su configuración de región e idioma"
@@ -1500,6 +1456,12 @@ msgstr "Proxy de la red"
 msgid "Set the system proxy settings"
 msgstr "Configurar los ajustes del proxy del sistema"
 
+#. TRANSLATORS: device type
+#. TRANSLATORS: AP type
+#: ../panels/network/panel-common.c:65 ../panels/network/panel-common.c:138
+msgid "Unknown"
+msgstr "Desconocido"
+
 #. TRANSLATORS: device type
 #: ../panels/network/panel-common.c:69
 msgid "Wired"
@@ -1888,27 +1850,28 @@ msgstr "Brillo"
 msgid "Dim screen to save power"
 msgstr "Oscurecer la pantalla para ahorrar energía"
 
-#: ../panels/screen/screen.ui.h:10
+#. To translators: This asks whether you want to lock the screen (through the screensaver) when you're detected to be physically in your home (your house, etc.)
+#: ../panels/screen/screen.ui.h:11
 msgid "Don't lock when at home"
 msgstr "No bloquear cuando esté en casa"
 
-#: ../panels/screen/screen.ui.h:11
+#: ../panels/screen/screen.ui.h:12
 msgid "Locations..."
 msgstr "Ubicaciones…"
 
-#: ../panels/screen/screen.ui.h:12 ../panels/user-accounts/um-lockbutton.c:347
+#: ../panels/screen/screen.ui.h:13 ../panels/user-accounts/um-lockbutton.c:347
 msgid "Lock"
 msgstr "Bloquear"
 
-#: ../panels/screen/screen.ui.h:13
+#: ../panels/screen/screen.ui.h:14
 msgid "Lock screen after:"
 msgstr "Bloquear pantalla después de:"
 
-#: ../panels/screen/screen.ui.h:14
+#: ../panels/screen/screen.ui.h:15
 msgid "Screen turns off"
 msgstr "La pantalla se apaga"
 
-#: ../panels/screen/screen.ui.h:15
+#: ../panels/screen/screen.ui.h:16
 msgid "Turn off after:"
 msgstr "Apagar después:"
 
@@ -2918,8 +2881,8 @@ msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
 msgstr ""
-"Es posible mantener la carpeta personal, el «spool» del correo y los archivos "
-"temporales al eliminar una cuenta de usuario."
+"Es posible mantener la carpeta personal, el «spool» del correo y los "
+"archivos temporales al eliminar una cuenta de usuario."
 
 #: ../panels/user-accounts/um-user-panel.c:448
 msgid "_Delete Files"
@@ -3263,6 +3226,39 @@ msgstr "Centro de control"
 msgid "_All Settings"
 msgstr "_Todas las configuraciones"
 
+#~ msgid "pause-toolbutton"
+#~ msgstr "pause-toolbutton"
+
+#~ msgid "resume-toolbutton"
+#~ msgstr "resume-toolbutton"
+
+#~ msgid "stop-toolbutton"
+#~ msgstr "stop-toolbutton"
+
+#~ msgid "toolbutton1"
+#~ msgstr "toolbutton1"
+
+#~ msgid "toolbutton2"
+#~ msgstr "toolbutton2"
+
+#~ msgid "Keyboard _model:"
+#~ msgstr "_Modelo del teclado:"
+
+#~ msgid "Choose a Keyboard Model"
+#~ msgstr "Elija un modelo de teclado"
+
+#~ msgid "_Models:"
+#~ msgstr "_Modelos:"
+
+#~ msgid "_Vendors:"
+#~ msgstr "_Fabricantes:"
+
+#~ msgid "Vendors"
+#~ msgstr "Fabricantes"
+
+#~ msgid "Models"
+#~ msgstr "Modelos"
+
 #~ msgid "Move _Down"
 #~ msgstr "_Bajar"
 
@@ -5848,4 +5844,5 @@ msgstr "_Todas las configuraciones"
 #~ msgstr "No hay establecido ningún grupo para el URI «%s»"
 
 #~ msgid "No application with name '%s' registered a bookmark for '%s'"
-#~ msgstr "Ninguna aplicación con el nombre «%s» registró un marcador para «%s»"
+#~ msgstr ""
+#~ "Ninguna aplicación con el nombre «%s» registró un marcador para «%s»"