[network-manager-applet] Finnish translation update



commit 07a81383722550d974a172475b8caa2e6283bbd3
Author: Jiri Grönroos <jiri gronroos+l10n iki fi>
Date:   Wed Jan 15 15:12:40 2014 +0200

    Finnish translation update

 po/fi.po | 1504 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 906 insertions(+), 598 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index b02df24..0cd5807 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -17,8 +17,8 @@ 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: 2013-09-03 19:41+0000\n"
-"PO-Revision-Date: 2013-09-08 21:43+0300\n"
+"POT-Creation-Date: 2013-12-04 16:52+0000\n"
+"PO-Revision-Date: 2013-12-11 22:16+0200\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <gnome-fi-laatu lists sourceforge net>\n"
 "Language: fi\n"
@@ -75,7 +75,6 @@ msgstr ""
 "katkaistaan."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:5
-#| msgid "Disable connected notifications"
 msgid "Disable VPN notifications"
 msgstr "Poista VPN-ilmoitukset käytöstä"
 
@@ -129,25 +128,32 @@ msgstr ""
 "käytössä"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
 #, fuzzy
 #| msgid "Choose CA Certificate"
 msgid "Ignore CA certificate"
 msgstr "Valitse CA-varmenne"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: ../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:15
+#: ../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:104
-#| msgid "Wired 802.1X authentication"
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
 msgid "802.1X authentication"
 msgstr "802.1X-tunnistautuminen"
 
@@ -156,37 +162,37 @@ msgstr "802.1X-tunnistautuminen"
 msgid "_Network name:"
 msgstr "_Verkon nimi:"
 
-#: ../src/applet.c:541
+#: ../src/applet.c:569
 msgid "Failed to add/activate connection"
 msgstr "Yhteyden lisäys/aktivointi epäonnistui"
 
-#: ../src/applet.c:543 ../src/applet.c:587 ../src/applet.c:613
-#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
+#: ../src/applet.c:571 ../src/applet.c:615 ../src/applet.c:641
+#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../src/applet.c:546 ../src/applet.c:616 ../src/applet-device-wifi.c:1379
-#: ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:574 ../src/applet.c:644 ../src/applet-device-wifi.c:1331
+#: ../src/applet-device-wifi.c:1350
 msgid "Connection failure"
 msgstr "Yhteysvirhe"
 
-#: ../src/applet.c:585
+#: ../src/applet.c:613
 msgid "Device disconnect failed"
 msgstr "Laitteen katkaisu epäonnistui"
 
-#: ../src/applet.c:590
+#: ../src/applet.c:618
 msgid "Disconnect failure"
 msgstr "Katkaisuvirhe"
 
-#: ../src/applet.c:611
+#: ../src/applet.c:639
 msgid "Connection activation failed"
 msgstr "Yhteyden aktivointi epäonnistui"
 
-#: ../src/applet.c:982 ../src/applet-device-wifi.c:1069
+#: ../src/applet.c:952 ../src/applet-device-wifi.c:1046
 msgid "Don't show this message again"
 msgstr "Älä näytä tätä uudestaan"
 
-#: ../src/applet.c:1071
+#: ../src/applet.c:1041
 #, c-format
 msgid ""
 "\n"
@@ -196,7 +202,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui, koska verkkoyhteys katkaistiin."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:1044
 #, c-format
 msgid ""
 "\n"
@@ -205,7 +211,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui, koska VPN-palvelu pysäytettiin odottamatta."
 
-#: ../src/applet.c:1077
+#: ../src/applet.c:1047
 #, c-format
 msgid ""
 "\n"
@@ -216,7 +222,7 @@ msgstr ""
 "VPN-yhteys ”%s” epäonnistui, koska VPN-palvelulta saatiin virheellinen "
 "asetusmäärittely."
 
-#: ../src/applet.c:1080
+#: ../src/applet.c:1050
 #, c-format
 msgid ""
 "\n"
@@ -225,7 +231,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui, koska yhteyttä palveluun ei saatu."
 
-#: ../src/applet.c:1083
+#: ../src/applet.c:1053
 #, c-format
 msgid ""
 "\n"
@@ -235,7 +241,7 @@ msgstr ""
 "VPN-yhteys ”%s” epäonnistui, koska VPN-palvelu ei käynnistynyt sallitussa "
 "ajassa."
 
-#: ../src/applet.c:1086
+#: ../src/applet.c:1056
 #, c-format
 msgid ""
 "\n"
@@ -244,7 +250,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui, koska VPN-palvelua ei voitu käynnistää."
 
-#: ../src/applet.c:1089
+#: ../src/applet.c:1059
 #, c-format
 msgid ""
 "\n"
@@ -253,7 +259,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui, koska kelvollisia VPN-salaisuuksia ei löytynyt."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:1062
 #, c-format
 msgid ""
 "\n"
@@ -262,7 +268,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui virheellisten VPN-salaisuuksien takia."
 
-#: ../src/applet.c:1099
+#: ../src/applet.c:1069
 #, c-format
 msgid ""
 "\n"
@@ -271,7 +277,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui."
 
-#: ../src/applet.c:1117
+#: ../src/applet.c:1087
 #, c-format
 msgid ""
 "\n"
@@ -281,7 +287,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” katkesi, koska verkkoyhteys katkaistiin."
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:1090
 #, c-format
 msgid ""
 "\n"
@@ -290,7 +296,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” katkesi, koska VPN-palvelu pysäytettiin."
 
-#: ../src/applet.c:1126
+#: ../src/applet.c:1096
 #, c-format
 msgid ""
 "\n"
@@ -299,7 +305,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” katkesi."
 
-#: ../src/applet.c:1156
+#: ../src/applet.c:1126
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -310,19 +316,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1158
+#: ../src/applet.c:1128
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN-yhteys on muodostettu onnistuneesti.\n"
 
-#: ../src/applet.c:1160
+#: ../src/applet.c:1130
 msgid "VPN Login Message"
 msgstr "VPN-yhteyden kirjautumisviesti"
 
-#: ../src/applet.c:1166 ../src/applet.c:1174 ../src/applet.c:1224
+#: ../src/applet.c:1136 ../src/applet.c:1144 ../src/applet.c:1194
 msgid "VPN Connection Failed"
 msgstr "VPN-yhteys epäonnistui"
 
-#: ../src/applet.c:1231
+#: ../src/applet.c:1201
 #, c-format
 msgid ""
 "\n"
@@ -335,7 +341,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1234
+#: ../src/applet.c:1204
 #, c-format
 msgid ""
 "\n"
@@ -348,450 +354,637 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1549
+#: ../src/applet.c:1528
 msgid "device not ready (firmware missing)"
 msgstr "laite ei ole valmiina"
 
-#: ../src/applet.c:1551
+#: ../src/applet.c:1530
 msgid "device not ready"
 msgstr "laite ei valmis"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1561 ../src/applet-device-ethernet.c:229
+#: ../src/applet.c:1540 ../src/applet-device-ethernet.c:123
+#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
 msgid "disconnected"
 msgstr "katkaistu"
 
-#: ../src/applet.c:1577
+#: ../src/applet.c:1556
 msgid "Disconnect"
 msgstr "Katkaise yhteys"
 
-#: ../src/applet.c:1591
+#: ../src/applet.c:1570
 msgid "device not managed"
 msgstr "laitetta ei hallita"
 
-#: ../src/applet.c:1635
+#: ../src/applet.c:1730
 msgid "No network devices available"
 msgstr "Verkkolaitteita ei löytynyt"
 
-#: ../src/applet.c:1723
+#: ../src/applet.c:1783
 msgid "_VPN Connections"
 msgstr "_VPN-yhteydet"
 
-#: ../src/applet.c:1780
+#: ../src/applet.c:1840
 msgid "_Configure VPN..."
 msgstr "_Määrittele VPN-yhteys…"
 
-#: ../src/applet.c:1784
+#: ../src/applet.c:1844
 msgid "_Disconnect VPN"
 msgstr "_Katkaise VPN-yhteys"
 
-#: ../src/applet.c:1878
+#: ../src/applet.c:1960
 msgid "NetworkManager is not running..."
 msgstr "Verkon hallinta ei ole käytössä…"
 
-#: ../src/applet.c:1883 ../src/applet.c:2735
+#: ../src/applet.c:1965 ../src/applet.c:2935
 msgid "Networking disabled"
 msgstr "Verkko ei ole käytössä"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2104
+#: ../src/applet.c:2185
 msgid "Enable _Networking"
 msgstr "Ota _verkko käyttöön"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2113
+#: ../src/applet.c:2194
 msgid "Enable _Wi-Fi"
 msgstr "Ota _wifi käyttöön"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2122
+#: ../src/applet.c:2203
 msgid "Enable _Mobile Broadband"
 msgstr "Ota _mobiililaajakaista käyttöön"
 
 #. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2131
+#: ../src/applet.c:2212
 msgid "Enable WiMA_X Mobile Broadband"
 msgstr "Ota WiMA_X-mobiililaajakaista käyttöön"
 
 #. Toggle notifications item
-#: ../src/applet.c:2142
+#: ../src/applet.c:2223
 msgid "Enable N_otifications"
 msgstr "Ota ilm_oitukset käyttöön"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2153
+#: ../src/applet.c:2234
 msgid "Connection _Information"
 msgstr "Tietoja _yhteydestä"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2163
+#: ../src/applet.c:2244
 msgid "Edit Connections..."
 msgstr "Muokkaa yhteyksiä…"
 
 #. Help item
-#: ../src/applet.c:2177
+#: ../src/applet.c:2258
 msgid "_Help"
 msgstr "O_hje"
 
 #. About item
-#: ../src/applet.c:2186
+#: ../src/applet.c:2267
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../src/applet.c:2364
+#: ../src/applet.c:2520
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "Yhteys verkkoon ”%s” on nyt muodostettu."
+
+#: ../src/applet.c:2561
 msgid "Disconnected"
 msgstr "Yhteys katkaistu"
 
-#: ../src/applet.c:2365
+#: ../src/applet.c:2562
 msgid "The network connection has been disconnected."
 msgstr "Verkkoyhteys on nyt katkaistu."
 
-#: ../src/applet.c:2598
+#: ../src/applet.c:2797
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Valmistellaan verkkoyhteyttä  ”%s”…"
 
-#: ../src/applet.c:2601
+#: ../src/applet.c:2800
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Käyttäjätunnistautuminen vaaditaan verkkoyhteydelle ”%s”…"
 
-#: ../src/applet.c:2604 ../src/applet-device-bt.c:235
-#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:594
+#: ../src/applet.c:2803 ../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 "Pyydetään verkko-osoitetta verkosta ”%s”…"
 
-#: ../src/applet.c:2607
+#: ../src/applet.c:2806
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Verkkoyhteys ”%s” on aktiivinen"
 
-#: ../src/applet.c:2690
+#: ../src/applet.c:2889
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Käynnistetään VPN-yhteyttä ”%s”…"
 
-#: ../src/applet.c:2693
+#: ../src/applet.c:2892
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Käyttäjätunnistautuminen vaaditaan VPN-yhteydelle ”%s”…"
 
-#: ../src/applet.c:2696
+#: ../src/applet.c:2895
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Pyydetään VPN-osoitetta yhteydelle ”%s”…"
 
-#: ../src/applet.c:2699
+#: ../src/applet.c:2898
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-yhteys ”%s” on aktiivinen"
 
-#: ../src/applet.c:2740
+#: ../src/applet.c:2940
 msgid "No network connection"
 msgstr "Ei verkkoyhteyttä"
 
-#: ../src/applet.c:3442
+#: ../src/applet.c:3615
 msgid "NetworkManager Applet"
 msgstr "Verkon hallinta -sovelma"
 
-#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
-#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:772
-#: ../src/applet-device-gsm.c:359 ../src/applet-device-wifi.c:859
-#: ../src/applet-device-wimax.c:275
+#: ../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 "Saatavilla"
 
-#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
-#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:816
-#: ../src/applet-device-gsm.c:401 ../src/applet-device-wimax.c:419
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "Yhteys verkkoon ”%s” on nyt muodostettu."
-
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
-#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:820
-#: ../src/applet-device-gsm.c:405 ../src/applet-device-wifi.c:1261
-#: ../src/applet-device-wimax.c:423
+#: ../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 "Yhteys muodostettu"
 
-#: ../src/applet-device-bt.c:200
+#: ../src/applet-device-bond.c:90
+#, fuzzy
+#| msgid "You are now connected to the GSM network."
+msgid "You are now connected to the bonded network."
+msgstr "Yhteys GSM-verkkoon on nyt muodostettu."
+
+#: ../src/applet-device-bond.c:114
+#, fuzzy, c-format
+#| msgid "Preparing network connection '%s'..."
+msgid "Preparing bond connection '%s'..."
+msgstr "Valmistellaan verkkoyhteyttä  ”%s”…"
+
+#: ../src/applet-device-bond.c:117
+#, fuzzy, c-format
+#| msgid "Configuring mobile broadband connection '%s'..."
+msgid "Configuring bond connection '%s'..."
+msgstr "Tehdään mobiililaajakaistayhteyden ”%s” asetuksia…"
+
+#: ../src/applet-device-bond.c:120
+#, fuzzy, c-format
+#| msgid "User authentication required for VPN connection '%s'..."
+msgid "User authentication required for bond connection '%s'..."
+msgstr "Käyttäjätunnistautuminen vaaditaan VPN-yhteydelle ”%s”…"
+
+#: ../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
+#, fuzzy, c-format
+#| msgid "Requesting a VPN address for '%s'..."
+msgid "Requesting address for '%s'..."
+msgstr "Pyydetään VPN-osoitetta yhteydelle ”%s”…"
+
+#: ../src/applet-device-bond.c:127
+#, fuzzy, c-format
+#| msgid "VPN connection '%s' active"
+msgid "Bond connection '%s' active"
+msgstr "VPN-yhteys ”%s” on aktiivinen"
+
+#: ../src/applet-device-bridge.c:90
+#, fuzzy
+#| msgid "You are now connected to the WiMAX network."
+msgid "You are now connected to the bridged network."
+msgstr "Yhteys WiMAX-verkkoon on nyt muodostettu."
+
+#: ../src/applet-device-bridge.c:114
+#, fuzzy, c-format
+#| msgid "Preparing network connection '%s'..."
+msgid "Preparing bridge connection '%s'..."
+msgstr "Valmistellaan verkkoyhteyttä  ”%s”…"
+
+#: ../src/applet-device-bridge.c:117
+#, fuzzy, c-format
+#| msgid "Configuring Wi-Fi network connection '%s'..."
+msgid "Configuring bridge connection '%s'..."
+msgstr "Tehdään wifi-verkkoyhteyden ”%s” asetuksia…"
+
+#: ../src/applet-device-bridge.c:120
+#, fuzzy, c-format
+#| msgid "User authentication required for VPN connection '%s'..."
+msgid "User authentication required for bridge connection '%s'..."
+msgstr "Käyttäjätunnistautuminen vaaditaan VPN-yhteydelle ”%s”…"
+
+#: ../src/applet-device-bridge.c:127
+#, fuzzy, c-format
+#| msgid "VPN connection '%s' active"
+msgid "Bridge connection '%s' active"
+msgstr "VPN-yhteys ”%s” on aktiivinen"
+
+#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+msgid "Wrong PUK code; please contact your provider."
+msgstr "Väärä PUK-koodi. Ota yhteys palveluntarjoajaasi."
+
+#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+msgid "Wrong PIN code; please contact your provider."
+msgstr "Väärä PIN-koodi. Ota yhteys palveluntarjoajaasi."
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:532
+msgid "Sending unlock code..."
+msgstr "Lähetetään lukituksen avauskoodia…"
+
+#: ../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 "Mobiililaajakaista (%s)"
+
+#: ../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 "Mobiililaajakaista"
+
+#. Default connection item
+#: ../src/applet-device-broadband.c:782
+msgid "New Mobile Broadband connection..."
+msgstr "Uusi mobiililaajakaistayhteys..."
+
+#: ../src/applet-device-broadband.c:797
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "Yhteys mobiililaajakaistaan on nyt muodostettu."
+
+#: ../src/applet-device-broadband.c:932 ../src/applet-device-broadband.c:938
+msgid "Mobile Broadband network."
+msgstr "Mobiililaajakaistaverkko."
+
+#: ../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 "Olet nyt rekisteröitynyt kotiverkkoon."
+
+#: ../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 "Olet nyt rekisteröitynyt vierailuverkkoon."
+
+#: ../src/applet-device-bt.c:103
 msgid "You are now connected to the mobile broadband network."
 msgstr "Yhteys mobiililaajakaistaan on nyt muodostettu."
 
-#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
+#: ../src/mobile-helpers.c:582
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Valmistellaan mobiililaajakaistayhteyttä ”%s”…"
 
-#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
-#: ../src/mobile-helpers.c:588
+#: ../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 "Tehdään mobiililaajakaistayhteyden ”%s” asetuksia…"
 
-#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
-#: ../src/mobile-helpers.c:591
+#: ../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 "Käyttäjätunnistautuminen vaaditaan mobiililaajakaistayhteydelle ”%s”…"
 
-#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:611
+#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobiililaajakaistayhteys ”%s” on aktiivinen"
 
-#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:718
-#: ../src/applet-device-gsm.c:305 ../src/applet-dialogs.c:424
-#, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Mobiililaajakaista (%s)"
-
-#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:720
-#: ../src/applet-device-gsm.c:307
-#: ../src/connection-editor/new-connection.c:113
-#: ../src/connection-editor/page-mobile.c:389
-#: ../src/libnm-gtk/nm-ui-utils.c:333
-msgid "Mobile Broadband"
-msgstr "Mobiililaajakaista"
-
 #. Default connection item
-#: ../src/applet-device-cdma.c:316
+#: ../src/applet-device-cdma.c:314
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "Uusi mobiililaajakaistayhteys (CDMA)…"
 
-#: ../src/applet-device-cdma.c:350
+#: ../src/applet-device-cdma.c:341
 msgid "You are now connected to the CDMA network."
 msgstr "Yhteys CDMA-verkkoon on nyt muodostettu."
 
-#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
+#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
 msgid "CDMA network."
 msgstr "CDMA-verkko."
 
-#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:958
-#: ../src/applet-device-gsm.c:678
-msgid "You are now registered on the home network."
-msgstr "Olet nyt rekisteröitynyt kotiverkkoon."
-
-#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:964
-#: ../src/applet-device-gsm.c:684
-msgid "You are now registered on a roaming network."
-msgstr "Olet nyt rekisteröitynyt vierailuverkkoon."
-
-#: ../src/applet-device-ethernet.c:62
+#: ../src/applet-device-ethernet.c:44
 msgid "Auto Ethernet"
 msgstr "Automaattinen Ethernet"
 
-#: ../src/applet-device-ethernet.c:202
+#: ../src/applet-device-ethernet.c:96
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet-verkot (%s)"
 
-#: ../src/applet-device-ethernet.c:204
+#: ../src/applet-device-ethernet.c:98
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet-verkko (%s)"
 
-#: ../src/applet-device-ethernet.c:207
+#: ../src/applet-device-ethernet.c:101
 msgid "Ethernet Networks"
 msgstr "Ethernet-verkot"
 
-#: ../src/applet-device-ethernet.c:209
+#: ../src/applet-device-ethernet.c:103
 msgid "Ethernet Network"
 msgstr "Ethernet-verkko"
 
-#: ../src/applet-device-ethernet.c:271
+#: ../src/applet-device-ethernet.c:147
 msgid "You are now connected to the ethernet network."
 msgstr "Yhteys ethernet-verkkoon on nyt muodostettu."
 
-#: ../src/applet-device-ethernet.c:297
+#: ../src/applet-device-ethernet.c:171
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Valmistellaan ethernet-verkkoyhteyttä  ”%s”…"
 
-#: ../src/applet-device-ethernet.c:300
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Tehdään ethernet-verkkoyhteyden ”%s” asetuksia…"
 
-#: ../src/applet-device-ethernet.c:303
+#: ../src/applet-device-ethernet.c:177
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Käyttäjätunnistautuminen vaaditaan ethernet-verkolle ”%s”…"
 
-#: ../src/applet-device-ethernet.c:306
+#: ../src/applet-device-ethernet.c:180
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Pyydetään verkko-osoitetta ethernet-verkosta ”%s”…"
 
-#: ../src/applet-device-ethernet.c:310
+#: ../src/applet-device-ethernet.c:184
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Ethernet-verkkoyhteys ”%s” on aktiivinen"
 
-#: ../src/applet-device-ethernet.c:491
+#: ../src/applet-device-ethernet.c:365
 msgid "DSL authentication"
 msgstr "DSL-todentaminen"
 
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:520
-msgid "Wrong PUK code; please contact your provider."
-msgstr "Väärä PUK-koodi. Ota yhteys palveluntarjoajaasi."
-
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:497
-msgid "Wrong PIN code; please contact your provider."
-msgstr "Väärä PIN-koodi. Ota yhteys palveluntarjoajaasi."
-
-#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:547
-msgid "Sending unlock code..."
-msgstr "Lähetetään lukituksen avauskoodia…"
-
 #. Default connection item
-#: ../src/applet-device-broadband.c:785
-msgid "New Mobile Broadband connection..."
-msgstr "Uusi mobiililaajakaistayhteys..."
-
-#: ../src/applet-device-broadband.c:821
-msgid "You are now connected to the Mobile Broadband network."
-msgstr "Yhteys mobiililaajakaistaan on nyt muodostettu."
-
-#: ../src/applet-device-broadband.c:957 ../src/applet-device-broadband.c:963
-msgid "Mobile Broadband network."
-msgstr "Mobiililaajakaistaverkko."
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:372
+#: ../src/applet-device-gsm.c:370
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "Uusi mobiililaajakaistayhteys (GSM)…"
 
-#: ../src/applet-device-gsm.c:406
+#: ../src/applet-device-gsm.c:397
 msgid "You are now connected to the GSM network."
 msgstr "Yhteys GSM-verkkoon on nyt muodostettu."
 
-#: ../src/applet-device-gsm.c:677 ../src/applet-device-gsm.c:683
+#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
 msgid "GSM network."
 msgstr "GSM-verkko."
 
-#: ../src/applet-device-wifi.c:98
+#: ../src/applet-device-infiniband.c:40
+#, fuzzy
+#| msgid "InfiniBand"
+msgid "Auto InfiniBand"
+msgstr "InfiniBand"
+
+#: ../src/applet-device-infiniband.c:92
+#, c-format
+#| msgid "Wi-Fi Networks (%s)"
+msgid "InfiniBand Networks (%s)"
+msgstr "InfiniBand-verkot (%s)"
+
+#: ../src/applet-device-infiniband.c:94
+#, c-format
+#| msgid "Wi-Fi Network (%s)"
+msgid "InfiniBand Network (%s)"
+msgstr "InfiniBand-verkko (%s)"
+
+#: ../src/applet-device-infiniband.c:97
+#| msgid "InfiniBand"
+msgid "InfiniBand Networks"
+msgstr "InfiniBand-verkot"
+
+#: ../src/applet-device-infiniband.c:99
+#| msgid "InfiniBand"
+msgid "InfiniBand Network"
+msgstr "InfiniBand-verkko"
+
+#: ../src/applet-device-infiniband.c:143
+#| msgid "You are now connected to the WiMAX network."
+msgid "You are now connected to the InfiniBand network."
+msgstr "Yhteys InfiniBand-verkkoon on nyt muodostettu."
+
+#: ../src/applet-device-infiniband.c:167
+#, c-format
+#| msgid "Preparing network connection '%s'..."
+msgid "Preparing InfiniBand connection '%s'..."
+msgstr "Valmistellaan InfiniBand-verkkoyhteyttä ”%s”…"
+
+#: ../src/applet-device-infiniband.c:170
+#, c-format
+#| msgid "Configuring Wi-Fi network connection '%s'..."
+msgid "Configuring InfiniBand connection '%s'..."
+msgstr "Tehdään InfiniBand-verkkoyhteyden ”%s” asetuksia…"
+
+#: ../src/applet-device-infiniband.c:173
+#, c-format
+#| msgid "User authentication required for VPN connection '%s'..."
+msgid "User authentication required for InfiniBand connection '%s'..."
+msgstr "Käyttäjätunnistautuminen vaaditaan InfiniBand-yhteydelle ”%s”…"
+
+#: ../src/applet-device-infiniband.c:180
+#, fuzzy, c-format
+#| msgid "InfiniBand connection %d"
+msgid "InfiniBand connection '%s' active"
+msgstr "InfiniBand-yhteys %d"
+
+#: ../src/applet-device-team.c:86
+#, fuzzy
+#| msgid "You are now connected to the ethernet network."
+msgid "You are now connected to the teamed network."
+msgstr "Yhteys ethernet-verkkoon on nyt muodostettu."
+
+#: ../src/applet-device-team.c:110
+#, fuzzy, c-format
+#| msgid "Preparing network connection '%s'..."
+msgid "Preparing team connection '%s'..."
+msgstr "Valmistellaan verkkoyhteyttä  ”%s”…"
+
+#: ../src/applet-device-team.c:113
+#, fuzzy, c-format
+#| msgid "Configuring Wi-Fi network connection '%s'..."
+msgid "Configuring team connection '%s'..."
+msgstr "Tehdään wifi-verkkoyhteyden ”%s” asetuksia…"
+
+#: ../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 "Käyttäjätunnistautuminen vaaditaan VPN-yhteydelle ”%s”…"
+
+#: ../src/applet-device-team.c:123
+#, fuzzy, c-format
+#| msgid "VPN connection '%s' active"
+msgid "Team connection '%s' active"
+msgstr "VPN-yhteys ”%s” on aktiivinen"
+
+#: ../src/applet-device-vlan.c:204
+#| msgid "You are now connected to the CDMA network."
+msgid "You are now connected to the VLAN."
+msgstr "Yhteys VLAN-verkkoon on nyt muodostettu."
+
+#: ../src/applet-device-vlan.c:228
+#, c-format
+#| msgid "Starting VPN connection '%s'..."
+msgid "Preparing VLAN connection '%s'..."
+msgstr "Valmistellaan VLAN-yhteyttä ”%s”…"
+
+#: ../src/applet-device-vlan.c:231
+#, fuzzy, c-format
+#| msgid "Starting VPN connection '%s'..."
+msgid "Configuring VLAN connection '%s'..."
+msgstr "Käynnistetään VPN-yhteyttä ”%s”…"
+
+#: ../src/applet-device-vlan.c:234
+#, c-format
+#| msgid "User authentication required for VPN connection '%s'..."
+msgid "User authentication required for VLAN connection '%s'..."
+msgstr "Käyttäjätunnistautuminen vaaditaan VLAN-yhteydelle ”%s”…"
+
+#: ../src/applet-device-vlan.c:241
+#, fuzzy, c-format
+#| msgid "VPN connection '%s' active"
+msgid "VLAN connection '%s' active"
+msgstr "VPN-yhteys ”%s” on aktiivinen"
+
+#: ../src/applet-device-wifi.c:96
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Yhdistä piilotettuun wifi-verkkoon..."
 
-#: ../src/applet-device-wifi.c:149
+#: ../src/applet-device-wifi.c:147
 msgid "Create _New Wi-Fi Network..."
 msgstr "Luo _uusi wifi-verkko…"
 
-#: ../src/applet-device-wifi.c:293
+#: ../src/applet-device-wifi.c:291
 msgid "(none)"
 msgstr "(ei mitään)"
 
-#: ../src/applet-device-wifi.c:787
+#: ../src/applet-device-wifi.c:769
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wifi-verkot (%s)"
 
-#: ../src/applet-device-wifi.c:789
+#: ../src/applet-device-wifi.c:771
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wifi-verkko (%s)"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:773
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wifi-verkko"
 msgstr[1] "Wifi-verkot"
 
-#: ../src/applet-device-wifi.c:824
+#: ../src/applet-device-wifi.c:802
 msgid "Wi-Fi is disabled"
 msgstr "Wifi ei ole käytössä"
 
-#: ../src/applet-device-wifi.c:825
+#: ../src/applet-device-wifi.c:803
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wifi on kytketty pois käytöstä laitteessa olevasta painikkeesta"
 
-#: ../src/applet-device-wifi.c:886
+#: ../src/applet-device-wifi.c:864
 msgid "More networks"
 msgstr "Lisää verkkoja"
 
-#: ../src/applet-device-wifi.c:1065
+#: ../src/applet-device-wifi.c:1042
 msgid "Wi-Fi Networks Available"
 msgstr "Wifi-verkkoja saatavilla"
 
-#: ../src/applet-device-wifi.c:1066
+#: ../src/applet-device-wifi.c:1043
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Käytä verkkovalikkoa yhdistääksesi wifi-verkkoon"
 
-#: ../src/applet-device-wifi.c:1260
+#: ../src/applet-device-wifi.c:1242
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Yhteys wifi-verkkoon ”%s” on nyt muodostettu."
 
-#: ../src/applet-device-wifi.c:1291
+#: ../src/applet-device-wifi.c:1273
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Valmistellaan wifi-verkkoyhteyttä  ”%s”…"
 
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-wifi.c:1276
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Tehdään wifi-verkkoyhteyden ”%s” asetuksia…"
 
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-wifi.c:1279
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Käyttäjätunnistautuminen vaaditaan wifi-verkolle ”%s”…"
 
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-wifi.c:1282
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Pyydetään verkko-osoitetta wifi-verkosta ”%s”…"
 
-#: ../src/applet-device-wifi.c:1321
+#: ../src/applet-device-wifi.c:1303
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Wifi-verkkoyhteys ”%s” on aktiivinen: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Wifi-verkkoyhteys ”%s” on aktiivinen"
 
-#: ../src/applet-device-wifi.c:1374
+#: ../src/applet-device-wifi.c:1326
 msgid "Failed to activate connection"
 msgstr "Yhteyden aktivointi epäonnistui"
 
-#: ../src/applet-device-wifi.c:1393
+#: ../src/applet-device-wifi.c:1345
 msgid "Failed to add new connection"
 msgstr "Uuden yhteyden lisäys epäonnistui"
 
-#: ../src/applet-device-wimax.c:227
+#: ../src/applet-device-wimax.c:228
 #, c-format
 msgid "WiMAX Mobile Broadband (%s)"
 msgstr "WiMAX-mobiililaajakaista (%s)"
 
-#: ../src/applet-device-wimax.c:229
+#: ../src/applet-device-wimax.c:230
 msgid "WiMAX Mobile Broadband"
 msgstr "WiMAX-mobiililaajakaista"
 
-#: ../src/applet-device-wimax.c:255
+#: ../src/applet-device-wimax.c:256
 msgid "WiMAX is disabled"
 msgstr "WiMAX ei ole käytössä"
 
-#: ../src/applet-device-wimax.c:256
+#: ../src/applet-device-wimax.c:257
 msgid "WiMAX is disabled by hardware switch"
 msgstr "WiMAX on kytketty pois käytöstä laitteessa olevasta painikkeesta"
 
-#: ../src/applet-device-wimax.c:424
+#: ../src/applet-device-wimax.c:402
 msgid "You are now connected to the WiMAX network."
 msgstr "Yhteys WiMAX-verkkoon on nyt muodostettu."
 
-#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:606
+#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Mobiililaajakaistayhteys ”%s” on aktiivinen (%d%%%s%s)"
 
-#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:609
+#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
 msgid "roaming"
 msgstr "verkkovierailu"
 
@@ -800,9 +993,9 @@ msgid "Error displaying connection information:"
 msgstr "Virhe näytettäessä yhteyden tietoja:"
 
 #: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:406
+#: ../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"
 
@@ -810,195 +1003,195 @@ msgstr "LEAP"
 msgid "Dynamic WEP"
 msgstr "Dynaaminen WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../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:243
+#: ../src/applet-dialogs.c:240
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
+#: ../src/connection-editor/page-wifi-security.c:261
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
-msgstr "Ei salausta"
+msgstr "Ei mitään"
 
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:274
 #, c-format
 msgid "%s (default)"
 msgstr "%s (oletus)"
 
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:481
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:483
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/applet-dialogs.c:361
+#: ../src/applet-dialogs.c:358
 #, c-format
 msgid "%d dB"
 msgstr "%d dB"
 
-#: ../src/applet-dialogs.c:363
+#: ../src/applet-dialogs.c:360
 msgctxt "WiMAX CINR"
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../src/applet-dialogs.c:375
+#: ../src/applet-dialogs.c:372
 msgctxt "WiMAX Base Station ID"
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:407
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:410
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:417
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:419
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:426
+#: ../src/applet-dialogs.c:423
 #, c-format
 msgid "WiMAX (%s)"
 msgstr "WiMAX (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
-#: ../src/connection-editor/page-general.c:345
+#: ../src/applet-dialogs.c:429 ../src/applet-dialogs.c:788
+#: ../src/connection-editor/page-general.c:327
 msgid "General"
 msgstr "Yleiset"
 
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:433
 msgid "Interface:"
 msgstr "Verkkolaite:"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:449
 msgid "Hardware Address:"
 msgstr "Fyysinen osoite:"
 
 #. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:457
 msgid "Driver:"
 msgstr "Ajuri:"
 
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:486
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:496
 msgid "Security:"
 msgstr "Tietoturva:"
 
-#: ../src/applet-dialogs.c:512
+#: ../src/applet-dialogs.c:509
 msgid "CINR:"
 msgstr "CINR:"
 
-#: ../src/applet-dialogs.c:525
+#: ../src/applet-dialogs.c:522
 msgid "BSID:"
 msgstr "BSID:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:539
 msgid "IPv4"
 msgstr "IPv4"
 
 #. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
+#: ../src/applet-dialogs.c:550 ../src/applet-dialogs.c:657
 msgid "IP Address:"
 msgstr "IP-osoite:"
 
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
+#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:568
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/applet-dialogs.c:569
+#: ../src/applet-dialogs.c:566
 msgid "Broadcast Address:"
 msgstr "Yleisosoite:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:578
+#: ../src/applet-dialogs.c:575
 msgid "Subnet Mask:"
 msgstr "Aliverkkopeite:"
 
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:577
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:585 ../src/applet-dialogs.c:672
 msgid "Default Route:"
 msgstr "Oletusyhdyskäytävä:"
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:597
 msgid "Primary DNS:"
 msgstr "Ensisijainen DNS:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:606
 msgid "Secondary DNS:"
 msgstr "Toissijainen DNS:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:616
 msgid "Ternary DNS:"
 msgstr "Kolmas DNS:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:631
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:640
 msgid "Ignored"
 msgstr "Ohitettu"
 
-#: ../src/applet-dialogs.c:796
+#: ../src/applet-dialogs.c:793
 msgid "VPN Type:"
 msgstr "VPN-tyyppi:"
 
-#: ../src/applet-dialogs.c:803
+#: ../src/applet-dialogs.c:800
 msgid "VPN Gateway:"
 msgstr "VPN-yhdyskäytävä:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:806
 msgid "VPN Username:"
 msgstr "VPN-käyttäjänimi:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:812
 msgid "VPN Banner:"
 msgstr "VPN-selite:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:818
 msgid "Base Connection:"
 msgstr "Yhteys:"
 
-#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
+#: ../src/applet-dialogs.c:820 ../src/libnm-gtk/nm-ui-utils.c:347
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:883
 msgid "No valid active connections found!"
 msgstr "Toimivia aktiivisia yhteyksiä ei löytynyt!"
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:911
 msgid ""
 "Copyright © 2004-2011 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -1008,42 +1201,42 @@ msgstr ""
 "Tekijänoikeus © 2005-2008 Novell, Inc.\n"
 "ja monet muut kehittäjät sekä kääntäjät"
 
-#: ../src/applet-dialogs.c:942
+#: ../src/applet-dialogs.c:914
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Ilmoitusalueen sovelma verkkolaitteiden ja -yhteyksien hallintaan."
 
-#: ../src/applet-dialogs.c:944
+#: ../src/applet-dialogs.c:916
 msgid "NetworkManager Website"
 msgstr "NetworkManagerin verkkosivusto"
 
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:931
 msgid "Missing resources"
 msgstr "Puuttuvia resursseja"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:956
 msgid "Mobile broadband network password"
 msgstr "Mobiililaajakaistaverkon salasana"
 
-#: ../src/applet-dialogs.c:993
+#: ../src/applet-dialogs.c:965
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Yhteys verkkoon ”%s” vaatii salasanan."
 
-#: ../src/applet-dialogs.c:1012
+#: ../src/applet-dialogs.c:980
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../src/applet-dialogs.c:1310
+#: ../src/applet-dialogs.c:1261
 msgid "SIM PIN unlock required"
 msgstr "SIM-kortin PIN-koodi vaaditaan"
 
-#: ../src/applet-dialogs.c:1311
+#: ../src/applet-dialogs.c:1262
 msgid "SIM PIN Unlock Required"
 msgstr "SIM-kortin PIN-koodi vaaditaan"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1313
+#: ../src/applet-dialogs.c:1264
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1052,25 +1245,25 @@ msgstr ""
 "Mobiililaajakaistalaite ”%s” vaatii SIM-kortin PIN-koodin ennen käyttöä."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1315
+#: ../src/applet-dialogs.c:1266
 msgid "PIN code:"
 msgstr "PIN-koodi:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1319
+#: ../src/applet-dialogs.c:1270
 msgid "Show PIN code"
 msgstr "Näytä PIN-koodi"
 
-#: ../src/applet-dialogs.c:1321
+#: ../src/applet-dialogs.c:1272
 msgid "SIM PUK unlock required"
 msgstr "SIM-kortin PUK-koodi vaaditaan"
 
-#: ../src/applet-dialogs.c:1322
+#: ../src/applet-dialogs.c:1273
 msgid "SIM PUK Unlock Required"
 msgstr "SIM-kortin PUK-koodi vaaditaan"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1324
+#: ../src/applet-dialogs.c:1275
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1079,22 +1272,22 @@ msgstr ""
 "Mobiililaajakaistalaite ”%s” vaatii SIM-kortin PUK-koodin ennen käyttöä."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1326
+#: ../src/applet-dialogs.c:1277
 msgid "PUK code:"
 msgstr "PUK-koodi:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1280
 msgid "New PIN code:"
 msgstr "Uusi PIN-koodi:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1282
 msgid "Re-enter new PIN code:"
 msgstr "Syötä uusi PIN-koodi uudelleen:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1287
 msgid "Show PIN/PUK codes"
 msgstr "Näytä PIN-/PUK-koodit"
 
@@ -1137,14 +1330,14 @@ msgid " "
 msgstr " "
 
 #: ../src/connection-editor/ce-new-connection.ui.h:2
+msgid "Create…"
+msgstr "Luo…"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Choose a Connection Type"
 msgstr "Valitse yhteyden tyyppi"
 
-#: ../src/connection-editor/ce-new-connection.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."
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1157,10 +1350,6 @@ msgstr ""
 "tietokoneelta puuttunee vaadittu\n"
 "VPN-liitännäinen."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:6
-msgid "Create…"
-msgstr "Luo…"
-
 #: ../src/connection-editor/ce-page-bond.ui.h:1
 msgid "Round-robin"
 msgstr "Kiertovuorottelu"
@@ -1174,7 +1363,6 @@ msgid "XOR"
 msgstr "XOR"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:4
-#| msgid "Broadcast Address:"
 msgid "Broadcast"
 msgstr "Yleislähetys"
 
@@ -1199,26 +1387,26 @@ msgid "ARP"
 msgstr "ARP"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:10
-#| msgid "Base Connection:"
 msgid "Bonded _connections:"
 msgstr "Sidotut _yhteydet:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-#| msgid "M_ode:"
 msgid "_Mode:"
 msgstr "_Tila:"
 
 #. Edit
 #: ../src/connection-editor/ce-page-bond.ui.h:12
 #: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:685
+#: ../src/connection-editor/ce-page-team.ui.h:4
+#: ../src/connection-editor/nm-connection-list.c:686
 msgid "_Edit"
 msgstr "_Muokkaa"
 
 #. Delete
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:702
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#: ../src/connection-editor/nm-connection-list.c:703
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -1232,7 +1420,7 @@ msgstr "ms"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:16
 #: ../src/connection-editor/ce-page-bridge.ui.h:5
-#| msgid "Interface:"
+#: ../src/connection-editor/ce-page-team.ui.h:6
 msgid "_Interface name:"
 msgstr "_Liitännän nimi:"
 
@@ -1260,13 +1448,24 @@ msgstr "Linkin _pystytysviive:"
 msgid "Link _down delay:"
 msgstr "Linkin ti_putusviive:"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+#, fuzzy
+#| msgid "Primary DNS:"
+msgid "_Primary:"
+msgstr "Ensisijainen DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+msgid ""
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
+msgstr ""
+
 #: ../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 "_Prioriteetti:"
 
@@ -1275,7 +1474,6 @@ msgid "_Hairpin mode:"
 msgstr "_Hairpin-tila:"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:1
-#| msgid "Base Connection:"
 msgid "Bridged _connections:"
 msgstr "Siltaavat _yhteydet:"
 
@@ -1303,11 +1501,11 @@ msgstr ""
 msgid "_Aging time:"
 msgstr "_Vanhenemisaika:"
 
-#: ../src/connection-editor/ce-page.c:72
+#: ../src/connection-editor/ce-page.c:67
 msgid "automatic"
 msgstr "automaattinen"
 
-#: ../src/connection-editor/ce-page.c:362
+#: ../src/connection-editor/ce-page.c:342
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "Yhteyden salaisuuksien päivittäminen epäonnistui tuntemattoman syyn takia."
@@ -1327,7 +1525,7 @@ msgstr "_Palvelu:"
 #: ../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"
@@ -1335,6 +1533,7 @@ msgstr "Näytä _salasana"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
 #: ../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
@@ -1538,7 +1737,6 @@ msgid "DNS ser_vers:"
 msgstr "_DNS-palvelimet:"
 
 #: ../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."
@@ -1564,6 +1762,20 @@ msgstr ""
 msgid "_Routes…"
 msgstr "_Reitit…"
 
+#: ../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 ""
+"Nimipalvelimien IP-osoitteita joita käytetään nimipalvelinten "
+"määrittämiseen. Käytä pilkkuja eritelläksesi useiden nimipalvelinten "
+"osoitteita."
+
 #: ../src/connection-editor/ce-page-ip6.ui.h:13
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Vaadi IPv6-osoite tälle yhteydelle"
@@ -1693,8 +1905,30 @@ msgstr "Kaiku"
 msgid "Send PPP _echo packets"
 msgstr "Lähetä PPP-kaiutuspak_etteja"
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr "_JSON-määritys:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#, fuzzy
+#| msgid "Import a saved VPN configuration..."
+msgid "_Import team configuration from a file..."
+msgstr "Tuo tallennetut VPN-asetukset..."
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+#| msgid "Bonded _connections:"
+msgid "_Teamed connections:"
+msgstr "Sidotut _yhteydet:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#, fuzzy
+#| msgid "Import a saved VPN configuration..."
+msgid "I_mport team configuration from a file..."
+msgstr "Tuo tallennetut VPN-asetukset..."
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
-#| msgid "Interface:"
 msgid "_Parent interface:"
 msgstr "_Isäntäliitäntä:"
 
@@ -1703,7 +1937,6 @@ msgid "VLAN interface _name:"
 msgstr "VLAN-liitännän _nimi:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-#| msgid "C_loned MAC address:"
 msgid "_Cloned MAC address:"
 msgstr "_Kloonattu MAC-osoite:"
 
@@ -1830,130 +2063,135 @@ msgstr ""
 "tunnistautumistapoja. Jos yhteys kuitenkin epäonnistuu, poista käytöstä "
 "joitain tunnistautumistapoja."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip4.c:928
-#: ../src/connection-editor/page-ip6.c:894
+#: ../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 "Osoite"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/page-ip4.c:945
+#: ../src/connection-editor/ip4-routes-dialog.c:741
+#: ../src/connection-editor/page-ip4.c:941
 msgid "Netmask"
 msgstr "Verkkopeite"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
-#: ../src/connection-editor/page-ip4.c:962
-#: ../src/connection-editor/page-ip6.c:928
+#: ../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 "Yhdyskäytävä"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:813
-#: ../src/connection-editor/ip6-routes-dialog.c:755
+#: ../src/connection-editor/ip4-routes-dialog.c:775
+#: ../src/connection-editor/ip6-routes-dialog.c:717
 msgid "Metric"
 msgstr "Metric"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip6.c:911
+#: ../src/connection-editor/ip6-routes-dialog.c:683
+#: ../src/connection-editor/page-ip6.c:904
 msgid "Prefix"
 msgstr "Etuliite"
 
-#: ../src/connection-editor/new-connection.c:101
-#: ../src/connection-editor/page-ethernet.c:251
+#: ../src/connection-editor/new-connection.c:102
+#: ../src/connection-editor/page-ethernet.c:242
 #: ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/new-connection.c:107
-#: ../src/connection-editor/page-wifi.c:483 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../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 "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:119
-#: ../src/connection-editor/page-wimax.c:134
+#: ../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:125
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/new-connection.c:126
+#: ../src/connection-editor/page-dsl.c:137
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:131
-#: ../src/connection-editor/page-infiniband.c:168
+#: ../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 "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:137
-#: ../src/connection-editor/page-bond.c:439 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:559
+#: ../src/connection-editor/new-connection.c:138
+#: ../src/connection-editor/page-bond.c:430 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../src/libnm-gtk/nm-ui-utils.c:562
 msgid "Bond"
 msgstr "Sidonta"
 
-#: ../src/connection-editor/new-connection.c:143
+#: ../src/connection-editor/new-connection.c:144
+#: ../src/connection-editor/page-team.c:255 ../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:212
-#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
 msgid "Bridge"
 msgstr "Silta"
 
-#: ../src/connection-editor/new-connection.c:149
-#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:341
-#: ../src/libnm-gtk/nm-ui-utils.c:563
+#: ../src/connection-editor/new-connection.c:156
+#: ../src/connection-editor/page-vlan.c:482 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/libnm-gtk/nm-ui-utils.c:568
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:162
-#: ../src/connection-editor/new-connection.c:302
+#: ../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:252
-#| msgid "Hardware Address:"
+#: ../src/connection-editor/new-connection.c:259
 msgid "Hardware"
 msgstr "Fyysinen"
 
-#: ../src/connection-editor/new-connection.c:272
+#: ../src/connection-editor/new-connection.c:279
 msgid "Virtual"
 msgstr "Virtuaalinen"
 
-#: ../src/connection-editor/new-connection.c:340
-#: ../src/connection-editor/new-connection.c:342
+#: ../src/connection-editor/new-connection.c:347
+#: ../src/connection-editor/new-connection.c:349
 msgid "Import a saved VPN configuration..."
 msgstr "Tuo tallennetut VPN-asetukset..."
 
-#: ../src/connection-editor/new-connection.c:371
+#: ../src/connection-editor/new-connection.c:378
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "Yhteysmuokkainikkunaa ei voitu alustaa tuntemattoman virheen takia."
 
-#: ../src/connection-editor/new-connection.c:380
+#: ../src/connection-editor/new-connection.c:387
 msgid "Could not create new connection"
 msgstr "Uutta yhteyttä ei voi luoda"
 
-#: ../src/connection-editor/new-connection.c:515
+#: ../src/connection-editor/new-connection.c:522
 msgid "Connection delete failed"
 msgstr "Yhteyden poistaminen epäonnistui"
 
-#: ../src/connection-editor/new-connection.c:562
+#: ../src/connection-editor/new-connection.c:569
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Haluatko varmasti poistaa yhteyden %s?"
 
-#: ../src/connection-editor/nm-connection-editor.c:118
+#: ../src/connection-editor/nm-connection-editor.c:122
 #, c-format
 msgid "Editing %s"
 msgstr "Muokataan %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:122
+#: ../src/connection-editor/nm-connection-editor.c:126
 msgid "Editing un-named connection"
 msgstr "Nimettömän yhteyden muokkaus"
 
-#: ../src/connection-editor/nm-connection-editor.c:282
+#: ../src/connection-editor/nm-connection-editor.c:286
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -1961,52 +2199,52 @@ msgstr ""
 "Yhteysmuokkain ei löytänyt joitain tarvitsemiaan resursseja (.ui-tiedostoa "
 "ei löytynyt)."
 
-#: ../src/connection-editor/nm-connection-editor.c:413
+#: ../src/connection-editor/nm-connection-editor.c:417
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ../src/connection-editor/nm-connection-editor.c:414
+#: ../src/connection-editor/nm-connection-editor.c:418
 msgid "Save any changes made to this connection."
 msgstr "Tallenna yhteydelle tehdyt muutokset."
 
-#: ../src/connection-editor/nm-connection-editor.c:415
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save..."
 msgstr "_Tallenna…"
 
-#: ../src/connection-editor/nm-connection-editor.c:416
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Tunnistaudu tallentaaksesi tämän yhteyden kaikille tämän koneen käyttäjille."
 
-#: ../src/connection-editor/nm-connection-editor.c:432
+#: ../src/connection-editor/nm-connection-editor.c:436
 msgid "Could not create connection"
 msgstr "Yhteyden muodostaminen epäonnistui"
 
-#: ../src/connection-editor/nm-connection-editor.c:432
+#: ../src/connection-editor/nm-connection-editor.c:436
 msgid "Could not edit connection"
 msgstr "Yhteyttä ei voitu muokata"
 
-#: ../src/connection-editor/nm-connection-editor.c:434
+#: ../src/connection-editor/nm-connection-editor.c:438
 msgid "Unknown error creating connection editor dialog."
 msgstr "Tuntematon virhe luotaessa yhteysmuokkaimen ikkunaa."
 
-#: ../src/connection-editor/nm-connection-editor.c:541
+#: ../src/connection-editor/nm-connection-editor.c:572
+msgid "Error initializing editor"
+msgstr "Virhe alustettaessa muokkainta"
+
+#: ../src/connection-editor/nm-connection-editor.c:903
+msgid "Connection add failed"
+msgstr "Yhteyden lisääminen epäonnistui"
+
+#: ../src/connection-editor/nm-connection-editor.c:943
 msgid "Error saving connection"
 msgstr "Virhe yhteyttä tallennettaessa"
 
-#: ../src/connection-editor/nm-connection-editor.c:542
+#: ../src/connection-editor/nm-connection-editor.c:944
 #, c-format
 msgid "The property '%s' / '%s' is invalid: %d"
 msgstr "Ominaisuus ”%s”/”%s” on virheellinen: %d"
 
-#: ../src/connection-editor/nm-connection-editor.c:641
-msgid "Error initializing editor"
-msgstr "Virhe alustettaessa muokkainta"
-
-#: ../src/connection-editor/nm-connection-editor.c:962
-msgid "Connection add failed"
-msgstr "Yhteyden lisääminen epäonnistui"
-
 #: ../src/connection-editor/nm-connection-editor.ui.h:2
 msgid "Connection _name:"
 msgstr "Yhteyden _nimi:"
@@ -2060,56 +2298,56 @@ msgid_plural "%d years ago"
 msgstr[0] "%d vuosi sitten"
 msgstr[1] "%d vuotta sitten"
 
-#: ../src/connection-editor/nm-connection-list.c:631
+#: ../src/connection-editor/nm-connection-list.c:632
 msgid "Name"
 msgstr "Nimi"
 
-#: ../src/connection-editor/nm-connection-list.c:644
+#: ../src/connection-editor/nm-connection-list.c:645
 msgid "Last Used"
 msgstr "Viimeksi käytetty"
 
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:687
 msgid "Edit the selected connection"
 msgstr "Muokkaa valittua yhteyttä"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:688
 msgid "_Edit..."
 msgstr "_Muokkaa…"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:689
 msgid "Authenticate to edit the selected connection"
 msgstr "Tunnistaudu muokataksesi valittua yhteyttä"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:704
 msgid "Delete the selected connection"
 msgstr "Poista valittu yhteys"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:705
 msgid "_Delete..."
 msgstr "_Poista…"
 
-#: ../src/connection-editor/nm-connection-list.c:705
+#: ../src/connection-editor/nm-connection-list.c:706
 msgid "Authenticate to delete the selected connection"
 msgstr "Tunnistaudu poistaaksesi valitun yhteyden"
 
-#: ../src/connection-editor/nm-connection-list.c:943
+#: ../src/connection-editor/nm-connection-list.c:935
 msgid "No VPN plugins are installed."
 msgstr "VPN-liitännäisiä ei ole asennettu."
 
-#: ../src/connection-editor/nm-connection-list.c:945
+#: ../src/connection-editor/nm-connection-list.c:937
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Ei tiedetä kuinka luodaan ”%s”-yhteyksiä"
 
-#: ../src/connection-editor/nm-connection-list.c:947
+#: ../src/connection-editor/nm-connection-list.c:939
 msgid "Error creating connection"
 msgstr "Virhe yhteyttä luotaessa"
 
-#: ../src/connection-editor/nm-connection-list.c:1003
+#: ../src/connection-editor/nm-connection-list.c:995
 msgid "Error editing connection"
 msgstr "Virhe yhteyttä muokattaessa"
 
-#: ../src/connection-editor/nm-connection-list.c:1004
+#: ../src/connection-editor/nm-connection-list.c:996
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Yhteyttä UUID:llä ”%s” ei löytynyt"
@@ -2119,33 +2357,28 @@ msgid "802.1x Security"
 msgstr "802.1x-suojaus"
 
 #: ../src/connection-editor/page-8021x-security.c:123
-#| msgid "Could not load WiFi security user interface."
 msgid "Could not load 802.1x Security user interface."
 msgstr "Turvallisuuskäyttöliittymää 802.1x:lle ei voitu ladata."
 
-#: ../src/connection-editor/page-8021x-security.c:141
+#: ../src/connection-editor/page-8021x-security.c:137
 msgid "Use 802.1_X security for this connection"
 msgstr "Käytä tällä yhteydellä 802.1X-suojausta"
 
-#: ../src/connection-editor/page-bond.c:442
-#| msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-bond.c:433
 msgid "Could not load bond user interface."
 msgstr "Käyttöliittymää sidonnalle ei voitu ladata."
 
-#: ../src/connection-editor/page-bond.c:584
+#: ../src/connection-editor/page-bond.c:587
 #, c-format
-#| msgid "Wired connection %d"
 msgid "Bond connection %d"
 msgstr "Sidottu yhteys %d"
 
 #: ../src/connection-editor/page-bridge.c:215
-#| msgid "Could not load wired user interface."
 msgid "Could not load bridge user interface."
 msgstr "Käyttöliittymää sillalle ei voitu ladata."
 
 #: ../src/connection-editor/page-bridge.c:310
 #, c-format
-#| msgid "Wired connection %d"
 msgid "Bridge connection %d"
 msgstr "Siltaava yhteys %d"
 
@@ -2157,23 +2390,22 @@ msgid "Bridge Port"
 msgstr "Sillan portti"
 
 #: ../src/connection-editor/page-bridge-port.c:117
-#| msgid "Could not load wired user interface."
 msgid "Could not load bridge port user interface."
 msgstr "Käyttöliittymää siltauksen portille ei voitu ladata."
 
-#: ../src/connection-editor/page-dsl.c:143
+#: ../src/connection-editor/page-dsl.c:139
 msgid "Could not load DSL user interface."
 msgstr "Käyttöliittymää DSL:lle ei voitu ladata."
 
-#: ../src/connection-editor/page-dsl.c:235
+#: ../src/connection-editor/page-dsl.c:231
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-yhteys %d"
 
-#: ../src/connection-editor/page-ethernet.c:90
-#: ../src/connection-editor/page-infiniband.c:74
-#: ../src/connection-editor/page-wifi.c:113
-#: ../src/connection-editor/page-wimax.c:70
+#: ../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"
@@ -2181,22 +2413,22 @@ msgstr ""
 "Tämä valinta lukitsee yhteyden verkkolaitteeseen, jonka pysyvä MAC-osoite "
 "annetaan tähän muodossa 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:253
+#: ../src/connection-editor/page-ethernet.c:244
 msgid "Could not load ethernet user interface."
 msgstr "Ethernet-käyttöliittymän lataus epäonnistui."
 
-#: ../src/connection-editor/page-ethernet.c:396
+#: ../src/connection-editor/page-ethernet.c:387
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernet-yhteys %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:59
+#: ../src/connection-editor/page-general.c:55
 #: ../src/libnm-gtk/nm-mobile-providers.c:808
 msgid "Default"
 msgstr "Oletus"
 
-#: ../src/connection-editor/page-general.c:60
+#: ../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 "
@@ -2206,20 +2438,19 @@ msgstr ""
 "sen valinta johtaa palomuurissa asetetun oletusvyöhykkeen käyttöön. Vain "
 "käytettävissä firewalld:n ollessa aktiivinen."
 
-#: ../src/connection-editor/page-general.c:61
+#: ../src/connection-editor/page-general.c:57
 msgid "FirewallD is not running."
 msgstr "FirewallD ei ole käynnissä."
 
-#: ../src/connection-editor/page-general.c:348
-#| msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-general.c:330
 msgid "Could not load General user interface."
 msgstr "Yleistä käyttöliittymää ei voitu ladata."
 
-#: ../src/connection-editor/page-infiniband.c:171
+#: ../src/connection-editor/page-infiniband.c:162
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand-käyttöliittymän lataus epäonnistui."
 
-#: ../src/connection-editor/page-infiniband.c:263
+#: ../src/connection-editor/page-infiniband.c:254
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand-yhteys %d"
@@ -2281,16 +2512,16 @@ msgstr "Ylimääräiset _DNS-palvelimet:"
 msgid "Additional s_earch domains:"
 msgstr "Ylimääräiset _etsittävät toimialueet:"
 
-#: ../src/connection-editor/page-ip4.c:860
+#: ../src/connection-editor/page-ip4.c:856
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Muokataan yhteyden %s IPv4-reittejä"
 
-#: ../src/connection-editor/page-ip4.c:1011
+#: ../src/connection-editor/page-ip4.c:1008
 msgid "IPv4 Settings"
 msgstr "IPv4-asetukset"
 
-#: ../src/connection-editor/page-ip4.c:1013
+#: ../src/connection-editor/page-ip4.c:1010
 msgid "Could not load IPv4 user interface."
 msgstr "Käyttöliittymää IPv4:lle ei voitu ladata."
 
@@ -2299,7 +2530,6 @@ msgid "Automatic, addresses only"
 msgstr "Automaattinen, vain osoitteet"
 
 #: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
 msgid "Ignore"
 msgstr "Ohita"
 
@@ -2307,38 +2537,55 @@ msgstr "Ohita"
 msgid "Automatic, DHCP only"
 msgstr "Automaattinen, vain DHCP"
 
-#: ../src/connection-editor/page-ip6.c:826
+#: ../src/connection-editor/page-ip6.c:819
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Muokataan kohteen %s IPv6-reittejä"
 
-#: ../src/connection-editor/page-ip6.c:975
+#: ../src/connection-editor/page-ip6.c:969
 msgid "IPv6 Settings"
 msgstr "IPv6-asetukset"
 
-#: ../src/connection-editor/page-ip6.c:977
+#: ../src/connection-editor/page-ip6.c:971
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6-käyttöliittymää ei voi ladata."
 
-#: ../src/connection-editor/page-master.c:284
+#: ../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:391
+#: ../src/connection-editor/page-mobile.c:353
 msgid "Could not load mobile broadband user interface."
 msgstr "Käyttöliittymää mobiililaajakaistalle ei voitu ladata."
 
-#: ../src/connection-editor/page-mobile.c:408
+#: ../src/connection-editor/page-mobile.c:370
 msgid "Unsupported mobile broadband connection type."
 msgstr "Mobiililaajakaistasi yhteystyyppi ei ole tuettu."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:658
+#: ../src/connection-editor/page-mobile.c:620
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Valitse mobiililaajakaistan toimittajan tyyppi"
 
-#: ../src/connection-editor/page-mobile.c:693
+#: ../src/connection-editor/page-mobile.c:647
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2346,21 +2593,21 @@ msgstr ""
 "Valitse mobiililaajakaistan toimittajan käyttämä tekniikka. Jos olet "
 "epävarma, kysy toimittajalta (operaattorilta)."
 
-#: ../src/connection-editor/page-mobile.c:698
+#: ../src/connection-editor/page-mobile.c:652
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Toimittaja käyttää _GSM-pohjaista tekniikkaa (eli GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:705
+#: ../src/connection-editor/page-mobile.c:659
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Toimittaja käyttää _CDMA-pohjaista tekniikkaa (mm. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:715 ../src/mb-menu-item.c:54
+#: ../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:718 ../src/mb-menu-item.c:58
+#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
 #: ../src/mobile-helpers.c:268
 msgid "GSM"
 msgstr "GSM"
@@ -2370,24 +2617,24 @@ msgid "EAP"
 msgstr "EAP"
 
 #: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/wireless-security/eap-method-ttls.c:248
 msgid "PAP"
 msgstr "PAP"
 
 #: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/wireless-security/eap-method-ttls.c:298
 msgid "CHAP"
 msgstr "CHAP"
 
 #: ../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:141
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/wireless-security/eap-method-ttls.c:265
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
@@ -2409,12 +2656,57 @@ msgstr "PPP-asetukset"
 msgid "Could not load PPP user interface."
 msgstr "Käyttöliittymää PPP:lle ei voitu ladata."
 
-#: ../src/connection-editor/page-vlan.c:482
-#| msgid "Could not load IPv4 user interface."
+#: ../src/connection-editor/page-team.c:94
+#: ../src/connection-editor/page-team-port.c:77
+#: ../src/connection-editor/vpn-helpers.c:234
+msgid "Select file to import"
+msgstr "Valitse tuotava tiedosto"
+
+#: ../src/connection-editor/page-team.c:114
+#: ../src/connection-editor/page-team-port.c:97
+msgid "Error: file doesn't contain a valid JSON configuration"
+msgstr "Virhe: tiedosto ei sisällä kelvollista JSON-määritystä"
+
+#: ../src/connection-editor/page-team.c:258
+#, fuzzy
+#| msgid "Could not load vlan user interface."
+msgid "Could not load team user interface."
+msgstr "Vlan-käyttöliittymää ei voitu ladata."
+
+#: ../src/connection-editor/page-team.c:353
+#, fuzzy, c-format
+#| msgid "DSL connection %d"
+msgid "Team connection %d"
+msgstr "DSL-yhteys %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:157
+#, fuzzy
+#| msgid "Bridge Port"
+msgid "Team Port"
+msgstr "Sillan portti"
+
+#: ../src/connection-editor/page-team-port.c:159
+#, fuzzy
+#| msgid "Could not load bridge port user interface."
+msgid "Could not load team port user interface."
+msgstr "Käyttöliittymää siltauksen portille ei voitu ladata."
+
+#. 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:318
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:484
 msgid "Could not load vlan user interface."
 msgstr "Vlan-käyttöliittymää ei voitu ladata."
 
-#: ../src/connection-editor/page-vlan.c:678
+#: ../src/connection-editor/page-vlan.c:680
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-yhteys %d"
@@ -2457,10 +2749,7 @@ msgstr ""
 "Valitse uutta yhteyttä varten käytettävä VPN-tyyppi. Jos haluamasi VPN-"
 "tyyppi ei ole listattuna, tietokoneelta puuttunee vaadittu VPN-liitännäinen."
 
-#: ../src/connection-editor/page-wifi.c:98
-#| 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"
+#: ../src/connection-editor/page-wifi.c:85
 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"
@@ -2468,79 +2757,70 @@ msgstr ""
 "Tämä valinta lukitsee yhteyden langattomaan wifi-tukiasemaan (AP), jonka "
 "BSSID-tunniste annetaan tähän muodossa 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:190
-#: ../src/connection-editor/page-wifi.c:194
-#: ../src/connection-editor/page-wifi.c:215
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:176
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "default"
 msgstr "oletus"
 
-#: ../src/connection-editor/page-wifi.c:219
+#: ../src/connection-editor/page-wifi.c:201
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:485
+#: ../src/connection-editor/page-wifi.c:467
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wifi-käyttöliittymän lataus epäonnistui."
 
-#: ../src/connection-editor/page-wifi.c:663
+#: ../src/connection-editor/page-wifi.c:638
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wifi-yhteys %d"
 
-#: ../src/connection-editor/page-wifi-security.c:265
-#| msgctxt "Wifi/wired security"
-#| msgid "None"
-msgctxt "Wi-Fi/Ethernet security"
-msgid "None"
-msgstr "Ei mitään"
-
-#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../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-bit-avain (hexa tai ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:296
+#: ../src/libnm-gtk/nm-wifi-dialog.c:901
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bittinen tunnuslause"
 
-#: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../src/connection-editor/page-wifi-security.c:322
+#: ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynaaminen WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:336
+#: ../src/libnm-gtk/nm-wifi-dialog.c:945
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 (henkilökohtainen)"
 
-#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:350
+#: ../src/libnm-gtk/nm-wifi-dialog.c:959
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:396
-#| msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:391
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Turvallisuuskäyttöliittymää wifille ei voitu ladata. WiFi-asetus puuttuu."
 
-#: ../src/connection-editor/page-wifi-security.c:407
+#: ../src/connection-editor/page-wifi-security.c:402
 msgid "Wi-Fi Security"
 msgstr "Wifi-tietoturva"
 
-#: ../src/connection-editor/page-wifi-security.c:409
-#| msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:404
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Turvallisuuskäyttöliittymää WiFi:lle ei voitu ladata."
 
-#: ../src/connection-editor/page-wimax.c:137
+#: ../src/connection-editor/page-wimax.c:128
 msgid "Could not load WiMAX user interface."
 msgstr "WiMAX-käyttöliittymän lataus epäonnistui."
 
-#: ../src/connection-editor/page-wimax.c:233
+#: ../src/connection-editor/page-wimax.c:224
 #, c-format
 msgid "WiMAX connection %d"
 msgstr "WiMAX-yhteys %d"
@@ -2562,30 +2842,26 @@ msgstr ""
 "\n"
 "Virhe: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:241
-msgid "Select file to import"
-msgstr "Valitse tuotava tiedosto"
-
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:284
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Tiedosto ”%s” on jo olemassa."
 
-#: ../src/connection-editor/vpn-helpers.c:294
+#: ../src/connection-editor/vpn-helpers.c:286
 msgid "_Replace"
 msgstr "Ko_rvaa"
 
-#: ../src/connection-editor/vpn-helpers.c:296
+#: ../src/connection-editor/vpn-helpers.c:288
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 "Haluatko korvata tiedoston %s VPN-asetuksilla, joita olet tallentamassa?"
 
-#: ../src/connection-editor/vpn-helpers.c:332
+#: ../src/connection-editor/vpn-helpers.c:324
 msgid "Cannot export VPN connection"
 msgstr "VPN-yhteyden asetuksia ei voi viedä"
 
-#: ../src/connection-editor/vpn-helpers.c:334
+#: ../src/connection-editor/vpn-helpers.c:326
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2596,11 +2872,11 @@ msgstr ""
 "\n"
 "Virhe: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:369
+#: ../src/connection-editor/vpn-helpers.c:361
 msgid "Export VPN connection..."
 msgstr "Vie VPN-asetukset…"
 
-#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+#: ../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)."
@@ -2623,63 +2899,65 @@ msgid ""
 msgstr ""
 "Bluetooth-asetukset epäonnistuivat (NetworkManageria ei löydy: (%s) %s)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:445
+#: ../src/gnome-bluetooth/bt-widget.c:441
 msgid "Use your mobile phone as a network device (PAN/NAP)"
 msgstr "Käytä matkapuhelintasi verkkolaitteena (PAN/NAP)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:454
+#: ../src/gnome-bluetooth/bt-widget.c:450
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "Käytä Internetiä matkapuhelimesi välityksellä (DUN)"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:336
+#: ../src/gnome-bluetooth/nma-bt-device.c:324
 #, c-format
 msgid "Error: %s"
 msgstr "Virhe: %s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:443
+#: ../src/gnome-bluetooth/nma-bt-device.c:431
 #, c-format
 msgid "Failed to create DUN connection: %s"
 msgstr "DUN-yhteyden luominen epäonnistui: %s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:445
-#: ../src/gnome-bluetooth/nma-bt-device.c:985
+#: ../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 "Puhelimesi on nyt valmis käyttöön."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:468
+#: ../src/gnome-bluetooth/nma-bt-device.c:456
 msgid "Mobile wizard was canceled"
 msgstr "Mobiiliapulainen peruttiin"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:477
+#: ../src/gnome-bluetooth/nma-bt-device.c:465
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "Tuntematon puhelinlaite (ei GSM tai CDMA)"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:513
+#: ../src/gnome-bluetooth/nma-bt-device.c:501
 msgid "unknown modem type."
 msgstr "tuntematon modeemityyppi."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:733
-#: ../src/gnome-bluetooth/nma-bt-device.c:739
+#: ../src/gnome-bluetooth/nma-bt-device.c:721
+#: ../src/gnome-bluetooth/nma-bt-device.c:727
 msgid "failed to connect to the phone."
 msgstr "puhelimeen yhdistäminen epäonnistui."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:770
+#: ../src/gnome-bluetooth/nma-bt-device.c:758
 msgid "unexpectedly disconnected from the phone."
 msgstr "yhteys puhelimeen katkesi odottamattomasti."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:780
+#: ../src/gnome-bluetooth/nma-bt-device.c:768
 msgid "timed out detecting phone details."
 msgstr "aikakatkaisu tunnistettaessa puhelimen tietoja."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:816
+#: ../src/gnome-bluetooth/nma-bt-device.c:779
 msgid "Detecting phone configuration..."
 msgstr "Tutkitaan puhelimen asetuksia…"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:869
-msgid "ModemManager is not running"
-msgstr "ModemManager ei ole käynnissä"
+#: ../src/gnome-bluetooth/nma-bt-device.c:811
+#, fuzzy
+#| msgid "Error editing connection"
+msgid "error getting bus connection"
+msgstr "Virhe yhteyttä muokattaessa"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:946
+#: ../src/gnome-bluetooth/nma-bt-device.c:908
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
@@ -2687,24 +2965,24 @@ msgstr ""
 "Oletusarvoisen Bluetooth-laitteen tulee olla käytössä ennen "
 "puhelinverkkoyhteyden asettamista."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:983
+#: ../src/gnome-bluetooth/nma-bt-device.c:945
 #, c-format
 msgid "Failed to create PAN connection: %s"
 msgstr "PAN-yhteyden luominen epäonnistui: %s"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:1004
+#: ../src/gnome-bluetooth/nma-bt-device.c:966
 #, c-format
 msgid "%s Network"
 msgstr "%s-verkko"
 
 #: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "Avaa tämän laitteen lukitus automaattisesti"
-
-#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "Avaa l_ukitus"
 
+#: ../src/gsm-unlock.ui.h:2
+msgid "Automatically unlock this device"
+msgstr "Avaa tämän laitteen lukitus automaattisesti"
+
 #: ../src/info.ui.h:1
 msgid "Connection Information"
 msgstr "Tietoja yhteydestä"
@@ -2713,27 +2991,27 @@ msgstr "Tietoja yhteydestä"
 msgid "Active Network Connections"
 msgstr "Aktiiviset verkkoyhteydet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:208
+#: ../src/libnm-gtk/nm-mobile-wizard.c:204
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr "Mobiililaajakaistayhteys on nyt luotu seuraavilla asetuksilla:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:215
+#: ../src/libnm-gtk/nm-mobile-wizard.c:211
 msgid "Your Device:"
 msgstr "Laite:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:226
+#: ../src/libnm-gtk/nm-mobile-wizard.c:222
 msgid "Your Provider:"
 msgstr "Palveluntarjoaja:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:237
+#: ../src/libnm-gtk/nm-mobile-wizard.c:233
 msgid "Your Plan:"
 msgstr "Liittymä:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: ../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 "
@@ -2746,23 +3024,23 @@ msgstr ""
 "Muokataksesi mobiililaajakaistayhteyden asetuksia, valitse ”Verkkoyhteydet” "
 "valikosta Järjestelmä >> Asetukset."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:274
+#: ../src/libnm-gtk/nm-mobile-wizard.c:266
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Vahvista mobiililaajakaistan asetukset"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:338
+#: ../src/libnm-gtk/nm-mobile-wizard.c:330
 msgid "Unlisted"
 msgstr "Ei luettelossa"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:493
+#: ../src/libnm-gtk/nm-mobile-wizard.c:461
 msgid "_Select your plan:"
 msgstr "_Valitse liittymä:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:517
+#: ../src/libnm-gtk/nm-mobile-wizard.c:485
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Valitun liittymän _APN (Access Point Name):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:541
+#: ../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"
@@ -2775,67 +3053,67 @@ msgstr ""
 "Jos olet epävarma liittymän tyypistä, kysy palveluntarjoajalta liittymäsi "
 "APN."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:548
+#: ../src/libnm-gtk/nm-mobile-wizard.c:512
 msgid "Choose your Billing Plan"
 msgstr "Valitse laskutustyyppi"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:597
+#: ../src/libnm-gtk/nm-mobile-wizard.c:561
 msgid "My plan is not listed..."
 msgstr "Ei luettelossa…"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../src/libnm-gtk/nm-mobile-wizard.c:714
 msgid "Select your provider from a _list:"
 msgstr "Valitse palveluntarjoaja _luettelosta:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnm-gtk/nm-mobile-wizard.c:727
 msgid "Provider"
 msgstr "Tarjoaja"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: ../src/libnm-gtk/nm-mobile-wizard.c:752
 msgid "I can't find my provider and I wish to enter it _manually:"
 msgstr "Palveluntarjoajaa ei löydy, haluan syöttää tarjoajan _manuaalisesti:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:803
+#: ../src/libnm-gtk/nm-mobile-wizard.c:765
 msgid "Provider:"
 msgstr "Tarjoaja:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:827
+#: ../src/libnm-gtk/nm-mobile-wizard.c:782
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Palveluntarjoaja käyttää GSM-tekniikkaa (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:833
+#: ../src/libnm-gtk/nm-mobile-wizard.c:784
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Palveluntarjoaja käyttää CDMA-tekniikkaa (1xRTT, EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:844
+#: ../src/libnm-gtk/nm-mobile-wizard.c:795
 msgid "Choose your Provider"
 msgstr "Valitse palveluntarjoaja"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1047
 msgid "Country or Region List:"
 msgstr "Maa- tai aluelista:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1060
 msgid "Country or region"
 msgstr "Maa tai alue"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1070
 msgid "My country is not listed"
 msgstr "Maani ei ole luettelossa"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1120
 msgid "Choose your Provider's Country or Region"
 msgstr "Valitse palveluntarjoajasi maa tai alue"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1174
 msgid "Installed GSM device"
 msgstr "Asennettiin GSM-laite"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1177
 msgid "Installed CDMA device"
 msgstr "Asennettiin CDMA-laite"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../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."
@@ -2843,40 +3121,40 @@ msgstr ""
 "Tämä apulainen mahdollistaa matkapuhelinverkon mobiililaajakaistan helpon "
 "käyttöönoton."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1350
 msgid "You will need the following information:"
 msgstr "Seuraavat tiedot tarvitaan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "Your broadband provider's name"
 msgstr "Laajakaistan tarjoajan nimi"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1367
 msgid "Your broadband billing plan name"
 msgstr "Laajakaistan laskutustyypin nimi"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1373
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(joissain tapauksissa) Laajakaistan laskutustyypin APN (Access Point Name)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Luo yhteys _tähän mobiililaajakaistalaitteeseen:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1417
 msgid "Any device"
 msgstr "Mikä tahansa laite"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1430
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Mobiililaajakaistayhteyden asetukset"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1603
 msgid "New Mobile Broadband Connection"
 msgstr "Uusi mobiililaajakaistayhteys"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
+#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
 msgid "Wired"
 msgstr "Kiinteä"
 
@@ -2888,15 +3166,15 @@ msgstr "Bluetooth"
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/libnm-gtk/nm-ui-utils.c:345
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:405
+#: ../src/libnm-gtk/nm-ui-utils.c:408
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:410
 msgid "USB"
 msgstr "USB"
 
@@ -2906,64 +3184,76 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
+#: ../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 "%s %s"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:437
+#: ../src/libnm-gtk/nm-wifi-dialog.c:435
 msgid "New..."
 msgstr "Uusi…"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1055
+#: ../src/libnm-gtk/nm-wifi-dialog.c:875
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ei salausta"
+
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1046
 msgid "C_reate"
 msgstr "_Luo"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1154
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1130
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "Salasanoja tai salausavaimia tarvitaan wifi-verkkoon ”%s” pääsemiseksi."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1156
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1132
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wifi-verkon salaustiedot vaaditaan"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1158
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1134
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wifi-verkko vaatii salaustietoja"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
 msgid "Create New Wi-Fi Network"
 msgstr "Luo uusi wifi-verkko"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
 msgid "New Wi-Fi network"
 msgstr "Uusi wifi-verkko"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1142
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Syötä sen wifi-verkon nimi, jonka haluat luoda."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Yhdistä piilotettuun wifi-verkkoon"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
 msgid "Hidden Wi-Fi network"
 msgstr "Piilotettu wifi-verkko"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1171
-#| msgid ""
-#| "Enter the name and security details of the hidden wireless network you "
-#| "wish to connect to."
+#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "Syötä yhdistettävän piilotetun wifi-verkon nimi ja salaustiedot."
 
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#| msgid "_Password:"
+msgid "_Secondary Password:"
+msgstr "_Toissijainen salasana:"
+
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
+#| msgid "Sho_w passwords"
+msgid "Sh_ow passwords"
+msgstr "Näy_tä salasanat"
+
 #: ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "_Wifi-tietoturva:"
@@ -2982,11 +3272,11 @@ msgstr "Käyttö:"
 
 #: ../src/main.c:75
 msgid ""
-"This program is a component of NetworkManager (https://wiki.gnome.org/";
-"Projects/NetworkManager/)."
+"This program is a component of NetworkManager (http://projects.gnome.org/";
+"NetworkManager)."
 msgstr ""
-"Tämä ohjelma on osa NetworkManageria (https://wiki.gnome.org/";
-"Projects/NetworkManager/)."
+"Tämä ohjelma on osa NetworkManageria (http://projects.gnome.org/";
+"NetworkManager)."
 
 #: ../src/main.c:76
 msgid ""
@@ -3078,16 +3368,16 @@ msgstr "Verkkovierailu (roaming - %s)"
 msgid "Roaming network"
 msgstr "Vierasverkko"
 
-#: ../src/mobile-helpers.c:317
+#: ../src/mobile-helpers.c:318
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN-koodi SIM-kortille \"%s\" laitteessa \"%s\""
 
-#: ../src/mobile-helpers.c:450
+#: ../src/mobile-helpers.c:451
 msgid "PIN code required"
 msgstr "PIN-koodi vaaditaan"
 
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:459
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Mobiililaajakaistalaite vaatii PIN-koodin"
 
@@ -3097,50 +3387,37 @@ msgstr "Mobiililaajakaistalaite vaatii PIN-koodin"
 msgid "%s connection"
 msgstr "%s (yhteys)"
 
-#: ../src/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "Varmentajavarmennetta ei valittu"
+#: ../src/utils/utils.c:376
+msgid "Store the password only for this _user"
+msgstr "Tallenna salasana _vain tälle käyttäjälle"
 
-#: ../src/wireless-security/eap-method.c:276
-#| 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?"
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
-msgstr ""
-"Varmentajan (CA) varmennetta käyttämättä jättäminen voi johtaa yhteyksien "
-"ottamiseen turvattomiin, epäluotettaviin wifi-verkkoihin. Haluatko valita "
-"varmentajan varmenteen?"
-
-#: ../src/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "Valitse CA-varmenne"
+#: ../src/utils/utils.c:378
+msgid "Store the password for _all users"
+msgstr "Tallenna salasana _kaikille käyttäjille"
 
-#: ../src/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER-, PEM- tai PKCS#12-yksityisavaimet (*.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 "DER-, PEM- tai PKCS#12-yksityisavaimet (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:648
+#: ../src/wireless-security/eap-method.c:443
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER- tai PEM-varmenteet (*.der, *.pem, *.crt, *.cer)"
 
 #: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-peap.c:298
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:399
+#: ../src/wireless-security/eap-method-fast.c:400
 msgid "Choose a PAC file..."
 msgstr "Valitse PAC-tiedosto..."
 
-#: ../src/wireless-security/eap-method-fast.c:406
+#: ../src/wireless-security/eap-method-fast.c:407
 msgid "PAC files (*.pac)"
 msgstr "PAC-tiedostot (* .pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:411
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
@@ -3167,8 +3444,8 @@ msgid "PAC _file:"
 msgstr "PAC-_tiedosto:"
 
 #: ../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 "_Sisempi tunnistautuminen:"
 
@@ -3176,14 +3453,14 @@ msgstr "_Sisempi tunnistautuminen:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Salli automaattinen PAC-hankinta"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../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:434
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../src/wireless-security/eap-method-peap.c:377
+#: ../src/wireless-security/eap-method-tls.c:464
+#: ../src/wireless-security/eap-method-ttls.c:377
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Valitse varmentajavarmenne…"
 
@@ -3201,7 +3478,15 @@ msgstr "Versio 1"
 msgid "C_A certificate:"
 msgstr "C_A-varmenne"
 
-#: ../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
+#, fuzzy
+#| msgid "Choose CA Certificate"
+msgid "No CA certificate is _required"
+msgstr "Valitse CA-varmenne"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "PEAP-_versio:"
 
@@ -3209,11 +3494,11 @@ msgstr "PEAP-_versio:"
 msgid "As_k for this password every time"
 msgstr "_Kysy tätä salasanaa jokaisella kerralla"
 
-#: ../src/wireless-security/eap-method-tls.c:260
+#: ../src/wireless-security/eap-method-tls.c:279
 msgid "Unencrypted private keys are insecure"
 msgstr "Salaamattomat yksityiset avaimet ovat epäluotettavia"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-tls.c:282
 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 "
@@ -3225,11 +3510,11 @@ msgstr ""
 "vaarantaa turvallisuusvaltuutuksesi. Ole hyvä, ja valitse salasanalla "
 "suojattu yksityinen avain."
 
-#: ../src/wireless-security/eap-method-tls.c:428
+#: ../src/wireless-security/eap-method-tls.c:458
 msgid "Choose your personal certificate..."
 msgstr "Valitse oma varmenne…"
 
-#: ../src/wireless-security/eap-method-tls.c:440
+#: ../src/wireless-security/eap-method-tls.c:470
 msgid "Choose your private key..."
 msgstr "Valitse salainen avaimesi…"
 
@@ -3241,39 +3526,31 @@ msgstr "I_dentiteetti:"
 msgid "_User certificate:"
 msgstr "_Käyttäjän varmenne:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "Y_ksityinen avain:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "_Yksityisen avaimen salasana:"
 
-#: ../src/wireless-security/nag-user-dialog.ui.h:1
-msgid "Don't _warn me again"
-msgstr "_Älä varoita uudelleen"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:2
-msgid "No"
-msgstr "Ei"
-
-#: ../src/wireless-security/nag-user-dialog.ui.h:3
-msgid "Yes"
-msgstr "Kyllä"
-
-#: ../src/wireless-security/wireless-security.c:394
+#: ../src/wireless-security/wireless-security.c:429
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:454
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:465
 msgid "FAST"
 msgstr "NOPEA"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:476
 msgid "Tunneled TLS"
 msgstr "Tunneloitu TLS"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:487
 msgid "Protected EAP (PEAP)"
 msgstr "Suojattu EAP (PEAP)"
 
@@ -3284,29 +3561,29 @@ msgid "Au_thentication:"
 msgstr "Todentaminen:"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "Avoin järjestelmä"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "Jaettu avain"
-
-#: ../src/wireless-security/ws-wep-key.ui.h:3
 msgid "1 (Default)"
 msgstr "1 (oletus)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "2"
 msgstr "2"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: ../src/wireless-security/ws-wep-key.ui.h:3
 msgid "3"
 msgstr "3"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:6
+#: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "4"
 msgstr "4"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:5
+msgid "Open System"
+msgstr "Avoin järjestelmä"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr "Jaettu avain"
+
 #: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
 msgstr "_Avain:"
@@ -3319,6 +3596,37 @@ msgstr "Nä_ytä avain"
 msgid "WEP inde_x:"
 msgstr "WEP-inde_ksi"
 
+#~ msgid "ModemManager is not running"
+#~ msgstr "ModemManager ei ole käynnissä"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Varmentajavarmennetta ei valittu"
+
+#~| 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?"
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Varmentajan (CA) varmennetta käyttämättä jättäminen voi johtaa yhteyksien "
+#~ "ottamiseen turvattomiin, epäluotettaviin wifi-verkkoihin. Haluatko valita "
+#~ "varmentajan varmenteen?"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "Valitse CA-varmenne"
+
+#~ msgid "Don't _warn me again"
+#~ msgstr "_Älä varoita uudelleen"
+
+#~ msgid "No"
+#~ msgstr "Ei"
+
+#~ msgid "Yes"
+#~ msgstr "Kyllä"
+
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "Langattomat verkot (%s)"
 


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