summary refs log tree commit diff
path: root/po/es.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/es.po')
-rw-r--r--po/es.po7458
1 files changed, 4926 insertions, 2532 deletions
diff --git a/po/es.po b/po/es.po
index cb47d130..80cfd712 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,196 +15,303 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-01-23 17:13+0530\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-23 14:29+0100\n"
 "PO-Revision-Date: 2014-01-29 11:34-0500\n"
 "Last-Translator: gguerrer <gguerrer@redhat.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Zanata 3.2.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: es\n"
+
+#: ../clients/cli/agent.c:42
+#, c-format
+msgid ""
+"Usage: nmcli agent { COMMAND | help }\n"
+"\n"
+"COMMAND := { secret | polkit | all }\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/agent.c:50
+#, c-format
+msgid ""
+"Usage: nmcli agent secret { help }\n"
+"\n"
+"Runs nmcli as NetworkManager secret agent. When NetworkManager requires\n"
+"a password it asks registered agents for it. This command keeps nmcli "
+"running\n"
+"and if a password is required asks the user for it.\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/agent.c:60
+#, c-format
+msgid ""
+"Usage: nmcli agent polkit { help }\n"
+"\n"
+"Registers nmcli as a polkit action for the user session.\n"
+"When a polkit daemon requires an authorization, nmcli asks the user and "
+"gives\n"
+"the response back to polkit.\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/agent.c:70
+#, c-format
+msgid ""
+"Usage: nmcli agent all { help }\n"
+"\n"
+"Runs nmcli as both NetworkManager secret and a polkit agent.\n"
+"\n"
+msgstr ""
+
+#: ../clients/cli/agent.c:152
+#, c-format
+msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
+msgstr ""
+
+#: ../clients/cli/agent.c:154
+#, fuzzy, c-format
+msgid "Error: secret agent initialization failed"
+msgstr "Falló la inicialización del módem"
+
+#: ../clients/cli/agent.c:169
+#, fuzzy, c-format
+msgid "Error: polkit agent initialization failed: %s"
+msgstr "Error: falló la activación de la conexión: %s"
+
+#: ../clients/cli/agent.c:177
+#, c-format
+msgid "nmcli successfully registered as a polkit agent.\n"
+msgstr ""
+
+#: ../clients/cli/agent.c:209 ../clients/cli/connections.c:9246
+#: ../clients/cli/devices.c:3060 ../clients/cli/general.c:325
+#: ../clients/cli/general.c:463
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "Error: NetworkManager no se está ejecutando."
+
+#: ../clients/cli/agent.c:245
+#, fuzzy, c-format
+msgid "Error: 'agent' command '%s' is not valid."
+msgstr "Error: comando 'general' '%s' no es válido."
 
 # auto translated by TM merge from project: gnome-search-tool, version: 3.4.0, DocId: gnome-search-tool
-#: ../cli/src/common.c:34 ../cli/src/common.c:46 ../cli/src/common.c:54
-#: ../cli/src/common.c:65 ../cli/src/connections.c:174
-#: ../cli/src/connections.c:200
+#: ../clients/cli/common.c:41 ../clients/cli/common.c:54
+#: ../clients/cli/common.c:62 ../clients/cli/common.c:74
+#: ../clients/cli/connections.c:173 ../clients/cli/connections.c:195
 msgid "GROUP"
 msgstr "GRUPO"
 
-#: ../cli/src/common.c:35 ../cli/src/common.c:55
+#. 0
+#: ../clients/cli/common.c:42 ../clients/cli/common.c:63
 msgid "ADDRESS"
 msgstr "DIRECCIÓN"
 
+#. 1
+#. 2
+#: ../clients/cli/common.c:43 ../clients/cli/common.c:64
+#: ../clients/cli/connections.c:198
+msgid "GATEWAY"
+msgstr "PUERTA DE ENLACE"
+
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:36 ../cli/src/common.c:56
+#. 2
+#: ../clients/cli/common.c:44 ../clients/cli/common.c:65
 msgid "ROUTE"
 msgstr "RUTA"
 
-#: ../cli/src/common.c:37 ../cli/src/common.c:57
+#. 3
+#: ../clients/cli/common.c:45 ../clients/cli/common.c:66
 msgid "DNS"
 msgstr "DNS"
 
-#: ../cli/src/common.c:38 ../cli/src/common.c:58
+#. 4
+#: ../clients/cli/common.c:46 ../clients/cli/common.c:67
 msgid "DOMAIN"
 msgstr "DOMINIO"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:39
+#. 5
+#: ../clients/cli/common.c:47
 msgid "WINS"
 msgstr "WINS"
 
-#: ../cli/src/common.c:47 ../cli/src/common.c:66
+#. 0
+#: ../clients/cli/common.c:55 ../clients/cli/common.c:75
 msgid "OPTION"
 msgstr "OPCIÓN"
 
-#: ../cli/src/common.c:404 ../cli/src/settings.c:2808
-#, c-format
-msgid "invalid IPv4 address '%s'"
-msgstr "Formato de dirección IPv4 inválido '%s'"
-
-#: ../cli/src/common.c:412
-#, c-format
-msgid "invalid prefix '%s'; <1-32> allowed"
+#: ../clients/cli/common.c:379 ../clients/cli/common.c:439
+#, fuzzy, c-format
+msgid "invalid prefix '%s'; <1-%d> allowed"
 msgstr "Prefijo inválido '%s'; <1-32> permitido"
 
-#: ../cli/src/common.c:419 ../cli/src/common.c:472
-#, c-format
-msgid "invalid gateway '%s'"
-msgstr "Puerta de enlace inválida '%s'"
-
-#: ../cli/src/common.c:457 ../cli/src/settings.c:3054
-#, c-format
-msgid "invalid IPv6 address '%s'"
-msgstr "Dirección IPv4 inválida '%s'"
-
-#: ../cli/src/common.c:465
-#, c-format
-msgid "invalid prefix '%s'; <1-128> allowed"
-msgstr "Prefijo inválido '%s'; <1-128> permitido"
-
-#: ../cli/src/common.c:512
-#, c-format
-msgid "invalid IPv4 route '%s'"
-msgstr "Ruta IPv4 inválida '%s'"
-
-#: ../cli/src/common.c:520
-#, c-format
-msgid "invalid prefix '%s'; <0-32> allowed"
-msgstr "Prefijo inválido '%s'; <0-32> permitido"
+#: ../clients/cli/common.c:387
+#, fuzzy, c-format
+msgid "invalid IP address: %s"
+msgstr "Formato de dirección IPv4 inválido '%s'"
 
-#: ../cli/src/common.c:527 ../cli/src/common.c:590
+#: ../clients/cli/common.c:451
 #, c-format
-msgid "invalid next hop address '%s'"
-msgstr "Siguiente dirección de salto inválida '%s'"
+msgid ""
+"the second component of route ('%s') is neither a next hop address nor a "
+"metric"
+msgstr ""
 
-#: ../cli/src/common.c:534 ../cli/src/common.c:598
+#: ../clients/cli/common.c:460
 #, c-format
 msgid "invalid metric '%s'"
 msgstr "Métrica inválida '%s'"
 
-#: ../cli/src/common.c:575
-#, c-format
-msgid "invalid IPv6 route '%s'"
-msgstr "Ruta IPv6 inválida '%s'"
+#: ../clients/cli/common.c:468
+#, fuzzy, c-format
+msgid "invalid route: %s"
+msgstr "Ruta IPv4 inválida '%s'"
 
-#: ../cli/src/common.c:583
-#, c-format
-msgid "invalid prefix '%s'; <0-128> allowed"
-msgstr "Prefijo inválido '%s'; <0-128> permitido"
+#: ../clients/cli/common.c:480
+msgid "default route cannot be added (NetworkManager handles it by itself)"
+msgstr ""
 
-#: ../cli/src/common.c:619
+#: ../clients/cli/common.c:497
 msgid "unmanaged"
 msgstr "sin gestión"
 
-#: ../cli/src/common.c:621
+#: ../clients/cli/common.c:499
 msgid "unavailable"
 msgstr "no disponible"
 
-#: ../cli/src/common.c:623 ../cli/src/network-manager.c:276
+#: ../clients/cli/common.c:501 ../clients/cli/general.c:260
 msgid "disconnected"
 msgstr "desconectado"
 
-#: ../cli/src/common.c:625
+#: ../clients/cli/common.c:503
 msgid "connecting (prepare)"
 msgstr "conectando (preparar)"
 
-#: ../cli/src/common.c:627
+#: ../clients/cli/common.c:505
 msgid "connecting (configuring)"
 msgstr "conectando (configurando)"
 
-#: ../cli/src/common.c:629
+#: ../clients/cli/common.c:507
 msgid "connecting (need authentication)"
 msgstr "conectando (necesita autenticación)"
 
-#: ../cli/src/common.c:631
+#: ../clients/cli/common.c:509
 msgid "connecting (getting IP configuration)"
 msgstr "conectando (obteniendo configuración IP)"
 
-#: ../cli/src/common.c:633
+#: ../clients/cli/common.c:511
 msgid "connecting (checking IP connectivity)"
 msgstr "conectando (comprobando conectividad IP)"
 
-#: ../cli/src/common.c:635
+#: ../clients/cli/common.c:513
 msgid "connecting (starting secondary connections)"
 msgstr "conectando (iniciando conexiones secundarias)"
 
-#: ../cli/src/common.c:637 ../cli/src/network-manager.c:272
+#: ../clients/cli/common.c:515 ../clients/cli/general.c:256
 msgid "connected"
 msgstr "conectado"
 
-#: ../cli/src/common.c:639 ../cli/src/connections.c:732
+#: ../clients/cli/common.c:517 ../clients/cli/connections.c:544
 msgid "deactivating"
 msgstr "desactivando"
 
-#: ../cli/src/common.c:641
+#: ../clients/cli/common.c:519
 msgid "connection failed"
 msgstr "conexión falló"
 
-#: ../cli/src/common.c:643 ../cli/src/connections.c:737
-#: ../cli/src/connections.c:760 ../cli/src/connections.c:1462
-#: ../cli/src/devices.c:827 ../cli/src/devices.c:2257
-#: ../cli/src/network-manager.c:279 ../cli/src/network-manager.c:297
-#: ../cli/src/network-manager.c:360 ../cli/src/network-manager.c:363
-#: ../cli/src/network-manager.c:373 ../cli/src/network-manager.c:375
-#: ../cli/src/network-manager.c:432 ../cli/src/network-manager.c:448
-#: ../cli/src/settings.c:732 ../cli/src/settings.c:760
-#: ../cli/src/settings.c:822 ../cli/src/settings.c:1137
-#: ../cli/src/utils.c:1080 ../src/main.c:470 ../src/main.c:498
+#: ../clients/cli/common.c:521 ../clients/cli/common.c:538
+#: ../clients/cli/connections.c:549 ../clients/cli/connections.c:572
+#: ../clients/cli/connections.c:1712 ../clients/cli/devices.c:891
+#: ../clients/cli/devices.c:932 ../clients/cli/devices.c:934
+#: ../clients/cli/general.c:263 ../clients/cli/general.c:281
+#: ../clients/cli/general.c:411 ../clients/cli/general.c:427
+#: ../clients/cli/settings.c:732 ../clients/cli/settings.c:817
+#: ../clients/cli/settings.c:1118 ../clients/cli/settings.c:2839
+#: ../clients/cli/utils.c:1200 ../src/main.c:241 ../src/main.c:386
+#: ../src/main.c:436
 msgid "unknown"
 msgstr "desconocido"
 
+#. "CAPABILITIES"
+#: ../clients/cli/common.c:530 ../clients/cli/connections.c:819
+#: ../clients/cli/connections.c:821 ../clients/cli/connections.c:823
+#: ../clients/cli/connections.c:855 ../clients/cli/connections.c:922
+#: ../clients/cli/connections.c:923 ../clients/cli/connections.c:925
+#: ../clients/cli/connections.c:3158 ../clients/cli/connections.c:7239
+#: ../clients/cli/connections.c:7240 ../clients/cli/devices.c:598
+#: ../clients/cli/devices.c:648 ../clients/cli/devices.c:856
+#: ../clients/cli/devices.c:857 ../clients/cli/devices.c:858
+#: ../clients/cli/devices.c:859 ../clients/cli/devices.c:895
+#: ../clients/cli/devices.c:897 ../clients/cli/devices.c:925
+#: ../clients/cli/devices.c:926 ../clients/cli/devices.c:927
+#: ../clients/cli/devices.c:928 ../clients/cli/devices.c:929
+#: ../clients/cli/devices.c:930 ../clients/cli/devices.c:931
+#: ../clients/cli/devices.c:933 ../clients/cli/devices.c:935
+#: ../clients/cli/general.c:421 ../clients/cli/settings.c:2834
+msgid "yes"
+msgstr "sí"
+
+#: ../clients/cli/common.c:532 ../clients/cli/connections.c:819
+#: ../clients/cli/connections.c:821 ../clients/cli/connections.c:823
+#: ../clients/cli/connections.c:922 ../clients/cli/connections.c:923
+#: ../clients/cli/connections.c:925 ../clients/cli/connections.c:3159
+#: ../clients/cli/connections.c:7239 ../clients/cli/connections.c:7240
+#: ../clients/cli/devices.c:598 ../clients/cli/devices.c:648
+#: ../clients/cli/devices.c:856 ../clients/cli/devices.c:857
+#: ../clients/cli/devices.c:858 ../clients/cli/devices.c:859
+#: ../clients/cli/devices.c:895 ../clients/cli/devices.c:897
+#: ../clients/cli/devices.c:925 ../clients/cli/devices.c:926
+#: ../clients/cli/devices.c:927 ../clients/cli/devices.c:928
+#: ../clients/cli/devices.c:929 ../clients/cli/devices.c:930
+#: ../clients/cli/devices.c:931 ../clients/cli/devices.c:933
+#: ../clients/cli/devices.c:935 ../clients/cli/general.c:423
+#: ../clients/cli/settings.c:2836
+msgid "no"
+msgstr "no"
+
+#: ../clients/cli/common.c:534
+msgid "yes (guessed)"
+msgstr ""
+
+#: ../clients/cli/common.c:536
+msgid "no (guessed)"
+msgstr ""
+
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:652
+#: ../clients/cli/common.c:547
 msgid "No reason given"
 msgstr "No se ha dado ninguna razón"
 
 # auto translated by TM merge from project: evolution-mapi, version: el6, DocId: evolution-mapi
-#: ../cli/src/common.c:655 ../cli/src/connections.c:2258
+#: ../clients/cli/common.c:550 ../clients/cli/connections.c:2729
 #, c-format
 msgid "Unknown error"
 msgstr "Error desconocido"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:658
+#: ../clients/cli/common.c:553
 msgid "Device is now managed"
 msgstr "El dispositivo es administrado ahora"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:661
+#: ../clients/cli/common.c:556
 msgid "Device is now unmanaged"
 msgstr "El dispositivo no es administrado ahora"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:664
+#: ../clients/cli/common.c:559
 msgid "The device could not be readied for configuration"
 msgstr "No se pudo alistar el dispositivo para configuración"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:667
+#: ../clients/cli/common.c:562
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr ""
@@ -212,407 +319,573 @@ msgstr ""
 "de espera, etc."
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:670
+#: ../clients/cli/common.c:565
 msgid "The IP configuration is no longer valid"
 msgstr "La configuración IP ya no es válida"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../cli/src/common.c:673
+#: ../clients/cli/common.c:568
 msgid "Secrets were required, but not provided"
 msgstr "Se necesitan secretos, pero no se han proporcionado"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:676
+#: ../clients/cli/common.c:571
 msgid "802.1X supplicant disconnected"
 msgstr "Suplicante de 802.1x desconectado"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:679
+#: ../clients/cli/common.c:574
 msgid "802.1X supplicant configuration failed"
 msgstr "Falló la configuración del suplicante de 802.1X"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:682
+#: ../clients/cli/common.c:577
 msgid "802.1X supplicant failed"
 msgstr "Falló el suplicante de 802.1X"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:685
+#: ../clients/cli/common.c:580
 msgid "802.1X supplicant took too long to authenticate"
 msgstr "El suplicante de 802.1X tardó mucho tiempo en autenticarse"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../cli/src/common.c:688
+#: ../clients/cli/common.c:583
 msgid "PPP service failed to start"
 msgstr "Falló al iniciar el servicio de PPP"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../cli/src/common.c:691
+#: ../clients/cli/common.c:586
 msgid "PPP service disconnected"
 msgstr "Servicio PPP desconectado"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../cli/src/common.c:694
+#: ../clients/cli/common.c:589
 msgid "PPP failed"
 msgstr "PPP falló"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../cli/src/common.c:697
+#: ../clients/cli/common.c:592
 msgid "DHCP client failed to start"
 msgstr "Falló al iniciar el cliente de DHCP"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../cli/src/common.c:700
+#: ../clients/cli/common.c:595
 msgid "DHCP client error"
 msgstr "Error del cliente de DHCP"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../cli/src/common.c:703
+#: ../clients/cli/common.c:598
 msgid "DHCP client failed"
 msgstr "Falló el cliente de DHCP"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../cli/src/common.c:706
+#: ../clients/cli/common.c:601
 msgid "Shared connection service failed to start"
 msgstr "Falló al iniciar el servicio de conexión compartida"
 
-#: ../cli/src/common.c:709
+#: ../clients/cli/common.c:604
 msgid "Shared connection service failed"
 msgstr "Falló el servicio de conexión compartida"
 
-#: ../cli/src/common.c:712
+#: ../clients/cli/common.c:607
 msgid "AutoIP service failed to start"
 msgstr "Falló al iniciar el servicio de AutoIP"
 
-#: ../cli/src/common.c:715
+#: ../clients/cli/common.c:610
 msgid "AutoIP service error"
 msgstr "Error del servicio de AutoIP"
 
-#: ../cli/src/common.c:718
+#: ../clients/cli/common.c:613
 msgid "AutoIP service failed"
 msgstr "Falló el servicio AutoIP"
 
-#: ../cli/src/common.c:721
+#: ../clients/cli/common.c:616
 msgid "The line is busy"
 msgstr "La línea está ocupada"
 
-#: ../cli/src/common.c:724
+#: ../clients/cli/common.c:619
 msgid "No dial tone"
 msgstr "No hay tono de llamada"
 
-#: ../cli/src/common.c:727
+#: ../clients/cli/common.c:622
 msgid "No carrier could be established"
 msgstr "No se pudo establecer proveedor del servicio"
 
-#: ../cli/src/common.c:730
+#: ../clients/cli/common.c:625
 msgid "The dialing request timed out"
 msgstr "El tiempo de la solicitud de marcado ha expirado"
 
-#: ../cli/src/common.c:733
+#: ../clients/cli/common.c:628
 msgid "The dialing attempt failed"
 msgstr "El intento de marcado falló"
 
-#: ../cli/src/common.c:736
+#: ../clients/cli/common.c:631
 msgid "Modem initialization failed"
 msgstr "Falló la inicialización del módem"
 
-#: ../cli/src/common.c:739
+#: ../clients/cli/common.c:634
 msgid "Failed to select the specified APN"
 msgstr "Falló al seleccionar el NPA especificado"
 
-#: ../cli/src/common.c:742
+#: ../clients/cli/common.c:637
 msgid "Not searching for networks"
 msgstr "No se están buscando redes"
 
-#: ../cli/src/common.c:745
+#: ../clients/cli/common.c:640
 msgid "Network registration denied"
 msgstr "Registro de red denegado"
 
-#: ../cli/src/common.c:748
+#: ../clients/cli/common.c:643
 msgid "Network registration timed out"
 msgstr "Expiró el tiempo de registro de la red"
 
-#: ../cli/src/common.c:751
+#: ../clients/cli/common.c:646
 msgid "Failed to register with the requested network"
 msgstr "Falló al registrarse con la red solicitada"
 
-#: ../cli/src/common.c:754
+#: ../clients/cli/common.c:649
 msgid "PIN check failed"
 msgstr "Falló"
 
-#: ../cli/src/common.c:757
+#: ../clients/cli/common.c:652
 msgid "Necessary firmware for the device may be missing"
 msgstr "El Firmware necesario para el dispositivo puede estar faltando "
 
-#: ../cli/src/common.c:760
+#: ../clients/cli/common.c:655
 msgid "The device was removed"
 msgstr "El dispositivo fue retirado"
 
-#: ../cli/src/common.c:763
+#: ../clients/cli/common.c:658
 msgid "NetworkManager went to sleep"
 msgstr "NetworkManager se fue a dormir"
 
-#: ../cli/src/common.c:766
+#: ../clients/cli/common.c:661
 msgid "The device's active connection disappeared"
 msgstr "La conexión activa del dispositivo desapareció"
 
-#: ../cli/src/common.c:769
+#: ../clients/cli/common.c:664
 msgid "Device disconnected by user or client"
 msgstr "Dispositivo desconectado por el usuario o cliente"
 
-#: ../cli/src/common.c:772
+#: ../clients/cli/common.c:667
 msgid "Carrier/link changed"
 msgstr "Proveedor del servicio o enlace cambiados"
 
-#: ../cli/src/common.c:775
+#: ../clients/cli/common.c:670
 msgid "The device's existing connection was assumed"
 msgstr "Se supuso una conexión del dispositivo disponible"
 
-#: ../cli/src/common.c:778
+#: ../clients/cli/common.c:673
 msgid "The supplicant is now available"
 msgstr "El suplicante ahora está disponible"
 
-#: ../cli/src/common.c:781
+#: ../clients/cli/common.c:676
 msgid "The modem could not be found"
 msgstr "No se pudo encontrar el módem "
 
-#: ../cli/src/common.c:784
+#: ../clients/cli/common.c:679
 msgid "The Bluetooth connection failed or timed out"
 msgstr "La conexión de Bluetooth falló o expiró"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:787
+#: ../clients/cli/common.c:682
 msgid "GSM Modem's SIM card not inserted"
 msgstr "La tarjeta SIM del módem GSM no está insertada"
 
-#: ../cli/src/common.c:790
+#: ../clients/cli/common.c:685
 msgid "GSM Modem's SIM PIN required"
 msgstr "Se requiere el PIN de SIM del módem GSM"
 
-#: ../cli/src/common.c:793
+#: ../clients/cli/common.c:688
 msgid "GSM Modem's SIM PUK required"
 msgstr "Se requiere el PUK de SIM del módem GSM"
 
-#: ../cli/src/common.c:796
+#: ../clients/cli/common.c:691
 msgid "GSM Modem's SIM wrong"
 msgstr "El SIM del módem GSM está errado"
 
 # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../cli/src/common.c:799
+#: ../clients/cli/common.c:694
 msgid "InfiniBand device does not support connected mode"
 msgstr "El dispositivo InfiniBand no soporta el modo conectado"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:802
+#: ../clients/cli/common.c:697
 msgid "A dependency of the connection failed"
 msgstr "Falló una dependencia de la conexión "
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:805
+#: ../clients/cli/common.c:700
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr "Hay un problema con Ethernet 2684 RFC en el puente ADSL"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:808
+#: ../clients/cli/common.c:703
 msgid "ModemManager is unavailable"
 msgstr "MódemManager no está disponible"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:811
+#: ../clients/cli/common.c:706
 msgid "The Wi-Fi network could not be found"
 msgstr "No se encontró la red de Wi-Fi"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/common.c:814
+#: ../clients/cli/common.c:709
 msgid "A secondary connection of the base connection failed"
 msgstr "Falló una conexión secundaria de la conexión de base"
 
-#: ../cli/src/common.c:817
+#: ../clients/cli/common.c:712
 msgid "DCB or FCoE setup failed"
 msgstr "Falló la confiuración de DCB o FCoE"
 
-#: ../cli/src/common.c:820
+#: ../clients/cli/common.c:715
 msgid "teamd control failed"
 msgstr "Falló el control teamd"
 
-#: ../cli/src/common.c:824 ../cli/src/devices.c:634 ../tui/nm-ui-utils.c:359
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
+#: ../clients/cli/common.c:718
+#, fuzzy
+msgid "Modem failed or no longer available"
+msgstr "MódemManager no está disponible"
+
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
+#: ../clients/cli/common.c:721
+#, fuzzy
+msgid "Modem now ready and available"
+msgstr "MódemManager no está disponible"
+
+#: ../clients/cli/common.c:724
+msgid "SIM PIN was incorrect"
+msgstr ""
+
+#: ../clients/cli/common.c:727
+#, fuzzy
+msgid "New connection activation was enqueued"
+msgstr "Error: falló la activación de la conexión."
+
+#: ../clients/cli/common.c:730
+#, fuzzy
+msgid "The device's parent changed"
+msgstr "El dispositivo fue retirado"
+
+#: ../clients/cli/common.c:733
+#, fuzzy
+msgid "The device parent's management changed"
+msgstr "El dispositivo fue retirado"
+
+#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
+#: ../clients/cli/common.c:737 ../clients/cli/devices.c:628
+#: ../libnm-glib/nm-device.c:1813 ../libnm/nm-device.c:1658
 msgid "Unknown"
 msgstr "desconocido"
 
-#: ../cli/src/common.c:866
+#: ../clients/cli/common.c:779
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr "Mapa de prioridad inválido '%s'"
 
-#: ../cli/src/common.c:873 ../cli/src/common.c:879
+#: ../clients/cli/common.c:786 ../clients/cli/common.c:792
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
 msgstr "Prioridad '%s' no es válida (<0-%ld>)"
 
-#: ../cli/src/common.c:935
+#: ../clients/cli/common.c:859
 #, c-format
 msgid "'%s' is not a valid team configuration or file name."
+msgstr "'%s' no es una configuración de un equipo o nombre de archivo válidos."
+
+#: ../clients/cli/common.c:961
+#, fuzzy, c-format
+msgid "Error: openconnect failed: %s\n"
+msgstr "Error: falló la verificación de conexión: %s\n"
+
+#: ../clients/cli/common.c:968
+#, fuzzy, c-format
+msgid "Error: openconnect failed with status %d\n"
+msgstr "Error: conexión no es válida: %s\n"
+
+#: ../clients/cli/common.c:970
+#, fuzzy, c-format
+msgid "Error: openconnect failed with signal %d\n"
+msgstr "Error: conexión no es válida: %s\n"
+
+#: ../clients/cli/common.c:1047
+#, c-format
+msgid ""
+"Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
+"without '--ask' option.\n"
 msgstr ""
-"'%s' no es una configuración de un equipo o nombre de archivo válidos."
 
-#: ../cli/src/connections.c:62
+#. define some prompts for connection editor
+#: ../clients/cli/connections.c:42
 msgid "Setting name? "
 msgstr "¿Establecimiento de permisos?"
 
-#: ../cli/src/connections.c:63
+#: ../clients/cli/connections.c:43
 msgid "Property name? "
 msgstr "¿Nombre de propiedad? "
 
-#: ../cli/src/connections.c:64
+#: ../clients/cli/connections.c:44
 msgid "Enter connection type: "
 msgstr "Ingrese el tipo de conexión:"
 
-#: ../cli/src/connections.c:68 ../cli/src/connections.c:175
-#: ../cli/src/devices.c:86 ../cli/src/devices.c:114 ../cli/src/devices.c:124
-#: ../cli/src/devices.c:134 ../cli/src/devices.c:143 ../cli/src/devices.c:158
-#: ../cli/src/devices.c:171 ../cli/src/devices.c:197 ../cli/src/devices.c:212
-#: ../cli/src/devices.c:221
+#. define some other prompts
+#: ../clients/cli/connections.c:47
+msgid "Connection type: "
+msgstr "Tipo de conexión:"
+
+#: ../clients/cli/connections.c:48
+msgid "VPN type: "
+msgstr "Tipo de VPN:"
+
+#: ../clients/cli/connections.c:49
+msgid "Bond master: "
+msgstr "Maestro de vínculo: "
+
+#: ../clients/cli/connections.c:50
+msgid "Team master: "
+msgstr "Maestro de equipo: "
+
+#: ../clients/cli/connections.c:51
+msgid "Bridge master: "
+msgstr "Maestro de puente:"
+
+#: ../clients/cli/connections.c:52
+msgid "Connection (name, UUID, or path): "
+msgstr "Conexión (nombre, UUID, o ruta): "
+
+#: ../clients/cli/connections.c:53
+#, fuzzy
+msgid "Connection(s) (name, UUID, or path): "
+msgstr "Conexión (nombre, UUID, o ruta): "
+
+#. 0
+#: ../clients/cli/connections.c:61 ../clients/cli/connections.c:174
+#: ../clients/cli/devices.c:58 ../clients/cli/devices.c:91
+#: ../clients/cli/devices.c:101 ../clients/cli/devices.c:112
+#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:138
+#: ../clients/cli/devices.c:151 ../clients/cli/devices.c:177
+#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
+#: ../clients/cli/devices.c:211
 msgid "NAME"
 msgstr "NOMBRE"
 
-#: ../cli/src/connections.c:69 ../cli/src/connections.c:176
+#. 0
+#. 1
+#: ../clients/cli/connections.c:62 ../clients/cli/connections.c:175
 msgid "UUID"
 msgstr "UUID"
 
-#: ../cli/src/connections.c:70 ../cli/src/connections.c:201
-#: ../cli/src/devices.c:72 ../cli/src/devices.c:88 ../cli/src/devices.c:200
+#. 1
+#. 0
+#. 1
+#. 2
+#: ../clients/cli/connections.c:63 ../clients/cli/connections.c:196
+#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:60
+#: ../clients/cli/devices.c:180
 msgid "TYPE"
 msgstr "TIPO"
 
-#: ../cli/src/connections.c:71
+#. 2
+#: ../clients/cli/connections.c:64
 msgid "TIMESTAMP"
 msgstr "MARCA DE TIEMPO"
 
-#: ../cli/src/connections.c:72
+#. 3
+#: ../clients/cli/connections.c:65
 msgid "TIMESTAMP-REAL"
 msgstr "MARCA DE TIEMPO-REAL"
 
-#: ../cli/src/connections.c:73 ../cli/src/devices.c:101
+#. 4
+#. 16
+#: ../clients/cli/connections.c:66 ../clients/cli/devices.c:75
 msgid "AUTOCONNECT"
 msgstr "AUTOCONECTAR"
 
-#: ../cli/src/connections.c:74
+#. 5
+#: ../clients/cli/connections.c:67
+#, fuzzy
+msgid "AUTOCONNECT-PRIORITY"
+msgstr "AUTOCONECTAR"
+
+#. 6
+#: ../clients/cli/connections.c:68
 msgid "READONLY"
 msgstr "SÓLOLECTURA"
 
-#: ../cli/src/connections.c:75 ../cli/src/connections.c:183
-#: ../cli/src/devices.c:74 ../cli/src/devices.c:187 ../cli/src/devices.c:203
+#. 7
+#. 8
+#. 2
+#. 15
+#. 5
+#: ../clients/cli/connections.c:69 ../clients/cli/connections.c:182
+#: ../clients/cli/devices.c:46 ../clients/cli/devices.c:167
+#: ../clients/cli/devices.c:183
 msgid "DBUS-PATH"
 msgstr "RUTA-DBUS"
 
-#: ../cli/src/connections.c:177
-msgid "DEVICES"
-msgstr "DISPOSITIVOS"
+#. 8
+#. 13
+#. 4
+#: ../clients/cli/connections.c:70 ../clients/cli/devices.c:165
+#: ../clients/cli/devices.c:182
+msgid "ACTIVE"
+msgstr "ACTIVO"
 
-#: ../cli/src/connections.c:178 ../cli/src/devices.c:73
-#: ../cli/src/devices.c:96 ../cli/src/network-manager.c:39
+#. 9
+#. 0
+#. 12
+#. 3
+#: ../clients/cli/connections.c:71 ../clients/cli/devices.c:43
+#: ../clients/cli/devices.c:59 ../clients/cli/devices.c:164
+#: ../clients/cli/devices.c:181
+msgid "DEVICE"
+msgstr "DISPOSITIVO"
+
+#. 10
+#. 3
+#. 1
+#. 10
+#. 1
+#: ../clients/cli/connections.c:72 ../clients/cli/connections.c:177
+#: ../clients/cli/devices.c:45 ../clients/cli/devices.c:69
+#: ../clients/cli/general.c:37
 msgid "STATE"
 msgstr "ESTADO"
 
-#: ../cli/src/connections.c:179
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
+#. 11
+#: ../clients/cli/connections.c:73
+#, fuzzy
+msgid "ACTIVE-PATH"
+msgstr "MASTER-RUTA"
+
+#. 2
+#: ../clients/cli/connections.c:176
+msgid "DEVICES"
+msgstr "DISPOSITIVOS"
+
+#. 4
+#: ../clients/cli/connections.c:178
 msgid "DEFAULT"
 msgstr "PREDETERMINADO"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/connections.c:180
+#. 5
+#: ../clients/cli/connections.c:179
 msgid "DEFAULT6"
 msgstr "PREDETERMINADO6"
 
-#: ../cli/src/connections.c:181
+#. 6
+#: ../clients/cli/connections.c:180
 msgid "SPEC-OBJECT"
 msgstr "OBJETO SPEC"
 
-#: ../cli/src/connections.c:182 ../cli/src/connections.c:224
-#: ../tui/nm-editor-utils.c:243 ../tui/nmt-connect-connection-list.c:343
+#. 7
+#. 4
+#. Ask for optional 'vpn' arguments.
+#: ../clients/cli/connections.c:181 ../clients/cli/connections.c:219
+#: ../clients/cli/connections.c:3863 ../clients/tui/nm-editor-utils.c:234
+#: ../clients/tui/nmt-connect-connection-list.c:406
 msgid "VPN"
 msgstr "VPN"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/connections.c:184 ../cli/src/devices.c:77
-#: ../cli/src/devices.c:105
+#. 9
+#. 5
+#. 21
+#: ../clients/cli/connections.c:183 ../clients/cli/devices.c:49
+#: ../clients/cli/devices.c:80
 msgid "CON-PATH"
 msgstr "CON-RUTA"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/connections.c:185
+#. 10
+#: ../clients/cli/connections.c:184
 msgid "ZONE"
 msgstr "ZONA"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/connections.c:186
+#. 11
+#: ../clients/cli/connections.c:185
 msgid "MASTER-PATH"
 msgstr "MASTER-RUTA"
 
-#: ../cli/src/connections.c:202
+#. 1
+#: ../clients/cli/connections.c:197
 msgid "USERNAME"
 msgstr "Nombre de usuario"
 
-#: ../cli/src/connections.c:203
-msgid "GATEWAY"
-msgstr "PUERTA DE ENLACE"
-
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/connections.c:204
+#. 3
+#: ../clients/cli/connections.c:199
 msgid "BANNER"
 msgstr "INDICADOR"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/connections.c:205
+#. 4
+#: ../clients/cli/connections.c:200
 msgid "VPN-STATE"
 msgstr "ESTADO-VPN"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/connections.c:206
+#. 5
+#: ../clients/cli/connections.c:201
 msgid "CFG"
 msgstr "CFG"
 
-#: ../cli/src/connections.c:219 ../cli/src/devices.c:236
+#: ../clients/cli/connections.c:214 ../clients/cli/devices.c:226
 msgid "GENERAL"
 msgstr "GENERAL"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/connections.c:220 ../cli/src/devices.c:243
+#. 0
+#. 6
+#: ../clients/cli/connections.c:215 ../clients/cli/devices.c:233
 msgid "IP4"
 msgstr "IP4"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/connections.c:221 ../cli/src/devices.c:244
+#. 1
+#. 7
+#: ../clients/cli/connections.c:216 ../clients/cli/devices.c:234
 msgid "DHCP4"
 msgstr "DHCP4"
 
-#: ../cli/src/connections.c:222 ../cli/src/devices.c:245
+#. 2
+#. 8
+#: ../clients/cli/connections.c:217 ../clients/cli/devices.c:235
 msgid "IP6"
 msgstr "IP6"
 
-#: ../cli/src/connections.c:223 ../cli/src/devices.c:246
+#. 3
+#. 9
+#: ../clients/cli/connections.c:218 ../clients/cli/devices.c:236
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../cli/src/connections.c:255
-#, c-format
+#: ../clients/cli/connections.c:253
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
-"COMMAND := { show | up | down | add | modify | edit | delete | reload | load "
-"}\n"
+"COMMAND := { show | up | down | add | modify | edit | delete | reload | "
+"load }\n"
 "\n"
-"  show configured [[id | uuid | path] <ID>]\n"
-"  show active     [[id | uuid | path | apath] <ID>]\n"
+"  show [--active] [[--show-secrets] [id | uuid | path | apath] <ID>] ...\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp <name>]\n"
+"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp <name>] "
+"[passwd-file <file with passwords>]\n"
 "\n"
-"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>]\n"
+"  up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [passwd-file "
+"<file with passwords>]\n"
 "\n"
-"  down [id | uuid | path | apath] <ID>\n"
+"  down [id | uuid | path | apath] <ID> ...\n"
 "\n"
 "  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
 "\n"
-"  modify [id | uuid | path] <ID> <setting>.<property> <value>\n"
+"  modify [--temporary] [id | uuid | path] <ID> ([+|-]<setting>.<property> "
+"<value>)+\n"
 "\n"
 "  edit [id | uuid | path] <ID>\n"
 "  edit [type <new_con_type>] [con-name <new_con_name>]\n"
@@ -626,8 +899,8 @@ msgid ""
 msgstr ""
 "Uso: nmcli connection { COMMAND | help }\n"
 "\n"
-"COMANDO := { show | up | down | add | modify | edit | delete | reload | load "
-"}\n"
+"COMANDO := { show | up | down | add | modify | edit | delete | reload | "
+"load }\n"
 "\n"
 "  show configured [[id | uuid | path] <ID>]\n"
 "  show active     [[id | uuid | path | apath] <ID>]\n"
@@ -652,67 +925,54 @@ msgstr ""
 "  load <filename> [ <filename>... ]\n"
 "\n"
 
-#: ../cli/src/connections.c:278
+#: ../clients/cli/connections.c:274
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := active [[id | uuid | path | apath] <ID>]\n"
-"\n"
-"Show connections which are currently used by a device to connect to a "
-"network.\n"
-"Without a parameter, all active connections are listed. When <ID> is "
-"provided,\n"
-"the connection details are displayed instead.\n"
-"\n"
-"ARGUMENTS := configured [[id | uuid | path] <ID>]\n"
-"\n"
-"Show in-memory and on-disk connections, some of which may also be active if\n"
-"a device is using that connection profile. Without a parameter, all profiles\n"
-"are listed. When <ID> is provided, the profile details are displayed instead."
-"\n"
-"\n"
+"ARGUMENTS := [--active]\n"
+"\n"
+"List in-memory and on-disk connection profiles, some of which may also be\n"
+"active if a device is using that connection profile. Without a parameter, "
+"all\n"
+"profiles are listed. When --active option is specified, only the active\n"
+"profiles are shown.\n"
+"\n"
+"ARGUMENTS := [--active] [--show-secrets] [id | uuid | path | apath] "
+"<ID> ...\n"
+"\n"
+"Show details for specified connections. By default, both static "
+"configuration\n"
+"and active connection data are displayed. It is possible to filter the "
+"output\n"
+"using global '--fields' option. Refer to the manual page for more "
+"information.\n"
+"When --active option is specified, only the active profiles are taken into\n"
+"account. --show-secrets option will reveal associated secrets as well.\n"
 msgstr ""
-"Uso: nmcli connection show { ARGUMENTS | help }\n"
-"\n"
-"ARGUMENTOS := active [[id | uuid | path | apath] <ID>]\n"
-"\n"
-"Mostrar conexiones que actualmente son utilizadas por un dispositivo para "
-"conectarse a una red.\n"
-"Sin un parámetro todas las conexiones activas aparecen. Cuando <ID> se "
-"proporciona, la información de conexión\n"
-"se muestra en su lugar.\n"
-"\n"
-"ARGUMENTOS := configured [[id | uuid | path] <ID>]\n"
-"\n"
-"Mostrar las conexiones en memoria y en disco, algunas de las cuales pueden "
-"también activarse si\n"
-"un dispositivo está utilizando ese perfil de conexión. Sin un parámetro, "
-"todos los perfiles\n"
-"se listan. Cuando se proporciona <ID>, la información de perfil se despliega "
-"en su lugar.\n"
-"\n"
 
-#: ../cli/src/connections.c:297
-#, c-format
+#: ../clients/cli/connections.c:295
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
 "\n"
 "ARGUMENTS := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp "
-"<name>]\n"
+"<name>] [passwd-file <file with passwords>]\n"
 "\n"
 "Activate a connection on a device. The profile to activate is identified by "
 "its\n"
 "name, UUID or D-Bus path.\n"
 "\n"
-"ARGUMENTS := ifname <ifname> [ap <BSSID>] [nsp <name>]\n"
+"ARGUMENTS := ifname <ifname> [ap <BSSID>] [nsp <name>] [passwd-file <file "
+"with passwords>]\n"
 "\n"
 "Activate a device with a connection. The connection profile is selected\n"
 "automatically by NetworkManager.\n"
 "\n"
-"ifname - specifies the device to active the connection on\n"
-"ap     - specifies AP to connect to (only valid for Wi-Fi)\n"
-"nsp    - specifies NSP to connect to (only valid for WiMAX)\n"
+"ifname      - specifies the device to active the connection on\n"
+"ap          - specifies AP to connect to (only valid for Wi-Fi)\n"
+"nsp         - specifies NSP to connect to (only valid for WiMAX)\n"
+"passwd-file - file with password(s) required to activate the connection\n"
 "\n"
 msgstr ""
 "Uso: nmcli connection up { ARGUMENTS | help }\n"
@@ -735,12 +995,12 @@ msgstr ""
 "nsp    - especifica NSP para conectarse a (únicamente válido para WiMAX)\n"
 "\n"
 
-#: ../cli/src/connections.c:318
-#, c-format
+#: ../clients/cli/connections.c:316
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := [id | uuid | path | apath] <ID>\n"
+"ARGUMENTS := [id | uuid | path | apath] <ID> ...\n"
 "\n"
 "Deactivate a connection from a device (without preventing the device from\n"
 "further auto-activation). The profile to deactivate is identified by its "
@@ -758,8 +1018,8 @@ msgstr ""
 "UUID o ruta D-Bus.\n"
 "\n"
 
-#: ../cli/src/connections.c:331
-#, c-format
+#: ../clients/cli/connections.c:328
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
 "\n"
@@ -771,6 +1031,8 @@ msgid ""
 "                  [con-name <connection name>]\n"
 "                  [autoconnect yes|no]\n"
 "\n"
+"                  [save yes|no]\n"
+"\n"
 "  TYPE_SPECIFIC_OPTIONS:\n"
 "    ethernet:     [mac <MAC address>]\n"
 "                  [cloned-mac <cloned MAC address>]\n"
@@ -780,6 +1042,7 @@ msgid ""
 "                  [mac <MAC address>]\n"
 "                  [cloned-mac <cloned MAC address>]\n"
 "                  [mtu <MTU>]\n"
+"                  [mode infrastructure|ap|adhoc]\n"
 "\n"
 "    wimax:        [mac <MAC address>]\n"
 "                  [nsp <NSP>]\n"
@@ -823,12 +1086,13 @@ msgid ""
 "                  [updelay <num>]\n"
 "                  [arp-interval <num>]\n"
 "                  [arp-ip-target <num>]\n"
+"                  [lacp-rate slow (0) | fast (1)]\n"
 "\n"
-"    bond-slave:   master <master (ifname or connection UUID)>\n"
+"    bond-slave:   master <master (ifname, or connection UUID or name)>\n"
 "\n"
 "    team:         [config <file>|<raw JSON data>]\n"
 "\n"
-"    team-slave:   master <master (ifname or connection UUID)>\n"
+"    team-slave:   master <master (ifname, or connection UUID or name)>\n"
 "                  [config <file>|<raw JSON data>]\n"
 "\n"
 "    bridge:       [stp yes|no]\n"
@@ -837,19 +1101,26 @@ msgid ""
 "                  [hello-time <1-10>]\n"
 "                  [max-age <6-40>]\n"
 "                  [ageing-time <0-1000000>]\n"
+"                  [mac <MAC address>]\n"
 "\n"
-"    bridge-slave: master <master (ifname or connection UUID)>\n"
+"    bridge-slave: master <master (ifname, or connection UUID or name)>\n"
 "                  [priority <0-63>]\n"
 "                  [path-cost <1-65535>]\n"
 "                  [hairpin yes|no]\n"
 "\n"
-"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
+"    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|"
+"ssh|l2tp|iodine|...\n"
 "                  [user <username>]\n"
 "\n"
 "    olpc-mesh:    ssid <SSID>\n"
 "                  [channel <1-13>]\n"
 "                  [dhcp-anycast <MAC address>]\n"
 "\n"
+"    adsl:         username <username>\n"
+"                  protocol pppoa|pppoe|ipoatm\n"
+"                  [password <password>]\n"
+"                  [encapsulation vcmux|llc]\n"
+"\n"
 "  IP_OPTIONS:\n"
 "                  [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n"
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
@@ -949,28 +1220,32 @@ msgstr ""
 "                  [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n"
 "\n"
 
-#: ../cli/src/connections.c:408
+#: ../clients/cli/connections.c:412
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := [id | uuid | path] <ID> <setting name>.<property name> "
-"[<value>]\n"
-"\n"
-"Modify a single property in the connection profile.\n"
-"The profile is identified by its name, UUID or D-Bus path.\n"
-"\n"
-msgstr ""
-"Uso: nmcli connection modify { ARGUMENTS | help }\n"
+"ARGUMENTS := [id | uuid | path] <ID> ([+|-]<setting>.<property> <value>)+\n"
 "\n"
-"ARGUMENTOS := [id | uuid | path] <ID> <setting name>.<property name> "
-"[<value>]\n"
+"Modify one or more properties of the connection profile.\n"
+"The profile is identified by its name, UUID or D-Bus path. For multi-valued\n"
+"properties you can use optional '+' or '-' prefix to the property name.\n"
+"The '+' sign allows appending items instead of overwriting the whole value.\n"
+"The '-' sign allows removing selected items instead of the whole value.\n"
 "\n"
-"Modificar una propiedad individual en el perfil de conexión.\n"
-"El perfil es identificado por su nombre, UUID o ruta D-Bus.\n"
+"Examples:\n"
+"nmcli con mod home-wifi wifi.ssid rakosnicek\n"
+"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, "
+"10.10.1.5/8\"\n"
+"nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n"
+"nmcli con mod em1-1 -ipv4.dns 1\n"
+"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n"
+"nmcli con mod bond0 +bond.options mii=500\n"
+"nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
+msgstr ""
 
-#: ../cli/src/connections.c:420
+#: ../clients/cli/connections.c:435
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -997,7 +1272,7 @@ msgstr ""
 "Añadir un nuevo perfil de conexión en un editor interactivo.\n"
 "\n"
 
-#: ../cli/src/connections.c:436
+#: ../clients/cli/connections.c:450
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1016,7 +1291,7 @@ msgstr ""
 "El perfil es identificado por su nombre, UUID o ruta  D-Bus.\n"
 "\n"
 
-#: ../cli/src/connections.c:448
+#: ../clients/cli/connections.c:461
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1029,7 +1304,7 @@ msgstr ""
 "Recargar todos los archivos de conexión desde el disco.\n"
 "\n"
 
-#: ../cli/src/connections.c:457
+#: ../clients/cli/connections.c:469
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1053,821 +1328,894 @@ msgstr ""
 "estado.\n"
 "\n"
 
-#: ../cli/src/connections.c:515
-#, c-format
-msgid "Error: 'list configured': %s"
-msgstr "Error: 'lista configurada': %s"
-
-#: ../cli/src/connections.c:523
-msgid "Connection details"
-msgstr "Detalles de conexiones"
-
-#: ../cli/src/connections.c:589
-msgid "never"
-msgstr "nunca"
-
-#: ../cli/src/connections.c:590 ../cli/src/connections.c:591
-#: ../cli/src/connections.c:833 ../cli/src/connections.c:834
-#: ../cli/src/connections.c:836 ../cli/src/connections.c:6112
-#: ../cli/src/devices.c:604 ../cli/src/devices.c:654 ../cli/src/devices.c:796
-#: ../cli/src/devices.c:797 ../cli/src/devices.c:798 ../cli/src/devices.c:831
-#: ../cli/src/devices.c:860 ../cli/src/devices.c:861 ../cli/src/devices.c:862
-#: ../cli/src/devices.c:863 ../cli/src/devices.c:864 ../cli/src/devices.c:865
-#: ../cli/src/devices.c:866 ../cli/src/network-manager.c:442
-msgid "yes"
-msgstr "sí"
-
-#: ../cli/src/connections.c:590 ../cli/src/connections.c:591
-#: ../cli/src/connections.c:833 ../cli/src/connections.c:834
-#: ../cli/src/connections.c:836 ../cli/src/connections.c:6112
-#: ../cli/src/devices.c:604 ../cli/src/devices.c:654 ../cli/src/devices.c:796
-#: ../cli/src/devices.c:797 ../cli/src/devices.c:798 ../cli/src/devices.c:831
-#: ../cli/src/devices.c:860 ../cli/src/devices.c:861 ../cli/src/devices.c:862
-#: ../cli/src/devices.c:863 ../cli/src/devices.c:864 ../cli/src/devices.c:865
-#: ../cli/src/devices.c:866 ../cli/src/network-manager.c:444
-msgid "no"
-msgstr "no"
-
-#: ../cli/src/connections.c:667
-msgid "List of configured connections"
-msgstr "Lista de conexiones configuradas"
-
-#: ../cli/src/connections.c:684 ../cli/src/connections.c:1225
-#: ../cli/src/connections.c:1785 ../cli/src/connections.c:1801
-#: ../cli/src/connections.c:1810 ../cli/src/connections.c:1820
-#: ../cli/src/connections.c:1916 ../cli/src/connections.c:7563
-#: ../cli/src/connections.c:7738 ../cli/src/devices.c:1633
-#: ../cli/src/devices.c:1641 ../cli/src/devices.c:2028
-#: ../cli/src/devices.c:2035 ../cli/src/devices.c:2049
-#: ../cli/src/devices.c:2056 ../cli/src/devices.c:2073
-#: ../cli/src/devices.c:2081 ../cli/src/devices.c:2277
-#: ../cli/src/devices.c:2373 ../cli/src/devices.c:2380
-#, c-format
-msgid "Error: %s argument is missing."
-msgstr "Error: falta el argumento %s."
-
-#: ../cli/src/connections.c:698
-#, c-format
-msgid "Error: %s - no such connection."
-msgstr "Error: %s - no hay tal conexión."
-
-#: ../cli/src/connections.c:710
-#, c-format
-msgid "Error: 'show configured': %s"
-msgstr "Error: 'mostrar configuradas': %s"
-
-#: ../cli/src/connections.c:715 ../cli/src/connections.c:1853
-#: ../cli/src/connections.c:7804 ../cli/src/connections.c:7845
-#: ../cli/src/connections.c:7997 ../cli/src/devices.c:2256
-#: ../cli/src/devices.c:2630 ../cli/src/network-manager.c:539
-#: ../cli/src/network-manager.c:582 ../cli/src/network-manager.c:599
-#: ../cli/src/network-manager.c:645 ../cli/src/network-manager.c:659
-#: ../cli/src/network-manager.c:776 ../cli/src/network-manager.c:820
-#: ../cli/src/network-manager.c:840
-#, c-format
-msgid "Error: %s."
-msgstr "Error: %s."
-
-#: ../cli/src/connections.c:728
+#: ../clients/cli/connections.c:540
 msgid "activating"
 msgstr "activando"
 
-#: ../cli/src/connections.c:730
+#: ../clients/cli/connections.c:542
 msgid "activated"
 msgstr "activada"
 
 # auto translated by TM merge from project: firewalld, version: 0.3.4, DocId: firewalld
-#: ../cli/src/connections.c:734
+#: ../clients/cli/connections.c:546
 msgid "deactivated"
 msgstr "desactivado"
 
-#: ../cli/src/connections.c:746
+#: ../clients/cli/connections.c:558
 msgid "VPN connecting (prepare)"
 msgstr "Conectando VPN (preparar)"
 
-#: ../cli/src/connections.c:748
+#: ../clients/cli/connections.c:560
 msgid "VPN connecting (need authentication)"
 msgstr "Conectando VPN (necesita autenticación)"
 
-#: ../cli/src/connections.c:750
+#: ../clients/cli/connections.c:562
 msgid "VPN connecting"
 msgstr "Conectando VPN"
 
-#: ../cli/src/connections.c:752
+#: ../clients/cli/connections.c:564
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Conectando VPN (obteniendo configuración IP)"
 
-#: ../cli/src/connections.c:754
+#: ../clients/cli/connections.c:566
 msgid "VPN connected"
 msgstr "VPN conectada"
 
-#: ../cli/src/connections.c:756
+#: ../clients/cli/connections.c:568
 msgid "VPN connection failed"
 msgstr "Falló la conexión VPN"
 
-#: ../cli/src/connections.c:758
+#: ../clients/cli/connections.c:570
 msgid "VPN disconnected"
 msgstr "VPN desconectada"
 
-# auto translated by TM merge from project: rhsm-web, version: 0.0, DocId: management
-#: ../cli/src/connections.c:829 ../cli/src/connections.c:839
-#: ../cli/src/devices.c:594
-msgid "N/A"
-msgstr "N/A"
+#: ../clients/cli/connections.c:640
+#, fuzzy, c-format
+msgid "Error updating secrets for %s: %s\n"
+msgstr "Error al guardar conexión: %s"
 
-#: ../cli/src/connections.c:1012
-#, c-format
-msgid "Error: 'list active': %s"
-msgstr "Error: 'activar lista': %s"
+#: ../clients/cli/connections.c:660
+#, fuzzy
+msgid "Connection profile details"
+msgstr "Detalles de conexiones"
+
+#: ../clients/cli/connections.c:672 ../clients/cli/connections.c:1081
+#, fuzzy, c-format
+msgid "Error: 'connection show': %s"
+msgstr "Error: 'device show': %s"
+
+#: ../clients/cli/connections.c:818
+msgid "never"
+msgstr "nunca"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/connections.c:1020
-msgid "Active connection details"
+#: ../clients/cli/connections.c:1069
+#, fuzzy
+msgid "Activate connection details"
 msgstr "Activar detalles de la conexión"
 
-#: ../cli/src/connections.c:1177 ../cli/src/connections.c:1840
-#: ../cli/src/connections.c:1899 ../cli/src/connections.c:7592
-#: ../cli/src/connections.c:7707 ../cli/src/connections.c:7798
-#: ../cli/src/connections.c:7826 ../cli/src/devices.c:1197
-#: ../cli/src/devices.c:1245 ../cli/src/devices.c:1403
-#: ../cli/src/devices.c:1538 ../cli/src/devices.c:1675
-#: ../cli/src/devices.c:2115 ../cli/src/devices.c:2414
-#: ../cli/src/network-manager.c:484
-#, c-format
-msgid "Error: NetworkManager is not running."
-msgstr "Error: NetworkManager no se está ejecutando."
+#: ../clients/cli/connections.c:1305
+#, fuzzy, c-format
+msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
+msgstr "Campo inválido '%s'; campos permitidos: %s"
 
-#: ../cli/src/connections.c:1203
-msgid "List of active connections"
-msgstr "Lista de conexiones activas"
+#: ../clients/cli/connections.c:1320 ../clients/cli/connections.c:1328
+#, fuzzy, c-format
+msgid "'%s' has to be alone"
+msgstr "el campo «%s» tiene que estar solo"
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/connections.c:1239 ../cli/src/connections.c:1926
+#. Add headers
+#: ../clients/cli/connections.c:1383
+#, fuzzy
+msgid "NetworkManager active profiles"
+msgstr "Estado de NetworkManager"
+
+#: ../clients/cli/connections.c:1384
+#, fuzzy
+msgid "NetworkManager connection profiles"
+msgstr "NetworkManager se fue a dormir"
+
+#: ../clients/cli/connections.c:1424 ../clients/cli/connections.c:2152
+#: ../clients/cli/connections.c:2174 ../clients/cli/connections.c:2183
+#: ../clients/cli/connections.c:2193 ../clients/cli/connections.c:2203
+#: ../clients/cli/connections.c:2365 ../clients/cli/connections.c:8815
+#: ../clients/cli/connections.c:9020 ../clients/cli/devices.c:2028
+#: ../clients/cli/devices.c:2036 ../clients/cli/devices.c:2359
+#: ../clients/cli/devices.c:2366 ../clients/cli/devices.c:2380
+#: ../clients/cli/devices.c:2387 ../clients/cli/devices.c:2404
+#: ../clients/cli/devices.c:2412 ../clients/cli/devices.c:2425
+#: ../clients/cli/devices.c:2669 ../clients/cli/devices.c:2676
+#: ../clients/cli/devices.c:2795 ../clients/cli/devices.c:2802
 #, c-format
-msgid "Error: '%s' is not an active connection."
-msgstr "Error: '%s' no se una conexión activa."
+msgid "Error: %s argument is missing."
+msgstr "Error: falta el argumento %s."
 
-#: ../cli/src/connections.c:1251
+#: ../clients/cli/connections.c:1439
+#, fuzzy, c-format
+msgid "Error: %s - no such connection profile."
+msgstr "Error: %s - no hay tal conexión."
+
+#: ../clients/cli/connections.c:1498 ../clients/cli/connections.c:2226
+#: ../clients/cli/connections.c:9319 ../clients/cli/devices.c:2636
+#: ../clients/cli/devices.c:3149 ../clients/cli/general.c:518
+#: ../clients/cli/general.c:567 ../clients/cli/general.c:584
+#: ../clients/cli/general.c:623 ../clients/cli/general.c:637
+#: ../clients/cli/general.c:755 ../clients/cli/general.c:802
+#: ../clients/cli/general.c:822
 #, c-format
-msgid "Error: 'show active': %s"
-msgstr "Error: 'mostrar activas': %s"
+msgid "Error: %s."
+msgstr "Error: %s."
 
-#: ../cli/src/connections.c:1344
+#: ../clients/cli/connections.c:1594
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "conexión no activa en el dispositivo «%s»"
 
-#: ../cli/src/connections.c:1352
+#: ../clients/cli/connections.c:1602
 msgid "no active connection or device"
 msgstr "conexión o dispositivo no activo"
 
-#: ../cli/src/connections.c:1423
+#: ../clients/cli/connections.c:1673
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "dispositivo «%s» incompatible con conexión «%s»"
 
-#: ../cli/src/connections.c:1426
+#: ../clients/cli/connections.c:1676
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "no se encontró dispositivo para conexión «%s»"
 
-#: ../cli/src/connections.c:1438
+#: ../clients/cli/connections.c:1688
 msgid "unknown reason"
 msgstr "razón desconocida"
 
-#: ../cli/src/connections.c:1440 ../cli/src/network-manager.c:288
+#: ../clients/cli/connections.c:1690 ../clients/cli/general.c:272
 msgid "none"
 msgstr "ninguna"
 
-#: ../cli/src/connections.c:1442
+#: ../clients/cli/connections.c:1692
 msgid "the user was disconnected"
 msgstr "el usuario estaba desconectado"
 
-#: ../cli/src/connections.c:1444
+#: ../clients/cli/connections.c:1694
 msgid "the base network connection was interrupted"
 msgstr "se interrumpió la conexión de red de base"
 
-#: ../cli/src/connections.c:1446
+#: ../clients/cli/connections.c:1696
 msgid "the VPN service stopped unexpectedly"
 msgstr "el servicio VPN se detuvo inesperadamente"
 
-#: ../cli/src/connections.c:1448
+#: ../clients/cli/connections.c:1698
 msgid "the VPN service returned invalid configuration"
 msgstr "el servicio VPN retornó una configuración no válida"
 
-#: ../cli/src/connections.c:1450
+#: ../clients/cli/connections.c:1700
 msgid "the connection attempt timed out"
 msgstr "se agotaron los intentos de conexión"
 
-#: ../cli/src/connections.c:1452
+#: ../clients/cli/connections.c:1702
 msgid "the VPN service did not start in time"
 msgstr "el servicio VPN no inició a tiempo"
 
-#: ../cli/src/connections.c:1454
+#: ../clients/cli/connections.c:1704
 msgid "the VPN service failed to start"
 msgstr "el servicio VPN falló en el inicio"
 
-#: ../cli/src/connections.c:1456
+#: ../clients/cli/connections.c:1706
 msgid "no valid VPN secrets"
 msgstr "secretos VPN no válidos"
 
-#: ../cli/src/connections.c:1458
+#: ../clients/cli/connections.c:1708
 msgid "invalid VPN secrets"
 msgstr "secretos VPN válidos"
 
-#: ../cli/src/connections.c:1460
+#: ../clients/cli/connections.c:1710
 msgid "the connection was removed"
 msgstr "se eliminó la conexión"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/connections.c:1477 ../cli/src/connections.c:1633
-#: ../cli/src/connections.c:6016
+#: ../clients/cli/connections.c:1732 ../clients/cli/connections.c:1760
+#: ../clients/cli/connections.c:1921 ../clients/cli/connections.c:7130
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Conexión activada con éxito (D-Bus active path: %s)\n"
 
-#: ../cli/src/connections.c:1482
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
+#: ../clients/cli/connections.c:1739
+#, fuzzy, c-format
+msgid ""
+"Connection successfully activated (master waiting for slaves) (D-Bus active "
+"path: %s)\n"
+msgstr "Conexión activada con éxito (D-Bus active path: %s)\n"
+
+#: ../clients/cli/connections.c:1743 ../clients/cli/connections.c:1765
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Error: falló la activación de la conexión."
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/connections.c:1507
+#: ../clients/cli/connections.c:1816
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Conexión VPN activada con éxito (D-Bus active path: %s)\n"
 
-#: ../cli/src/connections.c:1514
+#: ../clients/cli/connections.c:1824
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Error: falló la activación de la conexión: %s."
 
-#: ../cli/src/connections.c:1532 ../cli/src/devices.c:1294
+#: ../clients/cli/connections.c:1843 ../clients/cli/devices.c:1339
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Error: expiró la pausa de %d segundos."
 
-#: ../cli/src/connections.c:1597
+#: ../clients/cli/connections.c:1903
 #, c-format
-msgid ""
-"Error: Device '%s' is waiting for slaves before proceeding with activation."
+msgid "Error: Connection activation failed: %s"
+msgstr "Error: falló la activación de la conexión: %s"
+
+#: ../clients/cli/connections.c:1988
+#, fuzzy, c-format
+msgid "failed to read passwd-file '%s': %s"
+msgstr "Error: falló al retirar el valor de '%s': %s\n"
+
+#: ../clients/cli/connections.c:2000
+#, c-format
+msgid "missing colon in 'password' entry '%s'"
 msgstr ""
-"Error: Dispositivo '%s' está esperando los esclavos para proseguir con la "
-"activación."
 
-#: ../cli/src/connections.c:1617
+#: ../clients/cli/connections.c:2008
 #, c-format
-msgid "Error: Connection activation failed: %s"
-msgstr "Error: falló la activación de la conexión: %s"
+msgid "missing dot in 'password' entry '%s'"
+msgstr ""
+
+#: ../clients/cli/connections.c:2021
+#, c-format
+msgid "invalid setting name in 'password' entry '%s'"
+msgstr ""
 
 # auto translated by TM merge from project: evolution-mapi, version: el6, DocId: evolution-mapi
-#: ../cli/src/connections.c:1722 ../cli/src/connections.c:1854
+#: ../clients/cli/connections.c:2068 ../clients/cli/connections.c:2227
 msgid "unknown error"
 msgstr "Error desconocido"
 
-#: ../cli/src/connections.c:1730
+#: ../clients/cli/connections.c:2077
 #, c-format
 msgid "unknown device '%s'."
 msgstr "Dispositivo desconocido '%s'."
 
-#: ../cli/src/connections.c:1735
+#: ../clients/cli/connections.c:2082
 msgid "neither a valid connection nor device given"
 msgstr "Ni es una conexión válida ni es un dispositivo determinado."
 
-#: ../cli/src/connections.c:1773 ../cli/src/connections.c:1884
-#: ../cli/src/connections.c:7714
-msgid "Connection (name, UUID, or path): "
-msgstr "Conexión (nombre, UUID, o ruta): "
+#: ../clients/cli/connections.c:2165
+#, fuzzy, c-format
+msgid "Error: Connection '%s' does not exist."
+msgstr "Error: conexión no es válida: %s\n"
 
-#: ../cli/src/connections.c:1829 ../cli/src/devices.c:1171
-#: ../cli/src/devices.c:1647 ../cli/src/devices.c:2092
-#: ../cli/src/devices.c:2386
+#: ../clients/cli/connections.c:2211 ../clients/cli/devices.c:1238
+#: ../clients/cli/devices.c:2042 ../clients/cli/devices.c:2436
+#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2808
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Parámetro desconocido: %s\n"
 
 # auto translated by TM merge from project: gtk3, version: 3.8.2, DocId: gtk30
-#: ../cli/src/connections.c:1862
+#: ../clients/cli/connections.c:2235
 msgid "preparing"
 msgstr "Preparando"
 
-#: ../cli/src/connections.c:1889 ../cli/src/connections.c:7719
-#: ../cli/src/connections.c:7832
+#: ../clients/cli/connections.c:2259
+#, fuzzy, c-format
+msgid "Connection '%s' (%s) successfully deleted.\n"
+msgstr "Conexión '%s' (%s) agregada con éxito.\n"
+
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
+#: ../clients/cli/connections.c:2275
+#, fuzzy, c-format
+msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
+msgstr "Conexión activada con éxito (D-Bus active path: %s)\n"
+
+#: ../clients/cli/connections.c:2347 ../clients/cli/connections.c:9006
+#: ../clients/cli/connections.c:9111
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Error: no se especificó una conexión."
 
-#: ../cli/src/connections.c:2237 ../cli/src/utils.c:490
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
+#: ../clients/cli/connections.c:2379
+#, fuzzy, c-format
+msgid "Error: '%s' is not an active connection.\n"
+msgstr "Error: '%s' no se una conexión activa."
+
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
+#: ../clients/cli/connections.c:2380 ../clients/cli/connections.c:9035
+#, fuzzy, c-format
+msgid "Error: not all active connections found."
+msgstr "Error: '%s' no se una conexión activa."
+
+#: ../clients/cli/connections.c:2389
+#, fuzzy, c-format
+msgid "Error: no active connection provided."
+msgstr "Error: no se puede activar conexión: %s.\n"
+
+#: ../clients/cli/connections.c:2708 ../clients/cli/utils.c:569
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "'%s' no está entre [%s]"
 
-#: ../cli/src/connections.c:2319
+#: ../clients/cli/connections.c:2787
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s MAC address."
 msgstr "Error: '%s': '%s' no es una dirección MAC %s válida."
 
 # auto translated by TM merge from project: RHEL Migration Planning Guide, version: 6.4, DocId: Networking
-#: ../cli/src/connections.c:2320 ../tui/nm-editor-utils.c:173
-#: ../tui/nm-ui-utils.c:347
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:2788 ../clients/cli/connections.c:3273
+#: ../clients/tui/nm-editor-utils.c:164 ../libnm-core/nm-connection.c:1614
+#: ../libnm-glib/nm-device.c:1801 ../libnm/nm-device.c:1646
 msgid "InfiniBand"
 msgstr "Infiniband"
 
 # auto translated by TM merge from project: virt-manager, version: 0.9.0, DocId: virt-manager
-#: ../cli/src/connections.c:2320 ../tui/nm-editor-utils.c:156
-#: ../tui/nm-ui-utils.c:335
+#: ../clients/cli/connections.c:2788 ../clients/tui/nm-editor-utils.c:147
+#: ../libnm-glib/nm-device.c:1789 ../libnm/nm-device.c:1634
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../cli/src/connections.c:2343
+#: ../clients/cli/connections.c:2808
 #, c-format
 msgid "Error: 'mtu': '%s' is not a valid MTU."
 msgstr "Error: 'mtu': '%s' no es una MTU válido."
 
-#: ../cli/src/connections.c:2359
+#: ../clients/cli/connections.c:2824
 #, c-format
 msgid "Error: 'parent': '%s' is not a valid interface name."
 msgstr "Error: 'parent': '%s' no es un nombre de interfaz válido."
 
-#: ../cli/src/connections.c:2380
+#: ../clients/cli/connections.c:2845
 #, c-format
 msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
 msgstr "Error: 'p-key': '%s' no es una InfiniBand P_KEY válida."
 
-#: ../cli/src/connections.c:2396
-#, c-format
-msgid ""
-"Error: 'mode': '%s' is not a valid InfiniBand transport mode [datagram, "
-"connected]."
+#: ../clients/cli/connections.c:2890
+#, fuzzy, c-format
+msgid "Error: '%s': '%s' is not a valid %s %s."
+msgstr "Error: '%s': '%s' no es válido; %s "
+
+# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
+#: ../clients/cli/connections.c:2903
+#, fuzzy
+msgid "Wi-Fi mode"
+msgstr "Inalámbrica"
+
+#: ../clients/cli/connections.c:2912
+#, fuzzy
+msgid "InfiniBand transport mode"
+msgstr "Modo de transporte"
+
+#: ../clients/cli/connections.c:2924
+msgid "ADSL protocol"
 msgstr ""
-"Error: 'mode': '%s' no es un modo de transporte InfiniBand válido [datagram, "
-"connected]."
 
-#: ../cli/src/connections.c:2412
+#: ../clients/cli/connections.c:2935
+#, fuzzy
+msgid "ADSL encapsulation"
+msgstr "Autenticación DSL"
+
+#: ../clients/cli/connections.c:2948
 #, c-format
 msgid "Error: 'flags': '%s' is not valid; use <0-7>."
 msgstr "Error: 'flags': '%s' no es válido; use <0-7>."
 
-#: ../cli/src/connections.c:2434
+#: ../clients/cli/connections.c:2970
 #, c-format
 msgid "Error: '%s': '%s' is not valid; %s "
 msgstr "Error: '%s': '%s' no es válido; %s "
 
-#: ../cli/src/connections.c:2541
+#: ../clients/cli/connections.c:3149
 #, c-format
 msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
 msgstr "Error: '%s': '%s' no es válido; use <%u-%u>."
 
+#. Ask for optional arguments.
+#: ../clients/cli/connections.c:3205
+#, fuzzy, c-format
+msgid "There is %d optional argument for '%s' connection type.\n"
+msgid_plural "There are %d optional arguments for '%s' connection type.\n"
+msgstr[0] "Hay 1 argumento opcional para tipo de conexión '%s'\n"
+msgstr[1] "Hay 1 argumento opcional para tipo de conexión '%s'\n"
+
+#: ../clients/cli/connections.c:3208
+#, fuzzy, c-format
+msgid "Do you want to provide it? %s"
+msgid_plural "Do you want to provide them? %s"
+msgstr[0] "¿Desea proporcionarlo? (Sí o No) [yes] "
+msgstr[1] "¿Desea proporcionarlo? (Sí o No) [yes] "
+
 # auto translated by TM merge from project: virt-manager, version: 0.9.0, DocId: virt-manager
-#: ../cli/src/connections.c:2555
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3225
 msgid "ethernet"
 msgstr "Ethernet"
 
-# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
-#: ../cli/src/connections.c:2555 ../tui/nm-editor-utils.c:164
-#: ../tui/nm-ui-utils.c:337
-msgid "Wi-Fi"
-msgstr "Inalámbrica"
-
-#: ../cli/src/connections.c:2558
-#, c-format
-msgid "There are 3 optional arguments for '%s' connection type.\n"
-msgstr "Hay 3 argumentos opcionales para tipo de conexión '%s'.\n"
-
-#: ../cli/src/connections.c:2559 ../cli/src/connections.c:2613
-#: ../cli/src/connections.c:2735 ../cli/src/connections.c:2781
-#: ../cli/src/connections.c:2841 ../cli/src/connections.c:2909
-#: ../cli/src/connections.c:3072 ../cli/src/connections.c:3168
-#: ../cli/src/connections.c:3250
-msgid "Do you want to provide them? (yes/no) [yes] "
-msgstr "¿Desea proporcionarlos? (Sí o No) [yes] "
-
-#: ../cli/src/connections.c:2567 ../cli/src/connections.c:2621
-#: ../cli/src/connections.c:2748 ../cli/src/connections.c:2849
+#: ../clients/cli/connections.c:3230 ../clients/cli/connections.c:3278
+#: ../clients/cli/connections.c:3412 ../clients/cli/connections.c:3491
 msgid "MTU [auto]: "
 msgstr "MTU [auto]: "
 
-#: ../cli/src/connections.c:2578 ../cli/src/connections.c:2632
-#: ../cli/src/connections.c:2711 ../cli/src/connections.c:2759
+#: ../clients/cli/connections.c:3241 ../clients/cli/connections.c:3289
+#: ../clients/cli/connections.c:3384 ../clients/cli/connections.c:3423
+#: ../clients/cli/connections.c:3795
 msgid "MAC [none]: "
 msgstr "MAC [none]: "
 
-#: ../cli/src/connections.c:2589
+#: ../clients/cli/connections.c:3252
 msgid "Cloned MAC [none]: "
 msgstr "MAC clonada [none]: "
 
-#: ../cli/src/connections.c:2612
-#, c-format
-msgid "There are 5 optional arguments for 'InfiniBand' connection type.\n"
-msgstr "Hay 5 argumentos opcionales para tipo de conexión 'Infiniband'.\n"
-
-#: ../cli/src/connections.c:2643
-msgid "Transport mode (datagram or connected) [datagram]: "
-msgstr "Modo de transporte (datagrama o conectado) [datagram]: "
+#: ../clients/cli/connections.c:3300
+#, fuzzy, c-format
+msgid "Transport mode %s"
+msgstr "Modo de transporte"
 
-#: ../cli/src/connections.c:2656
+#: ../clients/cli/connections.c:3313
 msgid "Parent interface [none]: "
 msgstr "Interfaz principal [none]: "
 
-#: ../cli/src/connections.c:2667
+#: ../clients/cli/connections.c:3324
 msgid "P_KEY [none]: "
 msgstr "P_KEY [none]: "
 
-#: ../cli/src/connections.c:2677
+#: ../clients/cli/connections.c:3334
 #, c-format
 msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
 msgstr "Error: 'p-key' es obligatorio cuando 'parent' está especificado.\n"
 
-#: ../cli/src/connections.c:2702
-#, c-format
-msgid "There is 1 optional argument for 'WiMax' connection type.\n"
-msgstr "Hay 1 argumento opcional para tipo de conexión 'WiMax'.\n"
+# auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0
+#. Ask for optional arguments
+#: ../clients/cli/connections.c:3351 ../clients/tui/nm-editor-utils.c:155
+#: ../libnm-glib/nm-device.c:1791 ../libnm/nm-device.c:1636
+msgid "Wi-Fi"
+msgstr "Inalámbrica"
 
-#: ../cli/src/connections.c:2703 ../cli/src/connections.c:2805
-#: ../cli/src/connections.c:3024 ../cli/src/connections.c:3226
-msgid "Do you want to provide it? (yes/no) [yes] "
-msgstr "¿Desea proporcionarlo? (Sí o No) [yes] "
+#: ../clients/cli/connections.c:3359
+#, fuzzy, c-format
+msgid "Mode %s"
+msgstr "Modo"
 
-#: ../cli/src/connections.c:2734
-#, c-format
-msgid "There are 4 optional arguments for 'PPPoE' connection type.\n"
-msgstr "Hay 4 argumentos opcionales para tipo de conexión 'PPPoE'.\n"
+#. Ask for optional 'wimax' arguments.
+#: ../clients/cli/connections.c:3379 ../libnm-glib/nm-device.c:1797
+#: ../libnm/nm-device.c:1642
+msgid "WiMAX"
+msgstr "WiMAX"
 
-#: ../cli/src/connections.c:2742 ../cli/src/connections.c:2790
+#. Ask for optional 'pppoe' arguments.
+#: ../clients/cli/connections.c:3402
+msgid "PPPoE"
+msgstr ""
+
+#: ../clients/cli/connections.c:3406 ../clients/cli/connections.c:3444
+#: ../clients/cli/connections.c:3917
 msgid "Password [none]: "
 msgstr "Contraseña [none]: "
 
-#: ../cli/src/connections.c:2744
+#: ../clients/cli/connections.c:3408
 msgid "Service [none]: "
 msgstr "Servicio [ninguno]: "
 
-#: ../cli/src/connections.c:2780
-#, c-format
-msgid ""
-"There are 2 optional arguments for 'mobile broadband' connection type.\n"
-msgstr ""
-"Hay 2 argumentos opcionales para tipo de conexión 'banda ancha de móvil'.\n"
+#. Ask for optional 'gsm' or 'cdma' arguments.
+#: ../clients/cli/connections.c:3438
+#, fuzzy
+msgid "mobile broadband"
+msgstr "Banda ancha móvil"
 
-#: ../cli/src/connections.c:2788 ../cli/src/connections.c:3233
+#: ../clients/cli/connections.c:3442 ../clients/cli/connections.c:3867
 msgid "Username [none]: "
 msgstr "Nombre de usuario [none]: "
 
-#: ../cli/src/connections.c:2804
-#, c-format
-msgid "There is 1 optional argument for 'bluetooth' connection type.\n"
-msgstr "Hay 1 argumento opcional para tipo de conexión 'bluetooth'.\n"
+#. Ask for optional 'bluetooth' arguments.
+#: ../clients/cli/connections.c:3457
+#, fuzzy
+msgid "bluetooth"
+msgstr "Bluetooth"
 
-#: ../cli/src/connections.c:2813
-msgid "Bluetooth type (panu, dun-gsm or dun-cdma) [panu]: "
-msgstr "Tipo Bluetooth (panu, dun-gsm or dun-cdma) [panu]: "
+#: ../clients/cli/connections.c:3464
+#, fuzzy, c-format
+msgid "Bluetooth type %s"
+msgstr "Bluetooth"
 
-#: ../cli/src/connections.c:2821
+#: ../clients/cli/connections.c:3470
 #, c-format
 msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
 msgstr "Error: 'bt-type': '%s' no es un tipo bluetooth válido.\n"
 
-#: ../cli/src/connections.c:2840
-#, c-format
-msgid "There are 4 optional arguments for 'VLAN' connection type.\n"
-msgstr "Hay 4 argumentos opcionales para tipo de conexión 'Vlan'.\n"
+#. Ask for optional 'vlan' arguments.
+#. 13
+#: ../clients/cli/connections.c:3486 ../clients/cli/devices.c:240
+#: ../clients/tui/nm-editor-utils.c:218 ../clients/tui/nmt-page-vlan.c:97
+#: ../libnm-core/nm-connection.c:1612 ../libnm-glib/nm-device.c:1809
+#: ../libnm-util/nm-connection.c:1601 ../libnm/nm-device.c:1654
+msgid "VLAN"
+msgstr "VLAN"
 
-#: ../cli/src/connections.c:2860
+#: ../clients/cli/connections.c:3502
 msgid "VLAN flags (<0-7>) [none]: "
 msgstr "Indicadores VLAN (<0-7>) [none]: "
 
-#: ../cli/src/connections.c:2871
+#: ../clients/cli/connections.c:3513
 msgid "Ingress priority maps [none]: "
 msgstr "Mapas de prioridad de ingreso [none]: "
 
-#: ../cli/src/connections.c:2882
+#: ../clients/cli/connections.c:3524
 msgid "Egress priority maps [none]: "
 msgstr "Mapas de prioridad de egreso [none]: "
 
-#: ../cli/src/connections.c:2908
-#, c-format
-msgid "There are optional arguments for 'bond' connection type.\n"
-msgstr "Hay argumentos opcionales para tipo de conexión 'bond'.\n"
-
-#: ../cli/src/connections.c:2918
+#: ../clients/cli/connections.c:3535
 msgid "Bonding mode [balance-rr]: "
 msgstr "Modo de vinculación [balance-rr] desconocido: "
 
-#: ../cli/src/connections.c:2934
+#. Ask for optional 'bond' arguments.
+#: ../clients/cli/connections.c:3551
+msgid "bond"
+msgstr ""
+
+#: ../clients/cli/connections.c:3573
 msgid "Bonding primary interface [none]: "
 msgstr "Interfaz de vinculación primaria [none]: "
 
-#: ../cli/src/connections.c:2937
+#: ../clients/cli/connections.c:3576
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name.\n"
 msgstr "Error: 'primary': '%s' no es un nombre de interfaz válido.\n"
 
-#: ../cli/src/connections.c:2945
-msgid "Bonding monitoring mode (miimon or arp) [miimon]: "
-msgstr "Modo de monitorización de vinculación (miimon o arp) [miimon]: "
+#: ../clients/cli/connections.c:3584
+#, fuzzy, c-format
+msgid "Bonding monitoring mode %s"
+msgstr "Enlace de monitorización"
 
-#: ../cli/src/connections.c:2950
+#: ../clients/cli/connections.c:3590
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
 "Error: '%s' modo de monitorización no es válido; utilice '%s' o '%s'.\n"
 
-#: ../cli/src/connections.c:2959
+#: ../clients/cli/connections.c:3599
 msgid "Bonding miimon [100]: "
 msgstr "Vinculación miimon [100]: "
 
-#: ../cli/src/connections.c:2962
+#: ../clients/cli/connections.c:3602
 #, c-format
 msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
 msgstr "Error: 'miimon': '%s' no es un número valido <0-%u>.\n"
 
-#: ../cli/src/connections.c:2970
+#: ../clients/cli/connections.c:3610
 msgid "Bonding downdelay [0]: "
 msgstr "Vinculación downdelay [0]: "
 
-#: ../cli/src/connections.c:2973
+#: ../clients/cli/connections.c:3613
 #, c-format
 msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Error: 'downdelay': '%s' no es un número válido <0-%u>.\n"
 
-#: ../cli/src/connections.c:2981
+#: ../clients/cli/connections.c:3621
 msgid "Bonding updelay [0]: "
 msgstr "Vinculación updelay [0]: "
 
-#: ../cli/src/connections.c:2984
+#: ../clients/cli/connections.c:3624
 #, c-format
 msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Error: 'updelay': '%s' no es un número válido <0-%u>.\n"
 
-#: ../cli/src/connections.c:2993
+#: ../clients/cli/connections.c:3633
 msgid "Bonding arp-interval [0]: "
 msgstr "Vinculación arp-interval [0]: "
 
-#: ../cli/src/connections.c:2996
+#: ../clients/cli/connections.c:3636
 #, c-format
 msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
 msgstr "Error: 'arp-interval': '%s' no es un número válido <0-%u>.\n"
 
-#: ../cli/src/connections.c:3004
+#. FIXME: verify the string
+#: ../clients/cli/connections.c:3644
 msgid "Bonding arp-ip-target [none]: "
 msgstr "Vinculación arp-ip-target [none]: "
 
-#: ../cli/src/connections.c:3023
-#, c-format
-msgid "There is 1 optional argument for '%s' connection type.\n"
-msgstr "Hay 1 argumento opcional para tipo de conexión '%s'\n"
+#: ../clients/cli/connections.c:3651
+msgid "LACP rate ('slow' or 'fast') [slow]: "
+msgstr ""
 
-#: ../cli/src/connections.c:3032
+#: ../clients/cli/connections.c:3657
+#, fuzzy, c-format
+msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
+msgstr "Error: 'master': '%s' no es un UUID o una interfaz válida."
+
+#: ../clients/cli/connections.c:3680
 msgid "Team JSON configuration [none]: "
 msgstr "Configuración de equipo JSON [ninguna]: "
 
-#: ../cli/src/connections.c:3051
+#: ../clients/cli/connections.c:3697
 msgid "team"
 msgstr "Equipo"
 
-#: ../cli/src/connections.c:3057
+#: ../clients/cli/connections.c:3703
 msgid "team-slave"
 msgstr "Equipo esclavo"
 
-#: ../cli/src/connections.c:3071
-#, c-format
-msgid "There are 6 optional arguments for 'bridge' connection type.\n"
-msgstr "Hay 6 argumentos opcionales para tipo de conexión 'bridge'.\n"
+# auto translated by TM merge from project: RHN Satellite UI, version: 5.5, DocId: java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource
+#. Ask for optional 'bridge' arguments.
+#: ../clients/cli/connections.c:3715
+#, fuzzy
+msgid "bridge"
+msgstr "Puente"
 
-#: ../cli/src/connections.c:3081
-msgid "Enable STP (yes/no) [yes]: "
+#: ../clients/cli/connections.c:3721
+#, fuzzy, c-format
+msgid "Enable STP %s"
 msgstr "Habilitar STP (si o no) [yes]: "
 
-#: ../cli/src/connections.c:3085
-#, c-format
-msgid "Error: 'stp': '%s'.\n"
-msgstr "Error: 'stp': '%s'.\n"
+#: ../clients/cli/connections.c:3726
+#, fuzzy, c-format
+msgid "Error: 'stp': %s.\n"
+msgstr "Error: 'stp': '%s'."
 
-#: ../cli/src/connections.c:3093
-msgid "STP priority [128]: "
+#: ../clients/cli/connections.c:3734
+#, fuzzy
+msgid "STP priority [32768]: "
 msgstr "Prioridad STP [128]: "
 
-#: ../cli/src/connections.c:3097
+#: ../clients/cli/connections.c:3738
 #, c-format
 msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
 msgstr "Error: 'priority': '%s' no es un número válido <0-%d>.\n"
 
-#: ../cli/src/connections.c:3105
+#: ../clients/cli/connections.c:3746
 msgid "Forward delay [15]: "
 msgstr "Demora de reenvío [15]:"
 
-#: ../cli/src/connections.c:3109
+#: ../clients/cli/connections.c:3750
 #, c-format
 msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
 msgstr "Error: 'forward-updelay': '%s' no es un número válido <2-30>.\n"
 
-#: ../cli/src/connections.c:3118
+#: ../clients/cli/connections.c:3759
 msgid "Hello time [2]: "
 msgstr "Hello time [2]: "
 
-#: ../cli/src/connections.c:3122
+#: ../clients/cli/connections.c:3763
 #, c-format
 msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
 msgstr "Error: 'hello-time': '%s' no es un número válido <1-10>.\n"
 
-#: ../cli/src/connections.c:3130
+#: ../clients/cli/connections.c:3771
 msgid "Max age [20]: "
 msgstr "Edad máxima [20]: "
 
-#: ../cli/src/connections.c:3134
+#: ../clients/cli/connections.c:3775
 #, c-format
 msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
 msgstr "Error: 'max-age': '%s' no es un número válido <6-40>.\n"
 
-#: ../cli/src/connections.c:3142
+#: ../clients/cli/connections.c:3783
 msgid "MAC address ageing time [300]: "
 msgstr "Tiempo de envejecimiento de direción MAC  [300]: "
 
-#: ../cli/src/connections.c:3146
+#: ../clients/cli/connections.c:3787
 #, c-format
 msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
 msgstr "Error: 'ageing-time': '%s' no es un número válido <0-1000000>.\n"
 
-#: ../cli/src/connections.c:3167
-#, c-format
-msgid "There are 3 optional arguments for 'bridge-slave' connection type.\n"
-msgstr "Hay 3 argumentos opcionales para tipo de conexión 'bridge-slave'.\n"
+#. Ask for optional 'bridge-slave' arguments.
+#: ../clients/cli/connections.c:3814
+#, fuzzy
+msgid "bridge-slave"
+msgstr "Equipo esclavo"
 
-#: ../cli/src/connections.c:3176
+#: ../clients/cli/connections.c:3819
 msgid "Bridge port priority [32]: "
 msgstr "Prioridad de puerto de puente [32]: "
 
-#: ../cli/src/connections.c:3189
+#: ../clients/cli/connections.c:3832
 msgid "Bridge port STP path cost [100]: "
 msgstr "Costo de ruta STP puerto de puente [100]: "
 
-#: ../cli/src/connections.c:3203
-msgid "Hairpin (yes/no) [yes]: "
-msgstr "Hairpin (si o no) [yes]: "
-
-#: ../cli/src/connections.c:3207
-#, c-format
-msgid "Error: 'hairpin': '%s'.\n"
-msgstr "Error: 'hairpin': '%s'.\n"
+#: ../clients/cli/connections.c:3846
+#, fuzzy, c-format
+msgid "Hairpin %s"
+msgstr "Modo de Hairpin"
 
-#: ../cli/src/connections.c:3225
-#, c-format
-msgid "There is 1 optional argument for 'VPN' connection type.\n"
-msgstr "Hay 1 argumento opcional para tipo de conexión 'VPN'.\n"
+#: ../clients/cli/connections.c:3851
+#, fuzzy, c-format
+msgid "Error: 'hairpin': %s.\n"
+msgstr "Error: 'hairpin': '%s'."
 
-#: ../cli/src/connections.c:3249
-#, c-format
-msgid "There are 2 optional arguments for 'OLPC Mesh' connection type.\n"
-msgstr "Hay 2 argumentos opcionales para tipo de conexión 'OLPC'.\n"
+#. Ask for optional 'olpc' arguments.
+#: ../clients/cli/connections.c:3878 ../libnm-glib/nm-device.c:1795
+#: ../libnm/nm-device.c:1640
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
 
-#: ../cli/src/connections.c:3258
+#: ../clients/cli/connections.c:3883
 msgid "OLPC Mesh channel [1]: "
 msgstr "Canal OLPC Mesh [1]: "
 
-#: ../cli/src/connections.c:3261
+#: ../clients/cli/connections.c:3886
 #, c-format
 msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
 msgstr "Error: 'channel': '%s' no es un número válido <1-13>.\n"
 
-#: ../cli/src/connections.c:3269
+#: ../clients/cli/connections.c:3894
 msgid "DHCP anycast MAC address [none]: "
 msgstr "Dirección MAC DHCP anycast [none]: "
 
-#: ../cli/src/connections.c:3317
-msgid "IPv4 address (IP[/plen] [gateway]) [none]: "
+#. Ask for optional 'adsl' arguments.
+#: ../clients/cli/connections.c:3913 ../libnm-glib/nm-device.c:1811
+#: ../libnm/nm-device.c:1656
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../clients/cli/connections.c:3921
+#, fuzzy, c-format
+msgid "ADSL encapsulation %s"
+msgstr "Conexión ADSL %d"
+
+#: ../clients/cli/connections.c:3963
+#, fuzzy
+msgid "IPv4 address (IP[/plen]) [none]: "
 msgstr "Dirección IPv4 (IP[/plen] [gateway]) [none]: "
 
-#: ../cli/src/connections.c:3319
-msgid "IPv6 address (IP[/plen] [gateway]) [none]: "
+#: ../clients/cli/connections.c:3965
+#, fuzzy
+msgid "IPv6 address (IP[/plen]) [none]: "
 msgstr "Dirección IPv6 (IP[/plen] [gateway]) [none]: "
 
-#: ../cli/src/connections.c:3337
-#, c-format
-msgid "  Address successfully added: %s %s\n"
+#: ../clients/cli/connections.c:3979
+#, fuzzy, c-format
+msgid "  Address successfully added: %s\n"
 msgstr "Dirección agregada con éxito: %s %s\n"
 
-#: ../cli/src/connections.c:3339
-#, c-format
-msgid "  Warning: address already present: %s %s\n"
+#: ../clients/cli/connections.c:3981
+#, fuzzy, c-format
+msgid "  Warning: address already present: %s\n"
 msgstr "  Advertencia: la dirección ya está presente: %s %s\n"
 
-#: ../cli/src/connections.c:3341
+#: ../clients/cli/connections.c:3983
 #, c-format
 msgid "  Warning: ignoring garbage at the end: '%s'\n"
 msgstr "  Advertencia: ignorando basura al final: '%s'\n"
 
-#: ../cli/src/connections.c:3343 ../cli/src/connections.c:4192
-#: ../cli/src/connections.c:4247 ../cli/src/connections.c:4646
-#: ../cli/src/connections.c:4656
+#: ../clients/cli/connections.c:3985 ../clients/cli/connections.c:4867
+#: ../clients/cli/connections.c:4928 ../clients/cli/connections.c:5401
+#: ../clients/cli/connections.c:5434
 msgid "Error: "
 msgstr "Error: "
 
-#: ../cli/src/connections.c:3361
-msgid "Do you want to add IP addresses? (yes/no) [yes] "
+#: ../clients/cli/connections.c:4005
+#, fuzzy
+msgid "IPv4 gateway [none]: "
+msgstr "Dirección IPv4 (IP[/plen] [gateway]) [none]: "
+
+#: ../clients/cli/connections.c:4008
+#, fuzzy
+msgid "IPv6 gateway [none]: "
+msgstr "Dirección IPv6 (IP[/plen] [gateway]) [none]: "
+
+#: ../clients/cli/connections.c:4028
+#, fuzzy, c-format
+msgid "Error: invalid gateway address '%s'\n"
+msgstr "Error: invalid extra argument '%s'."
+
+#. Ask for IP addresses
+#: ../clients/cli/connections.c:4041
+#, fuzzy, c-format
+msgid "Do you want to add IP addresses? %s"
 msgstr "¿Desea proporcionar las direcciones IP? (Si o No) [yes] "
 
-#: ../cli/src/connections.c:3367
+#: ../clients/cli/connections.c:4049
 #, c-format
 msgid "Press <Enter> to finish adding addresses.\n"
 msgstr "Pulse <Enter> para terminar de agregar direcciones.\n"
 
-#: ../cli/src/connections.c:3513
+#: ../clients/cli/connections.c:4189
 #, c-format
 msgid "Error: 'parent': not valid without 'p-key'."
 msgstr "Error: 'parent': 'no es válido sin 'p-key'."
 
-#: ../cli/src/connections.c:3569 ../cli/src/connections.c:4562
+#: ../clients/cli/connections.c:4244 ../clients/cli/connections.c:5249
 msgid "SSID: "
 msgstr "SSID: "
 
-#: ../cli/src/connections.c:3572 ../cli/src/connections.c:4565
+#: ../clients/cli/connections.c:4247 ../clients/cli/connections.c:5252
 msgid "Error: 'ssid' is required."
 msgstr "Error: se requiere 'ssid'."
 
-#: ../cli/src/connections.c:3636
+#: ../clients/cli/connections.c:4311
 msgid "WiMAX NSP name: "
 msgstr "Nombre NSP WiMAX: "
 
-#: ../cli/src/connections.c:3639
+#: ../clients/cli/connections.c:4314
 msgid "Error: 'nsp' is required."
 msgstr "Error: se requiere 'nsp'."
 
-#: ../cli/src/connections.c:3694
+#: ../clients/cli/connections.c:4366
 msgid "PPPoE username: "
 msgstr "Nombre de usuario PPPoE"
 
-#: ../cli/src/connections.c:3697
+#: ../clients/cli/connections.c:4369 ../clients/cli/connections.c:5319
 msgid "Error: 'username' is required."
 msgstr "Error: 'username' es requerido."
 
-#: ../cli/src/connections.c:3768
+#: ../clients/cli/connections.c:4438
 msgid "APN: "
 msgstr "APN: "
 
-#: ../cli/src/connections.c:3771
+#: ../clients/cli/connections.c:4441
 msgid "Error: 'apn' is required."
 msgstr "Error: se requiere 'apn'."
 
-#: ../cli/src/connections.c:3830
+#: ../clients/cli/connections.c:4499
 msgid "Bluetooth device address: "
 msgstr "Dirección de dispositivo Bluetooth:"
 
-#: ../cli/src/connections.c:3833
+#: ../clients/cli/connections.c:4502
 msgid "Error: 'addr' is required."
 msgstr "Error: se requiere 'addr'."
 
-#: ../cli/src/connections.c:3876
+#: ../clients/cli/connections.c:4543
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
 msgstr "Error: 'bt-type': '%s' no es válido; utilice [%s, %s (%s), %s]."
 
-#: ../cli/src/connections.c:3921
+#: ../clients/cli/connections.c:4587
 msgid "VLAN parent device or connection UUID: "
 msgstr "Dispositivo principal VLAN o UUID de conexión: "
 
-#: ../cli/src/connections.c:3924
+#: ../clients/cli/connections.c:4590
 msgid "Error: 'dev' is required."
 msgstr "Error: se requiere 'dev'."
 
-#: ../cli/src/connections.c:3928
+#: ../clients/cli/connections.c:4594
 msgid "VLAN ID <0-4095>: "
 msgstr "ID de VLAN <0-4095>: "
 
-#: ../cli/src/connections.c:3931
+#: ../clients/cli/connections.c:4597
 msgid "Error: 'id' is required."
 msgstr "Error: Se requiere 'id'."
 
-#: ../cli/src/connections.c:3937
+#: ../clients/cli/connections.c:4603
 #, c-format
 msgid "Error: 'id': '%s' is not valid; use <0-4095>."
 msgstr "Error: 'id': '%s' no es válido; use <0-4095>."
 
-#: ../cli/src/connections.c:3947
+#: ../clients/cli/connections.c:4613
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
 msgstr "Error: 'dev': '%s' no es ni nombre de interfaz ni  MAC."
 
-#: ../cli/src/connections.c:4082
+#: ../clients/cli/connections.c:4747
 #, c-format
 msgid "Error: 'mode': %s."
 msgstr "Error: 'modo': %s."
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.9.0, DocId: NetworkManager
-#: ../cli/src/connections.c:4091
+#: ../clients/cli/connections.c:4756
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name."
 msgstr "Error: 'primary': '%s' no es un nombre de interfaz válido."
 
-#: ../cli/src/connections.c:4134
-msgid "Bond master: "
-msgstr "Maestro de vínculo: "
-
-#: ../cli/src/connections.c:4137 ../cli/src/connections.c:4229
-#: ../cli/src/connections.c:4416
+#: ../clients/cli/connections.c:4808 ../clients/cli/connections.c:4906
+#: ../clients/cli/connections.c:5108
 msgid "Error: 'master' is required."
 msgstr "Error: se requiere 'master'."
 
-#: ../cli/src/connections.c:4142 ../cli/src/connections.c:4239
-#: ../cli/src/connections.c:4427
+#: ../clients/cli/connections.c:4814 ../clients/cli/connections.c:4912
+#: ../clients/cli/connections.c:5114
+#, c-format
+msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:4817 ../clients/cli/connections.c:4920
+#: ../clients/cli/connections.c:5117
 #, c-format
 msgid ""
 "Warning: 'type' is currently ignored. We only support ethernet slaves for "
@@ -1876,102 +2224,139 @@ msgstr ""
 "Advertencia: 'type' se ignora actualmente. Solamente se soportan esclavos de "
 "Ethernet en el momento.\n"
 
-#: ../cli/src/connections.c:4226
-msgid "Team master: "
-msgstr "Maestro de equipo: "
-
-#: ../cli/src/connections.c:4329
+#: ../clients/cli/connections.c:5014
 #, c-format
 msgid "Error: 'stp': %s."
 msgstr "Error: 'stp': '%s'."
 
-#: ../cli/src/connections.c:4413
-msgid "Bridge master: "
-msgstr "Maestro de puente:"
-
-#: ../cli/src/connections.c:4421
-#, c-format
-msgid "Error: 'master': '%s' is not valid UUID nor interface."
-msgstr "Error: 'master': '%s' no es un UUID o una interfaz válida."
-
-#: ../cli/src/connections.c:4454
+#: ../clients/cli/connections.c:5144
 #, c-format
 msgid "Error: 'hairpin': %s."
 msgstr "Error: 'hairpin': '%s'."
 
-#: ../cli/src/connections.c:4506
-msgid "VPN type: "
-msgstr "Tipo de VPN:"
-
-#: ../cli/src/connections.c:4509
+#: ../clients/cli/connections.c:5197
 msgid "Error: 'vpn-type' is required."
 msgstr "Error: se requiere 'vpn-type'."
 
-#: ../cli/src/connections.c:4520
-#, c-format
-msgid "Error: 'vpn-type': %s."
+#: ../clients/cli/connections.c:5204
+#, fuzzy, c-format
+msgid "Warning: 'vpn-type': %s not known.\n"
 msgstr "Error: 'vpn-type': %s."
 
-#: ../cli/src/connections.c:4578
+#: ../clients/cli/connections.c:5265
 #, c-format
 msgid "Error: 'channel': '%s' is not valid; use <1-13>."
 msgstr "Error: 'channel': '%s' no es válido; use <1-13>."
 
-#: ../cli/src/connections.c:4613
+#: ../clients/cli/connections.c:5316
+#, fuzzy
+msgid "Username: "
+msgstr "Nombre de usuario"
+
+#: ../clients/cli/connections.c:5325
+#, c-format
+msgid "Protocol %s"
+msgstr ""
+
+#: ../clients/cli/connections.c:5328
+#, fuzzy
+msgid "Error: 'protocol' is required."
+msgstr "Error: se requiere 'nsp'."
+
+#: ../clients/cli/connections.c:5369
 #, c-format
 msgid "Error: '%s' is not a valid connection type."
 msgstr "Error: '%s' no es un tipo de conexión válida."
 
-#: ../cli/src/connections.c:4711
+#: ../clients/cli/connections.c:5413
 #, c-format
-msgid "Error: Failed to add '%s' connection: (%d) %s"
+msgid "Error: IPv4 gateway specified without IPv4 addresses"
+msgstr ""
+
+#: ../clients/cli/connections.c:5417
+#, fuzzy, c-format
+msgid "Error: multiple IPv4 gateways specified"
+msgstr "Error: No interface specified."
+
+#: ../clients/cli/connections.c:5421
+#, fuzzy, c-format
+msgid "Error: Invalid IPv4 gateway '%s'"
+msgstr "Puerta de enlace inválida '%s'"
+
+#: ../clients/cli/connections.c:5446
+#, c-format
+msgid "Error: IPv6 gateway specified without IPv6 addresses"
+msgstr ""
+
+#: ../clients/cli/connections.c:5450
+#, fuzzy, c-format
+msgid "Error: multiple IPv6 gateways specified"
+msgstr "Error: No interface specified."
+
+#: ../clients/cli/connections.c:5454
+#, fuzzy, c-format
+msgid "Error: Invalid IPv6 gateway '%s'"
+msgstr "Puerta de enlace inválida '%s'"
+
+#: ../clients/cli/connections.c:5514
+#, fuzzy, c-format
+msgid "Error: Failed to add '%s' connection: %s"
 msgstr "Error: Falló al agregar '%s' conexión: (%d) %s"
 
-#: ../cli/src/connections.c:4715
+#: ../clients/cli/connections.c:5519
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "Conexión '%s' (%s) agregada con éxito.\n"
 
-#: ../cli/src/connections.c:4761
-msgid "Connection type: "
-msgstr "Tipo de conexión:"
-
-#: ../cli/src/connections.c:4765
+#: ../clients/cli/connections.c:5757
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "Error: se requiere argumento 'type'."
 
-#: ../cli/src/connections.c:4771
+#: ../clients/cli/connections.c:5765
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "Error: tipo de conexión inválido; %s."
 
-#: ../cli/src/connections.c:4780
+#: ../clients/cli/connections.c:5774
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "Error: 'autoconnect': %s."
 
-#: ../cli/src/connections.c:4796
+#: ../clients/cli/connections.c:5784
+#, fuzzy, c-format
+msgid "Error: 'save': %s."
+msgstr "Error: 'stp': '%s'."
+
+#: ../clients/cli/connections.c:5801
 msgid "Interface name [*]: "
 msgstr "Nombre de interfaz [*]: "
 
-#: ../cli/src/connections.c:4801
+#: ../clients/cli/connections.c:5806
 #, c-format
 msgid "Error: 'ifname' argument is required."
 msgstr "Error: argumento 'ifname' es requerido."
 
-#: ../cli/src/connections.c:4808
+#: ../clients/cli/connections.c:5808
+#, c-format
+msgid "Error: mandatory 'ifname' not seen before '%s'."
+msgstr ""
+
+#: ../clients/cli/connections.c:5817
 #, c-format
 msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
 msgstr "Error: 'ifname': '%s' no es una interfaz válida ni '*'."
 
-#: ../cli/src/connections.c:5627
+#: ../clients/cli/connections.c:6712
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' setting values]\n"
 
-#: ../cli/src/connections.c:5708
-#, c-format
+#. TRANSLATORS: do not translate command names and keywords before ::
+#. *              However, you should translate terms enclosed in <>.
+#.
+#: ../clients/cli/connections.c:6794
+#, fuzzy, c-format
 msgid ""
 "---[ Main menu ]---\n"
 "goto     [<setting> | <prop>]        :: go to a setting or property\n"
@@ -1979,9 +2364,9 @@ msgid ""
 "value\n"
 "set      [<setting>.<prop> <value>]  :: set property value\n"
 "describe [<setting>.<prop>]          :: describe property\n"
-"print    [all]                       :: print the connection\n"
-"verify   [all]                       :: verify the connection\n"
-"save                                 :: save the connection\n"
+"print    [all | <setting>[.<prop>]]  :: print the connection\n"
+"verify   [all | fix]                 :: verify the connection\n"
+"save     [persistent|temporary]      :: save the connection\n"
 "activate [<ifname>] [/<ap>|<nsp>]    :: activate the connection\n"
 "back                                 :: go one level up (back)\n"
 "help/?   [<command>]                 :: print this help\n"
@@ -2003,7 +2388,7 @@ msgstr ""
 "nmcli    <conf-option> <value>       :: configuración nmcli\n"
 "quit                                 :: sale de nmcli\n"
 
-#: ../cli/src/connections.c:5735
+#: ../clients/cli/connections.c:6821
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -2023,12 +2408,13 @@ msgstr ""
 "          nmcli connection> goto secondaries\n"
 "          nmcli> goto ipv4.addresses\n"
 
-#: ../cli/src/connections.c:5742
+#: ../clients/cli/connections.c:6828
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
 "\n"
-"This command removes an entire setting from the connection, or if a property\n"
+"This command removes an entire setting from the connection, or if a "
+"property\n"
 "is given, resets that property to the default value.\n"
 "\n"
 "Examples: nmcli> remove wifi-sec\n"
@@ -2044,7 +2430,7 @@ msgstr ""
 "Ejemplos: nmcli> remove wifi-sec\n"
 "          nmcli> remove eth.mtu\n"
 
-#: ../cli/src/connections.c:5749
+#: ../clients/cli/connections.c:6835
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -2059,7 +2445,7 @@ msgstr ""
 "\n"
 "Ejemplo: nmcli> set con.id My connection\n"
 
-#: ../cli/src/connections.c:5754
+#: ../clients/cli/connections.c:6840
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -2072,7 +2458,7 @@ msgstr ""
 "Muestra la descripción de la propiedad. Puede consultar la página de manual "
 "nm-settings(5) para ver todos los parámetros y propiedades NM.\n"
 
-#: ../cli/src/connections.c:5759
+#: ../clients/cli/connections.c:6845
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2087,15 +2473,18 @@ msgstr ""
 "\n"
 "Ejemplo: nmcli ipv4> print all\n"
 
-#: ../cli/src/connections.c:5764
-#, c-format
+#: ../clients/cli/connections.c:6850
+#, fuzzy, c-format
 msgid ""
-"verify [all]  :: verify setting or connection validity\n"
+"verify [all | fix]  :: verify setting or connection validity\n"
 "\n"
-"Verifies whether the setting or connection is valid and can be saved later. "
-"It indicates invalid values on error.\n"
+"Verifies whether the setting or connection is valid and can be saved later.\n"
+"It indicates invalid values on error. Some errors may be fixed "
+"automatically\n"
+"by 'fix' option.\n"
 "\n"
 "Examples: nmcli> verify\n"
+"          nmcli> verify fix\n"
 "          nmcli bond> verify\n"
 msgstr ""
 "verify [all]  :: verifica parámetros o validez de conexión\n"
@@ -2106,18 +2495,23 @@ msgstr ""
 "Ejemplos: nmcli> verify\n"
 "          nmcli bond> verify\n"
 
-#: ../cli/src/connections.c:5771
+#: ../clients/cli/connections.c:6859
 #, c-format
 msgid ""
-"save  :: save the connection\n"
-"\n"
-"Sends the connection to NetworkManager that will save it.\n"
+"save [persistent|temporary]  :: save the connection\n"
+"\n"
+"Sends the connection profile to NetworkManager that either will save it\n"
+"persistently, or will only keep it in memory. 'save' without an argument\n"
+"means 'save persistent'.\n"
+"Note that once you save the profile persistently those settings are saved\n"
+"across reboot or restart. Subsequent changes can also be temporary or\n"
+"persistent, but any temporary changes will not persist across reboot or\n"
+"restart. If you want to fully remove the persistent connection, the "
+"connection\n"
+"profile must be deleted.\n"
 msgstr ""
-"save  :: guardar la conexión\n"
-"\n"
-"Envía la conexión a NetworkManager el cual la guardará.\n"
 
-#: ../cli/src/connections.c:5775
+#: ../clients/cli/connections.c:6870
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -2138,28 +2532,33 @@ msgstr ""
 "/<ap>|<nsp> - AP (Wi-Fi) or NSP (WiMAX) (prepend with / when <ifname> is not "
 "specified)\n"
 
-#: ../cli/src/connections.c:5782 ../cli/src/connections.c:5932
+#: ../clients/cli/connections.c:6877 ../clients/cli/connections.c:7035
 #, c-format
-msgid "back  :: go to upper menu level\n"
+msgid ""
+"back  :: go to upper menu level\n"
 "\n"
-msgstr "back  :: va a un nivel superior del menú\n"
+msgstr ""
+"back  :: va a un nivel superior del menú\n"
 "\n"
 
-#: ../cli/src/connections.c:5785
+#: ../clients/cli/connections.c:6880
 #, c-format
-msgid "help/? [<command>]  :: help for the nmcli commands\n"
+msgid ""
+"help/? [<command>]  :: help for the nmcli commands\n"
 "\n"
-msgstr "help/? [<command>]  :: ayuda para los comandos nmcli\n"
+msgstr ""
+"help/? [<command>]  :: ayuda para los comandos nmcli\n"
 "\n"
 
-#: ../cli/src/connections.c:5788
-#, c-format
+#: ../clients/cli/connections.c:6883
+#, fuzzy, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
 "\n"
 "Configures nmcli. The following options are available:\n"
 "status-line yes | no        [default: no]\n"
 "save-confirmation yes | no  [default: yes]\n"
+"show-secrets yes | no       [default: no]\n"
 "prompt-color <0-8>          [default: 0]\n"
 "  0 = normal\n"
 "  1 = black\n"
@@ -2195,7 +2594,7 @@ msgstr ""
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../cli/src/connections.c:5808 ../cli/src/connections.c:5938
+#: ../clients/cli/connections.c:6904 ../clients/cli/connections.c:7041
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -2208,13 +2607,16 @@ msgstr ""
 "Este comando sale de nmcli. Cuando la conexión es editada no se guarda, se "
 "le pide al usuario que confirme la acción.\n"
 
-#: ../cli/src/connections.c:5813 ../cli/src/connections.c:5943
-#: ../cli/src/connections.c:6313 ../cli/src/connections.c:7162
+#: ../clients/cli/connections.c:6909 ../clients/cli/connections.c:7046
+#: ../clients/cli/connections.c:7469 ../clients/cli/connections.c:8391
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Comando desconocido: '%s'\n"
 
-#: ../cli/src/connections.c:5879
+#. TRANSLATORS: do not translate command names and keywords before ::
+#. *              However, you should translate terms enclosed in <>.
+#.
+#: ../clients/cli/connections.c:6975
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2242,7 +2644,7 @@ msgstr ""
 "descripción del comando\n"
 "quit                             :: sale de nmcli\n"
 
-#: ../cli/src/connections.c:5904
+#: ../clients/cli/connections.c:7000
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -2253,14 +2655,14 @@ msgstr ""
 "\n"
 "Este comando establece <value> provisto a esta propiedad\n"
 
-#: ../cli/src/connections.c:5908
-#, c-format
+#: ../clients/cli/connections.c:7004
+#, fuzzy, c-format
 msgid ""
-"add [<value>]  :: add new option to the property\n"
+"add [<value>]  :: append new value to the property\n"
 "\n"
-"This command add provided <value> to this property, if the property is of a "
-"container type. For single-valued properties it replaces the value (same as "
-"'set').\n"
+"This command adds provided <value> to this property, if the property is of a "
+"container type. For single-valued properties the property value is replaced "
+"(same as 'set').\n"
 msgstr ""
 "add [<value>]  :: add new option to the property\n"
 "\n"
@@ -2268,7 +2670,7 @@ msgstr ""
 "es de un tipo de contenedor. Para propiedades de un solo valor, este comando "
 "remplaza el valor (igual que 'set').\n"
 
-#: ../cli/src/connections.c:5914
+#: ../clients/cli/connections.c:7010
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -2279,19 +2681,28 @@ msgstr ""
 "\n"
 "Despliega el valor actual y permite editarlo.\n"
 
-#: ../cli/src/connections.c:5918
+#: ../clients/cli/connections.c:7014
 #, c-format
 msgid ""
-"remove [<index>|<option>]  :: delete the value\n"
+"remove [<value>|<index>|<option name>]  :: delete the value\n"
+"\n"
+"Removes the property value. For single-valued properties, this sets the\n"
+"property back to its default value. For container-type properties, this "
+"removes\n"
+"all the values of that property, or you can specify an argument to remove "
+"just\n"
+"a single item or option. The argument is either a value or index of the item "
+"to\n"
+"remove, or an option name (for properties with named options).\n"
 "\n"
-"Removes the property value (sets it to default).\n"
-msgstr ""
-"remove [<index>|<option>]  :: borrar el valor\n"
+"Examples: nmcli ipv4.dns> remove 8.8.8.8\n"
+"          nmcli ipv4.dns> remove 2\n"
+"          nmcli bond.options> remove downdelay\n"
 "\n"
-"Retira el valor de propiedad (lo fija como predeterminado).\n"
+msgstr ""
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.9.0, DocId: NetworkManager
-#: ../cli/src/connections.c:5922
+#: ../clients/cli/connections.c:7025
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -2304,7 +2715,7 @@ msgstr ""
 "Muestra la descripción de la propiedad. Puede consultar la página de manual "
 "nm-settings(5) para ver todos los parámetros y propiedades NM.\n"
 
-#: ../cli/src/connections.c:5927
+#: ../clients/cli/connections.c:7030
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -2320,29 +2731,38 @@ msgstr ""
 "desplegar valores para toda la configuración o conexión.\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.9.0, DocId: NetworkManager
-#: ../cli/src/connections.c:5935
+#: ../clients/cli/connections.c:7038
 #, c-format
-msgid "help/? [<command>]  :: help for nmcli commands\n"
+msgid ""
+"help/? [<command>]  :: help for nmcli commands\n"
 "\n"
-msgstr "help/? [<command>]  :: ayuda para los comandos nmcli\n"
+msgstr ""
+"help/? [<command>]  :: ayuda para los comandos nmcli\n"
 "\n"
 
-#: ../cli/src/connections.c:6022
+#: ../clients/cli/connections.c:7136
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "Error: falló la activación de la conexión.\n"
 
-#: ../cli/src/connections.c:6093
+#: ../clients/cli/connections.c:7219
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr "Error: parámetro '%s' es obligatorio y no puede ser retirado.\n"
 
-#: ../cli/src/connections.c:6111
-#, c-format
-msgid "[ Connection type: %s | name: %s | UUID: %s | dirty: %s ]\n"
+#. TRANSLATORS: status line in nmcli connection editor
+#: ../clients/cli/connections.c:7237
+#, fuzzy, c-format
+msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ Connection type: %s | name: %s | UUID: %s | dirty: %s ]\n"
 
-#: ../cli/src/connections.c:6171
+#: ../clients/cli/connections.c:7273
+#, fuzzy, c-format
+msgid "The connection is not saved. Do you really want to quit? %s"
+msgstr ""
+"La conexión no es ha guardado. ¿Está seguro de que quiere salir? [s/n]\n"
+
+#: ../clients/cli/connections.c:7321
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -2351,80 +2771,82 @@ msgstr ""
 "El perfil de conexiones ha sido retirado de otro cliente. Puede escribir "
 "'save' en el menú principal para restaurarlo.\n"
 
-#: ../cli/src/connections.c:6192 ../cli/src/connections.c:6615
-#: ../cli/src/connections.c:6673
+#: ../clients/cli/connections.c:7346 ../clients/cli/connections.c:7772
+#: ../clients/cli/connections.c:7830
+#, c-format
+msgid "Allowed values for '%s' property: %s\n"
+msgstr "Valores permitidos para '%s' propiedad: %s\n"
+
+#: ../clients/cli/connections.c:7350 ../clients/cli/connections.c:7776
+#: ../clients/cli/connections.c:7834
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "Ingresar el valor '%s': "
 
-#: ../cli/src/connections.c:6209 ../cli/src/connections.c:6228
-#: ../cli/src/connections.c:6621 ../cli/src/connections.c:6680
+#: ../clients/cli/connections.c:7365 ../clients/cli/connections.c:7387
+#: ../clients/cli/connections.c:7780 ../clients/cli/connections.c:7839
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "Error: falló al establecer '%s' propiedad: %s\n"
 
-#: ../cli/src/connections.c:6221
+#: ../clients/cli/connections.c:7381
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "Modificar el valor '%s': "
 
-#: ../cli/src/connections.c:6250
+#: ../clients/cli/connections.c:7410
 #, c-format
 msgid "Error: %s\n"
 msgstr "Error: %s\n"
 
-#: ../cli/src/connections.c:6256 ../cli/src/connections.c:6759
-#: ../cli/src/connections.c:6800
+#: ../clients/cli/connections.c:7416 ../clients/cli/connections.c:7918
+#: ../clients/cli/connections.c:7959
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "Error: falló al retirar el valor de '%s': %s\n"
 
-#: ../cli/src/connections.c:6277
+#: ../clients/cli/connections.c:7437
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "Argumento desconocido de comando: '%s'\n"
 
-#: ../cli/src/connections.c:6297 ../cli/src/connections.c:7150
-msgid "The connection is not saved. Do you really want to quit? [y/n]\n"
-msgstr ""
-"La conexión no es ha guardado. ¿Está seguro de que quiere salir? [s/n]\n"
-
-#: ../cli/src/connections.c:6409
+#: ../clients/cli/connections.c:7565
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "Parámetros disponibles: %s\n"
 
-#: ../cli/src/connections.c:6418
+#: ../clients/cli/connections.c:7574
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "Error: nombre de parámetro inválido; %s\n"
 
-#: ../cli/src/connections.c:6435
+#: ../clients/cli/connections.c:7591
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "Propiedades disponibles: %s\n"
 
-#: ../cli/src/connections.c:6443
+#: ../clients/cli/connections.c:7599
 #, c-format
 msgid "Error: property %s\n"
 msgstr "Error: propiedad %s\n"
 
-#: ../cli/src/connections.c:6484
+#: ../clients/cli/connections.c:7640
+#, fuzzy, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
 "immediate activation of the connection.\n"
-"Do you still want to save? [yes] "
+"Do you still want to save? %s"
 msgstr ""
 "Guardando la conexión con 'autoconnect=yes'. Esto podría activar la conexión "
 "de forma inmediata.\n"
 "¿Aún desea guardar? [yes] "
 
-#: ../cli/src/connections.c:6557
+#: ../clients/cli/connections.c:7715
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "Puede modificar los siguientes parámetros: %s\n"
 
-#: ../cli/src/connections.c:6583
+#: ../clients/cli/connections.c:7742
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
@@ -2433,200 +2855,219 @@ msgstr ""
 "El perfil de conexión ha sido retirado de otro cliente. Puede escribir "
 "'save' para restaurarlo.\n"
 
-#: ../cli/src/connections.c:6613 ../cli/src/connections.c:6671
-#, c-format
-msgid "Allowed values for '%s' property: %s\n"
-msgstr "Valores permitidos para '%s' propiedad: %s\n"
-
-#: ../cli/src/connections.c:6625 ../cli/src/connections.c:6842
+#: ../clients/cli/connections.c:7784 ../clients/cli/connections.c:8001
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "Error: no se ha seleccionado parámetro; los válidos son [%s]\n"
 
-#: ../cli/src/connections.c:6626
+#: ../clients/cli/connections.c:7785
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr "utilice 'goto <setting>' primero, o 'set <setting>.<property>'\n"
 
-#: ../cli/src/connections.c:6641 ../cli/src/connections.c:6779
-#: ../cli/src/connections.c:6859
+#: ../clients/cli/connections.c:7799 ../clients/cli/connections.c:7938
+#: ../clients/cli/connections.c:8018
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "Error: argumento de parámetros inválido '%s'; los validos son [%s]\n"
 
-#: ../cli/src/connections.c:6651
+#: ../clients/cli/connections.c:7809
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "Error: No se encuentra la propiedad '%s'\n"
 
-#: ../cli/src/connections.c:6658
+#: ../clients/cli/connections.c:7816
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "Error: propiedad inválida: %s\n"
 
-#: ../cli/src/connections.c:6707
+#: ../clients/cli/connections.c:7866
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "Error: parámetro desconocido '%s'\n"
 
-#: ../cli/src/connections.c:6720
+#: ../clients/cli/connections.c:7879
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "Puede modificar los siguientes parámetros: %s\n"
 
-#: ../cli/src/connections.c:6764
+#: ../clients/cli/connections.c:7923
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "Error: no se ha proporcionado argumento; los válidos son [%s]\n"
 
-#: ../cli/src/connections.c:6777
+#: ../clients/cli/connections.c:7936
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "El parámetro '%s' no está presente en la conexión.\n"
 
-#: ../cli/src/connections.c:6818
+#: ../clients/cli/connections.c:7977
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "Error: %s propiedades, no es un nombre de parámetro.\n"
 
-#: ../cli/src/connections.c:6843
+#: ../clients/cli/connections.c:8002
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr "utilice 'goto <setting>' primero, o 'describe <setting>.<property>'\n"
 
-#: ../cli/src/connections.c:6884
+#: ../clients/cli/connections.c:8043
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "Error: propiedad inválida: %s, no es un nombre de parámetro válido.\n"
 
-#: ../cli/src/connections.c:6908
-#, c-format
-msgid "Error: '%s' setting not present\n"
-msgstr "Error: '%s' parámetro no está presente\n"
-
-#: ../cli/src/connections.c:6911
+#: ../clients/cli/connections.c:8072
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "Error: parámetro desconocido: '%s'\n"
 
-#: ../cli/src/connections.c:6927
+#: ../clients/cli/connections.c:8077
+#, fuzzy, c-format
+msgid "Error: '%s' setting not present in the connection\n"
+msgstr "El parámetro '%s' no está presente en la conexión.\n"
+
+#: ../clients/cli/connections.c:8102
+#, fuzzy, c-format
+msgid "Error: invalid property: %s%s\n"
+msgstr "Error: propiedad inválida: %s\n"
+
+#: ../clients/cli/connections.c:8104
+#, fuzzy
+msgid ", neither a valid setting name"
+msgstr "Error: propiedad inválida: %s, no es un nombre de parámetro válido.\n"
+
+#: ../clients/cli/connections.c:8121
+#, fuzzy, c-format
+msgid "Invalid verify option: %s\n"
+msgstr "Opción inválida: '%s'"
+
+#: ../clients/cli/connections.c:8129
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "Verificar parámetro '%s': %s\n"
 
-#: ../cli/src/connections.c:6934
+#: ../clients/cli/connections.c:8144
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "Verificar conexión: %s\n"
 
-#: ../cli/src/connections.c:6973
+#: ../clients/cli/connections.c:8147
 #, c-format
-msgid "Error: Failed to save '%s' (%s) connection: (%d) %s\n"
+msgid "The error cannot be fixed automatically.\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:8164
+#, fuzzy, c-format
+msgid "Error: invalid argument '%s'\n"
+msgstr "Error: invalid extra argument '%s'."
+
+#: ../clients/cli/connections.c:8197
+#, fuzzy, c-format
+msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "Error: Falló al guardar '%s' (%s) conexión: (%d) %s\n"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.9.0, DocId: NetworkManager
-#: ../cli/src/connections.c:6980
+#: ../clients/cli/connections.c:8204
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "Conexión '%s' (%s) guardada con éxito.\n"
 
-#: ../cli/src/connections.c:7014
+#: ../clients/cli/connections.c:8205
+#, fuzzy, c-format
+msgid "Connection '%s' (%s) successfully updated.\n"
+msgstr "Conexión '%s' (%s) agregada con éxito.\n"
+
+#: ../clients/cli/connections.c:8238
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "Error: falló la verificación de conexión: %s\n"
 
 # auto translated by TM merge from project: evolution-data-server, version: el6, DocId: evolution-data-server-2.32
-#: ../cli/src/connections.c:7015
+#: ../clients/cli/connections.c:8239
 msgid "(unknown error)"
 msgstr "(Error desconocido)"
 
-#: ../cli/src/connections.c:7036
+#: ../clients/cli/connections.c:8240
+#, c-format
+msgid "You may try running 'verify fix' to fix errors.\n"
+msgstr ""
+
+#: ../clients/cli/connections.c:8262
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "Error: la conexión no se ha guardado. Escriba primero 'save'.\n"
 
-#: ../cli/src/connections.c:7040
+#: ../clients/cli/connections.c:8266
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "Error: conexión no es válida: %s\n"
 
-#: ../cli/src/connections.c:7051
+#: ../clients/cli/connections.c:8276
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "Error: no se puede activar conexión: %s.\n"
 
-#: ../cli/src/connections.c:7061
-#, c-format
-msgid "Error: Failed to activate '%s' (%s) connection: (%d) %s\n"
+#: ../clients/cli/connections.c:8286
+#, fuzzy, c-format
+msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "Error: Falló al activar '%s' (%s) conexión: (%d) %s\n"
 
-#: ../cli/src/connections.c:7067
+#: ../clients/cli/connections.c:8292
 #, c-format
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr ""
 "Activación de conexión de monitorización (pulse cualquier tecla para "
 "continuar)\n"
 
-#: ../cli/src/connections.c:7105
+#: ../clients/cli/connections.c:8330
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "Error: status-line: %s\n"
 
-#: ../cli/src/connections.c:7113
+#: ../clients/cli/connections.c:8338
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "Error: save-confirmation: %s\n"
 
-#: ../cli/src/connections.c:7121
+#: ../clients/cli/connections.c:8346
+#, fuzzy, c-format
+msgid "Error: show-secrets: %s\n"
+msgstr "Error: 'mostrar activas': %s"
+
+#: ../clients/cli/connections.c:8354
 #, c-format
 msgid "Error: bad color number: '%s'; use <0-8>\n"
 msgstr "Error: número de color incorrecto: '%s'; use <0-8>\n"
 
-#: ../cli/src/connections.c:7133
+#: ../clients/cli/connections.c:8366
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "Configuración nmcli actual:\n"
 
-#: ../cli/src/connections.c:7141
+#: ../clients/cli/connections.c:8376
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "Opción de configuración inválida '%s'; permitida [%s]\n"
 
-#: ../cli/src/connections.c:7364
-#, c-format
-msgid ""
-">>> Command-line editing is not available. Consider installing a line "
-"editing library to enable the feature. <<<\n"
-"Supported libraries are:\n"
-"  - GNU Readline    (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
-"readline/rltop.html\n"
-"  - NetBSD Editline (libedit)     http://www.thrysoee.dk/editline/\n"
-msgstr ""
-">>> Modificación de línea de comando no está disponible. Considere instalar "
-"una biblioteca de edición de línea para activar esta funcionalidad. <<<\n"
-"Bibliotecas con soporte:\n"
-"  - GNU Readline    (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
-"readline/rltop.html\n"
-"  - NetBSD Editline (libedit)     http://www.thrysoee.dk/editline/\n"
-
-#: ../cli/src/connections.c:7390
+#: ../clients/cli/connections.c:8631
 #, c-format
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "Error: solamente uno si 'id', uuid, o 'path' pueden proporcionarse."
 
-#: ../cli/src/connections.c:7402 ../cli/src/connections.c:7599
+#: ../clients/cli/connections.c:8643 ../clients/cli/connections.c:8830
+#: ../clients/cli/connections.c:8837
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "Error: Conexión desconocida '%s'."
 
-#: ../cli/src/connections.c:7417
+#: ../clients/cli/connections.c:8661
 #, c-format
 msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr ""
 "Advertencia: modificando la conexión existente '%s'; argumento 'type' se "
 "ignora\n"
 
-#: ../cli/src/connections.c:7420
+#: ../clients/cli/connections.c:8664
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
@@ -2634,379 +3075,496 @@ msgstr ""
 "Advertencia: modificando la conexión existente '%s'; argumento 'con-name' se "
 "ignora\n"
 
-#: ../cli/src/connections.c:7434
+#: ../clients/cli/connections.c:8678
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "Tipos de conexión válidos: %s\n"
 
-#: ../cli/src/connections.c:7436
+#: ../clients/cli/connections.c:8680
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "Error: tipo de conexión no es válido; %s\n"
 
-#: ../cli/src/connections.c:7472
+#: ../clients/cli/connections.c:8719
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli interactive connection editor |==="
 
-#: ../cli/src/connections.c:7475
+#: ../clients/cli/connections.c:8722
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "Modificar conexión '%s' existente: '%s'"
 
-#: ../cli/src/connections.c:7477
+#: ../clients/cli/connections.c:8724
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "Agregar una nueva conexión '%s'"
 
-#: ../cli/src/connections.c:7479
+#: ../clients/cli/connections.c:8726
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "Escribir 'help' o '?' para comandos disponibles."
 
-#: ../cli/src/connections.c:7481
+#: ../clients/cli/connections.c:8728
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr ""
 "Escribir 'describe [<setting>.<prop>]' para descripción de propiedad "
 "detallada."
 
-#: ../cli/src/connections.c:7520
-#, c-format
-msgid "Error: Failed to modify connection '%s': (%d) %s"
+#: ../clients/cli/connections.c:8766
+#, fuzzy, c-format
+msgid "Error: Failed to modify connection '%s': %s"
 msgstr "Error: Falló al modificar conexión '%s': (%d) %s"
 
-#: ../cli/src/connections.c:7526
+#: ../clients/cli/connections.c:8773
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "Conexión '%s' (%s) modificada con éxito.\n"
 
-#: ../cli/src/connections.c:7553
+#: ../clients/cli/connections.c:8805
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "Error: No se proporcionaron argumentos."
 
-#: ../cli/src/connections.c:7577
+#: ../clients/cli/connections.c:8824
 #, c-format
 msgid "Error: connection ID is missing."
 msgstr "Error: falta ID de conexión."
 
-#: ../cli/src/connections.c:7582
+#: ../clients/cli/connections.c:8846 ../clients/cli/connections.c:8859
 #, c-format
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "Error: <setting>.<property> falta el argumento."
 
-#: ../cli/src/connections.c:7605
+#: ../clients/cli/connections.c:8864
+#, fuzzy, c-format
+msgid "Error: value for '%s' is missing."
+msgstr "Error: faltan campos para opciones «%s»."
+
+#: ../clients/cli/connections.c:8882
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "Error: inválido <setting>.<property> '%s'."
 
-#: ../cli/src/connections.c:7620
+#: ../clients/cli/connections.c:8890
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "Error: parámetro inválido o no permitido '%s': %s."
 
-#: ../cli/src/connections.c:7641
+#: ../clients/cli/connections.c:8911
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "Error: propiedad inválida '%s': %s."
 
-#: ../cli/src/connections.c:7647
+#: ../clients/cli/connections.c:8922
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr "Error: falló al modificar %s.%s: %s."
 
-#: ../cli/src/connections.c:7677
+#: ../clients/cli/connections.c:8940
+#, fuzzy, c-format
+msgid "Error: failed to remove a value from %s.%s: %s."
+msgstr "Error: falló al retirar el valor de '%s': %s\n"
+
+#: ../clients/cli/connections.c:8971
+#, fuzzy, c-format
+msgid "Error: not all connections deleted."
+msgstr "Error: no se especificó una conexión."
+
+#: ../clients/cli/connections.c:8972
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "Error: Falló el borrado de conexión: %s"
 
-#: ../cli/src/connections.c:7747
-#, c-format
-msgid "Error: unknown connection: %s\n"
+#: ../clients/cli/connections.c:9034
+#, fuzzy, c-format
+msgid "Error: unknown connection '%s'\n"
 msgstr "Error: conexión desconocida: %s\n"
 
-#: ../cli/src/connections.c:7781
+#: ../clients/cli/connections.c:9048
+#, fuzzy, c-format
+msgid "Error: no connection provided."
+msgstr "Error: no se especificó una conexión."
+
+#. truncate trailing ", "
+#: ../clients/cli/connections.c:9073
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "Error: no se puede borrar conexión desconocida(s): %s."
 
-#: ../cli/src/connections.c:7852
+#: ../clients/cli/connections.c:9091
+#, fuzzy, c-format
+msgid "Error: failed to reload connections: %s."
+msgstr "Error: Falló al agregar '%s' conexión: (%d) %s"
+
+#: ../clients/cli/connections.c:9124
+#, fuzzy, c-format
+msgid "Error: failed to load connection: %s."
+msgstr "Error: Falló al agregar '%s' conexión: (%d) %s"
+
+#: ../clients/cli/connections.c:9132
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "No se pudo cargar archivo '%s'\n"
 
-#: ../cli/src/connections.c:7917
-#, c-format
-msgid ""
-"Error: 'configured' or 'active' command is expected for 'connection show'."
-msgstr ""
-"Error: el comando 'configured' o 'active' se esperaba para 'connection show'."
-""
-
-#: ../cli/src/connections.c:7984
+#: ../clients/cli/connections.c:9311
 #, c-format
 msgid "Error: '%s' is not valid 'connection' command."
 msgstr "Error: '%s' no es un comando de 'connection' válido."
 
-#: ../cli/src/connections.c:8053 ../cli/src/network-manager.c:615
-#, c-format
-msgid "Error: Could not get system settings."
-msgstr "Error: no se pudo obtener configuración de sistema."
-
-#: ../cli/src/connections.c:8063
-#, c-format
-msgid "Error: Can't obtain connections: settings service is not running."
-msgstr ""
-"Error: no se pueden obtener conexiones: el servicio de configuración no se "
-"está ejecutando."
+#. define some prompts
+#: ../clients/cli/devices.c:38
+msgid "Interface: "
+msgstr "Interfaz:"
 
-#: ../cli/src/devices.c:71 ../cli/src/devices.c:87 ../cli/src/devices.c:184
-#: ../cli/src/devices.c:201
-msgid "DEVICE"
-msgstr "DISPOSITIVO"
+#: ../clients/cli/devices.c:39
+#, fuzzy
+msgid "Interface(s): "
+msgstr "Interfaz:"
 
-#: ../cli/src/devices.c:75 ../cli/src/devices.c:103
+#. 3
+#. 19
+#: ../clients/cli/devices.c:47 ../clients/cli/devices.c:78
 msgid "CONNECTION"
 msgstr "CONEXIÓN"
 
-#: ../cli/src/devices.c:76 ../cli/src/devices.c:104
+#. 4
+#. 20
+#: ../clients/cli/devices.c:48 ../clients/cli/devices.c:79
 msgid "CON-UUID"
 msgstr "CON-UUID"
 
-#: ../cli/src/devices.c:89
+#. 2
+#: ../clients/cli/devices.c:61
+#, fuzzy
+msgid "NM-TYPE"
+msgstr "TIPO"
+
+#. 3
+#: ../clients/cli/devices.c:62
 msgid "VENDOR"
 msgstr "PROVEEDOR"
 
-#: ../cli/src/devices.c:90
+#. 4
+#: ../clients/cli/devices.c:63
 msgid "PRODUCT"
 msgstr "PRODUCTO"
 
-#: ../cli/src/devices.c:91
+#. 5
+#: ../clients/cli/devices.c:64
 msgid "DRIVER"
 msgstr "CONTROLADOR"
 
-#: ../cli/src/devices.c:92
+#. 6
+#: ../clients/cli/devices.c:65
 msgid "DRIVER-VERSION"
 msgstr "VERSIÓN DE CONTROLADOR"
 
-#: ../cli/src/devices.c:93
+#. 7
+#: ../clients/cli/devices.c:66
 msgid "FIRMWARE-VERSION"
 msgstr "VERSIÓN DE FIRMWARE"
 
-#: ../cli/src/devices.c:94
+#. 8
+#: ../clients/cli/devices.c:67
 msgid "HWADDR"
 msgstr "HWADDR"
 
-#: ../cli/src/devices.c:95 ../tui/nmt-page-ethernet.c:86
-#: ../tui/nmt-page-infiniband.c:90 ../tui/nmt-page-vlan.c:138
-#: ../tui/nmt-page-wifi.c:364
+#. 9
+#: ../clients/cli/devices.c:68 ../clients/tui/nmt-page-ethernet.c:86
+#: ../clients/tui/nmt-page-infiniband.c:97 ../clients/tui/nmt-page-vlan.c:131
+#: ../clients/tui/nmt-page-wifi.c:373
 msgid "MTU"
 msgstr "MTU"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/devices.c:97
+#. 11
+#: ../clients/cli/devices.c:70
 msgid "REASON"
 msgstr "RAZÓN"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/devices.c:98
+#. 12
+#: ../clients/cli/devices.c:71
 msgid "UDI"
 msgstr "UDI"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/devices.c:99
+#. 13
+#: ../clients/cli/devices.c:72
 msgid "IP-IFACE"
 msgstr "IP-IFACE"
 
+#. 14
+#. 2
+#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:104
+msgid "IS-SOFTWARE"
+msgstr ""
+
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/devices.c:100
+#. 15
+#: ../clients/cli/devices.c:74
 msgid "NM-MANAGED"
 msgstr "NM-ADMINISTRADO"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/devices.c:102
+#. 17
+#: ../clients/cli/devices.c:76
 msgid "FIRMWARE-MISSING"
 msgstr "FALTA-FIRMWARE"
 
+#. 18
+#: ../clients/cli/devices.c:77
+msgid "PHYS-PORT-ID"
+msgstr ""
+
+#. 22
+#: ../clients/cli/devices.c:81
+msgid "METERED"
+msgstr ""
+
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/devices.c:115
+#. 0
+#: ../clients/cli/devices.c:92
 msgid "AVAILABLE-CONNECTION-PATHS"
 msgstr "RUTAS DE CONEXIÓN DISPONIBLES"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/devices.c:116
+#. 1
+#: ../clients/cli/devices.c:93
 msgid "AVAILABLE-CONNECTIONS"
 msgstr "CONEXIONES DISPONIBLES"
 
-#: ../cli/src/devices.c:125
+#. 0
+#: ../clients/cli/devices.c:102
 msgid "CARRIER-DETECT"
 msgstr "DETECTAR-PORTADOR"
 
-#: ../cli/src/devices.c:126
+#. 1
+#: ../clients/cli/devices.c:103
 msgid "SPEED"
 msgstr "VELOCIDAD"
 
-#: ../cli/src/devices.c:135
+#. 0
+#: ../clients/cli/devices.c:113
 msgid "CARRIER"
 msgstr "PORTADOR"
 
-#: ../cli/src/devices.c:144 ../cli/src/devices.c:563
+#. 0
+#: ../clients/cli/devices.c:122 ../clients/cli/devices.c:557
 msgid "WEP"
 msgstr "WEP"
 
-#: ../cli/src/devices.c:145
+#. 1
+#: ../clients/cli/devices.c:123
 msgid "WPA"
 msgstr "WPA"
 
-#: ../cli/src/devices.c:146 ../cli/src/devices.c:571
+#. 2
+#: ../clients/cli/devices.c:124 ../clients/cli/devices.c:565
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../cli/src/devices.c:147
+#. 3
+#: ../clients/cli/devices.c:125
 msgid "TKIP"
 msgstr "TKIP"
 
-#: ../cli/src/devices.c:148
+#. 4
+#: ../clients/cli/devices.c:126
 msgid "CCMP"
 msgstr "CCMP"
 
-#: ../cli/src/devices.c:149 ../cli/src/devices.c:239
+#. 5
+#. 2
+#: ../clients/cli/devices.c:127 ../clients/cli/devices.c:229
 msgid "AP"
 msgstr "AP"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/devices.c:150
+#. 6
+#: ../clients/cli/devices.c:128
 msgid "ADHOC"
 msgstr "ADHOC"
 
-#: ../cli/src/devices.c:159
+#. 7
+#: ../clients/cli/devices.c:129
+msgid "2GHZ"
+msgstr ""
+
+#. 8
+#: ../clients/cli/devices.c:130
+msgid "5GHZ"
+msgstr ""
+
+#. 0
+#: ../clients/cli/devices.c:139
 msgid "CTR-FREQ"
 msgstr "CTR-FREC"
 
-#: ../cli/src/devices.c:160
+#. 1
+#: ../clients/cli/devices.c:140
 msgid "RSSI"
 msgstr "RSSI"
 
-#: ../cli/src/devices.c:161
+#. 2
+#: ../clients/cli/devices.c:141
 msgid "CINR"
 msgstr "CINR"
 
-#: ../cli/src/devices.c:162
+#. 3
+#: ../clients/cli/devices.c:142
 msgid "TX-POW"
 msgstr "TX-POW"
 
-#: ../cli/src/devices.c:163
+#. 4
+#: ../clients/cli/devices.c:143
 msgid "BSID"
 msgstr "BSID"
 
-#: ../cli/src/devices.c:172 ../tui/nmt-page-wifi.c:221
+#. 0
+#: ../clients/cli/devices.c:152 ../clients/tui/nmt-page-wifi.c:227
 msgid "SSID"
 msgstr "SSID"
 
-#: ../cli/src/devices.c:173
+#. 1
+#: ../clients/cli/devices.c:153
 msgid "SSID-HEX"
 msgstr "SSID-HEX"
 
-#: ../cli/src/devices.c:174 ../tui/nmt-page-wifi.c:352
+#. 2
+#: ../clients/cli/devices.c:154 ../clients/tui/nmt-page-wifi.c:361
 msgid "BSSID"
 msgstr "BSSID"
 
-#: ../cli/src/devices.c:175
+#. 3
+#: ../clients/cli/devices.c:155
 msgid "MODE"
 msgstr "MODO"
 
-#: ../cli/src/devices.c:176
+#. 4
+#: ../clients/cli/devices.c:156
 msgid "CHAN"
 msgstr "CHAN"
 
-#: ../cli/src/devices.c:177
+#. 5
+#: ../clients/cli/devices.c:157
 msgid "FREQ"
 msgstr "FREC"
 
-#: ../cli/src/devices.c:178
+#. 6
+#: ../clients/cli/devices.c:158
 msgid "RATE"
 msgstr "TASA"
 
-#: ../cli/src/devices.c:179 ../cli/src/devices.c:199
+#. 7
+#. 1
+#: ../clients/cli/devices.c:159 ../clients/cli/devices.c:179
 msgid "SIGNAL"
 msgstr "SEÑAL"
 
-#: ../cli/src/devices.c:180
+#. 8
+#: ../clients/cli/devices.c:160
 msgid "BARS"
 msgstr "BARS"
 
-#: ../cli/src/devices.c:181
+#. 9
+#: ../clients/cli/devices.c:161
 msgid "SECURITY"
 msgstr "SEGURIDAD"
 
-#: ../cli/src/devices.c:182
+#. 10
+#: ../clients/cli/devices.c:162
 msgid "WPA-FLAGS"
 msgstr "INDICADORES-WPA"
 
-#: ../cli/src/devices.c:183
+#. 11
+#: ../clients/cli/devices.c:163
 msgid "RSN-FLAGS"
 msgstr "INDICADORES-RSN"
 
-#: ../cli/src/devices.c:185 ../cli/src/devices.c:202
-msgid "ACTIVE"
-msgstr "ACTIVO"
-
-#: ../cli/src/devices.c:186
+#. 14
+#: ../clients/cli/devices.c:166
 msgid "*"
 msgstr "*"
 
-#: ../cli/src/devices.c:198 ../cli/src/devices.c:242
+#. 0
+#. 5
+#: ../clients/cli/devices.c:178 ../clients/cli/devices.c:232
 msgid "NSP"
 msgstr "PSR"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/devices.c:213
+#. 0
+#: ../clients/cli/devices.c:193
 msgid "SLAVES"
 msgstr "ESCLAVOS"
 
+#. 0
+#: ../clients/cli/devices.c:202
+msgid "PARENT"
+msgstr ""
+
 # auto translated by TM merge from project: RHN Satellite UI, version: 5.5, DocId: java/code/src/com/redhat/rhn/frontend/strings/java/StringResource
-#: ../cli/src/devices.c:222
+#. 1
+#: ../clients/cli/devices.c:203
 msgid "ID"
 msgstr "ID"
 
-#: ../cli/src/devices.c:237
+#. 0
+#: ../clients/cli/devices.c:212 ../clients/cli/devices.c:227
 msgid "CAPABILITIES"
 msgstr "FUNCIONALIDADES"
 
-#: ../cli/src/devices.c:238
+#. 1
+#: ../clients/cli/devices.c:228
 msgid "WIFI-PROPERTIES"
 msgstr "PROPIEDADES-WIFI"
 
-#: ../cli/src/devices.c:240
+#. 3
+#: ../clients/cli/devices.c:230
 msgid "WIRED-PROPERTIES"
 msgstr "PROPIEDADES ALÁMBRICAS"
 
-#: ../cli/src/devices.c:241
+#. 4
+#: ../clients/cli/devices.c:231
 msgid "WIMAX-PROPERTIES"
 msgstr "PROPIEDADES-WIMAX"
 
-#: ../cli/src/devices.c:247 ../tui/nmt-page-bond.c:73
+#. 10
+#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-bond.c:354
 msgid "BOND"
 msgstr "VÍNCULO"
 
-#: ../cli/src/devices.c:248 ../tui/nm-editor-utils.c:227
-#: ../tui/nm-ui-utils.c:355 ../tui/nm-ui-utils.c:580 ../tui/nmt-page-vlan.c:53
-msgid "VLAN"
-msgstr "VLAN"
+#. 11
+#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-team.c:148
+msgid "TEAM"
+msgstr "EQUIPO"
+
+#. 12
+#: ../clients/cli/devices.c:239 ../clients/tui/nmt-page-bridge.c:77
+msgid "BRIDGE"
+msgstr "PUENTE"
+
+#. 14
+#: ../clients/cli/devices.c:241
+msgid "BLUETOOTH"
+msgstr ""
 
-#: ../cli/src/devices.c:249
+#. 15
+#: ../clients/cli/devices.c:242
 msgid "CONNECTIONS"
 msgstr "CONEXIONES"
 
-#: ../cli/src/devices.c:274
-#, c-format
+#: ../clients/cli/devices.c:266
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli device { COMMAND | help }\n"
 "\n"
-"COMMAND := { status | show | connect | disconnect | wifi | wimax }\n"
+"COMMAND := { status | show | connect | disconnect | delete | wifi | wimax }\n"
 "\n"
-"COMMAND := { status | show | connect | disconnect | wifi }\n"
+"COMMAND := { status | show | connect | disconnect | delete | wifi }\n"
 "\n"
 "  status\n"
 "\n"
@@ -3014,15 +3572,18 @@ msgid ""
 "\n"
 "  connect <ifname>\n"
 "\n"
-"  disconnect <ifname>\n"
+"  disconnect <ifname> ...\n"
+"\n"
+"  delete <ifname> ...\n"
 "\n"
 "  wifi [list [ifname <ifname>] [bssid <BSSID>]]\n"
 "\n"
 "  wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] "
 "[ifname <ifname>]\n"
-"                         [bssid <BSSID>] [name <name>] [private yes|no]\n"
+"                         [bssid <BSSID>] [name <name>] [private yes|no] "
+"[hidden yes|no]\n"
 "\n"
-"  wifi rescan [[ifname] <ifname>]\n"
+"  wifi rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
 "  wimax [list [ifname <ifname>] [nsp <name>]]\n"
 "\n"
@@ -3052,7 +3613,7 @@ msgstr ""
 "  wimax [list [ifname <ifname>] [nsp <name>]]\n"
 "\n"
 
-#: ../cli/src/devices.c:298
+#: ../clients/cli/devices.c:290
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -3063,8 +3624,10 @@ msgid ""
 " TYPE       - device type\n"
 " STATE      - device state\n"
 " CONNECTION - connection activated on device (if any)\n"
-"Displayed columns can be changed using '--fields' global option. 'status' is\n"
-"the default command, which means 'nmcli device' calls 'nmcli device status'.\n"
+"Displayed columns can be changed using '--fields' global option. 'status' "
+"is\n"
+"the default command, which means 'nmcli device' calls 'nmcli device "
+"status'.\n"
 "\n"
 msgstr ""
 "Uso: nmcli device status { help }\n"
@@ -3081,7 +3644,7 @@ msgstr ""
 "'nmcli device status'.\n"
 "\n"
 
-#: ../cli/src/devices.c:314
+#: ../clients/cli/devices.c:305
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -3101,7 +3664,7 @@ msgstr ""
 "dispositivo determinado.\n"
 "\n"
 
-#: ../cli/src/devices.c:326
+#: ../clients/cli/devices.c:316
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -3109,8 +3672,8 @@ msgid ""
 "ARGUMENTS := <ifname>\n"
 "\n"
 "Connect the device.\n"
-"NetworkManager will try to find a suitable connection that will be activated."
-"\n"
+"NetworkManager will try to find a suitable connection that will be "
+"activated.\n"
 "It will also consider connections that are not set to auto-connect.\n"
 "\n"
 msgstr ""
@@ -3123,14 +3686,14 @@ msgstr ""
 "También considerará conexiones que no estén configuradas para auto-connect.\n"
 "\n"
 
-#: ../cli/src/devices.c:339
-#, c-format
+#: ../clients/cli/devices.c:328
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
 "\n"
-"ARGUMENTS := <ifname>\n"
+"ARGUMENTS := <ifname> ...\n"
 "\n"
-"Disconnect the device.\n"
+"Disconnect devices.\n"
 "The command disconnects the device and prevents it from auto-activating\n"
 "further connections without user/manual intervention.\n"
 "\n"
@@ -3144,8 +3707,30 @@ msgstr ""
 "otras conexiones sin la intervención manual del usuario.\n"
 "\n"
 
-#: ../cli/src/devices.c:352
-#, c-format
+#: ../clients/cli/devices.c:340
+#, fuzzy, c-format
+msgid ""
+"Usage: nmcli device delete { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTS := <ifname> ...\n"
+"\n"
+"Delete the software devices.\n"
+"The command removes the interfaces. It only works for software devices\n"
+"(like bonds, bridges, etc.). Hardware devices cannot be deleted by the\n"
+"command.\n"
+"\n"
+msgstr ""
+"Uso: nmcli device show { ARGUMENTS | help }\n"
+"\n"
+"ARGUMENTOS := [<ifname>]\n"
+"\n"
+"Muestra detalles del o los dispositivo(s).\n"
+"El comando lista información para todos los dispositivos o para un "
+"dispositivo determinado.\n"
+"\n"
+
+#: ../clients/cli/devices.c:353
+#, fuzzy, c-format
 msgid ""
 "Usage: nmcli device wifi { ARGUMENTS | help }\n"
 "\n"
@@ -3156,9 +3741,10 @@ msgid ""
 "List available Wi-Fi access points. The 'ifname' and 'bssid' options can be\n"
 "used to list APs for a particular interface, or with a specific BSSID.\n"
 "\n"
-"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type "
-"key|phrase] [ifname <ifname>]\n"
-"                    [bssid <BSSID>] [name <name>] [private yes|no]\n"
+"ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|"
+"phrase] [ifname <ifname>]\n"
+"                    [bssid <BSSID>] [name <name>] [private yes|no] [hidden "
+"yes|no]\n"
 "\n"
 "Connect to a Wi-Fi network specified by SSID or BSSID. The command creates\n"
 "a new connection and then activates it on a device. This is a command-line\n"
@@ -3169,12 +3755,17 @@ msgid ""
 "only open, WEP and WPA-PSK networks are supported at the moment. It is also\n"
 "assumed that IP configuration is obtained via DHCP.\n"
 "\n"
-"ARGUMENTS := rescan [[ifname] <ifname>]\n"
+"ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n"
 "\n"
-"Request that NetworkManager immediately re-scan for available access points.\n"
-"NetworkManager scans Wi-Fi networks periodically, but in some cases it might\n"
-"be useful to start scanning manually. Note that this command does not show\n"
-"the APs, use 'nmcli device wifi list' for that.\n"
+"Request that NetworkManager immediately re-scan for available access "
+"points.\n"
+"NetworkManager scans Wi-Fi networks periodically, but in some cases it "
+"might\n"
+"be useful to start scanning manually. 'ssid' allows scanning for a specific\n"
+"SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can "
+"be\n"
+"given. Note that this command does not show the APs,\n"
+"use 'nmcli device wifi list' for that.\n"
 "\n"
 msgstr ""
 "Uso: nmcli device wifi { ARGUMENTS | help }\n"
@@ -3187,27 +3778,32 @@ msgstr ""
 "pueden utilizarse para listar\n"
 "las AP para una interfaz particular o con un BSSID específico.\n"
 "\n"
-"ARGUMENTOS := connect <(B)SSID> [password <password>] [wep-key-type "
-"key|phrase] [ifname <ifname>]\n"
+"ARGUMENTOS := connect <(B)SSID> [password <password>] [wep-key-type key|"
+"phrase] [ifname <ifname>]\n"
 "                    [bssid <BSSID>] [name <name>] [private yes|no]\n"
 "\n"
 "Conectar a una red Wi-Fi especificada por SSI o BSSID. El comando crea\n"
 "una nueva conexión y luego la activa en un dispositivo. Este es un \n"
 "equivalente de línea de comandos de hacer clic en un SSID en un cliente de \n"
 "GUI.El comando siempre crea\n"
-"una nueva conexión y por lo tanto es muy útil para conectarse a nuevas redes \n"
+"una nueva conexión y por lo tanto es muy útil para conectarse a nuevas "
+"redes \n"
 "Wi-Fi.\n"
-"Si ya existe una conexión para la red, es mejor devolver el perfil existente \n"
-"así: nmcli con up id <name>. Observe que solo abre, las redes WEP y WPA-PSK \n"
+"Si ya existe una conexión para la red, es mejor devolver el perfil "
+"existente \n"
+"así: nmcli con up id <name>. Observe que solo abre, las redes WEP y WPA-"
+"PSK \n"
 "tienen soporte en este momento. También se supone que configuración IP se \n"
-"obtiene vía DHCP.  Solicita que NetworkManager reescanée inmediatamente los \n"
-"puntos de acceso disponibles.NetworkManager escanea periodicamente  redes de \n"
+"obtiene vía DHCP.  Solicita que NetworkManager reescanée inmediatamente "
+"los \n"
+"puntos de acceso disponibles.NetworkManager escanea periodicamente  redes "
+"de \n"
 "Wi-Fi, pero en algunos casos puede ser útil comenzar el escaneo de forma \n"
 "manual. Observe que este comando no muestra las AP, use la lista de \n"
 "dispositivos nmcli Wi-Fi para ello.\n"
 "\n"
 
-#: ../cli/src/devices.c:386
+#: ../clients/cli/devices.c:388
 #, c-format
 msgid ""
 "Usage: nmcli device wimax { ARGUMENTS | help }\n"
@@ -3231,337 +3827,423 @@ msgstr ""
 "para una determinada interfaz, o con un NSP específico.\n"
 "\n"
 
-#: ../cli/src/devices.c:480
+#: ../clients/cli/devices.c:477 ../clients/cli/devices.c:668
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: ../cli/src/devices.c:547
+#: ../clients/cli/devices.c:545
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:548
+#: ../clients/cli/devices.c:546
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
 
-#: ../cli/src/devices.c:567
+#: ../clients/cli/devices.c:561
 msgid "WPA1"
 msgstr "WPA1"
 
-#: ../cli/src/devices.c:576
+#: ../clients/cli/devices.c:570
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../cli/src/devices.c:592
+#: ../clients/cli/devices.c:586
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../cli/src/devices.c:593
+#: ../clients/cli/devices.c:587
 msgid "Infra"
 msgstr "Infra"
 
-#: ../cli/src/devices.c:625
+# auto translated by TM merge from project: rhsm-web, version: 0.0, DocId: management
+#: ../clients/cli/devices.c:588
+msgid "N/A"
+msgstr "N/A"
+
+#: ../clients/cli/devices.c:619
 msgid "Home"
 msgstr "Casa"
 
-#: ../cli/src/devices.c:628
+#: ../clients/cli/devices.c:622
 msgid "Partner"
 msgstr "Asociado"
 
-#: ../cli/src/devices.c:631
+#: ../clients/cli/devices.c:625
 msgid "Roaming"
 msgstr "Roaming"
 
-#: ../cli/src/devices.c:725
+#: ../clients/cli/devices.c:783
 msgid "Device details"
 msgstr "Detalles de los dispositivos"
 
-#: ../cli/src/devices.c:737
+#: ../clients/cli/devices.c:795
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "Error: 'device show': %s"
 
-#: ../cli/src/devices.c:787 ../cli/src/devices.c:790 ../cli/src/devices.c:1334
-#: ../cli/src/devices.c:1474
+#: ../clients/cli/devices.c:847 ../clients/cli/devices.c:850
 msgid "(unknown)"
 msgstr "(desconocido)"
 
-#: ../cli/src/devices.c:827
+#: ../clients/cli/devices.c:891
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../cli/src/devices.c:913
+#: ../clients/cli/devices.c:981
 msgid "on"
 msgstr "encendido"
 
-#: ../cli/src/devices.c:913
+#: ../clients/cli/devices.c:981
 msgid "off"
 msgstr "apagado"
 
-#: ../cli/src/devices.c:1188
+#: ../clients/cli/devices.c:1255
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "Error: 'device status': %s"
 
-#: ../cli/src/devices.c:1206
+#. Add headers
+#: ../clients/cli/devices.c:1262
 msgid "Status of devices"
 msgstr "Estado de los dispositivos"
 
-#: ../cli/src/devices.c:1237
+#: ../clients/cli/devices.c:1293
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "Error: invalid extra argument '%s'."
 
-#: ../cli/src/devices.c:1265 ../cli/src/devices.c:1422
-#: ../cli/src/devices.c:1557 ../cli/src/devices.c:1696
-#: ../cli/src/devices.c:2436
+#: ../clients/cli/devices.c:1310 ../clients/cli/devices.c:1608
+#: ../clients/cli/devices.c:2080 ../clients/cli/devices.c:2847
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "Error: no se encontró el dispositivo «%s»."
 
-#: ../cli/src/devices.c:1319
-#, c-format
-msgid "Success: Device '%s' successfully activated."
+#: ../clients/cli/devices.c:1388
+#, fuzzy, c-format
+msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "Exito: Dispositivo '%s' ha sido activado correctamente."
 
-#: ../cli/src/devices.c:1333
+#: ../clients/cli/devices.c:1394
+#, fuzzy, c-format
+msgid "Error: Connection activation failed: (%d) %s.\n"
+msgstr "Error: Connection activation failed: (%d) %s."
+
+#: ../clients/cli/devices.c:1428
+#, fuzzy, c-format
+msgid "Error: Failed to add/activate new connection: %s"
+msgstr "Error: Failed to add/activate new connection: (%d) %s"
+
+#: ../clients/cli/devices.c:1437
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr "Error: Failed to add/activate new connection: Unknown error"
+
+#: ../clients/cli/devices.c:1448
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "Conexión con UUID '%s' ha sido creada y activada en dispositivo '%s'\n"
+
+#: ../clients/cli/devices.c:1512
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "Error: Device activation failed: %s"
 
-#: ../cli/src/devices.c:1350
+#: ../clients/cli/devices.c:1521
+#, fuzzy, c-format
+msgid "Error: Device activation failed: device was disconnected"
+msgstr "Error: Device activation failed: %s"
+
+#: ../clients/cli/devices.c:1536
 #, c-format
 msgid "Device '%s' has been connected.\n"
 msgstr "Dispositivo '%s' ha sido conectado.\n"
 
-#: ../cli/src/devices.c:1377 ../cli/src/devices.c:1512
-msgid "Interface: "
-msgstr "Interfaz:"
-
-#: ../cli/src/devices.c:1381 ../cli/src/devices.c:1390
-#: ../cli/src/devices.c:1516 ../cli/src/devices.c:1525
+#: ../clients/cli/devices.c:1577 ../clients/cli/devices.c:1586
+#: ../clients/cli/devices.c:1787 ../clients/cli/devices.c:1902
 #, c-format
 msgid "Error: No interface specified."
 msgstr "Error: No interface specified."
 
-#: ../cli/src/devices.c:1396 ../cli/src/devices.c:1531
+#: ../clients/cli/devices.c:1592
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "Error: extra argument not allowed: '%s'."
 
-#: ../cli/src/devices.c:1459
-#, c-format
-msgid "Success: Device '%s' successfully disconnected."
+#: ../clients/cli/devices.c:1676 ../clients/cli/devices.c:1691
+#: ../clients/cli/devices.c:1755
+#, fuzzy, c-format
+msgid "Device '%s' successfully disconnected.\n"
 msgstr "Éxito: dispositivo «%s» desconectado correctamente."
 
-#: ../cli/src/devices.c:1471
-#, c-format
-msgid "Error: Device '%s' (%s) disconnecting failed: %s"
+#: ../clients/cli/devices.c:1679
+#, fuzzy, c-format
+msgid "Device '%s' successfully removed.\n"
+msgstr "Exito: Dispositivo '%s' ha sido activado correctamente."
+
+#: ../clients/cli/devices.c:1739
+#, fuzzy, c-format
+msgid "Error: not all devices disconnected."
+msgstr "Error: No se encontró dispositivo Wi-Fi."
+
+#: ../clients/cli/devices.c:1740
+#, fuzzy, c-format
+msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "Error: falló la desconexión del dispositivo «%s» (%s): %s"
 
-#: ../cli/src/devices.c:1485
+#: ../clients/cli/devices.c:1807 ../clients/cli/devices.c:1929
 #, c-format
-msgid "Device '%s' has been disconnected.\n"
-msgstr "Dispositivo '%s' ha sido desconectado.\n"
+msgid "Warning: argument '%s' is duplicated.\n"
+msgstr ""
+
+#: ../clients/cli/devices.c:1809 ../clients/cli/devices.c:1931
+#, fuzzy, c-format
+msgid "Error: Device '%s' not found.\n"
+msgstr "Error: no se encontró el dispositivo «%s»."
+
+#: ../clients/cli/devices.c:1810 ../clients/cli/devices.c:1932
+#, fuzzy, c-format
+msgid "Error: not all devices found."
+msgstr "Error: No se encontró dispositivo Wi-Fi."
+
+#: ../clients/cli/devices.c:1820 ../clients/cli/devices.c:1942
+#, fuzzy, c-format
+msgid "Error: no valid device provided."
+msgstr "Error: No se proporcionaron argumentos."
+
+#: ../clients/cli/devices.c:1864
+#, fuzzy, c-format
+msgid "Error: not all devices deleted."
+msgstr "Error: No se encontró dispositivo Wi-Fi."
+
+#: ../clients/cli/devices.c:1865
+#, fuzzy, c-format
+msgid "Error: Device '%s' (%s) deletion failed: %s\n"
+msgstr "Error: falló la desconexión del dispositivo «%s» (%s): %s"
 
-#: ../cli/src/devices.c:1628
+#: ../clients/cli/devices.c:1923
+#, fuzzy, c-format
+msgid "Error: Device '%s' is a hardware device. It can't be deleted.\n"
+msgstr "Error: parámetro '%s' es obligatorio y no puede ser retirado.\n"
+
+#: ../clients/cli/devices.c:1925
+#, fuzzy, c-format
+msgid "Error: not all devices valid."
+msgstr "Error: No se encontró dispositivo Wi-Fi."
+
+#: ../clients/cli/devices.c:2023
 msgid "Wi-Fi scan list"
 msgstr "Lista de escán de Wi-Fi"
 
-#: ../cli/src/devices.c:1666
+#: ../clients/cli/devices.c:2061
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "Error: 'device wifi': %s"
 
-#: ../cli/src/devices.c:1719 ../cli/src/devices.c:1788
+#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2184
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "Error: no se encontró el punto de acceso con bssid «%s»."
 
-#: ../cli/src/devices.c:1743 ../cli/src/devices.c:2131
-#: ../cli/src/devices.c:2293
-#, c-format
-msgid "Error: Device '%s' is not a Wi-Fi device."
+#: ../clients/cli/devices.c:2130
+#, fuzzy, c-format
+msgid ""
+"Error: Device '%s' was not recognized as a Wi-Fi device, check "
+"NetworkManager Wi-Fi plugin."
 msgstr "Error: Device '%s' is not a Wi-Fi device."
 
-#: ../cli/src/devices.c:1825 ../cli/src/devices.c:1872
-#, c-format
-msgid "Connection with UUID '%s' created and activated on device '%s'\n"
-msgstr "Conexión con UUID '%s' ha sido creada y activada en dispositivo '%s'\n"
-
-#: ../cli/src/devices.c:1829
-#, c-format
-msgid "Error: Connection activation failed: (%d) %s."
-msgstr "Error: Connection activation failed: (%d) %s."
-
-#: ../cli/src/devices.c:1854
-#, c-format
-msgid "Error: Failed to add/activate new connection: (%d) %s"
-msgstr "Error: Failed to add/activate new connection: (%d) %s"
-
-#: ../cli/src/devices.c:1862
+#: ../clients/cli/devices.c:2132 ../clients/cli/devices.c:2464
+#: ../clients/cli/devices.c:2695
 #, c-format
-msgid "Error: Failed to add/activate new connection: Unknown error"
-msgstr "Error: Failed to add/activate new connection: Unknown error"
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "Error: Device '%s' is not a Wi-Fi device."
 
-#: ../cli/src/devices.c:2013
+#: ../clients/cli/devices.c:2344
 msgid "SSID or BSSID: "
 msgstr "SSID o BSSID: "
 
-#: ../cli/src/devices.c:2018
+#: ../clients/cli/devices.c:2349
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "Error: SSID or BSSID are missing."
 
-#: ../cli/src/devices.c:2042
+#: ../clients/cli/devices.c:2373
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "Error: bssid argument value '%s' is not a valid BSSID."
 
-#: ../cli/src/devices.c:2066
+#: ../clients/cli/devices.c:2397
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
 msgstr ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
 
-#: ../cli/src/devices.c:2086
+#: ../clients/cli/devices.c:2417 ../clients/cli/devices.c:2430
 #, c-format
 msgid "Error: %s: %s."
 msgstr "Error: %s: %s."
 
-#: ../cli/src/devices.c:2101
+#: ../clients/cli/devices.c:2445
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr "Error: BSSID para conectarse a (%s) difiere del argumento bssid (%s)."
 
-#: ../cli/src/devices.c:2107
+#: ../clients/cli/devices.c:2451
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "Error: Parámetro '%s' no es ni SSID ni BSSID."
 
-#: ../cli/src/devices.c:2133 ../cli/src/devices.c:2295
+#: ../clients/cli/devices.c:2466 ../clients/cli/devices.c:2697
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "Error: No se encontró dispositivo Wi-Fi."
 
-#: ../cli/src/devices.c:2151
+#: ../clients/cli/devices.c:2486
+#, fuzzy, c-format
+msgid "Error: Failed to scan hidden SSID: %s."
+msgstr "Error: falló al modificar %s.%s: %s."
+
+#: ../clients/cli/devices.c:2511
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "Error: No se encontro red con SSID '%s."
 
-#: ../cli/src/devices.c:2153
+#: ../clients/cli/devices.c:2513
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "Error: No se encontró punto de acceso con BSSID '%s'."
 
-#: ../cli/src/devices.c:2192
+#: ../clients/cli/devices.c:2555
+#, c-format
+msgid ""
+"Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
+msgstr ""
+
+#: ../clients/cli/devices.c:2569
 msgid "Password: "
 msgstr "Contraseña:"
 
-#: ../cli/src/devices.c:2321
+#: ../clients/cli/devices.c:2664
+#, fuzzy, c-format
+msgid "Error: '%s' cannot repeat."
+msgstr "Error: '%s' parámetro no está presente\n"
+
+#: ../clients/cli/devices.c:2743
 #, c-format
 msgid "Error: 'device wifi' command '%s' is not valid."
 msgstr "Error: 'device wifi' command '%s' no es válido."
 
-#: ../cli/src/devices.c:2368
+#: ../clients/cli/devices.c:2790
 msgid "WiMAX NSP list"
 msgstr "Lista PSR WiMAX"
 
-#: ../cli/src/devices.c:2405
+#: ../clients/cli/devices.c:2827
 #, c-format
 msgid "Error: 'device wimax': %s"
 msgstr "Error: 'device wimax': %s"
 
-#: ../cli/src/devices.c:2459
+#: ../clients/cli/devices.c:2870
 #, c-format
 msgid "Error: NSP with name '%s' not found."
 msgstr "Error: no se encontró el PSR con el nombre «%s»."
 
-#: ../cli/src/devices.c:2472
+#: ../clients/cli/devices.c:2883
 #, c-format
 msgid "Error: Device '%s' is not a WiMAX device."
 msgstr "Error: el dispositivo «%s» no es un dispositivo WiMAX."
 
-#: ../cli/src/devices.c:2510
+#: ../clients/cli/devices.c:2927
 #, c-format
 msgid "Error: Access point with nsp '%s' not found."
 msgstr "Error: no se encontró el punto de acceso con nsp «%s»."
 
-#: ../cli/src/devices.c:2542
+#: ../clients/cli/devices.c:2964
 #, c-format
 msgid "Error: 'device wimax' command '%s' is not valid."
 msgstr "Error: comando 'device wimax' '%s' no es válido."
 
-#: ../cli/src/devices.c:2621
+#: ../clients/cli/devices.c:3140
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr "Error: comando «dev» «%s» no válido."
 
-#: ../cli/src/network-manager.c:37
+#: ../clients/cli/general.c:35
 msgid "RUNNING"
 msgstr "EJECUTANDO"
 
-#: ../cli/src/network-manager.c:38
+#. 0
+#: ../clients/cli/general.c:36
 msgid "VERSION"
 msgstr "VERSIÓN"
 
-#: ../cli/src/network-manager.c:40
+#. 2
+#: ../clients/cli/general.c:38
 msgid "STARTUP"
 msgstr "INICIO"
 
-#: ../cli/src/network-manager.c:41
+#. 3
+#: ../clients/cli/general.c:39
 msgid "CONNECTIVITY"
 msgstr "CONECTIVIDAD"
 
-#: ../cli/src/network-manager.c:42
+#. 4
+#: ../clients/cli/general.c:40
 msgid "NETWORKING"
 msgstr "RED"
 
-#: ../cli/src/network-manager.c:43
+#. 5
+#: ../clients/cli/general.c:41
 msgid "WIFI-HW"
 msgstr "WIFI-HW"
 
-#: ../cli/src/network-manager.c:44
+#. 6
+#: ../clients/cli/general.c:42
 msgid "WIFI"
 msgstr "WIFI"
 
-#: ../cli/src/network-manager.c:45
+#. 7
+#: ../clients/cli/general.c:43
 msgid "WWAN-HW"
 msgstr "WWAN-HW"
 
-#: ../cli/src/network-manager.c:46
+#. 8
+#: ../clients/cli/general.c:44
 msgid "WWAN"
 msgstr "WWAN"
 
-#: ../cli/src/network-manager.c:47
+#. 9
+#: ../clients/cli/general.c:45
 msgid "WIMAX-HW"
 msgstr "WIMAX-HW"
 
-#: ../cli/src/network-manager.c:48
+#. 10
+#: ../clients/cli/general.c:46
 msgid "WIMAX"
 msgstr "WIMAX"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/network-manager.c:70
+#: ../clients/cli/general.c:68
 msgid "PERMISSION"
 msgstr "PERMISO"
 
-#: ../cli/src/network-manager.c:71
+#. 0
+#: ../clients/cli/general.c:69
 msgid "VALUE"
 msgstr "VALOR"
 
-#: ../cli/src/network-manager.c:79
+#: ../clients/cli/general.c:77
 msgid "LEVEL"
 msgstr "NIVEL"
 
-#: ../cli/src/network-manager.c:80
+#. 0
+#: ../clients/cli/general.c:78
 msgid "DOMAINS"
 msgstr "DOMINIOS"
 
-#: ../cli/src/network-manager.c:95
+#: ../clients/cli/general.c:92
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -3590,7 +4272,7 @@ msgstr ""
 "  logging [level <log level>] [domains <log domains>]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:107
+#: ../clients/cli/general.c:103
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -3607,7 +4289,7 @@ msgstr ""
 "llama a 'nmcli gen status'\n"
 "\n"
 
-#: ../cli/src/network-manager.c:117
+#: ../clients/cli/general.c:112
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -3616,8 +4298,8 @@ msgid ""
 "\n"
 "Get or change persistent system hostname.\n"
 "With no arguments, this prints currently configured hostname. When you pass\n"
-"a hostname, NetworkManager will set it as the new persistent system hostname."
-"\n"
+"a hostname, NetworkManager will set it as the new persistent system "
+"hostname.\n"
 "\n"
 msgstr ""
 "Uso: nombre de host general nmcli { ARGUMENTS | help }\n"
@@ -3631,7 +4313,7 @@ msgstr ""
 "de sistema persistente.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:130
+#: ../clients/cli/general.c:124
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -3644,7 +4326,7 @@ msgstr ""
 "Mostrar permisos de llamador para operaciones autenticadas.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:139
+#: ../clients/cli/general.c:132
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3670,7 +4352,7 @@ msgstr ""
 "para obtener una lista de los dominios de registro posibles.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:153
+#: ../clients/cli/general.c:145
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -3695,29 +4377,33 @@ msgstr ""
 "  connectivity [check]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:164
+#: ../clients/cli/general.c:155
 #, c-format
-msgid "Usage: nmcli networking on { help }\n"
+msgid ""
+"Usage: nmcli networking on { help }\n"
 "\n"
 "Switch networking on.\n"
 "\n"
-msgstr "Uso: red nmcli en { help }\n"
+msgstr ""
+"Uso: red nmcli en { help }\n"
 "\n"
 "Cambio de redes encendido.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:173
+#: ../clients/cli/general.c:163
 #, c-format
-msgid "Usage: nmcli networking off { help }\n"
+msgid ""
+"Usage: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
-msgstr "Uso: nmcli networking off { help }\n"
+msgstr ""
+"Uso: nmcli networking off { help }\n"
 "\n"
 "Switch networking off.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:182
+#: ../clients/cli/general.c:171
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3725,8 +4411,8 @@ msgid ""
 "ARGUMENTS := [check]\n"
 "\n"
 "Get network connectivity state.\n"
-"The optional 'check' argument makes NetworkManager re-check the connectivity."
-"\n"
+"The optional 'check' argument makes NetworkManager re-check the "
+"connectivity.\n"
 "\n"
 msgstr ""
 "Uso: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3738,7 +4424,7 @@ msgstr ""
 "conectividad.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:195
+#: ../clients/cli/general.c:183
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -3763,7 +4449,7 @@ msgstr ""
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:210
+#: ../clients/cli/general.c:197
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3780,7 +4466,7 @@ msgstr ""
 "Obtener estatus de todos los interruptores de radio encendidos o apagados.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:221
+#: ../clients/cli/general.c:207
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3797,7 +4483,7 @@ msgstr ""
 "Obtener estatus de interruptor de radio Wi-Fi, encendido o apagado.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:232
+#: ../clients/cli/general.c:217
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3815,7 +4501,7 @@ msgstr ""
 "apagado.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:244
+#: ../clients/cli/general.c:228
 #, c-format
 msgid ""
 "Usage: nmcli radio wimax { ARGUMENTS | help }\n"
@@ -3832,176 +4518,170 @@ msgstr ""
 "Obtener estatus del interruptor de radio WiMAX, encendido o apagado.\n"
 "\n"
 
-#: ../cli/src/network-manager.c:264
+#: ../clients/cli/general.c:248
 msgid "asleep"
 msgstr "dormido"
 
-#: ../cli/src/network-manager.c:266
+#: ../clients/cli/general.c:250
 msgid "connecting"
 msgstr "conectando"
 
-#: ../cli/src/network-manager.c:268
+#: ../clients/cli/general.c:252
 msgid "connected (local only)"
 msgstr "conectado (sólo local)"
 
-#: ../cli/src/network-manager.c:270
+#: ../clients/cli/general.c:254
 msgid "connected (site only)"
 msgstr "conectado (sólo el sitio)"
 
-#: ../cli/src/network-manager.c:274
+#: ../clients/cli/general.c:258
 msgid "disconnecting"
 msgstr "desconectando"
 
-#: ../cli/src/network-manager.c:290
+#: ../clients/cli/general.c:274
 msgid "portal"
 msgstr "portal"
 
-#: ../cli/src/network-manager.c:292
+#: ../clients/cli/general.c:276
 msgid "limited"
 msgstr "limitado"
 
-#: ../cli/src/network-manager.c:294
+#: ../clients/cli/general.c:278
 msgid "full"
 msgstr "total"
 
-#: ../cli/src/network-manager.c:332
+#: ../clients/cli/general.c:316
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "Error: solo estos campos están permitidos: %s"
 
-#: ../cli/src/network-manager.c:348 ../cli/src/network-manager.c:349
-#: ../cli/src/network-manager.c:350 ../cli/src/network-manager.c:351
-#: ../cli/src/network-manager.c:352 ../cli/src/network-manager.c:354
-#: ../cli/src/network-manager.c:355
+#: ../clients/cli/general.c:336 ../clients/cli/general.c:337
+#: ../clients/cli/general.c:338 ../clients/cli/general.c:339
+#: ../clients/cli/general.c:340 ../clients/cli/general.c:342
+#: ../clients/cli/general.c:343
 msgid "enabled"
 msgstr "activado"
 
-#: ../cli/src/network-manager.c:348 ../cli/src/network-manager.c:349
-#: ../cli/src/network-manager.c:350 ../cli/src/network-manager.c:351
-#: ../cli/src/network-manager.c:352 ../cli/src/network-manager.c:354
-#: ../cli/src/network-manager.c:355
+#: ../clients/cli/general.c:336 ../clients/cli/general.c:337
+#: ../clients/cli/general.c:338 ../clients/cli/general.c:339
+#: ../clients/cli/general.c:340 ../clients/cli/general.c:342
+#: ../clients/cli/general.c:343
 msgid "disabled"
 msgstr "desactivado"
 
-#: ../cli/src/network-manager.c:367
+#: ../clients/cli/general.c:346
 msgid "NetworkManager status"
 msgstr "Estado de NetworkManager"
 
-#: ../cli/src/network-manager.c:372
+#: ../clients/cli/general.c:351
 msgid "running"
 msgstr "ejecutando"
 
-#: ../cli/src/network-manager.c:372
-msgid "not running"
-msgstr "no ejecutando"
-
 # auto translated by TM merge from project: gnome-packagekit, version: 3.8.2, DocId: gnome-packagekit
-#: ../cli/src/network-manager.c:375
+#: ../clients/cli/general.c:354
 msgid "starting"
 msgstr "Iniciando"
 
 # auto translated by TM merge from project: libvirt, version: 1.1.1, DocId: libvirt
-#: ../cli/src/network-manager.c:375
+#: ../clients/cli/general.c:354
 msgid "started"
 msgstr "Iniciado"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/network-manager.c:446
+#: ../clients/cli/general.c:425
 msgid "auth"
 msgstr "auth"
 
-#: ../cli/src/network-manager.c:475
+#: ../clients/cli/general.c:454
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "Error: 'general permissions': %s"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/network-manager.c:489
+#: ../clients/cli/general.c:468
 msgid "NetworkManager permissions"
 msgstr "Permisos de NetworkManager"
 
-#: ../cli/src/network-manager.c:530
+#: ../clients/cli/general.c:509
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "Error: 'general logging': %s"
 
-#: ../cli/src/network-manager.c:545
+#: ../clients/cli/general.c:524
 msgid "NetworkManager logging"
 msgstr "Registro de NetworkManager"
 
-#: ../cli/src/network-manager.c:565
-#, c-format
-msgid "Error: failed to set hostname: (%d) %s"
+#: ../clients/cli/general.c:546
+#, fuzzy, c-format
+msgid "Error: failed to set hostname: %s"
 msgstr "Error: No se puedo establecer nombre de host: (%d) %s"
 
-#: ../cli/src/network-manager.c:682
-#, c-format
-msgid "Error: access denied to set logging; %s"
+#: ../clients/cli/general.c:659
+#, fuzzy, c-format
+msgid "Error: failed to set logging: %s"
 msgstr "Error: acceso denegado para establecer el registro; %s"
 
-#: ../cli/src/network-manager.c:684
-#, c-format
-msgid "Error: %s"
-msgstr "Error: %s"
-
-#: ../cli/src/network-manager.c:692
+#: ../clients/cli/general.c:668
 #, c-format
 msgid "Error: 'general' command '%s' is not valid."
 msgstr "Error: comando 'general' '%s' no es válido."
 
-#: ../cli/src/network-manager.c:710
+#: ../clients/cli/general.c:686
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "Error: valor '--fields' '%s' no es válido aquí (campo permitido: %s)"
 
-#: ../cli/src/network-manager.c:735
+#: ../clients/cli/general.c:711
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "Error: argumento '%s' es inválido: '%s' (usar on/off)."
 
 # auto translated by TM merge from project: RHN Satellite Installation Guide, version: 5.5, DocId: Trouble_Shooting
-#: ../cli/src/network-manager.c:746
+#: ../clients/cli/general.c:722
 msgid "Connectivity"
 msgstr "Conectividad"
 
 # auto translated by TM merge from project: RHN Satellite UI, version: 5.5, DocId: java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource
-#: ../cli/src/network-manager.c:758
+#: ../clients/cli/general.c:737
 msgid "Networking"
 msgstr "Redes"
 
-#: ../cli/src/network-manager.c:783
+#: ../clients/cli/general.c:762
 #, c-format
 msgid "Error: 'networking connectivity' command '%s' is not valid."
 msgstr "Error: el comando 'networking connectivity' '%s' no es válido."
 
-#: ../cli/src/network-manager.c:799
+#: ../clients/cli/general.c:778
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "Error: el comando 'networking''%s' no es válido."
 
-#: ../cli/src/network-manager.c:825 ../cli/src/network-manager.c:845
+#: ../clients/cli/general.c:807 ../clients/cli/general.c:827
 msgid "Radio switches"
 msgstr "Interruptores de radio"
 
-#: ../cli/src/network-manager.c:863
+#. no argument, show current WiFi state
+#: ../clients/cli/general.c:845
 msgid "Wi-Fi radio switch"
 msgstr "Interruptor de radio Wi-Fi"
 
-#: ../cli/src/network-manager.c:879
+#. no argument, show current WWAN (mobile broadband) state
+#: ../clients/cli/general.c:861
 msgid "WWAN radio switch"
 msgstr "Interruptor de radio WWAN"
 
-#: ../cli/src/network-manager.c:896
+#. no argument, show current WiMAX state
+#: ../clients/cli/general.c:878
 msgid "WiMAX radio switch"
 msgstr "Interruptor de radio WiMAXh"
 
-#: ../cli/src/network-manager.c:908
+#: ../clients/cli/general.c:890
 #, c-format
 msgid "Error: 'radio' command '%s' is not valid."
 msgstr "Error: el comando 'radio' '%s' no es válido."
 
-#: ../cli/src/nmcli.c:78
-#, c-format
+#: ../clients/cli/nmcli.c:86
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
@@ -4026,6 +4706,7 @@ msgid ""
 "  r[adio]         NetworkManager radio switches\n"
 "  c[onnection]    NetworkManager's connections\n"
 "  d[evice]        devices managed by NetworkManager\n"
+"  a[gent]         NetworkManager secret agent or polkit agent\n"
 "\n"
 msgstr ""
 "Uso: %s [OPTIONS] OBJECT { COMMAND | help }\n"
@@ -4053,337 +4734,365 @@ msgstr ""
 "  d[evice]        devices managed by NetworkManager\n"
 "\n"
 
-#: ../cli/src/nmcli.c:132
+#: ../clients/cli/nmcli.c:142
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
 msgstr "Error: el objeto «%s» desconocido, intente «nmcli help»."
 
-#: ../cli/src/nmcli.c:162
+#: ../clients/cli/nmcli.c:172
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "Error: la opción «--terse» se especifica la segunda vez."
 
-#: ../cli/src/nmcli.c:167
+#: ../clients/cli/nmcli.c:177
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "Error: la opción «--terse» es mutuamente exclusiva con «--pretty»."
 
-#: ../cli/src/nmcli.c:175
+#: ../clients/cli/nmcli.c:185
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "Error: la opción «--pretty» se especifica la segunda vez."
 
-#: ../cli/src/nmcli.c:180
+#: ../clients/cli/nmcli.c:190
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "Error: la opción «--pretty» es mutuamente exclusiva con «--terse»."
 
-#: ../cli/src/nmcli.c:190 ../cli/src/nmcli.c:206 ../cli/src/nmcli.c:235
+#: ../clients/cli/nmcli.c:200 ../clients/cli/nmcli.c:216
+#: ../clients/cli/nmcli.c:245
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "Error: falta argumento para opción «%s»."
 
-#: ../cli/src/nmcli.c:199 ../cli/src/nmcli.c:215
+#: ../clients/cli/nmcli.c:209 ../clients/cli/nmcli.c:225
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "Error: «%s» no es válido argumento para opción «%s»."
 
-#: ../cli/src/nmcli.c:222
+#: ../clients/cli/nmcli.c:232
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "Error: faltan campos para opciones «%s»."
 
-#: ../cli/src/nmcli.c:240
+#: ../clients/cli/nmcli.c:250
 #, c-format
 msgid "Error: '%s' is not a valid timeout for '%s' option."
 msgstr "Error: '%s' no es un tiempo de espera válido para opción '%s'."
 
-#: ../cli/src/nmcli.c:247
+#: ../clients/cli/nmcli.c:257
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "herramienta nmcli, versión %s\n"
 
-#: ../cli/src/nmcli.c:253
+#: ../clients/cli/nmcli.c:263
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "Error: opción «%s» desconocida, intente «nmcli -help»."
 
-#: ../cli/src/nmcli.c:288
-#, c-format
-msgid "\n"
-"Error: nmcli terminated by signal %d."
-msgstr "\n"
+#: ../clients/cli/nmcli.c:346 ../clients/cli/nmcli.c:356
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Error: nmcli terminated by signal %s (%d)\n"
+msgstr ""
+"\n"
 "Error: nmcli terminado por señal %d."
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/nmcli.c:318 ../src/main.c:130
-#, c-format
-msgid "Failed to set signal mask: %d"
+#: ../clients/cli/nmcli.c:387
+#, fuzzy, c-format
+msgid "Failed to set signal mask: %d\n"
 msgstr "Falló al establecer máscara de señal: %d"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/nmcli.c:325 ../src/main.c:139
-#, c-format
-msgid "Failed to create signal handling thread: %d"
+#: ../clients/cli/nmcli.c:394
+#, fuzzy, c-format
+msgid "Failed to create signal handling thread: %d\n"
 msgstr "Falló al crear hilo de manejo de señal: %d"
 
-#: ../cli/src/nmcli.c:338 ../test/nm-online.c:149
-#, c-format
-msgid "Error: Could not create NMClient object."
+#: ../clients/cli/nmcli.c:491 ../clients/nm-online.c:197
+#, fuzzy, c-format
+msgid "Error: Could not create NMClient object: %s."
 msgstr "Error: no se pudo crear un objeto NMClient."
 
-#: ../cli/src/nmcli.c:354
+#: ../clients/cli/nmcli.c:508
 msgid "Success"
 msgstr "Éxito"
 
-#: ../cli/src/settings.c:666
-#, c-format
-msgid "%d (hex-ascii-key)"
+#: ../clients/cli/polkit-agent.c:82
+#, fuzzy, c-format
+msgid "Authentication message: %s\n"
+msgstr "Autenticación"
+
+#: ../clients/cli/polkit-agent.c:88
+#, fuzzy, c-format
+msgid "Authentication error: %s\n"
+msgstr "Autenticación"
+
+#: ../clients/cli/polkit-agent.c:134
+#, fuzzy, c-format
+msgid "Warning: polkit agent initialization failed: %s\n"
+msgstr "Falló la inicialización del módem"
+
+#: ../clients/cli/settings.c:685
+#, fuzzy, c-format
+msgid "%d (key)"
 msgstr "%d (clave-hex-ascii)"
 
-#: ../cli/src/settings.c:668
-#, c-format
-msgid "%d (104/128-bit passphrase)"
+#: ../clients/cli/settings.c:687
+#, fuzzy, c-format
+msgid "%d (passphrase)"
 msgstr "%d (frase de acceso 104/128-bits)"
 
-#: ../cli/src/settings.c:671 ../cli/src/settings.c:799
+#: ../clients/cli/settings.c:690 ../clients/cli/settings.c:774
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (desconocido)"
 
-#: ../cli/src/settings.c:697
-msgid "0 (unknown)"
-msgstr "0 (desconocido)"
-
-#: ../cli/src/settings.c:703
-msgid "any, "
-msgstr "cualquiera,"
-
-#: ../cli/src/settings.c:705
-msgid "900 MHz, "
-msgstr "900 MHz, "
-
-#: ../cli/src/settings.c:707
-msgid "1800 MHz, "
-msgstr "1800 MHz, "
-
-#: ../cli/src/settings.c:709
-msgid "1900 MHz, "
-msgstr "1900 MHz, "
-
-#: ../cli/src/settings.c:711
-msgid "850 MHz, "
-msgstr "850 MHz, "
-
-#: ../cli/src/settings.c:713
-msgid "WCDMA 3GPP UMTS 2100 MHz, "
-msgstr "WCDMA 3GPP UMTS 2100 MHz, "
-
-#: ../cli/src/settings.c:715
-msgid "WCDMA 3GPP UMTS 1800 MHz, "
-msgstr "WCDMA 3GPP UMTS 1800 MHz, "
-
-#: ../cli/src/settings.c:717
-msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
-msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
-
-#: ../cli/src/settings.c:719
-msgid "WCDMA 3GPP UMTS 800 MHz, "
-msgstr "WCDMA 3GPP UMTS 800 MHz, "
-
-#: ../cli/src/settings.c:721
-msgid "WCDMA 3GPP UMTS 850 MHz, "
-msgstr "WCDMA 3GPP UMTS 850 MHz, "
-
-#: ../cli/src/settings.c:723
-msgid "WCDMA 3GPP UMTS 900 MHz, "
-msgstr "WCDMA 3GPP UMTS 900 MHz, "
-
-#: ../cli/src/settings.c:725
-msgid "WCDMA 3GPP UMTS 1700 MHz, "
-msgstr "WCDMA 3GPP UMTS 1700 MHz, "
-
-#: ../cli/src/settings.c:727
-msgid "WCDMA 3GPP UMTS 1900 MHz, "
-msgstr "WCDMA 3GPP UMTS 1900 MHz, "
-
-#: ../cli/src/settings.c:729
-msgid "WCDMA 3GPP UMTS 2600 MHz, "
-msgstr "WCDMA 3GPP UMTS 2600 MHz, "
-
-#: ../cli/src/settings.c:747
+#: ../clients/cli/settings.c:719
 msgid "0 (NONE)"
 msgstr "0 (NONE)"
 
-#: ../cli/src/settings.c:753
+#: ../clients/cli/settings.c:725
 msgid "REORDER_HEADERS, "
 msgstr "REORDENAR_ENCABEZADOS, "
 
-#: ../cli/src/settings.c:755
+#: ../clients/cli/settings.c:727
 msgid "GVRP, "
 msgstr "GVRP, "
 
-#: ../cli/src/settings.c:757
+#: ../clients/cli/settings.c:729
 msgid "LOOSE_BINDING, "
 msgstr "DESATAR_VINCULACIÓN, "
 
-#: ../cli/src/settings.c:793
+#: ../clients/cli/settings.c:768
 #, c-format
 msgid "%d (disabled)"
 msgstr "%d (inhabilitado)"
 
-#: ../cli/src/settings.c:795
+#: ../clients/cli/settings.c:770
 #, c-format
 msgid "%d (enabled, prefer public IP)"
 msgstr "%d (habilitado, prefiere IP pública)"
 
-#: ../cli/src/settings.c:797
+#: ../clients/cli/settings.c:772
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
 msgstr "%d (inhabilitado, prefiere temporal IP)"
 
-#: ../cli/src/settings.c:809
+#: ../clients/cli/settings.c:786
+#, fuzzy, c-format
+msgid "%d (no)"
+msgstr "%d (desconocido)"
+
+#: ../clients/cli/settings.c:788
+#, c-format
+msgid "%d (yes)"
+msgstr ""
+
+#: ../clients/cli/settings.c:791
+#, fuzzy, c-format
+msgid "%d (default)"
+msgstr "(predeterminado)"
+
+#: ../clients/cli/settings.c:804
 msgid "0 (none)"
 msgstr "0 (none)"
 
-#: ../cli/src/settings.c:815
+#: ../clients/cli/settings.c:810
 msgid "agent-owned, "
 msgstr "agente-adquirido, "
 
-#: ../cli/src/settings.c:817
+#: ../clients/cli/settings.c:812
 msgid "not saved, "
 msgstr "sin guardar,"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/settings.c:819
+#: ../clients/cli/settings.c:814
 msgid "not required, "
 msgstr "no requerido"
 
-#: ../cli/src/settings.c:1124
+#: ../clients/cli/settings.c:1105
 msgid "0 (disabled)"
 msgstr "0 (inhabilitado)"
 
-#: ../cli/src/settings.c:1130
+#: ../clients/cli/settings.c:1111
 msgid "enabled, "
 msgstr "habilitado,"
 
-#: ../cli/src/settings.c:1132
+#: ../clients/cli/settings.c:1113
 msgid "advertise, "
 msgstr "promover, "
 
-#: ../cli/src/settings.c:1134
+#: ../clients/cli/settings.c:1115
 msgid "willing, "
 msgstr "dispuesto, "
 
-#: ../cli/src/settings.c:1162
+#: ../clients/cli/settings.c:1143
 msgid "-1 (unset)"
 msgstr "-1 (sin establecer)"
 
-#: ../cli/src/settings.c:1270 ../cli/src/settings.c:1453
-#: ../cli/src/settings.c:1493
+#: ../clients/cli/settings.c:1240 ../clients/cli/settings.c:1517
+#: ../clients/cli/settings.c:1619
 msgid "auto"
 msgstr "auto"
 
 # auto translated by TM merge from project: Skynet topics, version: 1, DocId: 4680-83989
-#: ../cli/src/settings.c:1283
+#: ../clients/cli/settings.c:1253
 msgid "default"
 msgstr "predeterminado"
 
-#: ../cli/src/settings.c:1614
+#: ../clients/cli/settings.c:1563
+#, c-format
+msgid ""
+"invalid option '%s', use a combination of [%s] or 'ignore', 'default' or "
+"'none'"
+msgstr ""
+
+#: ../clients/cli/settings.c:1574
+msgid "'default' and 'ignore' are incompatible with other flags"
+msgstr ""
+
+#: ../clients/cli/settings.c:1750
 #, c-format
 msgid "Do you also want to set '%s' to '%s'? [yes]: "
 msgstr "¿Desea también establecer '%s' a '%s'? [yes]: "
 
-#: ../cli/src/settings.c:1616
+#: ../clients/cli/settings.c:1752
 #, c-format
 msgid "Do you also want to clear '%s'? [yes]: "
 msgstr "¿Desea también limpiar '%s' ? [yes]: "
 
-#: ../cli/src/settings.c:1814 ../cli/src/settings.c:2069
-#: ../cli/src/settings.c:3673
+#: ../clients/cli/settings.c:1913
+#, c-format
+msgid ""
+"Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:1932
+#, c-format
+msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:1934
+#, fuzzy
+msgid "Do you want to remove them? [yes] "
+msgstr "¿Desea proporcionarlos? (Sí o No) [yes] "
+
+#: ../clients/cli/settings.c:2030 ../clients/cli/settings.c:2425
+#: ../clients/cli/settings.c:4572
 #, c-format
 msgid "'%s' is not valid"
 msgstr "'%s' no es válido"
 
-#: ../cli/src/settings.c:1837
+#: ../clients/cli/settings.c:2053
 #, c-format
 msgid "'%d' is not valid; use <%d-%d>"
 msgstr "'%d' no es válido; use <%d-%d>"
 
-#: ../cli/src/settings.c:1859
-#, c-format
-msgid "'%u' is not valid; use <%d-%d>"
+#: ../clients/cli/settings.c:2075
+#, fuzzy, c-format
+msgid "'%lld' is not valid; use <%lld-%lld>"
+msgstr "'%d' no es válido; use <%d-%d>"
+
+#: ../clients/cli/settings.c:2097
+#, fuzzy, c-format
+msgid "'%u' is not valid; use <%u-%u>"
 msgstr "'%u' no es válido; use <%d-%d>"
 
-#: ../cli/src/settings.c:1925
+#: ../clients/cli/settings.c:2136
+#, fuzzy, c-format
+msgid "'%u' flags are not valid; use combination of %s"
+msgstr "'%s' no es válido; use [%s] or [%s]"
+
+#: ../clients/cli/settings.c:2203
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "'%s' no es válido; use <option>=<value>"
 
-#: ../cli/src/settings.c:1959
+#: ../clients/cli/settings.c:2237
 #, c-format
 msgid "index '%s' is not valid"
 msgstr "index '%s' no es válido"
 
-#: ../cli/src/settings.c:1964
+#: ../clients/cli/settings.c:2242 ../clients/cli/settings.c:2267
 msgid "no item to remove"
 msgstr "No se encontró ningún elemento para eliminar"
 
-#: ../cli/src/settings.c:1968
+#: ../clients/cli/settings.c:2246 ../clients/cli/settings.c:2271
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
 msgstr "index '%d' no está en el rango <0-%d>"
 
-#: ../cli/src/settings.c:1983
+#: ../clients/cli/settings.c:2286
 #, c-format
 msgid "invalid option '%s'"
 msgstr "Opción inválida: '%s'"
 
-#: ../cli/src/settings.c:1985
+#: ../clients/cli/settings.c:2288
 msgid "missing option"
 msgstr "Falta opción"
 
-#: ../cli/src/settings.c:2015 ../cli/src/settings.c:2035
+#: ../clients/cli/settings.c:2315 ../clients/cli/settings.c:2335
+#: ../clients/cli/settings.c:2355 ../clients/cli/settings.c:2375
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "'%s' no es un número válido (o está fuera de rango)"
 
-#: ../cli/src/settings.c:2089
+#: ../clients/cli/settings.c:2409
+#, fuzzy, c-format
+msgid "'%s' is not a valid value; use -1, 0 or 1"
+msgstr "'%s' no es válido; use 0, 1, o 2"
+
+#: ../clients/cli/settings.c:2441
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "'%s' no es un Ethernet MAC válido"
 
-#: ../cli/src/settings.c:2115 ../libnm-util/nm-setting-bridge.c:277
-#: ../libnm-util/nm-setting-connection.c:752
-#: ../libnm-util/nm-setting-vlan.c:475
+#: ../clients/cli/settings.c:2466 ../libnm-core/nm-setting-connection.c:836
+#: ../libnm-core/nm-setting-infiniband.c:256
+#: ../libnm-util/nm-setting-connection.c:835
+#: ../libnm-util/nm-setting-infiniband.c:270
 #, c-format
 msgid "'%s' is not a valid interface name"
 msgstr "'%s' no es un nombre de interfaz válido"
 
-#: ../cli/src/settings.c:2133 ../cli/src/settings.c:3212
-#: ../libnm-util/nm-setting-gsm.c:375
+#: ../clients/cli/settings.c:2490
+#, fuzzy, c-format
+msgid "'%s' is not a valid flag number; use <0-%d>"
+msgstr "'%s'  no es un canal válido; use <1-13>"
+
+#: ../clients/cli/settings.c:2502
 #, c-format
-msgid "'%s' is not a number"
-msgstr "'%s' no es un número "
+msgid "Warning: '%s' sum is higher than all flags => all flags set\n"
+msgstr ""
 
-#: ../cli/src/settings.c:2185
+#: ../clients/cli/settings.c:2543
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "'%s' no es un caracter hex"
 
-#: ../cli/src/settings.c:2215
+#: ../clients/cli/settings.c:2573
 #, c-format
 msgid "'%s' is not a valid MAC"
 msgstr "'%s' no es un MAC válido"
 
-#: ../cli/src/settings.c:2252 ../libnm-util/nm-setting-connection.c:715
+#: ../clients/cli/settings.c:2599 ../libnm-core/nm-setting-connection.c:825
+#: ../libnm-util/nm-setting-connection.c:792
 #, c-format
 msgid "'%s' is not a valid UUID"
 msgstr "'%s' no es un UUID válido"
 
-#: ../cli/src/settings.c:2317
+#: ../clients/cli/settings.c:2666
+#, c-format
+msgid "the property doesn't contain permission '%s'"
+msgstr ""
+
+#: ../clients/cli/settings.c:2678
 msgid ""
-"Enter a list of user permissions. This is a list of user names formatted as:\n"
+"Enter a list of user permissions. This is a list of user names formatted "
+"as:\n"
 "  [user:]<user name 1>, [user:]<user name 2>,...\n"
 "The items can be separated by commas or spaces.\n"
 "\n"
@@ -4396,30 +5105,131 @@ msgstr ""
 "\n"
 "Ejemplo: alice bob charlie\n"
 
-#: ../cli/src/settings.c:2332
+#: ../clients/cli/settings.c:2697
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr "'%s' no es un maestro válido; use ifname o UUID de conexión"
 
-#: ../cli/src/settings.c:2453
+#: ../clients/cli/settings.c:2741
+#, c-format
+msgid "Warning: %s is not an UUID of any existing connection profile\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:2745 ../clients/cli/settings.c:2761
+#, fuzzy, c-format
+msgid "'%s' is not a VPN connection profile"
+msgstr "Error: '%s' no es un tipo de conexión válida."
+
+#: ../clients/cli/settings.c:2754
+#, fuzzy, c-format
+msgid "'%s' is not a name of any exiting profile"
+msgstr "'%s' no es una configuración de un equipo o nombre de archivo válidos."
+
+#: ../clients/cli/settings.c:2788
+#, fuzzy, c-format
+msgid "the value '%s' is not a valid UUID"
+msgstr "'%s' no es un UUID válido"
+
+#: ../clients/cli/settings.c:2795
+#, c-format
+msgid "the property doesn't contain UUID '%s'"
+msgstr ""
+
+#: ../clients/cli/settings.c:2807
+msgid ""
+"Enter secondary connections that should be activated when this connection "
+"is\n"
+"activated. Connections can be specified either by UUID or ID (name). nmcli\n"
+"transparently translates names to UUIDs. Note that NetworkManager only "
+"supports\n"
+"VPNs as secondary connections at the moment.\n"
+"The items can be separated by commas or spaces.\n"
+"\n"
+"Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:2874
+msgid ""
+"Enter a value which indicates whether the connection is subject to a data\n"
+"quota, usage costs or other limitations. Accepted options are:\n"
+"'true','yes','on' to set the connection as metered\n"
+"'false','no','off' to set the connection as not metered\n"
+"'unknown' to let NetworkManager choose a value using some heuristics\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:2948
 msgid "private key password not provided"
 msgstr "La contraseña de clave privada no se ha provisto"
 
-#: ../cli/src/settings.c:2513
+#: ../clients/cli/settings.c:2976
+#, fuzzy, c-format
+msgid "the property doesn't contain EAP method '%s'"
+msgstr "La propiedad no puede cambiarse"
+
+#: ../clients/cli/settings.c:2993
+msgid ""
+"Enter file path to CA certificate (optionally prefixed with file://).\n"
+"  [file://]<file path>\n"
+"Note that nmcli does not support specifying certificates as raw blob data.\n"
+"Example: /home/cimrman/cacert.crt\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:3012
+#, c-format
+msgid "the property doesn't contain alternative subject match '%s'"
+msgstr ""
+
+#: ../clients/cli/settings.c:3028
+msgid ""
+"Enter file path to client certificate (optionally prefixed with file://).\n"
+"  [file://]<file path>\n"
+"Note that nmcli does not support specifying certificates as raw blob data.\n"
+"Example: /home/cimrman/jara.crt\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:3040
+msgid ""
+"Enter file path to CA certificate for inner authentication (optionally "
+"prefixed\n"
+"with file://).\n"
+"  [file://]<file path>\n"
+"Note that nmcli does not support specifying certificates as raw blob data.\n"
+"Example: /home/cimrman/ca-zweite-phase.crt\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:3060
+#, c-format
+msgid "the property doesn't contain \"phase2\" alternative subject match '%s'"
+msgstr ""
+
+#: ../clients/cli/settings.c:3076
+msgid ""
+"Enter file path to client certificate for inner authentication (optionally "
+"prefixed\n"
+"with file://).\n"
+"  [file://]<file path>\n"
+"Note that nmcli does not support specifying certificates as raw blob data.\n"
+"Example: /home/cimrman/jara-zweite-phase.crt\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:3096
+#, fuzzy
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
-"  <file path> [<password>]\n"
+"  [file://]<file path> [<password>]\n"
+"Note that nmcli does not support specifying private key as raw blob data.\n"
 "Example: /home/cimrman/jara-priv-key Dardanely\n"
 msgstr ""
 "Ingrese ruta a una clave y contraseña privadas (si aún no lo ha hecho):\n"
 "  <file path> [<password>]\n"
 "Ejemplo: /home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../cli/src/settings.c:2583
+#: ../clients/cli/settings.c:3167
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
-"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
+"(a) a string of hexadecimal digits, where each two digits represent one "
+"byte\n"
 "(b) space-separated list of bytes written as hexadecimal digits (with "
 "optional 0x/0X prefix, and optional leading 0).\n"
 "\n"
@@ -4436,7 +5246,7 @@ msgstr ""
 "Ejemplos: ab0455a6ea3a74C2\n"
 "          ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../cli/src/settings.c:2686
+#: ../clients/cli/settings.c:3270
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -4467,17 +5277,32 @@ msgstr ""
 "\n"
 "Ejemplo: mode=2,miimon=120\n"
 
-#: ../cli/src/settings.c:2727
+#: ../clients/cli/settings.c:3301
 #, c-format
 msgid "'%s' is not a valid InfiniBand MAC"
 msgstr "'%s' no es un InfiniBand MAC válido"
 
-#: ../cli/src/settings.c:2765
+#: ../clients/cli/settings.c:3338
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "'%s' no es una llave IBOIP P_key válida"
 
-#: ../cli/src/settings.c:2825
+#: ../clients/cli/settings.c:3369
+#, fuzzy, c-format
+msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])"
+msgstr "'%s' no es válido (use ip/[prefix] next-hop [metric])"
+
+#: ../clients/cli/settings.c:3417 ../clients/cli/settings.c:3436
+#, c-format
+msgid "invalid IPv4 address '%s'"
+msgstr "Formato de dirección IPv4 inválido '%s'"
+
+#: ../clients/cli/settings.c:3442 ../clients/cli/settings.c:3712
+#, c-format
+msgid "the property doesn't contain DNS server '%s'"
+msgstr ""
+
+#: ../clients/cli/settings.c:3454
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -4487,18 +5312,24 @@ msgstr ""
 "\n"
 "Ejemplo: 8.8.8.8, 8.8.4.4\n"
 
-#: ../cli/src/settings.c:2871 ../cli/src/settings.c:3123
+#: ../clients/cli/settings.c:3490 ../clients/cli/settings.c:3766
 #, c-format
-msgid "'%s' is not valid (use ip[/prefix] [gateway])"
-msgstr "'%s' no es válido (use ip[/prefix] [gateway])"
+msgid "the property doesn't contain DNS search domain '%s'"
+msgstr ""
 
-#: ../cli/src/settings.c:2897
+#: ../clients/cli/settings.c:3544 ../clients/cli/settings.c:3819
+#, c-format
+msgid "the property doesn't contain IP address '%s'"
+msgstr ""
+
+#: ../clients/cli/settings.c:3557
+#, fuzzy
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
-"  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
+"  ip[/prefix], ip[/prefix],...\n"
 "Missing prefix is regarded as prefix of 32.\n"
 "\n"
-"Example: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
+"Example: 192.168.1.5/24, 10.0.0.11/24\n"
 msgstr ""
 "Ingrese una lista de direcciones IPv4 formateadas así:\n"
 "  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
@@ -4506,19 +5337,28 @@ msgstr ""
 "\n"
 "Ejemplo: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
 
-#: ../cli/src/settings.c:2954
-#, c-format
-msgid "'%s' is not valid (use ip/[prefix] next-hop [metric])"
-msgstr "'%s' no es válido (use ip/[prefix] next-hop [metric])"
+#: ../clients/cli/settings.c:3573 ../clients/cli/settings.c:3848
+#, fuzzy, c-format
+msgid "invalid gateway address '%s'"
+msgstr "Puerta de enlace inválida '%s'"
+
+#: ../clients/cli/settings.c:3628 ../clients/cli/settings.c:3903
+#, fuzzy, c-format
+msgid "the property doesn't contain route '%s'"
+msgstr "La propiedad no puede cambiarse"
 
-#: ../cli/src/settings.c:2980
+#: ../clients/cli/settings.c:3641
+#, fuzzy
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
-"  ip/[prefix] next-hop [metric],...\n"
+"  ip[/prefix] [next-hop] [metric],...\n"
+"\n"
 "Missing prefix is regarded as a prefix of 32.\n"
-"Missing metric is regarded as a metric of 0.\n"
+"Missing next-hop is regarded as 0.0.0.0.\n"
+"Missing metric means default (NM/kernel will set a default value).\n"
 "\n"
-"Example: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+"Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
+"          10.1.2.0/24\n"
 msgstr ""
 "Ingresar una lista de rutas IPv4 formateadas como:\n"
 "  ip/[prefix] next-hop [metric],...\n"
@@ -4527,7 +5367,12 @@ msgstr ""
 "\n"
 "Ejemplo: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 
-#: ../cli/src/settings.c:3071
+#: ../clients/cli/settings.c:3687 ../clients/cli/settings.c:3706
+#, c-format
+msgid "invalid IPv6 address '%s'"
+msgstr "Dirección IPv4 inválida '%s'"
+
+#: ../clients/cli/settings.c:3724
 msgid ""
 "Enter a list of IPv6 addresses of DNS servers.  If the IPv6 configuration "
 "method is 'auto' these DNS servers are appended to those (if any) returned "
@@ -4548,14 +5393,14 @@ msgstr ""
 "\n"
 "Ejemplo: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../cli/src/settings.c:3149
+#: ../clients/cli/settings.c:3832
+#, fuzzy
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
-"  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
+"  ip[/prefix], ip[/prefix],...\n"
 "Missing prefix is regarded as prefix of 128.\n"
 "\n"
-"Example: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, 1050:0:0:0:5:600:300c:"
-"326b\n"
+"Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 msgstr ""
 "Ingrese una lista de direcciones IPv6 formateadas así:\n"
 "  ip[/prefix] [gateway], ip[/prefix] [gateway],...\n"
@@ -4563,21 +5408,19 @@ msgstr ""
 ".\n"
 "Ejemplo: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n"
 
-#: ../cli/src/settings.c:3171
-#, c-format
-msgid "'%s' is not valid (use <dest IP>/prefix <next-hop IP> [metric])"
-msgstr ""
-"'%s' no es un vaĺor válido (use <dest IP>/prefix <next-hop IP> [metric])"
-
-#: ../cli/src/settings.c:3197
+#: ../clients/cli/settings.c:3916
+#, fuzzy
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
-"  ip/[prefix] next-hop [metric],...\n"
+"  ip[/prefix] [next-hop] [metric],...\n"
+"\n"
 "Missing prefix is regarded as a prefix of 128.\n"
-"Missing metric is regarded as a metric of 0.\n"
+"Missing next-hop is regarded as \"::\".\n"
+"Missing metric means default (NM/kernel will set a default value).\n"
 "\n"
-"Example: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
+"Examples: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
 "db8:beef::3 2\n"
+"          abbe::/64 55\n"
 msgstr ""
 "Ingresar una lista de rutas IPv6 formateadas como:\n"
 "  ip/[prefix] next-hop [metric],...\n"
@@ -4587,22 +5430,28 @@ msgstr ""
 "Ejemplo: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:"
 "db8:beef::3 2\n"
 
-#: ../cli/src/settings.c:3219
+#: ../clients/cli/settings.c:3933 ../libnm-core/nm-setting-gsm.c:308
+#: ../libnm-util/nm-setting-gsm.c:365
+#, c-format
+msgid "'%s' is not a number"
+msgstr "'%s' no es un número "
+
+#: ../clients/cli/settings.c:3940
 #, c-format
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "'%s' no es válido; use 0, 1, o 2"
 
-#: ../cli/src/settings.c:3236
+#: ../clients/cli/settings.c:3957
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "'%s'  no es un canal válido; use <1-13>"
 
-#: ../cli/src/settings.c:3257
+#: ../clients/cli/settings.c:3994
 #, c-format
 msgid "'%s' is not valid; use [e, o, n]"
 msgstr "'%s' no es válido; use [e, o, n]"
 
-#: ../cli/src/settings.c:3285
+#: ../clients/cli/settings.c:4022
 msgid ""
 "nmcli can accepts both direct JSON configuration data and a file name "
 "containing the configuration. In the latter case the file is read and the "
@@ -4620,23 +5469,54 @@ msgstr ""
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../cli/src/settings.c:3325
+#: ../clients/cli/settings.c:4062
 msgid "no priority to remove"
 msgstr "no hay prioridad para retirar"
 
-#: ../cli/src/settings.c:3329
+#: ../clients/cli/settings.c:4066
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
 msgstr "index '%d' no está en el rango de <0-%d>"
 
-#: ../cli/src/settings.c:3444
+#: ../clients/cli/settings.c:4105
+#, c-format
+msgid ""
+"Warning: only one mapping at a time is supported; taking the first one (%s)\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:4112
+#, fuzzy, c-format
+msgid "the property doesn't contain mapping '%s'"
+msgstr "La propiedad no puede cambiarse"
+
+#: ../clients/cli/settings.c:4160
+#, fuzzy, c-format
+msgid "'%s' cannot be empty"
+msgstr "opción '%s' está vacía"
+
+#: ../clients/cli/settings.c:4234 ../clients/cli/settings.c:4401
+#: ../libnm-core/nm-setting-wired.c:646 ../libnm-core/nm-setting-wireless.c:784
+#: ../libnm-core/nm-setting-wireless.c:796 ../libnm-util/nm-setting-wired.c:647
+#: ../libnm-util/nm-setting-wireless.c:842
+#: ../libnm-util/nm-setting-wireless.c:856
+#, c-format
+msgid "'%s' is not a valid MAC address"
+msgstr "'%s' no es una dirección MAC válida"
+
+#: ../clients/cli/settings.c:4240 ../clients/cli/settings.c:4407
 #, c-format
-msgid "'%s' is not valid; 3 strings should be provided"
+msgid "the property doesn't contain MAC address '%s'"
+msgstr ""
+
+#: ../clients/cli/settings.c:4259
+#, fuzzy, c-format
+msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "'%s' no es válido; se deben proporcionar 3 cadenas "
 
-#: ../cli/src/settings.c:3463
+#: ../clients/cli/settings.c:4273
+#, fuzzy
 msgid ""
-"Enter a list of three channels (comma or space separated).\n"
+"Enter a list of subchannels (comma or space separated).\n"
 "\n"
 "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 msgstr ""
@@ -4644,7 +5524,12 @@ msgstr ""
 "\n"
 "Ejemplo: 0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../cli/src/settings.c:3513
+#: ../clients/cli/settings.c:4295
+#, c-format
+msgid "'%s' string value should consist of 1 - 199 characters"
+msgstr ""
+
+#: ../clients/cli/settings.c:4327
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -4655,27 +5540,53 @@ msgstr ""
 "  opción = <value>, option = <value>,...\n"
 "Las opciones válidas son: %s\n"
 
-#: ../cli/src/settings.c:3559
+#: ../clients/cli/settings.c:4373
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "'%s' no es un canal válido"
 
-#: ../cli/src/settings.c:3565
+#: ../clients/cli/settings.c:4379
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "'%ld' no es un canal válido"
 
-#: ../cli/src/settings.c:3668 ../cli/src/settings.c:3671
+#: ../clients/cli/settings.c:4466 ../clients/cli/settings.c:4504
+#: ../clients/cli/settings.c:4542
+#, c-format
+msgid "the property doesn't contain protocol '%s'"
+msgstr ""
+
+#: ../clients/cli/settings.c:4581
+#, c-format
+msgid ""
+"'%s' not compatible with %s '%s', please change the key or set the right %s "
+"first."
+msgstr ""
+
+#: ../clients/cli/settings.c:4589
 #, c-format
 msgid "WEP key is guessed to be of '%s'\n"
 msgstr "Clave WEP se cree que sea de '%s'\n"
 
-#: ../cli/src/settings.c:3695
+#: ../clients/cli/settings.c:4591
+#, fuzzy, c-format
+msgid "WEP key index set to '%d'\n"
+msgstr "Clave WEP se cree que sea de '%s'\n"
+
+#: ../clients/cli/settings.c:4614
 #, c-format
 msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"
 msgstr "'%s' no está entre [0 (desconocido), 1 (clave), 2 (frase de paso)]"
 
-#: ../cli/src/settings.c:3715
+#: ../clients/cli/settings.c:4630 ../clients/cli/settings.c:4633
+#: ../clients/cli/settings.c:4636 ../clients/cli/settings.c:4639
+#, c-format
+msgid ""
+"Warning: '%s' is not compatible with '%s' type, please change or delete the "
+"key.\n"
+msgstr ""
+
+#: ../clients/cli/settings.c:4652
 #, c-format
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
@@ -4684,127 +5595,151 @@ msgstr ""
 "Ingrese e tipo de claves WEP. Los valores aceptados son: 0 o Desconocido, 1 "
 "o clave y 2 o frase de paso..\n"
 
-#: ../cli/src/settings.c:3728
+#: ../clients/cli/settings.c:4665
 #, c-format
 msgid "'%s' is not a valid PSK"
 msgstr "'%s' no es un PSK válido"
 
-#: ../cli/src/settings.c:3772
+#: ../clients/cli/settings.c:4709
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "'%s' no es un indicador DCB válido"
 
-#: ../cli/src/settings.c:3795
+#: ../clients/cli/settings.c:4732
 #, c-format
 msgid "'%s' is not a DCB app priority"
 msgstr "'%s' no es una prioridad app DCB"
 
-#: ../cli/src/settings.c:3821
+#: ../clients/cli/settings.c:4758
 msgid "must contain 8 comma-separated numbers"
 msgstr "debe contener 8 números separados por comas"
 
-#: ../cli/src/settings.c:3838
+#: ../clients/cli/settings.c:4775
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "'%s' no un número entre 0 y %u (inclusive) o %u"
 
-#: ../cli/src/settings.c:3841
+#: ../clients/cli/settings.c:4778
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "'%s' no es un número entre 0 y %u (inclusive)"
 
-#: ../cli/src/settings.c:3863
+#: ../clients/cli/settings.c:4800
 #, c-format
-msgid "Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
+msgid ""
+"Warning: changes will have no effect until '%s' includes 1 (enabled)\n"
 "\n"
 msgstr ""
 "Advertencia: los cambios no tendrán efecto sino hasta que '%s' incluya 1 "
 "(habilitado)\n"
 "\n"
 
-#: ../cli/src/settings.c:3916
+#: ../clients/cli/settings.c:4853
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "Los porcentajes de ancho de banda deben ser en total 100%%"
 
-#: ../cli/src/settings.c:5594
+#: ../clients/cli/settings.c:6575
 msgid "don't know how to get the property value"
 msgstr "No sé cómo obtener el valor de propiedad"
 
-#: ../cli/src/settings.c:5647 ../cli/src/settings.c:5687
+#: ../clients/cli/settings.c:6628 ../clients/cli/settings.c:6668
 msgid "the property can't be changed"
 msgstr "La propiedad no puede cambiarse"
 
-#: ../cli/src/settings.c:5791
+#: ../clients/cli/settings.c:6752
+#, fuzzy
+msgid "(not available)"
+msgstr "no disponible"
+
+#: ../clients/cli/settings.c:6777
 msgid "[NM property description]"
 msgstr "[Descripción de propiedad NM]"
 
-#: ../cli/src/settings.c:5797
+#: ../clients/cli/settings.c:6782
 msgid "[nmcli specific description]"
 msgstr "[Descripción de propiedad nmcli]"
 
-#: ../cli/src/utils.c:111
+#. ----------------------------------------------------------------------------
+#: ../clients/cli/settings.c:6831
+msgid "<hidden>"
+msgstr ""
+
+#: ../clients/cli/utils.c:127
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr "Error: se requiere valor para argumento '%s'."
 
-#: ../cli/src/utils.c:136
+#: ../clients/cli/utils.c:152
 #, c-format
 msgid "Error: Argument '%s' was expected, but '%s' provided."
 msgstr "Error: Se esperaba argumento '%s', pero proporcionó '%s'."
 
-#: ../cli/src/utils.c:139
+#: ../clients/cli/utils.c:155
 #, c-format
 msgid "Error: Unexpected argument '%s'"
 msgstr "Error: Argumento inesperado '%s'"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/utils.c:189
+#: ../clients/cli/utils.c:205
 #, c-format
 msgid "Error converting IP4 address '0x%X' to text form"
 msgstr "Error al convertir dirección IP4 '0x%X' a forma de texto"
 
 # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../cli/src/utils.c:217
+#: ../clients/cli/utils.c:233
 #, c-format
 msgid "Error converting IP6 address '%s' to text form"
 msgstr "Error al convertir dirección IP6 '%s' a forma de texto"
 
-#: ../cli/src/utils.c:393
+#. Translators: the first %s is the partial value entered by
+#. * the user, the second %s a list of compatible values.
+#.
+#: ../clients/cli/utils.c:413 ../clients/cli/utils.c:444
+#, fuzzy, c-format
+msgid "'%s' is ambiguous (%s)"
+msgstr "'%s' es ambiguo (%s x %s)"
+
+#: ../clients/cli/utils.c:423
 #, c-format
 msgid "'%s' is not valid; use [%s] or [%s]"
 msgstr "'%s' no es válido; use [%s] or [%s]"
 
-#: ../cli/src/utils.c:475
+#: ../clients/cli/utils.c:456
+#, fuzzy, c-format
+msgid "'%s' is not valid; use [%s], [%s] or [%s]"
+msgstr "'%s' no es válido; use [%s] or [%s]"
+
+#: ../clients/cli/utils.c:555
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
 msgstr "'%s' es ambiguo (%s x %s)"
 
-#: ../cli/src/utils.c:487
+#: ../clients/cli/utils.c:567
 #, c-format
 msgid "missing name, try one of [%s]"
 msgstr "Falta el nombre, intente uno de [%s]"
 
-#: ../cli/src/utils.c:718
+#: ../clients/cli/utils.c:808
 #, c-format
 msgid "field '%s' has to be alone"
 msgstr "el campo «%s» tiene que estar solo"
 
-#: ../cli/src/utils.c:720
+#: ../clients/cli/utils.c:811
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s"
 msgstr "Campo inválido '%s'; campos permitidos: %s"
 
-#: ../cli/src/utils.c:747
+#: ../clients/cli/utils.c:868
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "Opción «--terse» requiere especificar «--fields»"
 
-#: ../cli/src/utils.c:751
+#: ../clients/cli/utils.c:872
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "Opción «--terse» requiere valores de «--fields» específicos, no «%s»"
 
-#: ../cli/src/utils.c:1070
+#: ../clients/cli/utils.c:1190
 #, c-format
 msgid ""
 "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
@@ -4813,7 +5748,7 @@ msgstr ""
 "Advertencia: las versiones de nmcli (%s) y de NetworkManager (%s) no "
 "coinciden. Use «--nocheck» para evitar el aviso.\n"
 
-#: ../cli/src/utils.c:1079
+#: ../clients/cli/utils.c:1199
 #, c-format
 msgid ""
 "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
@@ -4823,705 +5758,2418 @@ msgstr ""
 "Fuerce la ejecución usando «--nocheck», pero los resultados son "
 "impredecibles."
 
-#: ../libnm-util/crypto.c:133
+#: ../clients/common/nm-polkit-listener.c:215
+msgid "An authentication session is already underway."
+msgstr ""
+
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. * is not visible here since we only care about phase2 authentication
+#. * (and don't even care of which one)
+#.
+#: ../clients/common/nm-secret-agent-simple.c:226
+#: ../clients/common/nm-secret-agent-simple.c:331
+#: ../clients/tui/nmt-page-dsl.c:69 ../clients/tui/nmt-page-wifi.c:335
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: ../clients/common/nm-secret-agent-simple.c:233
+#: ../clients/common/nm-secret-agent-simple.c:276
+#: ../clients/common/nm-secret-agent-simple.c:306
+#: ../clients/common/nm-secret-agent-simple.c:345
+#: ../clients/common/nm-secret-agent-simple.c:509
+#: ../clients/common/nm-secret-agent-simple.c:524
+#: ../clients/common/nm-secret-agent-simple.c:542
+#: ../clients/common/nm-vpn-helpers.c:234
+#: ../clients/common/nm-vpn-helpers.c:235
+#: ../clients/common/nm-vpn-helpers.c:238 ../clients/tui/nmt-page-dsl.c:78
+#: ../clients/tui/nmt-page-wifi.c:280 ../clients/tui/nmt-page-wifi.c:311
+#: ../clients/tui/nmt-page-wifi.c:344
+msgid "Password"
+msgstr "Contraseña"
+
+#: ../clients/common/nm-secret-agent-simple.c:244
+msgid "Identity"
+msgstr "Identidad"
+
+#: ../clients/common/nm-secret-agent-simple.c:251
+msgid "Private key password"
+msgstr "Contraseña de llave privada"
+
+#: ../clients/common/nm-secret-agent-simple.c:292
+#: ../clients/tui/nmt-page-wifi.c:292
+msgid "Key"
+msgstr "Llave"
+
+#: ../clients/common/nm-secret-agent-simple.c:338
+#: ../clients/tui/nmt-page-dsl.c:81
+msgid "Service"
+msgstr "Servicio"
+
+#: ../clients/common/nm-secret-agent-simple.c:465
+msgid "Authentication required by wireless network"
+msgstr "Autenticación requerida por red inalámbrica"
+
+#: ../clients/common/nm-secret-agent-simple.c:466
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the wireless network "
+"'%s'."
+msgstr ""
+"Se requieren llaves de contraseñas o cifradas para acceder a la red "
+"inalámbrica '%s'."
+
+#: ../clients/common/nm-secret-agent-simple.c:474
+msgid "Wired 802.1X authentication"
+msgstr "Autenticación de Cableado 802.1X"
+
+#: ../clients/common/nm-secret-agent-simple.c:477
+msgid "Network name"
+msgstr "Nombre de red"
+
+#: ../clients/common/nm-secret-agent-simple.c:486
+msgid "DSL authentication"
+msgstr "Autenticación DSL"
+
+#: ../clients/common/nm-secret-agent-simple.c:494
+msgid "PIN code required"
+msgstr "Se requiere código PIN"
+
+#: ../clients/common/nm-secret-agent-simple.c:495
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "Se requiere código PIN para el dispositivo de ancho de banda móvil"
+
+#: ../clients/common/nm-secret-agent-simple.c:497
+msgid "PIN"
+msgstr "PIN"
+
+#: ../clients/common/nm-secret-agent-simple.c:505
+#: ../clients/common/nm-secret-agent-simple.c:520
+#: ../clients/common/nm-secret-agent-simple.c:538
+msgid "Mobile broadband network password"
+msgstr "Contraseña de red de ancho de banda móvil "
+
+#: ../clients/common/nm-secret-agent-simple.c:506
+#: ../clients/common/nm-secret-agent-simple.c:521
+#: ../clients/common/nm-secret-agent-simple.c:539
+#: ../clients/common/nm-secret-agent-simple.c:559
+#, c-format
+msgid "A password is required to connect to '%s'."
+msgstr "Se requiere una contraseña para conectarse a '%s'."
+
+#: ../clients/common/nm-secret-agent-simple.c:554
+#, fuzzy
+msgid "VPN password required"
+msgstr "Se requiere código PIN"
+
+#: ../clients/common/nm-vpn-helpers.c:236
+#: ../clients/common/nm-vpn-helpers.c:239
+#, fuzzy
+msgid "Group password"
+msgstr "Mostrar contraseña"
+
+#: ../clients/common/nm-vpn-helpers.c:241 ../clients/tui/nmt-page-ip4.c:146
+#: ../clients/tui/nmt-page-ip6.c:146
+msgid "Gateway"
+msgstr "Puerta de enlace"
+
+#: ../clients/common/nm-vpn-helpers.c:242
+msgid "Cookie"
+msgstr ""
+
+#: ../clients/common/nm-vpn-helpers.c:243
+msgid "Gateway certificate hash"
+msgstr ""
+
+#: ../clients/nm-online.c:96
+msgid "Connecting"
+msgstr "Conectando"
+
+#: ../clients/nm-online.c:149
+msgid ""
+"Time to wait for a connection, in seconds (without the option, default value "
+"is 30)"
+msgstr ""
+"Tiempo para esperar una conexión, en segundos (Sin la opción, el valor "
+"predeterminado es 30.)"
+
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
+#: ../clients/nm-online.c:150
+#, fuzzy
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr "Salir inmediatamente si NetworkManager no está ejecutándose "
+
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
+#: ../clients/nm-online.c:151
+msgid "Don't print anything"
+msgstr "No imprimir nada"
+
+#: ../clients/nm-online.c:152
+#, fuzzy
+msgid "Wait for NetworkManager startup instead of a connection"
+msgstr ""
+"Espera a que NetworkManager termine de activar las conexiones de red de "
+"inicio."
+
+#: ../clients/nm-online.c:173
+msgid ""
+"Waits for NetworkManager to finish activating startup network connections."
+msgstr ""
+"Espera a que NetworkManager termine de activar las conexiones de red de "
+"inicio."
+
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
+#: ../clients/nm-online.c:180 ../clients/nm-online.c:186
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr ""
+"Opción inválida. Por favor use --help para ver una lista de las opciones "
+"válidas."
+
+#: ../clients/tui/newt/nmt-newt-utils.c:180 ../clients/tui/nmt-editor.c:417
+#: ../clients/tui/nmt-password-dialog.c:176
+#: ../clients/tui/nmt-route-editor.c:125 ../clients/tui/nmtui-hostname.c:71
+#: ../clients/tui/nmtui.c:117
+msgid "OK"
+msgstr "Aceptar"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:328
+#: ../clients/tui/newt/nmt-newt-utils.c:360
+#, c-format
+msgid "Could not create temporary file: %s"
+msgstr "No se pudo crear archivo temporal: %s"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:368
+#, c-format
+msgid "Editor failed: %s"
+msgstr "Falló el editor: %s"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:376
+#, fuzzy, c-format
+msgid "Editor failed with status %d"
+msgstr "Falló el editor: %s"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:378
+#, fuzzy, c-format
+msgid "Editor failed with signal %d"
+msgstr "Falló el editor: %s"
+
+#: ../clients/tui/newt/nmt-newt-utils.c:382
+#, c-format
+msgid "Could not re-read file: %s"
+msgstr "No se pudo leer archivo: %s"
+
+#: ../clients/tui/nm-editor-utils.c:151
+#, c-format
+msgid "Ethernet connection %d"
+msgstr "Conexión Ethernet %d"
+
+#: ../clients/tui/nm-editor-utils.c:159
+#, c-format
+msgid "Wi-Fi connection %d"
+msgstr "Conexión Wi-Fi %d"
+
+#: ../clients/tui/nm-editor-utils.c:168
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "Conexión InfiniBand %d"
+
+#: ../clients/tui/nm-editor-utils.c:173 ../libnm-glib/nm-device.c:1799
+#: ../libnm/nm-device.c:1644
+msgid "Mobile Broadband"
+msgstr "Banda ancha móvil"
+
+#: ../clients/tui/nm-editor-utils.c:176
+#, c-format
+msgid "Mobile broadband connection %d"
+msgstr "Conexión de banda ancha móvil %d"
+
+#: ../clients/tui/nm-editor-utils.c:182 ../clients/tui/nmt-page-dsl.c:65
+msgid "DSL"
+msgstr "DSL"
+
+#: ../clients/tui/nm-editor-utils.c:186
+#, c-format
+msgid "DSL connection %d"
+msgstr "Conexión DSL %d"
+
+# auto translated by TM merge from project: virt-manager, version: 0.9.0, DocId: virt-manager
+#: ../clients/tui/nm-editor-utils.c:191 ../libnm-core/nm-connection.c:1606
+#: ../libnm-glib/nm-device.c:1803 ../libnm-util/nm-connection.c:1595
+#: ../libnm/nm-device.c:1648 ../src/settings/plugins/ifcfg-rh/reader.c:4059
+msgid "Bond"
+msgstr "Vinculación"
+
+#: ../clients/tui/nm-editor-utils.c:195
+#, c-format
+msgid "Bond connection %d"
+msgstr "Conexión de vínculo %d"
+
+# auto translated by TM merge from project: RHN Satellite UI, version: 5.5, DocId: java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource
+#: ../clients/tui/nm-editor-utils.c:200 ../libnm-core/nm-connection.c:1610
+#: ../libnm-glib/nm-device.c:1807 ../libnm-util/nm-connection.c:1599
+#: ../libnm/nm-device.c:1652 ../src/settings/plugins/ifcfg-rh/reader.c:4350
+msgid "Bridge"
+msgstr "Puente"
+
+#: ../clients/tui/nm-editor-utils.c:205
+#, c-format
+msgid "Bridge connection %d"
+msgstr "Conexión en puente %d"
+
+#: ../clients/tui/nm-editor-utils.c:209 ../libnm-core/nm-connection.c:1608
+#: ../libnm-glib/nm-device.c:1805 ../libnm-util/nm-connection.c:1597
+#: ../libnm/nm-device.c:1650 ../src/settings/plugins/ifcfg-rh/reader.c:4165
+msgid "Team"
+msgstr "Equipo "
+
+#: ../clients/tui/nm-editor-utils.c:214
+#, c-format
+msgid "Team connection %d"
+msgstr "Conexión de equipo %d"
+
+#: ../clients/tui/nm-editor-utils.c:222
+#, c-format
+msgid "VLAN connection %d"
+msgstr "Conexión VLAN %d"
+
+#: ../clients/tui/nm-editor-utils.c:237
+#, c-format
+msgid "VPN connection %d"
+msgstr "Conexión VPN %d"
+
+#: ../clients/tui/nmt-device-entry.c:371
+msgid "Select..."
+msgstr "Seleccionar..."
+
+#: ../clients/tui/nmt-edit-connection-list.c:112
+msgid "Add"
+msgstr "Añadir"
+
+#: ../clients/tui/nmt-edit-connection-list.c:115
+#: ../clients/tui/nmt-page-ip4.c:172 ../clients/tui/nmt-page-ip6.c:170
+#: ../clients/tui/nmt-page-team-port.c:112 ../clients/tui/nmt-page-team.c:176
+msgid "Edit..."
+msgstr "Editar..."
+
+#: ../clients/tui/nmt-edit-connection-list.c:118
+#: ../clients/tui/nmtui-edit.c:527
+msgid "Delete"
+msgstr "Borrar"
+
+#: ../clients/tui/nmt-editor-section.c:105
+msgid "Hide"
+msgstr "Ocultar"
+
+#: ../clients/tui/nmt-editor-section.c:105
+msgid "Show"
+msgstr "Mostrar"
+
+#: ../clients/tui/nmt-editor.c:99
+#, c-format
+msgid "Could not create editor for connection '%s' of type '%s'."
+msgstr "No se pudo crear editor para conexión '%s' del tipo '%s'"
+
+#: ../clients/tui/nmt-editor.c:103
+#, c-format
+msgid "Could not create editor for invalid connection '%s'."
+msgstr "No se pudo crear editor para conexión no válida '%s'."
+
+#: ../clients/tui/nmt-editor.c:113
+#, fuzzy
+msgid "Edit Connection"
+msgstr "Editar conexión"
+
+#: ../clients/tui/nmt-editor.c:166
+#, c-format
+msgid "Unable to save connection: %s"
+msgstr "No se pudo guardar conexión: %s"
+
+#: ../clients/tui/nmt-editor.c:180
+#, c-format
+msgid "Unable to add new connection: %s"
+msgstr "No se pudo adicionar nueva conexión: %s"
+
+#: ../clients/tui/nmt-editor.c:322
+msgid "Profile name"
+msgstr "Nombre de perfil"
+
+# auto translated by TM merge from project: virt-manager, version: 0.9.0, DocId: virt-manager
+#: ../clients/tui/nmt-editor.c:333
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../clients/tui/nmt-editor.c:335
+msgid "Device"
+msgstr "Dispositivo"
+
+#. And finally the bottom widgets
+#: ../clients/tui/nmt-editor.c:393
+msgid "Automatically connect"
+msgstr "Conectar de forma automática"
+
+#: ../clients/tui/nmt-editor.c:399
+msgid "Available to all users"
+msgstr "Disponible para todos los usuarios"
+
+#: ../clients/tui/nmt-editor.c:414 ../clients/tui/nmt-password-dialog.c:173
+#: ../clients/tui/nmt-route-editor.c:118 ../clients/tui/nmtui-edit.c:218
+#: ../clients/tui/nmtui-edit.c:526 ../clients/tui/nmtui-hostname.c:69
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../clients/tui/nmt-mtu-entry.c:86
+msgid "(default)"
+msgstr "(predeterminado)"
+
+#: ../clients/tui/nmt-mtu-entry.c:88 ../clients/tui/nmt-mtu-entry.c:119
+msgid "bytes"
+msgstr "bytes"
+
+#: ../clients/tui/nmt-page-bond.c:87
+msgid "Round-robin"
+msgstr "Round-robin"
+
+#: ../clients/tui/nmt-page-bond.c:88
+msgid "Active Backup"
+msgstr "Respaldo activo"
+
+#: ../clients/tui/nmt-page-bond.c:89
+msgid "XOR"
+msgstr "XOR"
+
+#: ../clients/tui/nmt-page-bond.c:90
+msgid "Broadcast"
+msgstr "Difusión"
+
+#: ../clients/tui/nmt-page-bond.c:91
+msgid "802.3ad"
+msgstr "802.3ad"
+
+#: ../clients/tui/nmt-page-bond.c:92
+msgid "Adaptive Transmit Load Balancing (tlb)"
+msgstr "Balanceo de carga de transmisión adaptable (tlb)"
+
+#: ../clients/tui/nmt-page-bond.c:93
+msgid "Adaptive Load Balancing (alb)"
+msgstr "Balanceo de carga adaptable (alb)"
+
+#: ../clients/tui/nmt-page-bond.c:99
+msgid "MII (recommended)"
+msgstr "MII (recomendable)"
+
+#: ../clients/tui/nmt-page-bond.c:100
+msgid "ARP"
+msgstr "ARP"
+
+#: ../clients/tui/nmt-page-bond.c:358 ../clients/tui/nmt-page-bridge.c:81
+#: ../clients/tui/nmt-page-team.c:155
+msgid "Slaves"
+msgstr "Esclavos"
+
+#: ../clients/tui/nmt-page-bond.c:370 ../clients/tui/nmt-page-wifi.c:233
+msgid "Mode"
+msgstr "Modo"
+
+#: ../clients/tui/nmt-page-bond.c:376
+msgid "Primary"
+msgstr "Primario"
+
+#: ../clients/tui/nmt-page-bond.c:382
+msgid "Link monitoring"
+msgstr "Enlace de monitorización"
+
+#: ../clients/tui/nmt-page-bond.c:388 ../clients/tui/nmt-page-bond.c:395
+#: ../clients/tui/nmt-page-bond.c:402 ../clients/tui/nmt-page-bond.c:409
+msgctxt "milliseconds"
+msgid "ms"
+msgstr "ms"
+
+#: ../clients/tui/nmt-page-bond.c:389 ../clients/tui/nmt-page-bond.c:410
+msgid "Monitoring frequency"
+msgstr "Frecuencia de monitorización"
+
+#: ../clients/tui/nmt-page-bond.c:396
+msgid "Link up delay"
+msgstr "Retraso de 'link up'"
+
+#: ../clients/tui/nmt-page-bond.c:403
+msgid "Link down delay"
+msgstr "Retraso de 'Link down'"
+
+#: ../clients/tui/nmt-page-bond.c:416
+msgid "ARP targets"
+msgstr "Destinos ARP"
+
+#: ../clients/tui/nmt-page-bridge-port.c:63
+msgid "BRIDGE PORT"
+msgstr "PUERTO DE PUENTE"
+
+#: ../clients/tui/nmt-page-bridge-port.c:70
+#: ../clients/tui/nmt-page-bridge.c:107
+msgid "Priority"
+msgstr "Prioridad"
+
+#: ../clients/tui/nmt-page-bridge-port.c:76
+msgid "Path cost"
+msgstr "Costo de ruta"
+
+#: ../clients/tui/nmt-page-bridge-port.c:78
+msgid "Hairpin mode"
+msgstr "Modo de Hairpin"
+
+#: ../clients/tui/nmt-page-bridge.c:91 ../clients/tui/nmt-page-bridge.c:116
+#: ../clients/tui/nmt-page-bridge.c:126 ../clients/tui/nmt-page-bridge.c:136
+msgid "seconds"
+msgstr "segundos"
+
+#: ../clients/tui/nmt-page-bridge.c:92
+msgid "Aging time"
+msgstr "Tiempo de caducidad"
+
+#: ../clients/tui/nmt-page-bridge.c:94
+msgid "Enable STP (Spanning Tree Protocol)"
+msgstr "Habilitar STP (Protocolo de árbol "
+
+#: ../clients/tui/nmt-page-bridge.c:117
+msgid "Forward delay"
+msgstr "Demora de envío"
+
+#: ../clients/tui/nmt-page-bridge.c:127
+msgid "Hello time"
+msgstr "Hello time"
+
+#: ../clients/tui/nmt-page-bridge.c:137
+msgid "Max age"
+msgstr "Edad máx"
+
+#: ../clients/tui/nmt-page-ethernet.c:73
+msgid "ETHERNET"
+msgstr "ETHERNET"
+
+#: ../clients/tui/nmt-page-ethernet.c:80 ../clients/tui/nmt-page-vlan.c:125
+#: ../clients/tui/nmt-page-wifi.c:367
+msgid "Cloned MAC address"
+msgstr "Dirección MAC clonada"
+
+#: ../clients/tui/nmt-page-infiniband.c:50
+msgid "Datagram"
+msgstr "Datagram"
+
+#: ../clients/tui/nmt-page-infiniband.c:51
+msgid "Connected"
+msgstr "Conectado"
+
+#: ../clients/tui/nmt-page-infiniband.c:84
+msgid "INFINIBAND"
+msgstr "INFINIBAND"
+
+#: ../clients/tui/nmt-page-infiniband.c:91
+msgid "Transport mode"
+msgstr "Modo de transporte"
+
+#: ../clients/tui/nmt-page-ip4.c:41
+msgid "Disabled"
+msgstr "Desactivado"
+
+#: ../clients/tui/nmt-page-ip4.c:42 ../clients/tui/nmt-page-ip6.c:42
+msgid "Automatic"
+msgstr "Automático"
+
+#: ../clients/tui/nmt-page-ip4.c:43 ../clients/tui/nmt-page-ip6.c:44
+msgid "Link-Local"
+msgstr "Enlace local"
+
+#: ../clients/tui/nmt-page-ip4.c:44 ../clients/tui/nmt-page-ip6.c:45
+msgid "Manual"
+msgstr "Manual"
+
+#: ../clients/tui/nmt-page-ip4.c:45
+msgid "Shared"
+msgstr "Compartido"
+
+#: ../clients/tui/nmt-page-ip4.c:85 ../clients/tui/nmt-page-ip6.c:85
+msgid "(No custom routes)"
+msgstr "(No hay rutas personalizadas)"
+
+#: ../clients/tui/nmt-page-ip4.c:88 ../clients/tui/nmt-page-ip6.c:88
+#, c-format
+msgid "One custom route"
+msgid_plural "%d custom routes"
+msgstr[0] "Una ruta personal"
+msgstr[1] "Rutas personalizadas %d"
+
+#: ../clients/tui/nmt-page-ip4.c:131
+msgid "IPv4 CONFIGURATION"
+msgstr "CONFIGURACIÓN IPv4"
+
+#: ../clients/tui/nmt-page-ip4.c:139 ../clients/tui/nmt-page-ip6.c:139
+msgid "Addresses"
+msgstr "Direcciones"
+
+#: ../clients/tui/nmt-page-ip4.c:153 ../clients/tui/nmt-page-ip6.c:153
+msgid "DNS servers"
+msgstr "Servidores DNS"
+
+#: ../clients/tui/nmt-page-ip4.c:159 ../clients/tui/nmt-page-ip6.c:159
+msgid "Search domains"
+msgstr "Búsqueda de dominios"
+
+#: ../clients/tui/nmt-page-ip4.c:174 ../clients/tui/nmt-page-ip6.c:172
+msgid "Routing"
+msgstr "Enrutando "
+
+#: ../clients/tui/nmt-page-ip4.c:176 ../clients/tui/nmt-page-ip6.c:174
+msgid "Never use this network for default route"
+msgstr "Nunca us"
+
+#: ../clients/tui/nmt-page-ip4.c:182 ../clients/tui/nmt-page-ip6.c:180
+msgid "Ignore automatically obtained routes"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ip4.c:190
+msgid "Require IPv4 addressing for this connection"
+msgstr "Requiere dirección IPv4 para esta conexión "
+
+#: ../clients/tui/nmt-page-ip6.c:41
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../clients/tui/nmt-page-ip6.c:43
+msgid "Automatic (DHCP-only)"
+msgstr "Automático (DHCP-"
+
+#: ../clients/tui/nmt-page-ip6.c:131
+msgid "IPv6 CONFIGURATION"
+msgstr "CONFIGURACIÓN IPv6"
+
+#: ../clients/tui/nmt-page-ip6.c:188
+msgid "Require IPv6 addressing for this connection"
+msgstr "Requiere dirigirse a IPv6 para esta conexión"
+
+#: ../clients/tui/nmt-page-ppp.c:134
+#, fuzzy
+msgid "PPP CONFIGURATION"
+msgstr "CONFIGURACIÓN IPv4"
+
+#: ../clients/tui/nmt-page-ppp.c:143
+#, fuzzy
+msgid "Allowed authentication methods:"
+msgstr "Autenticación"
+
+#: ../clients/tui/nmt-page-ppp.c:150
+#, fuzzy
+msgid "EAP"
+msgstr "SALTO"
+
+#: ../clients/tui/nmt-page-ppp.c:158
+#, fuzzy
+msgid "PAP"
+msgstr "AP"
+
+#: ../clients/tui/nmt-page-ppp.c:166
+msgid "CHAP"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ppp.c:174
+msgid "MSCHAPv2"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ppp.c:182
+msgid "MSCHAP"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ppp.c:198
+msgid "Use point-to-point encryption (MPPE)"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ppp.c:210
+msgid "Require 128-bit encryption"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ppp.c:220
+msgid "Use stateful MPPE"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ppp.c:232
+msgid "Allow BSD data compression"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ppp.c:240
+msgid "Allow Deflate data compression"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ppp.c:248
+msgid "Use TCP header compression"
+msgstr ""
+
+#: ../clients/tui/nmt-page-ppp.c:258
+msgid "Send PPP echo packets"
+msgstr ""
+
+#: ../clients/tui/nmt-page-team-port.c:95
+msgid "TEAM PORT"
+msgstr "PUERTO DE EQUIPO"
+
+#: ../clients/tui/nmt-page-team-port.c:102 ../clients/tui/nmt-page-team.c:166
+msgid "JSON configuration"
+msgstr "Configuración JSON"
+
+#: ../clients/tui/nmt-page-vlan.c:102
+msgid "Parent"
+msgstr "Padre"
+
+#: ../clients/tui/nmt-page-vlan.c:117
+msgid "VLAN id"
+msgstr "ID de VLAN"
+
+#: ../clients/tui/nmt-page-wifi.c:67
+msgctxt "Wi-Fi"
+msgid "Client"
+msgstr "Cliente"
+
+#: ../clients/tui/nmt-page-wifi.c:68
+msgid "Access Point"
+msgstr "Punto de acceso"
+
+#: ../clients/tui/nmt-page-wifi.c:69
+msgid "Ad-Hoc Network"
+msgstr "Red Ad-Hoc"
+
+#: ../clients/tui/nmt-page-wifi.c:74
+msgctxt "Wi-Fi"
+msgid "Automatic"
+msgstr "Automático"
+
+#. 802.11a Wi-Fi network
+#: ../clients/tui/nmt-page-wifi.c:76
+msgid "A (5 GHz)"
+msgstr "Un (5 GHz)"
+
+#. 802.11b / 802.11g Wi-Fi network
+#: ../clients/tui/nmt-page-wifi.c:78
+msgid "B/G (2.4 GHz)"
+msgstr "B/G (2.4 GHz)"
+
+#: ../clients/tui/nmt-page-wifi.c:83
+msgctxt "Wi-Fi security"
+msgid "None"
+msgstr "Ninguno"
+
+#: ../clients/tui/nmt-page-wifi.c:84
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 Personal"
+
+#: ../clients/tui/nmt-page-wifi.c:85
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA & WPA2 Empresarial"
+
+#: ../clients/tui/nmt-page-wifi.c:86
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr "Llave de WEP 40/128-bit (Hex o ASCII)"
+
+#: ../clients/tui/nmt-page-wifi.c:87
+msgid "WEP 128-bit Passphrase"
+msgstr "Frase de paso de WEP 128-bit"
+
+#: ../clients/tui/nmt-page-wifi.c:88
+msgid "Dynamic WEP (802.1x)"
+msgstr "WEP Dinámica (802.1x)"
+
+#: ../clients/tui/nmt-page-wifi.c:89
+msgid "LEAP"
+msgstr "SALTO"
+
+#: ../clients/tui/nmt-page-wifi.c:94
+msgctxt "WEP key index"
+msgid "1 (Default)"
+msgstr "1 (Predeterminado)"
+
+#: ../clients/tui/nmt-page-wifi.c:95
+msgctxt "WEP key index"
+msgid "2"
+msgstr "2"
+
+#: ../clients/tui/nmt-page-wifi.c:96
+msgctxt "WEP key index"
+msgid "3"
+msgstr "3"
+
+#: ../clients/tui/nmt-page-wifi.c:97
+msgctxt "WEP key index"
+msgid "4"
+msgstr "4"
+
+#: ../clients/tui/nmt-page-wifi.c:102
+msgid "Open System"
+msgstr "Sistema abierto"
+
+#: ../clients/tui/nmt-page-wifi.c:103
+msgid "Shared Key"
+msgstr "Clave compartida"
+
+#: ../clients/tui/nmt-page-wifi.c:217
+msgid "WI-FI"
+msgstr "WI-FI"
+
+#: ../clients/tui/nmt-page-wifi.c:259
+msgid "Channel"
+msgstr "Canal"
+
+#: ../clients/tui/nmt-page-wifi.c:264
+msgid "Security"
+msgstr "Seguridad"
+
+#. "wpa-enterprise"
+#. FIXME
+#: ../clients/tui/nmt-page-wifi.c:285
+msgid "(No support for wpa-enterprise yet...)"
+msgstr "(No hay soporte aún para wpa-enterprise...)"
+
+#: ../clients/tui/nmt-page-wifi.c:295 ../clients/tui/nmt-page-wifi.c:314
+msgid "WEP index"
+msgstr "Índice WEP"
+
+#: ../clients/tui/nmt-page-wifi.c:303 ../clients/tui/nmt-page-wifi.c:322
+msgid "Authentication"
+msgstr "Autenticación"
+
+#. "dynamic-wep"
+#. FIXME
+#: ../clients/tui/nmt-page-wifi.c:328
+msgid "(No support for dynamic-wep yet...)"
+msgstr "(No hay soporte aún para dynamic-wep...)"
+
+#: ../clients/tui/nmt-password-fields.c:130
+msgid "Ask for this password every time"
+msgstr "Preguntar cada vez esta contraseña "
+
+#: ../clients/tui/nmt-password-fields.c:131
+msgid "Show password"
+msgstr "Mostrar contraseña"
+
+#: ../clients/tui/nmt-route-table.c:192
+msgid "Destination"
+msgstr "Destino"
+
+#: ../clients/tui/nmt-route-table.c:192
+msgid "Prefix"
+msgstr "Prefijo"
+
+#: ../clients/tui/nmt-route-table.c:201
+msgid "Next Hop"
+msgstr "Próximo salto"
+
+#: ../clients/tui/nmt-route-table.c:209
+msgid "Metric"
+msgstr "Métrica"
+
+#: ../clients/tui/nmt-route-table.c:229
+msgid "No custom routes are defined."
+msgstr "No hay rutas personalizadas definidas."
+
+#: ../clients/tui/nmt-slave-list.c:137
+msgid "Select the type of slave connection you wish to add."
+msgstr "Seleccionar el tipo de conexión esclava que desee añadir."
+
+#: ../clients/tui/nmt-widget-list.c:141
+msgid "Add..."
+msgstr "Añadir..."
+
+#: ../clients/tui/nmt-widget-list.c:204
+msgid "Remove"
+msgstr "Retirar"
+
+#: ../clients/tui/nmtui-connect.c:58
+msgid ""
+"openconnect will be run to authenticate.\n"
+"It will return to nmtui when completed."
+msgstr ""
+
+#: ../clients/tui/nmtui-connect.c:72
+#, fuzzy, c-format
+msgid "Error: openconnect failed: %s"
+msgstr "Error: Falló el borrado de conexión: %s"
+
+#: ../clients/tui/nmtui-connect.c:79
+#, c-format
+msgid "openconnect failed with status %d"
+msgstr ""
+
+#: ../clients/tui/nmtui-connect.c:83
+#, c-format
+msgid "openconnect failed with signal %d"
+msgstr ""
+
+#: ../clients/tui/nmtui-connect.c:182
+msgid "Activation failed"
+msgstr "Activación falló"
+
+#: ../clients/tui/nmtui-connect.c:237
+msgid "Connecting..."
+msgstr "Conectándose..."
+
+#: ../clients/tui/nmtui-connect.c:272 ../clients/tui/nmtui-connect.c:303
+#, c-format
+msgid "Could not activate connection: %s"
+msgstr "No se pudo activar conexión: %s"
+
+#: ../clients/tui/nmtui-connect.c:363 ../clients/tui/nmtui-connect.c:412
+msgid "Activate"
+msgstr "Activar"
+
+#: ../clients/tui/nmtui-connect.c:365
+msgid "Deactivate"
+msgstr "Desactivar"
+
+#: ../clients/tui/nmtui-connect.c:417 ../clients/tui/nmtui-edit.c:121
+#: ../clients/tui/nmtui.c:111
+msgid "Quit"
+msgstr "Salir"
+
+#: ../clients/tui/nmtui-connect.c:440
+#, c-format
+msgid "No such connection '%s'"
+msgstr "No hay tal conexión '%s'"
+
+#: ../clients/tui/nmtui-connect.c:442
+msgid "Connection is already active"
+msgstr "La conexión ya está activa"
+
+#: ../clients/tui/nmtui-edit.c:226
+msgid "Create"
+msgstr "Crear"
+
+#: ../clients/tui/nmtui-edit.c:368
+msgid "Select the type of connection you wish to create."
+msgstr "Seleccionar el tipo de conexión que desea crear."
+
+#: ../clients/tui/nmtui-edit.c:376
+msgid ""
+"If you are creating a VPN, and the VPN connection you wish to create does "
+"not appear in the list, you may not have the correct VPN plugin installed."
+msgstr ""
+"Si está creando un VPN y la conexión VPN que usted desea crear no aparece en "
+"la lista, puede ser que usted no tenga el correcto complemento VPN instalado."
+
+#: ../clients/tui/nmtui-edit.c:412 ../clients/tui/nmtui-edit.c:428
+msgid "New Connection"
+msgstr "Nueva conexión"
+
+#: ../clients/tui/nmtui-edit.c:467
+#, c-format
+msgid "Unable to delete connection: %s"
+msgstr "No se pudo borrar conexión: %s"
+
+#: ../clients/tui/nmtui-edit.c:506
+#, fuzzy, c-format
+msgid "Could not delete connection '%s': %s"
+msgstr "No se pudo borrar conexión: %s"
+
+#: ../clients/tui/nmtui-edit.c:528
+#, c-format
+msgid "Are you sure you want to delete the connection '%s'?"
+msgstr "¿Está seguro de que desea eliminar la conexión '%s'?"
+
+#: ../clients/tui/nmtui-hostname.c:47
+msgid "Set Hostname"
+msgstr "Establecer nombre de host"
+
+#: ../clients/tui/nmtui-hostname.c:55
+msgid "Hostname"
+msgstr "Nombre de host"
+
+#. Translators: this indicates the result. ie, "I have set the hostname to ..."
+#: ../clients/tui/nmtui-hostname.c:118
+#, c-format
+msgid "Set hostname to '%s'"
+msgstr "Establecer nombre de host '%s'"
+
+#: ../clients/tui/nmtui-hostname.c:120
+#, c-format
+msgid "Unable to set hostname: %s"
+msgstr "No se pudo borrar el nombre de host: %s"
+
+#: ../clients/tui/nmtui.c:56 ../clients/tui/nmtui.c:59
+msgid "connection"
+msgstr "Conexión"
+
+#: ../clients/tui/nmtui.c:57
+msgid "Edit a connection"
+msgstr "Modificar una conexión"
+
+#: ../clients/tui/nmtui.c:60
+msgid "Activate a connection"
+msgstr "Activar una conexión"
+
+#: ../clients/tui/nmtui.c:62
+msgid "new hostname"
+msgstr "Nuevo nombre de host"
+
+#: ../clients/tui/nmtui.c:63
+msgid "Set system hostname"
+msgstr "Establecer nombre de host de sistema"
+
+#: ../clients/tui/nmtui.c:86
+msgid "NetworkManager TUI"
+msgstr "NetworkManager TUI"
+
+#: ../clients/tui/nmtui.c:94
+msgid "Please select an option"
+msgstr "Por favor seleccione una opción"
+
+#: ../clients/tui/nmtui.c:146
+msgid "Usage"
+msgstr "Uso "
+
+#: ../clients/tui/nmtui.c:227
+msgid "Could not parse arguments"
+msgstr "No se pudieron leer los argumentos"
+
+#: ../clients/tui/nmtui.c:237
+#, fuzzy, c-format
+msgid "Could not contact NetworkManager: %s.\n"
+msgstr "No se pudo activar conexión: %s"
+
+#: ../clients/tui/nmtui.c:242
+msgid "NetworkManager is not running."
+msgstr "NetworkManager no está funcionando."
+
+#: ../libnm-core/crypto.c:120 ../libnm-util/crypto.c:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "El archivo de clave PEM no tiene la etiqueta de finalización «%s»."
 
-#: ../libnm-util/crypto.c:146
+#: ../libnm-core/crypto.c:133 ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "No parece ser un archivo de clave privada PEM."
 
-#: ../libnm-util/crypto.c:163
+#: ../libnm-core/crypto.c:150 ../libnm-util/crypto.c:163
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "Archivo PEM mal formado: la primera etiqueta no era Proc-Type."
 
-#: ../libnm-util/crypto.c:171
+#: ../libnm-core/crypto.c:158 ../libnm-util/crypto.c:171
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "Archivo PEM mal formado: etiqueta Proc-Type «%s» desconocida."
 
-#: ../libnm-util/crypto.c:181
+#: ../libnm-core/crypto.c:168 ../libnm-util/crypto.c:181
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "Archivo PEM mal formado: la segunda etiqueta no era DEK-Info."
 
-#: ../libnm-util/crypto.c:192
+#: ../libnm-core/crypto.c:179 ../libnm-util/crypto.c:192
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
 msgstr "Archivo PEM mal formado: no se encontró IV en la etiqueta DEK-Info."
 
-#: ../libnm-util/crypto.c:199
+#: ../libnm-core/crypto.c:186 ../libnm-util/crypto.c:199
 #, c-format
 msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 msgstr ""
 "Archivo PEM mal formado: formato de IV no válido en la etiqueta DEK-Info."
 
-#: ../libnm-util/crypto.c:212
+#: ../libnm-core/crypto.c:201 ../libnm-util/crypto.c:214
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "Archivo PEM malformado: cifrador de clave privada «%s» desconocido."
 
-#: ../libnm-util/crypto.c:231
+#: ../libnm-core/crypto.c:220 ../libnm-util/crypto.c:233
 #, c-format
 msgid "Could not decode private key."
 msgstr "No se pudo decodificar la clave privada."
 
-#: ../libnm-util/crypto.c:283
+#: ../libnm-core/crypto.c:274 ../libnm-util/crypto.c:285
 msgid "Failed to find expected PKCS#8 start tag."
 msgstr "Falló al buscar la etiqueta de inicio de PKCS#8."
 
-#: ../libnm-util/crypto.c:291
+#: ../libnm-core/crypto.c:282 ../libnm-util/crypto.c:293
 #, c-format
 msgid "Failed to find expected PKCS#8 end tag '%s'."
 msgstr "Falló al buscar la etiqueta de final «%s» de PKCS#8."
 
-#: ../libnm-util/crypto.c:310
+#: ../libnm-core/crypto.c:301 ../libnm-util/crypto.c:312
 msgid "Failed to decode PKCS#8 private key."
 msgstr "Falló al descifrar la clave privada PKCS#8."
 
-#: ../libnm-util/crypto.c:352
+#: ../libnm-core/crypto.c:343 ../libnm-util/crypto.c:354
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV debe ser un número par de bytes de longitud."
 
-#: ../libnm-util/crypto.c:366
+#: ../libnm-core/crypto.c:357 ../libnm-util/crypto.c:368
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV contiene dígitos no hexadecimales."
 
-#: ../libnm-util/crypto.c:404 ../libnm-util/crypto_gnutls.c:147
-#: ../libnm-util/crypto_gnutls.c:259 ../libnm-util/crypto_nss.c:167
-#: ../libnm-util/crypto_nss.c:326
+#: ../libnm-core/crypto.c:397 ../libnm-core/crypto_gnutls.c:93
+#: ../libnm-core/crypto_gnutls.c:214 ../libnm-core/crypto_nss.c:115
+#: ../libnm-core/crypto_nss.c:280 ../libnm-util/crypto.c:408
+#: ../libnm-util/crypto_gnutls.c:146 ../libnm-util/crypto_gnutls.c:263
+#: ../libnm-util/crypto_nss.c:165 ../libnm-util/crypto_nss.c:326
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "Se desconocía el cifrador de clave privada «%s»."
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-core/crypto.c:496 ../libnm-util/crypto.c:518
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "No se pudo determinar el tipo de clave privada."
 
-#: ../libnm-util/crypto.c:566
+#: ../libnm-core/crypto.c:504
+#, c-format
+msgid "Password provided, but key was not encrypted."
+msgstr ""
+
+#: ../libnm-core/crypto.c:557 ../libnm-util/crypto.c:573
 #, c-format
 msgid "PEM certificate had no start tag '%s'."
 msgstr "El certificado PEM no tiene etiqueta de inicio «%s»."
 
-#: ../libnm-util/crypto.c:575
+#: ../libnm-core/crypto.c:566 ../libnm-util/crypto.c:582
 #, c-format
 msgid "PEM certificate had no end tag '%s'."
 msgstr "El certificado PEM no tiene etiqueta de finalización «%s»."
 
-#: ../libnm-util/crypto.c:593
+#: ../libnm-core/crypto.c:584 ../libnm-util/crypto.c:600
 #, c-format
 msgid "Failed to decode certificate."
 msgstr "No se pudo decodificar el certificado."
 
-#: ../libnm-util/crypto_gnutls.c:50
+#: ../libnm-core/crypto_gnutls.c:51 ../libnm-util/crypto_gnutls.c:51
 msgid "Failed to initialize the crypto engine."
 msgstr "Falló al inicializar el motor de descifrado."
 
-#: ../libnm-util/crypto_gnutls.c:92
-#, c-format
-msgid "Failed to initialize the MD5 engine: %s / %s."
-msgstr "Falló al inicializar el motor MD5: %s / %s."
-
-#: ../libnm-util/crypto_gnutls.c:155
+#: ../libnm-core/crypto_gnutls.c:101 ../libnm-util/crypto_gnutls.c:154
 #, c-format
 msgid "Invalid IV length (must be at least %zd)."
 msgstr "Longitud IV no válida (debe ser al menos de %zd)."
 
-#: ../libnm-util/crypto_gnutls.c:166
+#: ../libnm-core/crypto_gnutls.c:112 ../libnm-util/crypto_gnutls.c:165
 #, c-format
 msgid "Failed to initialize the decryption cipher context: %s / %s."
 msgstr "Falló al inicializar el contexto de descifrado: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:175
+#: ../libnm-core/crypto_gnutls.c:121 ../libnm-util/crypto_gnutls.c:174
 #, c-format
 msgid "Failed to set symmetric key for decryption: %s / %s."
 msgstr "Falló al establecer la clave simétrica para el descifrado: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:184
+#: ../libnm-core/crypto_gnutls.c:130 ../libnm-util/crypto_gnutls.c:183
 #, c-format
 msgid "Failed to set IV for decryption: %s / %s."
 msgstr "Falló al establecer IV para el descifrado: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:193
+#: ../libnm-core/crypto_gnutls.c:139 ../libnm-util/crypto_gnutls.c:192
 #, c-format
 msgid "Failed to decrypt the private key: %s / %s."
 msgstr "Falló al descifrar la clave privada: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:203 ../libnm-util/crypto_nss.c:257
+#: ../libnm-core/crypto_gnutls.c:149 ../libnm-core/crypto_nss.c:205
+#: ../libnm-util/crypto_gnutls.c:202 ../libnm-util/crypto_nss.c:255
 #, c-format
 msgid "Failed to decrypt the private key: unexpected padding length."
 msgstr "Falló al descifrar la clave privada: longitud inesperada del relleno."
 
-#: ../libnm-util/crypto_gnutls.c:214 ../libnm-util/crypto_nss.c:268
+#: ../libnm-core/crypto_gnutls.c:160 ../libnm-core/crypto_nss.c:216
+#: ../libnm-util/crypto_gnutls.c:213 ../libnm-util/crypto_nss.c:266
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "Falló al descifrar la clave privada."
 
-#: ../libnm-util/crypto_gnutls.c:281
+#: ../libnm-core/crypto_gnutls.c:236 ../libnm-util/crypto_gnutls.c:285
 #, c-format
 msgid "Failed to initialize the encryption cipher context: %s / %s."
 msgstr "Falló al inicializar el contexto de cifrador: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:290
+#: ../libnm-core/crypto_gnutls.c:245 ../libnm-util/crypto_gnutls.c:294
 #, c-format
 msgid "Failed to set symmetric key for encryption: %s / %s."
 msgstr "Falló al establecer la clave simétrica para el cifrado: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:300
+#: ../libnm-core/crypto_gnutls.c:255 ../libnm-util/crypto_gnutls.c:304
 #, c-format
 msgid "Failed to set IV for encryption: %s / %s."
 msgstr "Falló al establecer IV para el cifrado: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:309
+#: ../libnm-core/crypto_gnutls.c:264 ../libnm-util/crypto_gnutls.c:313
 #, c-format
 msgid "Failed to encrypt the data: %s / %s."
 msgstr "Falló al cifrar los datos: %s / %s."
 
-#: ../libnm-util/crypto_gnutls.c:349
+#: ../libnm-core/crypto_gnutls.c:307 ../libnm-util/crypto_gnutls.c:353
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "Error al inicializar los datos del certificado: %s"
 
-#: ../libnm-util/crypto_gnutls.c:371
+#: ../libnm-core/crypto_gnutls.c:329 ../libnm-util/crypto_gnutls.c:375
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "No se pudo decodificar el certificado: %s"
 
-#: ../libnm-util/crypto_gnutls.c:395
+#: ../libnm-core/crypto_gnutls.c:357 ../libnm-util/crypto_gnutls.c:399
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
 msgstr "No se pudo inicializar el decodificador PKCS#12: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-core/crypto_gnutls.c:370 ../libnm-util/crypto_gnutls.c:412
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %s"
 msgstr "No se pudo decodificar el archivo PKCS#12: %s"
 
-#: ../libnm-util/crypto_gnutls.c:420
+#: ../libnm-core/crypto_gnutls.c:382 ../libnm-util/crypto_gnutls.c:424
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "No se pudo verificar el archivo PKCS#12: %s"
 
-#: ../libnm-util/crypto_gnutls.c:448
+#: ../libnm-core/crypto_gnutls.c:414 ../libnm-util/crypto_gnutls.c:452
 #, c-format
 msgid "Couldn't initialize PKCS#8 decoder: %s"
 msgstr "No se pudo inicializar el decodificador PKCS#8: %s"
 
-#: ../libnm-util/crypto_gnutls.c:471
+#: ../libnm-core/crypto_gnutls.c:437 ../libnm-util/crypto_gnutls.c:475
 #, c-format
 msgid "Couldn't decode PKCS#8 file: %s"
 msgstr "No se pudo decodificar el archivo PKCS#8: %s"
 
-#: ../libnm-util/crypto_nss.c:56
+#: ../libnm-core/crypto_nss.c:57 ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "Falló al inicializar el motor de cifrado: %d."
 
-#: ../libnm-util/crypto_nss.c:107
-#, c-format
-msgid "Failed to initialize the MD5 context: %d."
-msgstr "Falló al inicializar el contexto MD5: %d"
-
-#: ../libnm-util/crypto_nss.c:175
+#: ../libnm-core/crypto_nss.c:123 ../libnm-util/crypto_nss.c:173
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
 msgstr "Longitud IV no válida (debe ser al menos de %d)."
 
-#: ../libnm-util/crypto_nss.c:186
+#: ../libnm-core/crypto_nss.c:134 ../libnm-util/crypto_nss.c:184
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "Falló al inicializar la ranura de descifrado."
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-core/crypto_nss.c:144 ../libnm-util/crypto_nss.c:194
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "Falló al establecer la clave simétrica para el descifrado."
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-core/crypto_nss.c:154 ../libnm-util/crypto_nss.c:204
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "Falló al establecer IV para el descifrado."
 
-#: ../libnm-util/crypto_nss.c:214
+#: ../libnm-core/crypto_nss.c:162 ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "Falló al inicializar el contexto de descifrado."
 
-#: ../libnm-util/crypto_nss.c:227
+#: ../libnm-core/crypto_nss.c:175 ../libnm-util/crypto_nss.c:225
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "Falló al descifrar la clave privada: %d."
 
-#: ../libnm-util/crypto_nss.c:235
+#: ../libnm-core/crypto_nss.c:183 ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: decrypted data too large."
 msgstr ""
 "Falló al descifrar la clave privada: los datos descifrados son demasiado "
 "grandes."
 
-#: ../libnm-util/crypto_nss.c:246
+#: ../libnm-core/crypto_nss.c:194 ../libnm-util/crypto_nss.c:244
 #, c-format
 msgid "Failed to finalize decryption of the private key: %d."
 msgstr "Falló la finalización del descifrado de la clave privada: %d."
 
-#: ../libnm-util/crypto_nss.c:348
+#: ../libnm-core/crypto_nss.c:302 ../libnm-util/crypto_nss.c:348
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "Falló al inicializar la ranura de cifrado."
 
-#: ../libnm-util/crypto_nss.c:356
+#: ../libnm-core/crypto_nss.c:310 ../libnm-util/crypto_nss.c:356
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "Falló al establecer la clave simétrica para el cifrado."
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-core/crypto_nss.c:318 ../libnm-util/crypto_nss.c:364
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "Falló al establecer IV para el cifrado."
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-core/crypto_nss.c:326 ../libnm-util/crypto_nss.c:372
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "Falló al inicializar el contexto de cifrado."
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-core/crypto_nss.c:334 ../libnm-util/crypto_nss.c:380
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "Falló al cifrar: %d."
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-core/crypto_nss.c:342 ../libnm-util/crypto_nss.c:388
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "Cantidad inesperada de datos después del encriptado."
 
-#: ../libnm-util/crypto_nss.c:431
+#: ../libnm-core/crypto_nss.c:385 ../libnm-util/crypto_nss.c:428
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "No se pudo decodificar el certificado: %d"
 
-#: ../libnm-util/crypto_nss.c:466
+#: ../libnm-core/crypto_nss.c:423
 #, c-format
-msgid "Couldn't convert password to UCS2: %d"
-msgstr "No se pudo convertir la contraseña a UCS2: %d"
+msgid "Password must be UTF-8"
+msgstr ""
 
-#: ../libnm-util/crypto_nss.c:494
+#: ../libnm-core/crypto_nss.c:453 ../libnm-util/crypto_nss.c:491
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %d"
 msgstr "No se pudo inicializar el decodificador PKCS#12: %d"
 
-#: ../libnm-util/crypto_nss.c:503
+#: ../libnm-core/crypto_nss.c:462 ../libnm-util/crypto_nss.c:500
 #, c-format
 msgid "Couldn't decode PKCS#12 file: %d"
 msgstr "No se pudo decodificar el archivo PKCS#12: %d"
 
-#: ../libnm-util/crypto_nss.c:512
+#: ../libnm-core/crypto_nss.c:471 ../libnm-util/crypto_nss.c:509
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "No se pudo verificar el archivo PKCS#12: %d"
 
-#: ../libnm-util/crypto_nss.c:556
+#: ../libnm-core/crypto_nss.c:522 ../libnm-util/crypto_nss.c:553
 msgid "Could not generate random data."
 msgstr "No se pudo generar datos aleatorios."
 
-#: ../libnm-util/nm-setting-8021x.c:2170 ../libnm-util/nm-setting-8021x.c:2187
-#: ../libnm-util/nm-setting-8021x.c:2228 ../libnm-util/nm-setting-8021x.c:2245
-#: ../libnm-util/nm-setting-8021x.c:2297 ../libnm-util/nm-setting-8021x.c:2309
-#: ../libnm-util/nm-setting-8021x.c:2327 ../libnm-util/nm-setting-8021x.c:2339
-#: ../libnm-util/nm-setting-8021x.c:2363 ../libnm-util/nm-setting-8021x.c:2539
-#: ../libnm-util/nm-setting-adsl.c:212
-#: ../libnm-util/nm-setting-bluetooth.c:144
-#: ../libnm-util/nm-setting-bluetooth.c:162
-#: ../libnm-util/nm-setting-bond.c:498 ../libnm-util/nm-setting-bridge.c:268
-#: ../libnm-util/nm-setting-cdma.c:163
-#: ../libnm-util/nm-setting-connection.c:692
-#: ../libnm-util/nm-setting-connection.c:708
-#: ../libnm-util/nm-setting-connection.c:763
-#: ../libnm-util/nm-setting-ip4-config.c:705
-#: ../libnm-util/nm-setting-ip4-config.c:715
-#: ../libnm-util/nm-setting-ip6-config.c:687
-#: ../libnm-util/nm-setting-ip6-config.c:697
-#: ../libnm-util/nm-setting-ip6-config.c:750
-#: ../libnm-util/nm-setting-olpc-mesh.c:127
-#: ../libnm-util/nm-setting-pppoe.c:165 ../libnm-util/nm-setting-team.c:131
-#: ../libnm-util/nm-setting-vpn.c:405 ../libnm-util/nm-setting-wimax.c:137
-#: ../libnm-util/nm-setting-wireless-security.c:795
-#: ../libnm-util/nm-setting-wireless.c:697
+#: ../libnm-core/nm-connection.c:226
+msgid "wrong type; should be a list of strings."
+msgstr ""
+
+#: ../libnm-core/nm-connection.c:281
+#, fuzzy
+msgid "unknown setting name"
+msgstr "Error: parámetro desconocido '%s'\n"
+
+#: ../libnm-core/nm-connection.c:805
+msgid "setting not found"
+msgstr ""
+
+#: ../libnm-core/nm-connection.c:869
+#, fuzzy
+msgid "setting not allowed in slave connection"
+msgstr "El parámetro '%s' no está presente en la conexión.\n"
+
+#: ../libnm-core/nm-connection.c:880
+msgid "setting is required for non-slave connections"
+msgstr ""
+
+#: ../libnm-core/nm-connection.c:946
+#, fuzzy
+msgid "Unexpected failure to verify the connection"
+msgstr "No se pudo borrar conexión: %s"
+
+#: ../libnm-core/nm-connection.c:979
+#, fuzzy
+msgid "Unexpected failure to normalize the connection"
+msgstr "No se pudo borrar conexión: %s"
+
+#: ../libnm-core/nm-connection.c:1480 ../libnm-core/nm-setting-8021x.c:2375
+#: ../libnm-core/nm-setting-8021x.c:2392 ../libnm-core/nm-setting-8021x.c:2423
+#: ../libnm-core/nm-setting-8021x.c:2440 ../libnm-core/nm-setting-8021x.c:2482
+#: ../libnm-core/nm-setting-8021x.c:2494 ../libnm-core/nm-setting-8021x.c:2512
+#: ../libnm-core/nm-setting-8021x.c:2524 ../libnm-core/nm-setting-8021x.c:2548
+#: ../libnm-core/nm-setting-8021x.c:2713 ../libnm-core/nm-setting-adsl.c:190
+#: ../libnm-core/nm-setting-bluetooth.c:121
+#: ../libnm-core/nm-setting-bluetooth.c:139 ../libnm-core/nm-setting-cdma.c:142
+#: ../libnm-core/nm-setting-connection.c:809
+#: ../libnm-core/nm-setting-connection.c:848
+#: ../libnm-core/nm-setting-connection.c:961
+#: ../libnm-core/nm-setting-ip-config.c:1844
+#: ../libnm-core/nm-setting-olpc-mesh.c:112
+#: ../libnm-core/nm-setting-pppoe.c:143 ../libnm-core/nm-setting-vpn.c:400
+#: ../libnm-core/nm-setting-wimax.c:117
+#: ../libnm-core/nm-setting-wireless-security.c:862
+#: ../libnm-core/nm-setting-wireless.c:693 ../libnm-util/nm-setting.c:1372
+#: ../libnm-util/nm-setting.c:1391 ../libnm-util/nm-setting.c:1409
+#: ../libnm-util/nm-setting-8021x.c:2326 ../libnm-util/nm-setting-8021x.c:2343
+#: ../libnm-util/nm-setting-8021x.c:2384 ../libnm-util/nm-setting-8021x.c:2401
+#: ../libnm-util/nm-setting-8021x.c:2453 ../libnm-util/nm-setting-8021x.c:2465
+#: ../libnm-util/nm-setting-8021x.c:2483 ../libnm-util/nm-setting-8021x.c:2495
+#: ../libnm-util/nm-setting-8021x.c:2519 ../libnm-util/nm-setting-8021x.c:2681
+#: ../libnm-util/nm-setting-adsl.c:210 ../libnm-util/nm-setting-bluetooth.c:143
+#: ../libnm-util/nm-setting-bluetooth.c:161 ../libnm-util/nm-setting-cdma.c:163
+#: ../libnm-util/nm-setting-connection.c:769
+#: ../libnm-util/nm-setting-connection.c:785
+#: ../libnm-util/nm-setting-connection.c:846
+#: ../libnm-util/nm-setting-ip4-config.c:852
+#: ../libnm-util/nm-setting-ip6-config.c:835
+#: ../libnm-util/nm-setting-ip6-config.c:898
+#: ../libnm-util/nm-setting-olpc-mesh.c:124
+#: ../libnm-util/nm-setting-pppoe.c:164 ../libnm-util/nm-setting-vpn.c:424
+#: ../libnm-util/nm-setting-wimax.c:139
+#: ../libnm-util/nm-setting-wireless-security.c:892
+#: ../libnm-util/nm-setting-wireless.c:752
 msgid "property is missing"
 msgstr "Falta propiedad"
 
-#: ../libnm-util/nm-setting-8021x.c:2177 ../libnm-util/nm-setting-8021x.c:2194
-#: ../libnm-util/nm-setting-8021x.c:2235 ../libnm-util/nm-setting-8021x.c:2252
-#: ../libnm-util/nm-setting-8021x.c:2303 ../libnm-util/nm-setting-8021x.c:2315
-#: ../libnm-util/nm-setting-8021x.c:2333 ../libnm-util/nm-setting-8021x.c:2345
-#: ../libnm-util/nm-setting-8021x.c:2369 ../libnm-util/nm-setting-adsl.c:219
-#: ../libnm-util/nm-setting-adsl.c:228 ../libnm-util/nm-setting-cdma.c:179
-#: ../libnm-util/nm-setting-cdma.c:188
-#: ../libnm-util/nm-setting-connection.c:699
-#: ../libnm-util/nm-setting-connection.c:770
-#: ../libnm-util/nm-setting-gsm.c:284 ../libnm-util/nm-setting-gsm.c:341
-#: ../libnm-util/nm-setting-gsm.c:350
-#: ../libnm-util/nm-setting-ip4-config.c:766
-#: ../libnm-util/nm-setting-ip4-config.c:775
-#: ../libnm-util/nm-setting-pppoe.c:172 ../libnm-util/nm-setting-pppoe.c:181
-#: ../libnm-util/nm-setting-vpn.c:414 ../libnm-util/nm-setting-vpn.c:424
-#: ../libnm-util/nm-setting-wimax.c:146
-#: ../libnm-util/nm-setting-wireless-security.c:825
-#: ../libnm-util/nm-setting-wireless-security.c:833
-#: ../libnm-util/nm-setting-wireless-security.c:857
+#: ../libnm-core/nm-keyfile-reader.c:141
+msgid "ignoring missing number"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:150
+#, fuzzy, c-format
+msgid "ignoring invalid number '%s'"
+msgstr "Métrica inválida '%s'"
+
+#: ../libnm-core/nm-keyfile-reader.c:170
+#, fuzzy, c-format
+msgid "ignoring invalid %s address: %s"
+msgstr "Formato de dirección IPv4 inválido '%s'"
+
+#: ../libnm-core/nm-keyfile-reader.c:210
+#, fuzzy, c-format
+msgid "ignoring invalid gateway '%s' for %s route"
+msgstr "Puerta de enlace inválida '%s'"
+
+#: ../libnm-core/nm-keyfile-reader.c:230
+#, fuzzy, c-format
+msgid "ignoring invalid %s route: %s"
+msgstr "Ruta IPv4 inválida '%s'"
+
+#: ../libnm-core/nm-keyfile-reader.c:348
+#, c-format
+msgid "unexpected character '%c' for address %s: '%s' (position %td)"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:358
+#, c-format
+msgid "unexpected character '%c' for %s: '%s' (position %td)"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:367
+#, c-format
+msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:378
+#, c-format
+msgid "garbage at the end of value %s: '%s'"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:384
+#, c-format
+msgid "deprecated semicolon at the end of value %s: '%s'"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:399
+#, c-format
+msgid "invalid prefix length for %s '%s', defaulting to %d"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:406
+#, c-format
+msgid "missing prefix length for %s '%s', defaulting to %d"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:509
+#, fuzzy, c-format
+msgid "ignoring invalid DNS server IPv4 address '%s'"
+msgstr "Formato de dirección IPv4 inválido '%s'"
+
+#: ../libnm-core/nm-keyfile-reader.c:548
+#, fuzzy, c-format
+msgid "ignoring invalid DNS server IPv6 address '%s'"
+msgstr "Dirección IPv4 inválida '%s'"
+
+#: ../libnm-core/nm-keyfile-reader.c:611 ../libnm-core/nm-keyfile-reader.c:752
+#: ../libnm-core/nm-keyfile-reader.c:1423
+#, c-format
+msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:625
+#, fuzzy
+msgid "ignoring invalid MAC address"
+msgstr "No es una dirección MAC válida"
+
+#: ../libnm-core/nm-keyfile-reader.c:741
+#, fuzzy
+msgid "ignoring invalid binary property"
+msgstr "Error: propiedad inválida: %s\n"
+
+#: ../libnm-core/nm-keyfile-reader.c:784
+msgid "ignoring invalid SSID"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:800
+msgid "ignoring invalid raw password"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:875 ../libnm-core/nm-keyfile-reader.c:1041
+#, c-format
+msgid "certificate or key file '%s' does not exist"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:880
+#, fuzzy, c-format
+msgid "invalid key/cert value path \"%s\""
+msgstr "invalido '%s' o su valor '%s'"
+
+#: ../libnm-core/nm-keyfile-reader.c:918
+msgid "invalid key/cert value data:;base64, is not base64"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:931
+msgid "invalid key/cert value data:;base64,file://"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:1078
+msgid "invalid key/cert value is not a valid blob"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:1083
+#, fuzzy
+msgid "invalid key/cert value"
+msgstr "invalido '%s' o su valor '%s'"
+
+#: ../libnm-core/nm-keyfile-reader.c:1130
+#, fuzzy, c-format
+msgid "invalid parity value '%s'"
+msgstr "invalido '%s' o su valor '%s'"
+
+#: ../libnm-core/nm-keyfile-reader.c:1324
+#, fuzzy, c-format
+msgid "error loading setting value: %s"
+msgstr "Error: nombre de parámetro inválido; %s\n"
+
+#: ../libnm-core/nm-keyfile-reader.c:1356
+#, fuzzy, c-format
+msgid "invalid negative value (%i)"
+msgstr "Puerta de enlace inválida '%s'"
+
+#: ../libnm-core/nm-keyfile-reader.c:1377
+#, fuzzy, c-format
+msgid "invalid char value (%i)"
+msgstr "invalido '%s' o su valor '%s'"
+
+#: ../libnm-core/nm-keyfile-reader.c:1400
+#, fuzzy, c-format
+msgid "invalid int64 value (%s)"
+msgstr "invalido '%s' o su valor '%s'"
+
+#: ../libnm-core/nm-keyfile-reader.c:1459
+#, c-format
+msgid "too large FLAGS property '%s' (%llu)"
+msgstr ""
+
+#: ../libnm-core/nm-keyfile-reader.c:1472
+#, fuzzy, c-format
+msgid "unhandled setting property type '%s'"
+msgstr "Error: inválido <setting>.<property> '%s'."
+
+#: ../libnm-core/nm-keyfile-reader.c:1503
+#, fuzzy, c-format
+msgid "invalid setting name '%s'"
+msgstr "Error: nombre de parámetro inválido; %s\n"
+
+#: ../libnm-core/nm-setting-8021x.c:412
+#, fuzzy
+msgid "data missing"
+msgstr "Falta propiedad "
+
+#: ../libnm-core/nm-setting-8021x.c:444
+msgid "binary data missing"
+msgstr ""
+
+#: ../libnm-core/nm-setting-8021x.c:461
+msgid "file:// URI not NUL terminated"
+msgstr ""
+
+#: ../libnm-core/nm-setting-8021x.c:470
+msgid "file:// URI is empty"
+msgstr ""
+
+#: ../libnm-core/nm-setting-8021x.c:478
+#, fuzzy
+msgid "file:// URI is not valid UTF-8"
+msgstr "index '%s' no es válido"
+
+#: ../libnm-core/nm-setting-8021x.c:677 ../libnm-util/nm-setting-8021x.c:640
+msgid "CA certificate must be in X.509 format"
+msgstr ""
+
+#: ../libnm-core/nm-setting-8021x.c:992 ../libnm-core/nm-setting-8021x.c:1256
+#: ../libnm-core/nm-setting-8021x.c:1576 ../libnm-util/nm-setting-8021x.c:958
+#: ../libnm-util/nm-setting-8021x.c:1221 ../libnm-util/nm-setting-8021x.c:1544
+#, fuzzy
+msgid "invalid certificate format"
+msgstr "Error al inicializar los datos del certificado: %s"
+
+#: ../libnm-core/nm-setting-8021x.c:1859 ../libnm-util/nm-setting-8021x.c:1813
+#, fuzzy
+msgid "invalid private key"
+msgstr "Puerta de enlace inválida '%s'"
+
+#: ../libnm-core/nm-setting-8021x.c:2171 ../libnm-util/nm-setting-8021x.c:2124
+#, fuzzy
+msgid "invalid phase2 private key"
+msgstr "Falló al descifrar la clave privada."
+
+#: ../libnm-core/nm-setting-8021x.c:2382 ../libnm-core/nm-setting-8021x.c:2399
+#: ../libnm-core/nm-setting-8021x.c:2430 ../libnm-core/nm-setting-8021x.c:2447
+#: ../libnm-core/nm-setting-8021x.c:2488 ../libnm-core/nm-setting-8021x.c:2500
+#: ../libnm-core/nm-setting-8021x.c:2518 ../libnm-core/nm-setting-8021x.c:2530
+#: ../libnm-core/nm-setting-8021x.c:2555 ../libnm-core/nm-setting-adsl.c:197
+#: ../libnm-core/nm-setting-cdma.c:149 ../libnm-core/nm-setting-cdma.c:158
+#: ../libnm-core/nm-setting-connection.c:816
+#: ../libnm-core/nm-setting-connection.c:859 ../libnm-core/nm-setting-gsm.c:226
+#: ../libnm-core/nm-setting-gsm.c:283 ../libnm-core/nm-setting-ip-config.c:1851
+#: ../libnm-core/nm-setting-ip4-config.c:178
+#: ../libnm-core/nm-setting-pppoe.c:150 ../libnm-core/nm-setting-pppoe.c:159
+#: ../libnm-core/nm-setting-vpn.c:409 ../libnm-core/nm-setting-vpn.c:419
+#: ../libnm-core/nm-setting-wimax.c:126
+#: ../libnm-core/nm-setting-wireless-security.c:892
+#: ../libnm-core/nm-setting-wireless-security.c:916
+#: ../libnm-util/nm-setting-8021x.c:2333 ../libnm-util/nm-setting-8021x.c:2350
+#: ../libnm-util/nm-setting-8021x.c:2391 ../libnm-util/nm-setting-8021x.c:2408
+#: ../libnm-util/nm-setting-8021x.c:2459 ../libnm-util/nm-setting-8021x.c:2471
+#: ../libnm-util/nm-setting-8021x.c:2489 ../libnm-util/nm-setting-8021x.c:2501
+#: ../libnm-util/nm-setting-8021x.c:2526 ../libnm-util/nm-setting-adsl.c:217
+#: ../libnm-util/nm-setting-cdma.c:170 ../libnm-util/nm-setting-cdma.c:179
+#: ../libnm-util/nm-setting-connection.c:776
+#: ../libnm-util/nm-setting-connection.c:853 ../libnm-util/nm-setting-gsm.c:283
+#: ../libnm-util/nm-setting-gsm.c:340 ../libnm-util/nm-setting-ip4-config.c:917
+#: ../libnm-util/nm-setting-ip4-config.c:926
+#: ../libnm-util/nm-setting-pppoe.c:171 ../libnm-util/nm-setting-pppoe.c:180
+#: ../libnm-util/nm-setting-vpn.c:433 ../libnm-util/nm-setting-vpn.c:443
+#: ../libnm-util/nm-setting-wimax.c:148
+#: ../libnm-util/nm-setting-wireless-security.c:922
+#: ../libnm-util/nm-setting-wireless-security.c:946
 msgid "property is empty"
 msgstr "propiedad está vacía"
 
-#: ../libnm-util/nm-setting-8021x.c:2205 ../libnm-util/nm-setting-8021x.c:2217
-#: ../libnm-util/nm-setting-8021x.c:2263 ../libnm-util/nm-setting-8021x.c:2275
+#: ../libnm-core/nm-setting-8021x.c:2412 ../libnm-core/nm-setting-8021x.c:2460
+#: ../libnm-util/nm-setting-8021x.c:2361 ../libnm-util/nm-setting-8021x.c:2373
+#: ../libnm-util/nm-setting-8021x.c:2419 ../libnm-util/nm-setting-8021x.c:2431
 #, c-format
 msgid "has to match '%s' property for PKCS#12"
 msgstr "Debe coincidir con propiedad '%s' para PKCS#12"
 
-#: ../libnm-util/nm-setting-8021x.c:2514 ../libnm-util/nm-setting-8021x.c:2548
-#: ../libnm-util/nm-setting-bluetooth.c:153
-#: ../libnm-util/nm-setting-bond.c:507
-#: ../libnm-util/nm-setting-infiniband.c:203
-#: ../libnm-util/nm-setting-infiniband.c:218
-#: ../libnm-util/nm-setting-ip4-config.c:757
-#: ../libnm-util/nm-setting-ip6-config.c:741
-#: ../libnm-util/nm-setting-olpc-mesh.c:155
-#: ../libnm-util/nm-setting-team.c:140 ../libnm-util/nm-setting-wimax.c:155
-#: ../libnm-util/nm-setting-wired.c:607 ../libnm-util/nm-setting-wired.c:616
-#: ../libnm-util/nm-setting-wireless-security.c:876
-#: ../libnm-util/nm-setting-wireless-security.c:885
-#: ../libnm-util/nm-setting-wireless-security.c:893
-#: ../libnm-util/nm-setting-wireless-security.c:901
-#: ../libnm-util/nm-setting-wireless-security.c:909
-#: ../libnm-util/nm-setting-wireless-security.c:918
-#: ../libnm-util/nm-setting-wireless-security.c:927
-#: ../libnm-util/nm-setting-wireless-security.c:936
-#: ../libnm-util/nm-setting-wireless-security.c:972
-#: ../libnm-util/nm-setting-wireless-security.c:982
-#: ../libnm-util/nm-setting-wireless.c:757
-#: ../libnm-util/nm-setting-wireless.c:766
-#: ../libnm-util/nm-setting-wireless.c:775
+#: ../libnm-core/nm-setting-8021x.c:2687
+#, fuzzy, c-format
+msgid "certificate is invalid: %s"
+msgstr "propiedad no es válida"
+
+#: ../libnm-core/nm-setting-8021x.c:2722
+#: ../libnm-core/nm-setting-bluetooth.c:130
+#: ../libnm-core/nm-setting-infiniband.c:193
+#: ../libnm-core/nm-setting-infiniband.c:208
+#: ../libnm-core/nm-setting-ip4-config.c:169
+#: ../libnm-core/nm-setting-ip6-config.c:165
+#: ../libnm-core/nm-setting-olpc-mesh.c:141
+#: ../libnm-core/nm-setting-wimax.c:135 ../libnm-core/nm-setting-wired.c:660
+#: ../libnm-core/nm-setting-wired.c:670
+#: ../libnm-core/nm-setting-wireless-security.c:935
+#: ../libnm-core/nm-setting-wireless-security.c:944
+#: ../libnm-core/nm-setting-wireless-security.c:953
+#: ../libnm-core/nm-setting-wireless-security.c:989
+#: ../libnm-core/nm-setting-wireless-security.c:999
+#: ../libnm-core/nm-setting-wireless.c:754
+#: ../libnm-core/nm-setting-wireless.c:763
+#: ../libnm-core/nm-setting-wireless.c:772 ../libnm-util/nm-setting.c:1382
+#: ../libnm-util/nm-setting.c:1400 ../libnm-util/nm-setting.c:1419
+#: ../libnm-util/nm-setting-8021x.c:2656 ../libnm-util/nm-setting-8021x.c:2690
+#: ../libnm-util/nm-setting-bluetooth.c:152
+#: ../libnm-util/nm-setting-infiniband.c:206
+#: ../libnm-util/nm-setting-infiniband.c:222
+#: ../libnm-util/nm-setting-ip4-config.c:908
+#: ../libnm-util/nm-setting-ip6-config.c:889
+#: ../libnm-util/nm-setting-olpc-mesh.c:152
+#: ../libnm-util/nm-setting-wimax.c:157 ../libnm-util/nm-setting-wired.c:659
+#: ../libnm-util/nm-setting-wired.c:668
+#: ../libnm-util/nm-setting-wireless-security.c:965
+#: ../libnm-util/nm-setting-wireless-security.c:974
+#: ../libnm-util/nm-setting-wireless-security.c:983
+#: ../libnm-util/nm-setting-wireless-security.c:1019
+#: ../libnm-util/nm-setting-wireless-security.c:1029
+#: ../libnm-util/nm-setting-wireless.c:812
+#: ../libnm-util/nm-setting-wireless.c:821
+#: ../libnm-util/nm-setting-wireless.c:830
 msgid "property is invalid"
 msgstr "propiedad no es válida"
 
-#: ../libnm-util/nm-setting-8021x.c:2573 ../libnm-util/nm-setting-8021x.c:2583
-#: ../libnm-util/nm-setting-8021x.c:2593 ../libnm-util/nm-setting-8021x.c:2603
-#: ../libnm-util/nm-setting-8021x.c:2613 ../libnm-util/nm-setting-adsl.c:239
-#: ../libnm-util/nm-setting-adsl.c:250
-#: ../libnm-util/nm-setting-bluetooth.c:170
-#: ../libnm-util/nm-setting-wireless-security.c:804
+#: ../libnm-core/nm-setting-8021x.c:2747 ../libnm-core/nm-setting-8021x.c:2757
+#: ../libnm-core/nm-setting-8021x.c:2767 ../libnm-core/nm-setting-8021x.c:2777
+#: ../libnm-core/nm-setting-8021x.c:2787 ../libnm-core/nm-setting-adsl.c:209
+#: ../libnm-core/nm-setting-adsl.c:221 ../libnm-core/nm-setting-bluetooth.c:147
+#: ../libnm-core/nm-setting-wireless-security.c:871
+#: ../libnm-util/nm-setting-8021x.c:2715 ../libnm-util/nm-setting-8021x.c:2725
+#: ../libnm-util/nm-setting-8021x.c:2735 ../libnm-util/nm-setting-8021x.c:2745
+#: ../libnm-util/nm-setting-8021x.c:2755 ../libnm-util/nm-setting-adsl.c:229
+#: ../libnm-util/nm-setting-adsl.c:241 ../libnm-util/nm-setting-bluetooth.c:169
+#: ../libnm-util/nm-setting-wireless-security.c:901
 #, c-format
 msgid "'%s' is not a valid value for the property"
 msgstr "'%s' no es un valor válido para propiedad"
 
-#: ../libnm-util/nm-setting-bluetooth.c:188
-#, c-format
-msgid "requires '%s' or '%s' setting"
+#: ../libnm-core/nm-setting-bluetooth.c:169
+#, fuzzy, c-format
+msgid "'%s' connection requires '%s' or '%s' setting"
 msgstr "requiere '%s' o el parámetro '%s'"
 
-#: ../libnm-util/nm-setting-bond.c:518
+#: ../libnm-core/nm-setting-bond.c:455 ../libnm-util/nm-setting-bond.c:503
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
 msgstr "Opción '%s' es inválida o su valor es '%s'"
 
-#: ../libnm-util/nm-setting-bond.c:537
+#: ../libnm-core/nm-setting-bond.c:474 ../libnm-util/nm-setting-bond.c:522
 #, c-format
 msgid "only one of '%s' and '%s' can be set"
 msgstr "únicamente uno de '%s' y '%s' pueden establecerse"
 
-#: ../libnm-util/nm-setting-bond.c:548
+#: ../libnm-core/nm-setting-bond.c:486 ../libnm-util/nm-setting-bond.c:533
 #, c-format
 msgid "mandatory option '%s' is missing"
 msgstr "Falta opción obligatorio '%s' "
 
-#: ../libnm-util/nm-setting-bond.c:557
+#: ../libnm-core/nm-setting-bond.c:496 ../libnm-util/nm-setting-bond.c:542
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
 msgstr "'%s' no es un valor váldo para '%s'"
 
-#: ../libnm-util/nm-setting-bond.c:570
+#: ../libnm-core/nm-setting-bond.c:510 ../libnm-util/nm-setting-bond.c:555
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
 msgstr "'%s=%s' es incompatible con '%s > 0'"
 
-#: ../libnm-util/nm-setting-bond.c:583
+#: ../libnm-core/nm-setting-bond.c:523 ../libnm-util/nm-setting-bond.c:568
 #, c-format
 msgid "'%s' is not a valid interface name for '%s' option"
 msgstr "'%s' no es un nombre de interfaz válido para la opción '%s'"
 
-#: ../libnm-util/nm-setting-bond.c:593
+#: ../libnm-core/nm-setting-bond.c:533 ../libnm-util/nm-setting-bond.c:578
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
 msgstr "opción '%s' es solamente válida para '%s=%s'"
 
-#: ../libnm-util/nm-setting-bond.c:606
+#: ../libnm-core/nm-setting-bond.c:546 ../libnm-util/nm-setting-bond.c:591
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
 msgstr "'%s=%s' no es una configuración válida para '%s'"
 
-#: ../libnm-util/nm-setting-bond.c:619 ../libnm-util/nm-setting-bond.c:628
-#: ../libnm-util/nm-setting-bond.c:648 ../libnm-util/nm-setting-bond.c:684
+#: ../libnm-core/nm-setting-bond.c:559 ../libnm-core/nm-setting-bond.c:568
+#: ../libnm-core/nm-setting-bond.c:588 ../libnm-core/nm-setting-bond.c:624
+#: ../libnm-util/nm-setting-bond.c:604 ../libnm-util/nm-setting-bond.c:613
+#: ../libnm-util/nm-setting-bond.c:633 ../libnm-util/nm-setting-bond.c:669
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
 msgstr "opción '%s' requiere que la opción '%s' sea establecida"
 
-#: ../libnm-util/nm-setting-bond.c:659
+#: ../libnm-core/nm-setting-bond.c:599 ../libnm-util/nm-setting-bond.c:644
 #, c-format
 msgid "'%s' option is empty"
 msgstr "opción '%s' está vacía"
 
-#: ../libnm-util/nm-setting-bond.c:671
+#: ../libnm-core/nm-setting-bond.c:611 ../libnm-util/nm-setting-bond.c:656
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "'%s' no es una diercción IPv4 válida para la opción '%s'"
 
+#: ../libnm-core/nm-setting-bond.c:638 ../libnm-util/nm-setting-bond.c:683
+#, fuzzy, c-format
+msgid "'%s' option is only valid with mode '%s'"
+msgstr "opción '%s' es solamente válida para '%s=%s'"
+
+#: ../libnm-core/nm-setting-bond.c:653
+#, fuzzy, c-format
+msgid "'%s' option should be string"
+msgstr "opción '%s' está vacía"
+
+#: ../libnm-core/nm-setting-bridge-port.c:125
+#: ../libnm-core/nm-setting-bridge-port.c:137
 #: ../libnm-util/nm-setting-bridge-port.c:155
 #: ../libnm-util/nm-setting-bridge-port.c:167
 #, c-format
 msgid "'%d' is not a valid value for the property (should be <= %d)"
 msgstr "'%d' no es un valor válido para la propiedad (debe ser <= %d)"
 
-#: ../libnm-util/nm-setting-bridge.c:251
+#: ../libnm-core/nm-setting-bridge-port.c:155
+#: ../libnm-core/nm-setting-team-port.c:98
+#, fuzzy, c-format
+msgid "missing setting"
+msgstr "Falta opción"
+
+#: ../libnm-core/nm-setting-bridge-port.c:166
+#: ../libnm-core/nm-setting-team-port.c:109
+#, c-format
+msgid ""
+"A connection with a '%s' setting must have the slave-type set to '%s'. "
+"Instead it is '%s'"
+msgstr ""
+
+#: ../libnm-core/nm-setting-bridge.c:210 ../libnm-util/nm-setting-bridge.c:270
 #, c-format
 msgid "value '%d' is out of range <%d-%d>"
 msgstr "El valor '%d' está fuera del rango <%d-%d>"
 
-#: ../libnm-util/nm-setting-connection.c:734
+#: ../libnm-core/nm-setting-bridge.c:227 ../libnm-core/nm-setting-wired.c:634
+#: ../libnm-core/nm-setting-wired.c:694 ../libnm-core/nm-setting-wired.c:722
+#: ../libnm-util/nm-setting-bridge.c:287 ../libnm-util/nm-setting-wired.c:634
+#: ../libnm-util/nm-setting-wired.c:692
+msgid "is not a valid MAC address"
+msgstr "No es una dirección MAC válida"
+
+#: ../libnm-core/nm-setting-connection.c:788
+#, fuzzy, c-format
+msgid "setting required for connection of type '%s'"
+msgstr "No se pudo crear editor para conexión '%s' del tipo '%s'"
+
+#: ../libnm-core/nm-setting-connection.c:869
+#, fuzzy, c-format
+msgid "connection type '%s' is not valid"
+msgstr "index '%s' no es válido"
+
+#: ../libnm-core/nm-setting-connection.c:904
+#: ../libnm-util/nm-setting-connection.c:878
+#, fuzzy, c-format
+msgid "Unknown slave type '%s'"
+msgstr "Nivel de registro desconocido «%s»"
+
+#: ../libnm-core/nm-setting-connection.c:914
+#: ../libnm-util/nm-setting-connection.c:888
+#, fuzzy, c-format
+msgid "Slave connections need a valid '%s' property"
+msgstr "'%s' conexiones requieren '%s' en esta propiedad"
+
+#: ../libnm-core/nm-setting-connection.c:935
+#: ../libnm-util/nm-setting-connection.c:898
 #, c-format
-msgid "'%s' doesn't match the virtual interface name '%s'"
-msgstr "'%s' no coincide con el nombre de interfaz virtual '%s'"
+msgid "Cannot set '%s' without '%s'"
+msgstr ""
+
+#: ../libnm-core/nm-setting-connection.c:949
+#, fuzzy, c-format
+msgid "metered value %d is not valid"
+msgstr "index '%s' no es válido"
 
-#: ../libnm-util/nm-setting-connection.c:780
+#: ../libnm-core/nm-setting-connection.c:970
 #, c-format
-msgid "requires presence of '%s' setting in the connection"
-msgstr "requiere presencia de parámetro '%s' en la conexión"
+msgid "property type should be set to '%s'"
+msgstr ""
 
-#: ../libnm-util/nm-setting-connection.c:802
-msgid "IPv4 configuration is not allowed for slave"
-msgstr "Configuración IPv4 no tiene permiso para esclavo"
+#: ../libnm-core/nm-setting-connection.c:985
+#, fuzzy, c-format
+msgid "slave-type '%s' requires a '%s' setting in the connection"
+msgstr "requiere presencia de parámetro '%s' en la conexión"
 
-#: ../libnm-util/nm-setting-connection.c:815
-msgid "IPv6 configuration is not allowed for slave"
-msgstr "Configuración IPv6 no tiene permiso para esclavo"
+#: ../libnm-core/nm-setting-connection.c:995
+#, c-format
+msgid ""
+"Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
+"set to '%s'"
+msgstr ""
 
-#: ../libnm-util/nm-setting-dcb.c:595
+#: ../libnm-core/nm-setting-dcb.c:523 ../libnm-util/nm-setting-dcb.c:595
 msgid "flags invalid"
 msgstr "Indicadores inválidos"
 
-#: ../libnm-util/nm-setting-dcb.c:604
+#: ../libnm-core/nm-setting-dcb.c:532 ../libnm-util/nm-setting-dcb.c:604
 msgid "flags invalid - disabled"
 msgstr "Indicadores inválidos - inhabilitado"
 
+#: ../libnm-core/nm-setting-dcb.c:558 ../libnm-core/nm-setting-dcb.c:607
 #: ../libnm-util/nm-setting-dcb.c:630 ../libnm-util/nm-setting-dcb.c:679
 msgid "property invalid (not enabled)"
 msgstr "propiedad inválida (no está habilitado)"
 
-#: ../libnm-util/nm-setting-dcb.c:639
+#: ../libnm-core/nm-setting-dcb.c:567 ../libnm-util/nm-setting-dcb.c:639
 msgid "element invalid"
 msgstr "elemento inválido"
 
-#: ../libnm-util/nm-setting-dcb.c:654
+#: ../libnm-core/nm-setting-dcb.c:582 ../libnm-util/nm-setting-dcb.c:654
 msgid "sum not 100%"
 msgstr "suma no es 100%"
 
+#: ../libnm-core/nm-setting-dcb.c:616 ../libnm-core/nm-setting-dcb.c:648
 #: ../libnm-util/nm-setting-dcb.c:688 ../libnm-util/nm-setting-dcb.c:720
 msgid "property invalid"
 msgstr "propiedad inválida"
 
-#: ../libnm-util/nm-setting-dcb.c:710
+#: ../libnm-core/nm-setting-dcb.c:638 ../libnm-util/nm-setting-dcb.c:710
 msgid "property missing"
 msgstr "Falta propiedad "
 
-#: ../libnm-util/nm-setting-gsm.c:297
+#: ../libnm-core/nm-setting-gsm.c:239 ../libnm-util/nm-setting-gsm.c:296
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
 msgstr "valor de propiedad '%s' está vacío o es demasiado largo (>64)"
 
-#: ../libnm-util/nm-setting-gsm.c:329
+#: ../libnm-core/nm-setting-gsm.c:271 ../libnm-util/nm-setting-gsm.c:328
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
 msgstr "'%s' contiene char(s) inválidos (use [A-Za-z._-])"
 
-#: ../libnm-util/nm-setting-gsm.c:364
+#: ../libnm-core/nm-setting-gsm.c:297 ../libnm-util/nm-setting-gsm.c:354
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "'%s' longitud es inválida (debe tener 5 o 6 dígitos)"
 
-#: ../libnm-util/nm-setting-infiniband.c:228
+#: ../libnm-core/nm-setting-infiniband.c:218
+#: ../libnm-util/nm-setting-infiniband.c:232
 msgid "not a valid interface name"
 msgstr "no es un nombre de interfaz válido"
 
-#: ../libnm-util/nm-setting-infiniband.c:236
+#: ../libnm-core/nm-setting-infiniband.c:226
+#: ../libnm-util/nm-setting-infiniband.c:240
 msgid "Must specify a P_Key if specifying parent"
 msgstr "Debe especificar un P_Key si el principal está especificado"
 
-#: ../libnm-util/nm-setting-infiniband.c:246
+#: ../libnm-core/nm-setting-infiniband.c:236
+#: ../libnm-util/nm-setting-infiniband.c:250
 msgid "InfiniBand P_Key connection did not specify parent interface name"
 msgstr ""
 "La conexión InfiniBand P_Key no especificó el nombre de la interfaz padre"
 
-#: ../libnm-util/nm-setting-ip4-config.c:726
-#: ../libnm-util/nm-setting-ip4-config.c:736
-#: ../libnm-util/nm-setting-ip4-config.c:746
-#: ../libnm-util/nm-setting-ip6-config.c:709
-#: ../libnm-util/nm-setting-ip6-config.c:719
-#: ../libnm-util/nm-setting-ip6-config.c:729
+#: ../libnm-core/nm-setting-infiniband.c:272
+#: ../libnm-util/nm-setting-infiniband.c:286
 #, c-format
-msgid "this property is not allowed for '%s=%s'"
-msgstr "esta propiedad no tiene permiso para '%s=%s'"
+msgid ""
+"interface name of software infiniband device must be '%s' or unset (instead "
+"it is '%s')"
+msgstr ""
 
-#: ../libnm-util/nm-setting-ip4-config.c:789
+#: ../libnm-core/nm-setting-infiniband.c:287
 #, c-format
-msgid "%d. IPv4 address is invalid"
+msgid "mtu for transport mode '%s' can be at most %d but it is %d"
+msgstr ""
+
+#: ../libnm-core/nm-setting-ip-config.c:77
+#, fuzzy, c-format
+msgid "Missing IPv4 address"
+msgstr "Formato de dirección IPv4 inválido '%s'"
+
+#: ../libnm-core/nm-setting-ip-config.c:77
+#, fuzzy, c-format
+msgid "Missing IPv6 address"
+msgstr "Dirección IPv4 inválida '%s'"
+
+#: ../libnm-core/nm-setting-ip-config.c:82
+#, fuzzy, c-format
+msgid "Invalid IPv4 address '%s'"
+msgstr "Formato de dirección IPv4 inválido '%s'"
+
+#: ../libnm-core/nm-setting-ip-config.c:82
+#, fuzzy, c-format
+msgid "Invalid IPv6 address '%s"
+msgstr "Dirección IPv4 inválida '%s'"
+
+#: ../libnm-core/nm-setting-ip-config.c:96
+#, fuzzy, c-format
+msgid "Invalid IPv4 address prefix '%u'"
+msgstr "Formato de dirección IPv4 inválido '%s'"
+
+#: ../libnm-core/nm-setting-ip-config.c:96
+#, fuzzy, c-format
+msgid "Invalid IPv6 address prefix '%u"
+msgstr "Dirección IPv4 inválida '%s'"
+
+#: ../libnm-core/nm-setting-ip-config.c:114
+#, fuzzy, c-format
+msgid "Invalid routing metric '%s'"
+msgstr "Métrica inválida '%s'"
+
+#: ../libnm-core/nm-setting-ip-config.c:1864
+#, fuzzy, c-format
+msgid "%d. DNS server address is invalid"
 msgstr "%d. dirección IPv4 es inválida"
 
-#: ../libnm-util/nm-setting-ip4-config.c:799
-#, c-format
-msgid "%d. IPv4 address has invalid prefix"
+#: ../libnm-core/nm-setting-ip-config.c:1880
+#, fuzzy, c-format
+msgid "%d. IP address is invalid"
+msgstr "%d. dirección IPv4 es inválida"
+
+#: ../libnm-core/nm-setting-ip-config.c:1892
+#, fuzzy, c-format
+msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d. dirección IPv4 tiene un prefijo inválido"
 
-#: ../libnm-util/nm-setting-ip4-config.c:815
+#: ../libnm-core/nm-setting-ip-config.c:1901
+#, fuzzy, c-format
+msgid "%d. IP address has invalid label '%s'"
+msgstr "%d. dirección IPv4 tiene un prefijo inválido"
+
+#: ../libnm-core/nm-setting-ip-config.c:1915
+msgid "gateway cannot be set if there are no addresses configured"
+msgstr ""
+
+#: ../libnm-core/nm-setting-ip-config.c:1924
+#, fuzzy
+msgid "gateway is invalid"
+msgstr "propiedad no es válida"
+
+#: ../libnm-core/nm-setting-ip-config.c:1938
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d. ruta es inválida"
 
-#: ../libnm-util/nm-setting-ip4-config.c:825
+#: ../libnm-core/nm-setting-ip-config.c:1947
 #, c-format
-msgid "%d. route has invalid prefix"
-msgstr "%d. ruta tiene un prefijo inválido"
+msgid "%d. route cannot be a default route"
+msgstr ""
+
+#: ../libnm-core/nm-setting-ip4-config.c:123
+#: ../libnm-core/nm-setting-ip6-config.c:121
+#: ../libnm-util/nm-setting-ip4-config.c:862
+#: ../libnm-util/nm-setting-ip6-config.c:845
+#, fuzzy, c-format
+msgid "this property cannot be empty for '%s=%s'"
+msgstr "esta propiedad no tiene permiso para '%s=%s'"
 
-#: ../libnm-util/nm-setting-ip6-config.c:708
+#: ../libnm-core/nm-setting-ip4-config.c:135
+#: ../libnm-core/nm-setting-ip4-config.c:145
+#: ../libnm-core/nm-setting-ip4-config.c:157
+#: ../libnm-core/nm-setting-ip6-config.c:133
+#: ../libnm-core/nm-setting-ip6-config.c:143
+#: ../libnm-core/nm-setting-ip6-config.c:153
+#: ../libnm-util/nm-setting-ip4-config.c:874
+#: ../libnm-util/nm-setting-ip4-config.c:884
+#: ../libnm-util/nm-setting-ip4-config.c:896
+#: ../libnm-util/nm-setting-ip6-config.c:857
+#: ../libnm-util/nm-setting-ip6-config.c:867
+#: ../libnm-util/nm-setting-ip6-config.c:877
 #, c-format
-msgid "'%s' not allowed for %s=%s"
-msgstr "'%s' no está permitida para %s=%s"
+msgid "this property is not allowed for '%s=%s'"
+msgstr "esta propiedad no tiene permiso para '%s=%s'"
 
-#: ../libnm-util/nm-setting-olpc-mesh.c:136
-#: ../libnm-util/nm-setting-wireless.c:706
+#: ../libnm-core/nm-setting-olpc-mesh.c:122
+#: ../libnm-core/nm-setting-wireless.c:703
+#: ../libnm-util/nm-setting-olpc-mesh.c:133
+#: ../libnm-util/nm-setting-wireless.c:761
 msgid "SSID length is out of range <1-32> bytes"
 msgstr "longitud SSID está fuera de rango <1-32> bytes"
 
-#: ../libnm-util/nm-setting-olpc-mesh.c:145
-#: ../libnm-util/nm-setting-wireless.c:746
+#: ../libnm-core/nm-setting-olpc-mesh.c:131
+#: ../libnm-core/nm-setting-wireless.c:743
+#: ../libnm-util/nm-setting-olpc-mesh.c:142
+#: ../libnm-util/nm-setting-wireless.c:801
 #, c-format
 msgid "'%d' is not a valid channel"
 msgstr "'%d' no es un canal válido"
 
-#: ../libnm-util/nm-setting-ppp.c:390
+#: ../libnm-core/nm-setting-ppp.c:367 ../libnm-util/nm-setting-ppp.c:389
 #, c-format
 msgid "'%d' is out of valid range <128-16384>"
 msgstr "'%d' está fuera del rango válido <128-16384>"
 
-#: ../libnm-util/nm-setting-ppp.c:403
+#: ../libnm-core/nm-setting-ppp.c:380 ../libnm-util/nm-setting-ppp.c:402
 #, c-format
 msgid "setting this property requires non-zero '%s' property"
 msgstr "Para establecer esta propiedad se requiere propiedad non-zero '%s'"
 
-#: ../libnm-util/nm-setting-vlan.c:497
+#: ../libnm-core/nm-setting-vlan.c:516 ../libnm-util/nm-setting-vlan.c:557
 #, c-format
 msgid "'%s' value doesn't match '%s=%s'"
 msgstr "'%s' valor no coincide '%s=%s'"
 
-#: ../libnm-util/nm-setting-vlan.c:508
+#: ../libnm-core/nm-setting-vlan.c:527 ../libnm-util/nm-setting-vlan.c:568
 #, c-format
 msgid "'%s' is neither an UUID nor an interface name"
 msgstr "'%s' ni es un UUID ni s un nombre de interfaz"
 
-#: ../libnm-util/nm-setting-vlan.c:521
+#: ../libnm-core/nm-setting-vlan.c:541 ../libnm-util/nm-setting-vlan.c:581
 #, c-format
 msgid "property is not specified and neither is '%s:%s'"
 msgstr "propiedad no se especificó y no es '%s:%s'"
 
-#: ../libnm-util/nm-setting-vlan.c:534
+#: ../libnm-core/nm-setting-vlan.c:554 ../libnm-util/nm-setting-vlan.c:594
 msgid "flags are invalid"
 msgstr "Indicadores son inválidos"
 
-#: ../libnm-util/nm-setting-wired.c:562
+#: ../libnm-core/nm-setting-vpn.c:441
+#, fuzzy, c-format
+msgid "secret was empty"
+msgstr "propiedad está vacía"
+
+#: ../libnm-core/nm-setting-vpn.c:471
+msgid "setting contained a secret with an empty name"
+msgstr ""
+
+#: ../libnm-core/nm-setting-vpn.c:479
 #, c-format
-msgid "'%s' is not a valid ethernet port value"
+msgid "secret value was empty"
+msgstr ""
+
+#: ../libnm-core/nm-setting-vpn.c:526 ../libnm-core/nm-setting.c:1650
+msgid "not a secret property"
+msgstr ""
+
+#: ../libnm-core/nm-setting-vpn.c:532
+msgid "secret is not of correct type"
+msgstr ""
+
+#: ../libnm-core/nm-setting-vpn.c:567
+#, fuzzy, c-format
+msgid "failed to convert value '%s' to uint"
+msgstr "Error: falló al retirar el valor de '%s': %s\n"
+
+#: ../libnm-core/nm-setting-vpn.c:575
+msgid "secret flags property not found"
+msgstr ""
+
+#: ../libnm-core/nm-setting-wired.c:614 ../libnm-util/nm-setting-wired.c:614
+#, fuzzy, c-format
+msgid "'%s' is not a valid Ethernet port value"
 msgstr "'%s' no es un valor de puerto Ethernet válido"
 
-#: ../libnm-util/nm-setting-wired.c:572
+#: ../libnm-core/nm-setting-wired.c:624 ../libnm-util/nm-setting-wired.c:624
 #, c-format
 msgid "'%s' is not a valid duplex value"
 msgstr "'%s' no es un valor duplex válido"
 
-#: ../libnm-util/nm-setting-wired.c:582 ../libnm-util/nm-setting-wired.c:640
-msgid "is not a valid MAC address"
-msgstr "No es una dirección MAC válida"
-
-#: ../libnm-util/nm-setting-wired.c:595
-#: ../libnm-util/nm-setting-wireless.c:787
-#: ../libnm-util/nm-setting-wireless.c:801
-#, c-format
-msgid "'%s' is not a valid MAC address"
-msgstr "'%s' no es una dirección MAC válida"
-
-#: ../libnm-util/nm-setting-wired.c:629
+#: ../libnm-core/nm-setting-wired.c:683 ../libnm-util/nm-setting-wired.c:681
 #, c-format
 msgid "invalid '%s' or its value '%s'"
 msgstr "invalido '%s' o su valor '%s'"
 
-#: ../libnm-util/nm-setting-wireless-security.c:816
+#: ../libnm-core/nm-setting-wired.c:704
+msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags"
+msgstr ""
+
+#: ../libnm-core/nm-setting-wired.c:713
+msgid "Wake-on-LAN password can only be used with magic packet mode"
+msgstr ""
+
+#: ../libnm-core/nm-setting-wireless-security.c:883
+#: ../libnm-util/nm-setting-wireless-security.c:913
 #, c-format
 msgid "'%s' security requires '%s=%s'"
 msgstr "'%s' requiere seguridad '%s=%s'"
 
-#: ../libnm-util/nm-setting-wireless-security.c:845
+#: ../libnm-core/nm-setting-wireless-security.c:904
+#: ../libnm-util/nm-setting-wireless-security.c:934
 #, c-format
 msgid "'%s' security requires '%s' setting presence"
 msgstr "'%s' requiere seguridad presencia de parámetro '%s'"
 
-#: ../libnm-util/nm-setting-wireless-security.c:866
+#: ../libnm-core/nm-setting-wireless-security.c:925
+#: ../libnm-util/nm-setting-wireless-security.c:955
 #, c-format
 msgid "'%d' value is out of range <0-3>"
 msgstr "'%d' valor está fuera de rango <0-3>"
 
-#: ../libnm-util/nm-setting-wireless-security.c:963
+#: ../libnm-core/nm-setting-wireless-security.c:980
+#: ../libnm-util/nm-setting-wireless-security.c:1010
 #, c-format
 msgid "'%s' connections require '%s' in this property"
 msgstr "'%s' conexiones requieren '%s' en esta propiedad"
 
-#: ../libnm-util/nm-setting-wireless-security.c:993
+#: ../libnm-core/nm-setting-wireless-security.c:1010
+#: ../libnm-util/nm-setting-wireless-security.c:1040
 #, c-format
 msgid "'%s' can only be used with '%s=%s' (WEP)"
 msgstr "'%s' solamente se pueden usar con '%s=%s' (WEP)"
 
-#: ../libnm-util/nm-setting-wireless.c:715
+#: ../libnm-core/nm-setting-wireless.c:712
+#: ../libnm-util/nm-setting-wireless.c:770
 #, c-format
 msgid "'%s' is not a valid Wi-Fi mode"
 msgstr "'%s' no es un modo Wi-Fi válido"
 
-#: ../libnm-util/nm-setting-wireless.c:725
+#: ../libnm-core/nm-setting-wireless.c:722
+#: ../libnm-util/nm-setting-wireless.c:780
 #, c-format
 msgid "'%s' is not a valid band"
 msgstr "'%s' no es una banda válida"
 
-#: ../libnm-util/nm-setting-wireless.c:735
+#: ../libnm-core/nm-setting-wireless.c:732
+#, fuzzy, c-format
+msgid "'%s' requires setting '%s' property"
+msgstr "requiere propiedad de parámetro '%s'"
+
+#: ../libnm-core/nm-setting.c:833
+#, c-format
+msgid "can't set property of type '%s' from value of type '%s'"
+msgstr ""
+
+#: ../libnm-core/nm-setting.c:1548
+msgid "secret not found"
+msgstr ""
+
+#: ../libnm-core/nm-setting.c:1640
+msgid "secret is not set"
+msgstr ""
+
+#: ../libnm-core/nm-utils.c:2480 ../libnm-util/nm-utils.c:1828
+#, c-format
+msgid "Could not find \"%s\" binary"
+msgstr ""
+
+#: ../libnm-glib/nm-device.c:1793 ../libnm/nm-device.c:1638
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: ../libnm-glib/nm-device.c:1839 ../libnm/nm-device.c:1684
+msgid "Wired"
+msgstr "Cableado"
+
+#: ../libnm-glib/nm-device.c:1870 ../libnm/nm-device.c:1715
+msgid "PCI"
+msgstr "PCI"
+
+#: ../libnm-glib/nm-device.c:1872 ../libnm/nm-device.c:1717
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%2$s (%1$s)" if there's no grammatical way to combine
+#. * the strings otherwise.
+#.
+#: ../libnm-glib/nm-device.c:1968 ../libnm-glib/nm-device.c:1987
+#: ../libnm/nm-device.c:1811 ../libnm/nm-device.c:1830
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../libnm-glib/nm-remote-connection.c:151
+#, fuzzy
+msgid "Disconnected by D-Bus"
+msgstr "desconectado"
+
+#: ../libnm-util/crypto_gnutls.c:88
+#, c-format
+msgid "Failed to initialize the MD5 engine: %s / %s."
+msgstr "Falló al inicializar el motor MD5: %s / %s."
+
+#: ../libnm-util/crypto_nss.c:102
+#, c-format
+msgid "Failed to initialize the MD5 context: %d."
+msgstr "Falló al inicializar el contexto MD5: %d"
+
+#: ../libnm-util/crypto_nss.c:463
+#, c-format
+msgid "Couldn't convert password to UCS2: %d"
+msgstr "No se pudo convertir la contraseña a UCS2: %d"
+
+#: ../libnm-util/nm-setting-bluetooth.c:187
+#, c-format
+msgid "requires '%s' or '%s' setting"
+msgstr "requiere '%s' o el parámetro '%s'"
+
+#: ../libnm-util/nm-setting-connection.c:863
+#, c-format
+msgid "requires presence of '%s' setting in the connection"
+msgstr "requiere presencia de parámetro '%s' en la conexión"
+
+#: ../libnm-util/nm-setting-ip4-config.c:940
+#, c-format
+msgid "%d. IPv4 address is invalid"
+msgstr "%d. dirección IPv4 es inválida"
+
+#: ../libnm-util/nm-setting-ip4-config.c:950
+#, c-format
+msgid "%d. IPv4 address has invalid prefix"
+msgstr "%d. dirección IPv4 tiene un prefijo inválido"
+
+#: ../libnm-util/nm-setting-ip4-config.c:966
+#: ../libnm-util/nm-setting-ip6-config.c:938
+#, c-format
+msgid "%d. route has invalid prefix"
+msgstr "%d. ruta tiene un prefijo inválido"
+
+#: ../libnm-util/nm-setting-ip6-config.c:912
+#, fuzzy, c-format
+msgid "%d. IPv6 address is invalid"
+msgstr "%d. dirección IPv4 es inválida"
+
+#: ../libnm-util/nm-setting-ip6-config.c:922
+#, fuzzy, c-format
+msgid "%d. IPv6 address has invalid prefix"
+msgstr "%d. dirección IPv4 tiene un prefijo inválido"
+
+#: ../libnm-util/nm-setting-vpn.c:583
+#, c-format
+msgid "Failed to convert '%s' value '%s' to uint"
+msgstr ""
+
+#: ../libnm-util/nm-setting-vpn.c:590
+#, c-format
+msgid "Secret flags property '%s' not found"
+msgstr ""
+
+#: ../libnm-util/nm-setting-wireless.c:790
 #, c-format
 msgid "requires setting '%s' property"
 msgstr "requiere propiedad de parámetro '%s'"
 
+#: ../libnm/nm-device-adsl.c:73
+#, fuzzy
+msgid "The connection was not an ADSL connection."
+msgstr "conectando (iniciando conexiones secundarias)"
+
+#: ../libnm/nm-device-bond.c:115
+#, fuzzy
+msgid "The connection was not a bond connection."
+msgstr "conectando (iniciando conexiones secundarias)"
+
+#: ../libnm/nm-device-bridge.c:115
+#, fuzzy
+msgid "The connection was not a bridge connection."
+msgstr "conectando (iniciando conexiones secundarias)"
+
+#: ../libnm/nm-device-bt.c:140
+#, fuzzy, c-format
+msgid "The connection was not a Bluetooth connection."
+msgstr "Hay 1 argumento opcional para tipo de conexión 'bluetooth'.\n"
+
+#: ../libnm/nm-device-bt.c:149
+msgid "Invalid device Bluetooth address."
+msgstr ""
+
+#: ../libnm/nm-device-bt.c:156
+msgid "The Bluetooth addresses of the device and the connection didn't match."
+msgstr ""
+
+#: ../libnm/nm-device-bt.c:165
+msgid ""
+"The device is lacking Bluetooth capabilities required by the connection."
+msgstr ""
+
+#: ../libnm/nm-device-ethernet.c:138
+#, fuzzy
+msgid "The connection was not an Ethernet or PPPoE connection."
+msgstr "Hay 4 argumentos opcionales para tipo de conexión 'PPPoE'.\n"
+
+#: ../libnm/nm-device-ethernet.c:154 ../libnm/nm-device-infiniband.c:105
+#: ../libnm/nm-device-wifi.c:598 ../libnm/nm-device-wimax.c:311
+#, fuzzy
+msgid "Invalid device MAC address."
+msgstr "No es una dirección MAC válida"
+
+#: ../libnm/nm-device-ethernet.c:160 ../libnm/nm-device-infiniband.c:113
+#: ../libnm/nm-device-wifi.c:605 ../libnm/nm-device-wimax.c:318
+msgid "The MACs of the device and the connection didn't match."
+msgstr ""
+
+#: ../libnm/nm-device-generic.c:92
+#, fuzzy
+msgid "The connection was not a generic connection."
+msgstr "conectando (iniciando conexiones secundarias)"
+
+#: ../libnm/nm-device-generic.c:99
+#, fuzzy
+msgid "The connection did not specify an interface name."
+msgstr ""
+"La conexión InfiniBand P_Key no especificó el nombre de la interfaz padre"
+
+#: ../libnm/nm-device-infiniband.c:97
+#, fuzzy
+msgid "The connection was not an InfiniBand connection."
+msgstr "Hay 5 argumentos opcionales para tipo de conexión 'Infiniband'.\n"
+
+#: ../libnm/nm-device-modem.c:123
+#, fuzzy
+msgid "The connection was not a modem connection."
+msgstr "se eliminó la conexión"
+
+#: ../libnm/nm-device-modem.c:131
+#, fuzzy
+msgid "The connection was not a valid modem connection."
+msgstr "conectando (iniciando conexiones secundarias)"
+
+#: ../libnm/nm-device-modem.c:138
+msgid "The device is lacking capabilities required by the connection."
+msgstr ""
+
+#: ../libnm/nm-device-olpc-mesh.c:118
+#, fuzzy
+msgid "The connection was not an OLPC Mesh connection."
+msgstr "Hay 2 argumentos opcionales para tipo de conexión 'OLPC'.\n"
+
+#: ../libnm/nm-device-team.c:121
+#, fuzzy
+msgid "The connection was not a team connection."
+msgstr "se eliminó la conexión"
+
+#: ../libnm/nm-device-vlan.c:131
+#, fuzzy
+msgid "The connection was not a VLAN connection."
+msgstr "Hay 4 argumentos opcionales para tipo de conexión 'Vlan'.\n"
+
+#: ../libnm/nm-device-vlan.c:138
+msgid "The VLAN identifiers of the device and the connection didn't match."
+msgstr ""
+
+#: ../libnm/nm-device-vlan.c:151
+msgid "The hardware address of the device and the connection didn't match."
+msgstr ""
+
+#: ../libnm/nm-device-wifi.c:589
+msgid "The connection was not a Wi-Fi connection."
+msgstr ""
+
+#: ../libnm/nm-device-wifi.c:625
+msgid "The device is lacking WPA capabilities required by the connection."
+msgstr ""
+
+#: ../libnm/nm-device-wifi.c:632
+msgid "The device is lacking WPA2/RSN capabilities required by the connection."
+msgstr ""
+
+#: ../libnm/nm-device-wimax.c:302
+#, fuzzy
+msgid "The connection was not a WiMAX connection."
+msgstr "Hay 1 argumento opcional para tipo de conexión 'WiMax'.\n"
+
+#: ../libnm/nm-device.c:2174
+#, fuzzy, c-format
+msgid "The connection was not valid: %s"
+msgstr "Error: conexión no es válida: %s\n"
+
+#: ../libnm/nm-device.c:2183
+#, c-format
+msgid "The interface names of the device and the connection didn't match."
+msgstr ""
+
+#: ../libnm/nm-manager.c:861
+#, fuzzy
+msgid "Active connection could not be attached to the device"
+msgstr "conexión o dispositivo no activo"
+
+# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
+#: ../libnm/nm-manager.c:1085
+#, fuzzy
+msgid "Active connection removed before it was initialized"
+msgstr "Activar detalles de la conexión"
+
+#: ../libnm/nm-object.c:1442 ../libnm/nm-object.c:1588
+msgid "Caller did not specify D-Bus path for object"
+msgstr ""
+
+#: ../libnm/nm-remote-settings.c:261
+msgid "Connection removed before it was initialized"
+msgstr ""
+
+#: ../libnm/nm-vpn-plugin-old.c:892
+#, fuzzy
+msgid "No service name specified"
+msgstr "Error: No interface specified."
+
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
 msgid "Enable or disable system networking"
 msgstr "Activar o desactivar la red del sistema"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
 msgid "System policy prevents enabling or disabling system networking"
-msgstr ""
-"La política del sistema evita activar o desactivar la red del sistema"
+msgstr "La política del sistema evita activar o desactivar la red del sistema"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
 msgid ""
 "Put NetworkManager to sleep or wake it up (should only be used by system "
 "power management)"
 msgstr ""
-"Poner NetworkManager a dormir o despertarlo (sólo lo debería usar el "
-"gestor de energía del sistema)"
+"Poner NetworkManager a dormir o despertarlo (sólo lo debería usar el gestor "
+"de energía del sistema)"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
 msgid "System policy prevents putting NetworkManager to sleep or waking it up"
@@ -5545,8 +8193,8 @@ msgstr "Activar o desactivar los dispositivos de banda ancha móvil"
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
 msgid "System policy prevents enabling or disabling mobile broadband devices"
 msgstr ""
-"La política del sistema evita activar o desactivar los dispositivos de "
-"banda ancha móvil"
+"La política del sistema evita activar o desactivar los dispositivos de banda "
+"ancha móvil"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
 msgid "Enable or disable WiMAX mobile broadband devices"
@@ -5556,8 +8204,8 @@ msgstr "Activar o desactivar los dispositivos de banda ancha móvil WiMAX"
 msgid ""
 "System policy prevents enabling or disabling WiMAX mobile broadband devices"
 msgstr ""
-"La política del sistema evita activar o desactivar los dispositivos de "
-"banda ancha móvil WiMAX"
+"La política del sistema evita activar o desactivar los dispositivos de banda "
+"ancha móvil WiMAX"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
 msgid "Allow control of network connections"
@@ -5572,8 +8220,7 @@ msgid "Connection sharing via a protected WiFi network"
 msgstr "Compartir conexión a través de una red WIFI protegida"
 
 #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
-msgid ""
-"System policy prevents sharing connections via a protected WiFi network"
+msgid "System policy prevents sharing connections via a protected WiFi network"
 msgstr ""
 "La política del sistema evita compartir conexiones a través de una red WiFi "
 "protegida"
@@ -5618,79 +8265,62 @@ msgstr ""
 "La política del sistema evita la modificación del nombre persistente del "
 "sistema"
 
-#: ../src/main.c:154
-#, c-format
-msgid "Opening %s failed: %s\n"
-msgstr "Al abrir %s falló: %s\n"
-
-#: ../src/main.c:160
-#, c-format
-msgid "Writing to %s failed: %s\n"
-msgstr "Escritura a %s falló: %s\n"
-
-#: ../src/main.c:165
-#, c-format
-msgid "Closing %s failed: %s\n"
-msgstr "Cierre %s falló: %s\n"
+#. Translators: the first %s is a prefix for the connection id, such
+#. * as "Wired Connection" or "VPN Connection". The %d is a number
+#. * that is combined with the first argument to create a unique
+#. * connection id.
+#: ../src/NetworkManagerUtils.c:1660
+#, fuzzy, c-format
+msgctxt "connection id fallback"
+msgid "%s %d"
+msgstr "%s %s"
 
-#: ../src/main.c:208
-#, c-format
-msgid "NetworkManager is already running (pid %ld)\n"
-msgstr "NetworkManager ya está en ejecución (pid %ld)\n"
+#: ../src/main.c:240
+#, fuzzy, c-format
+msgid "Failed to read configuration: %s\n"
+msgstr "Falló al leer configuración: (%d) %s\n"
 
-#: ../src/main.c:329
+#. Logging/debugging
+#: ../src/main.c:255 ../src/nm-iface-helper.c:300
 msgid "Print NetworkManager version and exit"
 msgstr "Imprimir versión de NetworkManager version y salir"
 
-#: ../src/main.c:330
+#: ../src/main.c:256 ../src/nm-iface-helper.c:301
 msgid "Don't become a daemon"
 msgstr "No se convierta en demonio"
 
-#: ../src/main.c:331
+#: ../src/main.c:257 ../src/nm-iface-helper.c:302
 msgid "Don't become a daemon, and log to stderr"
 msgstr "No se convierta en demonio y registre a stderr"
 
-#: ../src/main.c:332
+#: ../src/main.c:258 ../src/nm-iface-helper.c:303
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "Nivel de registro: uno de [%s]"
 
-#: ../src/main.c:334
+#: ../src/main.c:260 ../src/nm-iface-helper.c:305
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "Dominios de registro separados por ',': cualquier combinación de [%s]"
 
-#: ../src/main.c:336
+#: ../src/main.c:262 ../src/nm-iface-helper.c:307
 msgid "Make all warnings fatal"
 msgstr "Hacer todas las advertencias fatales"
 
-#: ../src/main.c:337
+#: ../src/main.c:263
 msgid "Specify the location of a PID file"
 msgstr "Especificar el sitio del archivo PID"
 
-#: ../src/main.c:337
-msgid "filename"
-msgstr "Nombre de archivo"
-
-#: ../src/main.c:338
+#: ../src/main.c:264
 msgid "State file location"
 msgstr "Estado del sitio de archivos"
 
-#: ../src/main.c:338
-msgid "/path/to/state.file"
-msgstr "/path/to/state.file"
-
-#: ../src/main.c:364
-#, c-format
-msgid "GModules are not supported on your platform!\n"
-msgstr "GModules no tienen soporte en su plataforma\n"
-
-#: ../src/main.c:369
-#, c-format
-msgid "You must be root to run NetworkManager!\n"
-msgstr "Debe ser root para ejecutar NetworkManager\n"
+#: ../src/main.c:266
+#, fuzzy
+msgid "Print NetworkManager configuration and exit"
+msgstr "Imprimir versión de NetworkManager version y salir"
 
-#: ../src/main.c:392
+#: ../src/main.c:276
 msgid ""
 "NetworkManager monitors all network connections and automatically\n"
 "chooses the best connection to use.  It also allows the user to\n"
@@ -5703,1075 +8333,839 @@ msgstr ""
 "los puntos de acceso con los que las tarjeta inalámbricas en el computador \n"
 "se deben asociar."
 
-#: ../src/main.c:398
-#, c-format
-msgid "Invalid option.  Please use --help to see a list of valid options.\n"
-msgstr ""
-"Opción no válida. Use --help para ver una lista de las opciones válidas.\n"
-
-#: ../src/main.c:412
+#: ../src/main.c:369 ../src/main-utils.c:249 ../src/nm-iface-helper.c:383
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s. Usar --help para ver la lista de opciones válidas.\n"
 
-#: ../src/main.c:417
+#: ../src/main.c:374 ../src/nm-iface-helper.c:388
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr ""
 "Ignorando dominio(s) de registro desconocido '%s' que pasó en línea de "
 "comandos.\n"
 
-#: ../src/main.c:468
+#: ../src/main.c:384
 #, c-format
 msgid "Failed to read configuration: (%d) %s\n"
 msgstr "Falló al leer configuración: (%d) %s\n"
 
-#: ../src/main.c:482
+#: ../src/main.c:400
 #, c-format
 msgid "Error in configuration file: %s.\n"
 msgstr "Error en archivo de configuración: %s.\n"
 
-#: ../src/main.c:487
+#: ../src/main.c:405
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
 msgstr ""
 "Ignorando dominio(s) de registro desconocido '%s' desde archivos de "
 "configuración.\n"
 
-#: ../src/main.c:495
-#, c-format
-msgid "State file %s parsing failed: (%d) %s\n"
-msgstr "Archivo de estado %s falló análisis: (%d) %s\n"
-
-#: ../src/main.c:508
+#: ../src/main.c:416 ../src/nm-iface-helper.c:398
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "No se pudo demonizar: %s [error %u]\n"
 
-#: ../src/bluez-manager/nm-bluez-device.c:198
+#: ../src/main-utils.c:104
 #, c-format
-msgid "%s Network"
-msgstr "Red %s "
+msgid "Opening %s failed: %s\n"
+msgstr "Al abrir %s falló: %s\n"
+
+#: ../src/main-utils.c:110
+#, c-format
+msgid "Writing to %s failed: %s\n"
+msgstr "Escritura a %s falló: %s\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:143
+#: ../src/main-utils.c:115
+#, c-format
+msgid "Closing %s failed: %s\n"
+msgstr "Cierre %s falló: %s\n"
+
+#: ../src/main-utils.c:125
+#, c-format
+msgid "Cannot create '%s': %s"
+msgstr ""
+
+#: ../src/main-utils.c:177
+#, fuzzy, c-format
+msgid "%s is already running (pid %ld)\n"
+msgstr "NetworkManager ya está en ejecución (pid %ld)\n"
+
+#: ../src/main-utils.c:187
+#, fuzzy, c-format
+msgid "You must be root to run %s!\n"
+msgstr "Debe ser root para ejecutar NetworkManager\n"
+
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:210
 msgid "# Created by NetworkManager\n"
 msgstr "# Creado por NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:150
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:217
 #, c-format
-msgid "# Merged from %s\n"
+msgid ""
+"# Merged from %s\n"
 "\n"
-msgstr "# Mezclado de %s\n"
+msgstr ""
+"# Mezclado de %s\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:313
+#: ../src/dhcp-manager/nm-dhcp-manager.c:130
+#, c-format
+msgid "'%s' support not found or not enabled."
+msgstr ""
+
+#: ../src/dhcp-manager/nm-dhcp-manager.c:177
 msgid "no usable DHCP client could be found."
 msgstr "cliente DHCP inútil pudo ser hallado."
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:322
-msgid "'dhclient' could be found."
-msgstr "se pudo encontrar «dhclient»."
-
-#: ../src/dhcp-manager/nm-dhcp-manager.c:332
-msgid "'dhcpcd' could be found."
-msgstr "se pudo encontrar «dhcpcd»."
-
-#: ../src/dhcp-manager/nm-dhcp-manager.c:340
-#, c-format
-msgid "unsupported DHCP client '%s'"
-msgstr "«%s» cliente DHCP sin soporte "
-
-#: ../src/dns-manager/nm-dns-manager.c:401
+#: ../src/dns-manager/nm-dns-manager.c:364
 msgid "NOTE: the libc resolver may not support more than 3 nameservers."
 msgstr ""
 "NOTA: el 'resolutor' de nombres de libc puede que no soporte más de 3 "
 "servidores de nombres."
 
-#: ../src/dns-manager/nm-dns-manager.c:403
+#: ../src/dns-manager/nm-dns-manager.c:366
 msgid "The nameservers listed below may not be recognized."
 msgstr "Puede que los servidores de nombres listados abajo no se reconozcan."
 
-#: ../src/logging/nm-logging.c:149
-#, c-format
-msgid "Unknown log level '%s'"
-msgstr "Nivel de registro desconocido «%s»"
+#: ../src/devices/adsl/nm-device-adsl.c:137
+#, fuzzy
+msgid "ADSL connection"
+msgstr "Conexión ADSL %d"
 
-#: ../src/logging/nm-logging.c:226
+#: ../src/devices/bluetooth/nm-bluez-device.c:201
 #, c-format
-msgid "Unknown log domain '%s'"
-msgstr "Dominio de registro desconocido «%s»"
-
-#: ../src/config/nm-config.c:271
-msgid "Config file location"
-msgstr "Sitio del archivo de configuración"
-
-#: ../src/config/nm-config.c:271
-msgid "/path/to/config.file"
-msgstr "/path/to/config.file"
-
-#: ../src/config/nm-config.c:272
-msgid "Config directory location"
-msgstr "Sitio del directorio de configuración"
-
-#: ../src/config/nm-config.c:272
-msgid "/path/to/config/dir"
-msgstr "/path/to/config/dir"
-
-#: ../src/config/nm-config.c:274
-msgid "List of plugins separated by ','"
-msgstr "Lista de conectores separados por ','"
+msgid "%s Network"
+msgstr "Red %s "
 
-#: ../src/config/nm-config.c:274
-msgid "plugin1,plugin2"
-msgstr "plugin1,plugin2"
+#: ../src/devices/bluetooth/nm-device-bt.c:255
+msgid "PAN requested, but Bluetooth device does not support NAP"
+msgstr ""
 
-#: ../src/config/nm-config.c:277
-msgid "An http(s) address for checking internet connectivity"
-msgstr "Una dirección http(s) a para verificación de conectividad de Internet"
+#: ../src/devices/bluetooth/nm-device-bt.c:265
+msgid "PAN connections cannot specify GSM, CDMA, or serial settings"
+msgstr ""
 
-#: ../src/config/nm-config.c:278
-msgid "The interval between connectivity checks (in seconds)"
-msgstr "El intervalo entre chequeos de conectividad (en segundos)"
+#: ../src/devices/bluetooth/nm-device-bt.c:278
+#, fuzzy
+msgid "PAN connection"
+msgstr "Conexión PAN %d"
 
-#: ../src/config/nm-config.c:279
-msgid "The expected start of the response"
-msgstr "El inicio esperado de respuesta"
+#: ../src/devices/bluetooth/nm-device-bt.c:285
+msgid "DUN requested, but Bluetooth device does not support DUN"
+msgstr ""
 
-#: ../src/config/nm-config.c:279
-msgid "Bingo!"
-msgstr "¡Listo!"
+#: ../src/devices/bluetooth/nm-device-bt.c:295
+msgid "DUN connection must include a GSM or CDMA setting"
+msgstr ""
 
-#: ../src/modem-manager/nm-modem-broadband.c:459
-#: ../src/modem-manager/nm-modem-old.c:864 ../src/devices/nm-device-bt.c:333
-#, c-format
-msgid "GSM connection %d"
+#: ../src/devices/bluetooth/nm-device-bt.c:305
+#: ../src/devices/wwan/nm-modem-broadband.c:540
+#, fuzzy
+msgid "GSM connection"
 msgstr "Conexión GSM %d"
 
-#: ../src/modem-manager/nm-modem-broadband.c:481
-#: ../src/modem-manager/nm-modem-old.c:891 ../src/devices/nm-device-bt.c:337
-#, c-format
-msgid "CDMA connection %d"
+#: ../src/devices/bluetooth/nm-device-bt.c:309
+#: ../src/devices/wwan/nm-modem-broadband.c:563
+#, fuzzy
+msgid "CDMA connection"
 msgstr "Conexión CDMA %d"
 
-#: ../src/devices/nm-device-bond.c:146 ../tui/nm-editor-utils.c:204
-#, c-format
-msgid "Bond connection %d"
-msgstr "Conexión de vínculo %d"
-
-#: ../src/devices/nm-device-adsl.c:150
-#, c-format
-msgid "ADSL connection %d"
-msgstr "Conexión ADSL %d"
+#: ../src/devices/bluetooth/nm-device-bt.c:317
+msgid "Unknown/unhandled Bluetooth connection type"
+msgstr ""
 
-#: ../src/devices/nm-device-bridge.c:143 ../tui/nm-editor-utils.c:214
-#, c-format
-msgid "Bridge connection %d"
-msgstr "Conexión en puente %d"
+#: ../src/devices/bluetooth/nm-device-bt.c:337
+#: ../src/devices/nm-device-ethernet.c:1446
+#: ../src/devices/nm-device-infiniband.c:204
+#: ../src/devices/wifi/nm-device-wifi.c:1113
+#: ../src/devices/wimax/nm-device-wimax.c:454
+#, fuzzy
+msgid "connection does not match device"
+msgstr "conexión o dispositivo no activo"
 
-#: ../src/devices/nm-device-bt.c:308
-#, c-format
-msgid "PAN connection %d"
-msgstr "Conexión PAN %d"
+#: ../src/devices/nm-device-bond.c:124
+#, fuzzy
+msgid "Bond connection"
+msgstr "Conexión de vínculo %d"
 
-#: ../src/devices/nm-device-bt.c:341
-#, c-format
-msgid "DUN connection %d"
-msgstr "Conexión DUN %d"
+#: ../src/devices/nm-device-bridge.c:130
+#, fuzzy
+msgid "Bridge connection"
+msgstr "Conexión en puente %d"
 
-#: ../src/devices/nm-device-ethernet.c:1254
-#, c-format
-msgid "PPPoE connection %d"
+#: ../src/devices/nm-device-ethernet.c:1427
+#, fuzzy
+msgid "PPPoE connection"
 msgstr "Conexión PPPoE %d"
 
-#: ../src/devices/nm-device-ethernet.c:1254
-#: ../src/settings/nm-settings-utils.c:50
+#: ../src/devices/nm-device-ethernet.c:1427
+#, fuzzy
+msgid "Wired connection"
+msgstr "Conexión cableada %d"
+
+#: ../src/devices/nm-device-ethernet-utils.c:40
 #, c-format
 msgid "Wired connection %d"
 msgstr "Conexión cableada %d"
 
-#: ../src/devices/nm-device-infiniband.c:270 ../tui/nm-editor-utils.c:177
-#, c-format
-msgid "InfiniBand connection %d"
+#: ../src/devices/nm-device-infiniband.c:186
+#, fuzzy
+msgid "InfiniBand connection"
 msgstr "Conexión InfiniBand %d"
 
-#: ../src/devices/nm-device-olpc-mesh.c:242
-#, c-format
-msgid "Mesh %d"
-msgstr "Malla %d"
-
-#: ../src/devices/nm-device-team.c:158 ../tui/nm-editor-utils.c:223
-#, c-format
-msgid "Team connection %d"
-msgstr "Conexión de equipo %d"
-
-#: ../src/devices/nm-device-vlan.c:255 ../tui/nm-editor-utils.c:231
-#, c-format
-msgid "VLAN connection %d"
+#: ../src/devices/nm-device-vlan.c:343
+#, fuzzy
+msgid "VLAN connection"
 msgstr "Conexión VLAN %d"
 
-#: ../src/nm-manager.c:3420 ../tui/nm-editor-utils.c:246
-#, c-format
-msgid "VPN connection %d"
-msgstr "Conexión VPN %d"
-
-#: ../src/nm-netlink-monitor.c:219
-msgid "error occurred while waiting for data on socket"
-msgstr "ha ocurrido un error mientras esperaban datos en un conector"
-
-#: ../src/nm-netlink-monitor.c:240
-#, c-format
-msgid "error processing netlink message: %s"
-msgstr "error al procesar el mensaje de netlink: %s"
-
-#: ../src/nm-netlink-monitor.c:264
-#, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr ""
-"no se puede conectar con netlink para monitorizar el estado del enlace: %s"
+#: ../src/devices/team/nm-device-team.c:134
+#, fuzzy
+msgid "Team connection"
+msgstr "Conexión de equipo %d"
 
-#: ../src/nm-netlink-monitor.c:275
-#, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "no se puede activar el indicador netlink para pasar credenciales: %s"
+#: ../src/devices/wifi/nm-device-olpc-mesh.c:151
+#, fuzzy
+msgid "Mesh"
+msgstr "Malla %d"
 
-#: ../src/nm-netlink-monitor.c:319 ../src/nm-netlink-monitor.c:381
-#, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
+#: ../src/devices/wifi/nm-device-wifi.c:1081
+msgid "WPA Ad-Hoc disabled due to kernel bugs"
 msgstr ""
-"no se puede asignar el indicador netlink para monitorizar el estado del "
-"enlace: %s"
-
-#: ../src/nm-netlink-monitor.c:469
-#, c-format
-msgid "unable to join netlink group: %s"
-msgstr "no pudo unirse al grupo netlink: %s"
-
-#: ../src/nm-sleep-monitor-systemd.c:116
-msgid "NetworkManager needs to turn off networks"
-msgstr "NetworkManager necesita apagar redes"
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:115
-msgid "System"
-msgstr "Sistema"
-
-# auto translated by TM merge from project: virt-manager, version: 0.9.0, DocId: virt-manager
-#: ../src/settings/plugins/ifcfg-rh/reader.c:4158 ../tui/nm-editor-utils.c:200
-#: ../tui/nm-ui-utils.c:349 ../tui/nm-ui-utils.c:574
-msgid "Bond"
-msgstr "Vinculación"
-
-#: ../src/settings/plugins/ifcfg-rh/reader.c:4240 ../tui/nm-editor-utils.c:218
-#: ../tui/nm-ui-utils.c:351 ../tui/nm-ui-utils.c:576
-msgid "Team"
-msgstr "Equipo "
-
-# auto translated by TM merge from project: RHN Satellite UI, version: 5.5, DocId: java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource
-#: ../src/settings/plugins/ifcfg-rh/reader.c:4424 ../tui/nm-editor-utils.c:209
-#: ../tui/nm-ui-utils.c:353 ../tui/nm-ui-utils.c:578
-msgid "Bridge"
-msgstr "Puente"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:44
+#, fuzzy, c-format
+msgid "%s is incompatible with static WEP keys"
+msgstr "'%s=%s' es incompatible con '%s > 0'"
 
-#: ../test/nm-online.c:73
-#, c-format
-msgid "Connecting"
-msgstr "Conectando"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:78
+#, fuzzy
+msgid "LEAP authentication requires a LEAP username"
+msgstr "Autenticación requerida por red inalámbrica"
 
-#: ../test/nm-online.c:104
-msgid ""
-"Time to wait for a connection, in seconds (without the option, default value "
-"is 30)"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:88
+msgid "LEAP username requires 'leap' authentication"
 msgstr ""
-"Tiempo para esperar una conexión, en segundos (Sin la opción, el valor "
-"predeterminado es 30.)"
-
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../test/nm-online.c:105
-msgid "Exit immediately if NetworkManager is not running"
-msgstr "Salir inmediatamente si NetworkManager no está ejecutándose "
-
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../test/nm-online.c:106
-msgid "Don't print anything"
-msgstr "No imprimir nada"
 
-#: ../test/nm-online.c:124
-msgid ""
-"Waits for NetworkManager to finish activating startup network connections."
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:101
+msgid "LEAP authentication requires IEEE 802.1x key management"
 msgstr ""
-"Espera a que NetworkManager termine de activar las conexiones de red de "
-"inicio."
 
-# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
-#: ../test/nm-online.c:131 ../test/nm-online.c:141
-msgid "Invalid option.  Please use --help to see a list of valid options."
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:121
+msgid "LEAP authentication is incompatible with Ad-Hoc mode"
 msgstr ""
-"Opción inválida. Por favor use --help para ver una lista de las opciones "
-"válidas."
-
-#: ../tui/newt/nmt-newt-utils.c:168 ../tui/nmt-editor.c:231
-#: ../tui/nmt-password-dialog.c:175 ../tui/nmt-route-editor.c:135
-#: ../tui/nmtui-hostname.c:71 ../tui/nmtui.c:120
-msgid "OK"
-msgstr "Aceptar"
-
-#: ../tui/newt/nmt-newt-utils.c:316 ../tui/newt/nmt-newt-utils.c:348
-#, c-format
-msgid "Could not create temporary file: %s"
-msgstr "No se pudo crear archivo temporal: %s"
 
-#: ../tui/newt/nmt-newt-utils.c:354
-#, c-format
-msgid "Editor failed: %s"
-msgstr "Falló el editor: %s"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:133
+msgid "LEAP authentication is incompatible with 802.1x setting"
+msgstr ""
 
-#: ../tui/newt/nmt-newt-utils.c:360
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:155
 #, c-format
-msgid "Could not re-read file: %s"
-msgstr "No se pudo leer archivo: %s"
+msgid "a connection using '%s' authentication cannot use WPA key management"
+msgstr ""
 
-#: ../tui/nm-editor-utils.c:160
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:166
 #, c-format
-msgid "Ethernet connection %d"
-msgstr "Conexión Ethernet %d"
+msgid "a connection using '%s' authentication cannot specific WPA protocols"
+msgstr ""
 
-#: ../tui/nm-editor-utils.c:168
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:182
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:199
 #, c-format
-msgid "Wi-Fi connection %d"
-msgstr "Conexión Wi-Fi %d"
-
-#: ../tui/nm-editor-utils.c:182 ../tui/nm-ui-utils.c:345
-msgid "Mobile Broadband"
-msgstr "Banda ancha móvil"
+msgid "a connection using '%s' authentication cannot specific WPA ciphers"
+msgstr ""
 
-#: ../tui/nm-editor-utils.c:185
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:211
 #, c-format
-msgid "Mobile broadband connection %d"
-msgstr "Conexión de banda ancha móvil %d"
+msgid "a connection using '%s' authentication cannot specific a WPA password"
+msgstr ""
 
-#: ../tui/nm-editor-utils.c:190
-msgid "DSL"
-msgstr "DSL"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:242
+#, fuzzy
+msgid "Dynamic WEP requires an 802.1x setting"
+msgstr "WEP Dinámica (802.1x)"
 
-#: ../tui/nm-editor-utils.c:194
-#, c-format
-msgid "DSL connection %d"
-msgstr "Conexión DSL %d"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:252
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:280
+msgid "Dynamic WEP requires 'open' authentication"
+msgstr ""
 
-#: ../tui/nm-ui-utils.c:316 ../tui/nm-ui-utils.c:385
-msgid "Wired"
-msgstr "Cableado"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:267
+msgid "Dynamic WEP requires 'ieee8021x' key management"
+msgstr ""
 
-#: ../tui/nm-ui-utils.c:339
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:314
+msgid "WPA-PSK authentication is incompatible with 802.1x"
+msgstr ""
 
-#: ../tui/nm-ui-utils.c:341
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:324
+#, fuzzy
+msgid "WPA-PSK requires 'open' authentication"
+msgstr "Autenticación de Cableado 802.1X"
 
-#: ../tui/nm-ui-utils.c:343
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:336
+msgid "WPA Ad-Hoc authentication requires an Ad-Hoc mode AP"
+msgstr ""
 
-#: ../tui/nm-ui-utils.c:357
-msgid "ADSL"
-msgstr "ADSL"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:349
+msgid "WPA Ad-Hoc authentication requires 'wpa' protocol"
+msgstr ""
 
-#: ../tui/nm-ui-utils.c:420
-msgid "PCI"
-msgstr "PCI"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:361
+#, fuzzy
+msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher"
+msgstr "Autenticación requerida por red inalámbrica"
 
-#: ../tui/nm-ui-utils.c:422
-msgid "USB"
-msgstr "USB"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:373
+msgid "WPA Ad-Hoc requires 'tkip' group cipher"
+msgstr ""
 
-#: ../tui/nm-ui-utils.c:498 ../tui/nm-ui-utils.c:518
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:387
+msgid "Access point does not support PSK but setting requires it"
+msgstr ""
 
-#: ../tui/nmt-device-entry.c:391
-msgid "Select..."
-msgstr "Seleccionar..."
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:417
+msgid "WPA-EAP authentication requires an 802.1x setting"
+msgstr ""
 
-#: ../tui/nmt-edit-connection-list.c:129
-msgid "Add"
-msgstr "Añadir"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:427
+#, fuzzy
+msgid "WPA-EAP requires 'open' authentication"
+msgstr "Autenticación de Cableado 802.1X"
 
-#: ../tui/nmt-edit-connection-list.c:132 ../tui/nmt-page-ip4.c:172
-#: ../tui/nmt-page-ip6.c:170 ../tui/nmt-page-team-port.c:110
-#: ../tui/nmt-page-team.c:180
-msgid "Edit..."
-msgstr "Editar..."
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:438
+msgid "802.1x setting requires 'wpa-eap' key management"
+msgstr ""
 
-#: ../tui/nmt-edit-connection-list.c:135 ../tui/nmtui-edit.c:471
-msgid "Delete"
-msgstr "Borrar"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:451
+msgid "Access point does not support 802.1x but setting requires it"
+msgstr ""
 
-#: ../tui/nmt-editor.c:81
-#, c-format
-msgid "Could not create editor for connection '%s' of type '%s'."
-msgstr "No se pudo crear editor para conexión '%s' del tipo '%s'"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:479
+msgid ""
+"Access point mode is Ad-Hoc but setting requires Infrastructure security"
+msgstr ""
 
-#: ../tui/nmt-editor.c:85
-#, c-format
-msgid "Could not create editor for invalid connection '%s'."
-msgstr "No se pudo crear editor para conexión no válida '%s'."
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:489
+msgid "Ad-Hoc mode is incompatible with 802.1x security"
+msgstr ""
 
-#: ../tui/nmt-editor.c:95
-msgid "Edit connection"
-msgstr "Editar conexión"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:498
+msgid "Ad-Hoc mode is incompatible with LEAP security"
+msgstr ""
 
-#: ../tui/nmt-editor.c:134
-#, c-format
-msgid "Error saving connection: %s"
-msgstr "Error al guardar conexión: %s"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:508
+msgid "Ad-Hoc mode requires 'open' authentication"
+msgstr ""
 
-#: ../tui/nmt-editor.c:144
-#, c-format
-msgid "Unable to save connection: %s"
-msgstr "No se pudo guardar conexión: %s"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:518
+msgid ""
+"Access point mode is Infrastructure but setting requires Ad-Hoc security"
+msgstr ""
 
-#: ../tui/nmt-editor.c:158
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:560
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:590
 #, c-format
-msgid "Unable to add new connection: %s"
-msgstr "No se pudo adicionar nueva conexión: %s"
-
-#: ../tui/nmt-editor.c:228 ../tui/nmt-password-dialog.c:172
-#: ../tui/nmt-route-editor.c:128 ../tui/nmtui-edit.c:201
-#: ../tui/nmtui-edit.c:470 ../tui/nmtui-hostname.c:69
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../tui/nmt-mtu-entry.c:86
-msgid "(default)"
-msgstr "(predeterminado)"
-
-#: ../tui/nmt-mtu-entry.c:88 ../tui/nmt-mtu-entry.c:119
-msgid "bytes"
-msgstr "bytes"
-
-#: ../tui/nmt-page-bond.c:88
-msgid "Round-robin"
-msgstr "Round-robin"
-
-#: ../tui/nmt-page-bond.c:89
-msgid "Active Backup"
-msgstr "Respaldo activo"
-
-#: ../tui/nmt-page-bond.c:90
-msgid "XOR"
-msgstr "XOR"
-
-#: ../tui/nmt-page-bond.c:91
-msgid "Broadcast"
-msgstr "Difusión"
-
-#: ../tui/nmt-page-bond.c:92
-msgid "802.3ad"
-msgstr "802.3ad"
-
-#: ../tui/nmt-page-bond.c:93
-msgid "Adaptive Transmit Load Balancing (tlb)"
-msgstr "Balanceo de carga de transmisión adaptable (tlb)"
-
-#: ../tui/nmt-page-bond.c:94
-msgid "Adaptive Load Balancing (alb)"
-msgstr "Balanceo de carga adaptable (alb)"
-
-#: ../tui/nmt-page-bond.c:100
-msgid "MII (recommended)"
-msgstr "MII (recomendable)"
-
-#: ../tui/nmt-page-bond.c:101
-msgid "ARP"
-msgstr "ARP"
-
-#: ../tui/nmt-page-bond.c:359 ../tui/nmt-page-bridge.c:86
-#: ../tui/nmt-page-team.c:159
-msgid "Slaves"
-msgstr "Esclavos"
+msgid "connection does not match access point"
+msgstr ""
 
-#: ../tui/nmt-page-bond.c:371 ../tui/nmt-page-wifi.c:227
-msgid "Mode"
-msgstr "Modo"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:614
+msgid "Access point is unencrypted but setting specifies security"
+msgstr ""
 
-#: ../tui/nmt-page-bond.c:377
-msgid "Primary"
-msgstr "Primario"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:703
+msgid ""
+"WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic "
+"WEP"
+msgstr ""
 
-#: ../tui/nmt-page-bond.c:383
-msgid "Link monitoring"
-msgstr "Enlace de monitorización"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:713
+msgid "WPA authentication is incompatible with Shared Key authentication"
+msgstr ""
 
-#: ../tui/nmt-page-bond.c:389 ../tui/nmt-page-bond.c:396
-#: ../tui/nmt-page-bond.c:403 ../tui/nmt-page-bond.c:410
-msgctxt "milliseconds"
-msgid "ms"
-msgstr "ms"
+#: ../src/devices/wifi/nm-wifi-ap-utils.c:760
+#, fuzzy
+msgid "Failed to determine AP security information"
+msgstr "Falló al establecer la clave simétrica para el descifrado."
 
-#: ../tui/nmt-page-bond.c:390 ../tui/nmt-page-bond.c:411
-msgid "Monitoring frequency"
-msgstr "Frecuencia de monitorización"
+#: ../src/devices/wwan/nm-modem-broadband.c:527
+#, fuzzy
+msgid "GSM mobile broadband connection requires a 'gsm' setting"
+msgstr "Conexión de banda ancha móvil %d"
 
-#: ../tui/nmt-page-bond.c:397
-msgid "Link up delay"
-msgstr "Retraso de 'link up'"
+#: ../src/nm-config.c:463
+msgid "Config file location"
+msgstr "Sitio del archivo de configuración"
 
-#: ../tui/nmt-page-bond.c:404
-msgid "Link down delay"
-msgstr "Retraso de 'Link down'"
+#: ../src/nm-config.c:464
+msgid "Config directory location"
+msgstr "Sitio del directorio de configuración"
 
-#: ../tui/nmt-page-bond.c:417
-msgid "ARP targets"
-msgstr "Destinos ARP"
+#: ../src/nm-config.c:465
+msgid "State file for no-auto-default devices"
+msgstr ""
 
-#: ../tui/nmt-page-bridge-port.c:38
-msgid "BRIDGE PORT"
-msgstr "PUERTO DE PUENTE"
+#: ../src/nm-config.c:466
+msgid "List of plugins separated by ','"
+msgstr "Lista de conectores separados por ','"
 
-#: ../tui/nmt-page-bridge-port.c:69 ../tui/nmt-page-bridge.c:112
-msgid "Priority"
-msgstr "Prioridad"
+#: ../src/nm-config.c:467
+#, fuzzy
+msgid "Quit after initial configuration"
+msgstr "Configuración nmcli actual:\n"
 
-#: ../tui/nmt-page-bridge-port.c:75
-msgid "Path cost"
-msgstr "Costo de ruta"
+#. These three are hidden for now, and should eventually just go away.
+#: ../src/nm-config.c:470
+msgid "An http(s) address for checking internet connectivity"
+msgstr "Una dirección http(s) a para verificación de conectividad de Internet"
 
-#: ../tui/nmt-page-bridge-port.c:77
-msgid "Hairpin mode"
-msgstr "Modo de Hairpin"
+#: ../src/nm-config.c:471
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "El intervalo entre chequeos de conectividad (en segundos)"
 
-#: ../tui/nmt-page-bridge.c:42
-msgid "BRIDGE"
-msgstr "PUENTE"
+#: ../src/nm-config.c:472
+msgid "The expected start of the response"
+msgstr "El inicio esperado de respuesta"
 
-#: ../tui/nmt-page-bridge.c:96 ../tui/nmt-page-bridge.c:121
-#: ../tui/nmt-page-bridge.c:131 ../tui/nmt-page-bridge.c:141
-msgid "seconds"
-msgstr "segundos"
+#. Interface/IP config
+#: ../src/nm-iface-helper.c:286
+#, fuzzy
+msgid "The interface to manage"
+msgstr "Interfaz principal [none]: "
 
-#: ../tui/nmt-page-bridge.c:97
-msgid "Aging time"
-msgstr "Tiempo de caducidad"
+#: ../src/nm-iface-helper.c:286
+msgid "eth0"
+msgstr ""
 
-#: ../tui/nmt-page-bridge.c:99
-msgid "Enable STP (Spanning Tree Protocol)"
-msgstr "Habilitar STP (Protocolo de árbol "
+#: ../src/nm-iface-helper.c:287
+#, fuzzy
+msgid "Connection UUID"
+msgstr "Conexión"
 
-#: ../tui/nmt-page-bridge.c:122
-msgid "Forward delay"
-msgstr "Demora de envío"
+#: ../src/nm-iface-helper.c:287
+msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b"
+msgstr ""
 
-#: ../tui/nmt-page-bridge.c:132
-msgid "Hello time"
-msgstr "Hello time"
+#: ../src/nm-iface-helper.c:288
+msgid "Whether to manage IPv6 SLAAC"
+msgstr ""
 
-#: ../tui/nmt-page-bridge.c:142
-msgid "Max age"
-msgstr "Edad máx"
+#: ../src/nm-iface-helper.c:289
+msgid "Whether SLAAC must be successful"
+msgstr ""
 
-#: ../tui/nmt-page-ethernet.c:41
-msgid "ETHERNET"
-msgstr "ETHERNET"
+#: ../src/nm-iface-helper.c:290
+msgid "Use an IPv6 temporary privacy address"
+msgstr ""
 
-#: ../tui/nmt-page-ethernet.c:80 ../tui/nmt-page-vlan.c:132
-#: ../tui/nmt-page-wifi.c:358
-msgid "Cloned MAC address"
+#: ../src/nm-iface-helper.c:291
+#, fuzzy
+msgid "Current DHCPv4 address"
 msgstr "Dirección MAC clonada"
 
-#: ../tui/nmt-page-infiniband.c:40
-msgid "INFINIBAND"
-msgstr "INFINIBAND"
-
-#: ../tui/nmt-page-infiniband.c:51
-msgid "Datagram"
-msgstr "Datagram"
+#: ../src/nm-iface-helper.c:292
+msgid "Whether DHCPv4 must be successful"
+msgstr ""
 
-#: ../tui/nmt-page-infiniband.c:52
-msgid "Connected"
-msgstr "Conectado"
+#: ../src/nm-iface-helper.c:293
+#, fuzzy
+msgid "Hex-encoded DHCPv4 client ID"
+msgstr "«%s» cliente DHCP sin soporte "
 
-#: ../tui/nmt-page-infiniband.c:84
-msgid "Transport mode"
-msgstr "Modo de transporte"
+#: ../src/nm-iface-helper.c:294
+msgid "Hostname to send to DHCP server"
+msgstr ""
 
-#: ../tui/nmt-page-ip4.c:41
-msgid "Disabled"
-msgstr "Desactivado"
+#: ../src/nm-iface-helper.c:294
+msgid "barbar"
+msgstr ""
 
-#: ../tui/nmt-page-ip4.c:42 ../tui/nmt-page-ip6.c:42
-msgid "Automatic"
-msgstr "Automático"
+#: ../src/nm-iface-helper.c:295
+#, fuzzy
+msgid "Route priority for IPv4"
+msgstr "no hay prioridad para retirar"
 
-#: ../tui/nmt-page-ip4.c:43 ../tui/nmt-page-ip6.c:44
-msgid "Link-Local"
-msgstr "Enlace local"
+#: ../src/nm-iface-helper.c:295
+msgid "0"
+msgstr ""
 
-#: ../tui/nmt-page-ip4.c:44 ../tui/nmt-page-ip6.c:45
-msgid "Manual"
-msgstr "Manual"
+#: ../src/nm-iface-helper.c:296
+#, fuzzy
+msgid "Route priority for IPv6"
+msgstr "no hay prioridad para retirar"
 
-#: ../tui/nmt-page-ip4.c:45
-msgid "Shared"
-msgstr "Compartido"
+#: ../src/nm-iface-helper.c:296
+msgid "1024"
+msgstr ""
 
-#: ../tui/nmt-page-ip4.c:54
-msgid "IPv4 CONFIGURATION"
-msgstr "CONFIGURACIÓN IPv4"
+#: ../src/nm-iface-helper.c:297
+msgid "Hex-encoded Interface Identifier"
+msgstr ""
 
-#: ../tui/nmt-page-ip4.c:100 ../tui/nmt-page-ip6.c:100
-msgid "(No custom routes)"
-msgstr "(No hay rutas personalizadas)"
+#: ../src/nm-iface-helper.c:317
+msgid ""
+"nm-iface-helper is a small, standalone process that manages a single network "
+"interface."
+msgstr ""
 
-#: ../tui/nmt-page-ip4.c:103 ../tui/nmt-page-ip6.c:103
+#: ../src/nm-iface-helper.c:364
 #, c-format
-msgid "One custom route"
-msgid_plural "%d custom routes"
-msgstr[0] "Una ruta personal"
-msgstr[1] "Rutas personalizadas %d"
-
-#: ../tui/nmt-page-ip4.c:141 ../tui/nmt-page-ip6.c:141
-msgid "Addresses"
-msgstr "Direcciones"
-
-#: ../tui/nmt-page-ip4.c:147 ../tui/nmt-page-ip6.c:147
-msgid "Gateway"
-msgstr "Puerta de enlace"
-
-#: ../tui/nmt-page-ip4.c:153 ../tui/nmt-page-ip6.c:153
-msgid "DNS servers"
-msgstr "Servidores DNS"
-
-#: ../tui/nmt-page-ip4.c:159 ../tui/nmt-page-ip6.c:159
-msgid "Search domains"
-msgstr "Búsqueda de dominios"
-
-#: ../tui/nmt-page-ip4.c:174 ../tui/nmt-page-ip6.c:172
-msgid "Routing"
-msgstr "Enrutando "
-
-#: ../tui/nmt-page-ip4.c:176 ../tui/nmt-page-ip6.c:174
-msgid "Never use this network for default route"
-msgstr "Nunca us"
-
-#: ../tui/nmt-page-ip4.c:184
-msgid "Require IPv4 addressing for this connection"
-msgstr "Requiere dirección IPv4 para esta conexión "
-
-#: ../tui/nmt-page-ip6.c:41
-msgid "Ignore"
-msgstr "Ignorar"
-
-#: ../tui/nmt-page-ip6.c:43
-msgid "Automatic (DHCP-only)"
-msgstr "Automático (DHCP-"
-
-#: ../tui/nmt-page-ip6.c:54
-msgid "IPv6 CONFIGURATION"
-msgstr "CONFIGURACIÓN IPv6"
-
-#: ../tui/nmt-page-ip6.c:182
-msgid "Require IPv6 addressing for this connection"
-msgstr "Requiere dirigirse a IPv6 para esta conexión"
-
-#: ../tui/nmt-page-main.c:134
-msgid "Hide"
-msgstr "Ocultar"
-
-#: ../tui/nmt-page-main.c:134
-msgid "Show"
-msgstr "Mostrar"
-
-#: ../tui/nmt-page-main.c:181
-msgid "Profile name"
-msgstr "Nombre de perfil"
-
-#: ../tui/nmt-page-main.c:188
-msgid "Device"
-msgstr "Dispositivo"
-
-#: ../tui/nmt-page-main.c:252
-msgid "Automatically connect"
-msgstr "Conectar de forma automática"
-
-#: ../tui/nmt-page-main.c:258
-msgid "Available to all users"
-msgstr "Disponible para todos los usuarios"
-
-#: ../tui/nmt-page-team-port.c:45
-msgid "TEAM PORT"
-msgstr "PUERTO DE EQUIPO"
-
-#: ../tui/nmt-page-team-port.c:100 ../tui/nmt-page-team.c:170
-msgid "JSON configuration"
-msgstr "Configuración JSON"
-
-#: ../tui/nmt-page-team.c:51
-msgid "TEAM"
-msgstr "EQUIPO"
-
-#: ../tui/nmt-page-vlan.c:109
-msgid "Parent"
-msgstr "Padre"
-
-#: ../tui/nmt-page-vlan.c:124
-msgid "VLAN id"
-msgstr "ID de VLAN"
-
-#: ../tui/nmt-page-wifi.c:58
-msgid "WI-FI"
-msgstr "WI-FI"
-
-#: ../tui/nmt-page-wifi.c:69
-msgctxt "Wi-Fi"
-msgid "Client"
-msgstr "Cliente"
-
-#: ../tui/nmt-page-wifi.c:70
-msgid "Access Point"
-msgstr "Punto de acceso"
-
-#: ../tui/nmt-page-wifi.c:71
-msgid "Ad-Hoc Network"
-msgstr "Red Ad-Hoc"
-
-#: ../tui/nmt-page-wifi.c:76
-msgctxt "Wi-Fi"
-msgid "Automatic"
-msgstr "Automático"
-
-#: ../tui/nmt-page-wifi.c:78
-msgid "A (5 GHz)"
-msgstr "Un (5 GHz)"
-
-#: ../tui/nmt-page-wifi.c:80
-msgid "B/G (2.4 GHz)"
-msgstr "B/G (2.4 GHz)"
-
-#: ../tui/nmt-page-wifi.c:85
-msgctxt "Wi-Fi security"
-msgid "None"
-msgstr "Ninguno"
-
-#: ../tui/nmt-page-wifi.c:86
-msgid "WPA & WPA2 Personal"
-msgstr "WPA & WPA2 Personal"
-
-#: ../tui/nmt-page-wifi.c:87
-msgid "WPA & WPA2 Enterprise"
-msgstr "WPA & WPA2 Empresarial"
-
-#: ../tui/nmt-page-wifi.c:88
-msgid "WEP 40/128-bit Key (Hex or ASCII)"
-msgstr "Llave de WEP 40/128-bit (Hex o ASCII)"
-
-#: ../tui/nmt-page-wifi.c:89
-msgid "WEP 128-bit Passphrase"
-msgstr "Frase de paso de WEP 128-bit"
-
-#: ../tui/nmt-page-wifi.c:90
-msgid "Dynamic WEP (802.1x)"
-msgstr "WEP Dinámica (802.1x)"
-
-#: ../tui/nmt-page-wifi.c:91
-msgid "LEAP"
-msgstr "SALTO"
-
-#: ../tui/nmt-page-wifi.c:96
-msgctxt "WEP key index"
-msgid "1 (Default)"
-msgstr "1 (Predeterminado)"
-
-#: ../tui/nmt-page-wifi.c:97
-msgctxt "WEP key index"
-msgid "2"
-msgstr "2"
-
-#: ../tui/nmt-page-wifi.c:98
-msgctxt "WEP key index"
-msgid "3"
-msgstr "3"
-
-#: ../tui/nmt-page-wifi.c:99
-msgctxt "WEP key index"
-msgid "4"
-msgstr "4"
-
-#: ../tui/nmt-page-wifi.c:104
-msgid "Open System"
-msgstr "Sistema abierto"
-
-#: ../tui/nmt-page-wifi.c:105
-msgid "Shared Key"
-msgstr "Clave compartida"
-
-#: ../tui/nmt-page-wifi.c:253
-msgid "Channel"
-msgstr "Canal"
-
-#: ../tui/nmt-page-wifi.c:258
-msgid "Security"
-msgstr "Seguridad"
-
-#: ../tui/nmt-page-wifi.c:274 ../tui/nmt-page-wifi.c:305
-#: ../tui/nmt-page-wifi.c:335 ../tui/nmt-secret-agent.c:214
-#: ../tui/nmt-secret-agent.c:251 ../tui/nmt-secret-agent.c:281
-#: ../tui/nmt-secret-agent.c:314 ../tui/nmt-secret-agent.c:380
-#: ../tui/nmt-secret-agent.c:393 ../tui/nmt-secret-agent.c:409
-msgid "Password"
-msgstr "Contraseña"
-
-#: ../tui/nmt-page-wifi.c:279
-msgid "(No support for wpa-enterprise yet...)"
-msgstr "(No hay soporte aún para wpa-enterprise...)"
-
-#: ../tui/nmt-page-wifi.c:286 ../tui/nmt-secret-agent.c:265
-msgid "Key"
-msgstr "Llave"
-
-#: ../tui/nmt-page-wifi.c:289 ../tui/nmt-page-wifi.c:308
-msgid "WEP index"
-msgstr "Índice WEP"
-
-#: ../tui/nmt-page-wifi.c:297 ../tui/nmt-page-wifi.c:316
-msgid "Authentication"
-msgstr "Autenticación"
-
-#: ../tui/nmt-page-wifi.c:322
-msgid "(No support for dynamic-wep yet...)"
-msgstr "(No hay soporte aún para dynamic-wep...)"
+msgid "An interface name and UUID are required\n"
+msgstr ""
 
-#: ../tui/nmt-page-wifi.c:329 ../tui/nmt-secret-agent.c:209
-#: ../tui/nmt-secret-agent.c:304
-msgid "Username"
-msgstr "Nombre de usuario"
+#: ../src/nm-iface-helper.c:370
+#, c-format
+msgid "Failed to find interface index for %s (%s)\n"
+msgstr ""
 
-#: ../tui/nmt-password-fields.c:130
-msgid "Ask for this password every time"
-msgstr "Preguntar cada vez esta contraseña "
+#: ../src/nm-iface-helper.c:430
+#, c-format
+msgid "(%s): Invalid IID %s\n"
+msgstr ""
 
-#: ../tui/nmt-password-fields.c:131
-msgid "Show password"
-msgstr "Mostrar contraseña"
+#: ../src/nm-logging.c:137
+#, c-format
+msgid "Unknown log level '%s'"
+msgstr "Nivel de registro desconocido «%s»"
 
-#: ../tui/nmt-route-table.c:219
-msgid "Destination"
-msgstr "Destino"
+#: ../src/nm-logging.c:219
+#, c-format
+msgid "Unknown log domain '%s'"
+msgstr "Dominio de registro desconocido «%s»"
 
-#: ../tui/nmt-route-table.c:219
-msgid "Prefix"
-msgstr "Prefijo"
+#: ../src/nm-manager.c:3423
+#, fuzzy
+msgid "VPN connection"
+msgstr "Conectando VPN"
 
-#: ../tui/nmt-route-table.c:228
-msgid "Next Hop"
-msgstr "Próximo salto"
+#: ../src/nm-sleep-monitor-systemd.c:115
+msgid "NetworkManager needs to turn off networks"
+msgstr "NetworkManager necesita apagar redes"
 
-#: ../tui/nmt-route-table.c:236
-msgid "Metric"
-msgstr "Métrica"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:112
+msgid "System"
+msgstr "Sistema"
 
-#: ../tui/nmt-route-table.c:256
-msgid "No custom routes are defined."
-msgstr "No hay rutas personalizadas definidas."
+#~ msgid "invalid prefix '%s'; <1-128> allowed"
+#~ msgstr "Prefijo inválido '%s'; <1-128> permitido"
+
+#~ msgid "invalid prefix '%s'; <0-32> allowed"
+#~ msgstr "Prefijo inválido '%s'; <0-32> permitido"
+
+#~ msgid "invalid next hop address '%s'"
+#~ msgstr "Siguiente dirección de salto inválida '%s'"
+
+#~ msgid "invalid IPv6 route '%s'"
+#~ msgstr "Ruta IPv6 inválida '%s'"
+
+#~ msgid "invalid prefix '%s'; <0-128> allowed"
+#~ msgstr "Prefijo inválido '%s'; <0-128> permitido"
+
+#~ msgid ""
+#~ "Usage: nmcli connection show { ARGUMENTS | help }\n"
+#~ "\n"
+#~ "ARGUMENTS := active [[id | uuid | path | apath] <ID>]\n"
+#~ "\n"
+#~ "Show connections which are currently used by a device to connect to a "
+#~ "network.\n"
+#~ "Without a parameter, all active connections are listed. When <ID> is "
+#~ "provided,\n"
+#~ "the connection details are displayed instead.\n"
+#~ "\n"
+#~ "ARGUMENTS := configured [[id | uuid | path] <ID>]\n"
+#~ "\n"
+#~ "Show in-memory and on-disk connections, some of which may also be active "
+#~ "if\n"
+#~ "a device is using that connection profile. Without a parameter, all "
+#~ "profiles\n"
+#~ "are listed. When <ID> is provided, the profile details are displayed "
+#~ "instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: nmcli connection show { ARGUMENTS | help }\n"
+#~ "\n"
+#~ "ARGUMENTOS := active [[id | uuid | path | apath] <ID>]\n"
+#~ "\n"
+#~ "Mostrar conexiones que actualmente son utilizadas por un dispositivo para "
+#~ "conectarse a una red.\n"
+#~ "Sin un parámetro todas las conexiones activas aparecen. Cuando <ID> se "
+#~ "proporciona, la información de conexión\n"
+#~ "se muestra en su lugar.\n"
+#~ "\n"
+#~ "ARGUMENTOS := configured [[id | uuid | path] <ID>]\n"
+#~ "\n"
+#~ "Mostrar las conexiones en memoria y en disco, algunas de las cuales "
+#~ "pueden también activarse si\n"
+#~ "un dispositivo está utilizando ese perfil de conexión. Sin un parámetro, "
+#~ "todos los perfiles\n"
+#~ "se listan. Cuando se proporciona <ID>, la información de perfil se "
+#~ "despliega en su lugar.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: nmcli connection modify { ARGUMENTS | help }\n"
+#~ "\n"
+#~ "ARGUMENTS := [id | uuid | path] <ID> <setting name>.<property name> "
+#~ "[<value>]\n"
+#~ "\n"
+#~ "Modify a single property in the connection profile.\n"
+#~ "The profile is identified by its name, UUID or D-Bus path.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: nmcli connection modify { ARGUMENTS | help }\n"
+#~ "\n"
+#~ "ARGUMENTOS := [id | uuid | path] <ID> <setting name>.<property name> "
+#~ "[<value>]\n"
+#~ "\n"
+#~ "Modificar una propiedad individual en el perfil de conexión.\n"
+#~ "El perfil es identificado por su nombre, UUID o ruta D-Bus.\n"
+#~ "\n"
+
+#~ msgid "Error: 'list configured': %s"
+#~ msgstr "Error: 'lista configurada': %s"
+
+#~ msgid "List of configured connections"
+#~ msgstr "Lista de conexiones configuradas"
+
+#~ msgid "Error: 'show configured': %s"
+#~ msgstr "Error: 'mostrar configuradas': %s"
+
+#~ msgid "Error: 'list active': %s"
+#~ msgstr "Error: 'activar lista': %s"
+
+#~ msgid "List of active connections"
+#~ msgstr "Lista de conexiones activas"
+
+#~ msgid ""
+#~ "Error: Device '%s' is waiting for slaves before proceeding with "
+#~ "activation."
+#~ msgstr ""
+#~ "Error: Dispositivo '%s' está esperando los esclavos para proseguir con la "
+#~ "activación."
+
+#~ msgid ""
+#~ "Error: 'mode': '%s' is not a valid InfiniBand transport mode [datagram, "
+#~ "connected]."
+#~ msgstr ""
+#~ "Error: 'mode': '%s' no es un modo de transporte InfiniBand válido "
+#~ "[datagram, connected]."
+
+#~ msgid "There are 3 optional arguments for '%s' connection type.\n"
+#~ msgstr "Hay 3 argumentos opcionales para tipo de conexión '%s'.\n"
+
+#~ msgid "Transport mode (datagram or connected) [datagram]: "
+#~ msgstr "Modo de transporte (datagrama o conectado) [datagram]: "
+
+#~ msgid ""
+#~ "There are 2 optional arguments for 'mobile broadband' connection type.\n"
+#~ msgstr ""
+#~ "Hay 2 argumentos opcionales para tipo de conexión 'banda ancha de "
+#~ "móvil'.\n"
+
+#~ msgid "Bluetooth type (panu, dun-gsm or dun-cdma) [panu]: "
+#~ msgstr "Tipo Bluetooth (panu, dun-gsm or dun-cdma) [panu]: "
+
+#~ msgid "There are optional arguments for 'bond' connection type.\n"
+#~ msgstr "Hay argumentos opcionales para tipo de conexión 'bond'.\n"
+
+#~ msgid "Bonding monitoring mode (miimon or arp) [miimon]: "
+#~ msgstr "Modo de monitorización de vinculación (miimon o arp) [miimon]: "
+
+#~ msgid "There are 6 optional arguments for 'bridge' connection type.\n"
+#~ msgstr "Hay 6 argumentos opcionales para tipo de conexión 'bridge'.\n"
+
+#~ msgid "Error: 'stp': '%s'.\n"
+#~ msgstr "Error: 'stp': '%s'.\n"
+
+#~ msgid "There are 3 optional arguments for 'bridge-slave' connection type.\n"
+#~ msgstr "Hay 3 argumentos opcionales para tipo de conexión 'bridge-slave'.\n"
+
+#~ msgid "Hairpin (yes/no) [yes]: "
+#~ msgstr "Hairpin (si o no) [yes]: "
+
+#~ msgid "Error: 'hairpin': '%s'.\n"
+#~ msgstr "Error: 'hairpin': '%s'.\n"
+
+#~ msgid "There is 1 optional argument for 'VPN' connection type.\n"
+#~ msgstr "Hay 1 argumento opcional para tipo de conexión 'VPN'.\n"
+
+#~ msgid ""
+#~ "save  :: save the connection\n"
+#~ "\n"
+#~ "Sends the connection to NetworkManager that will save it.\n"
+#~ msgstr ""
+#~ "save  :: guardar la conexión\n"
+#~ "\n"
+#~ "Envía la conexión a NetworkManager el cual la guardará.\n"
+
+#~ msgid ""
+#~ "remove [<index>|<option>]  :: delete the value\n"
+#~ "\n"
+#~ "Removes the property value (sets it to default).\n"
+#~ msgstr ""
+#~ "remove [<index>|<option>]  :: borrar el valor\n"
+#~ "\n"
+#~ "Retira el valor de propiedad (lo fija como predeterminado).\n"
+
+#~ msgid ""
+#~ ">>> Command-line editing is not available. Consider installing a line "
+#~ "editing library to enable the feature. <<<\n"
+#~ "Supported libraries are:\n"
+#~ "  - GNU Readline    (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
+#~ "readline/rltop.html\n"
+#~ "  - NetBSD Editline (libedit)     http://www.thrysoee.dk/editline/\n"
+#~ msgstr ""
+#~ ">>> Modificación de línea de comando no está disponible. Considere "
+#~ "instalar una biblioteca de edición de línea para activar esta "
+#~ "funcionalidad. <<<\n"
+#~ "Bibliotecas con soporte:\n"
+#~ "  - GNU Readline    (libreadline) http://cnswww.cns.cwru.edu/php/chet/"
+#~ "readline/rltop.html\n"
+#~ "  - NetBSD Editline (libedit)     http://www.thrysoee.dk/editline/\n"
 
-#: ../tui/nmt-secret-agent.c:223
-msgid "Identity"
-msgstr "Identidad"
+#~ msgid ""
+#~ "Error: 'configured' or 'active' command is expected for 'connection show'."
+#~ msgstr ""
+#~ "Error: el comando 'configured' o 'active' se esperaba para 'connection "
+#~ "show'."
 
-#: ../tui/nmt-secret-agent.c:228
-msgid "Private key password"
-msgstr "Contraseña de llave privada"
+#~ msgid "Error: Could not get system settings."
+#~ msgstr "Error: no se pudo obtener configuración de sistema."
 
-#: ../tui/nmt-secret-agent.c:309
-msgid "Service"
-msgstr "Servicio"
+#~ msgid "Error: Can't obtain connections: settings service is not running."
+#~ msgstr ""
+#~ "Error: no se pueden obtener conexiones: el servicio de configuración no "
+#~ "se está ejecutando."
 
-#: ../tui/nmt-secret-agent.c:340
-msgid "Authentication required by wireless network"
-msgstr "Autenticación requerida por red inalámbrica"
+#~ msgid "Device '%s' has been disconnected.\n"
+#~ msgstr "Dispositivo '%s' ha sido desconectado.\n"
 
-#: ../tui/nmt-secret-agent.c:341
-#, c-format
-msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
-msgstr ""
-"Se requieren llaves de contraseñas o cifradas para acceder a la red "
-"inalámbrica '%s'."
+#~ msgid "not running"
+#~ msgstr "no ejecutando"
 
-#: ../tui/nmt-secret-agent.c:349
-msgid "Wired 802.1X authentication"
-msgstr "Autenticación de Cableado 802.1X"
+#~ msgid "Error: %s"
+#~ msgstr "Error: %s"
 
-#: ../tui/nmt-secret-agent.c:352
-msgid "Network name"
-msgstr "Nombre de red"
+#~ msgid "0 (unknown)"
+#~ msgstr "0 (desconocido)"
 
-#: ../tui/nmt-secret-agent.c:359
-msgid "DSL authentication"
-msgstr "Autenticación DSL"
+#~ msgid "any, "
+#~ msgstr "cualquiera,"
 
-#: ../tui/nmt-secret-agent.c:367
-msgid "PIN code required"
-msgstr "Se requiere código PIN"
+#~ msgid "900 MHz, "
+#~ msgstr "900 MHz, "
 
-#: ../tui/nmt-secret-agent.c:368
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "Se requiere código PIN para el dispositivo de ancho de banda móvil"
+#~ msgid "1800 MHz, "
+#~ msgstr "1800 MHz, "
 
-#: ../tui/nmt-secret-agent.c:370
-msgid "PIN"
-msgstr "PIN"
+#~ msgid "1900 MHz, "
+#~ msgstr "1900 MHz, "
 
-#: ../tui/nmt-secret-agent.c:376 ../tui/nmt-secret-agent.c:389
-#: ../tui/nmt-secret-agent.c:405
-msgid "Mobile broadband network password"
-msgstr "Contraseña de red de ancho de banda móvil "
+#~ msgid "850 MHz, "
+#~ msgstr "850 MHz, "
 
-#: ../tui/nmt-secret-agent.c:377 ../tui/nmt-secret-agent.c:390
-#: ../tui/nmt-secret-agent.c:406
-#, c-format
-msgid "A password is required to connect to '%s'."
-msgstr "Se requiere una contraseña para conectarse a '%s'."
+#~ msgid "WCDMA 3GPP UMTS 2100 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../tui/nmt-slave-list.c:138
-msgid "Select the type of slave connection you wish to add."
-msgstr "Seleccionar el tipo de conexión esclava que desee añadir."
+#~ msgid "WCDMA 3GPP UMTS 1800 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../tui/nmt-widget-list.c:142
-msgid "Add..."
-msgstr "Añadir..."
+#~ msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../tui/nmt-widget-list.c:205
-msgid "Remove"
-msgstr "Retirar"
+#~ msgid "WCDMA 3GPP UMTS 800 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../tui/nmtui-connect.c:82
-msgid "Activation failed"
-msgstr "Activación falló"
+#~ msgid "WCDMA 3GPP UMTS 850 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../tui/nmtui-connect.c:134
-msgid "Connecting..."
-msgstr "Conectándose..."
+#~ msgid "WCDMA 3GPP UMTS 900 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../tui/nmtui-connect.c:159
-#, c-format
-msgid "Could not activate connection: %s"
-msgstr "No se pudo activar conexión: %s"
+#~ msgid "WCDMA 3GPP UMTS 1700 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../tui/nmtui-connect.c:218 ../tui/nmtui-connect.c:274
-msgid "Activate"
-msgstr "Activar"
+#~ msgid "WCDMA 3GPP UMTS 1900 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 1900 MHz, "
 
-#: ../tui/nmtui-connect.c:220
-msgid "Deactivate"
-msgstr "Desactivar"
+#~ msgid "WCDMA 3GPP UMTS 2600 MHz, "
+#~ msgstr "WCDMA 3GPP UMTS 2600 MHz, "
 
-#: ../tui/nmtui-connect.c:279 ../tui/nmtui-edit.c:102 ../tui/nmtui.c:114
-msgid "Quit"
-msgstr "Salir"
+#~ msgid "'%s' is not valid (use ip[/prefix] [gateway])"
+#~ msgstr "'%s' no es válido (use ip[/prefix] [gateway])"
 
-#: ../tui/nmtui-connect.c:304
-#, c-format
-msgid "No such connection '%s'"
-msgstr "No hay tal conexión '%s'"
+#~ msgid "'%s' is not valid (use <dest IP>/prefix <next-hop IP> [metric])"
+#~ msgstr ""
+#~ "'%s' no es un vaĺor válido (use <dest IP>/prefix <next-hop IP> [metric])"
 
-#: ../tui/nmtui-connect.c:306
-msgid "Connection is already active"
-msgstr "La conexión ya está activa"
+#~ msgid "'%s' doesn't match the virtual interface name '%s'"
+#~ msgstr "'%s' no coincide con el nombre de interfaz virtual '%s'"
 
-#: ../tui/nmtui-edit.c:209
-msgid "Create"
-msgstr "Crear"
+#~ msgid "IPv4 configuration is not allowed for slave"
+#~ msgstr "Configuración IPv4 no tiene permiso para esclavo"
 
-#: ../tui/nmtui-edit.c:350
-msgid "Select the type of connection you wish to create."
-msgstr "Seleccionar el tipo de conexión que desea crear."
+#~ msgid "IPv6 configuration is not allowed for slave"
+#~ msgstr "Configuración IPv6 no tiene permiso para esclavo"
 
-#: ../tui/nmtui-edit.c:357
-msgid ""
-"If you are creating a VPN, and the VPN connection you wish to create does "
-"not appear in the list, you may not have the correct VPN plugin installed."
-msgstr ""
-"Si está creando un VPN y la conexión VPN que usted desea crear no aparece en "
-"la lista, puede ser que usted no tenga el correcto complemento VPN instalado."
-""
+#~ msgid "'%s' not allowed for %s=%s"
+#~ msgstr "'%s' no está permitida para %s=%s"
 
-#: ../tui/nmtui-edit.c:390 ../tui/nmtui-edit.c:406
-msgid "New Connection"
-msgstr "Nueva conexión"
+#~ msgid "filename"
+#~ msgstr "Nombre de archivo"
 
-#: ../tui/nmtui-edit.c:443
-#, c-format
-msgid "Unable to delete connection: %s"
-msgstr "No se pudo borrar conexión: %s"
+#~ msgid "/path/to/state.file"
+#~ msgstr "/path/to/state.file"
 
-#: ../tui/nmtui-edit.c:472
-#, c-format
-msgid "Are you sure you want to delete the connection '%s'?"
-msgstr "¿Está seguro de que desea eliminar la conexión '%s'?"
+#~ msgid "GModules are not supported on your platform!\n"
+#~ msgstr "GModules no tienen soporte en su plataforma\n"
 
-#: ../tui/nmtui-edit.c:486
-#, c-format
-msgid "Could not delete connection: %s"
-msgstr "No se pudo borrar conexión: %s"
+#~ msgid "Invalid option.  Please use --help to see a list of valid options.\n"
+#~ msgstr ""
+#~ "Opción no válida. Use --help para ver una lista de las opciones válidas.\n"
 
-#: ../tui/nmtui-hostname.c:47
-msgid "Set Hostname"
-msgstr "Establecer nombre de host"
+#~ msgid "State file %s parsing failed: (%d) %s\n"
+#~ msgstr "Archivo de estado %s falló análisis: (%d) %s\n"
 
-#: ../tui/nmtui-hostname.c:55
-msgid "Hostname"
-msgstr "Nombre de host"
+#~ msgid "'dhclient' could be found."
+#~ msgstr "se pudo encontrar «dhclient»."
 
-#: ../tui/nmtui-hostname.c:114
-#, c-format
-msgid "Set hostname to '%s'"
-msgstr "Establecer nombre de host '%s'"
+#~ msgid "'dhcpcd' could be found."
+#~ msgstr "se pudo encontrar «dhcpcd»."
 
-#: ../tui/nmtui-hostname.c:116
-#, c-format
-msgid "Unable to set hostname: %s"
-msgstr "No se pudo borrar el nombre de host: %s"
+#~ msgid "/path/to/config.file"
+#~ msgstr "/path/to/config.file"
 
-#: ../tui/nmtui.c:59 ../tui/nmtui.c:62
-msgid "connection"
-msgstr "Conexión"
+#~ msgid "/path/to/config/dir"
+#~ msgstr "/path/to/config/dir"
 
-#: ../tui/nmtui.c:60
-msgid "Edit a connection"
-msgstr "Modificar una conexión"
+#~ msgid "plugin1,plugin2"
+#~ msgstr "plugin1,plugin2"
 
-#: ../tui/nmtui.c:63
-msgid "Activate a connection"
-msgstr "Activar una conexión"
+#~ msgid "Bingo!"
+#~ msgstr "¡Listo!"
 
-#: ../tui/nmtui.c:65
-msgid "new hostname"
-msgstr "Nuevo nombre de host"
+#~ msgid "DUN connection %d"
+#~ msgstr "Conexión DUN %d"
 
-#: ../tui/nmtui.c:66
-msgid "Set system hostname"
-msgstr "Establecer nombre de host de sistema"
+#~ msgid "error occurred while waiting for data on socket"
+#~ msgstr "ha ocurrido un error mientras esperaban datos en un conector"
 
-#: ../tui/nmtui.c:89
-msgid "NetworkManager TUI"
-msgstr "NetworkManager TUI"
+#~ msgid "error processing netlink message: %s"
+#~ msgstr "error al procesar el mensaje de netlink: %s"
 
-#: ../tui/nmtui.c:97
-msgid "Please select an option"
-msgstr "Por favor seleccione una opción"
+#~ msgid "unable to connect to netlink for monitoring link status: %s"
+#~ msgstr ""
+#~ "no se puede conectar con netlink para monitorizar el estado del enlace: %s"
 
-#: ../tui/nmtui.c:154
-msgid "Usage"
-msgstr "Uso "
+#~ msgid "unable to enable netlink handle credential passing: %s"
+#~ msgstr ""
+#~ "no se puede activar el indicador netlink para pasar credenciales: %s"
 
-#: ../tui/nmtui.c:221
-msgid "Could not parse arguments"
-msgstr "No se pudieron leer los argumentos"
+#~ msgid "unable to allocate netlink handle for monitoring link status: %s"
+#~ msgstr ""
+#~ "no se puede asignar el indicador netlink para monitorizar el estado del "
+#~ "enlace: %s"
 
-#: ../tui/nmtui.c:229
-msgid "NetworkManager is not running."
-msgstr "NetworkManager no está funcionando."
+#~ msgid "unable to join netlink group: %s"
+#~ msgstr "no pudo unirse al grupo netlink: %s"