diff --git a/po/es.po b/po/es.po
index 6120118b8a..fe3f8297d2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,96 +7,815 @@
 # Antonio Ognio <antonio@linux.org.pe>, 2004.
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2005, 2006.
 # Lucas Vieites Fariña <lucas@asixinformatica.com>, 2005, 2006.
-# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008.
+# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&amp;component=general\n"
-"POT-Creation-Date: 2008-11-13 21:19+0000\n"
-"PO-Revision-Date: 2008-11-14 20:28+0100\n"
+"product=NetworkManager&component=general\n"
+"POT-Creation-Date: 2010-02-26 03:24+0000\n"
+"PO-Revision-Date: 2010-03-07 13:27+0100\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/nm-netlink-monitor.c:195 ../src/nm-netlink-monitor.c:476
-#, c-format
-msgid "error processing netlink message: %s"
-msgstr "error al procesar el mensaje de netlink: %s"
-
-#: ../src/nm-netlink-monitor.c:252
-#, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr ""
-"no se puede asignar el manejador netlink para monitorizar el estado del "
-"enlace: %s"
-
-#: ../src/nm-netlink-monitor.c:262
-#, 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/nm-netlink-monitor.c:270
-#, c-format
-msgid "unable to join netlink group for monitoring link status: %s"
-msgstr ""
-"no pudo unirse al grupo netlink para monitorizar el estado del enlace: %s"
-
-#: ../src/nm-netlink-monitor.c:278
-#, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr ""
-"no se puede asignar el enlace a la caché de netlink para monitorizar el "
-"estado del enlace: %s"
-
-#: ../src/nm-netlink-monitor.c:441
-#, c-format
-msgid "error updating link cache: %s"
-msgstr "error al actualizar el enlace caché: %s"
-
-#: ../src/nm-netlink-monitor.c:499
-#, c-format
-msgid "error occurred while waiting for data on socket"
-msgstr "ha ocurrido un error mientras esperaban datos en un socket"
-
-#: ../src/NetworkManager.c:252
-#, 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/dhcp-manager/nm-dhcp-dhclient.c:88
-msgid "# Created by NetworkManager\n"
-msgstr "# Creado por NetworkManager\n"
-
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:94
+#: ../cli/src/connections.c:86
 #, c-format
 msgid ""
-"# Merged from %s\n"
+"Usage: nmcli con { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down }\n"
 "\n"
+"  list [id <id> | uuid <id> | system | user]\n"
+"  status\n"
+"  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout "
+"<timeout>]\n"
+"  down id <id> | uuid <id>\n"
 msgstr ""
-"# Mezclado de %s\n"
-"\n"
 
-#: ../src/named-manager/nm-named-manager.c:256
-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."
+#: ../cli/src/connections.c:158
+msgid "Connections"
+msgstr "Conexiones"
 
-#: ../src/named-manager/nm-named-manager.c:258
-msgid "The nameservers listed below may not be recognized."
-msgstr "Puede que los servidores de nombres listados abajo no se reconozcan."
+#: ../cli/src/connections.c:158 ../cli/src/connections.c:160
+#: ../cli/src/connections.c:196 ../cli/src/connections.c:198
+#: ../cli/src/connections.c:205 ../cli/src/connections.c:207
+#: ../cli/src/devices.c:298 ../cli/src/devices.c:458 ../cli/src/devices.c:460
+msgid "Type"
+msgstr "Tipo"
 
-#: ../system-settings/src/main.c:376
+#: ../cli/src/connections.c:158 ../cli/src/connections.c:160
+#: ../cli/src/connections.c:196 ../cli/src/connections.c:198
+#: ../cli/src/connections.c:205 ../cli/src/connections.c:207
+#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
+msgid "UUID"
+msgstr "UUID"
+
+#: ../cli/src/connections.c:158 ../cli/src/connections.c:160
+#: ../cli/src/connections.c:196 ../cli/src/connections.c:198
+#: ../cli/src/connections.c:205 ../cli/src/connections.c:207
+#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
+msgid "Name"
+msgstr "Nombre"
+
+#: ../cli/src/connections.c:163
 #, c-format
-msgid "Auto %s"
-msgstr "Auto %ss"
+msgid "System connections:\n"
+msgstr ""
+
+#: ../cli/src/connections.c:167
+#, c-format
+msgid "User connections:\n"
+msgstr ""
+
+#: ../cli/src/connections.c:178 ../cli/src/connections.c:967
+#: ../cli/src/connections.c:983 ../cli/src/connections.c:992
+#: ../cli/src/connections.c:1003 ../cli/src/connections.c:1085
+#: ../cli/src/devices.c:604 ../cli/src/devices.c:614 ../cli/src/devices.c:699
+#: ../cli/src/devices.c:785 ../cli/src/devices.c:792
+#, c-format
+msgid "Error: %s argument is missing."
+msgstr ""
+
+#: ../cli/src/connections.c:189
+#, c-format
+msgid "Error: %s - no such connection."
+msgstr ""
+
+#: ../cli/src/connections.c:196
+msgid "System-wide connections"
+msgstr ""
+
+#: ../cli/src/connections.c:205
+msgid "User connections"
+msgstr ""
+
+#: ../cli/src/connections.c:212 ../cli/src/connections.c:1016
+#: ../cli/src/connections.c:1103 ../cli/src/devices.c:446
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:628 ../cli/src/devices.c:706
+#: ../cli/src/devices.c:798
+#, c-format
+msgid "Unknown parameter: %s\n"
+msgstr ""
+
+#: ../cli/src/connections.c:221
+#, c-format
+msgid "Error: no valid parameter specified."
+msgstr ""
+
+#. FIXME: Fix the output
+#: ../cli/src/connections.c:268 ../cli/src/devices.c:302
+#: ../cli/src/devices.c:321 ../cli/src/devices.c:353 ../cli/src/devices.c:355
+#: ../cli/src/devices.c:357 ../cli/src/devices.c:359 ../cli/src/devices.c:361
+msgid "yes"
+msgstr "sí"
+
+#: ../cli/src/connections.c:268 ../cli/src/devices.c:304
+msgid "no"
+msgstr "no"
+
+#: ../cli/src/connections.c:297
+msgid "Active connections"
+msgstr "Conexiones activas"
+
+#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
+#: ../cli/src/devices.c:302 ../cli/src/devices.c:304
+msgid "Default"
+msgstr "Predeterminada"
+
+#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
+msgid "Service"
+msgstr "Servicio"
+
+#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
+msgid "Devices"
+msgstr "Dispositivos"
+
+#: ../cli/src/connections.c:659
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr ""
+
+#: ../cli/src/connections.c:667
+#, c-format
+msgid "no active connection or device"
+msgstr ""
+
+#: ../cli/src/connections.c:730
+msgid "activating"
+msgstr "activando"
+
+#: ../cli/src/connections.c:732
+msgid "activated"
+msgstr "activada"
+
+#: ../cli/src/connections.c:735 ../cli/src/connections.c:758
+#: ../cli/src/connections.c:791 ../cli/src/devices.c:111
+#: ../cli/src/network-manager.c:76 ../cli/src/network-manager.c:98
+msgid "unknown"
+msgstr "desconocido"
+
+#: ../cli/src/connections.c:744
+msgid "VPN connecting (prepare)"
+msgstr ""
+
+#: ../cli/src/connections.c:746
+msgid "VPN connecting (need authentication)"
+msgstr ""
+
+#: ../cli/src/connections.c:748
+msgid "VPN connecting"
+msgstr ""
+
+#: ../cli/src/connections.c:750
+msgid "VPN connecting (getting IP configuration)"
+msgstr ""
+
+#: ../cli/src/connections.c:752
+msgid "VPN connected"
+msgstr ""
+
+#: ../cli/src/connections.c:754
+msgid "VPN connection failed"
+msgstr ""
+
+#: ../cli/src/connections.c:756
+msgid "VPN disconnected"
+msgstr ""
+
+#: ../cli/src/connections.c:767
+msgid "unknown reason"
+msgstr "razón desconocida"
+
+#: ../cli/src/connections.c:769
+msgid "none"
+msgstr "ninguna"
+
+#: ../cli/src/connections.c:771
+msgid "the user was disconnected"
+msgstr ""
+
+#: ../cli/src/connections.c:773
+msgid "the base network connection was interrupted"
+msgstr ""
+
+#: ../cli/src/connections.c:775
+msgid "the VPN service stopped unexpectedly"
+msgstr ""
+
+#: ../cli/src/connections.c:777
+msgid "the VPN service returned invalid configuration"
+msgstr ""
+
+#: ../cli/src/connections.c:779
+msgid "the connection attempt timed out"
+msgstr ""
+
+#: ../cli/src/connections.c:781
+msgid "the VPN service did not start in time"
+msgstr ""
+
+#: ../cli/src/connections.c:783
+msgid "the VPN service failed to start"
+msgstr ""
+
+#: ../cli/src/connections.c:785
+msgid "no valid VPN secrets"
+msgstr ""
+
+#: ../cli/src/connections.c:787
+msgid "invalid VPN secrets"
+msgstr ""
+
+#: ../cli/src/connections.c:789
+msgid "the connection was removed"
+msgstr ""
+
+#: ../cli/src/connections.c:803
+#, c-format
+msgid "state: %s\n"
+msgstr "estado: %s\n"
+
+#: ../cli/src/connections.c:806 ../cli/src/connections.c:832
+#, c-format
+msgid "Connection activated\n"
+msgstr ""
+
+#: ../cli/src/connections.c:809
+#, c-format
+msgid "Error: Connection activation failed."
+msgstr ""
+
+#: ../cli/src/connections.c:828
+#, c-format
+msgid "state: %s (%d)\n"
+msgstr ""
+
+#: ../cli/src/connections.c:838
+#, c-format
+msgid "Error: Connection activation failed: %s."
+msgstr ""
+
+#: ../cli/src/connections.c:855 ../cli/src/devices.c:551
+#, c-format
+msgid "Error: Timeout %d sec expired."
+msgstr ""
+
+#: ../cli/src/connections.c:898
+#, c-format
+msgid "Error: Connection activation failed: %s"
+msgstr ""
+
+#: ../cli/src/connections.c:912
+#, c-format
+msgid "Error: Obtaining active connection for '%s' failed."
+msgstr ""
+
+#: ../cli/src/connections.c:921
+#, c-format
+msgid "Active connection state: %s\n"
+msgstr ""
+
+#: ../cli/src/connections.c:922
+#, c-format
+msgid "Active connection path: %s\n"
+msgstr ""
+
+#: ../cli/src/connections.c:976 ../cli/src/connections.c:1094
+#, c-format
+msgid "Error: Unknown connection: %s."
+msgstr ""
+
+#: ../cli/src/connections.c:1011 ../cli/src/devices.c:622
+#, c-format
+msgid "Error: timeout value '%s' is not valid."
+msgstr ""
+
+#: ../cli/src/connections.c:1024 ../cli/src/connections.c:1111
+#, c-format
+msgid "Error: id or uuid has to be specified."
+msgstr ""
+
+#: ../cli/src/connections.c:1044
+#, c-format
+msgid "Error: No suitable device found: %s."
+msgstr ""
+
+#: ../cli/src/connections.c:1046
+#, c-format
+msgid "Error: No suitable device found."
+msgstr ""
+
+#: ../cli/src/connections.c:1138
+#, c-format
+msgid "Warning: Connection not active\n"
+msgstr ""
+
+#: ../cli/src/connections.c:1189
+#, c-format
+msgid "Error: 'con' command '%s' is not valid."
+msgstr ""
+
+#: ../cli/src/connections.c:1216
+#, c-format
+msgid "Error: could not connect to D-Bus."
+msgstr ""
+
+#: ../cli/src/connections.c:1223
+#, c-format
+msgid "Error: Could not get system settings."
+msgstr ""
+
+#: ../cli/src/connections.c:1231
+#, c-format
+msgid "Error: Could not get user settings."
+msgstr ""
+
+#: ../cli/src/connections.c:1241
+#, c-format
+msgid "Error: Can't obtain connections: settings services are not running."
+msgstr ""
+
+#: ../cli/src/devices.c:73
+#, c-format
+msgid ""
+"Usage: nmcli dev { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi }\n"
+"\n"
+"  status\n"
+"  list [iface <iface>]\n"
+"  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
+"  wifi [list [iface <iface>] | apinfo iface <iface> hwaddr <hwaddr>]\n"
+"\n"
+msgstr ""
+
+#: ../cli/src/devices.c:93
+msgid "unmanaged"
+msgstr ""
+
+#: ../cli/src/devices.c:95
+msgid "unavailable"
+msgstr ""
+
+#: ../cli/src/devices.c:97 ../cli/src/network-manager.c:73
+msgid "disconnected"
+msgstr ""
+
+#: ../cli/src/devices.c:99
+msgid "connecting (prepare)"
+msgstr ""
+
+#: ../cli/src/devices.c:101
+msgid "connecting (configuring)"
+msgstr ""
+
+#: ../cli/src/devices.c:103
+msgid "connecting (need authentication)"
+msgstr ""
+
+#: ../cli/src/devices.c:105
+msgid "connecting (getting IP configuration)"
+msgstr ""
+
+#: ../cli/src/devices.c:107 ../cli/src/network-manager.c:71
+msgid "connected"
+msgstr ""
+
+#: ../cli/src/devices.c:109
+msgid "connection failed"
+msgstr ""
+
+#: ../cli/src/devices.c:132 ../cli/src/devices.c:876
+msgid "Unknown"
+msgstr ""
+
+#. print them
+#: ../cli/src/devices.c:164 ../cli/src/devices.c:266 ../cli/src/devices.c:861
+#: ../cli/src/devices.c:879
+msgid "(none)"
+msgstr ""
+
+#: ../cli/src/devices.c:209
+#, c-format
+msgid "%s: error converting IP4 address 0x%X"
+msgstr ""
+
+#: ../cli/src/devices.c:238
+#, c-format
+msgid "%s, %s, Freq %d MHz, Rate %d Mb/s, Strength %d"
+msgstr ""
+
+#: ../cli/src/devices.c:239
+msgid "Ad-Hoc"
+msgstr ""
+
+#: ../cli/src/devices.c:248
+msgid ", Encrypted: "
+msgstr ""
+
+#: ../cli/src/devices.c:253
+msgid " WEP"
+msgstr ""
+
+#: ../cli/src/devices.c:255
+msgid " WPA"
+msgstr ""
+
+#: ../cli/src/devices.c:257
+msgid " WPA2"
+msgstr ""
+
+#: ../cli/src/devices.c:260
+msgid " Enterprise"
+msgstr ""
+
+#: ../cli/src/devices.c:294 ../cli/src/devices.c:458 ../cli/src/devices.c:460
+msgid "Device"
+msgstr ""
+
+#: ../cli/src/devices.c:299
+msgid "Driver"
+msgstr ""
+
+#: ../cli/src/devices.c:299 ../cli/src/devices.c:567
+msgid "(unknown)"
+msgstr ""
+
+#: ../cli/src/devices.c:300 ../cli/src/devices.c:458 ../cli/src/devices.c:460
+msgid "State"
+msgstr ""
+
+#: ../cli/src/devices.c:313
+msgid "HW Address"
+msgstr ""
+
+#: ../cli/src/devices.c:319
+#, c-format
+msgid ""
+"\n"
+"  Capabilities:\n"
+msgstr ""
+
+#: ../cli/src/devices.c:321
+msgid "Carrier Detect"
+msgstr ""
+
+#: ../cli/src/devices.c:336
+#, c-format
+msgid "%u Mb/s"
+msgstr ""
+
+#: ../cli/src/devices.c:337
+msgid "Speed"
+msgstr ""
+
+#: ../cli/src/devices.c:348
+#, c-format
+msgid ""
+"\n"
+"  Wireless Properties\n"
+msgstr ""
+
+#: ../cli/src/devices.c:353
+msgid "WEP Encryption"
+msgstr ""
+
+#: ../cli/src/devices.c:355
+msgid "WPA Encryption"
+msgstr ""
+
+#: ../cli/src/devices.c:357
+msgid "WPA2 Encryption"
+msgstr ""
+
+#: ../cli/src/devices.c:359
+msgid "TKIP cipher"
+msgstr ""
+
+#: ../cli/src/devices.c:361
+msgid "CCMP cipher"
+msgstr ""
+
+#: ../cli/src/devices.c:368
+#, c-format
+msgid ""
+"\n"
+"  Wireless Access Points %s\n"
+msgstr ""
+
+#: ../cli/src/devices.c:368
+msgid "(* = current AP)"
+msgstr ""
+
+#: ../cli/src/devices.c:374
+#, c-format
+msgid ""
+"\n"
+"  Wired Properties\n"
+msgstr ""
+
+#: ../cli/src/devices.c:377 ../cli/src/devices.c:379
+msgid "Carrier"
+msgstr ""
+
+#: ../cli/src/devices.c:377
+msgid "on"
+msgstr ""
+
+#: ../cli/src/devices.c:379
+msgid "off"
+msgstr ""
+
+#: ../cli/src/devices.c:387
+#, c-format
+msgid ""
+"\n"
+"  IPv4 Settings:\n"
+msgstr ""
+
+#: ../cli/src/devices.c:395
+msgid "Address"
+msgstr ""
+
+#: ../cli/src/devices.c:401
+msgid "Prefix"
+msgstr ""
+
+#: ../cli/src/devices.c:405
+msgid "Gateway"
+msgstr ""
+
+#: ../cli/src/devices.c:416
+msgid "DNS"
+msgstr ""
+
+#: ../cli/src/devices.c:458
+msgid "Status of devices"
+msgstr ""
+
+#: ../cli/src/devices.c:487
+#, c-format
+msgid "Error: '%s' argument is missing."
+msgstr ""
+
+#: ../cli/src/devices.c:516 ../cli/src/devices.c:655 ../cli/src/devices.c:729
+#, c-format
+msgid "Error: Device '%s' not found."
+msgstr ""
+
+#: ../cli/src/devices.c:539
+#, c-format
+msgid "Success: Device '%s' successfully disconnected."
+msgstr ""
+
+#: ../cli/src/devices.c:564
+#, c-format
+msgid "Error: Device '%s' (%s) disconnecting failed: %s"
+msgstr ""
+
+#: ../cli/src/devices.c:572
+#, c-format
+msgid "Device state: %d (%s)\n"
+msgstr ""
+
+#: ../cli/src/devices.c:636
+#, c-format
+msgid "Error: iface has to be specified."
+msgstr ""
+
+#: ../cli/src/devices.c:736 ../cli/src/devices.c:746
+msgid "WiFi scan list"
+msgstr ""
+
+#: ../cli/src/devices.c:740
+#, c-format
+msgid "Error: Device '%s' is not a WiFi device."
+msgstr ""
+
+#: ../cli/src/devices.c:754
+msgid "Device:"
+msgstr ""
+
+#: ../cli/src/devices.c:806
+#, c-format
+msgid "Error: hwaddr has to be specified."
+msgstr ""
+
+#: ../cli/src/devices.c:844
+#, c-format
+msgid "Error: Access point with hwaddr '%s' not found."
+msgstr ""
+
+#: ../cli/src/devices.c:862
+#, c-format
+msgid "%u MHz"
+msgstr ""
+
+#: ../cli/src/devices.c:863
+#, c-format
+msgid "%u MB/s"
+msgstr ""
+
+#: ../cli/src/devices.c:869 ../cli/src/devices.c:871
+msgid "AP parameters"
+msgstr ""
+
+#: ../cli/src/devices.c:873
+msgid "SSID:"
+msgstr ""
+
+#: ../cli/src/devices.c:874
+msgid "BSSID:"
+msgstr ""
+
+#: ../cli/src/devices.c:875
+msgid "Frequency:"
+msgstr ""
+
+#: ../cli/src/devices.c:876
+msgid "Mode:"
+msgstr ""
+
+#: ../cli/src/devices.c:876
+msgid "Ad-hoc"
+msgstr ""
+
+#: ../cli/src/devices.c:876
+msgid "Infrastructure"
+msgstr ""
+
+#: ../cli/src/devices.c:877
+msgid "Maximal bitrate:"
+msgstr ""
+
+#: ../cli/src/devices.c:878
+msgid "Strength:"
+msgstr ""
+
+#: ../cli/src/devices.c:879
+msgid "Flags:"
+msgstr ""
+
+#: ../cli/src/devices.c:879
+msgid "privacy"
+msgstr ""
+
+#: ../cli/src/devices.c:880
+msgid "WPA flags:"
+msgstr ""
+
+#: ../cli/src/devices.c:881
+msgid "RSN flags:"
+msgstr ""
+
+#: ../cli/src/devices.c:907
+#, c-format
+msgid "Error: 'dev wifi' command '%s' is not valid."
+msgstr ""
+
+#: ../cli/src/devices.c:943
+#, c-format
+msgid "Error: 'dev' command '%s' is not valid."
+msgstr ""
+
+#: ../cli/src/network-manager.c:46
+#, c-format
+msgid ""
+"Usage: nmcli nm { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"\n"
+"  status\n"
+"  sleep\n"
+"  wakeup\n"
+"  wifi [on|off]\n"
+"  wwan [on|off]\n"
+"\n"
+msgstr ""
+
+#: ../cli/src/network-manager.c:67
+msgid "asleep"
+msgstr ""
+
+#: ../cli/src/network-manager.c:69
+msgid "connecting"
+msgstr ""
+
+#: ../cli/src/network-manager.c:93 ../cli/src/network-manager.c:94
+#: ../cli/src/network-manager.c:95 ../cli/src/network-manager.c:96
+#: ../cli/src/network-manager.c:143 ../cli/src/network-manager.c:160
+msgid "enabled"
+msgstr ""
+
+#: ../cli/src/network-manager.c:93 ../cli/src/network-manager.c:94
+#: ../cli/src/network-manager.c:95 ../cli/src/network-manager.c:96
+#: ../cli/src/network-manager.c:143 ../cli/src/network-manager.c:160
+msgid "disabled"
+msgstr ""
+
+#: ../cli/src/network-manager.c:102
+msgid "NetworkManager status"
+msgstr ""
+
+#: ../cli/src/network-manager.c:104
+msgid "NM running:"
+msgstr ""
+
+#: ../cli/src/network-manager.c:104
+msgid "running"
+msgstr ""
+
+#: ../cli/src/network-manager.c:104
+msgid "not running"
+msgstr ""
+
+#: ../cli/src/network-manager.c:105
+msgid "NM state:"
+msgstr ""
+
+#: ../cli/src/network-manager.c:106
+msgid "NM wireless hardware:"
+msgstr ""
+
+#. no argument, show current state
+#: ../cli/src/network-manager.c:107 ../cli/src/network-manager.c:143
+msgid "NM wireless:"
+msgstr ""
+
+#: ../cli/src/network-manager.c:108
+msgid "NM WWAN hardware:"
+msgstr ""
+
+#. no argument, show current state
+#: ../cli/src/network-manager.c:109 ../cli/src/network-manager.c:160
+msgid "NM WWAN:"
+msgstr ""
+
+#: ../cli/src/network-manager.c:150
+#, c-format
+msgid "Error: invalid 'wifi' parameter: '%s'."
+msgstr ""
+
+#: ../cli/src/network-manager.c:167
+#, c-format
+msgid "Error: invalid 'wwan' parameter: '%s'."
+msgstr ""
+
+#: ../cli/src/network-manager.c:178
+#, c-format
+msgid "Error: 'nm' command '%s' is not valid."
+msgstr ""
+
+#: ../cli/src/nmcli.c:65
+#, c-format
+msgid ""
+"Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+"\n"
+"OPTIONS\n"
+"  -t[erse]    terse output\n"
+"  -p[retty]   pretty output\n"
+"  -v[ersion]  show program version\n"
+"  -h[elp]     print this help\n"
+"\n"
+"OBJECT\n"
+"  nm          NetworkManager status\n"
+"  con         NetworkManager connections\n"
+"  dev         devices managed by NetworkManager\n"
+"\n"
+msgstr ""
+
+#: ../cli/src/nmcli.c:106
+#, c-format
+msgid "Object '%s' is unknown, try 'nmcli help'."
+msgstr ""
+
+#: ../cli/src/nmcli.c:139
+#, c-format
+msgid "nmcli tool, version %s\n"
+msgstr ""
+
+#: ../cli/src/nmcli.c:145
+#, c-format
+msgid "Option '%s' is unknown, try 'nmcli -help'."
+msgstr ""
+
+#: ../cli/src/nmcli.c:164
+#, c-format
+msgid "Caught signal %d, shutting down..."
+msgstr ""
+
+#: ../cli/src/nmcli.c:189
+#, c-format
+msgid "Error: Could not connect to NetworkManager."
+msgstr ""
+
+#: ../cli/src/nmcli.c:205
+msgid "Success"
+msgstr ""
 
 #: ../libnm-util/crypto.c:120
 #, c-format
@@ -184,8 +903,9 @@ msgstr "No hay memoria suficiente para almacenar la IV."
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV contiene dígitos no hexadecimales."
 
-#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:143
-#: ../libnm-util/crypto_nss.c:169
+#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:148
+#: ../libnm-util/crypto_gnutls.c:266 ../libnm-util/crypto_nss.c:171
+#: ../libnm-util/crypto_nss.c:336
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "Se desconocía el cifrador de clave privada «%s»."
@@ -205,71 +925,111 @@ msgstr "No se pudo determinar el tipo de clave privada."
 msgid "Not enough memory to store decrypted private key."
 msgstr "No hay memoria suficiente para almacenar la clave privada descifrada."
 
-#: ../libnm-util/crypto_gnutls.c:46
+#: ../libnm-util/crypto_gnutls.c:49
 msgid "Failed to initialize the crypto engine."
 msgstr "Falló al inicializar el motor de descifrado."
 
-#: ../libnm-util/crypto_gnutls.c:90
+#: ../libnm-util/crypto_gnutls.c:93
 #, 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:152 ../libnm-util/crypto_nss.c:178
+#: ../libnm-util/crypto_gnutls.c:156
+#, c-format
+msgid "Invalid IV length (must be at least %zd)."
+msgstr ""
+
+#: ../libnm-util/crypto_gnutls.c:165 ../libnm-util/crypto_nss.c:188
 #, c-format
 msgid "Not enough memory for decrypted key buffer."
 msgstr "No hay memoria suficiente para el búfer de la clave descifrada."
 
-#: ../libnm-util/crypto_gnutls.c:160
+#: ../libnm-util/crypto_gnutls.c:173
 #, 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:169
+#: ../libnm-util/crypto_gnutls.c:182
 #, 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:178
+#: ../libnm-util/crypto_gnutls.c:191
 #, 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:187
+#: ../libnm-util/crypto_gnutls.c:200
 #, 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:200
+#: ../libnm-util/crypto_gnutls.c:210 ../libnm-util/crypto_nss.c:267
+#, c-format
+#| msgid "Failed to decrypt the private key: %d."
+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:221 ../libnm-util/crypto_nss.c:278
 #, c-format
 msgid "Failed to decrypt the private key."
 msgstr "Falló al descifrar la clave privada."
 
-#: ../libnm-util/crypto_gnutls.c:235
+#: ../libnm-util/crypto_gnutls.c:286 ../libnm-util/crypto_nss.c:356
+#, c-format
+msgid "Could not allocate memory for encrypting."
+msgstr "No se pudo reservar memoria para el cifrado."
+
+#: ../libnm-util/crypto_gnutls.c:294
+#, c-format
+#| msgid "Failed to initialize the decryption cipher context: %s / %s."
+msgid "Failed to initialize the encryption cipher context: %s / %s."
+msgstr "Falló al inicializar el contexto de cifrado: %s / %s."
+
+#: ../libnm-util/crypto_gnutls.c:303
+#, c-format
+#| msgid "Failed to set symmetric key for decryption: %s / %s."
+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:313
+#, c-format
+#| msgid "Failed to set IV for decryption: %s / %s."
+msgid "Failed to set IV for encryption: %s / %s."
+msgstr "Falló al establecer IV para el cifrado: %s / %s."
+
+#: ../libnm-util/crypto_gnutls.c:322
+#, c-format
+#| msgid "Failed to decrypt the private key: %s / %s."
+msgid "Failed to encrypt the data: %s / %s."
+msgstr "Falló al cifrar los datos: %s / %s."
+
+#: ../libnm-util/crypto_gnutls.c:362
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "Error al inicializar los datos del certificado: %s"
 
-#: ../libnm-util/crypto_gnutls.c:257
+#: ../libnm-util/crypto_gnutls.c:384
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "No se pudo decodificar el certificado: %s"
 
-#: ../libnm-util/crypto_gnutls.c:281
+#: ../libnm-util/crypto_gnutls.c:408
 #, 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:294
+#: ../libnm-util/crypto_gnutls.c:421
 #, 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:306
+#: ../libnm-util/crypto_gnutls.c:433
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "No se pudo verificar el archivo PKCS#12: %s"
 
-#: ../libnm-util/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."
@@ -279,62 +1039,268 @@ msgstr "Falló al inicializar el motor de cifrado: %d."
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "Falló al inicializar el contexto MD5: %d"
 
-#: ../libnm-util/crypto_nss.c:186
+#: ../libnm-util/crypto_nss.c:179
+#, c-format
+msgid "Invalid IV length (must be at least %d)."
+msgstr ""
+
+#: ../libnm-util/crypto_nss.c:196
 #, 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-util/crypto_nss.c:206
 #, 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-util/crypto_nss.c:216
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "Falló al establecer IV para el descifrado."
 
-#: ../libnm-util/crypto_nss.c:214
+#: ../libnm-util/crypto_nss.c:224
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "Falló al inicializar el contexto de descifrado."
 
-#: ../libnm-util/crypto_nss.c:227
+#: ../libnm-util/crypto_nss.c:237
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "Falló al descifrar la clave privada: %d."
 
-#: ../libnm-util/crypto_nss.c:239
+#: ../libnm-util/crypto_nss.c:245
+#, c-format
+#| msgid "Failed to decrypt the private key: %d."
+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:256
 #, 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:284
+#: ../libnm-util/crypto_nss.c:364
+#, c-format
+#| msgid "Failed to initialize the decryption cipher slot."
+msgid "Failed to initialize the encryption cipher slot."
+msgstr "Falló al inicializar la ranura de cifrado."
+
+#: ../libnm-util/crypto_nss.c:372
+#, c-format
+#| msgid "Failed to set symmetric key for decryption."
+msgid "Failed to set symmetric key for encryption."
+msgstr "Falló al establecer la clave simétrica para el cifrado."
+
+#: ../libnm-util/crypto_nss.c:380
+#, c-format
+#| msgid "Failed to set IV for decryption."
+msgid "Failed to set IV for encryption."
+msgstr "Falló al establecer IV para el cifrado."
+
+#: ../libnm-util/crypto_nss.c:388
+#, c-format
+#| msgid "Failed to initialize the decryption context."
+msgid "Failed to initialize the encryption context."
+msgstr "Falló al inicializar el contexto de cifrado."
+
+#: ../libnm-util/crypto_nss.c:396
+#, c-format
+#| msgid "Failed to decrypt the private key: %d."
+msgid "Failed to encrypt: %d."
+msgstr "Falló al cifrar: %d."
+
+#: ../libnm-util/crypto_nss.c:404
+#, c-format
+msgid "Unexpected amount of data after encrypting."
+msgstr ""
+
+#: ../libnm-util/crypto_nss.c:447
 #, c-format
 msgid "Couldn't decode certificate: %d"
 msgstr "No se pudo decodificar el certificado: %d"
 
-#: ../libnm-util/crypto_nss.c:317
+#: ../libnm-util/crypto_nss.c:482
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "No se pudo convertir la contraseña a UCS2: %d"
 
-#: ../libnm-util/crypto_nss.c:345
+#: ../libnm-util/crypto_nss.c:510
 #, 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:354
+#: ../libnm-util/crypto_nss.c:519
 #, 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:363
+#: ../libnm-util/crypto_nss.c:528
 #, c-format
 msgid "Couldn't verify PKCS#12 file: %d"
 msgstr "No se pudo verificar el archivo PKCS#12: %d"
 
-#~ msgid "Not enough memory to create private key decryption key."
-#~ msgstr ""
-#~ "No hay memoria suficiente para crear la clave privada de la clave de "
-#~ "descifrado."
+#: ../libnm-util/crypto_nss.c:557
+#| msgid "Could not decode private key."
+msgid "Could not generate random data."
+msgstr "No se pudo generar datos aleatorios."
+
+#: ../libnm-util/nm-utils.c:1545
+#, c-format
+#| msgid "Not enough memory to create private key decryption key."
+msgid "Not enough memory to make encryption key."
+msgstr "No hay memoria suficiente para crear la clave privada de cifrado."
+
+#: ../libnm-util/nm-utils.c:1655
+#| msgid "Not enough memory to store PEM file data."
+msgid "Could not allocate memory for PEM file creation."
+msgstr "No se pudo reservar memoria para crear el archivo PEM."
+
+#: ../libnm-util/nm-utils.c:1667
+#, c-format
+msgid "Could not allocate memory for writing IV to PEM file."
+msgstr ""
+
+#: ../libnm-util/nm-utils.c:1679
+#, c-format
+msgid "Could not allocate memory for writing encrypted key to PEM file."
+msgstr ""
+
+#: ../libnm-util/nm-utils.c:1698
+#, c-format
+#| msgid "Not enough memory to store PEM file data."
+msgid "Could not allocate memory for PEM file data."
+msgstr "No se pudo reservar memoria para el archivo de datos PEM."
+
+#: ../src/nm-netlink-monitor.c:194 ../src/nm-netlink-monitor.c:464
+#: ../src/nm-netlink-monitor.c:582
+#: ../src/ip6-manager/nm-netlink-listener.c:352
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "error al procesar el mensaje de netlink: %s"
+
+#: ../src/nm-netlink-monitor.c:260
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr ""
+"no se puede asignar el manejador netlink para monitorizar el estado del "
+"enlace: %s"
+
+#: ../src/nm-netlink-monitor.c:270
+#, 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/nm-netlink-monitor.c:278
+#, c-format
+msgid "unable to join netlink group for monitoring link status: %s"
+msgstr ""
+"no pudo unirse al grupo netlink para monitorizar el estado del enlace: %s"
+
+#: ../src/nm-netlink-monitor.c:286
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr ""
+"no se puede asignar el enlace a la caché de netlink para monitorizar el "
+"estado del enlace: %s"
+
+#: ../src/nm-netlink-monitor.c:494
+#: ../src/ip6-manager/nm-netlink-listener.c:382
+msgid "error occurred while waiting for data on socket"
+msgstr "ha ocurrido un error mientras esperaban datos en un socket"
+
+#: ../src/nm-netlink-monitor.c:558 ../src/nm-netlink-monitor.c:571
+#, c-format
+msgid "error updating link cache: %s"
+msgstr "error al actualizar el enlace caché: %s"
+
+#: ../src/NetworkManager.c:494
+#, 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/dhcp-manager/nm-dhcp-dhclient.c:300
+msgid "# Created by NetworkManager\n"
+msgstr "# Creado por NetworkManager\n"
+
+#: ../src/dhcp-manager/nm-dhcp-dhclient.c:316
+#, c-format
+msgid ""
+"# Merged from %s\n"
+"\n"
+msgstr ""
+"# Mezclado de %s\n"
+"\n"
+
+#: ../src/ip6-manager/nm-netlink-listener.c:200
+#, c-format
+#| msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgid "unable to allocate netlink handle: %s"
+msgstr "no se puede asignar el manejador netlink: %s"
+
+#: ../src/ip6-manager/nm-netlink-listener.c:210
+#, c-format
+#| msgid "unable to connect to netlink for monitoring link status: %s"
+msgid "unable to connect to netlink: %s"
+msgstr "no se puede conectar con netlink: %s"
+
+#: ../src/ip6-manager/nm-netlink-listener.c:307
+#, c-format
+#| msgid "unable to join netlink group for monitoring link status: %s"
+msgid "unable to join netlink group: %s"
+msgstr "no pudo unirse al grupo netlink: %s"
+
+#: ../src/named-manager/nm-named-manager.c:315
+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/named-manager/nm-named-manager.c:317
+msgid "The nameservers listed below may not be recognized."
+msgstr "Puede que los servidores de nombres listados abajo no se reconozcan."
+
+#: ../src/system-settings/nm-default-wired-connection.c:157
+#, c-format
+msgid "Auto %s"
+msgstr "Auto %ss"
+
+#: ../system-settings/plugins/ifcfg-rh/reader.c:3213
+msgid "System"
+msgstr "Sistema"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
+msgid "Connection sharing via a protected WiFi network"
+msgstr ""
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
+msgid "Connection sharing via an open WiFi network"
+msgstr ""
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
+msgid "Modify persistent system hostname"
+msgstr ""
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
+msgid "Modify system connections"
+msgstr ""
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
+msgid "System policy prevents modification of system settings"
+msgstr ""
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr ""
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr ""
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr ""