[network-manager-applet] Merge Finnish translation from Launchpad.



commit ca733bdd01e703d2b4228c187beae6fa69340bf5
Author: Timo Jyrinki <timo debian org>
Date:   Mon Apr 11 16:40:32 2011 +0300

    Merge Finnish translation from Launchpad.

 po/fi.po | 2486 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 1468 insertions(+), 1018 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index b72c683..38012e8 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,31 +4,31 @@
 # package.
 #
 # Ilkka Tuohela <hile iki fi>, 2005-2008.
-# Timo Jyrinki <timo jyrinki iki fi>, 2008-2010.
-# Jiri Grönroos <jiri gronroos iki fi>, 2010.
+# Timo Jyrinki <timo jyrinki iki fi>, 2008-2011.
+# Jiri Grönroos <jiri gronroos iki fi>, 2010-2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-12 06:09+0000\n"
-"PO-Revision-Date: 2010-09-13 09:35+0000\n"
+"POT-Creation-Date: 2011-04-11 16:40+0300\n"
+"PO-Revision-Date: 2011-04-11 16:40+0300\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-09-13 15:09+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
 
 #: ../nm-applet.desktop.in.h:1
-msgid "Control your network connections"
+#, fuzzy
+msgid "Manage your network connections"
 msgstr "Hallitse verkkoyhteyksiä"
 
 #: ../nm-applet.desktop.in.h:2
-msgid "Network Manager"
-msgstr "Verkon hallinta"
+msgid "Network"
+msgstr "Verkko"
 
 #: ../nm-applet.schemas.in.h:1
 msgid "Disable WiFi Create"
@@ -43,8 +43,7 @@ msgid "Disable disconnected notifications"
 msgstr "�lä näytä ilmoitusta kun yhteys katkeaa"
 
 #: ../nm-applet.schemas.in.h:4
-msgid ""
-"Set this to TRUE to disable notifications when connecting to a network."
+msgid "Set this to TRUE to disable notifications when connecting to a network."
 msgstr ""
 "Merkitse tämä arvoksi TRUE kytkeäksesi ilmoitukset pois, kun kone etsii "
 "verkkoa."
@@ -80,8 +79,7 @@ msgid "Suppress networks available notifications"
 msgstr "�lä näytä ilmoituksia saatavilla olevista verkoista"
 
 #: ../nm-applet.schemas.in.h:10
-msgid ""
-"Used to determine whether settings should be migrated to a new version."
+msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "Määrittää, tuodaanko asetukset uuteen versioon."
 
 #: ../nm-connection-editor.desktop.in.h:1
@@ -89,34 +87,26 @@ msgid "Manage and change your network connection settings"
 msgstr "Hallitse ja muuta verkkoyhteyksien asetuksia"
 
 #: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.glade.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:7
 msgid "Network Connections"
 msgstr "Verkkoyhteydet"
 
-#: ../src/applet-dbus-manager.c:165
-#, c-format
-msgid "An instance of nm-applet is already running.\n"
-msgstr "Verkonhallintasovellus nm-applet on jo käynnissä.\n"
-
-#: ../src/applet-dbus-manager.c:167
-#, c-format
-msgid "Could not acquire the %s service. (%d)\n"
-msgstr "Ei voitu saavuttaa palvelua %s. (%d)\n"
-
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:332
-#: ../src/applet-device-gsm.c:375 ../src/applet-device-wired.c:241
-#: ../src/applet-device-wifi.c:817
+#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:337
+#: ../src/applet-device-gsm.c:381 ../src/applet-device-wired.c:240
+#: ../src/applet-device-wifi.c:867 ../src/applet-device-wimax.c:279
 msgid "Available"
 msgstr "Saatavilla"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:374
+#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:379
+#: ../src/applet-device-gsm.c:423 ../src/applet-device-wired.c:269
+#: ../src/applet-device-wimax.c:423
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Yhteys verkkoon â??%sâ?? on nyt muodostettu."
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:378
-#: ../src/applet-device-gsm.c:418 ../src/applet-device-wired.c:272
-#: ../src/applet-device-wifi.c:1259
+#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:383
+#: ../src/applet-device-gsm.c:427 ../src/applet-device-wired.c:273
+#: ../src/applet-device-wifi.c:1272 ../src/applet-device-wimax.c:427
 msgid "Connection Established"
 msgstr "Yhteys muodostettu"
 
@@ -124,125 +114,122 @@ msgstr "Yhteys muodostettu"
 msgid "You are now connected to the mobile broadband network."
 msgstr "Yhteys mobiililaajakaistaan on nyt muodostettu."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:414
-#: ../src/applet-device-gsm.c:452
+#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:419
+#: ../src/applet-device-gsm.c:463 ../src/applet-device-wimax.c:464
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Valmistellaan mobiililaajakaistayhteyttä â??%sâ??..."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:417
-#: ../src/applet-device-gsm.c:455
+#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:422
+#: ../src/applet-device-gsm.c:466 ../src/applet-device-wimax.c:467
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Tehdään mobiililaajakaistayhteyden â??%sâ?? asetuksia..."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:420
-#: ../src/applet-device-gsm.c:458
+#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:425
+#: ../src/applet-device-gsm.c:469 ../src/applet-device-wimax.c:470
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr ""
 "Käyttäjätunnistautuminen vaaditaan mobiililaajakaistayhteydelle â??%sâ??..."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:423
-#: ../src/applet-device-gsm.c:461 ../src/applet.c:2431
+#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:428
+#: ../src/applet-device-gsm.c:472 ../src/applet-device-wimax.c:473
+#: ../src/applet.c:2383
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Pyydetään verkko-osoitetta verkosta â??%sâ??..."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:479
+#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:446
+#: ../src/applet-device-gsm.c:490
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobiililaajakaistayhteys â??%sâ?? on aktiivinen"
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:621
-#: ../src/mb-menu-item.c:55
+#: ../src/applet-device-cdma.c:186 ../src/connection-editor/page-mobile.c:681
+#: ../src/mb-menu-item.c:54
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/applet-device-cdma.c:281 ../src/applet-device-gsm.c:325
+#: ../src/applet-device-cdma.c:283 ../src/applet-device-gsm.c:327
+#: ../src/applet-dialogs.c:405
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobiililaajakaista (%s)"
 
-#: ../src/applet-device-cdma.c:283 ../src/applet-device-gsm.c:327
-#: ../src/connection-editor/page-mobile.c:318
-#: ../src/connection-editor/nm-connection-editor.glade.h:6
-#: ../src/connection-editor/nm-connection-list.c:1399
+#: ../src/applet-device-cdma.c:285 ../src/applet-device-gsm.c:329
+#: ../src/connection-editor/page-mobile.c:372
+#: ../src/connection-editor/nm-connection-editor.ui.h:6
+#: ../src/connection-editor/nm-connection-list.c:1440
 msgid "Mobile Broadband"
 msgstr "Mobiililaajakaista"
 
 #. Default connection item
-#: ../src/applet-device-cdma.c:345
+#: ../src/applet-device-cdma.c:350
 msgid "New Mobile Broadband (CDMA) connection..."
 msgstr "Uusi mobiililaajakaistayhteys (CDMA)..."
 
-#: ../src/applet-device-cdma.c:379
+#: ../src/applet-device-cdma.c:384
 msgid "You are now connected to the CDMA network."
 msgstr "Yhteys CDMA-verkkoon on nyt muodostettu."
 
-#: ../src/applet-device-cdma.c:436 ../src/applet-device-gsm.c:474
+#: ../src/applet-device-cdma.c:441 ../src/applet-device-gsm.c:485
+#: ../src/applet-device-wimax.c:482
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Mobiililaajakaistayhteys â??%sâ?? on aktiivinen (%d%%%s%s)"
 
-#: ../src/applet-device-cdma.c:439 ../src/applet-device-gsm.c:477
+#: ../src/applet-device-cdma.c:444 ../src/applet-device-gsm.c:488
+#: ../src/applet-device-wimax.c:485
 msgid "roaming"
 msgstr "verkkovierailu"
 
-#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:624
-#: ../src/mb-menu-item.c:60
+#: ../src/applet-device-gsm.c:212 ../src/connection-editor/page-mobile.c:684
+#: ../src/mb-menu-item.c:59
 msgid "GSM"
 msgstr "GSM"
 
 #. Default connection item
-#: ../src/applet-device-gsm.c:388
+#: ../src/applet-device-gsm.c:394
 msgid "New Mobile Broadband (GSM) connection..."
 msgstr "Uusi mobiililaajakaistayhteys (GSM)..."
 
-#: ../src/applet-device-gsm.c:417
-msgid "GSM network."
-msgstr "GSM-verkko."
+#: ../src/applet-device-gsm.c:428
+#, fuzzy
+msgid "You are now connected to the GSM network."
+msgstr "Yhteys CDMA-verkkoon on nyt muodostettu."
 
-#: ../src/applet-device-gsm.c:706
+#: ../src/applet-device-gsm.c:589
 msgid "PIN code required"
 msgstr "PIN-koodi vaaditaan"
 
-#: ../src/applet-device-gsm.c:708
-msgid "PUK code required"
-msgstr "PUK-koodi vaaditaan"
-
-#: ../src/applet-device-gsm.c:719
+#: ../src/applet-device-gsm.c:597
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Mobiililaajakaistalaite vaatii PIN-koodin"
 
-#: ../src/applet-device-gsm.c:721
-msgid "PUK code is needed for the mobile broadband device"
-msgstr "Mobiililaajakaistalaite vaatii PUK-koodin"
-
-#: ../src/applet-device-gsm.c:854
+#: ../src/applet-device-gsm.c:718
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Väärä PIN-koodi. Ota yhteys palveluntarjoajaasi."
 
-#: ../src/applet-device-gsm.c:877
+#: ../src/applet-device-gsm.c:741
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Väärä PUK-koodi. Ota yhteys palveluntarjoajaasi."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:904
+#: ../src/applet-device-gsm.c:768
 msgid "Sending unlock code..."
 msgstr "Lähetetään lukituksen avauskoodia..."
 
-#: ../src/applet-device-gsm.c:964
+#: ../src/applet-device-gsm.c:831
 msgid "SIM PIN unlock required"
 msgstr "SIM-kortin PIN-koodi vaaditaan"
 
-#: ../src/applet-device-gsm.c:965
+#: ../src/applet-device-gsm.c:832
 msgid "SIM PIN Unlock Required"
 msgstr "SIM-kortin PIN-koodi vaaditaan"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:967
+#: ../src/applet-device-gsm.c:834
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -250,26 +237,26 @@ msgid ""
 msgstr ""
 "Mobiililaajakaistalaite â??%sâ?? vaatii SIM-kortin PIN-koodin ennen käyttöä."
 
-#: ../src/applet-device-gsm.c:968
-msgctxt "PIN code entry label"
+#. Translators: PIN code entry label
+#: ../src/applet-device-gsm.c:836
 msgid "PIN code:"
 msgstr "PIN-koodi:"
 
-#: ../src/applet-device-gsm.c:971
-msgctxt "Show/obscure PIN checkbox label"
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-device-gsm.c:840
 msgid "Show PIN code"
 msgstr "Näytä PIN-koodi"
 
-#: ../src/applet-device-gsm.c:974
+#: ../src/applet-device-gsm.c:843
 msgid "SIM PUK unlock required"
 msgstr "SIM-kortin PUK-koodi vaaditaan"
 
-#: ../src/applet-device-gsm.c:975
+#: ../src/applet-device-gsm.c:844
 msgid "SIM PUK Unlock Required"
 msgstr "SIM-kortin PUK-koodi vaaditaan"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:977
+#: ../src/applet-device-gsm.c:846
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -277,342 +264,419 @@ msgid ""
 msgstr ""
 "Mobiililaajakaistalaite â??%sâ?? vaatii SIM-kortin PUK-koodin ennen käyttöä."
 
-#: ../src/applet-device-gsm.c:978
-msgctxt "PUK code entry label"
+#. Translators: PUK code entry label
+#: ../src/applet-device-gsm.c:848
 msgid "PUK code:"
 msgstr "PUK-koodi:"
 
-#: ../src/applet-device-gsm.c:980
-msgctxt "New PIN entry label"
+#. Translators: New PIN entry label
+#: ../src/applet-device-gsm.c:851
 msgid "New PIN code:"
 msgstr "Uusi PIN-koodi:"
 
-#: ../src/applet-device-gsm.c:981
-msgctxt "New PIN verification entry label"
+#. Translators: New PIN verification entry label
+#: ../src/applet-device-gsm.c:853
 msgid "Re-enter new PIN code:"
 msgstr "Syötä uusi PIN-koodi uudelleen:"
 
-#: ../src/applet-device-gsm.c:985
-msgctxt "Show/obscure PIN/PUK checkbox label"
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-device-gsm.c:858
 msgid "Show PIN/PUK codes"
 msgstr "Näytä PIN-/PUK-koodit"
 
-#: ../src/applet-device-wired.c:63
+#: ../src/applet-device-wired.c:62
 msgid "Auto Ethernet"
 msgstr "Automaattinen Ethernet"
 
-#: ../src/applet-device-wired.c:206
+#: ../src/applet-device-wired.c:205
 #, c-format
 msgid "Wired Networks (%s)"
 msgstr "Kiinteät verkkoyhteydet (%s)"
 
-#: ../src/applet-device-wired.c:208
+#: ../src/applet-device-wired.c:207
 #, c-format
 msgid "Wired Network (%s)"
 msgstr "Kiinteä verkkoyhteys (%s)"
 
-#: ../src/applet-device-wired.c:211
+#: ../src/applet-device-wired.c:210
 msgid "Wired Networks"
 msgstr "Kiinteät verkkoyhteydet"
 
-#: ../src/applet-device-wired.c:213
+#: ../src/applet-device-wired.c:212
 msgid "Wired Network"
 msgstr "Kiinteä verkkoyhteys"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:233 ../src/applet.c:1326
+#: ../src/applet-device-wired.c:232 ../src/applet.c:1389
 msgid "disconnected"
 msgstr "katkaistu"
 
-#: ../src/applet-device-wired.c:271 ../src/applet.c:2135
-msgid "Wired network"
-msgstr "Kiinteä verkkoyhteys"
+#: ../src/applet-device-wired.c:274
+#, fuzzy
+msgid "You are now connected to the wired network."
+msgstr "Yhteys CDMA-verkkoon on nyt muodostettu."
 
-#: ../src/applet-device-wired.c:297
+#: ../src/applet-device-wired.c:300
 #, c-format
 msgid "Preparing wired network connection '%s'..."
 msgstr "Valmistellaan kiinteän verkon yhteyttä  â??%sâ??..."
 
-#: ../src/applet-device-wired.c:300
+#: ../src/applet-device-wired.c:303
 #, c-format
 msgid "Configuring wired network connection '%s'..."
 msgstr "Tehdään kiinteän verkon â??%sâ?? asetuksia..."
 
-#: ../src/applet-device-wired.c:303
+#: ../src/applet-device-wired.c:306
 #, c-format
 msgid "User authentication required for wired network connection '%s'..."
 msgstr "Käyttäjätunnistautuminen vaaditaan kiinteälle verkolle â??%sâ??..."
 
-#: ../src/applet-device-wired.c:306
+#: ../src/applet-device-wired.c:309
 #, c-format
 msgid "Requesting a wired network address for '%s'..."
 msgstr "Pyydetään verkko-osoitetta kiinteästä verkosta â??%sâ??..."
 
-#: ../src/applet-device-wired.c:310
+#: ../src/applet-device-wired.c:313
 #, c-format
 msgid "Wired network connection '%s' active"
 msgstr "Kiinteä verkkoyhteys â??%sâ?? on aktiivinen"
 
-#: ../src/applet-device-wired.c:561
+#: ../src/applet-device-wired.c:494
 msgid "DSL authentication"
 msgstr "DSL-todentaminen"
 
-#: ../src/applet-device-wifi.c:88
+#: ../src/applet-device-wifi.c:89
 msgid "_Connect to Hidden Wireless Network..."
 msgstr "_Yhdistä piilotettuun langattomaan verkkoon..."
 
-#: ../src/applet-device-wifi.c:121
+#: ../src/applet-device-wifi.c:142
 msgid "Create _New Wireless Network..."
 msgstr "Luo _uusi langaton verkko..."
 
-#: ../src/applet-device-wifi.c:749
+#: ../src/applet-device-wifi.c:226
+msgid "(none)"
+msgstr "(ei mitään)"
+
+#: ../src/applet-device-wifi.c:795
 #, c-format
 msgid "Wireless Networks (%s)"
 msgstr "Langattomat verkot (%s)"
 
-#: ../src/applet-device-wifi.c:751
+#: ../src/applet-device-wifi.c:797
 #, c-format
 msgid "Wireless Network (%s)"
 msgstr "Langaton verkko (%s)"
 
-#: ../src/applet-device-wifi.c:753
+#: ../src/applet-device-wifi.c:799
 msgid "Wireless Network"
 msgid_plural "Wireless Networks"
 msgstr[0] "Langaton verkko"
 msgstr[1] "Langattomat verkot"
 
-#: ../src/applet-device-wifi.c:783
+#: ../src/applet-device-wifi.c:832
 msgid "wireless is disabled"
 msgstr "Langaton verkko ei ole käytössä"
 
-#: ../src/applet-device-wifi.c:844
+#: ../src/applet-device-wifi.c:833
+msgid "wireless is disabled by hardware switch"
+msgstr ""
+"langaton yhteys on kytketty pois käytöstä laitteessa olevasta painikkeesta"
+
+#: ../src/applet-device-wifi.c:894
 msgid "More networks"
 msgstr "Lisää verkkoja"
 
-#: ../src/applet-device-wifi.c:1048
+#: ../src/applet-device-wifi.c:1073
 msgid "Wireless Networks Available"
 msgstr "Langattomia verkkoja saatavilla"
 
-#: ../src/applet-device-wifi.c:1049
+#: ../src/applet-device-wifi.c:1075
 msgid "Click on this icon to connect to a wireless network"
 msgstr "Yhdistä langattomaan verkkoon napsauttamalla tästä"
 
-#: ../src/applet-device-wifi.c:1052 ../src/applet.c:694
+#: ../src/applet-device-wifi.c:1076
+msgid "Use the network menu to connect to a wireless network"
+msgstr "Käytä verkkovalikkoa yhdistääksesi langattomaan verkkoon"
+
+#: ../src/applet-device-wifi.c:1079 ../src/applet.c:805
 msgid "Don't show this message again"
 msgstr "�lä näytä tätä uudestaan"
 
-#: ../src/applet-device-wifi.c:1258 ../src/applet-device-wifi.c:1288
-msgid "(none)"
-msgstr "(ei mitään)"
+#: ../src/applet-device-wifi.c:1271
+#, fuzzy, c-format
+msgid "You are now connected to the wireless network '%s'."
+msgstr "Yhteys CDMA-verkkoon on nyt muodostettu."
 
-#: ../src/applet-device-wifi.c:1298
+#: ../src/applet-device-wifi.c:1302
 #, c-format
 msgid "Preparing wireless network connection '%s'..."
 msgstr "Valmistellaan langatonta verkkoyhteyttä â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1301
+#: ../src/applet-device-wifi.c:1305
 #, c-format
 msgid "Configuring wireless network connection '%s'..."
 msgstr "Tehdään langattoman verkkoyhteyden â??%sâ?? asetuksia..."
 
-#: ../src/applet-device-wifi.c:1304
+#: ../src/applet-device-wifi.c:1308
 #, c-format
 msgid "User authentication required for wireless network '%s'..."
 msgstr "Käyttäjätunnistautuminen vaaditaan langattomalle verkolle â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1307
+#: ../src/applet-device-wifi.c:1311
 #, c-format
 msgid "Requesting a wireless network address for '%s'..."
 msgstr "Pyydetään verkko-osoitetta langattomasta verkosta â??%sâ??..."
 
-#: ../src/applet-device-wifi.c:1327
+#: ../src/applet-device-wifi.c:1332
 #, c-format
 msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgstr "Langaton verkkoyhteys â??%sâ?? on aktiivinen: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1331
+#: ../src/applet-device-wifi.c:1337
 #, c-format
 msgid "Wireless network connection '%s' active"
 msgstr "Langaton verkkoyhteys â??%sâ?? on aktiivinen"
 
+#: ../src/applet-device-wimax.c:231
+#, fuzzy, c-format
+msgid "WiMAX Mobile Broadband (%s)"
+msgstr "Mobiililaajakaista (%s)"
+
+#: ../src/applet-device-wimax.c:233
+#, fuzzy
+msgid "WiMAX Mobile Broadband"
+msgstr "Mobiililaajakaista"
+
+#: ../src/applet-device-wimax.c:259
+#, fuzzy
+msgid "WiMAX is disabled"
+msgstr "Langaton verkko ei ole käytössä"
+
+#: ../src/applet-device-wimax.c:260
+#, fuzzy
+msgid "WiMAX is disabled by hardware switch"
+msgstr ""
+"langaton yhteys on kytketty pois käytöstä laitteessa olevasta painikkeesta"
+
+#: ../src/applet-device-wimax.c:428
+#, fuzzy
+msgid "You are now connected to the WiMAX network."
+msgstr "Yhteys CDMA-verkkoon on nyt muodostettu."
+
 #: ../src/applet-dialogs.c:56
 msgid "Error displaying connection information:"
 msgstr "Virhe näytettäessä yhteyden tietoja:"
 
-#: ../src/applet-dialogs.c:87
-#: ../src/connection-editor/page-wireless-security.c:284
-#: ../src/wireless-dialog.c:962
-#: ../src/wireless-security/wireless-security.c:341
+#: ../src/applet-dialogs.c:108
+#: ../src/connection-editor/page-wireless-security.c:285
+#: ../src/wireless-dialog.c:946
+#: ../src/wireless-security/wireless-security.c:392
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:89
+#: ../src/applet-dialogs.c:110
 msgid "Dynamic WEP"
 msgstr "Dynaaminen WEP"
 
-#: ../src/applet-dialogs.c:91 ../src/applet-dialogs.c:192
-#: ../src/applet-dialogs.c:194
+#: ../src/applet-dialogs.c:112 ../src/applet-dialogs.c:221
+#: ../src/applet-dialogs.c:223
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:190
+#: ../src/applet-dialogs.c:219
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:198
-#: ../src/connection-editor/page-wireless-security.c:238
-#: ../src/wireless-dialog.c:919
-msgctxt "No wifi security used"
+#: ../src/applet-dialogs.c:227 ../src/applet-dialogs.c:236
+#: ../src/connection-editor/page-wireless-security.c:239
+#: ../src/wireless-dialog.c:903
+msgctxt "Wifi/wired security"
 msgid "None"
-msgstr "Ei mitään"
+msgstr "Ei salausta"
 
-#: ../src/applet-dialogs.c:207
-msgctxt "No wired security used"
-msgid "None"
-msgstr "Ei mitään"
+#: ../src/applet-dialogs.c:327 ../src/applet-dialogs.c:465
+#, c-format
+msgid "%u Mb/s"
+msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:210
-msgctxt "Unknown/unrecognized wired or wifi security"
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:467
+msgctxt "Speed"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/applet-dialogs.c:280 ../src/applet-dialogs.c:382
+#: ../src/applet-dialogs.c:342
 #, c-format
-msgid "%u Mb/s"
-msgstr "%u Mb/s"
+msgid "%d dB"
+msgstr ""
 
-#: ../src/applet-dialogs.c:282 ../src/applet-dialogs.c:384
-#: ../src/applet-dialogs.c:421 ../src/applet-dialogs.c:439
-#: ../src/applet-dialogs.c:450
-msgid "Unknown"
+#: ../src/applet-dialogs.c:344
+#, fuzzy
+msgctxt "WiMAX CINR"
+msgid "unknown"
 msgstr "Tuntematon"
 
-#: ../src/applet-dialogs.c:313
+#: ../src/applet-dialogs.c:356
+#, fuzzy
+msgctxt "WiMAX Base Station ID"
+msgid "unknown"
+msgstr "Tuntematon"
+
+#: ../src/applet-dialogs.c:391
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:315
+#: ../src/applet-dialogs.c:394
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:317
+#: ../src/applet-dialogs.c:401
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:319
+#: ../src/applet-dialogs.c:403
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:324
+#: ../src/applet-dialogs.c:407
+#, fuzzy, c-format
+msgid "WiMAX (%s)"
+msgstr "CDMA (%s)"
+
+#. --- General ---
+#: ../src/applet-dialogs.c:413
+msgid "General"
+msgstr "Yleiset"
+
+#: ../src/applet-dialogs.c:417
 msgid "Interface:"
 msgstr "Verkkolaite:"
 
-#: ../src/applet-dialogs.c:340
+#: ../src/applet-dialogs.c:433
 msgid "Hardware Address:"
 msgstr "Fyysinen osoite:"
 
-#: ../src/applet-dialogs.c:350
+#. Driver
+#: ../src/applet-dialogs.c:441
 msgid "Driver:"
 msgstr "Ajuri:"
 
-#: ../src/applet-dialogs.c:388
+#: ../src/applet-dialogs.c:470
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: ../src/applet-dialogs.c:397
+#: ../src/applet-dialogs.c:480
 msgid "Security:"
 msgstr "Tietoturva:"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:493
+msgid "CINR:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:506
+#, fuzzy
+msgid "BSID:"
+msgstr "_BSSID:"
+
+#. --- IPv4 ---
+#: ../src/applet-dialogs.c:523
+msgid "IPv4"
+msgstr "IPv4"
+
+#. Address
+#: ../src/applet-dialogs.c:534 ../src/applet-dialogs.c:641
 msgid "IP Address:"
 msgstr "IP-osoite:"
 
-#: ../src/applet-dialogs.c:437
+#: ../src/applet-dialogs.c:536 ../src/applet-dialogs.c:552
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: ../src/applet-dialogs.c:550
 msgid "Broadcast Address:"
 msgstr "Yleisosoite:"
 
-#: ../src/applet-dialogs.c:448
+#. Prefix
+#: ../src/applet-dialogs.c:559
 msgid "Subnet Mask:"
 msgstr "Aliverkkopeite:"
 
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:561
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: ../src/applet-dialogs.c:569 ../src/applet-dialogs.c:656
 msgid "Default Route:"
 msgstr "Oletusyhdyskäytävä:"
 
-#: ../src/applet-dialogs.c:474
+#: ../src/applet-dialogs.c:581
 msgid "Primary DNS:"
 msgstr "Ensisijainen DNS:"
 
-#: ../src/applet-dialogs.c:485
+#: ../src/applet-dialogs.c:590
 msgid "Secondary DNS:"
 msgstr "Toissijainen DNS:"
 
+#: ../src/applet-dialogs.c:600
+msgid "Ternary DNS:"
+msgstr ""
+
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:615
+msgid "IPv6"
+msgstr "IPv6"
+
+#: ../src/applet-dialogs.c:624
+msgid "Ignored"
+msgstr "Ohitettu"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:548
+#: ../src/applet-dialogs.c:732
 msgid "No valid active connections found!"
 msgstr "Toimivia aktiivisia yhteyksiä ei löytynyt!"
 
-#: ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:785
 msgid ""
-"Copyright © 2004-2008 Red Hat, Inc.\n"
-"Copyright © 2005-2008 Novell, Inc."
+"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2005-2008 Novell, Inc.\n"
+"and many other community contributors and translators"
 msgstr ""
-"Copyright © 2004-2008 Red Hat, Inc.\n"
-"Copyright © 2005-2008 Novell, Inc."
+"Tekijänoikeus © 2004-2011 Red Hat, Inc.\n"
+"Tekijänoikeus © 2005-2008 Novell, Inc.\n"
+"ja monet muut kehittäjät sekä kääntäjät"
 
-#: ../src/applet-dialogs.c:677
+#: ../src/applet-dialogs.c:788
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Ilmoitusalueen sovelma verkkolaitteiden ja -yhteyksien hallintaan."
 
-#: ../src/applet-dialogs.c:679
+#: ../src/applet-dialogs.c:790
 msgid "NetworkManager Website"
 msgstr "NetworkManagerin verkkosivusto"
 
-#: ../src/applet-dialogs.c:682
-msgid "translator-credits"
-msgstr ""
-"Timo Jyrinki, 2008-2009.\n"
-"Ilkka Tuohela, 2005-2008.\n"
-"\n"
-"http://www.gnome.fi/\n";
-"\n"
-"Launchpad Contributions:\n"
-"  Aapo Rantalainen https://launchpad.net/~aapo-rantalainen\n";
-"  Birunthan Mohanathas https://launchpad.net/~biru\n";
-"  Christian Hellberg https://launchpad.net/~christian-hellberg\n";
-"  Heikki Kulhia https://launchpad.net/~hessuk\n";
-"  Heikki Mäntysaari https://launchpad.net/~heikki-mantysaari\n";
-"  Jiri Grönroos https://launchpad.net/~jiri-gronroos\n";
-"  Jussi Aalto https://launchpad.net/~jtaalto\n";
-"  Ncl8 https://launchpad.net/~crofle\n";
-"  T Kortehisto https://launchpad.net/~temakort\n";
-"  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n";
-"  Tomi Juntunen https://launchpad.net/~tojuntu\n";
-"  papukaija https://launchpad.net/~papukaija";
-
-#: ../src/applet-dialogs.c:698
+#: ../src/applet-dialogs.c:805
 msgid "Missing resources"
 msgstr "Puuttuvia resursseja"
 
-#: ../src/applet-dialogs.c:725
+#: ../src/applet-dialogs.c:830
 msgid "Mobile broadband network password"
 msgstr "Mobiililaajakaistaverkon salasana"
 
-#: ../src/applet-dialogs.c:734
+#: ../src/applet-dialogs.c:839
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Yhteys verkkoon â??%sâ?? vaatii salasanan."
 
-#: ../src/applet-dialogs.c:755
+#: ../src/applet-dialogs.c:854
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../src/applet.c:807
+#: ../src/applet.c:894
 #, c-format
 msgid ""
 "\n"
@@ -622,7 +686,7 @@ msgstr ""
 "\n"
 "VPN-yhteys â??%sâ?? epäonnistui, koska verkkoyhteys katkaistiin."
 
-#: ../src/applet.c:810
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -631,7 +695,7 @@ msgstr ""
 "\n"
 "VPN-yhteys â??%sâ?? epäonnistui, koska VPN-palvelu pysäytettiin odottamatta."
 
-#: ../src/applet.c:813
+#: ../src/applet.c:900
 #, c-format
 msgid ""
 "\n"
@@ -642,7 +706,7 @@ msgstr ""
 "VPN-yhteys â??%sâ?? epäonnistui, koska VPN-palvelulta saatiin virheellinen "
 "asetusmäärittely."
 
-#: ../src/applet.c:816
+#: ../src/applet.c:903
 #, c-format
 msgid ""
 "\n"
@@ -651,7 +715,7 @@ msgstr ""
 "\n"
 "VPN-yhteys â??%sâ?? epäonnistui, koska yhteyttä palveluun ei saatu."
 
-#: ../src/applet.c:819
+#: ../src/applet.c:906
 #, c-format
 msgid ""
 "\n"
@@ -661,7 +725,7 @@ msgstr ""
 "VPN-yhteys â??%sâ?? epäonnistui, koska VPN-palvelu ei käynnistynyt sallitussa "
 "ajassa."
 
-#: ../src/applet.c:822
+#: ../src/applet.c:909
 #, c-format
 msgid ""
 "\n"
@@ -670,7 +734,7 @@ msgstr ""
 "\n"
 "VPN-yhteys â??%sâ?? epäonnistui, koska VPN-palvelua ei voitu käynnistää."
 
-#: ../src/applet.c:825
+#: ../src/applet.c:912
 #, c-format
 msgid ""
 "\n"
@@ -679,7 +743,7 @@ msgstr ""
 "\n"
 "VPN-yhteys â??%sâ?? epäonnistui, koska kelvollisia VPN-salaisuuksia ei löytynyt."
 
-#: ../src/applet.c:828
+#: ../src/applet.c:915
 #, c-format
 msgid ""
 "\n"
@@ -688,7 +752,7 @@ msgstr ""
 "\n"
 "VPN-yhteys â??%sâ?? epäonnistui virheellisten VPN-salaisuuksien takia."
 
-#: ../src/applet.c:835
+#: ../src/applet.c:922
 #, c-format
 msgid ""
 "\n"
@@ -697,7 +761,7 @@ msgstr ""
 "\n"
 "VPN-yhteys â??%sâ?? epäonnistui."
 
-#: ../src/applet.c:853
+#: ../src/applet.c:940
 #, c-format
 msgid ""
 "\n"
@@ -707,7 +771,7 @@ msgstr ""
 "\n"
 "VPN-yhteys â??%sâ?? katkesi, koska verkkoyhteys katkaistiin."
 
-#: ../src/applet.c:856
+#: ../src/applet.c:943
 #, c-format
 msgid ""
 "\n"
@@ -716,7 +780,7 @@ msgstr ""
 "\n"
 "VPN-yhteys â??%sâ?? katkesi, koska VPN-palvelu pysäytettiin."
 
-#: ../src/applet.c:862
+#: ../src/applet.c:949
 #, c-format
 msgid ""
 "\n"
@@ -725,15 +789,15 @@ msgstr ""
 "\n"
 "VPN-yhteys â??%sâ?? katkesi."
 
-#: ../src/applet.c:893
+#: ../src/applet.c:983
 msgid "VPN Login Message"
 msgstr "VPN-yhteyden kirjautumisviesti"
 
-#: ../src/applet.c:905 ../src/applet.c:913 ../src/applet.c:960
+#: ../src/applet.c:989 ../src/applet.c:997 ../src/applet.c:1047
 msgid "VPN Connection Failed"
 msgstr "VPN-yhteys epäonnistui"
 
-#: ../src/applet.c:967
+#: ../src/applet.c:1054
 #, c-format
 msgid ""
 "\n"
@@ -746,7 +810,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:970
+#: ../src/applet.c:1057
 #, c-format
 msgid ""
 "\n"
@@ -759,359 +823,278 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1314
+#: ../src/applet.c:1377
 msgid "device not ready (firmware missing)"
 msgstr "laite ei ole valmiina"
 
-#: ../src/applet.c:1316
+#: ../src/applet.c:1379
 msgid "device not ready"
 msgstr "laite ei valmis"
 
-#: ../src/applet.c:1342
+#: ../src/applet.c:1405
 msgid "Disconnect"
 msgstr "Katkaise yhteys"
 
-#: ../src/applet.c:1356
+#: ../src/applet.c:1419
 msgid "device not managed"
 msgstr "laitetta ei hallita"
 
-#: ../src/applet.c:1402
+#: ../src/applet.c:1463
 msgid "No network devices available"
 msgstr "Verkkolaitteita ei löytynyt"
 
-#: ../src/applet.c:1490
+#: ../src/applet.c:1551
 msgid "_VPN Connections"
 msgstr "_VPN-yhteydet"
 
-#: ../src/applet.c:1543
+#: ../src/applet.c:1608
 msgid "_Configure VPN..."
 msgstr "_Määrittele VPN-yhteys..."
 
-#: ../src/applet.c:1547
+#: ../src/applet.c:1612
 msgid "_Disconnect VPN"
 msgstr "_Katkaise VPN-yhteys"
 
-#: ../src/applet.c:1634
+#: ../src/applet.c:1710
 msgid "NetworkManager is not running..."
 msgstr "Verkon hallinta ei ole käytössä..."
 
-#: ../src/applet.c:1639 ../src/applet.c:2560
+#: ../src/applet.c:1715 ../src/applet.c:2508
 msgid "Networking disabled"
 msgstr "Verkko ei ole käytössä"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1868
+#: ../src/applet.c:1936
 msgid "Enable _Networking"
 msgstr "Ota _verkko käyttöön"
 
 #. 'Enable Wireless' item
-#: ../src/applet.c:1877
+#: ../src/applet.c:1945
 msgid "Enable _Wireless"
 msgstr "Ota _langaton käyttöön"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1886
+#: ../src/applet.c:1954
 msgid "Enable _Mobile Broadband"
 msgstr "Ota _mobiililaajakaista käyttöön"
 
+#. 'Enable WiMAX Mobile Broadband' item
+#: ../src/applet.c:1963
+#, fuzzy
+msgid "Enable WiMA_X Mobile Broadband"
+msgstr "Ota _mobiililaajakaista käyttöön"
+
 #. Toggle notifications item
-#: ../src/applet.c:1897
+#: ../src/applet.c:1974
 msgid "Enable N_otifications"
 msgstr "Ota ilm_oitukset käyttöön"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1908
+#: ../src/applet.c:1985
 msgid "Connection _Information"
 msgstr "Tietoja _yhteydestä"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1918
+#: ../src/applet.c:1995
 msgid "Edit Connections..."
 msgstr "Muokkaa yhteyksiä..."
 
 #. Help item
-#: ../src/applet.c:1932
+#: ../src/applet.c:2009
 msgid "_Help"
 msgstr "O_hje"
 
 #. About item
-#: ../src/applet.c:1941
+#: ../src/applet.c:2018
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../src/applet.c:2046 ../src/applet.c:2141
-msgid "Network"
-msgstr "Verkko"
-
-#: ../src/applet.c:2049
-msgid "Disconnected - you are now offline"
-msgstr "Yhteys katkaistu - olet nyt yhteydettömässä tilassa"
-
-#: ../src/applet.c:2051
+#: ../src/applet.c:2195
 msgid "Disconnected"
 msgstr "Yhteys katkaistu"
 
-#: ../src/applet.c:2132
-msgid "Wireless network"
-msgstr "Langaton verkko"
-
-#: ../src/applet.c:2138
-msgid "GSM network"
-msgstr "GSM-verkko"
+#: ../src/applet.c:2196
+#, fuzzy
+msgid "The network connection has been disconnected."
+msgstr ""
+"\n"
+"VPN-yhteys â??%sâ?? katkesi."
 
-#: ../src/applet.c:2425
+#: ../src/applet.c:2377
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Valmistellaan verkkoyhteyttä  â??%sâ??..."
 
-#: ../src/applet.c:2428
+#: ../src/applet.c:2380
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Käyttäjätunnistautuminen vaaditaan verkkoyhteydelle â??%sâ??..."
 
-#: ../src/applet.c:2434
+#: ../src/applet.c:2386
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Verkkoyhteys â??%sâ?? on aktiivinen"
 
-#: ../src/applet.c:2517
+#: ../src/applet.c:2464
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Käynnistetään VPN-yhteyttä â??%sâ??..."
 
-#: ../src/applet.c:2520
+#: ../src/applet.c:2467
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Käyttäjätunnistautuminen vaaditaan VPN-yhteydelle â??%sâ??..."
 
-#: ../src/applet.c:2523
+#: ../src/applet.c:2470
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Pyydetään VPN-osoitetta yhteydelle â??%sâ??..."
 
-#: ../src/applet.c:2526
+#: ../src/applet.c:2473
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-yhteys â??%sâ?? on aktiivinen"
 
-#: ../src/applet.c:2564
+#: ../src/applet.c:2512
 msgid "No network connection"
 msgstr "Ei verkkoyhteyttä"
 
-#: ../src/applet.c:3126
+#: ../src/applet.c:3161
 msgid "NetworkManager Applet"
 msgstr "Verkon hallinta -sovelma"
 
-#: ../src/applet.c:3132 ../src/wired-dialog.c:128
-msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
-msgstr ""
-"Verkon hallinta -sovelma ei voinut ladata jotain vaadituista resursseista "
-"(glade-tiedostoa ei löytynyt)."
-
-#: ../src/applet.glade.h:1 ../src/connection-editor/ce-vpn-wizard.glade.h:1
-msgid " "
-msgstr " "
-
-#: ../src/applet.glade.h:2
-msgid ""
-"1 (Default)\n"
-"2\n"
-"3\n"
-"4"
-msgstr ""
-"1 (oletus)\n"
-"2\n"
-"3\n"
-"4"
-
-#: ../src/applet.glade.h:6
-msgid ""
-"<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
-msgstr ""
-"<span size=\"larger\" weight=\"bold\">Aktiiviset verkkoyhteydet</span>"
-
-#: ../src/applet.glade.h:7
-msgid "Anony_mous identity:"
-msgstr "Anonyy_mi identiteetti:"
-
-#: ../src/applet.glade.h:8
-msgid "As_k for this password every time"
-msgstr "_Kysy tätä salasanaa jokaisella kerralla"
+#: ../src/gsm-unlock.ui.h:1
+msgid "_Unlock"
+msgstr "Avaa l_ukitus"
 
-#: ../src/applet.glade.h:9
-msgid ""
-"Automatic\n"
-"Version 0\n"
-"Version 1"
-msgstr ""
-"Automaattinen\n"
-"Versio 0\n"
-"Versio 1"
+#: ../src/info.ui.h:1
+msgid "Active Network Connections"
+msgstr "Aktiiviset verkkoyhteydet"
 
-#: ../src/applet.glade.h:12
-msgid "C_A certificate:"
-msgstr "C_A-varmenne"
+#: ../src/info.ui.h:2
+msgid "Connection Information"
+msgstr "Tietoja yhteydestä"
 
-#: ../src/applet.glade.h:13
-msgid "C_onnect"
-msgstr "_Yhdistä"
+#: ../src/wifi.ui.h:1 ../src/connection-editor/ce-vpn-wizard.ui.h:1
+#: ../src/wireless-security/eap-method-peap.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:1
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../src/wireless-security/ws-wpa-eap.ui.h:1
+msgid " "
+msgstr " "
 
-#: ../src/applet.glade.h:14
+#: ../src/wifi.ui.h:2
 msgid "Co_nnection:"
 msgstr "Yh_teys:"
 
-#: ../src/applet.glade.h:15
-msgid "Connection Information"
-msgstr "Tietoja yhteydestä"
+#: ../src/wifi.ui.h:3
+msgid "Wireless _adapter:"
+msgstr "Langaton verkkol_aite:"
 
-#: ../src/applet.glade.h:16
-msgid "Don't _warn me again"
-msgstr "_�lä varoita uudelleen"
+#: ../src/wifi.ui.h:4 ../src/wired-8021x.ui.h:2
+msgid "_Network name:"
+msgstr "_Verkon nimi:"
 
-#: ../src/applet.glade.h:17
-msgid "I_dentity:"
-msgstr "I_dentiteetti:"
+#: ../src/wifi.ui.h:5
+msgid "_Wireless security:"
+msgstr "_Langaton tietoturva:"
 
-#: ../src/applet.glade.h:18
-msgid "I_nner authentication:"
-msgstr "Sisempi tu_nnistautuminen:"
+#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
+msgid "Wired 802.1X authentication"
+msgstr "Langallisen 802.1x-yhteyden todentaminen"
 
-#: ../src/applet.glade.h:19
-msgid "No"
-msgstr "Ei"
+#: ../src/connection-editor/ce-page.c:67
+msgid "automatic"
+msgstr "automaattinen"
+
+#: ../src/connection-editor/ce-page.c:294
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr ""
+"Yhteyden salaisuuksien päivittäminen epäonnistui tuntemattoman syyn takia."
 
-#: ../src/applet.glade.h:20
+#: ../src/connection-editor/ce-ip4-routes.ui.h:1
+#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:5
 msgid ""
-"Open System\n"
-"Shared Key"
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"Avoin järjestelmä\n"
-"Jaettu avain"
+"IP-osoite on tietokoneen tunniste verkossa. Napsauta â??Lisääâ??-painiketta "
+"lisätäksesi IP-osoitteen."
 
-#: ../src/applet.glade.h:22
-msgid "Other Wireless Network..."
-msgstr "Muu langaton verkko..."
+#: ../src/connection-editor/ce-ip4-routes.ui.h:2
+#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr "Jos käytössä, tätä yhteyttä ei koskaan käytetä oletusverkkoyhteytenä."
 
-#: ../src/applet.glade.h:23
-msgid "Private _key:"
-msgstr "Y_ksityinen avain:"
+#: ../src/connection-editor/ce-ip4-routes.ui.h:3
+#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+msgid "Ig_nore automatically obtained routes"
+msgstr "Jätä huomiotta automaattisesti vastaa_notetut reitit"
 
-#: ../src/applet.glade.h:24
-msgid "Sho_w key"
-msgstr "Nä_ytä avain"
+#: ../src/connection-editor/ce-ip4-routes.ui.h:4
+#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+msgid "Use this c_onnection only for resources on its network"
+msgstr "Käytä tätä yhteyttä vain sen verk_ossa oleviin resursseihin"
 
-#: ../src/applet.glade.h:25 ../src/connection-editor/ce-page-dsl.glade.h:1
+#: ../src/connection-editor/ce-page-dsl.ui.h:1
+#: ../src/wireless-security/eap-method-leap.ui.h:1
+#: ../src/wireless-security/eap-method-simple.ui.h:2
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/ws-leap.ui.h:1
+#: ../src/wireless-security/ws-wpa-psk.ui.h:1
 msgid "Sho_w password"
 msgstr "Näytä _salasana"
 
-#: ../src/applet.glade.h:26
-msgid "Show it"
-msgstr "Näytä"
-
-#: ../src/applet.glade.h:27
-msgid "WEP inde_x:"
-msgstr "WEP-inde_ksi"
-
-#: ../src/applet.glade.h:28
-msgid "Wireless _adapter:"
-msgstr "Langaton verkkol_aite:"
-
-#: ../src/applet.glade.h:29
-msgid "Yes"
-msgstr "Kyllä"
-
-#: ../src/applet.glade.h:30
-msgid "_Authentication:"
-msgstr "_Todentaminen:"
-
-#: ../src/applet.glade.h:31
-msgid "_Key:"
-msgstr "_Avain:"
-
-#: ../src/applet.glade.h:32
-msgid "_Network name:"
-msgstr "_Verkon nimi:"
-
-#: ../src/applet.glade.h:33
-msgid "_PEAP version:"
-msgstr "_PEAP-versio:"
-
-#: ../src/applet.glade.h:34 ../src/connection-editor/ce-page-dsl.glade.h:2
-#: ../src/connection-editor/ce-page-mobile.glade.h:15
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/wireless-security/eap-method-leap.ui.h:2
+#: ../src/wireless-security/eap-method-simple.ui.h:3
+#: ../src/wireless-security/ws-leap.ui.h:2
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../src/applet.glade.h:35
-msgid "_Private key password:"
-msgstr "_Yksityisen avaimen salasana:"
-
-#: ../src/applet.glade.h:36 ../src/connection-editor/ce-page-mobile.glade.h:16
-msgid "_Type:"
-msgstr "_Tyyppi:"
-
-#: ../src/applet.glade.h:37
-msgid "_Unlock"
-msgstr "Avaa l_ukitus"
-
-#: ../src/applet.glade.h:38
-msgid "_User certificate:"
-msgstr "_Käyttäjän varmenne:"
+#: ../src/connection-editor/ce-page-dsl.ui.h:3
+msgid "_Service:"
+msgstr "_Palvelu:"
 
-#: ../src/applet.glade.h:39 ../src/connection-editor/ce-page-dsl.glade.h:4
-#: ../src/connection-editor/ce-page-mobile.glade.h:17
+#: ../src/connection-editor/ce-page-dsl.ui.h:4
+#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/wireless-security/eap-method-leap.ui.h:3
+#: ../src/wireless-security/eap-method-simple.ui.h:4
+#: ../src/wireless-security/ws-leap.ui.h:3
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: ../src/applet.glade.h:40
-msgid "_Wireless security:"
-msgstr "_Langaton tietoturva:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:1
+#: ../src/connection-editor/ce-page-ip6.ui.h:1
+msgid "Addresses"
+msgstr "Osoitteet"
 
-#: ../src/applet.glade.h:41
-msgid "label"
-msgstr "nimike"
-
-#: ../src/connection-editor/ce-page.c:69
-msgid "automatic"
-msgstr "automaattinen"
-
-#: ../src/connection-editor/ce-page.c:222
-#: ../src/connection-editor/nm-connection-editor.c:616
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr ""
-"Yhteyden salaisuuksien päivittäminen epäonnistui tuntemattoman syyn takia."
-
-#: ../src/connection-editor/ce-page-dsl.glade.h:3
-msgid "_Service:"
-msgstr "_Palvelu:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+#: ../src/connection-editor/ce-page-wired.ui.h:7
+#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/page-ip6.c:136
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Automatic"
+msgstr "Automaattinen"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:1
-#: ../src/connection-editor/ce-page-ip6.glade.h:1
-msgid "<b>Addresses</b>"
-msgstr "<b>Osoitteet</b>"
+#: ../src/connection-editor/ce-page-ip4.ui.h:3
+#: ../src/connection-editor/ce-page-ip6.ui.h:3
+msgid "Automatic with manual DNS settings"
+msgstr "Automaattinen omavalintaisilla DNS-asetuksilla"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:2
-#: ../src/connection-editor/ce-page-ip6.glade.h:2
-msgid ""
-"Automatic\n"
-"Automatic with manual DNS settings\n"
-"Manual\n"
-"Link-Local\n"
-"Shared to other computers"
-msgstr ""
-"Automaattinen\n"
-"Automaattinen omilla DNS-asetuksilla\n"
-"Manuaalinen\n"
-"Vain linkkitaso\n"
-"Jaettu muille tietokoneille"
-
-#: ../src/connection-editor/ce-page-ip4.glade.h:7
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
 msgid "D_HCP client ID:"
 msgstr "D_HCP-asiakastunniste:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:8
-#: ../src/connection-editor/ce-page-ip6.glade.h:7
+#: ../src/connection-editor/ce-page-ip4.ui.h:5
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1119,17 +1102,8 @@ msgstr ""
 "Verkko-osoitetta käytetään verkkonimiä määritettäessä. Käytä pilkkuja "
 "useampien verkko-osoitteiden erittelemiseen."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:9
-#: ../src/connection-editor/ce-page-ip6.glade.h:8
-msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
-msgstr ""
-"IP-osoite on tietokoneen tunniste verkossa. Napsauta â??Lisääâ??-painiketta "
-"lisätäksesi IP-osoitteen."
-
-#: ../src/connection-editor/ce-page-ip4.glade.h:10
-#: ../src/connection-editor/ce-page-ip6.glade.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1138,24 +1112,30 @@ msgstr ""
 "määrittämiseen. Käytä pilkkuja eritelläksesi useiden nimipalvelinten "
 "osoitteita."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:11
-#: ../src/connection-editor/ce-page-ip6.glade.h:10
-msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+#: ../src/connection-editor/ce-page-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Link-Local"
 msgstr ""
-"Jos käytössä, tätä yhteyttä ei koskaan käytetä oletusverkkoyhteytenä."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:12
-#: ../src/connection-editor/ce-page-ip6.glade.h:11
-msgid "Ig_nore automatically obtained routes"
-msgstr "Jätä huomiotta automaattisesti vastaa_notetut reitit"
+#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: ../src/connection-editor/page-ip4.c:163
+#: ../src/connection-editor/page-ip6.c:185
+msgid "Manual"
+msgstr "Manuaalinen"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:10
 msgid "Require IPv4 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/page-ip4.c:181
+#: ../src/connection-editor/page-ip6.c:205
+msgid "Shared to other computers"
+msgstr "Jaettu muille tietokoneille"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1165,522 +1145,517 @@ msgstr ""
 "tietokoneesi laiteasetuksia. Jos haluat käyttää DHCP:n asiakasohjelman "
 "tunnistetta, syötä se tähän."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:15
-#: ../src/connection-editor/ce-page-ip6.glade.h:13
-msgid "Use this c_onnection only for resources on its network"
-msgstr "Käytä tätä yhteyttä vain sen verk_ossa oleviin resursseihin"
-
-#: ../src/connection-editor/ce-page-ip4.glade.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:17
-#: ../src/connection-editor/ce-page-ip6.glade.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:12
 msgid "_DNS servers:"
 msgstr "_DNS-palvelimet:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:18
-#: ../src/connection-editor/ce-page-ip6.glade.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:13
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:19
-#: ../src/connection-editor/ce-page-ip6.glade.h:17
-msgid "_Routes&#x2026;"
-msgstr "_Reitit&#x2026;"
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid "_Routesâ?¦"
+msgstr "_Reititâ?¦"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:20
-#: ../src/connection-editor/ce-page-ip6.glade.h:18
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
 msgid "_Search domains:"
 msgstr "_Etsittävät toimialueet:"
 
-#: ../src/connection-editor/ce-page-ip6.glade.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "Require IPv6 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.glade.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>Lisäasetukset</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:1
+msgid "2G (GPRS/EDGE)"
+msgstr "2G (GPRS/EDGE)"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:2
-msgid "<b>Basic</b>"
-msgstr "<b>Perusasetukset</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
+msgid "3G (UMTS/HSPA)"
+msgstr "3G (UMTS/HSPA)"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:3
+#: ../src/connection-editor/ce-page-mobile.ui.h:3
+msgid "Advanced"
+msgstr "Lisäasetukset"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:4
 msgid "Allow roaming if home network is not available"
 msgstr "Salli verkkovierailu (roaming) jos kotiverkkoa ei ole saatavilla"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:4
-msgid ""
-"Any\n"
-"3G (UMTS/HSPA)\n"
-"2G (GPRS/EDGE)\n"
-"Prefer 3G (UMTS/HSPA)\n"
-"Prefer 2G (GPRS/EDGE)"
-msgstr ""
-"Mikä tahansa\n"
-"3G (UMTS/HSPA)\n"
-"2G (GPRS/EDGE)\n"
-"Mieluummin 3G (UMTS/HSPA)\n"
-"Mieluummin 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.glade.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+msgid "Any"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "Basic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "Change..."
 msgstr "Muuta..."
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "N_etwork ID:"
 msgstr "V_erkon tunniste:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "Nu_mber:"
 msgstr "Nu_mero:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "PI_N:"
 msgstr "PI_N:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+msgid "Prefer 2G (GPRS/EDGE)"
+msgstr "Ensisijaisesti 2G (GPRS/EDGE)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:12
+msgid "Prefer 3G (UMTS/HSPA)"
+msgstr "Ensisijaisesti 3G (UMTS/HSPA)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:13
 msgid "Sho_w passwords"
 msgstr "Näy_tä salasanat"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:14
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:1
-msgid "<b>Allowed Authentication Methods</b>"
-msgstr "<b>Sallitut todentamistavat</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:2
-msgid "<b>Authentication</b>"
-msgstr "<b>Todentaminen</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:3
-msgid "<b>Compression</b>"
-msgstr "<b>Pakkaus</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:4
-msgid "<b>Echo</b>"
-msgstr "<b>Kaiutus</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:5
-msgid ""
-"<i>In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods.</i>"
-msgstr ""
-"<i>Useimmissa tapauksissa palveluntarjoajan PPP-palvelimet tukevat kaikkia "
-"todentamistapoja. Jos yhteys epäonnistuu, kokeile poistaa joidenkin tapojen "
-"tuki pois käytöstä.</i>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+msgid "_Type:"
+msgstr "_Tyyppi:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:6
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
 msgid "Allow _BSD data compression"
 msgstr "Salli _BSD-datanpakkaus"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:7
+#: ../src/connection-editor/ce-page-ppp.ui.h:2
 msgid "Allow _Deflate data compression"
 msgstr "Salli _Deflate-datanpakkaus"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:8
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
 msgid "Allowed methods:"
 msgstr "Sallitut tavat"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:9
-msgid "C_HAP"
-msgstr "C_HAP"
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
+msgid "Authentication"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:10
-msgid "Challenge Handshake Authentication Protocol"
-msgstr "Challenge Handshake Authentication -yhteyskäytäntö"
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "Compression"
+msgstr "Pakkaus"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:11
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
 msgid "Configure _Methodsâ?¦"
 msgstr "Muuta _menetelmien asetuksiaâ?¦"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:12
-msgid "Extensible Authentication Protocol"
-msgstr "Extensible Authentication -yhteyskäytäntö"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:13
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:14
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "Microsoft Challenge Handshake Authentication -yhteyskäytäntö"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:15
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
+msgid "Echo"
 msgstr ""
-"Microsoft Challenge Handshake Authentication -yhteyskäytäntö versio 2"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:16
-msgid "Password Authentication Protocol"
-msgstr "Password Authentication -yhteyskäytäntö"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:17
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
 msgid "Send PPP _echo packets"
 msgstr "Lähetä PPP-kaiutuspak_etteja"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:18
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
 msgid "Use TCP _header compression"
 msgstr "Käytä TCP-otsa_kkeiden pakkausta"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:19
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
 msgid "Use _stateful MPPE"
 msgstr "Käytä tilalli_sta MPPE:tä"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:20
-msgid "_EAP"
-msgstr "_EAP"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:21
-msgid "_MSCHAP"
-msgstr "_MSCHAP"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:22
-msgid "_PAP"
-msgstr "_PAP"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:23
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
 msgid "_Require 128-bit encryption"
 msgstr "_Vaadi 128-bittinen salaus"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:24
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Käytä point-to-point-salausta (MPPE)"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:1
+#: ../src/connection-editor/ce-page-wired.ui.h:1
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:2
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:3
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:4
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:5
+msgid "Attachment Unit Interface (AUI)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wired.ui.h:6
 msgid "Aut_onegotiate"
 msgstr "Neuv_ottele automaattisesti"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:2
-msgid ""
-"Automatic\n"
-"10 Mb/s\n"
-"100 Mb/s\n"
-"1 Gb/s\n"
-"10 Gb/s"
-msgstr ""
-"Automaattinen\n"
-"10 Mb/s\n"
-"100 Mb/s\n"
-"1 Gb/s\n"
-"10 Gb/s"
-
-#: ../src/connection-editor/ce-page-wired.glade.h:7
-msgid ""
-"Automatic\n"
-"Twisted Pair (TP)\n"
-"Attachment Unit Interface (AUI)\n"
-"BNC\n"
-"Media Independent Interface (MII)"
-msgstr ""
-"Automaattinen\n"
-"Parikaapeli (TP)\n"
-"Attachment Unit Interface (AUI)\n"
-"BNC\n"
-"Media Independent Interface (MII)"
-
-#: ../src/connection-editor/ce-page-wired.glade.h:12
+#: ../src/connection-editor/ce-page-wired.ui.h:8
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:9
 msgid "Full duple_x"
 msgstr "Kaksisuuntainen duple_ksi"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:13
-#: ../src/connection-editor/ce-page-wireless.glade.h:8
+#: ../src/connection-editor/ce-page-wired.ui.h:10
+#: ../src/connection-editor/ce-page-wireless.ui.h:8
 msgid "MT_U:"
 msgstr "MT_U:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:14
-#: ../src/connection-editor/ce-page-wireless.glade.h:11
+#: ../src/connection-editor/ce-page-wired.ui.h:11
+msgid "Media Independent Interface (MII)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wired.ui.h:12
+#: ../src/connection-editor/ce-page-wireless.ui.h:11
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
 "network device this connection is activated on.  This feature is known as "
 "MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
 msgstr ""
+"Tähän annettavaa MAC-osoitetta käytetään sen verkkolaitteen laiteosoitteena, "
+"jolla tämä yhteys muodostetaan. Toiminto tunnetaan termeillä \"MAC cloning\" "
+"ja \"MAC spoofing\". Esimerkki: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:15
-#: ../src/connection-editor/ce-page-wireless.glade.h:12
+#: ../src/connection-editor/ce-page-wired.ui.h:13
+#: ../src/connection-editor/ce-page-wireless.ui.h:12
 msgid ""
 "This option locks this connection to the network device specified by its "
 "permanent MAC address entered here.  Example: 00:11:22:33:44:55"
 msgstr ""
+"Tämä valinta lukitsee yhteyden verkkolaitteeseen, jonka pysyvä MAC-osoite "
+"annetaan tähän muodossa 00:11:22:33:44:55"
+
+#: ../src/connection-editor/ce-page-wired.ui.h:14
+msgid "Twisted Pair (TP)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.glade.h:16
-#: ../src/connection-editor/ce-page-wireless.glade.h:16
+#: ../src/connection-editor/ce-page-wired.ui.h:15
+#: ../src/connection-editor/ce-page-wireless.ui.h:16
 msgid "_Cloned MAC address:"
 msgstr "_Kopioitu MAC-osoite:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:17
-#: ../src/connection-editor/ce-page-wireless.glade.h:17
+#: ../src/connection-editor/ce-page-wired.ui.h:16
+#: ../src/connection-editor/ce-page-wireless.ui.h:17
 msgid "_Device MAC address:"
 msgstr "_Laitteen MAC-osoite:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:18
+#: ../src/connection-editor/ce-page-wired.ui.h:17
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:19
+#: ../src/connection-editor/ce-page-wired.ui.h:18
 msgid "_Speed:"
 msgstr "Nopeu_s:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:20
-#: ../src/connection-editor/ce-page-wireless.glade.h:20
+#: ../src/connection-editor/ce-page-wired.ui.h:19
+#: ../src/connection-editor/ce-page-wireless.ui.h:20
 msgid "bytes"
 msgstr "tavua"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:1
-msgid ""
-"Automatic\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
-msgstr ""
-"Automaattinen\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
+#: ../src/connection-editor/ce-page-wireless.ui.h:1
+msgid "A (5 GHz)"
+msgstr "A (5 GHz)"
+
+#: ../src/connection-editor/ce-page-wireless.ui.h:2
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:4
+#: ../src/connection-editor/ce-page-wireless.ui.h:4
+msgid "B/G (2.4 GHz)"
+msgstr "B/G (2.4 GHz)"
+
+#: ../src/connection-editor/ce-page-wireless.ui.h:5
 msgid "Ban_d:"
 msgstr "Taajuus_alue"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:5
+#: ../src/connection-editor/ce-page-wireless.ui.h:6
 msgid "C_hannel:"
 msgstr "_Kanava"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:6
-msgid ""
-"Infrastructure\n"
-"Ad-hoc"
+#: ../src/connection-editor/ce-page-wireless.ui.h:7
+msgid "Infrastructure"
 msgstr ""
-"Infrastruktuuri\n"
-"Adhoc"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:9
+#: ../src/connection-editor/ce-page-wireless.ui.h:9
 msgid "M_ode:"
 msgstr "M_enetelmä:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:10
+#: ../src/connection-editor/ce-page-wireless.ui.h:10
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:13
+#: ../src/connection-editor/ce-page-wireless.ui.h:13
 msgid ""
 "This option locks this connection to the wireless access point (AP) "
 "specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
 msgstr ""
+"Tämä valinta lukitsee yhteyden langattomaan tukiasemaan (AP), jonka BSSID-"
+"tunniste annetaan tähän muodossa 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:14
+#: ../src/connection-editor/ce-page-wireless.ui.h:14
 msgid "Transmission po_wer:"
 msgstr "Lähetyste_ho:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:15
+#: ../src/connection-editor/ce-page-wireless.ui.h:15
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:18
+#: ../src/connection-editor/ce-page-wireless.ui.h:18
 msgid "_Rate:"
 msgstr "_Nopeus:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:19
+#: ../src/connection-editor/ce-page-wireless.ui.h:19
 msgid "_SSID:"
 msgstr "_SSID:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:21
+#: ../src/connection-editor/ce-page-wireless.ui.h:21
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless-security.glade.h:1
+#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
 msgid "_Security:"
 msgstr "Turvallisuu_s:"
 
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+msgid "Allowed Authentication Methods"
+msgstr "Sallitut todennustavat"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "C_HAP"
+msgstr "C_HAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "Challenge Handshake Authentication -yhteyskäytäntö"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "Extensible Authentication Protocol"
+msgstr "Extensible Authentication -yhteyskäytäntö"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Choose a VPN Connection Type</span>\n"
-"\n"
-"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."
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Valitse VPN-yhteyden tyyppi</span>\n"
-"\n"
-"Valitse uudessa yhteydessä käytettävän VPN-yhteyden tyyppi. Jos luettelo ei "
-"sisällä haluamaasi VPN-yhteyden tyyppiä, voi olla että et ole asentanut "
-"tarvittavaa VPN-liitännäistä."
+"Yleensä palveluntarjoajan PPP-palvelimet tukevat kaikkia "
+"tunnistautumistapoja. Jos yhteys kuitenkin epäonnistuu, poista käytöstä "
+"joitain tunnistautumistapoja."
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Microsoft Challenge Handshake Authentication -yhteyskäytäntö"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "Microsoft Challenge Handshake Authentication -yhteyskäytäntö versio 2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Password Authentication Protocol"
+msgstr "Password Authentication -yhteyskäytäntö"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_EAP"
+msgstr "_EAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "_MSCHAP"
+msgstr "_MSCHAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "_PAP"
+msgstr "_PAP"
+
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
+msgid "Choose a VPN Connection Type"
+msgstr "Valitse VPN-yhteyden tyyppi"
+
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
 msgid "Createâ?¦"
 msgstr "Luoâ?¦"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:501
-#: ../src/connection-editor/ip6-routes-dialog.c:459
-#: ../src/connection-editor/page-ip4.c:738
-#: ../src/connection-editor/page-ip6.c:723
+#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
+msgid ""
+"Select the type of VPN you wish to use for the new connection.  If the type "
+"of VPN connection you wish to create does not appear in the list, you may "
+"not have the correct VPN plugin installed."
+msgstr ""
+"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/ip4-routes-dialog.c:505
+#: ../src/connection-editor/ip6-routes-dialog.c:463
+#: ../src/connection-editor/page-ip4.c:733
+#: ../src/connection-editor/page-ip6.c:718
 msgid "Address"
 msgstr "Osoite"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:517
-#: ../src/connection-editor/page-ip4.c:755
+#: ../src/connection-editor/ip4-routes-dialog.c:521
+#: ../src/connection-editor/page-ip4.c:750
 msgid "Netmask"
 msgstr "Verkkopeite"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:533
-#: ../src/connection-editor/ip6-routes-dialog.c:491
-#: ../src/connection-editor/page-ip4.c:772
-#: ../src/connection-editor/page-ip6.c:757
+#: ../src/connection-editor/ip4-routes-dialog.c:537
+#: ../src/connection-editor/ip6-routes-dialog.c:495
+#: ../src/connection-editor/page-ip4.c:767
+#: ../src/connection-editor/page-ip6.c:752
 msgid "Gateway"
 msgstr "Yhdyskäytävä"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:549
-#: ../src/connection-editor/ip6-routes-dialog.c:507
+#: ../src/connection-editor/ip4-routes-dialog.c:553
+#: ../src/connection-editor/ip6-routes-dialog.c:511
 msgid "Metric"
 msgstr "Metric"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:475
-#: ../src/connection-editor/page-ip6.c:740
+#: ../src/connection-editor/ip6-routes-dialog.c:479
+#: ../src/connection-editor/page-ip6.c:735
 msgid "Prefix"
 msgstr "Etuliite"
 
-#: ../src/connection-editor/page-dsl.c:140
-#: ../src/connection-editor/page-dsl.c:147
-msgid "Could not load DSL user interface."
-msgstr "Käyttöliittymää DSL:lle ei voitu ladata."
-
-#: ../src/connection-editor/page-dsl.c:153
-#: ../src/connection-editor/nm-connection-editor.glade.h:4
-#: ../src/connection-editor/nm-connection-list.c:1407
+#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#: ../src/connection-editor/nm-connection-list.c:1448
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/page-dsl.c:241
+#: ../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:229
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-yhteys %d"
 
-#: ../src/connection-editor/page-ip4.c:126
-#: ../src/connection-editor/page-ip6.c:125
+#: ../src/connection-editor/page-ip4.c:127
+#: ../src/connection-editor/page-ip6.c:126
 msgid "Automatic (VPN)"
 msgstr "Automaattinen (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:126
+#: ../src/connection-editor/page-ip4.c:128
+#: ../src/connection-editor/page-ip6.c:127
 msgid "Automatic (VPN) addresses only"
 msgstr "Vain automaattiset osoitteet (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:129
+#: ../src/connection-editor/page-ip4.c:131
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (PPP)"
 msgstr "Automaattinen (PPP)"
 
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:130
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:131
 msgid "Automatic (PPP) addresses only"
 msgstr "Vain automaattiset osoitteet (PPP)"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:134
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE)"
 msgstr "Automaattinen (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:135
+#: ../src/connection-editor/page-ip6.c:134
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Vain automaattiset osoitteet (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
+#: ../src/connection-editor/page-ip4.c:137
 msgid "Automatic (DHCP)"
 msgstr "Automaattinen (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:138
 msgid "Automatic (DHCP) addresses only"
 msgstr "Vain automaattiset osoitteet (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:162
-#: ../src/connection-editor/page-ip6.c:184
-msgid "Manual"
-msgstr "Manuaalinen"
-
-#: ../src/connection-editor/page-ip4.c:174
-#: ../src/connection-editor/page-ip6.c:197
+#: ../src/connection-editor/page-ip4.c:175
+#: ../src/connection-editor/page-ip6.c:198
 msgid "Link-Local Only"
 msgstr "Vain linkkiyhteys"
 
-#: ../src/connection-editor/page-ip4.c:180
-#: ../src/connection-editor/page-ip6.c:204
-msgid "Shared to other computers"
-msgstr "Jaettu muille tietokoneille"
-
-#: ../src/connection-editor/page-ip4.c:190
+#: ../src/connection-editor/page-ip4.c:191
 msgid "Disabled"
 msgstr "Pois käytöstä"
 
-#: ../src/connection-editor/page-ip4.c:700
+#: ../src/connection-editor/page-ip4.c:699
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Muokataan yhteyden %s IPv4-reittejä"
 
-#: ../src/connection-editor/page-ip4.c:819
-#: ../src/connection-editor/page-ip4.c:826
-msgid "Could not load IPv4 user interface."
-msgstr "Käyttöliittymää IPv4:lle ei voitu ladata."
-
-#: ../src/connection-editor/page-ip4.c:832
+#: ../src/connection-editor/page-ip4.c:810
 msgid "IPv4 Settings"
 msgstr "IPv4-asetukset"
 
-#: ../src/connection-editor/page-ip6.c:135
-msgid "Automatic"
-msgstr "Automaattinen"
+#: ../src/connection-editor/page-ip4.c:812
+msgid "Could not load IPv4 user interface."
+msgstr "Käyttöliittymää IPv4:lle ei voitu ladata."
 
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip6.c:137
 msgid "Automatic, addresses only"
 msgstr "Automaattinen, vain osoitteet"
 
-#: ../src/connection-editor/page-ip6.c:148
-#: ../src/wireless-security/eap-method.c:233
+#: ../src/connection-editor/page-ip6.c:149
+#: ../src/wireless-security/eap-method.c:285
 msgid "Ignore"
 msgstr "Ohita"
 
-#: ../src/connection-editor/page-ip6.c:172
+#: ../src/connection-editor/page-ip6.c:173
 msgid "Automatic, DHCP only"
 msgstr "Automaattinen, vain DHCP"
 
-#: ../src/connection-editor/page-ip6.c:685
+#: ../src/connection-editor/page-ip6.c:684
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Muokataan kohteen %s IPv6-reittejä"
 
-#: ../src/connection-editor/page-ip6.c:802
-#: ../src/connection-editor/page-ip6.c:809
-msgid "Could not load IPv6 user interface."
-msgstr "IPv6-käyttöliittymää ei voi ladata."
-
-#: ../src/connection-editor/page-ip6.c:815
+#: ../src/connection-editor/page-ip6.c:793
 msgid "IPv6 Settings"
 msgstr "IPv6-asetukset"
 
-#: ../src/connection-editor/page-mobile.c:305
-#: ../src/connection-editor/page-mobile.c:312
+#: ../src/connection-editor/page-ip6.c:795
+msgid "Could not load IPv6 user interface."
+msgstr "IPv6-käyttöliittymää ei voi ladata."
+
+#: ../src/connection-editor/page-mobile.c:374
 msgid "Could not load mobile broadband user interface."
 msgstr "Käyttöliittymää mobiililaajakaistalle ei voitu ladata."
 
-#: ../src/connection-editor/page-mobile.c:333
+#: ../src/connection-editor/page-mobile.c:391
 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:574
+#: ../src/connection-editor/page-mobile.c:632
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Valitse mobiililaajakaistan toimittajan tyyppi"
 
-#: ../src/connection-editor/page-mobile.c:601
+#: ../src/connection-editor/page-mobile.c:659
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1688,335 +1663,331 @@ msgstr ""
 "Valitse mobiililaajakaistan toimittajan käyttämä tekniikka. Jos olet "
 "epävarma, kysy toimittajalta (operaattorilta)."
 
-#: ../src/connection-editor/page-mobile.c:606
+#: ../src/connection-editor/page-mobile.c:664
 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:611
-msgid "My provider uses _CDMA-based technology (i.e. 1xRTT, EVDO)"
-msgstr "Toimittaja käyttää _CDMA-pohjaista tekniikkaa (eli 1xRTT, EVDO)"
+#: ../src/connection-editor/page-mobile.c:671
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:132
+#: ../src/connection-editor/page-ppp.c:134
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:228
+#: ../src/connection-editor/page-ppp.c:135
+#: ../src/wireless-security/eap-method-ttls.c:232
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:276
+#: ../src/connection-editor/page-ppp.c:136
+#: ../src/wireless-security/eap-method-ttls.c:280
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-peap.c:245
-#: ../src/wireless-security/eap-method-ttls.c:260
+#: ../src/connection-editor/page-ppp.c:137
+#: ../src/wireless-security/eap-method-peap.c:248
+#: ../src/wireless-security/eap-method-ttls.c:264
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:244
+#: ../src/connection-editor/page-ppp.c:138
+#: ../src/wireless-security/eap-method-ttls.c:248
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:139
+#: ../src/connection-editor/page-ppp.c:141
 msgid "none"
 msgstr "ei mitään"
 
-#: ../src/connection-editor/page-ppp.c:199
+#: ../src/connection-editor/page-ppp.c:201
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Muokataan PPP-todentamistapoja yhteydelle %s"
 
+#: ../src/connection-editor/page-ppp.c:281
+msgid "PPP Settings"
+msgstr "PPP-asetukset"
+
 #: ../src/connection-editor/page-ppp.c:283
-#: ../src/connection-editor/page-ppp.c:290
 msgid "Could not load PPP user interface."
 msgstr "Käyttöliittymää PPP:lle ei voitu ladata."
 
-#: ../src/connection-editor/page-ppp.c:296
-msgid "PPP Settings"
-msgstr "PPP-asetukset"
-
-#: ../src/connection-editor/page-vpn.c:108
-#: ../src/connection-editor/nm-connection-editor.glade.h:8
-#: ../src/connection-editor/nm-connection-list.c:1403
+#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/nm-connection-editor.ui.h:8
+#: ../src/connection-editor/nm-connection-list.c:1444
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/page-vpn.c:119
+#: ../src/connection-editor/page-vpn.c:109
+msgid "Could not load VPN user interface."
+msgstr "VPN-käyttöliittymän lataus epäonnistui"
+
+#: ../src/connection-editor/page-vpn.c:124
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "VPN-liitännäispalvelua ei löydy kohteelle â??%sâ??"
 
-#: ../src/connection-editor/page-vpn.c:213
-#: ../src/connection-editor/nm-connection-list.c:988
+#: ../src/connection-editor/page-vpn.c:218
+#: ../src/connection-editor/nm-connection-list.c:881
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-yhteys %d"
 
+#: ../src/connection-editor/page-wired.c:211
+#: ../src/connection-editor/nm-connection-editor.ui.h:9
+#: ../src/connection-editor/nm-connection-list.c:1432
+msgid "Wired"
+msgstr "Kiinteä"
+
 #: ../src/connection-editor/page-wired.c:213
-#: ../src/connection-editor/page-wired.c:220
 msgid "Could not load wired user interface."
 msgstr "Käyttöliittymää kiinteälle yhteydelle ei voitu ladata."
 
-#: ../src/connection-editor/page-wired.c:226
-#: ../src/connection-editor/nm-connection-editor.glade.h:9
-#: ../src/connection-editor/nm-connection-list.c:1391
-msgid "Wired"
-msgstr "Kiinteä"
-
-#: ../src/connection-editor/page-wired.c:359
+#: ../src/connection-editor/page-wired.c:348
 #, c-format
 msgid "Wired connection %d"
 msgstr "Kiinteä yhteys %d"
 
-#: ../src/connection-editor/page-wired-security.c:115
+#: ../src/connection-editor/page-wired-security.c:114
 msgid "802.1x Security"
 msgstr "802.1x-suojaus"
 
-#: ../src/connection-editor/page-wired-security.c:123
+#: ../src/connection-editor/page-wired-security.c:116
+msgid "Could not load Wired Security security user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-wired-security.c:130
 msgid "Use 802.1X security for this connection"
 msgstr "Käytä tällä yhteydellä 802.1x-suojausta"
 
-#: ../src/connection-editor/page-wireless.c:146
-#: ../src/connection-editor/page-wireless.c:150
-#: ../src/connection-editor/page-wireless.c:171
+#: ../src/connection-editor/page-wireless.c:147
+#: ../src/connection-editor/page-wireless.c:151
+#: ../src/connection-editor/page-wireless.c:172
 #, c-format
 msgid "default"
 msgstr "oletus"
 
-#: ../src/connection-editor/page-wireless.c:175
+#: ../src/connection-editor/page-wireless.c:176
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:399
-#: ../src/connection-editor/page-wireless.c:406
-msgid "Could not load WiFi user interface."
-msgstr "Käyttöliittymää WiFi:lle ei voitu ladata."
-
-#: ../src/connection-editor/page-wireless.c:412
-#: ../src/connection-editor/nm-connection-editor.glade.h:10
-#: ../src/connection-editor/nm-connection-list.c:1395
+#: ../src/connection-editor/page-wireless.c:396
+#: ../src/connection-editor/nm-connection-editor.ui.h:10
+#: ../src/connection-editor/nm-connection-list.c:1436
 msgid "Wireless"
 msgstr "Langaton"
 
-#: ../src/connection-editor/page-wireless.c:574
+#: ../src/connection-editor/page-wireless.c:398
+msgid "Could not load WiFi user interface."
+msgstr "Käyttöliittymää WiFi:lle ei voitu ladata."
+
+#: ../src/connection-editor/page-wireless.c:562
 #, c-format
 msgid "Wireless connection %d"
 msgstr "Langaton yhteys %d"
 
-#: ../src/connection-editor/page-wireless-security.c:262
-#: ../src/wireless-dialog.c:936
+#: ../src/connection-editor/page-wireless-security.c:263
+#: ../src/wireless-dialog.c:920
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit-avain (hexa tai ASCII)"
 
-#: ../src/connection-editor/page-wireless-security.c:271
-#: ../src/wireless-dialog.c:945
+#: ../src/connection-editor/page-wireless-security.c:272
+#: ../src/wireless-dialog.c:929
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bittinen tunnuslause"
 
-#: ../src/connection-editor/page-wireless-security.c:297
-#: ../src/wireless-dialog.c:975
+#: ../src/connection-editor/page-wireless-security.c:298
+#: ../src/wireless-dialog.c:959
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynaaminen WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:311
-#: ../src/wireless-dialog.c:989
+#: ../src/connection-editor/page-wireless-security.c:312
+#: ../src/wireless-dialog.c:973
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 (henkilökohtainen)"
 
-#: ../src/connection-editor/page-wireless-security.c:325
-#: ../src/wireless-dialog.c:1003
+#: ../src/connection-editor/page-wireless-security.c:326
+#: ../src/wireless-dialog.c:987
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wireless-security.c:365
+#: ../src/connection-editor/page-wireless-security.c:359
 msgid "Could not load WiFi security user interface; missing WiFi setting."
 msgstr ""
 "Turvallisuuskäyttöliittymää WiFi:lle ei voitu ladata. WiFi-asetukset "
 "puuttuvat."
 
-#: ../src/connection-editor/page-wireless-security.c:372
-#: ../src/connection-editor/page-wireless-security.c:379
-msgid "Could not load WiFi security user interface."
-msgstr "Turvallisuuskäyttöliittymää WiFi:lle ei voitu ladata."
-
-#: ../src/connection-editor/page-wireless-security.c:385
+#: ../src/connection-editor/page-wireless-security.c:368
 msgid "Wireless Security"
 msgstr "Langaton tietoturva"
 
-#: ../src/connection-editor/nm-connection-editor.c:100
+#: ../src/connection-editor/page-wireless-security.c:370
+msgid "Could not load WiFi security user interface."
+msgstr "Turvallisuuskäyttöliittymää WiFi:lle ei voitu ladata."
+
+#: ../src/connection-editor/nm-connection-editor.c:101
 #, c-format
 msgid "Editing %s"
 msgstr "Muokataan %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:104
+#: ../src/connection-editor/nm-connection-editor.c:105
 msgid "Editing un-named connection"
 msgstr "Nimettömän yhteyden muokkaus"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
-msgid ""
-"The connection editor could not find some required resources (the "
-"NetworkManager applet glade file was not found)."
-msgstr ""
-"Yhteyseditori ei voinut ladata jotain vaadituista resursseista (Verkon "
-"hallinta -sovelman glade-tiedostoa ei löytynyt)."
-
-#: ../src/connection-editor/nm-connection-editor.c:300
+#: ../src/connection-editor/nm-connection-editor.c:294
 msgid ""
-"The connection editor could not find some required resources (the glade file "
+"The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
-"Yhteyseditori ei voinut ladata jotain vaadituista resursseista (glade-"
-"tiedostoa ei löytynyt)."
 
-#: ../src/connection-editor/nm-connection-editor.c:398
+#: ../src/connection-editor/nm-connection-editor.c:397
 msgid "Error creating connection editor dialog."
 msgstr "Virhe luotaessa yhteysmuokkaimen ikkunaa."
 
-#: ../src/connection-editor/nm-connection-editor.c:419
-msgid "Apply"
-msgstr "Toteuta"
+#: ../src/connection-editor/nm-connection-editor.c:409
+msgid "_Save"
+msgstr "_Tallenna"
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:410
 msgid "Save any changes made to this connection."
 msgstr "Tallenna yhteydelle tehdyt muutokset."
 
-#: ../src/connection-editor/nm-connection-editor.c:421
-msgid "Apply..."
-msgstr "Toteuta..."
+#: ../src/connection-editor/nm-connection-editor.c:411
+msgid "_Save..."
+msgstr "_Tallenna..."
 
-#: ../src/connection-editor/nm-connection-editor.c:422
+#: ../src/connection-editor/nm-connection-editor.c:412
 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.glade.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Available to all users"
 msgstr "Saatavilla kaikille käyttäjille"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:2
 msgid "Connect _automatically"
 msgstr "Yhdistä _automaattisesti"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:3
 msgid "Connection _name:"
 msgstr "Yhteyden _nimi:"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:5
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "E_xport"
 msgstr "_Vie"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:11
+#: ../src/connection-editor/nm-connection-editor.ui.h:11
 msgid "_Import"
 msgstr "_Tuo"
 
-#: ../src/connection-editor/nm-connection-list.c:217
+#: ../src/connection-editor/nm-connection-list.c:216
 msgid "never"
 msgstr "ei koskaan"
 
-#: ../src/connection-editor/nm-connection-list.c:228
-#: ../src/connection-editor/nm-connection-list.c:239
+#: ../src/connection-editor/nm-connection-list.c:227
+#: ../src/connection-editor/nm-connection-list.c:238
 msgid "now"
 msgstr "nyt"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:246
+#: ../src/connection-editor/nm-connection-list.c:245
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuutti sitten"
 msgstr[1] "%d minuuttia sitten"
 
-#: ../src/connection-editor/nm-connection-list.c:250
+#: ../src/connection-editor/nm-connection-list.c:249
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d tunti sitten"
 msgstr[1] "%d tuntia sitten"
 
-#: ../src/connection-editor/nm-connection-list.c:262
+#: ../src/connection-editor/nm-connection-list.c:261
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d päivä sitten"
 msgstr[1] "%d päivää sitten"
 
-#: ../src/connection-editor/nm-connection-list.c:268
+#: ../src/connection-editor/nm-connection-list.c:267
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d kuukausi sitten"
 msgstr[1] "%d kuukautta sitten"
 
-#: ../src/connection-editor/nm-connection-list.c:272
+#: ../src/connection-editor/nm-connection-list.c:271
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d vuosi sitten"
 msgstr[1] "%d vuotta sitten"
 
-#: ../src/connection-editor/nm-connection-list.c:594
+#: ../src/connection-editor/nm-connection-list.c:486
 msgid "Connection add failed"
 msgstr "Yhteyden lisääminen epäonnistui"
 
-#: ../src/connection-editor/nm-connection-list.c:623
+#: ../src/connection-editor/nm-connection-list.c:515
+msgid "Error saving connection"
+msgstr "Virhe yhteyttä tallennettaessa"
+
+#: ../src/connection-editor/nm-connection-list.c:516
 #, c-format
-msgid "Error editing connection: property '%s' / '%s' invalid: %d"
+msgid "The property '%s' / '%s' is invalid: %d"
 msgstr ""
-"Yhteysasetusten muuttaminen ei onnistu: ominaisuus \"%s\"/\"%s\" ei kelpaa: "
-"%d"
 
-#: ../src/connection-editor/nm-connection-list.c:630
-#: ../src/connection-editor/nm-connection-list.c:745
+#: ../src/connection-editor/nm-connection-list.c:523
+#: ../src/connection-editor/nm-connection-list.c:642
 msgid "An unknown error occurred."
 msgstr "Tapahtui tuntematon virhe."
 
-#: ../src/connection-editor/nm-connection-list.c:635
-#: ../src/connection-editor/nm-connection-list.c:786
+#: ../src/connection-editor/nm-connection-list.c:528
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "Error initializing editor"
 msgstr "Virhe alustettaessa muokkainta"
 
-#: ../src/connection-editor/nm-connection-list.c:651
-#: ../src/connection-editor/nm-connection-list.c:803
-#: ../src/connection-editor/nm-connection-list.c:971
+#: ../src/connection-editor/nm-connection-list.c:546
+#: ../src/connection-editor/nm-connection-list.c:700
+#: ../src/connection-editor/nm-connection-list.c:867
 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/nm-connection-list.c:660
+#: ../src/connection-editor/nm-connection-list.c:557
 msgid "Could not create new connection"
 msgstr "Uutta yhteyttä ei voi luoda"
 
-#: ../src/connection-editor/nm-connection-list.c:671
+#: ../src/connection-editor/nm-connection-list.c:569
 msgid "Could not edit new connection"
 msgstr "Uutta yhteyttä ei voitu muokata"
 
-#: ../src/connection-editor/nm-connection-list.c:818
+#: ../src/connection-editor/nm-connection-list.c:714
 msgid "Could not edit connection"
 msgstr "Yhteyttä ei voitu muokata"
 
-#: ../src/connection-editor/nm-connection-list.c:843
+#: ../src/connection-editor/nm-connection-list.c:744
 msgid "Connection delete failed"
 msgstr "Yhteyden poistaminen epäonnistui"
 
-#: ../src/connection-editor/nm-connection-list.c:875
+#: ../src/connection-editor/nm-connection-list.c:776
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Haluatko varmasti poistaa yhteyden %s?"
 
-#: ../src/connection-editor/nm-connection-list.c:1018
-#: ../src/connection-editor/vpn-helpers.c:228
+#: ../src/connection-editor/nm-connection-list.c:911
+#: ../src/connection-editor/vpn-helpers.c:227
 msgid "Cannot import VPN connection"
 msgstr "VPN-yhteyttä ei voi tuoda"
 
-#: ../src/connection-editor/nm-connection-list.c:1020
+#: ../src/connection-editor/nm-connection-list.c:913
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2026,51 +1997,83 @@ msgstr ""
 "\n"
 "Virhe: VPN-palvelutyyppiä ei määritelty."
 
-#: ../src/connection-editor/nm-connection-list.c:1033
+#: ../src/connection-editor/nm-connection-list.c:926
 msgid "Could not edit imported connection"
 msgstr "Tuotua yhteyttä ei voitu muokata"
 
-#: ../src/connection-editor/nm-connection-list.c:1167
+#: ../src/connection-editor/nm-connection-list.c:1069
 msgid "Name"
 msgstr "Nimi"
 
-#: ../src/connection-editor/nm-connection-list.c:1179
+#: ../src/connection-editor/nm-connection-list.c:1081
 msgid "Last Used"
 msgstr "Viimeksi käytetty"
 
-#: ../src/connection-editor/nm-connection-list.c:1282
-msgid "Edit"
-msgstr "Muokkaa"
+#: ../src/connection-editor/nm-connection-list.c:1197
+msgid "No VPN plugin available. Please install one to enable this button."
+msgstr ""
+"Ei VPN-liitännäistä saatavilla. Asenna liitännäinen, niin tämä painike on "
+"käytettävissä."
+
+#: ../src/connection-editor/nm-connection-list.c:1208
+msgid "_Edit"
+msgstr "_Muokkaa"
 
-#: ../src/connection-editor/nm-connection-list.c:1283
+#: ../src/connection-editor/nm-connection-list.c:1209
 msgid "Edit the selected connection"
 msgstr "Muokkaa valittua yhteyttä"
 
-#: ../src/connection-editor/nm-connection-list.c:1284
-msgid "Edit..."
-msgstr "Muokkaa..."
+#: ../src/connection-editor/nm-connection-list.c:1210
+msgid "_Edit..."
+msgstr "_Muokkaa..."
 
-#: ../src/connection-editor/nm-connection-list.c:1285
+#: ../src/connection-editor/nm-connection-list.c:1211
 msgid "Authenticate to edit the selected connection"
 msgstr "Tunnistaudu muokataksesi valittua yhteyttä"
 
-#: ../src/connection-editor/nm-connection-list.c:1299
-msgid "Delete"
-msgstr "Poista"
+#: ../src/connection-editor/nm-connection-list.c:1226
+msgid "_Delete"
+msgstr "_Poista"
 
-#: ../src/connection-editor/nm-connection-list.c:1300
+#: ../src/connection-editor/nm-connection-list.c:1227
 msgid "Delete the selected connection"
 msgstr "Poista valittu yhteys"
 
-#: ../src/connection-editor/nm-connection-list.c:1301
-msgid "Delete..."
-msgstr "Poista..."
+#: ../src/connection-editor/nm-connection-list.c:1228
+msgid "_Delete..."
+msgstr "_Poista..."
 
-#: ../src/connection-editor/nm-connection-list.c:1302
+#: ../src/connection-editor/nm-connection-list.c:1229
 msgid "Authenticate to delete the selected connection"
 msgstr "Tunnistaudu poistaaksesi valitun yhteyden"
 
-#: ../src/connection-editor/vpn-helpers.c:230
+#: ../src/connection-editor/nm-connection-list.c:1504
+#, fuzzy
+msgid "Error creating connection"
+msgstr "Virhe yhteyttä tallennettaessa"
+
+#: ../src/connection-editor/nm-connection-list.c:1505
+#, fuzzy, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "Uutta yhteyttä ei voi luoda"
+
+#: ../src/connection-editor/nm-connection-list.c:1559
+#: ../src/connection-editor/nm-connection-list.c:1571
+#, fuzzy
+msgid "Error editing connection"
+msgstr "Virhe yhteyttä tallennettaessa"
+
+#: ../src/connection-editor/nm-connection-list.c:1560
+#, fuzzy, c-format
+msgid "Don't know how to edit '%s' connections"
+msgstr "Yhteyttä ei voitu muokata"
+
+#: ../src/connection-editor/nm-connection-list.c:1572
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:229
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2083,30 +2086,30 @@ msgstr ""
 "\n"
 "Virhe: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:262
+#: ../src/connection-editor/vpn-helpers.c:261
 msgid "Select file to import"
 msgstr "Valitse tuotava tiedosto"
 
-#: ../src/connection-editor/vpn-helpers.c:310
+#: ../src/connection-editor/vpn-helpers.c:309
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Tiedosto â??%sâ?? on jo olemassa."
 
-#: ../src/connection-editor/vpn-helpers.c:312
+#: ../src/connection-editor/vpn-helpers.c:311
 msgid "_Replace"
 msgstr "Ko_rvaa"
 
-#: ../src/connection-editor/vpn-helpers.c:314
+#: ../src/connection-editor/vpn-helpers.c:313
 #, 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:350
+#: ../src/connection-editor/vpn-helpers.c:349
 msgid "Cannot export VPN connection"
 msgstr "VPN-yhteyden asetuksia ei voi viedä"
 
-#: ../src/connection-editor/vpn-helpers.c:352
+#: ../src/connection-editor/vpn-helpers.c:351
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2117,58 +2120,65 @@ msgstr ""
 "\n"
 "Virhe: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:386
+#: ../src/connection-editor/vpn-helpers.c:385
 msgid "Export VPN connection..."
 msgstr "Vie VPN-asetukset..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:213
+#: ../src/gnome-bluetooth/bt-widget.c:218
+#, fuzzy, c-format
+msgid "Failed to create PAN connection: %s"
+msgstr "Uutta yhteyttä ei voi luoda"
+
+#: ../src/gnome-bluetooth/bt-widget.c:223
+#: ../src/gnome-bluetooth/bt-widget.c:491
+msgid "Your phone is now ready to use!"
+msgstr "Puhelimesi on nyt valmis käyttöön."
+
+#: ../src/gnome-bluetooth/bt-widget.c:247
 #, c-format
 msgid "%s Network"
 msgstr "%s-verkko"
 
-#: ../src/gnome-bluetooth/bt-widget.c:322
+#: ../src/gnome-bluetooth/bt-widget.c:373
 #, c-format
 msgid "Error: %s"
 msgstr "Virhe: %s"
 
-#: ../src/gnome-bluetooth/bt-widget.c:441
+#: ../src/gnome-bluetooth/bt-widget.c:486
+#, fuzzy, c-format
+msgid "Failed to create DUN connection: %s"
+msgstr "Uutta yhteyttä ei voi luoda"
+
+#: ../src/gnome-bluetooth/bt-widget.c:509
 msgid "Mobile wizard was canceled"
 msgstr "Mobiiliapulainen peruttiin"
 
-#: ../src/gnome-bluetooth/bt-widget.c:450
+#: ../src/gnome-bluetooth/bt-widget.c:518
 msgid "Unknown phone device type (not GSM or CDMA)"
 msgstr "Tuntematon puhelinlaite (ei GSM tai CDMA)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:478
-msgid "Your phone is now ready to use!"
-msgstr "Puhelimesi on nyt valmis käyttöön."
-
-#: ../src/gnome-bluetooth/bt-widget.c:648
-#: ../src/gnome-bluetooth/bt-widget.c:654
+#: ../src/gnome-bluetooth/bt-widget.c:712
+#: ../src/gnome-bluetooth/bt-widget.c:718
 msgid "failed to connect to the phone."
 msgstr "puhelimeen yhdistäminen epäonnistui."
 
-#: ../src/gnome-bluetooth/bt-widget.c:687
+#: ../src/gnome-bluetooth/bt-widget.c:751
 msgid "unexpectedly disconnected from the phone."
 msgstr "yhteys puhelimeen katkesi odottamattomasti."
 
-#: ../src/gnome-bluetooth/bt-widget.c:696
+#: ../src/gnome-bluetooth/bt-widget.c:760
 msgid "timed out detecting phone details."
 msgstr "aikakatkaisu tunnistettaessa puhelimen tietoja."
 
-#: ../src/gnome-bluetooth/bt-widget.c:711
-msgid "could not connect to the system bus."
-msgstr "järjestelmäväylään ei voi yhdistää."
-
-#: ../src/gnome-bluetooth/bt-widget.c:716
+#: ../src/gnome-bluetooth/bt-widget.c:772
 msgid "Detecting phone configuration..."
 msgstr "Tutkitaan puhelimen asetuksia..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:782
+#: ../src/gnome-bluetooth/bt-widget.c:838
 msgid "could not find the Bluetooth device."
 msgstr "Bluetooth-laitetta ei löydy."
 
-#: ../src/gnome-bluetooth/bt-widget.c:912
+#: ../src/gnome-bluetooth/bt-widget.c:971
 msgid ""
 "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
 "Networking connection."
@@ -2176,30 +2186,29 @@ msgstr ""
 "Oletusarvoisen Bluetooth-laitteen tulee olla käytössä ennen "
 "puhelinverkkoyhteyden asettamista."
 
-#: ../src/gnome-bluetooth/bt-widget.c:944
+#: ../src/gnome-bluetooth/bt-widget.c:1003
 #, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
 msgstr ""
 "Bluetooth-asetukset epäonnistuivat (virhe yhdistäessä D-Bus-väylään: %s)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:954
+#: ../src/gnome-bluetooth/bt-widget.c:1013
 msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 msgstr ""
 "Bluetooth-asetukset epäonnistuivat (D-Bus-välityspalvelimen luonti "
 "epäonnistui)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:963
+#: ../src/gnome-bluetooth/bt-widget.c:1022
 #, c-format
 msgid ""
 "Bluetooth configuration not possible (error finding NetworkManager: %s)."
 msgstr "Bluetooth-asetukset epäonnistuivat (NetworkManageria ei löydy: %s)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1014
+#: ../src/gnome-bluetooth/bt-widget.c:1085
 msgid "Use your mobile phone as a network device (PAN/NAP)"
 msgstr "Käytä matkapuhelintasi verkkolaitteena (PAN/NAP)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1023
+#: ../src/gnome-bluetooth/bt-widget.c:1094
 msgid "Access the Internet using your mobile phone (DUN)"
 msgstr "Käytä Internetiä matkapuhelimesi välityksellä (DUN)"
 
@@ -2209,11 +2218,11 @@ msgstr "Käyttö:"
 
 #: ../src/main.c:72
 msgid ""
-"This program is a component of NetworkManager "
-"(http://projects.gnome.org/NetworkManager)."
+"This program is a component of NetworkManager (http://projects.gnome.org/";
+"NetworkManager)."
 msgstr ""
-"Tämä ohjelma on osa NetworkManageria "
-"(http://projects.gnome.org/NetworkManager)."
+"Tämä ohjelma on osa NetworkManageria (http://projects.gnome.org/";
+"NetworkManager)."
 
 #: ../src/main.c:73
 msgid ""
@@ -2223,76 +2232,80 @@ msgstr ""
 "Sitä ei ole tarkoitettu komentorivin keskusteluun mutta sen sijaan se toimii "
 "GNOME-työpöytäympäristössä"
 
-#: ../src/mb-menu-item.c:58
+#: ../src/mb-menu-item.c:57
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:61
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:63
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:65
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:67
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:69
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:71
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:104
+#: ../src/mb-menu-item.c:73
+msgid "WiMAX"
+msgstr ""
+
+#: ../src/mb-menu-item.c:109
 msgid "not enabled"
 msgstr "ei käytössä"
 
-#: ../src/mb-menu-item.c:110
+#: ../src/mb-menu-item.c:115
 msgid "not registered"
 msgstr "ei rekisteröity"
 
-#: ../src/mb-menu-item.c:128
+#: ../src/mb-menu-item.c:133
 #, c-format
 msgid "Home network (%s)"
 msgstr "Kotiverkko (%s)"
 
-#: ../src/mb-menu-item.c:130
+#: ../src/mb-menu-item.c:135
 #, c-format
 msgid "Home network"
 msgstr "Kotiverkko"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 msgid "searching"
 msgstr "etsitään"
 
-#: ../src/mb-menu-item.c:141
+#: ../src/mb-menu-item.c:146
 msgid "registration denied"
 msgstr "rekisteröinti evätty"
 
-#: ../src/mb-menu-item.c:146 ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s - verkkovierailu)"
 
-#: ../src/mb-menu-item.c:148 ../src/mb-menu-item.c:154
+#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (verkkovierailu)"
 
-#: ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:162
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Verkkovierailu (roaming - %s)"
 
-#: ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:164
 #, c-format
 msgid "Roaming network"
 msgstr "Vierasverkko"
@@ -2383,43 +2396,43 @@ msgstr "Palveluntarjoajaa ei löydy, haluan syöttää tarjoajan _manuaalisesti:
 msgid "Provider:"
 msgstr "Tarjoaja:"
 
-#: ../src/utils/mobile-wizard.c:753
+#: ../src/utils/mobile-wizard.c:761
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "Palveluntarjoaja käyttää GSM-tekniikkaa (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/utils/mobile-wizard.c:755
+#: ../src/utils/mobile-wizard.c:767
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Palveluntarjoaja käyttää CDMA-tekniikkaa (1xRTT, EVDO)"
 
-#: ../src/utils/mobile-wizard.c:766
+#: ../src/utils/mobile-wizard.c:778
 msgid "Choose your Provider"
 msgstr "Valitse palveluntarjoaja"
 
-#: ../src/utils/mobile-wizard.c:1012
-msgid "Country List:"
-msgstr "Maaluettelo:"
-
 #: ../src/utils/mobile-wizard.c:1024
-msgid "Country"
-msgstr "Maa"
+msgid "Country or Region List:"
+msgstr "Maa- tai aluelista:"
 
-#: ../src/utils/mobile-wizard.c:1031
+#: ../src/utils/mobile-wizard.c:1036
+msgid "Country or region"
+msgstr "Maa tai alue"
+
+#: ../src/utils/mobile-wizard.c:1043
 msgid "My country is not listed"
 msgstr "Maani ei ole luettelossa"
 
-#: ../src/utils/mobile-wizard.c:1077
-msgid "Choose your Provider's Country"
-msgstr "Valitse palveluntarjoajan maa"
+#: ../src/utils/mobile-wizard.c:1089
+msgid "Choose your Provider's Country or Region"
+msgstr "Valitse palveluntarjoajasi maa tai alue"
 
-#: ../src/utils/mobile-wizard.c:1126
+#: ../src/utils/mobile-wizard.c:1143
 msgid "Installed GSM device"
 msgstr "Asennettiin GSM-laite"
 
-#: ../src/utils/mobile-wizard.c:1129
+#: ../src/utils/mobile-wizard.c:1146
 msgid "Installed CDMA device"
 msgstr "Asennettiin CDMA-laite"
 
-#: ../src/utils/mobile-wizard.c:1297
+#: ../src/utils/mobile-wizard.c:1314
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
@@ -2427,83 +2440,62 @@ msgstr ""
 "Tämä apulainen mahdollistaa matkapuhelinverkon mobiililaajakaistan helpon "
 "käyttöönoton."
 
-#: ../src/utils/mobile-wizard.c:1302
+#: ../src/utils/mobile-wizard.c:1319
 msgid "You will need the following information:"
 msgstr "Seuraavat tiedot tarvitaan:"
 
-#: ../src/utils/mobile-wizard.c:1313
+#: ../src/utils/mobile-wizard.c:1330
 msgid "Your broadband provider's name"
 msgstr "Laajakaistan tarjoajan nimi"
 
-#: ../src/utils/mobile-wizard.c:1319
+#: ../src/utils/mobile-wizard.c:1336
 msgid "Your broadband billing plan name"
 msgstr "Laajakaistan laskutustyypin nimi"
 
-#: ../src/utils/mobile-wizard.c:1325
+#: ../src/utils/mobile-wizard.c:1342
 msgid "(in some cases) Your broadband billing plan APN (Access Point Name)"
 msgstr ""
 "(joissain tapauksissa) Laajakaistan laskutustyypin APN (Access Point Name)"
 
-#: ../src/utils/mobile-wizard.c:1352
+#: ../src/utils/mobile-wizard.c:1369
 msgid "Create a connection for _this mobile broadband device:"
 msgstr "Luo yhteys _tähän mobiililaajakaistalaitteeseen:"
 
-#: ../src/utils/mobile-wizard.c:1367
+#: ../src/utils/mobile-wizard.c:1384
 msgid "Any device"
 msgstr "Mikä tahansa laite"
 
-#: ../src/utils/mobile-wizard.c:1380
+#: ../src/utils/mobile-wizard.c:1397
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Mobiililaajakaistayhteyden asetukset"
 
-#: ../src/utils/mobile-wizard.c:1554
+#: ../src/utils/mobile-wizard.c:1561
 msgid "New Mobile Broadband Connection"
 msgstr "Uusi mobiililaajakaistayhteys"
 
-#: ../src/utils/nmn-mobile-providers.c:76
+#: ../src/utils/nmn-mobile-providers.c:78
 msgid "United Kingdom"
 msgstr "Yhdistynyt kuningaskunta"
 
-#: ../src/utils/nmn-mobile-providers.c:508
+#: ../src/utils/nmn-mobile-providers.c:510
 msgid "Default"
 msgstr "Oletus"
 
-#: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:245
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr "VPN-yhteyttä â??%sâ?? ei voi käynnistää"
-
-#: ../src/vpn-password-dialog.c:140
-#, c-format
+#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
 msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-"Kirjautumisikkunaa VPN-yhteyden tyypille â??%sâ?? ei löydy. Ota yhteyttä "
-"järjestelmäsi ylläpitäjään."
-
-#: ../src/vpn-password-dialog.c:248
-#, c-format
-msgid ""
-"There was a problem launching the authentication dialog for VPN connection "
-"type '%s'. Contact your system administrator."
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
 msgstr ""
-"Virhe käynnistettäessä kirjautumisikkunaa VPN-yhteyden tyypille â??%sâ??. Ota "
-"yhteyttä järjestelmäsi ylläpitäjään."
 
-#: ../src/wired-dialog.c:99
-msgid "Wired 802.1X authentication"
-msgstr "Langallisen 802.1x-yhteyden todentaminen"
-
-#: ../src/wireless-dialog.c:474
+#: ../src/wireless-dialog.c:454
 msgid "New..."
 msgstr "Uusi..."
 
-#: ../src/wireless-dialog.c:1094
+#: ../src/wireless-dialog.c:1074
 msgid "C_reate"
 msgstr "_Luo"
 
-#: ../src/wireless-dialog.c:1175
+#: ../src/wireless-dialog.c:1152
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the wireless network "
@@ -2512,46 +2504,46 @@ msgstr ""
 "Salasanoja tai salausavaimia tarvitaan langattomaan verkkoon â??%sâ?? "
 "pääsemiseksi."
 
-#: ../src/wireless-dialog.c:1177
+#: ../src/wireless-dialog.c:1154
 msgid "Wireless Network Authentication Required"
 msgstr "Langattoman verkon salaustiedot vaaditaan"
 
-#: ../src/wireless-dialog.c:1179
+#: ../src/wireless-dialog.c:1156
 msgid "Authentication required by wireless network"
 msgstr "Langaton verkko vaatii salaustietoja"
 
-#: ../src/wireless-dialog.c:1184
+#: ../src/wireless-dialog.c:1161
 msgid "Create New Wireless Network"
 msgstr "Luo uusi langaton verkko"
 
-#: ../src/wireless-dialog.c:1186
+#: ../src/wireless-dialog.c:1163
 msgid "New wireless network"
 msgstr "Uusi langaton verkko"
 
-#: ../src/wireless-dialog.c:1187
+#: ../src/wireless-dialog.c:1164
 msgid "Enter a name for the wireless network you wish to create."
 msgstr "Syötä sen langattoman verkon nimi, jonka haluat luoda."
 
-#: ../src/wireless-dialog.c:1189
+#: ../src/wireless-dialog.c:1166
 msgid "Connect to Hidden Wireless Network"
 msgstr "Ota yhteys piilotettuun langattomaan verkkoon"
 
-#: ../src/wireless-dialog.c:1191
+#: ../src/wireless-dialog.c:1168
 msgid "Hidden wireless network"
 msgstr "Piilotettu langaton verkko"
 
-#: ../src/wireless-dialog.c:1192
+#: ../src/wireless-dialog.c:1169
 msgid ""
 "Enter the name and security details of the hidden wireless network you wish "
 "to connect to."
 msgstr ""
 "Syötä yhdistettävän piilotetun langattoman verkon nimi ja salaustiedot."
 
-#: ../src/wireless-security/eap-method.c:227
+#: ../src/wireless-security/eap-method.c:279
 msgid "No Certificate Authority certificate chosen"
 msgstr "Varmentajavarmennetta ei valittu"
 
-#: ../src/wireless-security/eap-method.c:228
+#: ../src/wireless-security/eap-method.c:280
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections "
 "to insecure, rogue wireless networks.  Would you like to choose a "
@@ -2561,37 +2553,70 @@ msgstr ""
 "turvattomiin, epäluotettaviin langattomiin verkkoihin. Haluatko valita "
 "varmentajan varmenteen?"
 
-#: ../src/wireless-security/eap-method.c:237
+#: ../src/wireless-security/eap-method.c:289
 msgid "Choose CA Certificate"
 msgstr "Valitse CA-varmenne"
 
-#: ../src/wireless-security/eap-method.c:552
+#: ../src/wireless-security/eap-method.c:627
 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:555
+#: ../src/wireless-security/eap-method.c:630
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER- tai PEM-varmenteet (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:261
+#: ../src/wireless-security/eap-method-peap.c:264
+#: ../src/wireless-security/wireless-security.c:368
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:277
+#: ../src/wireless-security/eap-method-peap.c:280
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:366
-#: ../src/wireless-security/eap-method-tls.c:457
-#: ../src/wireless-security/eap-method-ttls.c:365
+#: ../src/wireless-security/eap-method-peap.c:349
+#: ../src/wireless-security/eap-method-tls.c:419
+#: ../src/wireless-security/eap-method-ttls.c:349
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Valitse varmentajavarmenne..."
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
+msgid "Anony_mous identity:"
+msgstr "Anonyy_mi identiteetti:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+#: ../src/wireless-security/eap-method-ttls.ui.h:3
+msgid "C_A certificate:"
+msgstr "C_A-varmenne"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
+msgid "I_nner authentication:"
+msgstr "Sisempi tu_nnistautuminen:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:6
+msgid "Version 0"
+msgstr "Versio 0"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:7
+msgid "Version 1"
+msgstr "Versio 1"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+msgid "_PEAP version:"
+msgstr "_PEAP-versio:"
+
+#: ../src/wireless-security/eap-method-simple.ui.h:1
+msgid "As_k for this password every time"
+msgstr "_Kysy tätä salasanaa jokaisella kerralla"
+
+#: ../src/wireless-security/eap-method-tls.c:250
 msgid "Unencrypted private keys are insecure"
 msgstr "Salaamattomat yksityiset avaimet ovat epäluotettavia"
 
-#: ../src/wireless-security/eap-method-tls.c:266
+#: ../src/wireless-security/eap-method-tls.c:253
 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 "
@@ -2603,43 +2628,468 @@ msgstr ""
 "vaarantaa turvallisuusvaltuutuksesi. Ole hyvä, ja valitse salasanalla "
 "suojattu yksityinen avain."
 
-#: ../src/wireless-security/eap-method-tls.c:451
+#: ../src/wireless-security/eap-method-tls.c:413
 msgid "Choose your personal certificate..."
 msgstr "Valitse oma varmenne..."
 
-#: ../src/wireless-security/eap-method-tls.c:463
+#: ../src/wireless-security/eap-method-tls.c:425
 msgid "Choose your private key..."
 msgstr "Valitse salainen avaimesi..."
 
-#: ../src/wireless-security/wireless-security.c:329
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "I_dentity:"
+msgstr "I_dentiteetti:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:3
+msgid "Private _key:"
+msgstr "Y_ksityinen avain:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+msgid "_Private key password:"
+msgstr "_Yksityisen avaimen salasana:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+msgid "_User certificate:"
+msgstr "_Käyttäjän varmenne:"
+
+#: ../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:380
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:353
+#: ../src/wireless-security/wireless-security.c:404
 msgid "Tunneled TLS"
 msgstr "Tunneloitu TLS"
 
-#: ../src/wireless-security/wireless-security.c:364
+#: ../src/wireless-security/wireless-security.c:415
 msgid "Protected EAP (PEAP)"
 msgstr "Suojattu EAP (PEAP)"
 
-#~ msgid "_MAC address:"
-#~ msgstr "_MAC-osoite:"
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:2
+#: ../src/wireless-security/ws-wep-key.ui.h:9
+#: ../src/wireless-security/ws-wpa-eap.ui.h:2
+msgid "_Authentication:"
+msgstr "_Todentaminen:"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:1
+msgid "1 (Default)"
+msgstr "1 (oletus)"
 
-#~ msgid "Select A File"
-#~ msgstr "Valitse tiedosto"
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
 
-#~ msgid "None"
-#~ msgstr "Ei mitään"
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
 
-#~ msgid "Save this connection for all users of this machine."
-#~ msgstr "Tallenna tämä yhteys kaikille tämän koneen käyttäjille."
+#: ../src/wireless-security/ws-wep-key.ui.h:5
+msgid "Open System"
+msgstr "Avoin järjestelmä"
 
-#~ msgid "_Band:"
-#~ msgstr "_Kaista:"
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr "Jaettu avain"
 
-#~ msgid "_Routesâ?¦"
-#~ msgstr "_Reititâ?¦"
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "Sho_w key"
+msgstr "Nä_ytä avain"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+msgid "WEP inde_x:"
+msgstr "WEP-inde_ksi"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "_Key:"
+msgstr "_Avain:"
+
+#~ msgid "Network Manager"
+#~ msgstr "Verkon hallinta"
+
+#~ msgid "An instance of nm-applet is already running.\n"
+#~ msgstr "Verkonhallintasovellus nm-applet on jo käynnissä.\n"
+
+#~ msgid "Could not acquire the %s service. (%d)\n"
+#~ msgstr "Ei voitu saavuttaa palvelua %s. (%d)\n"
+
+#~ msgid "GSM network."
+#~ msgstr "GSM-verkko."
+
+#~ msgid "Wired network"
+#~ msgstr "Kiinteä verkkoyhteys"
+
+#~ msgctxt "Wifi/wired security"
+#~ msgid "Unknown"
+#~ msgstr "Tuntematon"
+
+#~ msgid "Disconnected - you are now offline"
+#~ msgstr "Yhteys katkaistu - olet nyt yhteydettömässä tilassa"
+
+#~ msgid "Wireless network"
+#~ msgstr "Langaton verkko"
+
+#~ msgid "GSM network"
+#~ msgstr "GSM-verkko"
+
+#~ msgid "C_onnect"
+#~ msgstr "_Yhdistä"
+
+#~ msgid "Other Wireless Network..."
+#~ msgstr "Muu langaton verkko..."
+
+#~ msgid "label"
+#~ msgstr "nimike"
+
+#~ msgid "could not connect to the system bus."
+#~ msgstr "järjestelmäväylään ei voi yhdistää."
+
+#~ msgid "Cannot start VPN connection '%s'"
+#~ msgstr "VPN-yhteyttä â??%sâ?? ei voi käynnistää"
+
+#~ msgid ""
+#~ "Could not find the authentication dialog for VPN connection type '%s'. "
+#~ "Contact your system administrator."
+#~ msgstr ""
+#~ "Kirjautumisikkunaa VPN-yhteyden tyypille â??%sâ?? ei löydy. Ota yhteyttä "
+#~ "järjestelmäsi ylläpitäjään."
+
+#~ msgid ""
+#~ "There was a problem launching the authentication dialog for VPN "
+#~ "connection type '%s'. Contact your system administrator."
+#~ msgstr ""
+#~ "Virhe käynnistettäessä kirjautumisikkunaa VPN-yhteyden tyypille â??%sâ??. Ota "
+#~ "yhteyttä järjestelmäsi ylläpitäjään."
+
+#~ msgid ""
+#~ "Infrastructure\n"
+#~ "Ad-hoc"
+#~ msgstr ""
+#~ "Infrastruktuuri\n"
+#~ "Adhoc"
+
+#~ msgid "PUK code is needed for the mobile broadband device"
+#~ msgstr "Mobiililaajakaistalaite vaatii PUK-koodin"
+
+#~ msgid ""
+#~ "Any\n"
+#~ "3G (UMTS/HSPA)\n"
+#~ "2G (GPRS/EDGE)\n"
+#~ "Prefer 3G (UMTS/HSPA)\n"
+#~ "Prefer 2G (GPRS/EDGE)"
+#~ msgstr ""
+#~ "Mikä tahansa\n"
+#~ "3G (UMTS/HSPA)\n"
+#~ "2G (GPRS/EDGE)\n"
+#~ "Mieluummin 3G (UMTS/HSPA)\n"
+#~ "Mieluummin 2G (GPRS/EDGE)"
+
+#~ msgid ""
+#~ "The connection editor could not find some required resources (the glade "
+#~ "file was not found)."
+#~ msgstr ""
+#~ "Yhteyseditori ei voinut ladata jotain vaadituista resursseista (glade-"
+#~ "tiedostoa ei löytynyt)."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Choose a VPN Connection Type</"
+#~ "span>\n"
+#~ "\n"
+#~ "Select the type of VPN you wish to use for the new connection.  If the "
+#~ "type of VPN connection you wish to create does not appear in the list, "
+#~ "you may not have the correct VPN plugin installed."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Valitse VPN-yhteyden tyyppi</span>\n"
+#~ "\n"
+#~ "Valitse uudessa yhteydessä käytettävän VPN-yhteyden tyyppi. Jos luettelo "
+#~ "ei sisällä haluamaasi VPN-yhteyden tyyppiä, voi olla että et ole "
+#~ "asentanut tarvittavaa VPN-liitännäistä."
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "A (5 GHz)\n"
+#~ "B/G (2.4 GHz)"
+#~ msgstr ""
+#~ "Automaattinen\n"
+#~ "A (5 GHz)\n"
+#~ "B/G (2.4 GHz)"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Twisted Pair (TP)\n"
+#~ "Attachment Unit Interface (AUI)\n"
+#~ "BNC\n"
+#~ "Media Independent Interface (MII)"
+#~ msgstr ""
+#~ "Automaattinen\n"
+#~ "Parikaapeli (TP)\n"
+#~ "Attachment Unit Interface (AUI)\n"
+#~ "BNC\n"
+#~ "Media Independent Interface (MII)"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "10 Mb/s\n"
+#~ "100 Mb/s\n"
+#~ "1 Gb/s\n"
+#~ "10 Gb/s"
+#~ msgstr ""
+#~ "Automaattinen\n"
+#~ "10 Mb/s\n"
+#~ "100 Mb/s\n"
+#~ "1 Gb/s\n"
+#~ "10 Gb/s"
+
+#~ msgid "<b>Echo</b>"
+#~ msgstr "<b>Kaiutus</b>"
+
+#~ msgid "<b>Compression</b>"
+#~ msgstr "<b>Pakkaus</b>"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>Todentaminen</b>"
+
+#~ msgid "<b>Basic</b>"
+#~ msgstr "<b>Perusasetukset</b>"
+
+#~ msgid "<b>Advanced</b>"
+#~ msgstr "<b>Lisäasetukset</b>"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Automatic with manual DNS settings\n"
+#~ "Manual\n"
+#~ "Link-Local\n"
+#~ "Shared to other computers"
+#~ msgstr ""
+#~ "Automaattinen\n"
+#~ "Automaattinen omilla DNS-asetuksilla\n"
+#~ "Manuaalinen\n"
+#~ "Vain linkkitaso\n"
+#~ "Jaettu muille tietokoneille"
+
+#~ msgid "<b>Addresses</b>"
+#~ msgstr "<b>Osoitteet</b>"
+
+#~ msgid ""
+#~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
+#~ msgstr ""
+#~ "<span size=\"larger\" weight=\"bold\">Aktiiviset verkkoyhteydet</span>"
+
+#~ msgid "PUK code required"
+#~ msgstr "PUK-koodi vaaditaan"
+
+#~ msgid ""
+#~ "Open System\n"
+#~ "Shared Key"
+#~ msgstr ""
+#~ "Avoin järjestelmä\n"
+#~ "Jaettu avain"
+
+#~ msgid ""
+#~ "Copyright © 2004-2008 Red Hat, Inc.\n"
+#~ "Copyright © 2005-2008 Novell, Inc."
+#~ msgstr ""
+#~ "Copyright © 2004-2008 Red Hat, Inc.\n"
+#~ "Copyright © 2005-2008 Novell, Inc."
+
+#~ msgid ""
+#~ "The NetworkManager Applet could not find some required resources (the "
+#~ "glade file was not found)."
+#~ msgstr ""
+#~ "Verkon hallinta -sovelma ei voinut ladata jotain vaadituista resursseista "
+#~ "(glade-tiedostoa ei löytynyt)."
+
+#~ msgid ""
+#~ "1 (Default)\n"
+#~ "2\n"
+#~ "3\n"
+#~ "4"
+#~ msgstr ""
+#~ "1 (oletus)\n"
+#~ "2\n"
+#~ "3\n"
+#~ "4"
+
+#~ msgid "<b>Allowed Authentication Methods</b>"
+#~ msgstr "<b>Sallitut todentamistavat</b>"
+
+#~ msgid ""
+#~ "<i>In most cases, the provider's PPP servers will support all "
+#~ "authentication methods.  If connections fail, try disabling support for "
+#~ "some methods.</i>"
+#~ msgstr ""
+#~ "<i>Useimmissa tapauksissa palveluntarjoajan PPP-palvelimet tukevat "
+#~ "kaikkia todentamistapoja. Jos yhteys epäonnistuu, kokeile poistaa "
+#~ "joidenkin tapojen tuki pois käytöstä.</i>"
+
+#~ msgid ""
+#~ "The connection editor could not find some required resources (the "
+#~ "NetworkManager applet glade file was not found)."
+#~ msgstr ""
+#~ "Yhteyseditori ei voinut ladata jotain vaadituista resursseista (Verkon "
+#~ "hallinta -sovelman glade-tiedostoa ei löytynyt)."
+
+#~ msgid "Apply..."
+#~ msgstr "Toteuta..."
+
+#~ msgid "Apply"
+#~ msgstr "Toteuta"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Version 0\n"
+#~ "Version 1"
+#~ msgstr ""
+#~ "Automaattinen\n"
+#~ "Versio 0\n"
+#~ "Versio 1"
+
+#~ msgid "Delete"
+#~ msgstr "Poista"
+
+#~ msgid "Edit..."
+#~ msgstr "Muokkaa..."
+
+#~ msgid "Edit"
+#~ msgstr "Muokkaa"
+
+#~ msgid "Delete..."
+#~ msgstr "Poista..."
+
+#~ msgid "My provider uses _CDMA-based technology (i.e. 1xRTT, EVDO)"
+#~ msgstr "Toimittaja käyttää _CDMA-pohjaista tekniikkaa (eli 1xRTT, EVDO)"
+
+#~ msgid "Country"
+#~ msgstr "Maa"
+
+#~ msgid "Choose your Provider's Country"
+#~ msgstr "Valitse palveluntarjoajan maa"
+
+#~ msgid "Country List:"
+#~ msgstr "Maaluettelo:"
+
+#~ msgid "_Routes&#x2026;"
+#~ msgstr "_Reitit&#x2026;"
+
+#~ msgid "Error editing connection: property '%s' / '%s' invalid: %d"
+#~ msgstr ""
+#~ "Yhteysasetusten muuttaminen ei onnistu: ominaisuus \"%s\"/\"%s\" ei "
+#~ "kelpaa: %d"
+
+#~ msgctxt "New PIN verification entry label"
+#~ msgid "Re-enter new PIN code:"
+#~ msgstr "Syötä uusi PIN-koodi uudelleen:"
+
+#~ msgctxt "New PIN entry label"
+#~ msgid "New PIN code:"
+#~ msgstr "Uusi PIN-koodi:"
+
+#~ msgctxt "PUK code entry label"
+#~ msgid "PUK code:"
+#~ msgstr "PUK-koodi:"
+
+#~ msgctxt "Show/obscure PIN checkbox label"
+#~ msgid "Show PIN code"
+#~ msgstr "Näytä PIN-koodi"
+
+#~ msgctxt "PIN code entry label"
+#~ msgid "PIN code:"
+#~ msgstr "PIN-koodi:"
+
+#~ msgctxt "Show/obscure PIN/PUK checkbox label"
+#~ msgid "Show PIN/PUK codes"
+#~ msgstr "Näytä PIN-/PUK-koodit"
+
+#~ msgid "Show it"
+#~ msgstr "Näytä"
+
+#~ msgctxt "Unknown/unrecognized wired or wifi security"
+#~ msgid "Unknown"
+#~ msgstr "Tuntematon"
+
+#~ msgctxt "No wifi security used"
+#~ msgid "None"
+#~ msgstr "Ei mitään"
+
+#~ msgctxt "No wired security used"
+#~ msgid "None"
+#~ msgstr "Ei mitään"
 
-#~ msgid "WEP 40/128-bit Key"
-#~ msgstr "WEP 40-/128-bittinen avain"
+#~ msgid "translator-credits"
+#~ msgstr ""
+#~ "Timo Jyrinki, 2008-2009.\n"
+#~ "Ilkka Tuohela, 2005-2008.\n"
+#~ "\n"
+#~ "http://www.gnome.fi/\n";
+#~ "\n"
+#~ "Launchpad Contributions:\n"
+#~ "  Aapo Rantalainen https://launchpad.net/~aapo-rantalainen\n";
+#~ "  Birunthan Mohanathas https://launchpad.net/~poiru\n";
+#~ "  Christian Hellberg https://launchpad.net/~christian-hellberg\n";
+#~ "  Heikki Kulhia https://launchpad.net/~hessuk\n";
+#~ "  Heikki Mäntysaari https://launchpad.net/~heikki-mantysaari\n";
+#~ "  Jiri Grönroos https://launchpad.net/~jiri-gronroos\n";
+#~ "  Jussi Aalto https://launchpad.net/~jtaalto-deactivatedaccount\n";
+#~ "  Mathieu Trudel-Lapierre https://launchpad.net/~mathieu-tl\n";
+#~ "  Ncl8 https://launchpad.net/~crofle\n";
+#~ "  T Kortehisto https://launchpad.net/~kortehisto\n";
+#~ "  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n";
+#~ "  Tomi Juntunen https://launchpad.net/~tojuntu\n";
+#~ "  papukaija https://launchpad.net/~papukaija";
+
+#~ msgid ""
+#~ "Copyright © 2004-2010 Red Hat, Inc.\n"
+#~ "Copyright © 2005-2008 Novell, Inc.\n"
+#~ "and many other community contributors and translators"
+#~ msgstr ""
+#~ "Tekijänoikeus © 2004-2010 Red Hat, Inc.\n"
+#~ "Tekijänoikeus © 2005-2008 Novell, Inc.\n"
+#~ "ja monet muut yhteisön jäsenet ja kääntäjät"
+
+#~ msgid "Create&#x2026;"
+#~ msgstr "Luo&#x2026;"
+
+#~ msgid "Flight Mode"
+#~ msgstr "Lentokonetila"
+
+#~ msgid "%s (VPN, Connected)"
+#~ msgstr "%s (VPN, yhdistetty)"
+
+#~ msgid "Network (Wired)"
+#~ msgstr "Verkko (kiinteä)"
+
+#~ msgid "Network (Mobile, %d%%)"
+#~ msgstr "Verkko (mobiili, %d% %)"
+
+#~ msgid "Network (Mobile)"
+#~ msgstr "Verkko (mobiili)"
+
+#~ msgid "%s (VPN, Connecting)"
+#~ msgstr "%s (VPN, yhdistetään)"
+
+#~ msgid "Network (Wireless, %d%%)"
+#~ msgstr "Verkko (langaton, %d% %)"
+
+#~ msgid "Network (Connecting)"
+#~ msgstr "Verkko (yhdistetään)"
+
+#~ msgid "Network (Disabled)"
+#~ msgstr "Verkko (poissa käytöstä)"
+
+#~ msgid "Network (Disconnected)"
+#~ msgstr "Verkko (yhteys katkaistu)"



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