[gnome-control-center] Updated Spanish translation

[Daniel Mustieles GarcÃa <dmustieles src gnome org>]

commit 9b15b77abfedd07e423b5b9ac881074827873a00
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Thu Feb 14 18:21:42 2013 +0100

    Updated Spanish translation

 po/es.po |  780 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 452 insertions(+), 328 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index 87ed33b..b942e84 100644
--- a/po/es.po
+++ b/po/es.po
@@ -20,8 +20,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&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-02-06 21:06+0000\n"
-"PO-Revision-Date: 2013-02-11 14:34+0100\n"
+"POT-Creation-Date: 2013-02-14 09:11+0000\n"
+"PO-Revision-Date: 2013-02-14 18:20+0100\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: EspaÃol <gnome-es-list gnome org>\n"
 "Language: \n"
@@ -126,9 +126,7 @@ msgstr "Cambiar el fondo"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Fondo de pantalla;Pantalla;Escritorio;"
 
-#. TRANSLATORS: device type
 #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
-#: ../panels/network/panel-common.c:99
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -179,10 +177,10 @@ msgid "Type"
 msgstr "Tipo"
 
 #: ../panels/bluetooth/bluetooth.ui.h:10
-#: ../panels/network/connection-editor/ce-page-ip4.c:180
-#: ../panels/network/connection-editor/ce-page-ip4.c:416
-#: ../panels/network/connection-editor/ce-page-ip6.c:182
-#: ../panels/network/connection-editor/ce-page-ip6.c:420
+#: ../panels/network/connection-editor/ce-page-ip4.c:181
+#: ../panels/network/connection-editor/ce-page-ip4.c:432
+#: ../panels/network/connection-editor/ce-page-ip6.c:183
+#: ../panels/network/connection-editor/ce-page-ip6.c:436
 msgid "Address"
 msgstr "DireccioÌn"
 
@@ -250,6 +248,7 @@ msgstr ""
 #: ../panels/color/cc-color-calibrate.c:359
 msgid "Place your calibration device over the square and press 'Start'"
 msgstr ""
+"Coloque su dispositivo de calibraciÃn sobre el cuadrado y pulse ÂIniciarÂ"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
@@ -258,6 +257,8 @@ msgstr ""
 msgid ""
 "Move your calibration device to the calibrate position and press 'Continue'"
 msgstr ""
+"Mueva su dispositivo de calibracioÌn a la posicioÌn de calibrado y pulse "
+"ÂContinuarÂ"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
@@ -266,6 +267,8 @@ msgstr ""
 msgid ""
 "Move your calibration device to the surface position and press 'Continue'"
 msgstr ""
+"Mueva su dispositivo de calibraciÃn a la posiciÃn de la superficie y pulse "
+"ÂContinuarÂ"
 
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
@@ -319,11 +322,10 @@ msgstr "Puede quitar el dispositivo de calibraciÃn."
 #. * detected early enough)
 #: ../panels/color/cc-color-calibrate.c:551
 msgid "Do not disturb the calibration device while in progress"
-msgstr ""
+msgstr "No interrumpir al dispositivo de calibraciÃn cuando està en progreso"
 
 #. TRANSLATORS: This refers to the TFT display on a laptop
 #: ../panels/color/cc-color-common.c:41
-#| msgid "Lock screen"
 msgid "Laptop Screen"
 msgstr "Pantalla del portÃtil"
 
@@ -363,8 +365,19 @@ msgstr "Impresora %s"
 msgid "%s Webcam"
 msgstr "CaÌmara web %s"
 
+#: ../panels/color/cc-color-device.c:89
+#, c-format
+#| msgid "Learn more about color management"
+msgid "Enable color management for %s"
+msgstr "Activar la gestiÃn de color para %s"
+
+#: ../panels/color/cc-color-device.c:93
+#, c-format
+msgid "Show color profiles for %s"
+msgstr "Mostrar perfiles de color para %s"
+
 #. not calibrated
-#: ../panels/color/cc-color-device.c:303
+#: ../panels/color/cc-color-device.c:318
 msgid "Not calibrated"
 msgstr "Sin calibrar"
 
@@ -505,7 +518,7 @@ msgstr "Gris predeterminado"
 
 #: ../panels/color/cc-color-profile.c:192
 msgid "Vendor supplied factory calibration data"
-msgstr ""
+msgstr "Datos de calibraciÃn de fÃbrica proporcionados por el vendedor"
 
 #: ../panels/color/cc-color-profile.c:201
 msgid "Full-screen display correction not possible with this profile"
@@ -556,7 +569,7 @@ msgstr ""
 #: ../panels/color/color.ui.h:3
 msgid ""
 "You will not be able to use your computer while calibration takes place."
-msgstr ""
+msgstr "No podrà usar su equipo mientras se realiza la calibraciÃn"
 
 #. This is the approximate time it takes to calibrate the display.
 #: ../panels/color/color.ui.h:5
@@ -609,6 +622,8 @@ msgid ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
 msgstr ""
+"Alternativamente, puede usar el nivel de brillo usado con uno de los otros "
+"perfiles para este dispositivo."
 
 #: ../panels/color/color.ui.h:17
 msgid "Display Brightness"
@@ -619,6 +634,8 @@ msgid ""
 "You can use a color profile on different computers, or even create profiles "
 "for different lighting conditions."
 msgstr ""
+"Puede usar un perfil de color en diferentes equipos, o incluso crear "
+"perfiles para diferentes condiciones de luz."
 
 #: ../panels/color/color.ui.h:19
 msgid "Profile Name:"
@@ -657,6 +674,8 @@ msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
 msgstr ""
+"Se han encontrado problemas. El perfil puede no funciona correctamente. <a "
+"href=\"\">Mostrar detalles.</a>"
 
 #: ../panels/color/color.ui.h:27
 msgid "Device type:"
@@ -732,7 +751,7 @@ msgstr "Ver detalles"
 
 #: ../panels/color/color.ui.h:43
 msgid "Unable to detect any devices that can be color managed"
-msgstr ""
+msgstr "So se han detectado dispositivos que se puedan gestionar por color"
 
 #: ../panels/color/color.ui.h:44
 msgid "LCD"
@@ -768,7 +787,7 @@ msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "Media"
 
-#: ../panels/color/color.ui.h:52 ../panels/power/power.ui.h:5
+#: ../panels/color/color.ui.h:52 ../panels/power/power.ui.h:4
 #: ../panels/privacy/privacy.ui.h:7
 msgid "30 minutes"
 msgstr "30 minutos"
@@ -778,7 +797,7 @@ msgctxt "Calibration quality"
 msgid "Low"
 msgstr "Baja"
 
-#: ../panels/color/color.ui.h:54
+#: ../panels/color/color.ui.h:54 ../panels/power/power.ui.h:3
 msgid "15 minutes"
 msgstr "15 minutos"
 
@@ -1108,11 +1127,8 @@ msgstr "Cambiar la resoluciÃn y posiciÃn de los monitores y proyectores"
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Panel;Proyector;xranrd;Pantalla;ResolucioÌn;Actualizar;"
 
-#. TRANSLATORS: device type
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:441
-#: ../panels/network/cc-network-panel.c:1132
-#: ../panels/network/panel-common.c:107 ../panels/network/panel-common.c:161
+#: ../panels/info/cc-info-panel.c:441 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -1365,7 +1381,6 @@ msgid "_Software"
 msgstr "Soft_ware"
 
 #: ../panels/info/info.ui.h:26
-#| msgid "Other Media"
 msgid "_Other Mediaâ"
 msgstr "_Otros soportesâ"
 
@@ -1557,42 +1572,34 @@ msgid "Disabled"
 msgstr "Desactivado"
 
 #: ../panels/keyboard/cc-keyboard-option.c:255
-#| msgid "Left Half"
 msgid "Left Shift"
 msgstr "MayÃs izquierda"
 
 #: ../panels/keyboard/cc-keyboard-option.c:256
-#| msgid "Left Half"
 msgid "Left Alt"
 msgstr "Alt izquierda"
 
 #: ../panels/keyboard/cc-keyboard-option.c:257
-#| msgid "Left Half"
 msgid "Left Ctrl"
 msgstr "Ctrl derecho"
 
 #: ../panels/keyboard/cc-keyboard-option.c:258
-#| msgid "Right Half"
 msgid "Right Shift"
 msgstr "MayÃs derecha"
 
 #: ../panels/keyboard/cc-keyboard-option.c:259
-#| msgid "Right Half"
 msgid "Right Alt"
 msgstr "Alt derecha"
 
 #: ../panels/keyboard/cc-keyboard-option.c:260
-#| msgid "Right Half"
 msgid "Right Ctrl"
 msgstr "Ctrl derecha"
 
 #: ../panels/keyboard/cc-keyboard-option.c:261
-#| msgid "Left Half"
 msgid "Left Alt+Shift"
 msgstr "Alt izquierda+MayÃs"
 
 #: ../panels/keyboard/cc-keyboard-option.c:262
-#| msgid "Right Half"
 msgid "Right Alt+Shift"
 msgstr "Alt derecha+MayÃs"
 
@@ -1601,7 +1608,6 @@ msgid "Left Ctrl+Shift"
 msgstr "Ctrl izquierdo +MayÃs"
 
 #: ../panels/keyboard/cc-keyboard-option.c:264
-#| msgid "Right Half"
 msgid "Right Ctrl+Shift"
 msgstr "Ctrl derecha+MayÃs"
 
@@ -1610,7 +1616,6 @@ msgid "Left+Right Shift"
 msgstr "Izquierda+MayÃs derecha"
 
 #: ../panels/keyboard/cc-keyboard-option.c:266
-#| msgid "Left Ring"
 msgid "Left+Right Alt"
 msgstr "Izquierda+Alt derecha"
 
@@ -1929,31 +1934,21 @@ msgstr "Una sola pulsacioÌn, botoÌn secundario"
 
 #. TRANSLATORS: this is to disable the radio hardware in the
 #. * network panel
-#: ../panels/network/cc-network-panel.c:338
+#: ../panels/network/cc-network-panel.c:341
 msgid "Air_plane Mode"
 msgstr "Modo a_viÃn"
 
-#: ../panels/network/cc-network-panel.c:879
+#: ../panels/network/cc-network-panel.c:904
 msgid "Network proxy"
 msgstr "Proxy de la red"
 
-#: ../panels/network/cc-network-panel.c:1058 ../panels/network/net-vpn.c:280
+#: ../panels/network/cc-network-panel.c:1083 ../panels/network/net-vpn.c:280
 #, c-format
 msgid "%s VPN"
 msgstr "VPN Â%sÂ"
 
-#: ../panels/network/cc-network-panel.c:1128
-#: ../panels/network/connection-editor/net-connection-editor.c:584
-msgid "Bond"
-msgstr ""
-
-#: ../panels/network/cc-network-panel.c:1130
-#: ../panels/network/connection-editor/net-connection-editor.c:588
-msgid "VLAN"
-msgstr "VLAN"
-
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:1202
+#: ../panels/network/cc-network-panel.c:1216
 msgid "The system network services are not compatible with this version."
 msgstr "Los servicios de red del sistema no son compatibles con esta versiÃn."
 
@@ -1971,7 +1966,6 @@ msgstr "Identidad anoÌni_ma"
 
 #: ../panels/network/connection-editor/8021x-security-page.ui.h:4
 #: ../panels/network/connection-editor/security-page.ui.h:4
-#| msgid "Authenticating"
 msgid "Inner _authentication"
 msgstr "AutenticacioÌn i_nterna"
 
@@ -2017,7 +2011,7 @@ msgid "None"
 msgstr "Ninguna"
 
 #: ../panels/network/connection-editor/ce-page-details.c:91
-#: ../panels/power/power.ui.h:9
+#: ../panels/power/power.ui.h:19
 msgid "Never"
 msgstr "Nunca"
 
@@ -2043,38 +2037,37 @@ msgstr[1] "hace %i dÃas"
 #. Translators: network device speed
 #: ../panels/network/connection-editor/ce-page-details.c:155
 #: ../panels/network/net-device-ethernet.c:54
-#: ../panels/network/net-device-mobile.c:278
-#: ../panels/network/net-device-wifi.c:538
+#: ../panels/network/net-device-wifi.c:537
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
 #: ../panels/network/connection-editor/ce-page-details.c:179
-#: ../panels/network/net-device-wifi.c:567
+#: ../panels/network/net-device-wifi.c:566
 msgctxt "Signal strength"
 msgid "None"
 msgstr "Ninguna"
 
 #: ../panels/network/connection-editor/ce-page-details.c:181
-#: ../panels/network/net-device-wifi.c:569
+#: ../panels/network/net-device-wifi.c:568
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "DeÌbil"
 
 #: ../panels/network/connection-editor/ce-page-details.c:183
-#: ../panels/network/net-device-wifi.c:571
+#: ../panels/network/net-device-wifi.c:570
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "Aceptar"
 
 #: ../panels/network/connection-editor/ce-page-details.c:185
-#: ../panels/network/net-device-wifi.c:573
+#: ../panels/network/net-device-wifi.c:572
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Buena"
 
 #: ../panels/network/connection-editor/ce-page-details.c:187
-#: ../panels/network/net-device-wifi.c:575
+#: ../panels/network/net-device-wifi.c:574
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Excelente"
@@ -2086,59 +2079,82 @@ msgstr "Excelente"
 msgid "Identity"
 msgstr "Identidad"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:183
-#: ../panels/network/connection-editor/ce-page-ip4.c:419
+#: ../panels/network/connection-editor/ce-page-ip4.c:194
+#: ../panels/network/connection-editor/ce-page-ip4.c:445
 msgid "Netmask"
 msgstr "MaÌscara de red"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:186
-#: ../panels/network/connection-editor/ce-page-ip4.c:422
-#: ../panels/network/connection-editor/ce-page-ip6.c:188
-#: ../panels/network/connection-editor/ce-page-ip6.c:426
+#: ../panels/network/connection-editor/ce-page-ip4.c:208
+#: ../panels/network/connection-editor/ce-page-ip4.c:458
+#: ../panels/network/connection-editor/ce-page-ip6.c:209
+#: ../panels/network/connection-editor/ce-page-ip6.c:466
 #: ../panels/network/network-vpn.ui.h:3
 msgid "Gateway"
 msgstr "Puerta de enlace"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:330
-#: ../panels/network/connection-editor/ce-page-ip6.c:334
+#: ../panels/network/connection-editor/ce-page-ip4.c:225
+#: ../panels/network/connection-editor/ce-page-ip6.c:226
+#| msgid "_Cloned Address"
+msgid "Delete Address"
+msgstr "Eliminar direcciÃn"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:277
+#: ../panels/network/connection-editor/ce-page-ip6.c:278
+#| msgid "_Add"
+msgid "Add"
+msgstr "AnÌadir"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:342
+#: ../panels/network/connection-editor/ce-page-ip6.c:346
 msgid "Server"
 msgstr "Servidor"
 
-#. Translators: Please see http://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ce-page-ip4.c:426
-#: ../panels/network/connection-editor/ce-page-ip6.c:430
-#| msgid "Metric"
+#: ../panels/network/connection-editor/ce-page-ip4.c:359
+#: ../panels/network/connection-editor/ce-page-ip6.c:363
+#| msgid "Delete device"
+msgid "Delete DNS Server"
+msgstr "Eliminar servidor DNS"
+
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ce-page-ip4.c:472
+#: ../panels/network/connection-editor/ce-page-ip6.c:480
 msgctxt "network parameters"
 msgid "Metric"
 msgstr "MeÌtrica"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:579
+#: ../panels/network/connection-editor/ce-page-ip4.c:493
+#: ../panels/network/connection-editor/ce-page-ip6.c:501
+#| msgid "Default Route"
+msgid "Delete Route"
+msgstr "Eliminar ruta"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:605
 #: ../panels/network/network-wifi.ui.h:26
 msgid "Automatic (DHCP)"
 msgstr "AutomaÌtico (DHCP)"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:583
-#: ../panels/network/connection-editor/ce-page-ip6.c:585
+#: ../panels/network/connection-editor/ce-page-ip4.c:609
+#: ../panels/network/connection-editor/ce-page-ip6.c:611
 #: ../panels/network/network-wifi.ui.h:25
 msgid "Manual"
 msgstr "Manual"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:587
-#: ../panels/network/connection-editor/ce-page-ip6.c:589
+#: ../panels/network/connection-editor/ce-page-ip4.c:613
+#: ../panels/network/connection-editor/ce-page-ip6.c:615
 msgid "Link-Local Only"
 msgstr "SoÌlo enlace local"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:888
+#: ../panels/network/connection-editor/ce-page-ip4.c:914
 #: ../panels/network/network-wifi.ui.h:60
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:185
-#: ../panels/network/connection-editor/ce-page-ip6.c:423
+#: ../panels/network/connection-editor/ce-page-ip6.c:196
+#: ../panels/network/connection-editor/ce-page-ip6.c:449
 msgid "Prefix"
 msgstr "Prefijo"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:577
+#: ../panels/network/connection-editor/ce-page-ip6.c:603
 #: ../panels/network/connection-editor/ethernet-page.ui.h:1
 #: ../panels/network/connection-editor/ip4-page.ui.h:4
 #: ../panels/network/connection-editor/ip6-page.ui.h:4
@@ -2146,11 +2162,11 @@ msgstr "Prefijo"
 msgid "Automatic"
 msgstr "AutomaÌtico"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:581
+#: ../panels/network/connection-editor/ce-page-ip6.c:607
 msgid "Automatic, DHCP only"
 msgstr "AutomaÌtico, DHCP uÌnicamente"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:849
+#: ../panels/network/connection-editor/ce-page-ip6.c:875
 #: ../panels/network/network-wifi.ui.h:61
 msgid "IPv6"
 msgstr "IPv6"
@@ -2211,7 +2227,7 @@ msgstr "Velocidad de conexiÃn"
 #: ../panels/network/connection-editor/details-page.ui.h:4
 #: ../panels/network/net-device-ethernet.c:159
 #: ../panels/network/network-simple.ui.h:2
-#: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:684
+#: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
 msgid "IPv4 Address"
 msgstr "DirecciÃn IPv4"
 
@@ -2220,7 +2236,7 @@ msgstr "DirecciÃn IPv4"
 #: ../panels/network/net-device-ethernet.c:164
 #: ../panels/network/network-mobile.ui.h:4
 #: ../panels/network/network-simple.ui.h:3
-#: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:685
+#: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
 msgid "IPv6 Address"
 msgstr "DirecciÃn IPv6"
 
@@ -2250,7 +2266,6 @@ msgid "DNS"
 msgstr "DNS"
 
 #: ../panels/network/connection-editor/details-page.ui.h:9
-#| msgid "Last used"
 msgid "Last Used"
 msgstr "Usada por uÌltima vez"
 
@@ -2313,7 +2328,7 @@ msgstr "Conectar _automaÌticamente"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:15
 msgid "Make available to other _users"
-msgstr ""
+msgstr "Hacer disponible para _otros usuarios"
 
 #: ../panels/network/connection-editor/ethernet-page.ui.h:16
 msgid "bytes"
@@ -2332,15 +2347,27 @@ msgstr "_Direcciones"
 
 #: ../panels/network/connection-editor/ip4-page.ui.h:5
 #: ../panels/network/connection-editor/ip6-page.ui.h:5
+#| msgid "Automatic"
+msgid "Automatic DNS"
+msgstr "DNS automaÌtico"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
 #: ../panels/network/network-wifi.ui.h:39
 msgid "Routes"
 msgstr "Rutas"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#| msgid "Automatic Suspend"
+msgid "Automatic Routes"
+msgstr "Rutas automaÌticas"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
 #: ../panels/network/network-wifi.ui.h:45
 msgid "Use this connection _only for resources on its network"
-msgstr ""
+msgstr "Usar esta c_onexioÌn soÌlo para los recursos en su red"
 
 #: ../panels/network/connection-editor/ip6-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:47
@@ -2348,7 +2375,6 @@ msgid "IPv_6"
 msgstr "IPv_6"
 
 #: ../panels/network/connection-editor/net-connection-editor.c:267
-#| msgid "Bluetooth connection failed"
 msgid "Unable to open connection editor"
 msgstr "No se pudo abrir el editor de conexiones"
 
@@ -2356,23 +2382,30 @@ msgstr "No se pudo abrir el editor de conexiones"
 msgid "New Profile"
 msgstr "Perfil nuevo"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:502
+#: ../panels/network/connection-editor/net-connection-editor.c:504
 #: ../panels/printers/new-printer-dialog.ui.h:2
 #: ../panels/user-accounts/um-account-dialog.c:1068
 msgid "_Add"
 msgstr "_AnÌadir"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:583
+#: ../panels/network/connection-editor/net-connection-editor.c:585
 #: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
 msgid "VPN"
 msgstr "VPN"
 
 #: ../panels/network/connection-editor/net-connection-editor.c:586
+msgid "Bond"
+msgstr ""
+
+#: ../panels/network/connection-editor/net-connection-editor.c:587
 msgid "Bridge"
 msgstr "Puente"
 
+#: ../panels/network/connection-editor/net-connection-editor.c:588
+msgid "VLAN"
+msgstr "VLAN"
+
 #: ../panels/network/connection-editor/net-connection-editor.c:738
-#| msgid "Could not load ui: %s"
 msgid "Could not load VPN plugins"
 msgstr "No se pudieron cargar los complementos de VPN"
 
@@ -2390,7 +2423,7 @@ msgid "_Reset"
 msgstr "_Reiniciar"
 
 #: ../panels/network/connection-editor/reset-page.ui.h:2
-#: ../panels/network/net-device-wifi.c:1404
+#: ../panels/network/net-device-wifi.c:1411
 #: ../panels/network/network-wifi.ui.h:54
 msgid "_Forget"
 msgstr "_Olvidar"
@@ -2400,12 +2433,16 @@ msgid ""
 "Reset the settings for this network, including passwords, but remember it as "
 "a preferred network"
 msgstr ""
+"Restablecer la configuraciÃn para esta red, incluyendo las contraseÃas, pero "
+"recordarla como una red preferida."
 
 #: ../panels/network/connection-editor/reset-page.ui.h:4
 msgid ""
 "Remove all details relating to this network and do not try to automatically "
 "connect"
 msgstr ""
+"Quitar todos los detalles relativos a esta red y no volver a intentar "
+"conectarse automaÌticamente a ella."
 
 #: ../panels/network/connection-editor/security-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:14
@@ -2424,6 +2461,10 @@ msgid ""
 "\n"
 "Error: %s."
 msgstr ""
+"No se pudo leer el archivo Â%s o no contiene informacioÌn de conexioÌn VPN que "
+"se pueda reconocer\n"
+"\n"
+"Error: %s."
 
 #: ../panels/network/connection-editor/vpn-helpers.c:242
 msgid "Select file to import"
@@ -2441,7 +2482,7 @@ msgstr "_Reemplazar"
 #: ../panels/network/connection-editor/vpn-helpers.c:298
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
-msgstr ""
+msgstr "ÂQuiere reemplazar %s con la conexiÃn VP que està guardando?"
 
 #: ../panels/network/connection-editor/vpn-helpers.c:334
 msgid "Cannot export VPN connection"
@@ -2454,6 +2495,9 @@ msgid ""
 "\n"
 "Error: %s."
 msgstr ""
+"No se pudo exportar la conexioÌn VPN Â%s a %s.\n"
+"\n"
+"Error: %s."
 
 #: ../panels/network/connection-editor/vpn-helpers.c:371
 msgid "Export VPN connection..."
@@ -2461,7 +2505,7 @@ msgstr "Exportar conexioÌn VPNâ"
 
 #: ../panels/network/connection-editor/vpn-page.ui.h:2
 msgid "(Error: unable to load VPN connection editor)"
-msgstr ""
+msgstr "(Error: no se pudo cargar el editor de conexiones VPN)"
 
 #: ../panels/network/connection-editor/wifi-page.ui.h:1
 #: ../panels/network/network-wifi.ui.h:12
@@ -2475,7 +2519,6 @@ msgstr "_BSSID"
 
 #: ../panels/network/connection-editor/wifi-page.ui.h:3
 #: ../panels/network/network-wifi.ui.h:16
-#| msgid "_Forget Network"
 msgid "My Home Network"
 msgstr "Mi red privada"
 
@@ -2503,8 +2546,7 @@ msgstr ""
 msgid "Bond slaves"
 msgstr "Asociar esclavos"
 
-#: ../panels/network/net-device-bridge.c:79
-#| msgid "Bond slaves"
+#: ../panels/network/net-device-bridge.c:77
 msgid "Bridge slaves"
 msgstr "Asociar esclavos"
 
@@ -2525,7 +2567,7 @@ msgstr "ayer"
 
 #: ../panels/network/net-device-ethernet.c:162
 #: ../panels/network/network-mobile.ui.h:3
-#: ../panels/network/panel-common.c:687 ../panels/network/panel-common.c:689
+#: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
 #: ../panels/printers/printers.ui.h:13
 msgid "IP Address"
 msgstr "DirecciÃn IP"
@@ -2535,16 +2577,23 @@ msgstr "DirecciÃn IP"
 msgid "Last used"
 msgstr "Usada Ãltima vez"
 
-#: ../panels/network/net-device-ethernet.c:477
+#: ../panels/network/net-device-ethernet.c:337
+#: ../panels/network/net-device-wifi.c:1549
+#: ../panels/network/network-ethernet.ui.h:2
+#: ../panels/network/network-vpn.ui.h:8 ../panels/universal-access/uap.ui.h:23
+msgid "Optionsâ"
+msgstr "Opcionesâ"
+
+#: ../panels/network/net-device-ethernet.c:470
 #, c-format
 msgid "Profile %d"
 msgstr "Perfil %d"
 
-#: ../panels/network/net-device-mobile.c:220
+#: ../panels/network/net-device-mobile.c:239
 msgid "Add new connection"
 msgstr "AÃadir una conexiÃn nueva"
 
-#: ../panels/network/net-device-wifi.c:1125
+#: ../panels/network/net-device-wifi.c:1120
 msgid ""
 "If you have a connection to the Internet other than wireless, you can set up "
 "a wireless hotspot to share the connection with others."
@@ -2552,12 +2601,12 @@ msgstr ""
 "Si tiene otra conexioÌn a Internet aparte de la inalaÌmbrica, puede configurar "
 "un Âhotspot inalaÌmbrico para compartir su conexioÌn a Internet con otros."
 
-#: ../panels/network/net-device-wifi.c:1129
+#: ../panels/network/net-device-wifi.c:1124
 #, c-format
 msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
 msgstr "Cambiar al Âhotspot inalÃmbrico le desconectarà de <b>%s</b>."
 
-#: ../panels/network/net-device-wifi.c:1133
+#: ../panels/network/net-device-wifi.c:1128
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2565,18 +2614,24 @@ msgstr ""
 "No es posible acceder a Internet usando la conexioÌn inalaÌmbrica mientras el "
 "Âhotspot estaÌ activado."
 
-#: ../panels/network/net-device-wifi.c:1207
+#: ../panels/network/net-device-wifi.c:1202
 msgid "Stop hotspot and disconnect any users?"
 msgstr "ÂDetener el Âhotspot y desconectar a los usuarios?"
 
-#: ../panels/network/net-device-wifi.c:1210
+#: ../panels/network/net-device-wifi.c:1205
 msgid "_Stop Hotspot"
 msgstr "_Detener ÂhotspotÂ"
 
-#: ../panels/network/net-device-wifi.c:1400
-#| msgid ""
-#| "Network details for %s including password and any custom configuration "
-#| "will be lost."
+#: ../panels/network/net-device-wifi.c:1277
+msgid "System policy prohibits use as a Hotspot"
+msgstr "La polÃtica del sistema prohÃbe usarlo como punto de acceso"
+
+#: ../panels/network/net-device-wifi.c:1280
+#| msgid "InfiniBand device does not support connected mode"
+msgid "Wireless device does not support Hotspot mode"
+msgstr "El dispositivo inalÃmbrico no soporta el modo de punto de acceso"
+
+#: ../panels/network/net-device-wifi.c:1407
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
@@ -2584,13 +2639,13 @@ msgstr ""
 "Se perderÃn los detalles de las redes seleccionadas, incluyendo la "
 "contraseÃa y cualquier configuraciÃn personalizada."
 
-#: ../panels/network/net-device-wifi.c:1705
+#: ../panels/network/net-device-wifi.c:1714
 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
 msgid "History"
 msgstr "HistoÌrico"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: ../panels/network/net-device-wifi.c:1717
+#: ../panels/network/net-device-wifi.c:1726
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Olvidar"
@@ -2611,7 +2666,7 @@ msgstr ""
 msgid "This is not recommended for untrusted public networks."
 msgstr "No se recomienda para redes pÃblicas en las que no se confÃa."
 
-#: ../panels/network/net-proxy.c:406
+#: ../panels/network/net-proxy.c:408
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -2628,7 +2683,7 @@ msgid "Provider"
 msgstr "Proveedor"
 
 #: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:6
+#: ../panels/network/network-simple.ui.h:7
 msgid "_Optionsâ"
 msgstr "_Opcionesâ"
 
@@ -2675,6 +2730,31 @@ msgstr "_Servidor socks"
 msgid "_Ignore Hosts"
 msgstr "_Ignorar anfitriones"
 
+#: ../panels/network/network-proxy.ui.h:11
+#| msgid "_HTTP Proxy"
+msgid "HTTP proxy port"
+msgstr "Puerto para proxy HTTP"
+
+#: ../panels/network/network-proxy.ui.h:12
+#| msgid "H_TTPS Proxy"
+msgid "HTTPS proxy port"
+msgstr "Puerto para proxy HTTPS"
+
+#: ../panels/network/network-proxy.ui.h:13
+#| msgid "_FTP Proxy"
+msgid "FTP proxy port"
+msgstr "Puerto para proxy FTP"
+
+#: ../panels/network/network-proxy.ui.h:14
+#| msgid "Socks Port"
+msgid "Socks proxy port"
+msgstr "Puerto para proxy Socks"
+
+#: ../panels/network/network-simple.ui.h:6
+#| msgid "Device Off"
+msgid "Turn device off"
+msgstr "Apagar dispositivo"
+
 #: ../panels/network/network.ui.h:1
 msgid "Select the interface to use for the new service"
 msgstr "Seleccionar la interfaz que usar para el servicio nuevo"
@@ -2707,8 +2787,12 @@ msgstr "ContrasenÌa del grupo"
 msgid "Username"
 msgstr "Nombre de usuario"
 
+#: ../panels/network/network-vpn.ui.h:7
+#| msgid "Export VPN connection..."
+msgid "Turn VPN connection off"
+msgstr "Cerrar la conexiÃn VPN"
+
 #: ../panels/network/network-wifi.ui.h:1
-#| msgid "A_utomatic Login"
 msgid "Automatic _Connect"
 msgstr "_Conectar automÃticamente"
 
@@ -2740,7 +2824,6 @@ msgid "Show P_assword"
 msgstr "Mostrar contr_asenÌa"
 
 #: ../panels/network/network-wifi.ui.h:21
-#| msgid "Failed to delete user"
 msgid "Make available to other users"
 msgstr "Hacer disponible para el resto de usuarios"
 
@@ -2840,349 +2923,333 @@ msgstr "Punto de acceso Wi-Fi"
 msgid "_Turn On"
 msgstr "_Activar"
 
-#. TRANSLATORS: device type
-#: ../panels/network/network-wifi.ui.h:66 ../panels/network/panel-common.c:87
+#: ../panels/network/network-wifi.ui.h:66
 msgid "Wi-Fi"
 msgstr "InalaÌmbrica"
 
 #: ../panels/network/network-wifi.ui.h:67
+#| msgid "Turn on or off:"
+msgid "Turn Wi-Fi off"
+msgstr "Apagar la Wi-Fi"
+
+#: ../panels/network/network-wifi.ui.h:68
 msgid "_Use as Hotspotâ"
 msgstr "_Usar como ÂhotspotÂâ"
 
-#: ../panels/network/network-wifi.ui.h:68
+#: ../panels/network/network-wifi.ui.h:69
 msgid "_Connect to Hidden Networkâ"
 msgstr "Conectar a una red ocultaâ"
 
-#: ../panels/network/network-wifi.ui.h:69
+#: ../panels/network/network-wifi.ui.h:70
 msgid "_History"
 msgstr "_HistoÌrico"
 
-#: ../panels/network/network-wifi.ui.h:70
+#: ../panels/network/network-wifi.ui.h:71
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "Apagar para conectarse a una red inalaÌmbrica"
 
-#: ../panels/network/network-wifi.ui.h:71
+#: ../panels/network/network-wifi.ui.h:72
 msgid "Network Name"
 msgstr "Nombre de red"
 
-#: ../panels/network/network-wifi.ui.h:72
+#: ../panels/network/network-wifi.ui.h:73
 msgid "Connected Devices"
 msgstr "Dispositivos conectados"
 
-#: ../panels/network/network-wifi.ui.h:73
+#: ../panels/network/network-wifi.ui.h:74
 msgid "Security type"
 msgstr "Tipo de seguridad"
 
-#: ../panels/network/network-wifi.ui.h:74
+#: ../panels/network/network-wifi.ui.h:75
 msgid "Security key"
 msgstr "Clave de seguridad"
 
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:83
-msgid "Wired"
-msgstr "Cableada"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:94
-msgid "Mobile broadband"
-msgstr "Banda ancha mÃvil"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:103
-msgid "Mesh"
-msgstr "Malla"
-
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:165
+#: ../panels/network/panel-common.c:131
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:169
+#: ../panels/network/panel-common.c:135
 msgid "Infrastructure"
 msgstr "Infraestructura"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:193 ../panels/network/panel-common.c:256
+#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
 msgid "Status unknown"
 msgstr "Estado desconocido"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:197
+#: ../panels/network/panel-common.c:155
 msgid "Unmanaged"
 msgstr "Sin gestionar"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:202
-msgid "Firmware missing"
-msgstr "falta el ÂfirmwareÂ"
-
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:206
-msgid "Cable unplugged"
-msgstr "Cable desconectado"
-
-#. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:209
+#: ../panels/network/panel-common.c:159
 msgid "Unavailable"
 msgstr "No disponible"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:220 ../panels/network/panel-common.c:262
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
 msgid "Connecting"
 msgstr "Conectando"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:224 ../panels/network/panel-common.c:266
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
 msgid "Authentication required"
 msgstr "Se necesita autenticacioÌn"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:228 ../panels/network/panel-common.c:270
+#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
 msgid "Connected"
 msgstr "Conectado"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:232
+#: ../panels/network/panel-common.c:181
 msgid "Disconnecting"
 msgstr "Desconectando"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:236 ../panels/network/panel-common.c:274
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
 msgid "Connection failed"
 msgstr "Fallà la conexiÃn"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:240 ../panels/network/panel-common.c:282
+#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
 msgid "Status unknown (missing)"
 msgstr "Estado desconocido (ausente)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:278
+#: ../panels/network/panel-common.c:227
 msgid "Not connected"
 msgstr "No conectado"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:302
+#: ../panels/network/panel-common.c:252
 msgid "Configuration failed"
 msgstr "Fallà la configuraciÃn"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:306
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration failed"
 msgstr "Fallà la configuraciÃn IP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:310
+#: ../panels/network/panel-common.c:260
 msgid "IP configuration expired"
 msgstr "La configuraciÃn IP ha expirado"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:314
+#: ../panels/network/panel-common.c:264
 msgid "Secrets were required, but not provided"
 msgstr "Se necesitan secretos, pero no se han proporcionado"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:318
+#: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant disconnected"
 msgstr "Suplicante de 802.1x desconectado"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:322
+#: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant configuration failed"
 msgstr "Fallà la configuraciÃn del suplicante de 802.1x"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:326
+#: ../panels/network/panel-common.c:276
 msgid "802.1x supplicant failed"
 msgstr "Fallà el suplicante de 802.1x"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:330
+#: ../panels/network/panel-common.c:280
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "El suplicante de 802.1x tardà mucho tiempo en autenticarse"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:334
+#: ../panels/network/panel-common.c:284
 msgid "PPP service failed to start"
 msgstr "FalloÌ al iniciar el servicio de PPP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:338
+#: ../panels/network/panel-common.c:288
 msgid "PPP service disconnected"
 msgstr "Servicio PPP desconectado"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:342
+#: ../panels/network/panel-common.c:292
 msgid "PPP failed"
 msgstr "PPP fallÃ"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:346
+#: ../panels/network/panel-common.c:296
 msgid "DHCP client failed to start"
 msgstr "Fallà al iniciar el cliente de DHCP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:350
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client error"
 msgstr "Error del cliente de DHCP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:354
+#: ../panels/network/panel-common.c:304
 msgid "DHCP client failed"
 msgstr "Fallà el cliente de DHCP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:358
+#: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed to start"
 msgstr "Fallà al iniciar el servicio de conexiÃn compartida"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:362
+#: ../panels/network/panel-common.c:312
 msgid "Shared connection service failed"
 msgstr "Fallà el servicio de conexiÃn compartida"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:366
+#: ../panels/network/panel-common.c:316
 msgid "AutoIP service failed to start"
 msgstr "Fallà al iniciar el servicio de AutoIP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:370
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service error"
 msgstr "Error del servicio de AutoIP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:374
+#: ../panels/network/panel-common.c:324
 msgid "AutoIP service failed"
 msgstr "FalloÌ el servicio AutoIP"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:378
+#: ../panels/network/panel-common.c:328
 msgid "Line busy"
 msgstr "LÃnea ocupada"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:382
+#: ../panels/network/panel-common.c:332
 msgid "No dial tone"
 msgstr "No hay tono de llamada"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:386
+#: ../panels/network/panel-common.c:336
 msgid "No carrier could be established"
 msgstr "No se pudo establecer el portador"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:390
+#: ../panels/network/panel-common.c:340
 msgid "Dialing request timed out"
 msgstr "ExpiroÌ el tiempo de solicitud de llamada"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:394
+#: ../panels/network/panel-common.c:344
 msgid "Dialing attempt failed"
 msgstr "Intento de llamada fallido"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:398
+#: ../panels/network/panel-common.c:348
 msgid "Modem initialization failed"
 msgstr "FalloÌ la inicializaciÃn del mÃdem"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:402
+#: ../panels/network/panel-common.c:352
 msgid "Failed to select the specified APN"
 msgstr "FalloÌ al seleccionar el NPA especificado"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:406
+#: ../panels/network/panel-common.c:356
 msgid "Not searching for networks"
 msgstr "No se estÃn buscando redes"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:410
+#: ../panels/network/panel-common.c:360
 msgid "Network registration denied"
 msgstr "Registro de la red denegado"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:414
+#: ../panels/network/panel-common.c:364
 msgid "Network registration timed out"
 msgstr "ExpiroÌ el tiempo de registro de la red"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:418
+#: ../panels/network/panel-common.c:368
 msgid "Failed to register with the requested network"
 msgstr "Fallà al registrarse con la red solicitada"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:422
+#: ../panels/network/panel-common.c:372
 msgid "PIN check failed"
 msgstr "FalloÌ la comprobacioÌn de l PIN"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:426
+#: ../panels/network/panel-common.c:376
 msgid "Firmware for the device may be missing"
 msgstr "Es posible que falte el firmware del dispositivo"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:430
+#: ../panels/network/panel-common.c:380
 msgid "Connection disappeared"
 msgstr "La conexiÃn ha desaparecido"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:434
-msgid "Carrier/link changed"
-msgstr "Ha cambiado el portador/enlace"
-
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:438
+#: ../panels/network/panel-common.c:384
 msgid "Existing connection was assumed"
 msgstr "Se asumià una conexiÃn existente"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:442
+#: ../panels/network/panel-common.c:388
 msgid "Modem not found"
 msgstr "MÃdem no encontrado"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:446
+#: ../panels/network/panel-common.c:392
 msgid "Bluetooth connection failed"
 msgstr "Fallà la conexiÃn Bluetooth"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:450
+#: ../panels/network/panel-common.c:396
 msgid "SIM Card not inserted"
 msgstr "Tarjeta SIM no insertada"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:454
+#: ../panels/network/panel-common.c:400
 msgid "SIM Pin required"
 msgstr "Se necesita el PIN de la SIM"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:458
+#: ../panels/network/panel-common.c:404
 msgid "SIM Puk required"
 msgstr "Se necesita el PUK de la SIM"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:462
+#: ../panels/network/panel-common.c:408
 msgid "SIM wrong"
 msgstr "SIM errÃnea"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:466
+#: ../panels/network/panel-common.c:412
 msgid "InfiniBand device does not support connected mode"
 msgstr "El dispositivo InfiniBand no soporta el modo conectado"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:470
+#: ../panels/network/panel-common.c:416
 msgid "Connection dependency failed"
 msgstr "Fallà la dependencia de la conexiÃn"
 
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:440
+msgid "Firmware missing"
+msgstr "falta el ÂfirmwareÂ"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+msgid "Cable unplugged"
+msgstr "Cable desconectado"
+
 #: ../panels/network/wireless-security/eap-method-fast.c:261
 #: ../panels/network/wireless-security/eap-method-peap.c:280
 msgid "GTC"
@@ -3209,7 +3276,6 @@ msgstr "Archivo _PAC"
 #: ../panels/network/wireless-security/eap-method-fast.ui.h:3
 #: ../panels/network/wireless-security/eap-method-peap.ui.h:7
 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
-#| msgid "<b>_Use authentication</b>"
 msgid "_Inner authentication"
 msgstr "AutenticacioÌn i_nterna"
 
@@ -3307,7 +3373,6 @@ msgstr ""
 "(Puede proteger su clave privada con una contrasenÌa con openssl)"
 
 #: ../panels/network/wireless-security/eap-method-tls.c:428
-#| msgid "Set your personal information"
 msgid "Choose your personal certificate..."
 msgstr "Elija su certificado personalâ"
 
@@ -3470,14 +3535,14 @@ msgid "Show Details in Lock Screen"
 msgstr "Mostrar detalles en la pantalla de bloqueo"
 
 #: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1628 ../panels/power/cc-power-panel.c:1635
+#: ../panels/power/cc-power-panel.c:1637 ../panels/power/cc-power-panel.c:1644
 #: ../panels/privacy/cc-privacy-panel.c:78
 #: ../panels/privacy/cc-privacy-panel.c:145
 msgid "On"
 msgstr "Encendido"
 
 #: ../panels/notifications/cc-notifications-panel.c:203
-#: ../panels/power/cc-power-panel.c:1622 ../panels/power/cc-power-panel.c:1633
+#: ../panels/power/cc-power-panel.c:1631 ../panels/power/cc-power-panel.c:1642
 #: ../panels/privacy/cc-privacy-panel.c:78
 #: ../panels/privacy/cc-privacy-panel.c:145
 msgid "Off"
@@ -3656,162 +3721,161 @@ msgstr "Descargando"
 msgid "Estimated battery capacity: %s"
 msgstr "Capacidad estimada de la baterÃa: %s"
 
-#: ../panels/power/cc-power-panel.c:400
+#: ../panels/power/cc-power-panel.c:404
 msgctxt "Battery name"
 msgid "Main"
 msgstr "Principal"
 
-#: ../panels/power/cc-power-panel.c:402
+#: ../panels/power/cc-power-panel.c:406
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "Adicional"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:484
+#: ../panels/power/cc-power-panel.c:493
 msgid "Wireless mouse"
 msgstr "RatÃn inalÃmbrico"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:488
+#: ../panels/power/cc-power-panel.c:497
 msgid "Wireless keyboard"
 msgstr "Teclado inalÃmbrico"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:492
+#: ../panels/power/cc-power-panel.c:501
 msgid "Uninterruptible power supply"
 msgstr "Fuente de alimentaciÃn no interrumplible"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:497
+#: ../panels/power/cc-power-panel.c:506
 msgid "Personal digital assistant"
 msgstr "Asistente digital personal"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:501
+#: ../panels/power/cc-power-panel.c:510
 msgid "Cellphone"
 msgstr "TeleÌfono moÌvil"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:505
+#: ../panels/power/cc-power-panel.c:514
 msgid "Media player"
 msgstr "Reproductor multimedia"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:509
+#: ../panels/power/cc-power-panel.c:518
 msgid "Tablet"
 msgstr "Tableta"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:513
+#: ../panels/power/cc-power-panel.c:522
 msgid "Computer"
 msgstr "Equipo"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:517 ../panels/power/cc-power-panel.c:725
-#: ../panels/power/cc-power-panel.c:1929
+#: ../panels/power/cc-power-panel.c:526 ../panels/power/cc-power-panel.c:734
+#: ../panels/power/cc-power-panel.c:1938
 msgid "Battery"
 msgstr "BateriÌa"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:526
+#: ../panels/power/cc-power-panel.c:535
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Cargando"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:533
+#: ../panels/power/cc-power-panel.c:542
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "PrecaucioÌn"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:538
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Baja"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:543
+#: ../panels/power/cc-power-panel.c:552
 msgctxt "Battery power"
 msgid "Good"
 msgstr "Bien"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:548
+#: ../panels/power/cc-power-panel.c:557
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "Cargada completamente"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:552
+#: ../panels/power/cc-power-panel.c:561
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "VaciÌa"
 
-#: ../panels/power/cc-power-panel.c:723
+#: ../panels/power/cc-power-panel.c:732
 msgid "Batteries"
 msgstr "BateriÌas"
 
-#: ../panels/power/cc-power-panel.c:1065
+#: ../panels/power/cc-power-panel.c:1074
 msgid "When _idle"
 msgstr ""
 
-#: ../panels/power/cc-power-panel.c:1392
+#: ../panels/power/cc-power-panel.c:1401
 msgid "Power Saving"
 msgstr "Ahorro de energÃa"
 
-#: ../panels/power/cc-power-panel.c:1421
+#: ../panels/power/cc-power-panel.c:1430
 msgid "_Screen Brightness"
 msgstr "_Brillo de la pantalla"
 
-#: ../panels/power/cc-power-panel.c:1449
-#| msgid "Suspend when inactive for"
+#: ../panels/power/cc-power-panel.c:1458
 msgid "_Dim Screen when Inactive"
 msgstr "_Oscurecer la pantalla cuando està inactiva"
 
-#: ../panels/power/cc-power-panel.c:1472
-msgid "_Mark As Inactive After"
-msgstr "_Marcar como inactivo despuÃs de"
+#: ../panels/power/cc-power-panel.c:1481
+#, fuzzy
+#| msgid "Full Screen"
+msgid "_Blank Screen"
+msgstr "Pantalla completa"
 
-#: ../panels/power/cc-power-panel.c:1507
+#: ../panels/power/cc-power-panel.c:1516
 msgid "_Wi-Fi"
 msgstr "_Wi-Fi"
 
-#: ../panels/power/cc-power-panel.c:1535
+#: ../panels/power/cc-power-panel.c:1544
 msgid "_Mobile Broadband"
 msgstr "Banda ancha _mÃvil"
 
-#: ../panels/power/cc-power-panel.c:1573
+#: ../panels/power/cc-power-panel.c:1582
 msgid "_Bluetooth"
 msgstr "_Bluetooth"
 
-#: ../panels/power/cc-power-panel.c:1624
+#: ../panels/power/cc-power-panel.c:1633
 msgid "When on battery power"
 msgstr "En modo baterÃa"
 
-#: ../panels/power/cc-power-panel.c:1626
+#: ../panels/power/cc-power-panel.c:1635
 msgid "When plugged in"
 msgstr "Cuando està conectado a la red"
 
-#: ../panels/power/cc-power-panel.c:1753
+#: ../panels/power/cc-power-panel.c:1762
 msgid "Suspend & Power Off"
 msgstr "Suspender y apagar"
 
-#: ../panels/power/cc-power-panel.c:1784
-#| msgctxt "proxy method"
-#| msgid "Automatic"
+#: ../panels/power/cc-power-panel.c:1793
 msgid "_Automatic Suspend"
 msgstr "Suspender _automaÌticamente"
 
-#: ../panels/power/cc-power-panel.c:1806
+#: ../panels/power/cc-power-panel.c:1815
 msgid "When Battery Power is _Critical"
 msgstr "_Cuando la carga està crÃticamente baja"
 
-#: ../panels/power/cc-power-panel.c:1839
+#: ../panels/power/cc-power-panel.c:1848
 msgid "Power Off"
 msgstr "Apagar"
 
-#: ../panels/power/cc-power-panel.c:1981
+#: ../panels/power/cc-power-panel.c:1990
 msgid "Devices"
 msgstr "Dispositivos"
 
@@ -3839,48 +3903,92 @@ msgstr "Hibernar"
 msgid "Power off"
 msgstr "Apagar"
 
-#: ../panels/power/power.ui.h:3 ../panels/privacy/privacy.ui.h:6
-msgid "5 minutes"
-msgstr "5 minutos"
-
-#: ../panels/power/power.ui.h:4
-msgid "10 minutes"
-msgstr "10 minutos"
+#: ../panels/power/power.ui.h:5
+#| msgid "5 minutes"
+msgid "45 minutes"
+msgstr "45 minutos"
 
 #: ../panels/power/power.ui.h:6 ../panels/privacy/privacy.ui.h:8
 msgid "1 hour"
 msgstr "1 hora"
 
-#: ../panels/power/power.ui.h:7 ../panels/privacy/privacy.ui.h:3
+#: ../panels/power/power.ui.h:7
+#| msgid "40 minutes"
+msgid "80 minutes"
+msgstr "80 minutos"
+
+#: ../panels/power/power.ui.h:8
+#| msgid "40 minutes"
+msgid "90 minutes"
+msgstr "90 minutos"
+
+#: ../panels/power/power.ui.h:9
+#| msgid "10 minutes"
+msgid "100 minutes"
+msgstr "100 minutos"
+
+#: ../panels/power/power.ui.h:10
+#| msgid "1 hour"
+msgid "2 hours"
+msgstr "2 horas"
+
+#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:3
 msgid "1 minute"
 msgstr "1 minuto"
 
-#: ../panels/power/power.ui.h:8 ../panels/privacy/privacy.ui.h:4
+#: ../panels/power/power.ui.h:12 ../panels/privacy/privacy.ui.h:4
 msgid "2 minutes"
 msgstr "2 minutos"
 
-#: ../panels/power/power.ui.h:10
-#| msgctxt "proxy method"
-#| msgid "Automatic"
+#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:5
+msgid "3 minutes"
+msgstr "3 minutos"
+
+#: ../panels/power/power.ui.h:14
+#| msgid "40 minutes"
+msgid "4 minutes"
+msgstr "4 minutos"
+
+#: ../panels/power/power.ui.h:15 ../panels/privacy/privacy.ui.h:6
+msgid "5 minutes"
+msgstr "5 minutos"
+
+#: ../panels/power/power.ui.h:16
+#| msgid "5 minutes"
+msgid "8 minutes"
+msgstr "8 minutos"
+
+#: ../panels/power/power.ui.h:17
+msgid "10 minutes"
+msgstr "10 minutos"
+
+#: ../panels/power/power.ui.h:18
+#| msgid "2 minutes"
+msgid "12 minutes"
+msgstr "12 minutos"
+
+#: ../panels/power/power.ui.h:20
 msgid "Automatic Suspend"
 msgstr "Suspender automaÌticamente"
 
-#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:10
+#: ../panels/power/power.ui.h:21 ../panels/privacy/privacy.ui.h:10
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../panels/power/power.ui.h:12
-msgid "When on _Battery Power"
-msgstr "Usando _baterÃa"
-
-#: ../panels/power/power.ui.h:13
-msgid "When _Plugged In"
-msgstr "Cuando està _enchufado"
+#: ../panels/power/power.ui.h:22
+#| msgid "When _Plugged In"
+msgid "_Plugged In"
+msgstr "_Enchufado"
 
-#: ../panels/power/power.ui.h:14
+#: ../panels/power/power.ui.h:23
 msgid "Delay"
 msgstr "Retardo"
 
+#: ../panels/power/power.ui.h:24
+#| msgid "When on _Battery Power"
+msgid "On _Battery Power"
+msgstr "Usando _baterÃa"
+
 #. Translators: The printer is low on toner
 #: ../panels/printers/cc-printers-panel.c:591
 msgid "Low on toner"
@@ -4455,7 +4563,7 @@ msgstr "Oculto"
 msgid "Visible"
 msgstr "Visible"
 
-#: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:32
+#: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:31
 msgid "Screen Lock"
 msgstr "Bloqueo de pantalla"
 
@@ -4463,11 +4571,11 @@ msgstr "Bloqueo de pantalla"
 msgid "Name & Visibility"
 msgstr "Nombre y visibilidad"
 
-#: ../panels/privacy/cc-privacy-panel.c:446 ../panels/privacy/privacy.ui.h:27
+#: ../panels/privacy/cc-privacy-panel.c:446 ../panels/privacy/privacy.ui.h:26
 msgid "Usage & History"
 msgstr "Uso e histÃrico"
 
-#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:37
+#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:36
 msgid "Purge Trash & Temporary Files"
 msgstr "Vaciar papelera y archivos temporales"
 
@@ -4496,13 +4604,9 @@ msgstr "Se apaga la pantalla"
 msgid "30 seconds"
 msgstr "30 segundos"
 
-#: ../panels/privacy/privacy.ui.h:5
-msgid "3 minutes"
-msgstr "3 minutos"
-
 #: ../panels/privacy/privacy.ui.h:11
 msgid "Control how you appear on the screen and the network."
-msgstr ""
+msgstr "Controla cÃmo aparece en la pantalla y en la red."
 
 #: ../panels/privacy/privacy.ui.h:12
 msgid "Display _full name in top bar"
@@ -4557,14 +4661,10 @@ msgid "30 days"
 msgstr "30 dÃas"
 
 #: ../panels/privacy/privacy.ui.h:25
-msgid "Don't retain history"
-msgstr "No recordar el histÃrico"
-
-#: ../panels/privacy/privacy.ui.h:26
 msgid "Forever"
 msgstr "Para siempre"
 
-#: ../panels/privacy/privacy.ui.h:28
+#: ../panels/privacy/privacy.ui.h:27
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
@@ -4572,57 +4672,59 @@ msgstr ""
 "Recordar su histÃrico hace que sea mÃs sencillo buscar las cosas de nuevo. "
 "Estos elementos nunca se comparten en la red."
 
-#: ../panels/privacy/privacy.ui.h:29
+#: ../panels/privacy/privacy.ui.h:28
 msgid "Cl_ear Recent History"
 msgstr "Limpiar el histÃrico r_eciente"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: ../panels/privacy/privacy.ui.h:29
 msgid "_Recently Used"
 msgstr "Usados _recientemente"
 
-#: ../panels/privacy/privacy.ui.h:31
+#: ../panels/privacy/privacy.ui.h:30
 msgid "Retain _History"
 msgstr "Recordar _histÃrico"
 
-#: ../panels/privacy/privacy.ui.h:33
+#: ../panels/privacy/privacy.ui.h:32
 msgid "The Screen Lock protects your privacy when you are away."
 msgstr "La pantalla de bloqueo protege"
 
-#: ../panels/privacy/privacy.ui.h:34
+#: ../panels/privacy/privacy.ui.h:33
 msgid "Automatic Screen _Lock"
 msgstr "_Bloque de pantalla automaÌtico"
 
-#: ../panels/privacy/privacy.ui.h:35
-msgid "Lock Screen _After"
+#: ../panels/privacy/privacy.ui.h:34
+#, fuzzy
+#| msgid "Lock Screen _After"
+msgid "Lock Screen _After Blank For"
 msgstr "B_loquear pantalla despuÃs de"
 
-#: ../panels/privacy/privacy.ui.h:36
+#: ../panels/privacy/privacy.ui.h:35
 msgid "Show _Notifications"
 msgstr "Mostrar _notificaciones"
 
-#: ../panels/privacy/privacy.ui.h:38
+#: ../panels/privacy/privacy.ui.h:37
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
-#: ../panels/privacy/privacy.ui.h:39
+#: ../panels/privacy/privacy.ui.h:38
 msgid "_Purge Temporary Files"
 msgstr "_Limpiar archivos temporales"
 
-#: ../panels/privacy/privacy.ui.h:40
+#: ../panels/privacy/privacy.ui.h:39
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
 msgstr ""
 
-#: ../panels/privacy/privacy.ui.h:41
+#: ../panels/privacy/privacy.ui.h:40
 msgid "Automatically Empty _Trash"
 msgstr "Vaciar la papelera automÃ_ticamente"
 
-#: ../panels/privacy/privacy.ui.h:42
+#: ../panels/privacy/privacy.ui.h:41
 msgid "Automatically Purge Temporary _Files"
 msgstr "Li_mpiar los archivos temporales automÃticamente"
 
-#: ../panels/privacy/privacy.ui.h:43
+#: ../panels/privacy/privacy.ui.h:42
 msgid "Purge _After"
 msgstr "Limpiar _despuÃs de"
 
@@ -4640,13 +4742,11 @@ msgid "Language;Layout;Keyboard;Input;"
 msgstr "Idioma;DistribuciÃn;Teclado;Entrada;"
 
 #: ../panels/region/gnome-region-panel-formats.c:144
-#| msgid "Imperial"
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "Imperial"
 
 #: ../panels/region/gnome-region-panel-formats.c:146
-#| msgid "Metric"
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "MeÌtrico"
@@ -5380,10 +5480,6 @@ msgstr "Alto contraste"
 msgid "Beep on Caps and Num Lock"
 msgstr "Pitar al usar Bloq. Num. y Bloq. MayÃs."
 
-#: ../panels/universal-access/uap.ui.h:23
-msgid "Optionsâ"
-msgstr "Opcionesâ"
-
 #: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "Lector de pantalla"
@@ -5909,6 +6005,21 @@ msgstr "AnÌadir o quitar usuarios"
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
 msgstr "inicio;sesiÃn;nombre;huella;avatar;logo;cara;contraseÃa;"
 
+#: ../panels/user-accounts/data/history-dialog.ui.h:2
+#| msgid "Previous track"
+msgid "Previous Week"
+msgstr "Semana anterior"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:3
+#| msgid "Last Week"
+msgid "Next Week"
+msgstr "Siguiente semana"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:4
+#| msgid "Next track"
+msgid "Next week"
+msgstr "La semana que viene"
+
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid "Set a password now"
 msgstr "Establecer una contrasenÌa ahora"
@@ -6058,7 +6169,7 @@ msgid "Authentication is required to change user data"
 msgstr "Se requiere autenticacioÌn para cambiar los datos del usuario"
 
 #: ../panels/user-accounts/pw-utils.c:94
-#: ../panels/user-accounts/um-password-dialog.c:601
+#: ../panels/user-accounts/um-password-dialog.c:605
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "Demasiado corta"
@@ -6069,25 +6180,25 @@ msgid "Not good enough"
 msgstr "No es suficientemente buena"
 
 #: ../panels/user-accounts/pw-utils.c:108
-#: ../panels/user-accounts/um-password-dialog.c:602
+#: ../panels/user-accounts/um-password-dialog.c:606
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "DeÌbil"
 
 #: ../panels/user-accounts/pw-utils.c:111
-#: ../panels/user-accounts/um-password-dialog.c:603
+#: ../panels/user-accounts/um-password-dialog.c:607
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "Regular"
 
 #: ../panels/user-accounts/pw-utils.c:114
-#: ../panels/user-accounts/um-password-dialog.c:604
+#: ../panels/user-accounts/um-password-dialog.c:608
 msgctxt "Password strength"
 msgid "Good"
 msgstr "Buena"
 
 #: ../panels/user-accounts/pw-utils.c:117
-#: ../panels/user-accounts/um-password-dialog.c:605
+#: ../panels/user-accounts/um-password-dialog.c:609
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "Fuerte"
@@ -6097,7 +6208,6 @@ msgid "Authentication failed"
 msgstr "FalloÌ la autenticacioÌn"
 
 #: ../panels/user-accounts/run-passwd.c:504
-#: ../panels/user-accounts/um-password-dialog.c:273
 #, c-format
 msgid "The new password is too short"
 msgstr "La contrasenÌa nueva es demasiado corta"
@@ -6253,47 +6363,52 @@ msgstr "Esta semana"
 msgid "Last Week"
 msgstr "Ãltima semana"
 
-#: ../panels/user-accounts/um-password-dialog.c:105
+#: ../panels/user-accounts/um-password-dialog.c:130
 msgid "_Generate a password"
 msgstr "_Generar una contrasenÌa"
 
-#: ../panels/user-accounts/um-password-dialog.c:159
+#: ../panels/user-accounts/um-password-dialog.c:184
 msgid "Please choose another password."
 msgstr "Elija otra contrasenÌa."
 
-#: ../panels/user-accounts/um-password-dialog.c:168
+#: ../panels/user-accounts/um-password-dialog.c:193
 msgid "Please type your current password again."
 msgstr "Escriba de nuevo su contrasenÌa actual."
 
-#: ../panels/user-accounts/um-password-dialog.c:174
+#: ../panels/user-accounts/um-password-dialog.c:199
 msgid "Password could not be changed"
 msgstr "No se pudo cambiar la contrasenÌa"
 
-#: ../panels/user-accounts/um-password-dialog.c:270
+#: ../panels/user-accounts/um-password-dialog.c:297
 msgid "You need to enter a new password"
 msgstr "Debe introducir una contrasenÌa"
 
-#: ../panels/user-accounts/um-password-dialog.c:279
+#: ../panels/user-accounts/um-password-dialog.c:300
+#| msgid "The new password is too short"
+msgid "The new password is not strong enough"
+msgstr "La contrasenÌa nueva no es suficientemente segura"
+
+#: ../panels/user-accounts/um-password-dialog.c:306
 msgid "You need to confirm the password"
 msgstr "Debe confirmar la contrasenÌa"
 
-#: ../panels/user-accounts/um-password-dialog.c:282
+#: ../panels/user-accounts/um-password-dialog.c:309
 msgid "The passwords do not match"
 msgstr "Las contrasenÌas no coinciden"
 
-#: ../panels/user-accounts/um-password-dialog.c:288
+#: ../panels/user-accounts/um-password-dialog.c:315
 msgid "You need to enter your current password"
 msgstr "Debe introducir su contrasenÌa actual"
 
-#: ../panels/user-accounts/um-password-dialog.c:291
+#: ../panels/user-accounts/um-password-dialog.c:318
 msgid "The current password is not correct"
 msgstr "La contrasenÌa actual no es correcta"
 
-#: ../panels/user-accounts/um-password-dialog.c:381
+#: ../panels/user-accounts/um-password-dialog.c:385
 msgid "Passwords do not match"
 msgstr "Las contrasenÌas no coinciden"
 
-#: ../panels/user-accounts/um-password-dialog.c:443
+#: ../panels/user-accounts/um-password-dialog.c:447
 msgid "Wrong password"
 msgstr "ContrasenÌa erroÌnea"
 
@@ -6858,6 +6973,24 @@ msgstr "Preferencias;ConfiguraciÃn;"
 msgid "All Settings"
 msgstr "Todas las configuraciones"
 
+#~ msgid "Wired"
+#~ msgstr "Cableada"
+
+#~ msgid "Mobile broadband"
+#~ msgstr "Banda ancha mÃvil"
+
+#~ msgid "Mesh"
+#~ msgstr "Malla"
+
+#~ msgid "Carrier/link changed"
+#~ msgstr "Ha cambiado el portador/enlace"
+
+#~ msgid "_Mark As Inactive After"
+#~ msgstr "_Marcar como inactivo despuÃs de"
+
+#~ msgid "Don't retain history"
+#~ msgstr "No recordar el histÃrico"
+
 #~ msgid "Out of range"
 #~ msgstr "Fuera de rango"
 
@@ -6956,9 +7089,6 @@ msgstr "Todas las configuraciones"
 #~ msgid "Add a virtual device"
 #~ msgstr "AÃadir un dispositivo virtual"
 
-#~ msgid "Delete device"
-#~ msgstr "Eliminar dispositivo"
-
 #~ msgid "Remove a device"
 #~ msgstr "Quitar un dispositivo"
 
@@ -7377,9 +7507,6 @@ msgstr "Todas las configuraciones"
 #~ msgid "_Stop Hotspot..."
 #~ msgstr "_Detener ÂhotspotÂâ"
 
-#~ msgid "Device Off"
-#~ msgstr "Dispositivo apagado"
-
 #~ msgid "_Network Name"
 #~ msgstr "_Nombre de red"
 
@@ -7395,9 +7522,6 @@ msgstr "Todas las configuraciones"
 #~ msgid "FTP Port"
 #~ msgstr "Puerto FTP"
 
-#~ msgid "Socks Port"
-#~ msgstr "Puerto Socks"
-
 #~ msgid "Select an account"
 #~ msgstr "Seleccionar una cuenta"