diff --git a/po/es.po b/po/es.po
index 5cd2fceaa..504f19d87 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: gnome-shell.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-08-20 12:23+0000\n"
-"PO-Revision-Date: 2012-08-20 19:32+0200\n"
+"POT-Creation-Date: 2012-08-21 18:33+0000\n"
+"PO-Revision-Date: 2012-08-23 17:23+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "Language: \n"
@@ -245,38 +245,32 @@ msgctxt "title"
 msgid "Sign In"
 msgstr "Iniciar sesión"
 
-#. Translators: this message is shown below the password entry field
-#. to indicate the user can swipe their finger instead
-#: ../js/gdm/loginDialog.js:766 ../js/ui/unlockDialog.js:127
-msgid "(or swipe finger)"
-msgstr "(o pase el dedo)"
-
 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: ../js/gdm/loginDialog.js:787
+#: ../js/gdm/loginDialog.js:784
 msgid "Not listed?"
 msgstr "¿No está en la lista?"
 
-#: ../js/gdm/loginDialog.js:930 ../js/ui/endSessionDialog.js:406
+#: ../js/gdm/loginDialog.js:929 ../js/ui/endSessionDialog.js:406
 #: ../js/ui/extensionDownloader.js:195 ../js/ui/networkAgent.js:153
 #: ../js/ui/polkitAuthenticationAgent.js:176
 #: ../js/ui/shellMountOperation.js:396 ../js/ui/status/bluetooth.js:432
-#: ../js/ui/unlockDialog.js:132
+#: ../js/ui/unlockDialog.js:129
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../js/gdm/loginDialog.js:935
+#: ../js/gdm/loginDialog.js:934
 msgctxt "button"
 msgid "Sign In"
 msgstr "Iniciar sesión"
 
-#: ../js/gdm/loginDialog.js:1278
+#: ../js/gdm/loginDialog.js:1277
 msgid "Login Window"
 msgstr "Ventana de inicio de sesión"
 
-#: ../js/gdm/powerMenu.js:88 ../js/ui/userMenu.js:615 ../js/ui/userMenu.js:619
-#: ../js/ui/userMenu.js:730
+#: ../js/gdm/powerMenu.js:88 ../js/ui/userMenu.js:634 ../js/ui/userMenu.js:638
+#: ../js/ui/userMenu.js:749
 msgid "Suspend"
 msgstr "Suspender"
 
@@ -284,11 +278,22 @@ msgstr "Suspender"
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../js/gdm/powerMenu.js:98 ../js/ui/userMenu.js:617 ../js/ui/userMenu.js:619
-#: ../js/ui/userMenu.js:729
+#: ../js/gdm/powerMenu.js:98 ../js/ui/userMenu.js:636 ../js/ui/userMenu.js:638
+#: ../js/ui/userMenu.js:748
 msgid "Power Off"
 msgstr "Apagar"
 
+#. Translators: this message is shown below the password entry field
+#. to indicate the user can swipe their finger instead
+#: ../js/gdm/util.js:220
+msgid "(or swipe finger)"
+msgstr "(o pase el dedo)"
+
+#: ../js/gdm/util.js:245
+#, c-format
+msgid "(e.g., user or %s)"
+msgstr "(ej., usuario o %s)"
+
 #: ../js/misc/util.js:92
 msgid "Command not found"
 msgstr "Comando no encontrado"
@@ -490,16 +495,15 @@ msgstr "Hoy"
 msgid "Tomorrow"
 msgstr "Mañana"
 
-#: ../js/ui/calendar.js:727
+#: ../js/ui/calendar.js:729
 msgid "This week"
 msgstr "Esta semana"
 
-#: ../js/ui/calendar.js:735
+#: ../js/ui/calendar.js:737
 msgid "Next week"
 msgstr "La semana que viene"
 
 #: ../js/ui/dash.js:241
-#| msgid "Applications"
 msgid "Show Applications"
 msgstr "Mostrar aplicaciones"
 
@@ -623,7 +627,7 @@ msgid "tray"
 msgstr "bandeja"
 
 #: ../js/ui/keyboard.js:545 ../js/ui/status/keyboard.js:146
-#: ../js/ui/status/power.js:205
+#: ../js/ui/status/power.js:207
 msgid "Keyboard"
 msgstr "Teclado"
 
@@ -689,27 +693,27 @@ msgstr "Página web"
 msgid "Screencast from %d %t"
 msgstr "Screencast desde %d %t"
 
-#: ../js/ui/messageTray.js:1195
+#: ../js/ui/messageTray.js:1228
 msgid "Open"
 msgstr "Abrir"
 
-#: ../js/ui/messageTray.js:1202
+#: ../js/ui/messageTray.js:1235
 msgid "Remove"
 msgstr "Quitar"
 
-#: ../js/ui/messageTray.js:1212
+#: ../js/ui/messageTray.js:1245
 msgid "Unmute"
 msgstr "Dar voz"
 
-#: ../js/ui/messageTray.js:1212
+#: ../js/ui/messageTray.js:1245
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../js/ui/messageTray.js:1954
+#: ../js/ui/messageTray.js:2027
 msgid "Message Tray"
 msgstr "Bandeja de mensajes"
 
-#: ../js/ui/messageTray.js:2418
+#: ../js/ui/messageTray.js:2465
 msgid "System Information"
 msgstr "Información del sistema"
 
@@ -878,7 +882,7 @@ msgstr "Inténtelo de nuevo,"
 #. "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:724
+#: ../js/ui/popupMenu.js:726
 msgid "toggle-switch-us"
 msgstr "toggle-switch-intl"
 
@@ -938,7 +942,7 @@ msgstr "Contraseña"
 msgid "Remember Passphrase"
 msgstr "Recordar contraseña"
 
-#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:135
+#: ../js/ui/shellMountOperation.js:400 ../js/ui/unlockDialog.js:132
 msgid "Unlock"
 msgstr "Desbloquear"
 
@@ -1240,7 +1244,7 @@ msgstr "Falló la conexión"
 msgid "Activation of network connection failed"
 msgstr "Falló la activación de la conexión de red"
 
-#: ../js/ui/status/network.js:2066
+#: ../js/ui/status/network.js:2104
 msgid "Networking is disabled"
 msgstr "La red está desactivada"
 
@@ -1296,47 +1300,47 @@ msgctxt "percent of battery remaining"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../js/ui/status/power.js:195
+#: ../js/ui/status/power.js:197
 msgid "AC adapter"
 msgstr "Adaptador de corriente"
 
-#: ../js/ui/status/power.js:197
+#: ../js/ui/status/power.js:199
 msgid "Laptop battery"
 msgstr "Batería del portátil"
 
-#: ../js/ui/status/power.js:199
+#: ../js/ui/status/power.js:201
 msgid "UPS"
 msgstr "SAI"
 
-#: ../js/ui/status/power.js:201
+#: ../js/ui/status/power.js:203
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../js/ui/status/power.js:203
+#: ../js/ui/status/power.js:205
 msgid "Mouse"
 msgstr "Ratón"
 
-#: ../js/ui/status/power.js:207
+#: ../js/ui/status/power.js:209
 msgid "PDA"
 msgstr "PDA"
 
-#: ../js/ui/status/power.js:209
+#: ../js/ui/status/power.js:211
 msgid "Cell phone"
 msgstr "Teléfono móvil"
 
-#: ../js/ui/status/power.js:211
+#: ../js/ui/status/power.js:213
 msgid "Media player"
 msgstr "Reproductor multimedia"
 
-#: ../js/ui/status/power.js:213
+#: ../js/ui/status/power.js:215
 msgid "Tablet"
 msgstr "Tableta"
 
-#: ../js/ui/status/power.js:215
+#: ../js/ui/status/power.js:217
 msgid "Computer"
 msgstr "Equipo"
 
-#: ../js/ui/status/power.js:217
+#: ../js/ui/status/power.js:219
 msgctxt "device"
 msgid "Unknown"
 msgstr "Desconocido"
@@ -1587,67 +1591,67 @@ msgstr "Editar cuenta"
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: ../js/ui/unlockDialog.js:143
+#: ../js/ui/unlockDialog.js:140
 msgid "Log in as another user"
 msgstr "Iniciar sesión como otro usuario"
 
-#: ../js/ui/userMenu.js:165
+#: ../js/ui/userMenu.js:167
 msgid "Available"
 msgstr "Disponible"
 
-#: ../js/ui/userMenu.js:168
+#: ../js/ui/userMenu.js:170
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../js/ui/userMenu.js:171
+#: ../js/ui/userMenu.js:173
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../js/ui/userMenu.js:174
+#: ../js/ui/userMenu.js:176
 msgid "Away"
 msgstr "Ausente"
 
-#: ../js/ui/userMenu.js:177
+#: ../js/ui/userMenu.js:179
 msgid "Idle"
 msgstr "Inactivo"
 
-#: ../js/ui/userMenu.js:180
+#: ../js/ui/userMenu.js:182
 msgid "Unavailable"
 msgstr "No disponible"
 
-#: ../js/ui/userMenu.js:570 ../js/ui/userMenu.js:711
+#: ../js/ui/userMenu.js:589 ../js/ui/userMenu.js:730
 msgid "Switch User"
 msgstr "Cambiar de usuario"
 
-#: ../js/ui/userMenu.js:571
+#: ../js/ui/userMenu.js:590
 msgid "Switch Session"
 msgstr "Cambiar de sesión"
 
-#: ../js/ui/userMenu.js:694
+#: ../js/ui/userMenu.js:713
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../js/ui/userMenu.js:703
+#: ../js/ui/userMenu.js:722
 msgid "System Settings"
 msgstr "Configuración del sistema"
 
-#: ../js/ui/userMenu.js:716
+#: ../js/ui/userMenu.js:735
 msgid "Log Out"
 msgstr "Cerrar la sesión"
 
-#: ../js/ui/userMenu.js:721
+#: ../js/ui/userMenu.js:740
 msgid "Lock"
 msgstr "Bloquear"
 
-#: ../js/ui/userMenu.js:736
+#: ../js/ui/userMenu.js:755
 msgid "Install Updates & Restart"
 msgstr "Instalar actualizaciones y reiniciar"
 
-#: ../js/ui/userMenu.js:754
+#: ../js/ui/userMenu.js:773
 msgid "Your chat status will be set to busy"
 msgstr "Su estado del chat se establecerá a «ocupado»"
 
-#: ../js/ui/userMenu.js:755
+#: ../js/ui/userMenu.js:774
 msgid ""
 "Notifications are now disabled, including chat messages. Your online status "
 "has been adjusted to let others know that you might not see their messages."
@@ -1656,15 +1660,15 @@ msgstr ""
 "chat. Su estado en línea se ha ajustado para que otros sepan que puede no "
 "leer sus mensajes."
 
-#: ../js/ui/viewSelector.js:75
+#: ../js/ui/viewSelector.js:88
 msgid "Windows"
 msgstr "Ventanas"
 
-#: ../js/ui/viewSelector.js:79
+#: ../js/ui/viewSelector.js:92
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: ../js/ui/viewSelector.js:83 ../src/shell-util.c:250
+#: ../js/ui/viewSelector.js:96 ../src/shell-util.c:250
 msgid "Search"
 msgstr "Buscar"