diff --git a/po/es.po b/po/es.po
index d652818d2..07b882160 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&component=general\n"
-"POT-Creation-Date: 2010-09-22 15:13+0000\n"
-"PO-Revision-Date: 2010-09-25 10:43+0200\n"
+"POT-Creation-Date: 2010-10-04 19:52+0000\n"
+"PO-Revision-Date: 2010-10-07 18:02+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -226,6 +226,135 @@ msgid "Whether to collect stats about applications usage"
 msgstr ""
 "Indica si se deben recolectar estadísticas acerca del uso de las aplicaciones"
 
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:1
+msgid "Clip the crosshairs at the center"
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:2
+msgid "Color of the crosshairs"
+msgstr "Color de las cruces"
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:3
+msgid ""
+"Determines the length of the vertical and horizontal lines that make up the "
+"crosshairs."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:4
+msgid ""
+"Determines the position of the magnified mouse image within the magnified "
+"view and how it reacts to system mouse movement. The values are - none: no "
+"mouse tracking; - centered: the mouse image is displayed at the center of "
+"the zoom region (which also represents the point under the system mouse) and "
+"the magnified contents are scrolled as the system mouse moves; - "
+"proportional: the position of the magnified mouse in the zoom region is "
+"proportionally the same as the position of the system mouse on screen; - "
+"push: when the magnified mouse intersects a boundary of the zoom region, the "
+"contents are scrolled into view."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:5
+msgid ""
+"Determines the transparency of the crosshairs, from fully opaque to fully "
+"transparent."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:6
+msgid ""
+"Determines whether the crosshairs intersect the magnified mouse sprite, or "
+"are clipped such that the ends of the horizontal and vertical lines surround "
+"the mouse image."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:7
+#| msgid "Enabled"
+msgid "Enable lens mode"
+msgstr "Activar el modo lente"
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:8
+msgid ""
+"Enables/disables display of crosshairs centered on the magnified mouse "
+"sprite."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:9
+msgid ""
+"For centered mouse tracking, when the system pointer is at or near the edge "
+"of the screen, the magnified contents continue to scroll such that the "
+"screen edge moves into the magnified view."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:10
+msgid "Length of the crosshairs"
+msgstr "Longitud de las cruces"
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:11
+msgid "Magnification factor"
+msgstr "Factor de magnificación"
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:12
+msgid "Mouse Tracking Mode"
+msgstr "Modo de seguimiento del ratón"
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:13
+msgid "Opacity of the crosshairs"
+msgstr "Opacidad de las cruces"
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:14
+msgid "Screen position"
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:15
+msgid "Scroll magnified contents beyond the edges of the desktop"
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:16
+msgid "Show or hide crosshairs"
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:17
+msgid "Show or hide the magnifier"
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:18
+msgid "Show or hide the magnifier and all of its zoom regions."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:19
+msgid ""
+"The color of the the vertical and horizontal lines that make up the "
+"crosshairs."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:20
+msgid ""
+"The magnified view either fills the entire screen, or occupies the top-half, "
+"bottom-half, left-half, or right-half of the screen."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:21
+msgid ""
+"The power of the magnification. A value of 1.0 means no magnification. A "
+"value of 2.0 doubles the size."
+msgstr ""
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:22
+msgid "Thickness of the crosshairs"
+msgstr "Grosor de las cruces"
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:23
+msgid ""
+"Whether the magnified view should be centered over the location of the "
+"system mouse and move with it."
+msgstr ""
+"Indica si la vista magnificada se debe centrar sobre la ubicación del ratón "
+"del sistema y moverse con ella."
+
+#: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:24
+msgid "Width of the vertical and horizontal lines that make up the crosshairs."
+msgstr ""
+"Anchura de las líneas verticales y horizontales que conforman las cruces."
+
 #: ../data/clock-preferences.ui.h:1
 msgid "Clock Format"
 msgstr "Formato del reloj"
@@ -263,19 +392,19 @@ msgstr "APLICACIONES"
 msgid "PREFERENCES"
 msgstr "PREFERENCIAS"
 
-#: ../js/ui/appDisplay.js:653
+#: ../js/ui/appDisplay.js:648
 msgid "New Window"
 msgstr "Ventana nueva"
 
-#: ../js/ui/appDisplay.js:657
+#: ../js/ui/appDisplay.js:652
 msgid "Remove from Favorites"
 msgstr "Quitar de los favoritos"
 
-#: ../js/ui/appDisplay.js:658
+#: ../js/ui/appDisplay.js:653
 msgid "Add to Favorites"
 msgstr "Añadir a los favoritos"
 
-#: ../js/ui/appDisplay.js:986
+#: ../js/ui/appDisplay.js:830
 msgid "Drag here to add favorites"
 msgstr "Arrastrar aquí para añadir a los favoritos"
 
@@ -346,58 +475,58 @@ msgid "Undo"
 msgstr "Deshacer"
 
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:467
+#: ../js/ui/panel.js:461
 #, c-format
 msgid "Quit %s"
 msgstr "Salir de %s"
 
-#: ../js/ui/panel.js:492
+#: ../js/ui/panel.js:486
 msgid "Preferences"
 msgstr "Preferencias"
 
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:578
+#: ../js/ui/panel.js:572
 msgid "%a %b %e, %R:%S"
 msgstr "%a %e de %b, %R:%S"
 
-#: ../js/ui/panel.js:579
+#: ../js/ui/panel.js:573
 msgid "%a %b %e, %R"
 msgstr "%a %e de %b, %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:583
+#: ../js/ui/panel.js:577
 msgid "%a %R:%S"
 msgstr "%a %R:%S"
 
-#: ../js/ui/panel.js:584
+#: ../js/ui/panel.js:578
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/panel.js:591
+#: ../js/ui/panel.js:585
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%a %e de %b, %H:%M:%S"
 
-#: ../js/ui/panel.js:592
+#: ../js/ui/panel.js:586
 msgid "%a %b %e, %l:%M %p"
 msgstr "%a %e de %b, %H:%M"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../js/ui/panel.js:596
+#: ../js/ui/panel.js:590
 msgid "%a %l:%M:%S %p"
 msgstr "%a %H:%M:%S"
 
-#: ../js/ui/panel.js:597
+#: ../js/ui/panel.js:591
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:742
+#: ../js/ui/panel.js:736
 msgid "Activities"
 msgstr "Actividades"
 
@@ -419,7 +548,7 @@ msgstr "Conectar a…"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:32
+#: ../js/ui/popupMenu.js:33
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
 
@@ -449,8 +578,9 @@ msgid "Account Information..."
 msgstr "Información de la cuenta…"
 
 #: ../js/ui/statusMenu.js:110
-msgid "System Preferences..."
-msgstr "Preferencias del sistema…"
+#| msgid "System Preferences..."
+msgid "System Settings..."
+msgstr "Ajustes del sistema…"
 
 #: ../js/ui/statusMenu.js:117
 msgid "Lock Screen"
@@ -489,32 +619,32 @@ msgstr ""
 msgid "Can't remove the first workspace."
 msgstr "No se puede quitar el primer área de trabajo."
 
-#: ../src/shell-global.c:1189
+#: ../src/shell-global.c:1196
 msgid "Less than a minute ago"
 msgstr "Hace menos de un minuto"
 
-#: ../src/shell-global.c:1193
+#: ../src/shell-global.c:1200
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Hace %d minuto"
 msgstr[1] "Hace %d minutos"
 
-#: ../src/shell-global.c:1198
+#: ../src/shell-global.c:1205
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Hace %d hora"
 msgstr[1] "Hace %d horas"
 
-#: ../src/shell-global.c:1203
+#: ../src/shell-global.c:1210
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Hace %d día"
 msgstr[1] "Hace %d días"
 
-#: ../src/shell-global.c:1208
+#: ../src/shell-global.c:1215
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"