[network-manager-applet] Updated Esperanto translation



commit cfaa20da35faccf61e56f5a0e43bbcec8b8329b6
Author: Kristjan SCHMIDT <kristjan schmidt googlemail com>
Date:   Thu Mar 20 14:08:07 2014 +0100

    Updated Esperanto translation

 po/eo.po | 4005 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 2659 insertions(+), 1346 deletions(-)
---
diff --git a/po/eo.po b/po/eo.po
index 82b46df..97b2231 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,17 +6,18 @@
 # Michael MORONI, <haikara90 gmail com>, 2009.
 # Patrick OUDEJANS <>, 2009.
 # Aisano <>, 2010.
-# Tiffany Antopolski <tiffany antopolski gmail com>, 2011, 2012.
-# Kristjan SCHMIDT <kristjan schmidt googlemail com>, 2010, 2011.
+# Tiffany ANTOPOLSKI <tiffany antopolski gmail com>, 2011, 2012.
+# Kristjan SCHMIDT <kristjan schmidt googlemail com>, 2010, 2011, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n";
-"POT-Creation-Date: 2012-03-06 17:04+0000\n"
-"PO-Revision-Date: 2012-03-07 18:13+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
+"POT-Creation-Date: 2014-03-20 11:06+0000\n"
+"PO-Revision-Date: 2014-03-20 13:59+0100\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan schmidt googlemail com>\n"
-"Language-Team: Esperanto <ubuntu-l10n-eo lists launchpad net>\n"
+"Language-Team: Esperanto <gnome-l10n-eo lists launchpad net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,466 +35,1002 @@ msgstr "Reto"
 msgid "Manage your network connections"
 msgstr "Kontroli viajn retkonektojn"
 
-#: ../nm-applet.schemas.in.h:1
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "Retkonektoj"
+
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "Administri kaj ŝanĝi viajn retkonektajn agordojn"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "Elŝalti atentigojn pri konektoj"
 
-#: ../nm-applet.schemas.in.h:2
-msgid "Set this to TRUE to disable notifications when connecting to a network."
-msgstr "Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam konektanta al la reto."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#| msgid ""
+#| "Set this to TRUE to disable notifications when connecting to a network."
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+"Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam konektanta al reto."
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
 msgstr "Elŝalti atentigojn pri malkonektoj"
 
-#: ../nm-applet.schemas.in.h:4
-msgid "Set this to TRUE to disable notifications when disconnecting from a network."
-msgstr "Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam malkonektanta al la reto."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#| msgid ""
+#| "Set this to TRUE to disable notifications when disconnecting from a "
+#| "network."
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam malkonektanta al reto."
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#| msgid "Disable connected notifications"
+msgid "Disable VPN notifications"
+msgstr "Elŝalti VPN-atentigojn"
 
-#: ../nm-applet.schemas.in.h:5
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#| msgid ""
+#| "Set this to TRUE to disable notifications when disconnecting from a "
+#| "network."
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam konektante aŭ "
+"malkonektante de VPN."
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
 msgid "Suppress networks available notifications"
 msgstr "Nuligi atentigon pri disponeblaj retoj"
 
-#: ../nm-applet.schemas.in.h:6
-msgid "Set this to TRUE to disable notifications when wireless networks are available."
-msgstr "Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam sendrataj retoj disponeblas."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#| msgid ""
+#| "Set this to TRUE to disable notifications when wireless networks are "
+#| "available."
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Agordi ĉi tiun al 'vera' por elŝalti atentigojn kiam sendrataj retoj "
+"disponeblas."
 
-#: ../nm-applet.schemas.in.h:7
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
 msgstr "Stampo"
 
-#: ../nm-applet.schemas.in.h:8
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "Uzita por determini ĉu agordoj devus esti migrigita al nova versio."
 
-#: ../nm-applet.schemas.in.h:9
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
 msgid "Disable WiFi Create"
 msgstr "Elŝalti kreon de sendrataj konektoj"
 
-#: ../nm-applet.schemas.in.h:10
-msgid "Set to TRUE to disable creation of adhoc networks when using the applet."
-msgstr "Agordi tion ĉi \"vera\", se vi volas elŝalti la kreadon de por-okazaj retoj per la aplikaĵeto."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#| msgid ""
+#| "Set to TRUE to disable creation of adhoc networks when using the applet."
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Agordi tion ĉi \"vera\", se vi volas elŝalti la kreadon de por-okazaj retoj "
+"per la aplikaĵeto."
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Retkonektoj"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
-msgid "Manage and change your network connection settings"
-msgstr "Administri kaj ŝanĝi viajn retkonektajn agordojn"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
 
-#: ../src/applet-device-bt.c:174
-#: ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:446
-#: ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:875
-#: ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "Disponeble"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#| msgid "Choose CA Certificate"
+msgid "Ignore CA certificate"
+msgstr "Ignori CA-atestilon"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#| msgid "Wired 802.1X authentication"
+msgid "802.1X authentication"
+msgstr "802.1X-aŭtentigo"
+
+#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
+#: ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "Ret_nomo:"
+
+#: ../src/applet.c:574
+#| msgid "Failed to create PAN connection: %s"
+msgid "Failed to add/activate connection"
+msgstr "Malsukcesis aldoni/aktivigi konekton"
+
+#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
+#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Nekonata eraro"
+
+#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
+#: ../src/applet-device-wifi.c:1350
+#| msgid "Connection add failed"
+msgid "Connection failure"
+msgstr "Konekto malsukcesis"
+
+#: ../src/applet.c:618
+#| msgid "disconnected"
+msgid "Device disconnect failed"
+msgstr ""
 
-#: ../src/applet-device-bt.c:200
-#: ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:488
-#: ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet.c:623
+#| msgid "Disconnected"
+msgid "Disconnect failure"
+msgstr "Malkonekto malsukcesis"
+
+#: ../src/applet.c:644
+#| msgid "Connection add failed"
+msgid "Connection activation failed"
+msgstr "Konekto-aktivigo malsukcesis"
+
+#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+msgid "Don't show this message again"
+msgstr "Ne remontri tiun mesaĝon"
+
+#: ../src/applet.c:1046
 #, c-format
-msgid "You are now connected to '%s'."
-msgstr "Vi estas konektita al '%s'."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"Malsukcesis VPN-konekto '%s' ĉar retkonekto estis interrompita."
 
-#: ../src/applet-device-bt.c:204
-#: ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:492
-#: ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1278
-#: ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "Konekto establita"
+#: ../src/applet.c:1049
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"Malsukcesis VPN-konekto '%s' ĉar VPN-servo haltigis neatendite."
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "Vi estas nun konektita al la poŝtelefona larĝkapacita reto."
+#: ../src/applet.c:1052
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"Malsukcesis VPN-konekto '%s' ĉar VPN-servo revenigis nevalidan agordon."
 
-#: ../src/applet-device-bt.c:231
-#: ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:528
-#: ../src/applet-device-wimax.c:464
+#: ../src/applet.c:1055
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "Pretigas poŝtelefonan larĝkapacitan konekton '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"Malsukcesis VPN-konekto '%s' ĉar la konekta provo eltempiĝis."
 
-#: ../src/applet-device-bt.c:234
-#: ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:531
-#: ../src/applet-device-wimax.c:467
+#: ../src/applet.c:1058
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "Agordas poŝtelefonan larĝkapacitan konekton '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"Malsukcesis VPN-konekto '%s' ĉar la VPN-servo ne komencis tempe."
 
-#: ../src/applet-device-bt.c:237
-#: ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:534
-#: ../src/applet-device-wimax.c:470
+#: ../src/applet.c:1061
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "Movebla larĝkapacita konekto «%s» necesas aŭtentigon de uzanto..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"Malsukcesis VPN-konekto '%s' ĉar la VPN-servo malsukcesis je la komenco."
+
+#: ../src/applet.c:1064
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"Malsukcesis VPN-konekto '%s' ĉar ne estis validaj VPN-sekretaĵoj."
 
-#: ../src/applet-device-bt.c:240
-#: ../src/applet-device-cdma.c:490
-#: ../src/applet-device-gsm.c:537
-#: ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2479
+#: ../src/applet.c:1067
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"Malsukcesis VPN-konekto '%s' ĉar estis nevalidaj VPN-sekretaĵoj."
+
+#: ../src/applet.c:1074
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"Malsukcesis VPN-konekto '%s' ."
+
+#: ../src/applet.c:1092
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"Malkonektiĝis VPN-konekto '%s' ĉar retkonekto estis interrompita."
+
+#: ../src/applet.c:1095
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"Malkonektiĝis VPN-konekto '%s' ĉar la VPN-servo haltigis."
+
+#: ../src/applet.c:1101
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"Malkonektiĝis VPN-konekto '%s' ."
+
+#: ../src/applet.c:1131
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:1133
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
+
+#: ../src/applet.c:1135
+msgid "VPN Login Message"
+msgstr "VPN-ensalutmesaĝo"
+
+#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+msgid "VPN Connection Failed"
+msgstr "Malsukcesis VPN-konekto"
+
+#: ../src/applet.c:1206
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"Malsukcesis VPN-konekto '%s' ĉar la VPN-servo malsukcesis je la komenco.\n"
+"\n"
+"%s"
+
+#: ../src/applet.c:1209
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"Malsukcesis VPN-konekto '%s' je la komenco.\n"
+"\n"
+"%s"
+
+#: ../src/applet.c:1533
+msgid "device not ready (firmware missing)"
+msgstr "aparato ne pretas (mikroprogramaro mankas)"
+
+#: ../src/applet.c:1535
+msgid "device not ready"
+msgstr "Aparato ne preta"
+
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
+#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+msgid "disconnected"
+msgstr "nekonektite"
+
+#: ../src/applet.c:1561
+msgid "Disconnect"
+msgstr "Malkonekti"
+
+#: ../src/applet.c:1575
+msgid "device not managed"
+msgstr "Aparato ne administrita"
+
+#: ../src/applet.c:1735
+msgid "No network devices available"
+msgstr "Neniuj retaparatoj disponeblaj"
+
+#: ../src/applet.c:1788
+msgid "_VPN Connections"
+msgstr "_VPN-konektoj"
+
+#: ../src/applet.c:1845
+msgid "_Configure VPN..."
+msgstr "_Agordi na VPN..."
+
+#: ../src/applet.c:1849
+msgid "_Disconnect VPN"
+msgstr "_Malkonekti VPN"
+
+#: ../src/applet.c:1965
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager ne estas rulanta..."
+
+#: ../src/applet.c:1970 ../src/applet.c:2940
+msgid "Networking disabled"
+msgstr "Retkonektado elŝaltitas"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:2190
+msgid "Enable _Networking"
+msgstr "Enŝalti _reton"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:2199
+#| msgid "Enable _Wireless"
+msgid "Enable _Wi-Fi"
+msgstr "Enŝalti _sendratan reton"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:2208
+msgid "Enable _Mobile Broadband"
+msgstr "Enŝalti _moveblan larĝkapacitan konekton"
+
+#. 'Enable WiMAX Mobile Broadband' item
+#: ../src/applet.c:2217
+msgid "Enable WiMA_X Mobile Broadband"
+msgstr "Enŝalti WiMAX-larĝkapacitan konekton"
+
+#. Toggle notifications item
+#: ../src/applet.c:2228
+msgid "Enable N_otifications"
+msgstr "Enŝalti atentig_ojn"
+
+#. 'Connection Information' item
+#: ../src/applet.c:2239
+msgid "Connection _Information"
+msgstr "Konektaj _informoj"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:2249
+msgid "Edit Connections..."
+msgstr "Redakti konektojn..."
+
+#. Help item
+#: ../src/applet.c:2263
+msgid "_Help"
+msgstr "_Helpo"
+
+#. About item
+#: ../src/applet.c:2272
+msgid "_About"
+msgstr "_Pri"
+
+#: ../src/applet.c:2525
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "Vi estas konektita al '%s'."
+
+#: ../src/applet.c:2566
+msgid "Disconnected"
+msgstr "Malkonektita"
+
+#: ../src/applet.c:2567
+msgid "The network connection has been disconnected."
+msgstr "La retkonekto estas malkonektigita."
+
+#: ../src/applet.c:2802
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "Agordanta retkonekton '%s'..."
+
+#: ../src/applet.c:2805
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "Retkonekto '%s' necesas uzantan aŭtentigon..."
+
+#: ../src/applet.c:2808 ../src/applet-device-bt.c:136
+#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Petanta retan adreson por '%s'..."
 
-#: ../src/applet-device-bt.c:244
-#: ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:555
+#: ../src/applet.c:2811
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "Poŝtelefona larĝkapacita konekto '%s' aktivas"
+msgid "Network connection '%s' active"
+msgstr "Retkonekto '%s' aktiva"
 
-#: ../src/applet-device-cdma.c:184
-#: ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:2894
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "Komencanta VPN-konekton '%s'..."
 
-#: ../src/applet-device-cdma.c:345
-#: ../src/applet-device-gsm.c:392
-#: ../src/applet-dialogs.c:430
+#: ../src/applet.c:2897
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Poŝtelefona larĝkapacita reto (%s)"
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "VPN-retkonekto '%s' necesas uzantan aŭtentigon..."
 
-#: ../src/applet-device-cdma.c:347
-#: ../src/applet-device-gsm.c:394
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1511
-msgid "Mobile Broadband"
-msgstr "Poŝtelefona larĝkapacita reto"
+#: ../src/applet.c:2900
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "Petanta VPN-adreson por '%s'..."
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:412
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Nova poŝtelefona larĝkapacita (CDMA) konekto..."
+#: ../src/applet.c:2903
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "VPN-konekto '%s' aktiva"
 
-#: ../src/applet-device-cdma.c:446
-msgid "You are now connected to the CDMA network."
-msgstr "Vi estas konektita al la CDMA-reto."
+#: ../src/applet.c:2945
+msgid "No network connection"
+msgstr "Neniu retkonekto"
 
-#: ../src/applet-device-cdma.c:503
-#: ../src/applet-device-gsm.c:550
-#: ../src/applet-device-wimax.c:482
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Poŝtelefona larĝkapacita konekto '%s' aktivas: (%d%%%s%s)"
+#: ../src/applet.c:3615
+msgid "NetworkManager Applet"
+msgstr "Apleto por NetworkManager"
 
-#: ../src/applet-device-cdma.c:506
-#: ../src/applet-device-gsm.c:553
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "retmigrado"
+#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
+#: ../src/applet-device-broadband.c:769 ../src/applet-device-bt.c:90
+#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
+#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
+#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
+#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
+msgid "Available"
+msgstr "Disponeble"
 
-#: ../src/applet-device-cdma.c:647
-#: ../src/applet-device-cdma.c:653
-msgid "CDMA network."
-msgstr "CDMA-reto."
+#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
+#: ../src/applet-device-broadband.c:796 ../src/applet-device-bt.c:102
+#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
+#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
+#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
+#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
+msgid "Connection Established"
+msgstr "Konekto estas starigita"
 
-#: ../src/applet-device-cdma.c:648
-#: ../src/applet-device-gsm.c:1198
-msgid "You are now registered on the home network."
-msgstr "Vi estas nun registrita en la hejma reto."
+#: ../src/applet-device-bond.c:90
+#| msgid "You are now connected to the wired network."
+msgid "You are now connected to the bonded network."
+msgstr "Vi estas nun konektite al la drata reto."
 
-#: ../src/applet-device-cdma.c:654
-#: ../src/applet-device-gsm.c:1204
-msgid "You are now registered on a roaming network."
-msgstr "Vi estas nun registrita en la retmigra reto."
+#: ../src/applet-device-bond.c:114
+#, c-format
+#| msgid "Preparing network connection '%s'..."
+msgid "Preparing bond connection '%s'..."
+msgstr "Agordante dratan konekton '%s'..."
 
-#: ../src/applet-device-gsm.c:213
-#: ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet-device-bond.c:117
+#, c-format
+#| msgid "Configuring mobile broadband connection '%s'..."
+msgid "Configuring bond connection '%s'..."
+msgstr "Agordas dratan konekton '%s'..."
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:459
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Nova port-larĝkapacita (GSM) konekto..."
+#: ../src/applet-device-bond.c:120
+#, c-format
+#| msgid "User authentication required for VPN connection '%s'..."
+msgid "User authentication required for bond connection '%s'..."
+msgstr "Drata retkonekto '%s' bezonas uzantan aŭtentigon..."
 
-#: ../src/applet-device-gsm.c:493
-msgid "You are now connected to the GSM network."
-msgstr "Vi estas nun konektite al la GSM-reto."
+#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
+#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
+#: ../src/applet-device-vlan.c:237
+#, c-format
+#| msgid "Requesting a VPN address for '%s'..."
+msgid "Requesting address for '%s'..."
+msgstr "Petanta adreson por '%s'..."
 
-#: ../src/applet-device-gsm.c:654
-msgid "PIN code required"
-msgstr "PIN-kodo bezonatas"
+#: ../src/applet-device-bond.c:127
+#, c-format
+#| msgid "VPN connection '%s' active"
+msgid "Bond connection '%s' active"
+msgstr "Drata konekto '%s' aktiva"
 
-#: ../src/applet-device-gsm.c:662
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "Port-larĝkapacita aparato bezonas PIN-kodon"
+#: ../src/applet-device-bridge.c:90
+#| msgid "You are now connected to the wired network."
+msgid "You are now connected to the bridged network."
+msgstr "Vi estas nun konektite al la pontita reto."
 
-#: ../src/applet-device-gsm.c:783
+#: ../src/applet-device-bridge.c:114
 #, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "PIN-kodo por SIM-karto '%s' ĉe '%s'"
+#| msgid "Preparing network connection '%s'..."
+msgid "Preparing bridge connection '%s'..."
+msgstr "Agordanta pont-konekton '%s'..."
 
-#: ../src/applet-device-gsm.c:875
-msgid "Wrong PIN code; please contact your provider."
-msgstr "Malĝusta PIN-kodo; bonvolu kontakti vian retprovizanton."
+#: ../src/applet-device-bridge.c:117
+#, c-format
+#| msgid "Configuring wired network connection '%s'..."
+msgid "Configuring bridge connection '%s'..."
+msgstr "Agordanta pont-konekton '%s'…"
+
+#: ../src/applet-device-bridge.c:120
+#, c-format
+#| msgid "User authentication required for VPN connection '%s'..."
+msgid "User authentication required for bridge connection '%s'..."
+msgstr "Pont-retkonekto '%s' bezonas uzantan aŭtentigon..."
+
+#: ../src/applet-device-bridge.c:127
+#, c-format
+#| msgid "VPN connection '%s' active"
+msgid "Bridge connection '%s' active"
+msgstr "Pont-konekto '%s' aktiva"
 
-#: ../src/applet-device-gsm.c:898
+#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Malĝusta PUK-kodo; bonvolu kontakti vian retprovizanton."
 
+#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+msgid "Wrong PIN code; please contact your provider."
+msgstr "Malĝusta PIN-kodo; bonvolu kontakti vian retprovizanton."
+
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:925
+#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:532
 msgid "Sending unlock code..."
 msgstr "Sendas malŝlosan kodon..."
 
-#: ../src/applet-device-gsm.c:988
-msgid "SIM PIN unlock required"
-msgstr "SIM-PIN postulas malŝloson"
+#: ../src/applet-device-broadband.c:715 ../src/applet-device-cdma.c:247
+#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:421
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Poŝtelefona larĝkapacita reto (%s)"
 
-#: ../src/applet-device-gsm.c:989
-msgid "SIM PIN Unlock Required"
-msgstr "SIM-PIN postulas malŝloson"
+#: ../src/applet-device-broadband.c:717 ../src/applet-device-cdma.c:249
+#: ../src/applet-device-gsm.c:305
+#: ../src/connection-editor/new-connection.c:114
+#: ../src/connection-editor/page-mobile.c:351
+#: ../src/libnm-gtk/nm-ui-utils.c:333
+msgid "Mobile Broadband"
+msgstr "Poŝtelefona larĝkapacita reto"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:991
-#, c-format
-msgid "The mobile broadband device '%s' requires a SIM PIN code before it can be used."
-msgstr "La poŝtelefona larĝkapacita aparato '%s' postulas SIM-PIN-kodon antaŭ ol ĝi povas esti uzata."
+#. Default connection item
+#: ../src/applet-device-broadband.c:782
+#, fuzzy
+#| msgid "New Mobile Broadband Connection"
+msgid "New Mobile Broadband connection..."
+msgstr "Nova poŝtelefona larĝkapacita konekto"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:993
-msgid "PIN code:"
-msgstr "PIN-kodo:"
+#: ../src/applet-device-broadband.c:797
+#, fuzzy
+#| msgid "You are now connected to the mobile broadband network."
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "Vi estas nun konektita al la poŝtelefona larĝkapacita reto."
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:997
-msgid "Show PIN code"
-msgstr "Montri PIN-kodon"
+#: ../src/applet-device-broadband.c:932 ../src/applet-device-broadband.c:938
+#, fuzzy
+#| msgid "Mobile broadband network password"
+msgid "Mobile Broadband network."
+msgstr "Pasvorto de la movebla larĝkapacita konekto"
 
-#: ../src/applet-device-gsm.c:1000
-msgid "SIM PUK unlock required"
-msgstr "Malŝloso de SIM-PUK postulata"
+#: ../src/applet-device-broadband.c:933 ../src/applet-device-cdma.c:403
+#: ../src/applet-device-gsm.c:662
+msgid "You are now registered on the home network."
+msgstr "Vi estas nun registrita en la hejma reto."
 
-#: ../src/applet-device-gsm.c:1001
-msgid "SIM PUK Unlock Required"
-msgstr "Malŝloso de SIM-PUK postulata"
+#: ../src/applet-device-broadband.c:939 ../src/applet-device-cdma.c:409
+#: ../src/applet-device-gsm.c:668
+msgid "You are now registered on a roaming network."
+msgstr "Vi estas nun registrita en la retmigra reto."
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1003
+#: ../src/applet-device-bt.c:103
+msgid "You are now connected to the mobile broadband network."
+msgstr "Vi estas nun konektita al la poŝtelefona larĝkapacita reto."
+
+#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
+#: ../src/mobile-helpers.c:582
 #, c-format
-msgid "The mobile broadband device '%s' requires a SIM PUK code before it can be used."
-msgstr "La poŝtelefona laĝkapacita aparato '%s' postulas SIM-PUK-kodon antaŭ ol ĝi povos esti uzata."
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "Pretigas poŝtelefonan larĝkapacitan konekton '%s'..."
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1005
-msgid "PUK code:"
-msgstr "PUK-kodo:"
+#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
+#: ../src/mobile-helpers.c:585
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "Agordas poŝtelefonan larĝkapacitan konekton '%s'..."
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "New PIN code:"
-msgstr "Nova PIN-kodo:"
+#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
+#: ../src/mobile-helpers.c:588
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "Movebla larĝkapacita konekto «%s» necesas aŭtentigon de uzanto..."
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1010
-msgid "Re-enter new PIN code:"
-msgstr "Reenigi novan PIN-kodon:"
+#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "Poŝtelefona larĝkapacita konekto '%s' aktivas"
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1015
-msgid "Show PIN/PUK codes"
-msgstr "Montri PIN/PUK-kodojn"
+#. Default connection item
+#: ../src/applet-device-cdma.c:314
+msgid "New Mobile Broadband (CDMA) connection..."
+msgstr "Nova poŝtelefona larĝkapacita (CDMA) konekto..."
 
-#: ../src/applet-device-gsm.c:1197
-#: ../src/applet-device-gsm.c:1203
-msgid "GSM network."
-msgstr "GSM-reto."
+#: ../src/applet-device-cdma.c:341
+msgid "You are now connected to the CDMA network."
+msgstr "Vi estas konektita al la CDMA-reto."
+
+#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
+msgid "CDMA network."
+msgstr "CDMA-reto."
 
-#: ../src/applet-device-wired.c:62
+#: ../src/applet-device-ethernet.c:44
 msgid "Auto Ethernet"
 msgstr "Aŭtomata eterreto"
 
-#: ../src/applet-device-wired.c:205
+#: ../src/applet-device-ethernet.c:96
 #, c-format
-msgid "Wired Networks (%s)"
-msgstr "Drata reto (%s)"
+#| msgid "Wired Networks (%s)"
+msgid "Ethernet Networks (%s)"
+msgstr "Drataj retoj (%s)"
 
-#: ../src/applet-device-wired.c:207
+#: ../src/applet-device-ethernet.c:98
 #, c-format
-msgid "Wired Network (%s)"
+#| msgid "Wired Network (%s)"
+msgid "Ethernet Network (%s)"
 msgstr "Drata reto (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:101
+#| msgid "Wired Networks"
+msgid "Ethernet Networks"
 msgstr "Drataj retoj"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:103
+#| msgid "Wired Network"
+msgid "Ethernet Network"
 msgstr "Drata reto"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232
-#: ../src/applet.c:1485
-msgid "disconnected"
-msgstr "nekonektite"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:147
+#, fuzzy
+#| msgid "You are now connected to the wired network."
+msgid "You are now connected to the ethernet network."
 msgstr "Vi estas nun konektite al la drata reto."
 
-#: ../src/applet-device-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:171
+#, fuzzy, c-format
+#| msgid "Preparing wired network connection '%s'..."
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "Preparanta drat-retan konekton '%s'…"
 
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+#| msgid "Configuring wired network connection '%s'..."
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "Agordanta drat-retan konekton '%s'…"
 
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:177
+#, fuzzy, c-format
+#| msgid "User authentication required for wired network connection '%s'..."
+msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Drat-reta konekto '%s' bezonas aŭtentigon de la uzanto..."
 
-#: ../src/applet-device-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../src/applet-device-ethernet.c:180
+#, fuzzy, c-format
+#| msgid "Requesting a wired network address for '%s'..."
+msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Petanta drat-retan adreson por '%s'..."
 
-#: ../src/applet-device-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../src/applet-device-ethernet.c:184
+#, fuzzy, c-format
+#| msgid "Wired network connection '%s' active"
+msgid "Ethernet network connection '%s' active"
 msgstr "Drat-reta konekto '%s' aktiva"
 
-#: ../src/applet-device-wired.c:494
+#: ../src/applet-device-ethernet.c:365
 msgid "DSL authentication"
 msgstr "DSL-aŭtentigo"
 
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
+#. Default connection item
+#: ../src/applet-device-gsm.c:370
+msgid "New Mobile Broadband (GSM) connection..."
+msgstr "Nova port-larĝkapacita (GSM) konekto..."
+
+#: ../src/applet-device-gsm.c:397
+msgid "You are now connected to the GSM network."
+msgstr "Vi estas nun konektite al la GSM-reto."
+
+#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
+msgid "GSM network."
+msgstr "GSM-reto."
+
+#: ../src/applet-device-infiniband.c:40
+msgid "Auto InfiniBand"
+msgstr ""
+
+#: ../src/applet-device-infiniband.c:92
+#, fuzzy, c-format
+#| msgid "Wired Networks (%s)"
+msgid "InfiniBand Networks (%s)"
+msgstr "Drata reto (%s)"
+
+#: ../src/applet-device-infiniband.c:94
+#, fuzzy, c-format
+#| msgid "Wired Network (%s)"
+msgid "InfiniBand Network (%s)"
+msgstr "Drata reto (%s)"
+
+#: ../src/applet-device-infiniband.c:97
+#, fuzzy
+#| msgid "Wired Networks"
+msgid "InfiniBand Networks"
+msgstr "Drataj retoj"
+
+#: ../src/applet-device-infiniband.c:99
+#, fuzzy
+#| msgid "Wired Network"
+msgid "InfiniBand Network"
+msgstr "Drata reto"
+
+#: ../src/applet-device-infiniband.c:143
+#, fuzzy
+#| msgid "You are now connected to the wired network."
+msgid "You are now connected to the InfiniBand network."
+msgstr "Vi estas nun konektite al la drata reto."
+
+#: ../src/applet-device-infiniband.c:167
+#, fuzzy, c-format
+#| msgid "Preparing network connection '%s'..."
+msgid "Preparing InfiniBand connection '%s'..."
+msgstr "Agordanta retkonekton '%s'..."
+
+#: ../src/applet-device-infiniband.c:170
+#, fuzzy, c-format
+#| msgid "Configuring mobile broadband connection '%s'..."
+msgid "Configuring InfiniBand connection '%s'..."
+msgstr "Agordas poŝtelefonan larĝkapacitan konekton '%s'..."
+
+#: ../src/applet-device-infiniband.c:173
+#, fuzzy, c-format
+#| msgid "User authentication required for VPN connection '%s'..."
+msgid "User authentication required for InfiniBand connection '%s'..."
+msgstr "VPN-retkonekto '%s' necesas uzantan aŭtentigon..."
+
+#: ../src/applet-device-infiniband.c:180
+#, fuzzy, c-format
+#| msgid "VPN connection '%s' active"
+msgid "InfiniBand connection '%s' active"
+msgstr "VPN-konekto '%s' aktiva"
+
+#: ../src/applet-device-team.c:86
+#, fuzzy
+#| msgid "You are now connected to the wired network."
+msgid "You are now connected to the teamed network."
+msgstr "Vi estas nun konektite al la drata reto."
+
+#: ../src/applet-device-team.c:110
+#, fuzzy, c-format
+#| msgid "Preparing network connection '%s'..."
+msgid "Preparing team connection '%s'..."
+msgstr "Agordanta retkonekton '%s'..."
+
+#: ../src/applet-device-team.c:113
+#, fuzzy, c-format
+#| msgid "Configuring wired network connection '%s'..."
+msgid "Configuring team connection '%s'..."
+msgstr "Agordanta drat-retan konekton '%s'…"
+
+#: ../src/applet-device-team.c:116
+#, fuzzy, c-format
+#| msgid "User authentication required for VPN connection '%s'..."
+msgid "User authentication required for team connection '%s'..."
+msgstr "VPN-retkonekto '%s' necesas uzantan aŭtentigon..."
+
+#: ../src/applet-device-team.c:123
+#, fuzzy, c-format
+#| msgid "VPN connection '%s' active"
+msgid "Team connection '%s' active"
+msgstr "VPN-konekto '%s' aktiva"
+
+#: ../src/applet-device-vlan.c:204
+#, fuzzy
+#| msgid "You are now connected to the CDMA network."
+msgid "You are now connected to the VLAN."
+msgstr "Vi estas konektita al la CDMA-reto."
+
+#: ../src/applet-device-vlan.c:228
+#, fuzzy, c-format
+#| msgid "Starting VPN connection '%s'..."
+msgid "Preparing VLAN connection '%s'..."
+msgstr "Komencanta VPN-konekton '%s'..."
+
+#: ../src/applet-device-vlan.c:231
+#, fuzzy, c-format
+#| msgid "Starting VPN connection '%s'..."
+msgid "Configuring VLAN connection '%s'..."
+msgstr "Komencanta VPN-konekton '%s'..."
+
+#: ../src/applet-device-vlan.c:234
+#, fuzzy, c-format
+#| msgid "User authentication required for VPN connection '%s'..."
+msgid "User authentication required for VLAN connection '%s'..."
+msgstr "VPN-retkonekto '%s' necesas uzantan aŭtentigon..."
+
+#: ../src/applet-device-vlan.c:241
+#, fuzzy, c-format
+#| msgid "VPN connection '%s' active"
+msgid "VLAN connection '%s' active"
+msgstr "VPN-konekto '%s' aktiva"
+
+#: ../src/applet-device-wifi.c:96
+#, fuzzy
+#| msgid "_Connect to Hidden Wireless Network..."
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Konektiĝi al kaŝita sendrata reto..."
 
-#: ../src/applet-device-wifi.c:150
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:147
+#, fuzzy
+#| msgid "Create _New Wireless Network..."
+msgid "Create _New Wi-Fi Network..."
 msgstr "Krei _novan sendratan reton…"
 
-#: ../src/applet-device-wifi.c:294
+#: ../src/applet-device-wifi.c:291
 msgid "(none)"
 msgstr "(neniu)"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:769
 #, c-format
-msgid "Wireless Networks (%s)"
+#| msgid "Wired Networks (%s)"
+msgid "Wi-Fi Networks (%s)"
 msgstr "Sendrataj retoj (%s)"
 
-#: ../src/applet-device-wifi.c:805
+#: ../src/applet-device-wifi.c:771
 #, c-format
-msgid "Wireless Network (%s)"
+#| msgid "Wired Network (%s)"
+msgid "Wi-Fi Network (%s)"
 msgstr "Sendrata reto (%s)"
 
-#: ../src/applet-device-wifi.c:807
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
+#: ../src/applet-device-wifi.c:773
+#| msgid "Wired Network"
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
 msgstr[0] "Sendrata reto"
 msgstr[1] "Sendrataj retoj"
 
-#: ../src/applet-device-wifi.c:840
-msgid "wireless is disabled"
-msgstr "Sendrata ret-konektilo estas elŝaltita"
+#: ../src/applet-device-wifi.c:802
+#| msgid "WiMAX is disabled"
+msgid "Wi-Fi is disabled"
+msgstr "Sendrata reto estas elŝaltite"
 
-#: ../src/applet-device-wifi.c:841
-msgid "wireless is disabled by hardware switch"
-msgstr "sendrata reto estas elŝaltite per aparatara ŝaltilo"
+#: ../src/applet-device-wifi.c:803
+#, fuzzy
+#| msgid "WiMAX is disabled by hardware switch"
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "WiMAX estas elŝaltite per aparatara ŝaltilo"
 
-#: ../src/applet-device-wifi.c:902
+#: ../src/applet-device-wifi.c:864
 msgid "More networks"
 msgstr "Pliaj retoj"
 
-#: ../src/applet-device-wifi.c:1081
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1042
+#, fuzzy
+#| msgid "Wireless Networks Available"
+msgid "Wi-Fi Networks Available"
 msgstr "Sendrataj retoj estas disponeblaj"
 
-#: ../src/applet-device-wifi.c:1082
-msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1043
+#, fuzzy
+#| msgid "Use the network menu to connect to a wireless network"
+msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Uzi la retmenuon por konekti al sendrata reto"
 
-#: ../src/applet-device-wifi.c:1085
-#: ../src/applet.c:901
-msgid "Don't show this message again"
-msgstr "Ne remontri tiun mesaĝon"
-
-#: ../src/applet-device-wifi.c:1277
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
+#: ../src/applet-device-wifi.c:1242
+#, fuzzy, c-format
+#| msgid "You are now connected to the wireless network '%s'."
+msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Vi estas nun konektite al la sendrata reto '%s'."
 
-#: ../src/applet-device-wifi.c:1308
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "Preparanta sendrat-retan konekton '%s'…"
+#: ../src/applet-device-wifi.c:1273
+#, fuzzy, c-format
+#| msgid "Preparing network connection '%s'..."
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Agordanta retkonekton '%s'..."
 
-#: ../src/applet-device-wifi.c:1311
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "Agordanta sendrat-retan konekton '%s'…"
+#: ../src/applet-device-wifi.c:1276
+#, fuzzy, c-format
+#| msgid "Configuring wired network connection '%s'..."
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "Agordanta drat-retan konekton '%s'…"
 
-#: ../src/applet-device-wifi.c:1314
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1279
+#, fuzzy, c-format
+#| msgid "User authentication required for wireless network '%s'..."
+msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Sendrata reto '%s' necesas legitimadon de la uzanto..."
 
-#: ../src/applet-device-wifi.c:1317
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "Petanta sendrat-retan adreson por '%s'..."
+#: ../src/applet-device-wifi.c:1282
+#, fuzzy, c-format
+#| msgid "Requesting a network address for '%s'..."
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "Petanta retan adreson por '%s'..."
 
-#: ../src/applet-device-wifi.c:1338
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#: ../src/applet-device-wifi.c:1303
+#, fuzzy, c-format
+#| msgid "Wireless network connection '%s' active: %s (%d%%)"
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Sendrat-reta konekto '%s' aktiva: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1343
-#, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "Sendrat-reta konekto '%s' aktiva"
+#: ../src/applet-device-wifi.c:1308
+#, fuzzy, c-format
+#| msgid "Wired network connection '%s' active"
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Drat-reta konekto '%s' aktiva"
+
+#: ../src/applet-device-wifi.c:1326
+#, fuzzy
+#| msgid "Failed to create PAN connection: %s"
+msgid "Failed to activate connection"
+msgstr "Malsukcesis krei PAN-konekton: %s"
 
-#: ../src/applet-device-wimax.c:231
+#: ../src/applet-device-wifi.c:1345
+#| msgid "Could not edit new connection"
+msgid "Failed to add new connection"
+msgstr "Malsukcesis aldoni novan konekton"
+
+#: ../src/applet-device-wimax.c:228
 #, c-format
 msgid "WiMAX Mobile Broadband (%s)"
 msgstr "WiMAX-portebla larĝkapacita reto (%s)"
 
-#: ../src/applet-device-wimax.c:233
+#: ../src/applet-device-wimax.c:230
 msgid "WiMAX Mobile Broadband"
 msgstr "WiMAX-portebla larĝkapacita reto"
 
-#: ../src/applet-device-wimax.c:259
+#: ../src/applet-device-wimax.c:256
 msgid "WiMAX is disabled"
 msgstr "WiMAX estas elŝaltite"
 
-#: ../src/applet-device-wimax.c:260
+#: ../src/applet-device-wimax.c:257
 msgid "WiMAX is disabled by hardware switch"
 msgstr "WiMAX estas elŝaltite per aparatara ŝaltilo"
 
-#: ../src/applet-device-wimax.c:428
+#: ../src/applet-device-wimax.c:402
 msgid "You are now connected to the WiMAX network."
 msgstr "Vi estas nun konektite al la WiMAX-reto."
 
+#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Poŝtelefona larĝkapacita konekto '%s' aktivas: (%d%%%s%s)"
+
+#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
+msgid "roaming"
+msgstr "retmigrado"
+
 #: ../src/applet-dialogs.c:57
 msgid "Error displaying connection information:"
 msgstr "Eraro montrante konekt-informojn:"
 
 #: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wireless-security.c:285
-#: ../src/libnm-gtk/nm-wireless-dialog.c:949
-#: ../src/wireless-security/wireless-security.c:397
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnm-gtk/nm-wifi-dialog.c:918
+#: ../src/wireless-security/wireless-security.c:441
 msgid "LEAP"
 msgstr "LEAP"
 
@@ -501,198 +1038,198 @@ msgstr "LEAP"
 msgid "Dynamic WEP"
 msgstr "Dinamika WEP"
 
-#: ../src/applet-dialogs.c:113
-#: ../src/applet-dialogs.c:246
-#: ../src/applet-dialogs.c:248
+#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
+#: ../src/applet-dialogs.c:244
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:240
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:252
-#: ../src/applet-dialogs.c:261
-#: ../src/connection-editor/page-wireless-security.c:239
-#: ../src/libnm-gtk/nm-wireless-dialog.c:906
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
+#: ../src/connection-editor/page-wifi-security.c:261
+#| msgctxt "Wifi/wired security"
+#| msgid "None"
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Neniu"
 
-#: ../src/applet-dialogs.c:352
-#: ../src/applet-dialogs.c:490
+#: ../src/applet-dialogs.c:274
+#, c-format
+#| msgid "1 (Default)"
+msgid "%s (default)"
+msgstr "%s (defaŭlte)"
+
+#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:481
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:354
-#: ../src/applet-dialogs.c:492
+#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:483
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../src/applet-dialogs.c:367
+#: ../src/applet-dialogs.c:358
 #, c-format
 msgid "%d dB"
 msgstr "%d dB"
 
-#: ../src/applet-dialogs.c:369
+#: ../src/applet-dialogs.c:360
 msgctxt "WiMAX CINR"
 msgid "unknown"
 msgstr "nekonate"
 
-#: ../src/applet-dialogs.c:381
+#: ../src/applet-dialogs.c:372
 msgctxt "WiMAX Base Station ID"
 msgid "unknown"
 msgstr "nekonate"
 
-#: ../src/applet-dialogs.c:416
+#: ../src/applet-dialogs.c:407
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Eterreto (%s)"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:410
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "Sendrata reto laŭ 802.11 (%s)"
 
-#: ../src/applet-dialogs.c:426
+#: ../src/applet-dialogs.c:417
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:428
+#: ../src/applet-dialogs.c:419
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:432
+#: ../src/applet-dialogs.c:423
 #, c-format
 msgid "WiMAX (%s)"
 msgstr "WiMAX (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:438
-#: ../src/applet-dialogs.c:797
+#: ../src/applet-dialogs.c:429 ../src/applet-dialogs.c:788
+#: ../src/connection-editor/page-general.c:327
 msgid "General"
 msgstr "Ĝenerale"
 
-#: ../src/applet-dialogs.c:442
+#: ../src/applet-dialogs.c:433
 msgid "Interface:"
 msgstr "Interfaco:"
 
-#: ../src/applet-dialogs.c:458
+#: ../src/applet-dialogs.c:449
 msgid "Hardware Address:"
 msgstr "Aparatara adreso:"
 
 #. Driver
-#: ../src/applet-dialogs.c:466
+#: ../src/applet-dialogs.c:457
 msgid "Driver:"
 msgstr "Pelilo:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:486
 msgid "Speed:"
 msgstr "Rapido:"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:496
 msgid "Security:"
 msgstr "Sekureco:"
 
-#: ../src/applet-dialogs.c:518
+#: ../src/applet-dialogs.c:509
 msgid "CINR:"
 msgstr "CINR:"
 
-#: ../src/applet-dialogs.c:531
+#: ../src/applet-dialogs.c:522
 msgid "BSID:"
 msgstr "_BSID:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:548
+#: ../src/applet-dialogs.c:539
 msgid "IPv4"
 msgstr "IPv4"
 
 #. Address
-#: ../src/applet-dialogs.c:559
-#: ../src/applet-dialogs.c:666
+#: ../src/applet-dialogs.c:550 ../src/applet-dialogs.c:657
 msgid "IP Address:"
 msgstr "IP-adreso:"
 
-#: ../src/applet-dialogs.c:561
-#: ../src/applet-dialogs.c:577
+#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:568
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../src/applet-dialogs.c:575
+#: ../src/applet-dialogs.c:566
 msgid "Broadcast Address:"
 msgstr "Elsenda adreso:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:584
+#: ../src/applet-dialogs.c:575
 msgid "Subnet Mask:"
 msgstr "Subreta masko:"
 
-#: ../src/applet-dialogs.c:586
+#: ../src/applet-dialogs.c:577
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../src/applet-dialogs.c:594
-#: ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:585 ../src/applet-dialogs.c:672
 msgid "Default Route:"
 msgstr "Defaŭlta kurso:"
 
-#: ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:597
 msgid "Primary DNS:"
 msgstr "Unuaranga DNS:"
 
-#: ../src/applet-dialogs.c:615
+#: ../src/applet-dialogs.c:606
 msgid "Secondary DNS:"
 msgstr "Duaranga DNS:"
 
-#: ../src/applet-dialogs.c:625
+#: ../src/applet-dialogs.c:616
 msgid "Ternary DNS:"
 msgstr "Triaranga DNS:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:640
+#: ../src/applet-dialogs.c:631
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:649
+#: ../src/applet-dialogs.c:640
 msgid "Ignored"
 msgstr "Ignorite"
 
-#: ../src/applet-dialogs.c:802
+#: ../src/applet-dialogs.c:793
 msgid "VPN Type:"
 msgstr "VPN-Tipo:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:800
 msgid "VPN Gateway:"
 msgstr "VPN-kluzo:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:806
 msgid "VPN Username:"
 msgstr "VPN-uzantonomo:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:812
 msgid "VPN Banner:"
 msgstr "VPN-rubando:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:818
 msgid "Base Connection:"
 msgstr "Baza konekto:"
 
-#: ../src/applet-dialogs.c:829
+#: ../src/applet-dialogs.c:820 ../src/libnm-gtk/nm-ui-utils.c:347
 msgid "Unknown"
 msgstr "Nekonata"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:892
+#: ../src/applet-dialogs.c:883
 msgid "No valid active connections found!"
 msgstr "Ne validaj aktiv-konektoj trovitaj"
 
-#: ../src/applet-dialogs.c:945
+#: ../src/applet-dialogs.c:911
 msgid ""
 "Copyright © 2004-2011 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -702,370 +1239,526 @@ msgstr ""
 "Kopirajto © 2005-2008 Novell, Inc.\n"
 "kaj multaj aliaj komunumaj kontribuantoj kaj tradukantoj"
 
-#: ../src/applet-dialogs.c:948
-msgid "Notification area applet for managing your network devices and connections."
-msgstr "Apleto en atentiga zono por administri viajn retajn aparatojn kaj konektojn."
+#: ../src/applet-dialogs.c:914
+msgid ""
+"Notification area applet for managing your network devices and connections."
+msgstr ""
+"Apleto en atentiga zono por administri viajn retajn aparatojn kaj konektojn."
 
-#: ../src/applet-dialogs.c:950
+#: ../src/applet-dialogs.c:916
 msgid "NetworkManager Website"
 msgstr "Retpaĝaro de NetworkManager"
 
-#: ../src/applet-dialogs.c:965
+#: ../src/applet-dialogs.c:931
 msgid "Missing resources"
 msgstr "Mankantaj risurcoj"
 
-#: ../src/applet-dialogs.c:990
+#: ../src/applet-dialogs.c:956
 msgid "Mobile broadband network password"
 msgstr "Pasvorto de la movebla larĝkapacita konekto"
 
-#: ../src/applet-dialogs.c:999
+#: ../src/applet-dialogs.c:965
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Pasvorto bezonatas por konektiĝi al '%s'."
 
-#: ../src/applet-dialogs.c:1018
+#: ../src/applet-dialogs.c:980
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ../src/applet.c:990
+#: ../src/applet-dialogs.c:1261
+msgid "SIM PIN unlock required"
+msgstr "SIM-PIN postulas malŝloson"
+
+#: ../src/applet-dialogs.c:1262
+msgid "SIM PIN Unlock Required"
+msgstr "SIM-PIN postulas malŝloson"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1264
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was interrupted."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 msgstr ""
-"\n"
-"Fiaskis VPN-konekto '%s' ĉar retkonekto estis interrompita."
+"La poŝtelefona larĝkapacita aparato '%s' postulas SIM-PIN-kodon antaŭ ol ĝi "
+"povas esti uzata."
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1266
+msgid "PIN code:"
+msgstr "PIN-kodo:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1270
+msgid "Show PIN code"
+msgstr "Montri PIN-kodon"
+
+#: ../src/applet-dialogs.c:1272
+msgid "SIM PUK unlock required"
+msgstr "Malŝloso de SIM-PUK postulata"
+
+#: ../src/applet-dialogs.c:1273
+msgid "SIM PUK Unlock Required"
+msgstr "Malŝloso de SIM-PUK postulata"
 
-#: ../src/applet.c:993
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1275
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"\n"
-"Fiaskis VPN-konekto '%s' ĉar VPN-servo haltigis neatendite."
+"La poŝtelefona laĝkapacita aparato '%s' postulas SIM-PUK-kodon antaŭ ol ĝi "
+"povos esti uzata."
 
-#: ../src/applet.c:996
-#, c-format
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1277
+msgid "PUK code:"
+msgstr "PUK-kodo:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1280
+msgid "New PIN code:"
+msgstr "Nova PIN-kodo:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1282
+msgid "Re-enter new PIN code:"
+msgstr "Reenigi novan PIN-kodon:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1287
+msgid "Show PIN/PUK codes"
+msgstr "Montri PIN/PUK-kodojn"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:1
+#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../src/connection-editor/ce-page-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid configuration."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"Fiaskis VPN-konekto '%s' ĉar VPN-servo revenigis nevalidan agordon."
+"IP-adresoj identigas vian komputilon surrete. Alklaku la butonon \"Aldoni\" "
+"por aldoni IP-adreson."
 
-#: ../src/applet.c:999
-#, c-format
+#: ../src/connection-editor/ce-ip4-routes.ui.h:2
+#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+msgid "Ig_nore automatically obtained routes"
+msgstr "Ig_nori aŭtomate ricevitajn itinerojn"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:3
+#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+msgid "_Use this connection only for resources on its network"
+msgstr "_Uzi ĉi tiun konekton nur por fontoj sur ĝia reto"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:4
+#: ../src/connection-editor/ce-ip6-routes.ui.h:4
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"Fiaskis VPN-konekto '%s' ĉar la konekta provo eltempiĝis."
+"Se enŝaltite, ĉi tiu konekto neniam estos uzata kiel la defaŭltan "
+"retkonekton."
 
-#: ../src/applet.c:1002
-#, c-format
+#: ../src/connection-editor/ce-new-connection.ui.h:1
+#: ../src/libnm-gtk/wifi.ui.h:1
+#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../src/wireless-security/ws-wpa-eap.ui.h:1
+msgid " "
+msgstr " "
+
+#: ../src/connection-editor/ce-new-connection.ui.h:2
+msgid "Create…"
+msgstr "Krei…"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+#| msgid "Choose a VPN Connection Type"
+msgid "Choose a Connection Type"
+msgstr "Elekti konekttipon"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+#| msgid ""
+#| "Select the type of VPN you wish to use for the new connection.  If the "
+#| "type of VPN connection you wish to create does not appear in the list, "
+#| "you may not have the correct VPN plugin installed."
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+"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 ""
-"\n"
-"Fiaskis VPN-konekto '%s' ĉar la VPN-servo ne komencis tempe."
+"Elektu la VPN-specon kiun vi deziras uzi por la nova konekto. Se la de vi "
+"dezirata VPN-speco ne disponeblas en la listo, eble vi ne instalis la ĝustan "
+"VPN-kromprogramon."
 
-#: ../src/applet.c:1005
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
 msgstr ""
-"\n"
-"Fiaskis VPN-konekto '%s' ĉar la VPN-servo fiaskis je la komenco."
 
-#: ../src/applet.c:1008
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
 msgstr ""
-"\n"
-"Fiaskis VPN-konekto '%s' ĉar ne estis validaj VPN-sekretaĵoj."
 
-#: ../src/applet.c:1011
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
 msgstr ""
-"\n"
-"Fiaskis VPN-konekto '%s' ĉar estis nevalidaj VPN-sekretaĵoj."
 
-#: ../src/applet.c:1018
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#| msgid "Broadcast Address:"
+msgid "Broadcast"
 msgstr ""
-"\n"
-"Fiaskis VPN-konekto '%s' ."
 
-#: ../src/applet.c:1036
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was interrupted."
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr "802.3ad"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
 msgstr ""
-"\n"
-"Malkonektiĝis VPN-konekto '%s' ĉar retkonekto estis interrompita."
 
-#: ../src/applet.c:1039
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
 msgstr ""
-"\n"
-"Malkonektiĝis VPN-konekto '%s' ĉar la VPN-servo haltigis."
 
-#: ../src/applet.c:1045
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#| msgid "EAP"
+msgid "ARP"
+msgstr "ARP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#| msgid "Base Connection:"
+msgid "Bonded _connections:"
+msgstr "Drataj _konektoj"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#| msgid "M_ode:"
+msgid "_Mode:"
+msgstr "Reĝi_mo:"
+
+#. Edit
+#: ../src/connection-editor/ce-page-bond.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:2
+#: ../src/connection-editor/ce-page-team.ui.h:4
+#: ../src/connection-editor/nm-connection-list.c:686
+msgid "_Edit"
+msgstr "R_edakti"
+
+#. Delete
+#: ../src/connection-editor/ce-page-bond.ui.h:13
+#: ../src/connection-editor/ce-page-bridge.ui.h:3
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#: ../src/connection-editor/nm-connection-list.c:703
+msgid "_Delete"
+msgstr "_Forigi"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:14
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "ms"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: ../src/connection-editor/ce-page-team.ui.h:6
+#| msgid "Interface:"
+msgid "_Interface name:"
+msgstr "_Interfaco-nomo:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:17
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-"Malkonektiĝis VPN-konekto '%s' ."
 
-#: ../src/applet.c:1079
-msgid "VPN Login Message"
-msgstr "VPN-ensalutmesaĝo"
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+msgid "Link _up delay:"
+msgstr ""
 
-#: ../src/applet.c:1085
-#: ../src/applet.c:1093
-#: ../src/applet.c:1143
-msgid "VPN Connection Failed"
-msgstr "Fiaskis VPN-konekto"
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _down delay:"
+msgstr ""
 
-#: ../src/applet.c:1150
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+#| msgid "Primary DNS:"
+msgid "_Primary:"
+msgstr "_Unuarang:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
 msgstr ""
-"\n"
-"Fiaskis VPN-konekto '%s' ĉar la VPN-servo fiaskis je la komenco.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1153
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#| msgid "S_ecurity:"
+msgid "_Priority:"
+msgstr "_Prioritato:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#| msgid "Base Connection:"
+msgid "Bridged _connections:"
+msgstr "Pont_konektoj:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:6
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:84
+msgid "automatic"
+msgstr "aŭtomata"
+
+#: ../src/connection-editor/ce-page.c:92
+#: ../src/connection-editor/ce-page-dcb.ui.h:13
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:176
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+msgid "default"
+msgstr "defaŭlte"
+
+#: ../src/connection-editor/ce-page.c:359
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "Malsukcesis ĝisdatigi konektosekretojn pro nekonata eraro."
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+#| msgid "Use 802.1_X security for this connection"
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "Uzi 802.1_X-sekurecon por ĉi tiu konekto"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
 msgstr ""
-"\n"
-"Fiaskis VPN-konekto '%s' je la komenco.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1473
-msgid "device not ready (firmware missing)"
-msgstr "aparato ne pretas (mikroprogramaro mankas)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
 
-#: ../src/applet.c:1475
-msgid "device not ready"
-msgstr "Aparato ne preta"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.c:1501
-msgid "Disconnect"
-msgstr "Malkonekti"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.c:1515
-msgid "device not managed"
-msgstr "Aparato ne administrita"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.c:1559
-msgid "No network devices available"
-msgstr "Neniuj retaparatoj disponeblaj"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/applet.c:1647
-msgid "_VPN Connections"
-msgstr "_VPN-konektoj"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.c:1704
-msgid "_Configure VPN..."
-msgstr "_Agordi na VPN..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.c:1708
-msgid "_Disconnect VPN"
-msgstr "_Malkonekti VPN"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#: ../src/applet.c:1806
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager ne estas rulanta..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.c:1811
-#: ../src/applet.c:2604
-msgid "Networking disabled"
-msgstr "Retkonektado elŝaltitas"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2032
-msgid "Enable _Networking"
-msgstr "Enŝalti _reton"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2041
-msgid "Enable _Wireless"
-msgstr "Enŝalti _sendratan reton"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2050
-msgid "Enable _Mobile Broadband"
-msgstr "Enŝalti _moveblan larĝkapacitan konekton"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2059
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Enŝalti WiMAX-larĝkapacitan konekton"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
 
-#. Toggle notifications item
-#: ../src/applet.c:2070
-msgid "Enable N_otifications"
-msgstr "Enŝalti atentig_ojn"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2081
-msgid "Connection _Information"
-msgstr "Konektaj _informoj"
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2091
-msgid "Edit Connections..."
-msgstr "Redakti konektojn..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2105
-msgid "_Help"
-msgstr "_Helpo"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2114
-msgid "_About"
-msgstr "_Pri"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#: ../src/applet.c:2291
-msgid "Disconnected"
-msgstr "Malkonektita"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.c:2292
-msgid "The network connection has been disconnected."
-msgstr "La retkonekto estas malkonektigita."
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.c:2473
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "Agordanta retkonekton '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:25
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.c:2476
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "Retkonekto '%s' necesas uzantan aŭtentigon..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:26
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.c:2482
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "Retkonekto '%s' aktiva"
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.c:2560
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "Komencanta VPN-konekton '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.c:2563
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "VPN-retkonekto '%s' necesas uzantan aŭtentigon..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#| msgid "2"
+msgid "2:"
+msgstr "2:"
 
-#: ../src/applet.c:2566
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "Petanta VPN-adreson por '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#| msgid "3"
+msgid "3:"
+msgstr "3:"
 
-#: ../src/applet.c:2569
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN-konekto '%s' aktiva"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#| msgid "4"
+msgid "4:"
+msgstr "4:"
 
-#: ../src/applet.c:2608
-msgid "No network connection"
-msgstr "Neniu retkonekto"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.c:3258
-msgid "NetworkManager Applet"
-msgstr "Apleto por NetworkManager"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+msgid "6:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "Aŭtomate malŝlosi ĉi tiun aparaton"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "7:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "_Unlock"
-msgstr "_Malŝlosi"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/info.ui.h:1
-msgid "Connection Information"
-msgstr "Konektinformoj"
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "Strict Bandwidth:"
+msgstr ""
 
-#: ../src/info.ui.h:2
-msgid "Active Network Connections"
-msgstr "Aktivaj retkonektoj"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Priority Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:1
-#: ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "Dratita 802.1X-aŭtentigo"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Group Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
-msgid "_Network name:"
-msgstr "Ret_nomo:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Group ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "aŭtomata"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "15"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:310
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Fiaskis ĝisdatigi konektosekretojn pro nekonata eraro."
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-msgid "IP addresses identify your computer on the network.  Click the \"Add\" button to add an IP address."
-msgstr "IP-adresoj identigas vian komputilon surrete. Alklaku la butonon \"Aldoni\" por aldoni IP-adreson."
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#, no-c-format
+msgid ""
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-msgid "Ig_nore automatically obtained routes"
-msgstr "Ig_nori aŭtomate ricevitajn itinerojn"
+#: ../src/connection-editor/ce-page-dcb.ui.h:44
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-msgid "_Use this connection only for resources on its network"
-msgstr "_Uzi ĉi tiun konekton nur por fontoj sur ĝia reto"
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid "If enabled, this connection will never be used as the default network connection."
-msgstr "Se enŝaltite, ĉi tiu konekto neniam estos uzata kiel la defaŭltan retkonekton."
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid "Enter the traffic class for each user priority."
+msgstr ""
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 #: ../src/wireless-security/eap-method-leap.ui.h:1
 #: ../src/wireless-security/eap-method-simple.ui.h:1
 #: ../src/wireless-security/ws-leap.ui.h:1
@@ -1079,14 +1772,15 @@ msgstr "_Servo:"
 #: ../src/connection-editor/ce-page-dsl.ui.h:3
 #: ../src/wireless-security/eap-method-leap.ui.h:3
 #: ../src/wireless-security/eap-method-simple.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../src/wireless-security/eap-method-tls.ui.h:7
 #: ../src/wireless-security/ws-leap.ui.h:3
 #: ../src/wireless-security/ws-wpa-psk.ui.h:3
 msgid "Sho_w password"
 msgstr "_Montri pasvorton"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
 #: ../src/wireless-security/eap-method-leap.ui.h:2
 #: ../src/wireless-security/eap-method-simple.ui.h:2
 #: ../src/wireless-security/ws-leap.ui.h:2
@@ -1094,15 +1788,133 @@ msgstr "_Montri pasvorton"
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:1
 #: ../src/connection-editor/ce-page-ip4.ui.h:1
 #: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
+#: ../src/connection-editor/ce-page-wifi.ui.h:1
 #: ../src/connection-editor/page-ip6.c:142
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Aŭtomate"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "Tordita Paro (TP)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Attachment Unit Interface (AUI)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "Media Independent Interface (MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "_Pordo:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "_Rapido:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "Plene ambaŭdire_kta"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "Aŭt_omate intertrakti"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:14
+#: ../src/connection-editor/ce-page-infiniband.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+#: ../src/connection-editor/ce-page-wimax.ui.h:1
+msgid "_Device MAC address:"
+msgstr "_Aparatara MAC-adreso:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
+msgid "C_loned MAC address:"
+msgstr "K_lonita MAC-adreso:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+msgid ""
+"The MAC address entered here will be used as hardware address for the "
+"network device this connection is activated on.  This feature is known as "
+"MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
+msgstr ""
+"La ĉi tie enigita MAC-adreso estos uzata kiel aparatara adreso por la "
+"retaparato al kiu tiu ĉi konekto estas farata. Tiu ĉi trajto estas konata "
+"kiel MAC-klonado aŭ mistifikado. Ekzemple: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:17
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "_MTU:"
+msgstr "_MTU:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:18
+#: ../src/connection-editor/ce-page-infiniband.ui.h:3
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "bytes"
+msgstr "bajtoj"
+
+#: ../src/connection-editor/ce-page-general.ui.h:1
+msgid "Automatically connect to _VPN when using this connection"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, fuzzy
+#| msgid "You are now connected to the wired network."
+msgid "All _users may connect to this network"
+msgstr "Vi estas nun konektite al la drata reto."
+
+#: ../src/connection-editor/ce-page-general.ui.h:3
+msgid "_Automatically connect to this network when it is available"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-infiniband.ui.h:1
+msgid "_Transport mode:"
+msgstr ""
+
+#. IP-over-InfiniBand "datagram mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#| msgid "C_onnect"
+msgid "Connected"
+msgstr "Konektite"
+
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
@@ -1138,13 +1950,23 @@ msgid "Addresses"
 msgstr "Adresoj"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:9
-msgid "The DHCP client identifier allows the network administrator to customize your computer's 
configuration.  If you wish to use a DHCP client identifier, enter it here."
-msgstr "La DHCP-klienta identigilo ebligas al la retadministranto tajlori la konfiguron de via komputilo. Se 
vi deziras uzi DHCP-klientan identigilon, enigu ĝin ĉi tie."
+msgid ""
+"The DHCP client identifier allows the network administrator to customize "
+"your computer's configuration.  If you wish to use a DHCP client identifier, "
+"enter it here."
+msgstr ""
+"La DHCP-klienta identigilo ebligas al la retadministranto tajlori la "
+"konfiguron de via komputilo. Se vi deziras uzi DHCP-klientan identigilon, "
+"enigu ĝin ĉi tie."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:10
 #: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "Domains used when resolving host names. Use commas to separate multiple domains."
-msgstr "Retregionoj uzataj dum serĉado de nomoj de gastigaj komputiloj. Uzu komojn por disigi plurajn 
retregionojn."
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr ""
+"Retregionoj uzataj dum serĉado de nomoj de gastigaj komputiloj. Uzu komojn "
+"por disigi plurajn retregionojn."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid "D_HCP client ID:"
@@ -1152,39 +1974,69 @@ msgstr "D_HCP-klientidentigilo:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
 #: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:307
 msgid "S_earch domains:"
 msgstr "S_erĉi domajnojn:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
 #: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:298
 msgid "DNS ser_vers:"
 msgstr "_DNS-serviloj:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-msgid "IP addresses of domain name servers used to resolve host names. Use commas to separate multiple 
domain name server addresses."
-msgstr "IP-adresoj de serviloj por retregionaj nomoj uzataj por serĉi nomojn de gastigaj komputiloj. Uzu 
komojn por disigi plurajn adresojn de serviloj por retregionaj nomoj."
+msgid ""
+"IP addresses of domain name servers used to resolve host names. Use commas "
+"to separate multiple domain name server addresses."
+msgstr ""
+"IP-adresoj de serviloj por retregionaj nomoj uzataj por serĉi nomojn de "
+"gastigaj komputiloj. Uzu komojn por disigi plurajn adresojn de serviloj por "
+"retregionaj nomoj."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Postuli IPv_4-adresadon antaŭ ol ĉi tiu konekto povas esti farata"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:16
-msgid "When connecting to IPv6-capable networks, allows the connection to complete if IPv4 configuration 
fails but IPv6 configuration succeeds."
-msgstr "Permesi la kompletigon de la konekto, se dum konektado al IPv6-kapablaj retoj la IPv4-agordo fiaskas 
sed la IPv6-agordo sukcesas."
+msgid ""
+"When connecting to IPv6-capable networks, allows the connection to complete "
+"if IPv4 configuration fails but IPv6 configuration succeeds."
+msgstr ""
+"Permesi la kompletigon de la konekto, se dum konektado al IPv6-kapablaj "
+"retoj la IPv4-agordo malsukcesas sed la IPv6-agordo sukcesas."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
 #: ../src/connection-editor/ce-page-ip6.ui.h:15
 msgid "_Routes…"
 msgstr "Alidi_rektoj…"
 
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#, fuzzy
+#| msgid ""
+#| "IP addresses of domain name servers used to resolve host names. Use "
+#| "commas to separate multiple domain name server addresses."
+msgid ""
+"IP addresses of domain name servers used to resolve host names. Use commas "
+"to separate multiple domain name server addresses. Link-local addresses will "
+"be automatically scoped to the connecting interface."
+msgstr ""
+"IP-adresoj de serviloj por retregionaj nomoj uzataj por serĉi nomojn de "
+"gastigaj komputiloj. Uzu komojn por disigi plurajn adresojn de serviloj por "
+"retregionaj nomoj."
+
 #: ../src/connection-editor/ce-page-ip6.ui.h:13
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Postuli IPv_6-adresadon por kompletigi ĉi tiun konekton"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:14
-msgid "When connecting to IPv4-capable networks, allows the connection to complete if IPv6 configuration 
fails but IPv4 configuration succeeds."
-msgstr "Permesi la kompletigon de la konekto, se dum konektado al IPv4-kapablaj retoj la IPv6-agordo fiaskas 
sed la IPv4-agordo sukcesas."
+msgid ""
+"When connecting to IPv4-capable networks, allows the connection to complete "
+"if IPv6 configuration fails but IPv4 configuration succeeds."
+msgstr ""
+"Permesi la kompletigon de la konekto, se dum konektado al IPv4-kapablaj "
+"retoj la IPv6-agordo malsukcesas sed la IPv4-agordo sukcesas."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
 msgid "Any"
@@ -1207,43 +2059,53 @@ msgid "Prefer 2G (GPRS/EDGE)"
 msgstr "Preferi na 2G (GPRS/EDGE)"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:6
+#, fuzzy
+#| msgid "Prefer 3G (UMTS/HSPA)"
+msgid "Prefer 4G (LTE)"
+msgstr "Preferi na 3G (UMTS/HSPA)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+msgid "Use only 4G (LTE)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Baza"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "Nu_mber:"
 msgstr "Nu_mero:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:12
 msgid "Advanced"
 msgstr "Altnivele"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:13
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:14
 msgid "N_etwork ID:"
 msgstr "R_eta identigilo:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:16
 msgid "Change..."
 msgstr "Ŝanĝi..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:18
 msgid "Allow _roaming if home network is not available"
 msgstr "Permesi _retmigradon se la hejma reto ne disponeblas"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:19
 msgid "Sho_w passwords"
 msgstr "_Montri pasvortojn"
 
@@ -1295,139 +2157,111 @@ msgstr "Eĥo"
 msgid "Send PPP _echo packets"
 msgstr "Sendi _eĥajn PPP-pakaĵojn"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "Twisted Pair (TP)"
-msgstr "Tordita Paro (TP)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Attachment Unit Interface (AUI)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "BNC"
-msgstr "BNC"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Media Independent Interface (MII)"
-msgstr "Media Independent Interface (MII)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "_Port:"
-msgstr "_Pordo:"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "_Rapido:"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+#| msgid "Base Connection:"
+msgid "_Teamed connections:"
+msgstr "Baza konekto:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "Plene ambaŭdire_kta"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "I_mport team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "Aŭt_omate intertrakti"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+#| msgid "Interface:"
+msgid "_Parent interface:"
+msgstr "Interfaco:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "_Device MAC address:"
-msgstr "_Aparatara MAC-adreso:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN interface _name:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-msgid "C_loned MAC address:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+#| msgid "C_loned MAC address:"
+msgid "_Cloned MAC address:"
 msgstr "K_lonita MAC-adreso:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid "The MAC address entered here will be used as hardware address for the network device this connection 
is activated on.  This feature is known as MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
-msgstr "La ĉi tie enigita MAC-adreso estos uzata kiel aparatara adreso por la retaparato al kiu tiu ĉi 
konekto estas farata. Tiu ĉi trajto estas konata kiel MAC-klonado aŭ mistifikado. Ekzemple: 00:11:22:33:44:55"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "Device name + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "bytes"
-msgstr "bajtoj"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number 
together".
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "\"vlan\" + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+msgid "S_ecurity:"
+msgstr "S_ekureco:"
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
 msgid "Infrastructure"
 msgstr "Infrastrukturo"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
 msgid "Ad-hoc"
 msgstr "Provizore"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "Transmission po_wer:"
 msgstr "Senda po_vumo:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "_Rate:"
 msgstr "_Rapido:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid "This option locks this connection to the wireless access point (AP) specified by the BSSID entered 
here.  Example: 00:11:22:33:44:55"
-msgstr "Ĉi tiu opcio limigas ĉi tiun konekton al la sendrata retkaptejo (AP) specifita per la BSSID enigita 
tien ĉi. Ekzemplo: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "C_hannel:"
 msgstr "_Kanalo:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "Ban_d:"
 msgstr "Ben_do:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "M_ode:"
 msgstr "Reĝim_o:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "S_ecurity:"
-msgstr "S_ekureco:"
-
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
 msgid "Allowed Authentication Methods"
 msgstr "Permesitaj aŭtentokontrol-metodoj"
@@ -1473,67 +2307,376 @@ msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol versio 2"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-msgid "In most cases, the provider's PPP servers will support all authentication methods.  If connections 
fail, try disabling support for some methods."
-msgstr "En la plej multaj kazoj, la PPP-serviloj subtenos ĉiujn metodojn de aŭtentigkontrolo.  Se konektoj 
fiaskas, provu elŝalti la subtenon por kelkaj metodoj."
-
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
-#: ../src/wireless-security/eap-method-peap.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:1
-#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../src/wireless-security/ws-wpa-eap.ui.h:1
-msgid " "
-msgstr " "
-
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "Elekti VPN-konekttipon"
-
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-msgid "Select the type of VPN you wish to use for the new connection.  If the type of VPN connection you 
wish to create does not appear in the list, you may not have the correct VPN plugin installed."
-msgstr "Elektu la VPN-specon kiun vi deziras uzi por la nova konekto. Se la de vi dezirata VPN-speco ne 
disponeblas en la listo, eble vi ne instalis la ĝustan VPN-kromprogramon."
-
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-msgid "Create…"
-msgstr "Krei…"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:900
-#: ../src/connection-editor/page-ip6.c:866
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+"En la plej multaj kazoj, la PPP-serviloj subtenos ĉiujn metodojn de "
+"aŭtentigkontrolo.  Se konektoj malsukcesas, provu elŝalti la subtenon por kelkaj "
+"metodoj."
+
+#: ../src/connection-editor/ip4-routes-dialog.c:724
+#: ../src/connection-editor/ip6-routes-dialog.c:666
+#: ../src/connection-editor/page-ip4.c:924
+#: ../src/connection-editor/page-ip6.c:887
 msgid "Address"
 msgstr "Adreso"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:917
+#: ../src/connection-editor/ip4-routes-dialog.c:741
+#: ../src/connection-editor/page-ip4.c:941
 msgid "Netmask"
 msgstr "Retmasko"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:934
-#: ../src/connection-editor/page-ip6.c:900
+#: ../src/connection-editor/ip4-routes-dialog.c:758
+#: ../src/connection-editor/ip6-routes-dialog.c:700
+#: ../src/connection-editor/page-ip4.c:958
+#: ../src/connection-editor/page-ip6.c:921
 msgid "Gateway"
 msgstr "Kluzo"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:775
+#: ../src/connection-editor/ip6-routes-dialog.c:717
 msgid "Metric"
 msgstr "Metra"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:883
+#: ../src/connection-editor/ip6-routes-dialog.c:683
+#: ../src/connection-editor/page-ip6.c:904
 msgid "Prefix"
 msgstr "Prefikso"
 
-#: ../src/connection-editor/page-dsl.c:139
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1519
+#: ../src/connection-editor/new-connection.c:102
+#: ../src/connection-editor/page-ethernet.c:242
+#: ../src/libnm-gtk/nm-ui-utils.c:323
+#| msgid "Auto Ethernet"
+msgid "Ethernet"
+msgstr "Eterreto"
+
+#: ../src/connection-editor/new-connection.c:108
+#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Wi-Fi"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:120
+#: ../src/connection-editor/page-wimax.c:125
+#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
+msgid "WiMAX"
+msgstr "WiMAX"
+
+#: ../src/connection-editor/new-connection.c:126
+#: ../src/connection-editor/page-dsl.c:137
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/new-connection.c:132
+#: ../src/connection-editor/page-infiniband.c:159
+#: ../src/libnm-gtk/nm-ui-utils.c:335
+msgid "InfiniBand"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:138
+#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/libnm-gtk/nm-ui-utils.c:562
+msgid "Bond"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:144
+#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:564
+msgid "Team"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:150
+#: ../src/connection-editor/page-bridge.c:208
+#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+msgid "Bridge"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:156
+#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/libnm-gtk/nm-ui-utils.c:568
+msgid "VLAN"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:169
+#: ../src/connection-editor/new-connection.c:309
+#: ../src/connection-editor/page-vpn.c:113
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/new-connection.c:259
+#| msgid "Hardware Address:"
+msgid "Hardware"
+msgstr "Aparataro"
+
+#: ../src/connection-editor/new-connection.c:279
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/new-connection.c:347
+#: ../src/connection-editor/new-connection.c:349
+#, fuzzy
+#| msgid "Export VPN connection..."
+msgid "Import a saved VPN configuration..."
+msgstr "Elporti VPN-konekton..."
+
+#: ../src/connection-editor/new-connection.c:378
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr ""
+"La dialogujo por la konekto-redaktilo ne estis pravalorizebla pro nekonata "
+"eraro."
+
+#: ../src/connection-editor/new-connection.c:387
+msgid "Could not create new connection"
+msgstr "Ne eblis krei novan konekton."
+
+#: ../src/connection-editor/new-connection.c:522
+msgid "Connection delete failed"
+msgstr "Forigo de konekto malsukcesis."
+
+#: ../src/connection-editor/new-connection.c:569
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "Ĉu vi certe volas forigi la konekton %s?"
+
+#: ../src/connection-editor/nm-connection-editor.c:123
+#, c-format
+msgid "Editing %s"
+msgstr "Redaktante %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:127
+msgid "Editing un-named connection"
+msgstr "Redaktante sennoman konekton"
+
+#: ../src/connection-editor/nm-connection-editor.c:287
+msgid ""
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+msgstr ""
+"La konektoredaktilo ne povis trovi kelkajn neprajn risurcojn (la .ui-dosiero "
+"ne estis  trovita)."
+
+#: ../src/connection-editor/nm-connection-editor.c:418
+msgid "_Save"
+msgstr "Kon_servi"
+
+#: ../src/connection-editor/nm-connection-editor.c:419
+msgid "Save any changes made to this connection."
+msgstr "Konservi ĉiujn ŝanĝojn faritajn al tiu ĉi konekto."
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "_Save..."
+msgstr "Kon_servi..."
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr ""
+"Aŭtentigi por konservi ĉi tiun konekton por ĉiuj uzantoj de ĉi tiu komputilo."
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+#| msgid "Could not create new connection"
+msgid "Could not create connection"
+msgstr "Ne eblis krei novan konekton."
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "Ne eblis agordi konekton."
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+#, fuzzy
+#| msgid "Error creating connection editor dialog."
+msgid "Unknown error creating connection editor dialog."
+msgstr "Eraro dum kreo de dialogujo por konekto-redaktilo."
+
+#: ../src/connection-editor/nm-connection-editor.c:573
+msgid "Error initializing editor"
+msgstr "Eraro dum pravalorizado de redaktilo"
+
+#: ../src/connection-editor/nm-connection-editor.c:906
+msgid "Connection add failed"
+msgstr "Aldono de konekto malsukcesis"
+
+#: ../src/connection-editor/nm-connection-editor.c:946
+msgid "Error saving connection"
+msgstr "Eraro dum konservo de konekto"
+
+#: ../src/connection-editor/nm-connection-editor.c:947
+#, c-format
+msgid "The property '%s' / '%s' is invalid: %d"
+msgstr "La atributo  '%s' / '%s' estas nevalida: %d"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
+msgid "Connection _name:"
+msgstr "_Nomo de konekto:"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#| msgid "E_xport"
+msgid "_Export..."
+msgstr "E_lporti..."
+
+#: ../src/connection-editor/nm-connection-list.c:143
+msgid "never"
+msgstr "neniam"
+
+#: ../src/connection-editor/nm-connection-list.c:154
+#: ../src/connection-editor/nm-connection-list.c:165
+msgid "now"
+msgstr "nun"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:172
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "Antaŭ %d minuto"
+msgstr[1] "Antaŭ %d minutoj"
+
+#: ../src/connection-editor/nm-connection-list.c:176
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "Antaŭ %d horo"
+msgstr[1] "Antaŭ %d horoj"
+
+#: ../src/connection-editor/nm-connection-list.c:188
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Antaŭ %d tago"
+msgstr[1] "Antaŭ %d tagoj"
+
+#: ../src/connection-editor/nm-connection-list.c:194
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "Antaŭ %d monato"
+msgstr[1] "Antaŭ %d monatoj"
+
+#: ../src/connection-editor/nm-connection-list.c:198
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "Antaŭ %d jaro"
+msgstr[1] "Antaŭ %d jaroj"
+
+#: ../src/connection-editor/nm-connection-list.c:632
+msgid "Name"
+msgstr "Nomo"
+
+#: ../src/connection-editor/nm-connection-list.c:645
+msgid "Last Used"
+msgstr "Laste uzita"
+
+#: ../src/connection-editor/nm-connection-list.c:687
+msgid "Edit the selected connection"
+msgstr "Redaki elektitan konekton"
+
+#: ../src/connection-editor/nm-connection-list.c:688
+msgid "_Edit..."
+msgstr "R_edakti..."
+
+#: ../src/connection-editor/nm-connection-list.c:689
+msgid "Authenticate to edit the selected connection"
+msgstr "Aŭtentigi por redakti la elektitan konekton"
+
+#: ../src/connection-editor/nm-connection-list.c:704
+msgid "Delete the selected connection"
+msgstr "Forigi la elektitan konekton"
+
+#: ../src/connection-editor/nm-connection-list.c:705
+msgid "_Delete..."
+msgstr "_Forigi..."
+
+#: ../src/connection-editor/nm-connection-list.c:706
+msgid "Authenticate to delete the selected connection"
+msgstr "Vi devas aŭtentigi por forigi la elektitan konekton"
+
+#: ../src/connection-editor/nm-connection-list.c:935
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:937
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "Ne scias kiel krei konektojn per  '%s'"
+
+#: ../src/connection-editor/nm-connection-list.c:939
+msgid "Error creating connection"
+msgstr "Eraro dum kreo de konekto"
+
+#: ../src/connection-editor/nm-connection-list.c:995
+msgid "Error editing connection"
+msgstr "Eraro dum redakto de konekto"
+
+#: ../src/connection-editor/nm-connection-list.c:996
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr "Ne trovis konekton kun UUID '%s':w"
+
+#: ../src/connection-editor/page-8021x-security.c:121
+msgid "802.1x Security"
+msgstr "802.1x-sekureco"
+
+#: ../src/connection-editor/page-8021x-security.c:123
+#, fuzzy
+#| msgid "Could not load WiFi security user interface."
+msgid "Could not load 802.1x Security user interface."
+msgstr "Ne eblis ŝargi uzantinterfacon por la sekureco de sendrataj konektoj."
+
+#: ../src/connection-editor/page-8021x-security.c:137
+msgid "Use 802.1_X security for this connection"
+msgstr "Uzi 802.1_X-sekurecon por ĉi tiu konekto"
+
+#: ../src/connection-editor/page-bond.c:436
+#, fuzzy
+#| msgid "Could not load wired user interface."
+msgid "Could not load bond user interface."
+msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
+
+#: ../src/connection-editor/page-bond.c:594
+#, c-format
+#| msgid "Wired connection %d"
+msgid "Bond connection %d"
+msgstr "Pont-konekto %d"
+
+#: ../src/connection-editor/page-bridge.c:211
+#, fuzzy
+#| msgid "Could not load wired user interface."
+msgid "Could not load bridge user interface."
+msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
+
+#: ../src/connection-editor/page-bridge.c:306
+#, fuzzy, c-format
+#| msgid "Wired connection %d"
+msgid "Bridge connection %d"
+msgstr "Drata konekto %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:115
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:117
+#, fuzzy
+#| msgid "Could not load wired user interface."
+msgid "Could not load bridge port user interface."
+msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
+
+#: ../src/connection-editor/page-dcb.c:607
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:609
+#, fuzzy
+#| msgid "Could not load DSL user interface."
+msgid "Could not load DCB user interface."
+msgstr "Ne eblas ŝargi uzantinterfacon de DSL."
+
+#: ../src/connection-editor/page-dsl.c:139
 msgid "Could not load DSL user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon de DSL."
 
@@ -1542,6 +2685,66 @@ msgstr "Ne eblas ŝargi uzantinterfacon de DSL."
 msgid "DSL connection %d"
 msgstr "DSL-konekto «%d»"
 
+#: ../src/connection-editor/page-ethernet.c:81
+#: ../src/connection-editor/page-infiniband.c:65
+#: ../src/connection-editor/page-wifi.c:95
+#: ../src/connection-editor/page-wimax.c:61
+msgid ""
+"This option locks this connection to the network device specified by its "
+"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+msgstr ""
+"Ĉi tiu opcio limigas ĉi tiun konekton al la reta aparato specifita per ĝia "
+"permanenta MAC-adreso enigita tien ĉi. Ekzemplo: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-ethernet.c:244
+#, fuzzy
+#| msgid "Could not load wired user interface."
+msgid "Could not load ethernet user interface."
+msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
+
+#: ../src/connection-editor/page-ethernet.c:387
+#, c-format
+#| msgid "Wired connection %d"
+msgid "Ethernet connection %d"
+msgstr "Drata konekto %d"
+
+#. TRANSLATORS: Default zone set for firewall, when no zone is selected
+#: ../src/connection-editor/page-general.c:55
+#: ../src/libnm-gtk/nm-mobile-providers.c:808
+msgid "Default"
+msgstr "Defaŭlte"
+
+#: ../src/connection-editor/page-general.c:56
+msgid ""
+"The zone defines the trust level of the connection. Default is not a regular "
+"zone, selecting it results in the use of the default zone set in the "
+"firewall. Only usable if firewalld is active."
+msgstr ""
+
+#: ../src/connection-editor/page-general.c:57
+#, fuzzy
+#| msgid "NetworkManager is not running..."
+msgid "FirewallD is not running."
+msgstr "NetworkManager ne estas rulanta..."
+
+#: ../src/connection-editor/page-general.c:330
+#, fuzzy
+#| msgid "Could not load wired user interface."
+msgid "Could not load General user interface."
+msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
+
+#: ../src/connection-editor/page-infiniband.c:162
+#, fuzzy
+#| msgid "Could not load WiFi user interface."
+msgid "Could not load InfiniBand user interface."
+msgstr "Ne eblas ŝargi uzantinterfacon por sendrataj konektoj."
+
+#: ../src/connection-editor/page-infiniband.c:254
+#, fuzzy, c-format
+#| msgid "Wired connection %d"
+msgid "InfiniBand connection %d"
+msgstr "Drata konekto %d"
+
 #: ../src/connection-editor/page-ip4.c:133
 #: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (VPN)"
@@ -1589,16 +2792,30 @@ msgstr "Nur \"Ligi-Loke\""
 msgid "Disabled"
 msgstr "Elŝaltite"
 
-#: ../src/connection-editor/page-ip4.c:832
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:296
+#, fuzzy
+#| msgid "DNS ser_vers:"
+msgid "Additional DNS ser_vers:"
+msgstr "_DNS-serviloj:"
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:305
+#, fuzzy
+#| msgid "S_earch domains:"
+msgid "Additional s_earch domains:"
+msgstr "S_erĉi domajnojn:"
+
+#: ../src/connection-editor/page-ip4.c:856
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Redaktanta IPv4-kurson por %s"
 
-#: ../src/connection-editor/page-ip4.c:981
+#: ../src/connection-editor/page-ip4.c:1008
 msgid "IPv4 Settings"
 msgstr "Agordoj por IPv4"
 
-#: ../src/connection-editor/page-ip4.c:983
+#: ../src/connection-editor/page-ip4.c:1010
 msgid "Could not load IPv4 user interface."
 msgstr "Ne eblas ŝargi IPv4-uzantinterfacon."
 
@@ -1607,7 +2824,6 @@ msgid "Automatic, addresses only"
 msgstr "Aŭtomate, nur adresoj"
 
 #: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:285
 msgid "Ignore"
 msgstr "Ignori"
 
@@ -1615,474 +2831,341 @@ msgstr "Ignori"
 msgid "Automatic, DHCP only"
 msgstr "Aŭtomate, nur DHCP"
 
-#: ../src/connection-editor/page-ip6.c:798
+#: ../src/connection-editor/page-ip6.c:819
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Redaktanta IPv6-kursoj por %s"
 
-#: ../src/connection-editor/page-ip6.c:945
+#: ../src/connection-editor/page-ip6.c:969
 msgid "IPv6 Settings"
 msgstr "Agordoj por IPv6"
 
-#: ../src/connection-editor/page-ip6.c:947
+#: ../src/connection-editor/page-ip6.c:971
 msgid "Could not load IPv6 user interface."
 msgstr "Ne eblas ŝargi IPv6-uzantinterfacon."
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-master.c:244
+#: ../src/connection-editor/page-master.c:255
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:245
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:256
+#, c-format
+msgid ""
+"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"same physical device."
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:373
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:353
 msgid "Could not load mobile broadband user interface."
 msgstr "Ne eblas ŝargi uzinterfacon por poŝtelefona larĝkapacita reto."
 
-#: ../src/connection-editor/page-mobile.c:398
+#: ../src/connection-editor/page-mobile.c:370
 msgid "Unsupported mobile broadband connection type."
 msgstr "Nesubtenata speco de poŝtelefona larĝkapacita konekto."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:639
+#: ../src/connection-editor/page-mobile.c:620
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Elektu specon de poŝtelefona larĝkapacita provizanto"
 
-#: ../src/connection-editor/page-mobile.c:674
-msgid "Select the technology your mobile broadband provider uses.  If you are unsure, ask your provider."
-msgstr "Elektu la teĥnologion uzatan de via poŝtelefona larĝkapacita provizanto. Se vi ne certas, demandu 
vian provizanton."
+#: ../src/connection-editor/page-mobile.c:647
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+msgstr ""
+"Elektu la teĥnologion uzatan de via poŝtelefona larĝkapacita provizanto. Se "
+"vi ne certas, demandu vian provizanton."
 
-#: ../src/connection-editor/page-mobile.c:679
+#: ../src/connection-editor/page-mobile.c:652
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
-msgstr "Mia provizanto uzas _GSM-bazitan teĥnologion (ekz. GPRS, EDGE, UMTS, HSDPA)"
+msgstr ""
+"Mia provizanto uzas _GSM-bazitan teĥnologion (ekz. GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:686
+#: ../src/connection-editor/page-mobile.c:659
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Mia provizanto uzas C_DMA-bazitan teĥnologion (ekz. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:270
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
+#: ../src/mobile-helpers.c:268
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:137
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:138
+#: ../src/wireless-security/eap-method-ttls.c:248
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:139
+#: ../src/wireless-security/eap-method-ttls.c:298
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:140
 #: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../src/wireless-security/eap-method-peap.c:264
+#: ../src/wireless-security/eap-method-ttls.c:281
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:141
+#: ../src/wireless-security/eap-method-ttls.c:265
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:144
 msgid "none"
 msgstr "neniu"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../src/connection-editor/page-ppp.c:204
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Redaktanta PPP-metodojn de aŭtentigo por %s"
 
-#: ../src/connection-editor/page-ppp.c:282
+#: ../src/connection-editor/page-ppp.c:287
 msgid "PPP Settings"
 msgstr "Agordoj por PPP"
 
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:289
 msgid "Could not load PPP user interface."
 msgstr "Ne eblis ŝargi PPP-uzantinterfacon."
 
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-#: ../src/connection-editor/nm-connection-list.c:1515
-msgid "VPN"
-msgstr "VPN"
+#: ../src/connection-editor/page-team.c:92
+#: ../src/connection-editor/page-team-port.c:77
+#: ../src/connection-editor/vpn-helpers.c:234
+msgid "Select file to import"
+msgstr "Elekti enportendan dosieron"
+
+#: ../src/connection-editor/page-team.c:112
+#: ../src/connection-editor/page-team-port.c:97
+msgid "Error: file doesn't contain a valid JSON configuration"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:247
+#, fuzzy
+#| msgid "Could not load wired user interface."
+msgid "Could not load team user interface."
+msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
+
+#: ../src/connection-editor/page-team.c:346
+#, fuzzy, c-format
+#| msgid "Wired connection %d"
+msgid "Team connection %d"
+msgstr "Drata konekto %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:157
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:159
+#, fuzzy
+#| msgid "Could not load wired user interface."
+msgid "Could not load team port user interface."
+msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
+
+#. Translators: the first %s is a device name (eg, "em1"), the
+#. * second is a connection name (eg, "Auto Ethernet").
+#.
+#: ../src/connection-editor/page-vlan.c:323
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:111
+#: ../src/connection-editor/page-vlan.c:489
+#, fuzzy
+#| msgid "Could not load IPv4 user interface."
+msgid "Could not load vlan user interface."
+msgstr "Ne eblas ŝargi IPv4-uzantinterfacon."
+
+#: ../src/connection-editor/page-vlan.c:685
+#, fuzzy, c-format
+#| msgid "VPN connection %d"
+msgid "VLAN connection %d"
+msgstr "VPN-konekto %d"
+
+#: ../src/connection-editor/page-vpn.c:115
 msgid "Could not load VPN user interface."
 msgstr "Ne eblis ŝargi VPN-uzantointerfacon."
 
-#: ../src/connection-editor/page-vpn.c:126
+#: ../src/connection-editor/page-vpn.c:130
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Ne eblis trovi VPN-kromprograman servon por '%s'."
 
-#: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:900
+#: ../src/connection-editor/page-vpn.c:224
+#: ../src/connection-editor/page-vpn.c:321
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-konekto %d"
 
-#: ../src/connection-editor/page-wired.c:89
-#: ../src/connection-editor/page-wireless.c:94
-msgid "This option locks this connection to the network device specified by its permanent MAC address 
entered here.  Example: 00:11:22:33:44:55"
-msgstr "Ĉi tiu opcio limigas ĉi tiun konekton al la reta aparato specifita per ĝia permanenta MAC-adreso 
enigita tien ĉi. Ekzemplo: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/page-wired.c:272
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:1503
-msgid "Wired"
-msgstr "Drata"
-
-#: ../src/connection-editor/page-wired.c:274
-msgid "Could not load wired user interface."
-msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
-
-#: ../src/connection-editor/page-wired.c:449
-#, c-format
-msgid "Wired connection %d"
-msgstr "Drata konekto %d"
-
-#: ../src/connection-editor/page-wired-security.c:116
-msgid "802.1x Security"
-msgstr "802.1x-sekureco"
-
-#: ../src/connection-editor/page-wired-security.c:118
-msgid "Could not load Wired Security security user interface."
-msgstr "Ne eblas ŝargi sekurecan uzantinterfacon por sendrata sekureco."
+#: ../src/connection-editor/page-vpn.c:250
+msgid ""
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
+msgstr ""
+"La VPN-kromprogramo malsukcesis korekte importi la VPN-konekton\n"
+"\n"
+"Eraro: neniu speco de VPN-servo"
 
-#: ../src/connection-editor/page-wired-security.c:136
-msgid "Use 802.1_X security for this connection"
-msgstr "Uzi 802.1_X-sekurecon por ĉi tiu konekto"
+#: ../src/connection-editor/page-vpn.c:275
+msgid "Choose a VPN Connection Type"
+msgstr "Elekti VPN-konekttipon"
 
-#: ../src/connection-editor/page-wireless.c:171
-#: ../src/connection-editor/page-wireless.c:175
-#: ../src/connection-editor/page-wireless.c:196
-#, c-format
-msgid "default"
-msgstr "defaŭlte"
+#: ../src/connection-editor/page-vpn.c:276
+msgid ""
+"Select the type of VPN you wish to use for the new connection.  If the type "
+"of VPN connection you wish to create does not appear in the list, you may "
+"not have the correct VPN plugin installed."
+msgstr ""
+"Elektu la VPN-specon kiun vi deziras uzi por la nova konekto. Se la de vi "
+"dezirata VPN-speco ne disponeblas en la listo, eble vi ne instalis la ĝustan "
+"VPN-kromprogramon."
+
+#: ../src/connection-editor/page-wifi.c:85
+#, fuzzy
+#| msgid ""
+#| "This option locks this connection to the wireless access point (AP) "
+#| "specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
+msgid ""
+"This option locks this connection to the Wi-Fi access point (AP) specified "
+"by the BSSID entered here.  Example: 00:11:22:33:44:55"
+msgstr ""
+"Ĉi tiu opcio limigas ĉi tiun konekton al la sendrata retkaptejo (AP) "
+"specifita per la BSSID enigita tien ĉi. Ekzemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:200
+#: ../src/connection-editor/page-wifi.c:201
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:457
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:1507
-msgid "Wireless"
-msgstr "Sendrata"
-
-#: ../src/connection-editor/page-wireless.c:459
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:467
+#, fuzzy
+#| msgid "Could not load WiFi user interface."
+msgid "Could not load Wi-Fi user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por sendrataj konektoj."
 
-#: ../src/connection-editor/page-wireless.c:663
-#, c-format
-msgid "Wireless connection %d"
-msgstr "Sendrata konekto %d"
+#: ../src/connection-editor/page-wifi.c:638
+#, fuzzy, c-format
+#| msgid "Wired connection %d"
+msgid "Wi-Fi connection %d"
+msgstr "Drata konekto %d"
 
-#: ../src/connection-editor/page-wireless-security.c:263
-#: ../src/libnm-gtk/nm-wireless-dialog.c:923
+#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/libnm-gtk/nm-wifi-dialog.c:892
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bita ŝlosilo (Deksesuma aŭ ASCII)"
 
-#: ../src/connection-editor/page-wireless-security.c:272
-#: ../src/libnm-gtk/nm-wireless-dialog.c:932
+#: ../src/connection-editor/page-wifi-security.c:296
+#: ../src/libnm-gtk/nm-wifi-dialog.c:901
 msgid "WEP 128-bit Passphrase"
 msgstr "128-bita WEP-pasfrazo"
 
-#: ../src/connection-editor/page-wireless-security.c:298
-#: ../src/libnm-gtk/nm-wireless-dialog.c:962
+#: ../src/connection-editor/page-wifi-security.c:322
+#: ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dinamika WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:312
-#: ../src/libnm-gtk/nm-wireless-dialog.c:976
+#: ../src/connection-editor/page-wifi-security.c:336
+#: ../src/libnm-gtk/nm-wifi-dialog.c:945
 msgid "WPA & WPA2 Personal"
 msgstr "WPA kaj WPA2 por personoj"
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:990
+#: ../src/connection-editor/page-wifi-security.c:350
+#: ../src/libnm-gtk/nm-wifi-dialog.c:959
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA kaj WPA2 por enterprenoj"
 
-#: ../src/connection-editor/page-wireless-security.c:360
-msgid "Could not load WiFi security user interface; missing WiFi setting."
-msgstr "Ne eblis ŝargi uzantinterfacon por la sekureco de sendrataj konektoj ĉar mankas agordojn por 
sendrataj konektoj."
+#: ../src/connection-editor/page-wifi-security.c:391
+#, fuzzy
+#| msgid "Could not load WiFi security user interface; missing WiFi setting."
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr ""
+"Ne eblis ŝargi uzantinterfacon por la sekureco de sendrataj konektoj ĉar "
+"mankas agordojn por sendrataj konektoj."
 
-#: ../src/connection-editor/page-wireless-security.c:370
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:402
+#| msgid "Wireless Security"
+msgid "Wi-Fi Security"
 msgstr "Sekureco de sendrataj konektoj"
 
-#: ../src/connection-editor/page-wireless-security.c:372
-msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:404
+#, fuzzy
+#| msgid "Could not load WiFi security user interface."
+msgid "Could not load Wi-Fi security user interface."
 msgstr "Ne eblis ŝargi uzantinterfacon por la sekureco de sendrataj konektoj."
 
-#: ../src/connection-editor/nm-connection-editor.c:101
-#, c-format
-msgid "Editing %s"
-msgstr "Redaktante %s"
-
-#: ../src/connection-editor/nm-connection-editor.c:105
-msgid "Editing un-named connection"
-msgstr "Redaktante sennoman konekton"
-
-#: ../src/connection-editor/nm-connection-editor.c:288
-msgid "The connection editor could not find some required resources (the .ui file was not found)."
-msgstr "La konektoredaktilo ne povis trovi kelkajn neprajn risurcojn (la .ui-dosiero ne estis  trovita)."
-
-#: ../src/connection-editor/nm-connection-editor.c:391
-msgid "Error creating connection editor dialog."
-msgstr "Eraro dum kreo de dialogujo por konekto-redaktilo."
-
-#: ../src/connection-editor/nm-connection-editor.c:403
-msgid "_Save"
-msgstr "Kon_servi"
-
-#: ../src/connection-editor/nm-connection-editor.c:404
-msgid "Save any changes made to this connection."
-msgstr "Konservi ĉiujn ŝanĝojn faritajn al tiu ĉi konekto."
-
-#: ../src/connection-editor/nm-connection-editor.c:405
-msgid "_Save..."
-msgstr "Kon_servi..."
-
-#: ../src/connection-editor/nm-connection-editor.c:406
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr "Aŭtentigi por konservi ĉi tiun konekton por ĉiuj uzantoj de ĉi tiu komputilo."
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "_Import"
-msgstr "E_nporti"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "E_xport"
-msgstr "E_lporti"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-msgid "Connection _name:"
-msgstr "_Nomo de konekto:"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-msgid "Connect _automatically"
-msgstr "Konekti _aŭtomate"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "A_vailable to all users"
-msgstr "Disponebla al ĉiuj uzantoj"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "neniam"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "nun"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "Antaŭ %d minuto"
-msgstr[1] "Antaŭ %d minutoj"
-
-#: ../src/connection-editor/nm-connection-list.c:249
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "Antaŭ %d horo"
-msgstr[1] "Antaŭ %d horoj"
-
-#: ../src/connection-editor/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Antaŭ %d tago"
-msgstr[1] "Antaŭ %d tagoj"
-
-#: ../src/connection-editor/nm-connection-list.c:267
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "Antaŭ %d monato"
-msgstr[1] "Antaŭ %d monatoj"
-
-#: ../src/connection-editor/nm-connection-list.c:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "Antaŭ %d jaro"
-msgstr[1] "Antaŭ %d jaroj"
-
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Connection add failed"
-msgstr "Aldono de konekto fiaskis"
-
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "Eraro dum konservo de konekto"
-
-#: ../src/connection-editor/nm-connection-list.c:516
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "La atributo  '%s' / '%s' estas nevalida: %d"
-
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:662
-msgid "An unknown error occurred."
-msgstr "Okazis nekonata eraro."
-
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "Error initializing editor"
-msgstr "Eraro dum pravalorizado de redaktilo"
-
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:719
-#: ../src/connection-editor/nm-connection-list.c:886
-msgid "The connection editor dialog could not be initialized due to an unknown error."
-msgstr "La dialogujo por la konekto-redaktilo ne estis pravalorizebla pro nekonata eraro."
-
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "Ne eblis krei novan konekton."
-
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "Ne eblis agordi novan konekton."
-
-#: ../src/connection-editor/nm-connection-list.c:733
-msgid "Could not edit connection"
-msgstr "Ne eblis agordi konekton."
-
-#: ../src/connection-editor/nm-connection-list.c:763
-msgid "Connection delete failed"
-msgstr "Forigo de konekto malsukcesis."
+#: ../src/connection-editor/page-wimax.c:128
+#, fuzzy
+#| msgid "Could not load WiFi user interface."
+msgid "Could not load WiMAX user interface."
+msgstr "Ne eblas ŝargi uzantinterfacon por sendrataj konektoj."
 
-#: ../src/connection-editor/nm-connection-list.c:795
-#, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "Ĉu vi certe volas forigi la konekton %s?"
+#: ../src/connection-editor/page-wimax.c:224
+#, fuzzy, c-format
+#| msgid "Wired connection %d"
+msgid "WiMAX connection %d"
+msgstr "Drata konekto %d"
 
-#: ../src/connection-editor/nm-connection-list.c:930
-#: ../src/connection-editor/vpn-helpers.c:227
+#: ../src/connection-editor/vpn-helpers.c:207
 msgid "Cannot import VPN connection"
 msgstr "Ne eblas enporti VPN-konekton"
 
-#: ../src/connection-editor/nm-connection-list.c:932
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-msgstr ""
-"La VPN-kromprogramo fiaskis korekte importi la VPN-konekton\n"
-"\n"
-"Eraro: neniu speco de VPN-servo"
-
-#: ../src/connection-editor/nm-connection-list.c:945
-msgid "Could not edit imported connection"
-msgstr "Ne eblas redakti enportitan konekton"
-
-#: ../src/connection-editor/nm-connection-list.c:1126
-msgid "Name"
-msgstr "Nomo"
-
-#: ../src/connection-editor/nm-connection-list.c:1138
-msgid "Last Used"
-msgstr "Laste uzita"
-
-#: ../src/connection-editor/nm-connection-list.c:1264
-msgid "No VPN plugin available. Please install one to enable this button."
-msgstr "Neniu VPN-kromprogramo estas instalita. Bonvole instalu iun por enŝalti tiun butonon."
-
-#: ../src/connection-editor/nm-connection-list.c:1275
-msgid "_Edit"
-msgstr "R_edakti"
-
-#: ../src/connection-editor/nm-connection-list.c:1276
-msgid "Edit the selected connection"
-msgstr "Redaki elektitan konekton"
-
-#: ../src/connection-editor/nm-connection-list.c:1277
-msgid "_Edit..."
-msgstr "R_edakti..."
-
-#: ../src/connection-editor/nm-connection-list.c:1278
-msgid "Authenticate to edit the selected connection"
-msgstr "Aŭtentigi por redakti la elektitan konekton"
-
-#: ../src/connection-editor/nm-connection-list.c:1293
-msgid "_Delete"
-msgstr "_Forigi"
-
-#: ../src/connection-editor/nm-connection-list.c:1294
-msgid "Delete the selected connection"
-msgstr "Forigi la elektitan konekton"
-
-#: ../src/connection-editor/nm-connection-list.c:1295
-msgid "_Delete..."
-msgstr "_Forigi..."
-
-#: ../src/connection-editor/nm-connection-list.c:1296
-msgid "Authenticate to delete the selected connection"
-msgstr "Vi devas aŭtentigi por forigi la elektitan konekton"
-
-#: ../src/connection-editor/nm-connection-list.c:1575
-msgid "Error creating connection"
-msgstr "Eraro dum kreo de konekto"
-
-#: ../src/connection-editor/nm-connection-list.c:1576
-#, c-format
-msgid "Don't know how to create '%s' connections"
-msgstr "Ne scias kiel krei konektojn per  '%s'"
-
-#: ../src/connection-editor/nm-connection-list.c:1631
-#: ../src/connection-editor/nm-connection-list.c:1643
-msgid "Error editing connection"
-msgstr "Eraro dum redakto de konekto"
-
-#: ../src/connection-editor/nm-connection-list.c:1632
-#, c-format
-msgid "Don't know how to edit '%s' connections"
-msgstr "Ne scias kiel redakti konektojn per  '%s'"
-
-#: ../src/connection-editor/nm-connection-list.c:1644
-#, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr "Ne trovis konekton kun UUID '%s':w"
-
-#: ../src/connection-editor/vpn-helpers.c:229
+#: ../src/connection-editor/vpn-helpers.c:209
 #, c-format
 msgid ""
-"The file '%s' could not be read or does not contain recognized VPN connection information\n"
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
 "\n"
 "Error: %s."
 msgstr ""
-"La dosiero '%s' ne estis legebla aŭ ne entenas rekonitajn VPN-konektajn informojn\n"
+"La dosiero '%s' ne estis legebla aŭ ne entenas rekonitajn VPN-konektajn "
+"informojn\n"
 "\n"
 "Eraro: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:262
-msgid "Select file to import"
-msgstr "Elekti enportendan dosieron"
-
-#: ../src/connection-editor/vpn-helpers.c:313
+#: ../src/connection-editor/vpn-helpers.c:284
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Dosiero nomita «%s» jam ekzistas."
 
-#: ../src/connection-editor/vpn-helpers.c:315
+#: ../src/connection-editor/vpn-helpers.c:286
 msgid "_Replace"
 msgstr "_Anstataŭigi"
 
-#: ../src/connection-editor/vpn-helpers.c:317
+#: ../src/connection-editor/vpn-helpers.c:288
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Ĉu vi volas anstataŭigi %s per la VPN-konekto vi estas konservanta?"
 
-#: ../src/connection-editor/vpn-helpers.c:353
+#: ../src/connection-editor/vpn-helpers.c:324
 msgid "Cannot export VPN connection"
 msgstr "Ne eblas elporti VPN-konekton"
 
-#: ../src/connection-editor/vpn-helpers.c:355
+#: ../src/connection-editor/vpn-helpers.c:326
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2093,290 +3176,421 @@ msgstr ""
 "\n"
 "Eraro: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:390
+#: ../src/connection-editor/vpn-helpers.c:361
 msgid "Export VPN connection..."
 msgstr "Elporti VPN-konekton..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Fiaskis krei PAN-konekton: %s"
+#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"La Retadministrilo-apleto ne povis trovi kelkajn neprajn risurcojn (la .ui-"
+"dosiero ne estis  trovita)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr "Via telefono estas nun uzpreta!"
+#: ../src/gnome-bluetooth/bt-widget.c:321
+#, fuzzy, c-format
+#| msgid ""
+#| "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+msgid ""
+"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
+msgstr "Agordado de Bludento ne eblas (malsukcesis konekti al D-buso: %s)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:249
-#, c-format
-msgid "%s Network"
-msgstr "%s Reto"
+#: ../src/gnome-bluetooth/bt-widget.c:330
+#, fuzzy, c-format
+#| msgid ""
+#| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+msgid ""
+"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
+msgstr "Agordado de Bludento ne eblas (ne povis trovi NetworkManager: %s)."
+
+#: ../src/gnome-bluetooth/bt-widget.c:441
+msgid "Use your mobile phone as a network device (PAN/NAP)"
+msgstr "Uzi vian poŝtelefonon kiel retaparato (PAN/NAP)"
+
+#: ../src/gnome-bluetooth/bt-widget.c:450
+msgid "Access the Internet using your mobile phone (DUN)"
+msgstr "Eniri la reton per via poŝtelefono (DUN)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:375
+#: ../src/gnome-bluetooth/nma-bt-device.c:324
 #, c-format
 msgid "Error: %s"
 msgstr "Eraro: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:488
+#: ../src/gnome-bluetooth/nma-bt-device.c:431
 #, c-format
 msgid "Failed to create DUN connection: %s"
-msgstr "Fiaskis krei DUN-konekton: %s"
+msgstr "Malsukcesis krei DUN-konekton: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:511
+#: ../src/gnome-bluetooth/nma-bt-device.c:433
+#: ../src/gnome-bluetooth/nma-bt-device.c:947
+msgid "Your phone is now ready to use!"
+msgstr "Via telefono estas nun uzpreta!"
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:456
 msgid "Mobile wizard was canceled"
 msgstr "Asistanto por poŝtelefonoj nuliĝis"
 
-#: ../src/gnome-bluetooth/bt-widget.c:520
+#: ../src/gnome-bluetooth/nma-bt-device.c:465
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "Nekonata telefonaparata speco (ne GSM nek CDMA)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
+#: ../src/gnome-bluetooth/nma-bt-device.c:501
+msgid "unknown modem type."
+msgstr ""
+
+#: ../src/gnome-bluetooth/nma-bt-device.c:721
+#: ../src/gnome-bluetooth/nma-bt-device.c:727
 msgid "failed to connect to the phone."
-msgstr "fiaskis konekti al la telefono."
+msgstr "malsukcesis konekti al la telefono."
 
-#: ../src/gnome-bluetooth/bt-widget.c:753
+#: ../src/gnome-bluetooth/nma-bt-device.c:758
 msgid "unexpectedly disconnected from the phone."
 msgstr "neatendite malkonektiĝis de la telefono."
 
-#: ../src/gnome-bluetooth/bt-widget.c:762
+#: ../src/gnome-bluetooth/nma-bt-device.c:768
 msgid "timed out detecting phone details."
 msgstr "eltempiĝis dum detektado de telefonaj detaloj."
 
-#: ../src/gnome-bluetooth/bt-widget.c:774
+#: ../src/gnome-bluetooth/nma-bt-device.c:779
 msgid "Detecting phone configuration..."
 msgstr "Detektas telefonan agordaron..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:840
-msgid "could not find the Bluetooth device."
-msgstr "Ne eblis trovi la Bludento-aparaton."
+#: ../src/gnome-bluetooth/nma-bt-device.c:811
+#, fuzzy
+#| msgid "Error editing connection"
+msgid "error getting bus connection"
+msgstr "Eraro dum redakto de konekto"
 
-#: ../src/gnome-bluetooth/bt-widget.c:980
-msgid "The default Bluetooth adapter must be enabled before setting up a Dial-Up-Networking connection."
-msgstr "La defaŭlta Bludento-adaptilo devas esti enŝaltita antaŭ ol vi povas starigi pertelefonan 
retkonekton."
+#: ../src/gnome-bluetooth/nma-bt-device.c:908
+msgid ""
+"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+"Networking connection."
+msgstr ""
+"La defaŭlta Bludento-adaptilo devas esti enŝaltita antaŭ ol vi povas starigi "
+"pertelefonan retkonekton."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1012
+#: ../src/gnome-bluetooth/nma-bt-device.c:945
 #, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr "Agordado de Bludento ne eblas (fiaskis konekti al D-buso: %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1022
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "Agordado de Bludento ne eblas (fiaskis krei D-busan prokurilon)."
+msgid "Failed to create PAN connection: %s"
+msgstr "Malsukcesis krei PAN-konekton: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1031
+#: ../src/gnome-bluetooth/nma-bt-device.c:966
 #, c-format
-msgid "Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "Agordado de Bludento ne eblas (ne povis trovi NetworkManager: %s)."
+msgid "%s Network"
+msgstr "%s Reto"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1098
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Uzi vian poŝtelefonon kiel retaparato (PAN/NAP)"
+#: ../src/gsm-unlock.ui.h:1
+msgid "_Unlock"
+msgstr "_Malŝlosi"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1107
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Eniri la reton per via poŝtelefono (DUN)"
+#: ../src/gsm-unlock.ui.h:2
+msgid "Automatically unlock this device"
+msgstr "Aŭtomate malŝlosi ĉi tiun aparaton"
+
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "Konektinformoj"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:198
-msgid "Your mobile broadband connection is configured with the following settings:"
-msgstr "Via poŝtelefona larĝkapacita konekto estas agordita per la sekvaj agordoj:"
+#: ../src/info.ui.h:2
+msgid "Active Network Connections"
+msgstr "Aktivaj retkonektoj"
+
+#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+msgid ""
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
+"Via poŝtelefona larĝkapacita konekto estas agordita per la sekvaj agordoj:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:211
 msgid "Your Device:"
 msgstr "Via aparato:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:222
 msgid "Your Provider:"
 msgstr "Via provizanto:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:233
 msgid "Your Plan:"
 msgstr "Via faktura reĝimo:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:252
-msgid "A connection will now be made to your mobile broadband provider using the settings you selected.  If 
the connection fails or you cannot access network resources, double-check your settings.  To modify your 
mobile broadband connection settings, choose \"Network Connections\" from the System >> Preferences menu."
-msgstr "Konekto estos nun farata al via poŝtelefona larĝkapacita provizanto uzante la de vi elektitajn 
agordojn. Se la konekto malsukcesas aŭ vi ne povas atingi retajn fontojn, rekontrolu viajn agordojn. Por 
modifi viajn agordojn por poŝtelefona larĝkapacita konekto, elektu \"Retkonektoj\"-n el la menuo Sistemo >> 
Agordoj."
+#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+msgid ""
+"A connection will now be made to your mobile broadband provider using the "
+"settings you selected.  If the connection fails or you cannot access network "
+"resources, double-check your settings.  To modify your mobile broadband "
+"connection settings, choose \"Network Connections\" from the System >> "
+"Preferences menu."
+msgstr ""
+"Konekto estos nun farata al via poŝtelefona larĝkapacita provizanto uzante "
+"la de vi elektitajn agordojn. Se la konekto malsukcesas aŭ vi ne povas "
+"atingi retajn fontojn, rekontrolu viajn agordojn. Por modifi viajn agordojn "
+"por poŝtelefona larĝkapacita konekto, elektu \"Retkonektoj\"-n el la menuo "
+"Sistemo >> Agordoj."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:264
+#: ../src/libnm-gtk/nm-mobile-wizard.c:266
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Konfirmi agordojn por poŝtelefona larĝkapacita reto"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:330
 msgid "Unlisted"
 msgstr "Nelistigite"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:480
+#: ../src/libnm-gtk/nm-mobile-wizard.c:461
 msgid "_Select your plan:"
 msgstr "_Elekti vian planon:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:504
+#: ../src/libnm-gtk/nm-mobile-wizard.c:485
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Elekti planon - _APN (Access Point Name, nomo de retkaptejo):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:528
+#: ../src/libnm-gtk/nm-mobile-wizard.c:505
 msgid ""
-"Warning: Selecting an incorrect plan may result in billing issues for your broadband account or may prevent 
connectivity.\n"
+"Warning: Selecting an incorrect plan may result in billing issues for your "
+"broadband account or may prevent connectivity.\n"
 "\n"
 "If you are unsure of your plan please ask your provider for your plan's APN."
 msgstr ""
-"Atenton: Elekto de neĝusta plano povas kaŭzi fakturajn problemojn kun via larĝkapacita konto, aŭ eble 
preventas konekteblon.\n"
+"Atenton: Elekto de neĝusta plano povas kaŭzi fakturajn problemojn kun via "
+"larĝkapacita konto, aŭ eble preventas konekteblon.\n"
 "\n"
-"Se vi ne certas kiun planon elekti, bonvolu demandi vian provizanton por la APN de via plano."
+"Se vi ne certas kiun planon elekti, bonvolu demandi vian provizanton por la "
+"APN de via plano."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../src/libnm-gtk/nm-mobile-wizard.c:512
 msgid "Choose your Billing Plan"
 msgstr "Elekti vian fakturo-planon"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:583
+#: ../src/libnm-gtk/nm-mobile-wizard.c:561
 msgid "My plan is not listed..."
 msgstr "Mia plano estas nelistigite..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:740
+#: ../src/libnm-gtk/nm-mobile-wizard.c:714
 msgid "Select your provider from a _list:"
 msgstr "Elekti vian provizanton el _listo:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnm-gtk/nm-mobile-wizard.c:727
 msgid "Provider"
 msgstr "Provizanto"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:778
+#: ../src/libnm-gtk/nm-mobile-wizard.c:752
 msgid "I can't find my provider and I wish to enter it _manually:"
 msgstr "Mi ne povas trovi mian provizanton kaj mi deziras enigi ĝin _mane:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:789
+#: ../src/libnm-gtk/nm-mobile-wizard.c:765
 msgid "Provider:"
 msgstr "Provizanto:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:813
+#: ../src/libnm-gtk/nm-mobile-wizard.c:782
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Mia provizanto uzas GSM-teĥnologion (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:819
+#: ../src/libnm-gtk/nm-mobile-wizard.c:784
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Mia provizanto uzas CDMA-teĥnologion (1XRRT, EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:830
+#: ../src/libnm-gtk/nm-mobile-wizard.c:795
 msgid "Choose your Provider"
 msgstr "Elekti vian provizanton"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1081
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1047
 msgid "Country or Region List:"
 msgstr "Landa aŭ regiona listo:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1093
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1060
 msgid "Country or region"
 msgstr "Lando aŭ regiono"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1070
 msgid "My country is not listed"
 msgstr "Mia lando ne estas listigita"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1146
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1120
 msgid "Choose your Provider's Country or Region"
 msgstr "Elekti la landon aŭ regionon de via provizanto"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1200
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1174
 msgid "Installed GSM device"
 msgstr "Instalis GSM-aparaton"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1203
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1177
 msgid "Installed CDMA device"
 msgstr "Instalis CDMA-aparaton"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1375
-msgid "This assistant helps you easily set up a mobile broadband connection to a cellular (3G) network."
-msgstr "Ĉi tiu asistanto helpas vin facile agordi poŝtelefonan larĝkapacitan konekton al portebla (3G) reto."
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1345
+msgid ""
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
+msgstr ""
+"Ĉi tiu asistanto helpas vin facile agordi poŝtelefonan larĝkapacitan "
+"konekton al portebla (3G) reto."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1380
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1350
 msgid "You will need the following information:"
 msgstr "Vi bezonos la sekvajn informojn:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1395
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "Your broadband provider's name"
 msgstr "La nomon de via larĝkapacita provizanto"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1401
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1367
 msgid "Your broadband billing plan name"
 msgstr "La nomon de la fakturplano de via larĝkapacita provizanto"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1373
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
-msgstr "(en kelkaj kazoj) la APN-n (Access Point Name, nomo de retkaptejo) de la fakturplano"
+msgstr ""
+"(en kelkaj kazoj) la APN-n (Access Point Name, nomo de retkaptejo) de la "
+"fakturplano"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Krei konekton por _tiu ĉi larĝkapacita aparato:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1449
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1417
 msgid "Any device"
 msgstr "Iu aparato"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1462
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1430
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Agordi poŝtelefonan larĝkapacitan konekton"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1626
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1603
 msgid "New Mobile Broadband Connection"
 msgstr "Nova poŝtelefona larĝkapacita konekto"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
+msgid "Wired"
+msgstr "Drata"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:327
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:329
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:345
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:408
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:410
+msgid "USB"
+msgstr ""
+
+#. 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.
+#.
+#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:435
 msgid "New..."
 msgstr "Nova..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1077
+#: ../src/libnm-gtk/nm-wifi-dialog.c:875
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Neniu"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1046
 msgid "C_reate"
 msgstr "K_rei"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1161
-#, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "Pasvortoj aŭ ĉifroŝlosiloj estas postulataj por atingi la sendratan reton '%s'."
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1130
+#, fuzzy, c-format
+#| msgid ""
+#| "Passwords or encryption keys are required to access the wireless network "
+#| "'%s'."
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr ""
+"Pasvortoj aŭ ĉifroŝlosiloj estas postulataj por atingi la sendratan reton "
+"'%s'."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1163
-msgid "Wireless Network Authentication Required"
-msgstr "Aŭtentigo por sendrata reto postulata"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1132
+#| msgid "Wireless Network Authentication Required"
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Aŭtentigo por sendrata reto estas postulata"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1165
-msgid "Authentication required by wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1134
+#| msgid "Authentication required by wireless network"
+msgid "Authentication required by Wi-Fi network"
 msgstr "Sendrata reto postulas aŭtentigon"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1170
-msgid "Create New Wireless Network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#| msgid "Create New Wireless Network"
+msgid "Create New Wi-Fi Network"
 msgstr "Krei novan sendratan reton"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-msgid "New wireless network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
+#| msgid "New wireless network"
+msgid "New Wi-Fi network"
 msgstr "Nova sendrata reto"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1173
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1142
+#| msgid "Enter a name for the wireless network you wish to create."
+msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Entajpu nomon por la sendrata reto kiun vi volas krei."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1175
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#| msgid "Connect to Hidden Wireless Network"
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Konekti al kaŝita sendrata reto"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
-msgid "Hidden wireless network"
-msgstr "Kaŝi sendratan reton"
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#| msgid "Hidden wireless network"
+msgid "Hidden Wi-Fi network"
+msgstr "Kaŝita sendrata reto"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#| msgid ""
+#| "Enter the name and security details of the hidden wireless network you "
+#| "wish to connect to."
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Entajpu la nomon kaj sekurecdetalojn de la kaŝita sendrata reto al kiu vi "
+"volas konekti."
+
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#, fuzzy
+#| msgid "_Password:"
+msgid "_Secondary Password:"
+msgstr "_Duaranga pasvorto:"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1178
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Entajpu la nomon kaj sekurecdetalojn de la kaŝita sendrata reto al kiu vi volas fari konekton."
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
+#| msgid "Sho_w passwords"
+msgid "Sh_ow passwords"
+msgstr "M_ontri pasvortojn"
 
 #: ../src/libnm-gtk/wifi.ui.h:2
-msgid "Wireless _security:"
-msgstr "_Sendrata sekureco:"
+#| msgid "Wireless _security:"
+msgid "Wi-Fi _security:"
+msgstr "Sendrata _sekureco:"
 
 #: ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Ko_nekto:"
 
 #: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _adapter:"
+#| msgid "Wireless _adapter:"
+msgid "Wi-Fi _adapter:"
 msgstr "Sendrata _adaptilo:"
 
 #: ../src/main.c:73
@@ -2384,122 +3598,159 @@ msgid "Usage:"
 msgstr "Uzo:"
 
 #: ../src/main.c:75
-msgid "This program is a component of NetworkManager (https://wiki.gnome.org/Projects/NetworkManager/)."
-msgstr "Tiu ĉi programo estas parto de NetworkManager (https://wiki.gnome.org/Projects/NetworkManager/)."
+msgid ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/";
+"Projects/NetworkManager/)."
+msgstr ""
+"Tiu ĉi programo estas parto de NetworkManager (https://wiki.gnome.org/";
+"Projects/NetworkManager/)."
 
 #: ../src/main.c:76
-msgid "It is not intended for command-line interaction but instead runs in the GNOME desktop environment."
-msgstr "Ĝi ne estas celata por komandlinia interago sed anstataŭe ruliĝas en la GNOME-labortabla ĉirkaŭaĵo."
+msgid ""
+"It is not intended for command-line interaction but instead runs in the "
+"GNOME desktop environment."
+msgstr ""
+"Ĝi ne estas celata por komandlinia interago sed anstataŭe ruliĝas en la "
+"GNOME-labortabla ĉirkaŭaĵo."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:56
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:60
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:62
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:64
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:66
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:68
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:70
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/mb-menu-item.c:72
+#| msgid "HSPA"
+msgid "HSPA+"
+msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:76
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:112
 msgid "not enabled"
 msgstr "ne enŝaltite"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:118
 msgid "not registered"
 msgstr "neregistrite"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:136
 #, c-format
 msgid "Home network (%s)"
 msgstr "Hejmreto (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:138
 #, c-format
 msgid "Home network"
 msgstr "Hejmreto"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:146
 msgid "searching"
 msgstr "serĉante"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:149
 msgid "registration denied"
 msgstr "registrado malpermesita"
 
-#: ../src/mb-menu-item.c:151
-#: ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s retmigrado)"
 
-#: ../src/mb-menu-item.c:153
-#: ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:156 ../src/mb-menu-item.c:162
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (retmigrado)"
 
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:165
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Retmigra reto (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:167
 #, c-format
 msgid "Roaming network"
 msgstr "Retmigra reto"
 
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "Defaŭlte"
+#: ../src/mobile-helpers.c:318
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "PIN-kodo por SIM-karto '%s' ĉe '%s'"
 
-#: ../src/wired-dialog.c:91
-#: ../src/wired-dialog.c:99
-msgid "The NetworkManager Applet could not find some required resources (the .ui file was not found)."
-msgstr "La Retadministrilo-apleto ne povis trovi kelkajn neprajn risurcojn (la .ui-dosiero ne estis  
trovita)."
+#: ../src/mobile-helpers.c:451
+msgid "PIN code required"
+msgstr "PIN-kodo bezonatas"
 
-#: ../src/wireless-security/eap-method.c:279
-msgid "No Certificate Authority certificate chosen"
-msgstr "Neniu atestilo de Atestilaŭtoritato (CA) elektita"
+#: ../src/mobile-helpers.c:459
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "Port-larĝkapacita aparato bezonas PIN-kodon"
 
-#: ../src/wireless-security/eap-method.c:280
-msgid "Not using a Certificate Authority (CA) certificate can result in connections to insecure, rogue 
wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "Neuzo de atestilo de Atestilaŭtoritato (Certificate Authority, CA) povas kaŭzi konektojn al 
nesekuraj sendrataj retoj. Ĉu vi deziras elekti atestilon de Atestilaŭtoritato?"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:174
+#, c-format
+#| msgid "Base Connection:"
+msgid "%s connection"
+msgstr "%s-konekto"
 
-#: ../src/wireless-security/eap-method.c:289
-msgid "Choose CA Certificate"
-msgstr "Elekti CA-atestilon"
+#: ../src/utils/utils.c:376
+msgid "Store the password only for this _user"
+msgstr ""
+
+#: ../src/utils/utils.c:378
+msgid "Store the password for _all users"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:648
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "Privataj ŝlosiloj de specoj DER, PEM aŭ PKCS#12 (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:440
+#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
+"Privataj ŝlosiloj de specoj DER, PEM aŭ PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:651
+#: ../src/wireless-security/eap-method.c:443
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER- aŭ PEM-atestiloj (*.der, *.pem, *.crt, *.cer)"
 
+#: ../src/wireless-security/eap-method-fast.c:261
+#: ../src/wireless-security/eap-method-peap.c:298
+msgid "GTC"
+msgstr "GTC"
+
+#: ../src/wireless-security/eap-method-fast.c:400
+msgid "Choose a PAC file..."
+msgstr "Elekti PAC-dosieron..."
+
+#: ../src/wireless-security/eap-method-fast.c:407
+msgid "PAC files (*.pac)"
+msgstr "PAC-dosieroj (*.pac)"
+
+#: ../src/wireless-security/eap-method-fast.c:411
+msgid "All files"
+msgstr "Ĉiuj dosieroj"
+
 #: ../src/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "Sennoma"
@@ -2523,8 +3774,8 @@ msgid "PAC _file:"
 msgstr "PAC-_dosiero:"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "_Ena aŭtentigo:"
 
@@ -2532,31 +3783,14 @@ msgstr "_Ena aŭtentigo:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permesi aŭtomatan PAC-pro_vizadon"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
-msgid "GTC"
-msgstr "GTC"
-
-#: ../src/wireless-security/eap-method-fast.c:399
-msgid "Choose a PAC file..."
-msgstr "Elekti PAC-dosieron..."
-
-#: ../src/wireless-security/eap-method-fast.c:406
-msgid "PAC files (*.pac)"
-msgstr "PAC-dosieroj (*.pac)"
-
-#: ../src/wireless-security/eap-method-fast.c:410
-msgid "All files"
-msgstr "Ĉiuj dosieroj"
-
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:373
+#: ../src/wireless-security/eap-method-peap.c:281
+#: ../src/wireless-security/wireless-security.c:417
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../src/wireless-security/eap-method-peap.c:377
+#: ../src/wireless-security/eap-method-tls.c:461
+#: ../src/wireless-security/eap-method-ttls.c:377
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Elekti atestilon de Atestilaŭtoritato (CA)..."
 
@@ -2574,7 +3808,14 @@ msgstr "Versio 1"
 msgid "C_A certificate:"
 msgstr "C_A-atestilo:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#| msgid "C_A certificate:"
+msgid "No CA certificate is _required"
+msgstr "CA-atestilo ne estas _bezonata"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "_Versio de PEAP:"
 
@@ -2582,25 +3823,29 @@ msgstr "_Versio de PEAP:"
 msgid "As_k for this password every time"
 msgstr "Ĉiam _postuli la pasvorton"
 
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:276
 msgid "Unencrypted private keys are insecure"
 msgstr "Neĉifritaj privataj ŝlosiloj estas nesekuraj"
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../src/wireless-security/eap-method-tls.c:279
 msgid ""
-"The selected private key does not appear to be protected by a password.  This could allow your security 
credentials to be compromised.  Please select a password-protected private key.\n"
+"The selected private key does not appear to be protected by a password.  "
+"This could allow your security credentials to be compromised.  Please select "
+"a password-protected private key.\n"
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"Ŝajne la elektita privata ŝlosilo ne estas protektata per pasvorto. Tio povas kaŭzi la forlikon de viaj 
sekurecinformoj. Bonvolu elekti pasvort-protektitan privatan ŝlosilon.\n"
+"Ŝajne la elektita privata ŝlosilo ne estas protektata per pasvorto. Tio "
+"povas kaŭzi la forlikon de viaj sekurecinformoj. Bonvolu elekti pasvort-"
+"protektitan privatan ŝlosilon.\n"
 "\n"
 "(Vi povas pasvort-protekti vian privatan ŝlosilon per openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:455
 msgid "Choose your personal certificate..."
 msgstr "Elekti vian personan atestilon..."
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:467
 msgid "Choose your private key..."
 msgstr "Elekti vian privatan ŝlosilon..."
 
@@ -2612,27 +3857,31 @@ msgstr "I_dento:"
 msgid "_User certificate:"
 msgstr "_Uzanto-atestilo:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "Privata ŝ_losilo:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "_Pasvorto por privata ŝlosilo:"
 
-#: ../src/wireless-security/wireless-security.c:385
+#: ../src/wireless-security/wireless-security.c:429
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:409
+#: ../src/wireless-security/wireless-security.c:454
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:465
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:420
+#: ../src/wireless-security/wireless-security.c:476
 msgid "Tunneled TLS"
 msgstr "Tunelita TLS"
 
-#: ../src/wireless-security/wireless-security.c:431
+#: ../src/wireless-security/wireless-security.c:487
 msgid "Protected EAP (PEAP)"
 msgstr "Protektita EAP (PEAP)"
 
@@ -2643,28 +3892,16 @@ msgid "Au_thentication:"
 msgstr "Aŭ_tentigo:"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "Malferma sistemo"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "Kunhavigita ŝlosilo"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:3
 msgid "1 (Default)"
 msgstr "1 (defaŭlte)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "2"
-msgstr "2"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:5
-msgid "3"
-msgstr "3"
+msgid "Open System"
+msgstr "Malferma sistemo"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:6
-msgid "4"
-msgstr "4"
+msgid "Shared Key"
+msgstr "Kunhavigita ŝlosilo"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
@@ -2678,6 +3915,85 @@ msgstr "_Montri ŝlosilon"
 msgid "WEP inde_x:"
 msgstr "WEP-inde_kso:"
 
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "Sendrataj retoj (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "Sendrata reto (%s)"
+
+#~ msgid "Wireless Network"
+#~ msgid_plural "Wireless Networks"
+#~ msgstr[0] "Sendrata reto"
+#~ msgstr[1] "Sendrataj retoj"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "Sendrata ret-konektilo estas elŝaltita"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "sendrata reto estas elŝaltite per aparatara ŝaltilo"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "Preparanta sendrat-retan konekton '%s'…"
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "Agordanta sendrat-retan konekton '%s'…"
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "Petanta sendrat-retan adreson por '%s'..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "Sendrat-reta konekto '%s' aktiva"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "Ne eblas ŝargi sekurecan uzantinterfacon por sendrata sekureco."
+
+#~ msgid "Wireless"
+#~ msgstr "Sendrata"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "Sendrata konekto %d"
+
+#~ msgid "_Import"
+#~ msgstr "E_nporti"
+
+#~ msgid "Connect _automatically"
+#~ msgstr "Konekti _aŭtomate"
+
+#~ msgid "A_vailable to all users"
+#~ msgstr "Disponebla al ĉiuj uzantoj"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "Okazis nekonata eraro."
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "Ne eblas redakti enportitan konekton"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr ""
+#~ "Neniu VPN-kromprogramo estas instalita. Bonvole instalu iun por enŝalti "
+#~ "tiun butonon."
+
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "Ne scias kiel redakti konektojn per  '%s'"
+
+#~ msgid "could not find the Bluetooth device."
+#~ msgstr "Ne eblis trovi la Bludento-aparaton."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr "Agordado de Bludento ne eblas (malsukcesis krei D-busan prokurilon)."
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Neniu atestilo de Atestilaŭtoritato (CA) elektita"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Neuzo de atestilo de Atestilaŭtoritato (Certificate Authority, CA) povas "
+#~ "kaŭzi konektojn al nesekuraj sendrataj retoj. Ĉu vi deziras elekti "
+#~ "atestilon de Atestilaŭtoritato?"
+
 #~ msgid "Click on this icon to connect to a wireless network"
 #~ msgstr "Alklaki sur ĉi tiu simbolo por konektiĝi al sendrata reto"
 
@@ -2701,8 +4017,8 @@ msgstr "WEP-inde_kso:"
 
 #~ msgid "Wired network"
 #~ msgstr "Drata reto"
-#~ msgctxt "Wifi/wired security"
 
+#~ msgctxt "Wifi/wired security"
 #~ msgid "Unknown"
 #~ msgstr "Nekonate"
 
@@ -2715,9 +4031,6 @@ msgstr "WEP-inde_kso:"
 #~ msgid "GSM network"
 #~ msgstr "GSM-reto"
 
-#~ msgid "C_onnect"
-#~ msgstr "K_onekti"
-
 #~ msgid "Other Wireless Network..."
 #~ msgstr "Alia sendrata reto..."
 
@@ -2879,7 +4192,7 @@ msgstr "WEP-inde_kso:"
 #~ "some methods.</i>"
 #~ msgstr ""
 #~ "<i>En multaj kazoj, La PPP-serviloj de provizantoj subtenos ĉiujn "
-#~ "metodojn de aŭtentigo. Se konektoj fiaskas, klopodi, malaktivigante la "
+#~ "metodojn de aŭtentigo. Se konektoj malsukcesas, klopodi, malaktivigante la "
 #~ "subtenon por kelkaj metodoj.</i>"
 
 #~ msgid "<b>Advanced</b>"
@@ -2896,16 +4209,16 @@ msgstr "WEP-inde_kso:"
 
 #~ msgid "Country List:"
 #~ msgstr "Land-listo:"
-#~ msgctxt "No wifi security used"
 
+#~ msgctxt "No wifi security used"
 #~ msgid "None"
 #~ msgstr "Nenio"
-#~ msgctxt "No wired security used"
 
+#~ msgctxt "No wired security used"
 #~ msgid "None"
 #~ msgstr "Nenio"
-#~ msgctxt "Unknown/unrecognized wired or wifi security"
 
+#~ msgctxt "Unknown/unrecognized wired or wifi security"
 #~ msgid "Unknown"
 #~ msgstr "Nekonate"
 
@@ -2918,28 +4231,28 @@ msgstr "WEP-inde_kso:"
 #~ "  Neil Shepperd https://launchpad.net/~nshepperd\n";
 #~ "  Patrick (Petriko) Oudejans https://launchpad.net/~patrickoudejans\n";
 #~ "  kitzOgen https://launchpad.net/~kitzogen";
-#~ msgctxt "PUK code entry label"
 
+#~ msgctxt "PUK code entry label"
 #~ msgid "PUK code:"
 #~ msgstr "PUK-kodo:"
-#~ msgctxt "PIN code entry label"
 
+#~ msgctxt "PIN code entry label"
 #~ msgid "PIN code:"
 #~ msgstr "PIN-kodo:"
-#~ msgctxt "Show/obscure PIN checkbox label"
 
+#~ msgctxt "Show/obscure PIN checkbox label"
 #~ msgid "Show PIN code"
 #~ msgstr "Montri PIN-kodon"
-#~ msgctxt "New PIN verification entry label"
 
+#~ msgctxt "New PIN verification entry label"
 #~ msgid "Re-enter new PIN code:"
 #~ msgstr "Reenigu novan PIN-kodon:"
-#~ msgctxt "New PIN entry label"
 
+#~ msgctxt "New PIN entry label"
 #~ msgid "New PIN code:"
 #~ msgstr "Nova PIN-kodo:"
-#~ msgctxt "Show/obscure PIN/PUK checkbox label"
 
+#~ msgctxt "Show/obscure PIN/PUK checkbox label"
 #~ msgid "Show PIN/PUK codes"
 #~ msgstr "Montri PIN/PUK-kodojn"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]