[gnome-control-center] Update Finnish translation



commit 32b2594b2a53f770156198a185982aed855514d9
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Sun Jan 26 18:04:19 2020 +0000

    Update Finnish translation

 po/fi.po | 4701 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 2620 insertions(+), 2081 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 08c5f619f..c8272cfaf 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -26,8 +26,8 @@ msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-control-center/";
 "issues\n"
-"POT-Creation-Date: 2019-09-28 19:30+0000\n"
-"PO-Revision-Date: 2019-10-13 09:55+0300\n"
+"POT-Creation-Date: 2020-01-08 15:54+0000\n"
+"PO-Revision-Date: 2020-01-26 20:03+0200\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <lokalisointi-lista googlegroups com>\n"
 "Language: fi\n"
@@ -35,74 +35,75 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.2.4\n"
 "X-POT-Import-Date: 2012-03-07 10:37:43+0000\n"
 "X-Project-Style: gnome\n"
 
-#: panels/applications/cc-applications-panel.c:561
+#: panels/applications/cc-applications-panel.c:708
 msgid "System Bus"
 msgstr "Järjestelmäväylä"
 
-#: panels/applications/cc-applications-panel.c:561
-#: panels/applications/cc-applications-panel.c:563
-#: panels/applications/cc-applications-panel.c:579
-#: panels/applications/cc-applications-panel.c:584
+#: panels/applications/cc-applications-panel.c:708
+#: panels/applications/cc-applications-panel.c:710
+#: panels/applications/cc-applications-panel.c:723
+#: panels/applications/cc-applications-panel.c:728
 msgid "Full access"
 msgstr "Täydet oikeudet"
 
-#: panels/applications/cc-applications-panel.c:563
+#: panels/applications/cc-applications-panel.c:710
 msgid "Session Bus"
 msgstr "Istuntoväylä"
 
-#: panels/applications/cc-applications-panel.c:568
-#: panels/power/cc-power-panel.c:2477 panels/thunderbolt/cc-bolt-panel.ui:466
-#: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45
-#: shell/cc-window.c:273
+#: panels/applications/cc-applications-panel.c:714
+#: panels/power/cc-power-panel.c:2469 panels/thunderbolt/cc-bolt-panel.ui:466
+#: panels/thunderbolt/cc-bolt-panel.ui:525
 msgid "Devices"
 msgstr "Laitteet"
 
-#: panels/applications/cc-applications-panel.c:568
+#: panels/applications/cc-applications-panel.c:714
 msgid "Full access to /dev"
 msgstr "Täysi pääsy kohteeseen /dev"
 
-#: panels/applications/cc-applications-panel.c:573
+#: panels/applications/cc-applications-panel.c:718
 #: panels/network/gnome-network-panel.desktop.in.in:3
-#: panels/network/network-mobile.ui:241
+#: panels/network/network-mobile.ui:252
 msgid "Network"
 msgstr "Verkko"
 
-#: panels/applications/cc-applications-panel.c:573
+#: panels/applications/cc-applications-panel.c:718
+#: panels/applications/cc-snap-row.c:109
 msgid "Has network access"
 msgstr "Verkon käyttö"
 
-#: panels/applications/cc-applications-panel.c:579
-#: panels/applications/cc-applications-panel.c:581
-#: panels/search/cc-search-locations-dialog.c:293
+#: panels/applications/cc-applications-panel.c:723
+#: panels/applications/cc-applications-panel.c:725
+#: panels/search/cc-search-locations-dialog.c:361
 msgid "Home"
 msgstr "Koti"
 
-#: panels/applications/cc-applications-panel.c:581
-#: panels/applications/cc-applications-panel.c:586
+#: panels/applications/cc-applications-panel.c:725
+#: panels/applications/cc-applications-panel.c:730
 msgid "Read-only"
 msgstr "Vain luku"
 
-#: panels/applications/cc-applications-panel.c:584
-#: panels/applications/cc-applications-panel.c:586
+#: panels/applications/cc-applications-panel.c:728
+#: panels/applications/cc-applications-panel.c:730
 msgid "File System"
 msgstr "Tiedostojärjestelmä"
 
-#: panels/applications/cc-applications-panel.c:591
-#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:277
-#: shell/cc-window.c:975 shell/cc-window.ui:132
+#: panels/applications/cc-applications-panel.c:734
+#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:281
+#: shell/cc-window.c:964 shell/cc-window.ui:125
 #: shell/gnome-control-center.desktop.in.in:3
 msgid "Settings"
 msgstr "Asetukset"
 
-#: panels/applications/cc-applications-panel.c:591
+#: panels/applications/cc-applications-panel.c:734
+#: panels/applications/cc-snap-row.c:73
 msgid "Can change settings"
 msgstr "Voi muuttaa asetuksia"
 
-#: panels/applications/cc-applications-panel.c:596
+#: panels/applications/cc-applications-panel.c:736
 #, c-format
 msgid ""
 "%s has the following permissions built-in. These cannot be altered. If you "
@@ -111,70 +112,69 @@ msgstr ""
 "%s omaa seuraavat sisäänrakennetut oikeudet. Niitä ei voi muuttaa. Jos olet "
 "huolissasi näistä oikeuksia, harkitse sovelluksen poistamista."
 
-#: panels/applications/cc-applications-panel.c:738
+#: panels/applications/cc-applications-panel.c:891
 msgid "Web Links"
 msgstr "Verkkolinkit"
 
-#: panels/applications/cc-applications-panel.c:748
+#: panels/applications/cc-applications-panel.c:901
 msgid "Git Links"
 msgstr "Git-linkit"
 
-#: panels/applications/cc-applications-panel.c:754
+#: panels/applications/cc-applications-panel.c:907
 #, c-format
 msgid "%s Links"
 msgstr "%s-linkit"
 
-#: panels/applications/cc-applications-panel.c:762
-#: panels/applications/cc-applications-panel.c:798
+#: panels/applications/cc-applications-panel.c:915
+#: panels/applications/cc-applications-panel.c:951
 msgid "Unset"
 msgstr "Poista asetus"
 
-#: panels/applications/cc-applications-panel.c:853
+#: panels/applications/cc-applications-panel.c:1006
 msgid "Links"
 msgstr "Linkit"
 
-#: panels/applications/cc-applications-panel.c:861
+#: panels/applications/cc-applications-panel.c:1014
 msgid "Hypertext Files"
 msgstr "Hypertekstitiedostot"
 
-#: panels/applications/cc-applications-panel.c:875
+#: panels/applications/cc-applications-panel.c:1028
 msgid "Text Files"
 msgstr "Tekstitiedostot"
 
-#: panels/applications/cc-applications-panel.c:889
+#: panels/applications/cc-applications-panel.c:1042
 msgid "Image Files"
 msgstr "Kuvatiedostot"
 
-#: panels/applications/cc-applications-panel.c:905
+#: panels/applications/cc-applications-panel.c:1058
 msgid "Font Files"
 msgstr "Fonttitiedostot"
 
-#: panels/applications/cc-applications-panel.c:966
+#: panels/applications/cc-applications-panel.c:1119
 msgid "Archive Files"
 msgstr "Arkistotiedostot"
 
-#: panels/applications/cc-applications-panel.c:986
+#: panels/applications/cc-applications-panel.c:1139
 msgid "Package Files"
 msgstr "Pakettitiedostot"
 
-#: panels/applications/cc-applications-panel.c:1009
+#: panels/applications/cc-applications-panel.c:1162
 msgid "Audio Files"
 msgstr "Äänitiedostot"
 
-#: panels/applications/cc-applications-panel.c:1026
+#: panels/applications/cc-applications-panel.c:1179
 msgid "Video Files"
 msgstr "Videotiedostot"
 
-#: panels/applications/cc-applications-panel.c:1034
+#: panels/applications/cc-applications-panel.c:1187
 msgid "Other Files"
 msgstr "Muut tiedostot"
 
 #. List of applications.
-#: panels/applications/cc-applications-panel.c:1376
-#: panels/applications/cc-applications-panel.ui:406
+#: panels/applications/cc-applications-panel.c:1529
+#: panels/applications/cc-applications-panel.ui:412
 #: panels/applications/gnome-applications-panel.desktop.in.in:3
 #: panels/notifications/cc-notifications-panel.ui:167
-#: panels/privacy/cc-privacy-panel.ui:1085
 msgid "Applications"
 msgstr "Sovellukset"
 
@@ -200,7 +200,7 @@ msgstr ""
 
 #: panels/applications/cc-applications-panel.ui:126
 #: panels/applications/cc-applications-panel.ui:132
-#: panels/privacy/cc-privacy-panel.c:908 panels/privacy/cc-privacy-panel.ui:745
+#: panels/camera/gnome-camera-panel.desktop.in.in:3
 msgid "Camera"
 msgstr "Kamera"
 
@@ -213,12 +213,11 @@ msgstr "Kamera"
 #: panels/applications/cc-applications-panel.ui:145
 #: panels/applications/cc-applications-panel.ui:157
 #: panels/applications/cc-applications-panel.ui:237
-#: panels/applications/cc-applications-panel.ui:255
+#: panels/applications/cc-applications-panel.ui:261
 #: panels/keyboard/cc-keyboard-option.c:259
 #: panels/keyboard/cc-keyboard-option.c:378
-#: panels/keyboard/keyboard-shortcuts.c:425
-#: panels/keyboard/shortcut-editor.ui:96 panels/network/network-proxy.ui:123
-#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:96
+#: panels/keyboard/keyboard-shortcuts.c:425 panels/network/network-proxy.ui:126
 #: panels/user-accounts/um-fingerprint-dialog.c:211
 #: subprojects/gvc/gvc-mixer-control.c:1876
 msgid "Disabled"
@@ -226,18 +225,18 @@ msgstr "Ei käytössä"
 
 #: panels/applications/cc-applications-panel.ui:138
 #: panels/applications/cc-applications-panel.ui:144
-#: panels/privacy/cc-privacy-panel.c:941 panels/privacy/cc-privacy-panel.ui:850
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:3
 msgid "Microphone"
 msgstr "Mikrofoni"
 
 #: panels/applications/cc-applications-panel.ui:150
 #: panels/applications/cc-applications-panel.ui:156
-#: panels/privacy/cc-privacy-panel.c:850 panels/privacy/cc-privacy-panel.ui:955
+#: panels/location/gnome-location-panel.desktop.in.in:3
 msgid "Location Services"
 msgstr "Sijaintipalvelut"
 
 #: panels/applications/cc-applications-panel.ui:162
-#: panels/applications/cc-applications-panel.ui:489
+#: panels/applications/cc-applications-panel.ui:495
 msgid "Built-in Permissions"
 msgstr "Sisäänrakennetut oikeudet"
 
@@ -264,7 +263,7 @@ msgstr "Sovelluksen käyttämät järjestelmäominaisuudet."
 #: panels/applications/cc-applications-panel.ui:230
 #: panels/applications/cc-applications-panel.ui:236
 #: panels/keyboard/01-launchers.xml.in:16
-#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:162
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:155
 msgid "Search"
 msgstr "Haku"
 
@@ -274,75 +273,304 @@ msgid "Notifications"
 msgstr "Ilmoitukset"
 
 #: panels/applications/cc-applications-panel.ui:248
+msgid "Run in background"
+msgstr "Suorita taustalla"
+
 #: panels/applications/cc-applications-panel.ui:254
+#: panels/applications/cc-applications-panel.ui:260
 msgid "Sounds"
 msgstr "Äänet"
 
-#: panels/applications/cc-applications-panel.ui:287
+#: panels/applications/cc-applications-panel.ui:293
 msgid "Default Handlers"
 msgstr "Oletuskäsittelimet"
 
-#: panels/applications/cc-applications-panel.ui:299
+#: panels/applications/cc-applications-panel.ui:305
 msgid "Types of files and links that this application opens."
 msgstr "Sovelluksen avaamat tiedosto- ja linkkityypit."
 
-#: panels/applications/cc-applications-panel.ui:315
+#: panels/applications/cc-applications-panel.ui:321
 msgid "Reset"
 msgstr "Tyhjennä asetukset"
 
-#: panels/applications/cc-applications-panel.ui:351
+#: panels/applications/cc-applications-panel.ui:357
 msgid "Usage"
 msgstr "Käyttö"
 
-#: panels/applications/cc-applications-panel.ui:363
+#: panels/applications/cc-applications-panel.ui:369
 msgid "How much resources this application is using."
 msgstr "Kuinka paljon resursseja tämä sovellus käyttää."
 
-#: panels/applications/cc-applications-panel.ui:378
-#: panels/applications/cc-applications-panel.ui:525
+#: panels/applications/cc-applications-panel.ui:384
+#: panels/applications/cc-applications-panel.ui:531
 msgid "Storage"
 msgstr "Tallennustila"
 
-#: panels/applications/cc-applications-panel.ui:413
+#: panels/applications/cc-applications-panel.ui:419
 msgid "Open in Software"
 msgstr "Avaa ohjelmistokeskuksessa"
 
-#: panels/applications/cc-applications-panel.ui:463 shell/cc-panel-list.ui:190
+#: panels/applications/cc-applications-panel.ui:469 shell/cc-panel-list.ui:121
 msgid "No results found"
 msgstr "Tuloksia ei löytynyt"
 
-#: panels/applications/cc-applications-panel.ui:474
-#: panels/keyboard/cc-keyboard-panel.ui:157 shell/cc-panel-list.ui:201
+#: panels/applications/cc-applications-panel.ui:480
+#: panels/keyboard/cc-keyboard-panel.ui:188 shell/cc-panel-list.ui:132
 msgid "Try a different search"
 msgstr "Yritä eri hakuehdoilla"
 
-#: panels/applications/cc-applications-panel.ui:542
+#: panels/applications/cc-applications-panel.ui:548
 msgid ""
 "How much disk space this application is occupying with app data and caches."
 msgstr ""
 "Kuinka paljon levytilaa tämä sovellus varaa sovellustiedoin ja välimuistin "
 "kera."
 
-#: panels/applications/cc-applications-panel.ui:551
+#: panels/applications/cc-applications-panel.ui:557
 msgid "Application"
 msgstr "Sovellus"
 
-#: panels/applications/cc-applications-panel.ui:557
+#: panels/applications/cc-applications-panel.ui:563
 msgid "Data"
 msgstr "Tiedot"
 
-#: panels/applications/cc-applications-panel.ui:563
+#: panels/applications/cc-applications-panel.ui:569
 msgid "Cache"
 msgstr "Välimuisti"
 
-#: panels/applications/cc-applications-panel.ui:569
+#: panels/applications/cc-applications-panel.ui:575
 msgid "<b>Total</b>"
 msgstr "<b>Yhteensä</b>"
 
-#: panels/applications/cc-applications-panel.ui:586
+#: panels/applications/cc-applications-panel.ui:592
 msgid "Clear Cache…"
 msgstr "Tyhjennä välimuisti…"
 
+#: panels/applications/cc-snap-row.c:55
+msgid "Add user accounts and change passwords"
+msgstr "Lisää käyttäjiä ja vaihda salasanoja"
+
+#: panels/applications/cc-snap-row.c:57 panels/applications/cc-snap-row.c:133
+msgid "Play and record sound"
+msgstr "Toista ja tallenna ääntä"
+
+#: panels/applications/cc-snap-row.c:59
+msgid "Detect network devices using mDNS/DNS-SD (Bonjour/zeroconf)"
+msgstr "Havaitse verkkolaitteet käyttäen mDNS:ää/DNS-SD:tä (Bonjour/zeroconf)"
+
+#: panels/applications/cc-snap-row.c:61
+msgid "Access bluetooth hardware directly"
+msgstr "Suora pääsy bluetooth-laitteisiin"
+
+#: panels/applications/cc-snap-row.c:63
+msgid "Use bluetooth devices"
+msgstr "Käytä bluetooth-laitteita"
+
+#: panels/applications/cc-snap-row.c:65
+msgid "Use your camera"
+msgstr "Käytä kameraa"
+
+#: panels/applications/cc-snap-row.c:67
+msgid "Print documents"
+msgstr "Tulosta asiakirjoja"
+
+#: panels/applications/cc-snap-row.c:69
+msgid "Use any connected joystick"
+msgstr "Käytä mitä tahansa yhdistettyä peliohjainta"
+
+#: panels/applications/cc-snap-row.c:71
+msgid "Allow connecting to the Docker service"
+msgstr "Salli yhdistäminen Docker-palveluun"
+
+#: panels/applications/cc-snap-row.c:75
+msgid "Configure network firewall"
+msgstr "Muokkaa verkon palomuuria"
+
+#: panels/applications/cc-snap-row.c:77
+msgid "Setup and use privileged FUSE filesystems"
+msgstr "Aseta ja käytä etuoikeutettuja FUSE-tiedostojärjestelmiä"
+
+#: panels/applications/cc-snap-row.c:79
+msgid "Update firmware on this device"
+msgstr "Päivitä laiteohjelmisto (firmware) tällä laitteella"
+
+#: panels/applications/cc-snap-row.c:81
+msgid "Access hardware information"
+msgstr "Pääsy laitteiden tietoihin"
+
+#: panels/applications/cc-snap-row.c:83
+msgid "Provide entropy to hardware random number generator"
+msgstr "Tarjoa entropiaa laitepohjaiselle satunnaislukugeneraattorille"
+
+#: panels/applications/cc-snap-row.c:85
+msgid "Use hardware-generated random numbers"
+msgstr "Käytä laitteiston luomia satunnaislukuja"
+
+#: panels/applications/cc-snap-row.c:87
+msgid "Access files in your home folder"
+msgstr "Pääsy kotikansiosi tiedostoihin"
+
+#: panels/applications/cc-snap-row.c:89
+msgid "Access libvirt service"
+msgstr "Pääsy libvirt-palveluun"
+
+#: panels/applications/cc-snap-row.c:91
+msgid "Change system language and region settings"
+msgstr "Muuta järjestelmän kieltä ja alueasetuksia"
+
+#: panels/applications/cc-snap-row.c:93
+msgid "Change location settings and providers"
+msgstr "Muuta sijainnin asetuksia ja palveluntarjoajia"
+
+#: panels/applications/cc-snap-row.c:95
+msgid "Access your location"
+msgstr "Pääsy sijaintitietoosi"
+
+#: panels/applications/cc-snap-row.c:97
+msgid "Read system and application logs"
+msgstr "Lue järjestelmän ja sovellusten lokeja"
+
+#: panels/applications/cc-snap-row.c:99
+msgid "Access LXD service"
+msgstr "Pääsy LXD-palveluun"
+
+#: panels/applications/cc-snap-row.c:101
+msgid "access the media-hub service"
+msgstr "Pääsy media-hub-palveluun"
+
+#: panels/applications/cc-snap-row.c:103
+msgid "Use and configure modems"
+msgstr "Käytä ja muokkaa modeemeja"
+
+#: panels/applications/cc-snap-row.c:105
+msgid "Read system mount information and disk quotas"
+msgstr "Lue järjestelmän liitostietoja ja levykiintiöitä"
+
+#: panels/applications/cc-snap-row.c:107
+msgid "Control music and video players"
+msgstr "Hallitse musiikki- ja videosoittimia"
+
+#: panels/applications/cc-snap-row.c:111
+msgid "Change low-level network settings"
+msgstr "Muuta matalan tason verkkoasetuksia"
+
+#: panels/applications/cc-snap-row.c:113
+msgid "Access the NetworkManager service to read and change network settings"
+msgstr ""
+"Pääsy NetworkManager-palveluun sekä verkkoasetuksien luku- ja muutosoikeudet"
+
+#: panels/applications/cc-snap-row.c:115
+msgid "Read access to network settings"
+msgstr "Lukuoikeus verkkoasetuksiin"
+
+#: panels/applications/cc-snap-row.c:117
+msgid "Change network settings"
+msgstr "Muuta verkkoasetuksia"
+
+#: panels/applications/cc-snap-row.c:119
+msgid "Read network settings"
+msgstr "Lue verkon asetukset"
+
+#: panels/applications/cc-snap-row.c:121
+msgid ""
+"Access the ofono service to read and change network settings for mobile "
+"telephony"
+msgstr ""
+"Pääsy ofono-palveluun sekä mobiilipuhelinpalvelujen verkkoasetusten luku- ja "
+"muutosoikeudet"
+
+#: panels/applications/cc-snap-row.c:123
+msgid "Control Open vSwitch hardware"
+msgstr "Hallitse Open vSwitch -laitteita"
+
+#: panels/applications/cc-snap-row.c:125
+msgid "Read from CD/DVD"
+msgstr "Lue CD:ltä/DVD:ltä"
+
+#: panels/applications/cc-snap-row.c:127
+msgid "Read, add, change, or remove saved passwords"
+msgstr "Lue, lisää, muuta tai poista tallennettuja salasanoja"
+
+#: panels/applications/cc-snap-row.c:129
+msgid ""
+"Access pppd and ppp devices for configuring Point-to-Point Protocol "
+"connections"
+msgstr ""
+"Pääsy pppd- ja ppp-laitteisiin sekä muokkausoikeus Point-to-Point-"
+"yhteyskäytännön yhteyksiin"
+
+#: panels/applications/cc-snap-row.c:131
+msgid "Pause or end any process on the system"
+msgstr "Keskeytä tai lopeta mikä tahansa järjestelmän prosessi"
+
+#: panels/applications/cc-snap-row.c:135
+msgid "Access USB hardware directly"
+msgstr "Suora pääsy USB-laitteisiin"
+
+#: panels/applications/cc-snap-row.c:137
+msgid "Read/write files on removable storage devices"
+msgstr "Tieerillisissä tallennuslaitteissa"
+
+#: panels/applications/cc-snap-row.c:139
+msgid "Prevent screen sleep/lock"
+msgstr "Estä näytön lepotila ja lukitus"
+
+#: panels/applications/cc-snap-row.c:141
+msgid "Access serial port hardware"
+msgstr "Pääsy sarjaportin laitteisiin"
+
+#: panels/applications/cc-snap-row.c:143
+msgid "Restart or power off the device"
+msgstr "Sammuta tai käynnistä laite uudelleen"
+
+#: panels/applications/cc-snap-row.c:145
+msgid "Install, remove and configure software"
+msgstr "Asenna, poista ja muokkaa ohjelmistoja"
+
+#: panels/applications/cc-snap-row.c:147
+msgid "Access Storage Framework service"
+msgstr "Pääsy Storage Framework -palveluun"
+
+#: panels/applications/cc-snap-row.c:149
+msgid "Read process and system information"
+msgstr "Lue prosessi- ja järjestelmätietoja"
+
+#: panels/applications/cc-snap-row.c:151
+msgid "Monitor and control any running program"
+msgstr "Valvo ja hallitse mitä tahansa käynnissä olevaa ohjelmaa"
+
+#: panels/applications/cc-snap-row.c:153
+msgid "Change the date and time"
+msgstr "Vaihda päivää ja aikaa"
+
+#: panels/applications/cc-snap-row.c:155
+msgid "Change time server settings"
+msgstr "Vaihda aikapalvelimen asetuksia"
+
+#: panels/applications/cc-snap-row.c:157
+msgid "Change the time zone"
+msgstr "Vaihda aikavyöhykettä"
+
+#: panels/applications/cc-snap-row.c:159
+msgid "Access the UDisks2 service for configuring disks and removable media"
+msgstr "Pääsy UDisks2-palveluun sekä muokkaa levyjä ja irrotettavia medioita"
+
+#: panels/applications/cc-snap-row.c:161
+msgid "Read/change shared calendar events in Ubuntu Unity 8"
+msgstr "Lue ja muuta jaettuja kalenteritapahtumia Ubuntu Unity 8:ssa"
+
+#: panels/applications/cc-snap-row.c:163
+msgid "Read/change shared contacts in Ubuntu Unity 8"
+msgstr "Lue ja muuta jaettuja yhteystietoja Ubuntu Unity 8:ssa"
+
+#: panels/applications/cc-snap-row.c:165
+msgid "Access energy usage data"
+msgstr "Pääsy virrankäytön tietoihin"
+
+#: panels/applications/cc-snap-row.c:167
+msgid "Read/write access to U2F devices exposed"
+msgstr "Luku- ja kirjoitusoikeus altistetuille U2F-laitteille"
+
 #: panels/applications/gnome-applications-panel.desktop.in.in:4
 msgid "Control various application permissions and settings"
 msgstr "Hallitse sovellusten eri oikeuksia ja asetuksia"
@@ -353,40 +581,40 @@ msgstr "Hallitse sovellusten eri oikeuksia ja asetuksia"
 msgid "application;flatpak;permission;setting;"
 msgstr "application;flatpak;permission;setting;sovellus;käyttöoikeudet;asetus;"
 
-#: panels/background/cc-background-chooser.c:348
+#: panels/background/cc-background-chooser.c:349
 msgid "Select a picture"
 msgstr "Valitse kuva"
 
-#: panels/background/cc-background-chooser.c:351
-#: panels/color/cc-color-panel.c:241 panels/color/cc-color-panel.c:894
-#: panels/color/cc-color-panel.ui:657 panels/color/color-calibrate.ui:25
+#: panels/background/cc-background-chooser.c:352
+#: panels/color/cc-color-calibrate.ui:25 panels/color/cc-color-panel.c:241
+#: panels/color/cc-color-panel.c:894 panels/color/cc-color-panel.ui:657
 #: panels/common/cc-language-chooser.ui:24
 #: panels/display/cc-display-panel.c:950
+#: panels/info-overview/cc-info-overview-panel.ui:235
+#: panels/network/cc-wifi-hotspot-dialog.ui:122
 #: panels/network/connection-editor/connection-editor.ui:17
-#: panels/network/connection-editor/vpn-helpers.c:181
-#: panels/network/connection-editor/vpn-helpers.c:310
-#: panels/network/net-device-wifi.c:1260 panels/network/net-device-wifi.c:1340
-#: panels/network/net-device-wifi.c:1561 panels/network/network-wifi.ui:24
+#: panels/network/connection-editor/vpn-helpers.c:176
+#: panels/network/connection-editor/vpn-helpers.c:299
+#: panels/network/net-device-wifi.c:800 panels/network/net-device-wifi.c:908
 #: panels/printers/new-printer-dialog.ui:45
-#: panels/printers/pp-details-dialog.c:313
-#: panels/privacy/cc-privacy-panel.c:1137 panels/region/cc-format-chooser.ui:24
-#: panels/region/cc-input-chooser.ui:11
-#: panels/search/cc-search-locations-dialog.c:614
-#: panels/sharing/cc-sharing-panel.c:428
+#: panels/printers/pp-details-dialog.c:252
+#: panels/region/cc-format-chooser.ui:28 panels/region/cc-input-chooser.ui:11
+#: panels/search/cc-search-locations-dialog.c:638
+#: panels/sharing/cc-sharing-panel.c:428 panels/usage/cc-usage-panel.c:134
 #: panels/user-accounts/cc-add-user-dialog.ui:28
 #: panels/user-accounts/cc-avatar-chooser.c:107
 #: panels/user-accounts/cc-avatar-chooser.c:235
 #: panels/user-accounts/cc-password-dialog.ui:20
-#: panels/user-accounts/cc-user-panel.c:641
-#: panels/user-accounts/cc-user-panel.c:659
+#: panels/user-accounts/cc-user-panel.c:635
+#: panels/user-accounts/cc-user-panel.c:653
 #: panels/user-accounts/data/join-dialog.ui:20
 #: panels/user-accounts/um-fingerprint-dialog.c:261
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: panels/background/cc-background-chooser.c:352
-#: panels/network/connection-editor/vpn-helpers.c:182
-#: panels/printers/pp-details-dialog.c:314
+#: panels/background/cc-background-chooser.c:353
+#: panels/network/connection-editor/vpn-helpers.c:177
+#: panels/printers/pp-details-dialog.c:253
 #: panels/sharing/cc-sharing-panel.c:429
 #: panels/user-accounts/cc-avatar-chooser.c:236
 msgid "_Open"
@@ -448,45 +676,45 @@ msgstr "Vaihda taustakuva"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Taustakuva;Näyttö;Työpöytä;Wallpaper;Screen;Desktop;"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:309
+#: panels/bluetooth/cc-bluetooth-panel.ui:31
 msgid "No Bluetooth Found"
 msgstr "Bluetoothia ei löytynyt"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:310
+#: panels/bluetooth/cc-bluetooth-panel.ui:42
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "Liitä sovitin käyttääksesi Bluetoothia."
 
-#: panels/bluetooth/cc-bluetooth-panel.c:313
+#: panels/bluetooth/cc-bluetooth-panel.ui:69
 msgid "Bluetooth Turned Off"
 msgstr "Bluetooth on pois päältä"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:314
+#: panels/bluetooth/cc-bluetooth-panel.ui:80
 msgid "Turn on to connect devices and receive file transfers."
 msgstr "Kytke päälle yhdistääksesi laitteita ja vastaanottaaksesi tiedostoja."
 
-#: panels/bluetooth/cc-bluetooth-panel.c:317
+#: panels/bluetooth/cc-bluetooth-panel.ui:107
 msgid "Airplane Mode is on"
 msgstr "Lentokonetila on päällä"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:318
+#: panels/bluetooth/cc-bluetooth-panel.ui:118
 msgid "Bluetooth is disabled when airplane mode is on."
 msgstr "Bluetooth on pois käytöstä, kun lentokonetila on päällä."
 
-#: panels/bluetooth/cc-bluetooth-panel.c:321
+#: panels/bluetooth/cc-bluetooth-panel.ui:124
+msgid "Turn Off Airplane Mode"
+msgstr "Poista lentokonetila käytöstä"
+
+#: panels/bluetooth/cc-bluetooth-panel.ui:154
 msgid "Hardware Airplane Mode is on"
 msgstr "Laitetason lentokonetila on päällä"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:322
+#: panels/bluetooth/cc-bluetooth-panel.ui:165
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "Poista lentokonetila käytöstä käyttääksesi Bluetoothia."
 
-#: panels/bluetooth/cc-bluetooth-panel.c:324
-msgid "Turn Off Airplane Mode"
-msgstr "Poista lentokonetila käytöstä"
-
 #. Translators: The found device is a printer connected via Bluetooth
 #: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:3
-#: panels/printers/pp-new-printer-dialog.c:1697
+#: panels/printers/pp-new-printer-dialog.c:1714
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -499,6 +727,51 @@ msgstr "Kytke Bluetooth päälle tai pois ja yhdistä laitteita"
 msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;jakaminen;jaot;"
 
+#: panels/camera/cc-camera-panel.ui:34
+msgid "Camera is turned off"
+msgstr "Kamera on sammutettu"
+
+#: panels/camera/cc-camera-panel.ui:43
+msgid "No applications can capture photos or video."
+msgstr "Mikään sovellus ei voi ottaa valokuvia tai videota."
+
+#: panels/camera/cc-camera-panel.ui:77
+msgid ""
+"Use of the camera allows applications to capture photos and video. Disabling "
+"the camera may cause some applications to not function properly."
+msgstr ""
+"Kameran käyttö mahdollistaa sovellusten ottaa valo- ja videokuvaa. Kameran "
+"poistaminen käytöstä saattaa aiheuttaa ongelmia joidenkin sovellusten "
+"toimintaan."
+
+#: panels/camera/cc-camera-panel.ui:87
+msgid "Allow the applications below to use your camera."
+msgstr "Salli alla listattujen sovellusten käyttää kameraa."
+
+#: panels/camera/cc-camera-panel.ui:107
+msgid "No Applications Have Asked for Camera Access"
+msgstr "Mikään sovellus ei ole pyytänyt kameran käyttöoikeutta"
+
+#: panels/camera/gnome-camera-panel.desktop.in.in:4
+msgid "Protect your pictures"
+msgstr "Suojaa kuvasi"
+
+#. FIXME
+#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/camera/gnome-camera-panel.desktop.in.in:20
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:20
+#: panels/location/gnome-location-panel.desktop.in.in:20
+#: panels/lock/gnome-lock-panel.desktop.in.in:20
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:20
+#: panels/usage/gnome-usage-panel.desktop.in.in:20
+msgid ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;"
+msgstr ""
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;näyttö;lukitus;diagnostikka;kaatuminen;yksityinen;"
+"viimeisimmät;väliaikset;nimi;verkko;identiteetti;"
+
 #. TRANSLATORS: The user has to attach the sensor to the screen
 #: panels/color/cc-color-calibrate.c:348
 msgid "Place your calibration device over the square and press “Start”"
@@ -574,6 +847,25 @@ msgstr "Voit irrottaa kalibrointilaitteen."
 msgid "Do not disturb the calibration device while in progress"
 msgstr "Älä liikuta kalibrointilaitetta kesken kalibroinnin"
 
+#: panels/color/cc-color-calibrate.ui:7
+msgid "Display Calibration"
+msgstr "Näytön kalibrointi"
+
+#. This starts the calibration process
+#: panels/color/cc-color-calibrate.ui:40
+msgid "_Start"
+msgstr "_Käynnistä"
+
+#. This resumes the calibration process
+#: panels/color/cc-color-calibrate.ui:54
+msgid "_Resume"
+msgstr "_Jatka"
+
+#. This button returns the user back to the color control panel
+#: panels/color/cc-color-calibrate.ui:67 panels/region/cc-format-chooser.ui:64
+msgid "_Done"
+msgstr "_Valmis"
+
 #. TRANSLATORS: This refers to the TFT display on a laptop
 #: panels/color/cc-color-common.c:41
 msgid "Laptop Screen"
@@ -664,7 +956,7 @@ msgstr "Tuetut ICC-profiilit"
 
 #. TRANSLATORS: filter name on the file->open dialog
 #: panels/color/cc-color-panel.c:260
-#: panels/network/wireless-security/eap-method-fast.c:417
+#: panels/network/wireless-security/eap-method-fast.c:309
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
@@ -704,7 +996,7 @@ msgid "Save Profile"
 msgstr "Tallenna profiili"
 
 #: panels/color/cc-color-panel.c:895
-#: panels/network/connection-editor/vpn-helpers.c:311
+#: panels/network/connection-editor/vpn-helpers.c:300
 msgid "_Save"
 msgstr "_Tallenna"
 
@@ -872,7 +1164,7 @@ msgid "_Import File…"
 msgstr "_Tuo tiedosto\t…"
 
 #: panels/color/cc-color-panel.ui:672
-#: panels/network/connection-editor/net-connection-editor.c:497
+#: panels/network/connection-editor/net-connection-editor.c:513
 #: panels/printers/new-printer-dialog.ui:80
 #: panels/region/cc-input-chooser.ui:20
 #: panels/user-accounts/cc-add-user-dialog.ui:47
@@ -1101,25 +1393,6 @@ msgstr "Koko ruudun näyttökorjaus ei ole mahdollista tällä profiililla"
 msgid "This profile may no longer be accurate"
 msgstr "Tämä profiili ei välttämättä ole enää tarkka"
 
-#: panels/color/color-calibrate.ui:7
-msgid "Display Calibration"
-msgstr "Näytön kalibrointi"
-
-#. This starts the calibration process
-#: panels/color/color-calibrate.ui:40
-msgid "_Start"
-msgstr "_Käynnistä"
-
-#. This resumes the calibration process
-#: panels/color/color-calibrate.ui:54
-msgid "_Resume"
-msgstr "_Jatka"
-
-#. This button returns the user back to the color control panel
-#: panels/color/color-calibrate.ui:67 panels/region/cc-format-chooser.ui:13
-msgid "_Done"
-msgstr "_Valmis"
-
 #: panels/color/gnome-color-panel.desktop.in.in:3
 msgid "Color"
 msgstr "Värit"
@@ -1138,12 +1411,11 @@ msgstr "Väri;ICC;color;profiili;kalibrointi;Calibrate;Tulostin;Printer;Näyttö
 msgid "Other…"
 msgstr "Muu…"
 
-#: panels/common/cc-language-chooser.c:125
-#: panels/region/cc-format-chooser.c:296 panels/region/cc-input-chooser.c:178
+#: panels/common/cc-language-chooser.c:127 panels/region/cc-input-chooser.c:178
 msgid "More…"
 msgstr "Lisää…"
 
-#: panels/common/cc-language-chooser.c:142
+#: panels/common/cc-language-chooser.c:144
 msgid "No languages found"
 msgstr "Kieli ei löytynyt"
 
@@ -1155,13 +1427,25 @@ msgstr "Valitse kieli"
 msgid "_Select"
 msgstr "_Valitse"
 
+#: panels/common/cc-permission-infobar.ui:20
+msgid "Unlock…"
+msgstr "Avaa lukitus…"
+
+#: panels/common/cc-permission-infobar.ui:45
+msgid "Unlock to Change Settings"
+msgstr "Avaa lukitus muuttaaksesi asetuksia"
+
+#: panels/common/cc-permission-infobar.ui:55
+msgid "Some settings must be unlocked before they can be changed."
+msgstr "Joidenkin asetusten lukitus tulee avata, ennen kuin niitä voi muuttaa."
+
 #: panels/common/cc-util.c:127
-#: panels/network/connection-editor/ce-page-details.c:106
+#: panels/network/connection-editor/ce-page-details.c:143
 msgid "Today"
 msgstr "Tänään"
 
 #: panels/common/cc-util.c:131
-#: panels/network/connection-editor/ce-page-details.c:108
+#: panels/network/connection-editor/ce-page-details.c:145
 msgid "Yesterday"
 msgstr "Eilen"
 
@@ -1175,6 +1459,46 @@ msgstr "%e. %b"
 msgid "%b %e, %Y"
 msgstr "%e. %b %Y"
 
+#: panels/common/cc-util.c:165
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d tunti"
+msgstr[1] "%d tuntia"
+
+#: panels/common/cc-util.c:166
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuutti"
+msgstr[1] "%d minuuttia"
+
+#: panels/common/cc-util.c:167
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunti"
+msgstr[1] "%d sekuntia"
+
+#. 5 hours 2 minutes 12 seconds
+#: panels/common/cc-util.c:172
+#, c-format
+msgctxt "time"
+msgid "%s %s %s"
+msgstr "%s %s %s"
+
+#. 2 minutes 12 seconds
+#: panels/common/cc-util.c:177
+#, c-format
+msgctxt "time"
+msgid "%s %s"
+msgstr "%s %s"
+
+#. 0 seconds
+#: panels/common/cc-util.c:187
+msgid "0 seconds"
+msgstr "0 sekuntia"
+
 #. translators: This is the default hotspot name, need to be less than 32-bytes
 #: panels/common/hostname-helper.c:177
 msgctxt "hotspot"
@@ -1377,9 +1701,87 @@ msgstr "Muuta järjestelmän aika-asetuksia"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "Muuttaaksesi ajan tai päivän asetuksia sinun tulee tunnistautua."
 
+#: panels/default-apps/cc-default-apps-panel.ui:31
+msgid "_Web"
+msgstr "_Verkko"
+
+#: panels/default-apps/cc-default-apps-panel.ui:43
+msgid "_Mail"
+msgstr "_Sähköposti"
+
+#: panels/default-apps/cc-default-apps-panel.ui:59
+msgid "_Calendar"
+msgstr "_Kalenteri"
+
+#: panels/default-apps/cc-default-apps-panel.ui:75
+msgid "M_usic"
+msgstr "M_usiikki"
+
+#: panels/default-apps/cc-default-apps-panel.ui:91
+msgid "_Video"
+msgstr "_Video"
+
+#: panels/default-apps/cc-default-apps-panel.ui:162
+#: panels/removable-media/cc-removable-media-panel.ui:162
+msgid "_Photos"
+msgstr "_Kuvat"
+
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:3
+msgid "Default Applications"
+msgstr "Oletussovellukset"
+
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:4
+msgid "Configure Default Applications"
+msgstr "Määritä oletussovellukset"
+
+#. Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/default-apps/gnome-default-apps-panel.desktop.in.in:19
+msgid "default;application;preferred;media;"
+msgstr "default;application;preferred;media;oletussovellus;ensisijainen;"
+
+#. translators: '%s' is the distributor's name, such as 'Fedora'
+#: panels/diagnostics/cc-diagnostics-panel.c:141
+#, c-format
+msgid ""
+"Sending reports of technical problems helps us improve %s. Reports are sent "
+"anonymously and are scrubbed of personal data."
+msgstr ""
+"Vikailmoitusten lähettäminen auttaa parantamaan %sa. Ilmoitukset eivät "
+"sisällä henkilökohtaisia tietoja. Ilmoitukset lähetetään anonyymisti."
+
+#: panels/diagnostics/cc-diagnostics-panel.c:151
+#: panels/diagnostics/cc-diagnostics-panel.ui:53
+msgid "Reports are sent anonymously and are scrubbed of personal data."
+msgstr ""
+"Raportit lähetetään anonyymisti, ja niistä poistetaan henkilökohtaiset "
+"tiedot."
+
+#: panels/diagnostics/cc-diagnostics-panel.ui:30
+msgid "Problem Reporting"
+msgstr "Vikailmoitukset"
+
+#: panels/diagnostics/cc-diagnostics-panel.ui:43
+msgid ""
+"Sending reports of technical problems help us improve this operating system."
+msgstr ""
+"Teknisiin ongelmiin liittyvien raporttien lähettäminen auttaa meitä "
+"parantamaan tätä käyttöjärjestelmää."
+
+#: panels/diagnostics/cc-diagnostics-panel.ui:78
+msgid "_Automatic Problem Reporting"
+msgstr "_Automaattiset vikailmoitukset"
+
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:3
+msgid "Diagnostics"
+msgstr "Diagnostiikka"
+
+#: panels/diagnostics/gnome-diagnostics-panel.desktop.in.in:4
+msgid "Report your problems"
+msgstr "Ilmoita ongelmista"
+
+#. FIXME
 #: panels/display/cc-display-panel.c:961
 #: panels/network/connection-editor/connection-editor.ui:27
-#: panels/network/network-wifi.ui:38
 msgid "_Apply"
 msgstr "_Toteuta"
 
@@ -1412,6 +1814,14 @@ msgstr "Peili"
 msgid "Display Mode"
 msgstr "Näyttötila"
 
+#: panels/display/cc-display-panel.ui:222
+msgid "Contains top bar and Activities"
+msgstr "Sisältää yläpalkin ja Toiminnot"
+
+#: panels/display/cc-display-panel.ui:223
+msgid "Primary Display"
+msgstr "Ensisijainen näyttö"
+
 #: panels/display/cc-display-panel.ui:245
 msgid ""
 "Drag displays to match your physical display setup. Select a display to "
@@ -1424,6 +1834,10 @@ msgstr ""
 msgid "Display Arrangement"
 msgstr "Näyttöjen järjestys"
 
+#: panels/display/cc-display-panel.ui:387
+msgid "Active Display"
+msgstr "Aktiivinen näyttö"
+
 #: panels/display/cc-display-panel.ui:434
 msgid "Display Configuration"
 msgstr "Näyttömääritykset"
@@ -1526,7 +1940,7 @@ msgid "Manual Schedule"
 msgstr "Mukautettu aikataulu"
 
 #: panels/display/cc-night-light-page.ui:148
-#: panels/region/cc-format-chooser.ui:154
+#: panels/region/cc-format-chooser.ui:346
 msgid "Times"
 msgstr "Aika"
 
@@ -1573,37 +1987,11 @@ msgstr ""
 "redshift;color;sunset;sunrise;Paneeli;Projektori;Näyttö;Resoluutio;Tarkkuus;"
 "Virkistystaajuus;yövalo;"
 
-#: panels/info/cc-info-default-apps-panel.ui:31
-msgid "_Web"
-msgstr "_Verkko"
-
-#: panels/info/cc-info-default-apps-panel.ui:43
-msgid "_Mail"
-msgstr "_Sähköposti"
-
-#: panels/info/cc-info-default-apps-panel.ui:59
-msgid "_Calendar"
-msgstr "_Kalenteri"
-
-#: panels/info/cc-info-default-apps-panel.ui:75
-msgid "M_usic"
-msgstr "M_usiikki"
-
-#: panels/info/cc-info-default-apps-panel.ui:91
-msgid "_Video"
-msgstr "_Video"
-
-#: panels/info/cc-info-default-apps-panel.ui:162
-#: panels/info/cc-info-removable-media-panel.ui:162
-msgid "_Photos"
-msgstr "_Kuvat"
-
-#. TRANSLATORS: AP type
-#: panels/info/cc-info-overview-panel.c:369
-#: panels/info/cc-info-overview-panel.c:440
-#: panels/info/cc-info-overview-panel.c:452
-#: panels/info/cc-info-overview-panel.c:497
-#: panels/info/cc-info-overview-panel.c:527 panels/network/panel-common.c:123
+#: panels/info-overview/cc-info-overview-panel.c:406
+#: panels/info-overview/cc-info-overview-panel.c:421
+#: panels/info-overview/cc-info-overview-panel.c:433
+#: panels/info-overview/cc-info-overview-panel.c:479
+#: panels/info-overview/cc-info-overview-panel.c:509
 msgid "Unknown"
 msgstr "Tuntematon"
 
@@ -1611,217 +1999,106 @@ msgstr "Tuntematon"
 #. * example:
 #. * "Fedora 25 (Workstation Edition); Build ID: xyz" or
 #. * "Ubuntu 16.04 LTS; Build ID: jki"
-#: panels/info/cc-info-overview-panel.c:460
+#: panels/info-overview/cc-info-overview-panel.c:441
 #, c-format
 msgid "%s; Build ID: %s"
 msgstr "%s; koontitunniste: %s"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info/cc-info-overview-panel.c:477
+#: panels/info-overview/cc-info-overview-panel.c:456
 #, c-format
 msgid "64-bit"
 msgstr "64-bit"
 
 #. translators: This is the type of architecture for the OS
-#: panels/info/cc-info-overview-panel.c:480
+#: panels/info-overview/cc-info-overview-panel.c:459
 #, c-format
 msgid "32-bit"
 msgstr "32-bit"
 
-#: panels/info/cc-info-overview-panel.c:710
-#, c-format
-msgid "Version %s"
-msgstr "Versio %s"
+#: panels/info-overview/cc-info-overview-panel.c:665
+msgid "X11"
+msgstr "X11"
+
+#: panels/info-overview/cc-info-overview-panel.c:669
+msgid "Wayland"
+msgstr "Wayland"
 
-#: panels/info/cc-info-overview-panel.ui:70
-msgid "Device name"
+#: panels/info-overview/cc-info-overview-panel.c:671
+msgctxt "Windowing system (Wayland, X11, or Unknown)"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: panels/info-overview/cc-info-overview-panel.ui:54
+msgid "Device Name"
 msgstr "Laitteen nimi"
 
-#: panels/info/cc-info-overview-panel.ui:86
+#: panels/info-overview/cc-info-overview-panel.ui:76
 msgid "Memory"
 msgstr "Muisti"
 
-#: panels/info/cc-info-overview-panel.ui:102
+#: panels/info-overview/cc-info-overview-panel.ui:85
 msgid "Processor"
 msgstr "Suoritin"
 
-#: panels/info/cc-info-overview-panel.ui:118
+#: panels/info-overview/cc-info-overview-panel.ui:94
 msgid "Graphics"
 msgstr "Grafiikka"
 
-#. To translators: this field contains the distro name and version
-#: panels/info/cc-info-overview-panel.ui:133
-msgid "OS name"
+#: panels/info-overview/cc-info-overview-panel.ui:103
+msgid "Disk Capacity"
+msgstr "Levyn kapasiteetti"
+
+#: panels/info-overview/cc-info-overview-panel.ui:104
+msgid "Calculating…"
+msgstr "Lasketaan…"
+
+#. translators: this field contains the distro name and version
+#: panels/info-overview/cc-info-overview-panel.ui:126
+msgid "OS Name"
 msgstr "Käyttöjärjestelmän nimi"
 
-#. To translators: this field contains the distro type
-#: panels/info/cc-info-overview-panel.ui:149
-msgid "OS type"
+#: panels/info-overview/cc-info-overview-panel.ui:135
+msgid "OS Type"
 msgstr "Käyttöjärjestelmän tyyppi"
 
-#: panels/info/cc-info-overview-panel.ui:165
+#: panels/info-overview/cc-info-overview-panel.ui:144
+msgid "GNOME Version"
+msgstr "Gnome-versio"
+
+#: panels/info-overview/cc-info-overview-panel.ui:154
+msgid "Windowing System"
+msgstr "Ikkunointijärjestelmä"
+
+#: panels/info-overview/cc-info-overview-panel.ui:162
 msgid "Virtualization"
 msgstr "Virtualisointi"
 
-#: panels/info/cc-info-overview-panel.ui:181
-msgid "Disk"
-msgstr "Levy"
+#: panels/info-overview/cc-info-overview-panel.ui:171
+msgid "Software Updates"
+msgstr "Ohjelmistopäivitykset"
 
-#: panels/info/cc-info-overview-panel.ui:293
-msgid "Calculating…"
-msgstr "Lasketaan…"
+#: panels/info-overview/cc-info-overview-panel.ui:192
+msgid "Rename Device"
+msgstr "Nimeä laite uudelleen"
 
-#: panels/info/cc-info-overview-panel.ui:333
-msgid "Check for updates"
-msgstr "Tarkista päivitykset"
+#: panels/info-overview/cc-info-overview-panel.ui:209
+msgid ""
+"The device name is used to identify this device when it is viewed over the "
+"network, or when pairing Bluetooth devices."
+msgstr ""
+"Laitteen nimeä käytetään laitteen tunnistamiseen, kun sitä tarkastellaan "
+"verkossa tai paritetaan Bluetooth-laitteita."
 
-#: panels/info/cc-info-removable-media-panel.c:307
-msgid "Ask what to do"
-msgstr "Kysy mitä tehdään"
+#: panels/info-overview/cc-info-overview-panel.ui:226
+msgid "_Rename"
+msgstr "_Nimeä uudelleen"
 
-#: panels/info/cc-info-removable-media-panel.c:311
-msgid "Do nothing"
-msgstr "Älä tee mitään"
-
-#: panels/info/cc-info-removable-media-panel.c:315
-msgid "Open folder"
-msgstr "Avaa kansio"
-
-#: panels/info/cc-info-removable-media-panel.c:401
-msgid "Other Media"
-msgstr "Muu media"
-
-#: panels/info/cc-info-removable-media-panel.c:434
-msgid "Select an application for audio CDs"
-msgstr "Valitse sovellus ääni-CD-levyille"
-
-#: panels/info/cc-info-removable-media-panel.c:435
-msgid "Select an application for video DVDs"
-msgstr "Valitse sovellus video-DVD-levyille"
-
-#: panels/info/cc-info-removable-media-panel.c:436
-msgid "Select an application to run when a music player is connected"
-msgstr "Valitse sovellus ajettavaksi kun musiikkisoitin kytketään"
-
-#: panels/info/cc-info-removable-media-panel.c:437
-msgid "Select an application to run when a camera is connected"
-msgstr "Valitse sovellus ajettavaksi kun kamera kytketään"
-
-#: panels/info/cc-info-removable-media-panel.c:438
-msgid "Select an application for software CDs"
-msgstr "Valitse sovellus ohjelmisto-CD-levyille"
-
-#. translators: these strings are duplicates of shared-mime-info
-#. * strings, just here to fix capitalization of the English originals.
-#. * If the shared-mime-info translation works for your language,
-#. * simply leave these untranslated.
-#.
-#: panels/info/cc-info-removable-media-panel.c:450
-msgid "audio DVD"
-msgstr "ääni-DVD"
-
-#: panels/info/cc-info-removable-media-panel.c:451
-msgid "blank Blu-ray disc"
-msgstr "tyhjä Blu-ray-levy"
-
-#: panels/info/cc-info-removable-media-panel.c:452
-msgid "blank CD disc"
-msgstr "tyhjä CD-levy"
-
-#: panels/info/cc-info-removable-media-panel.c:453
-msgid "blank DVD disc"
-msgstr "tyhjä DVD-levy"
-
-#: panels/info/cc-info-removable-media-panel.c:454
-msgid "blank HD DVD disc"
-msgstr "tyhjä HD DVD -levy"
-
-#: panels/info/cc-info-removable-media-panel.c:455
-msgid "Blu-ray video disc"
-msgstr "Blu-ray-videolevy"
-
-#: panels/info/cc-info-removable-media-panel.c:456
-msgid "e-book reader"
-msgstr "e-kirjalukija"
-
-#: panels/info/cc-info-removable-media-panel.c:457
-msgid "HD DVD video disc"
-msgstr "HD DVD -videolevy"
-
-#: panels/info/cc-info-removable-media-panel.c:458
-msgid "Picture CD"
-msgstr "Kuva-CD"
-
-#: panels/info/cc-info-removable-media-panel.c:459
-msgid "Super Video CD"
-msgstr "Super Video CD"
-
-#: panels/info/cc-info-removable-media-panel.c:460
-msgid "Video CD"
-msgstr "Video-CD"
-
-#: panels/info/cc-info-removable-media-panel.c:461
-msgid "Windows software"
-msgstr "Windows-ohjelmisto"
-
-#: panels/info/cc-info-removable-media-panel.ui:44
-msgid "Select how media should be handled"
-msgstr "Valitse kuinka mediaa käsitellään"
-
-#: panels/info/cc-info-removable-media-panel.ui:75
-msgid "CD _audio"
-msgstr "_Ääni-CD"
-
-#: panels/info/cc-info-removable-media-panel.ui:92
-msgid "_DVD video"
-msgstr "_DVD-video"
-
-#: panels/info/cc-info-removable-media-panel.ui:133
-msgid "_Music player"
-msgstr "_Musiikkisoitin"
-
-#: panels/info/cc-info-removable-media-panel.ui:191
-msgid "_Software"
-msgstr "_Ohjelmisto"
-
-#: panels/info/cc-info-removable-media-panel.ui:229
-msgid "_Other Media…"
-msgstr "_Muu media…"
-
-#: panels/info/cc-info-removable-media-panel.ui:287
-msgid "_Never prompt or start programs on media insertion"
-msgstr "_Älä koskaan kysy tai käynnistä ohjelmia liitettäessä media"
-
-#: panels/info/cc-info-removable-media-panel.ui:339
-msgid "Select how other media should be handled"
-msgstr "Valitse kuinka muita medioita käsitellään"
-
-#: panels/info/cc-info-removable-media-panel.ui:378
-msgid "_Action:"
-msgstr "_Toiminto:"
-
-#: panels/info/cc-info-removable-media-panel.ui:401
-msgid "_Type:"
-msgstr "_Tyyppi:"
-
-#: panels/info/gnome-default-apps-panel.desktop.in.in:3
-msgid "Default Applications"
-msgstr "Oletussovellukset"
-
-#: panels/info/gnome-default-apps-panel.desktop.in.in:4
-msgid "Configure Default Applications"
-msgstr "Määritä oletussovellukset"
-
-#. Translators: Search terms to find the Default Applications panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/info/gnome-default-apps-panel.desktop.in.in:19
-msgid "default;application;preferred;media;"
-msgstr "default;application;preferred;media;oletussovellus;ensisijainen;"
-
-#: panels/info/gnome-info-overview-panel.desktop.in.in:3
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:3
 msgid "About"
 msgstr "Tietoja"
 
-#: panels/info/gnome-info-overview-panel.desktop.in.in:4
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:4
 msgid "View information about your system"
 msgstr "Katsele järjestelmän tietoja"
 
@@ -1830,35 +2107,20 @@ msgstr "Katsele järjestelmän tietoja"
 #. The list MUST also end with a semicolon!
 #. "Preferred Applications" is the old name for the preference, so make
 #. sure that you use the same "translation" for those keywords
-#: panels/info/gnome-info-overview-panel.desktop.in.in:23
+#: panels/info-overview/gnome-info-overview-panel.desktop.in.in:23
+#, fuzzy
+#| msgid ""
+#| "device;system;information;memory;processor;version;default;application;"
+#| "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgid ""
-"device;system;information;memory;processor;version;default;application;"
-"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+"device;system;information;hostname;memory;processor;version;default;"
+"application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgstr ""
 "device;system;information;memory;processor;version;default;application;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;laite;"
 "järjestelmä;tiedot;muisti;suoritin;prosessori;versio;oletukset;sovellus;"
 "suositellut;automaattikäynnistys;ääni;irrotettava;ulkoinen;"
 
-#: panels/info/gnome-removable-media-panel.desktop.in.in:3
-msgid "Removable Media"
-msgstr "Erilliset tallennusvälineet"
-
-#: panels/info/gnome-removable-media-panel.desktop.in.in:4
-msgid "Configure Removable Media settings"
-msgstr "Määritä erillisten tallennusvälineiden asetukset"
-
-#. Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
-#: panels/info/gnome-removable-media-panel.desktop.in.in:19
-msgid ""
-"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
-"removable;media;autorun;"
-msgstr ""
-"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
-"removable;media;autorun;laite;järjestelmä;tiedot;muisti;suoritin;prosessori;"
-"versio;oletukset;sovellus;suositellut;automaattikäynnistys;ääni;irrotettava;"
-"ulkoinen;"
-
 #: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
 msgstr "Ääni ja media"
@@ -2030,6 +2292,50 @@ msgstr "Pienennä tekstin kokoa"
 msgid "High contrast on or off"
 msgstr "Korkea kontrasti päälle/pois"
 
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:8
+#: panels/keyboard/cc-keyboard-panel.ui:72
+#, fuzzy
+#| msgid "Alternative Characters Key"
+msgid "Alternate Characters Key"
+msgstr "Vaihtoehtoinen merkistönäppäin"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:28
+msgid ""
+"The alternate characters key can be used to enter additional characters. "
+"These are sometimes printed as a third-option on your keyboard."
+msgstr ""
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:45
+#| msgid "Left+Right Alt"
+msgid "Left Alt"
+msgstr "Vasen Alt"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:61
+#| msgid "Left+Right Alt"
+msgid "Right Alt"
+msgstr "Oikea Alt"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:77
+#| msgid "Left thumb"
+msgid "Left Super"
+msgstr "Vasen Super"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:93
+#| msgid "Right thumb"
+msgid "Right Super"
+msgstr "Oikea Super"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:109
+#, fuzzy
+#| msgid "Security key"
+msgid "Menu key"
+msgstr "Salausavain"
+
+#: panels/keyboard/cc-alt-chars-key-dialog.ui:125
+#| msgid "Right Half"
+msgid "Right Ctrl"
+msgstr "Oikea Ctrl"
+
 #: panels/keyboard/cc-keyboard-manager.c:501
 #: panels/keyboard/cc-keyboard-manager.c:509
 #: panels/keyboard/cc-keyboard-manager.c:809
@@ -2058,11 +2364,48 @@ msgstr "Compose-näppäin"
 msgid "Modifiers-only switch to next source"
 msgstr "Vaihda seuraavaan lähteeseen"
 
-#: panels/keyboard/cc-keyboard-panel.c:180
+#: panels/keyboard/cc-keyboard-panel.c:94
+#| msgid "Right Half"
+msgctxt "keyboard key"
+msgid "Right Ctrl"
+msgstr "Oikea Ctrl"
+
+#: panels/keyboard/cc-keyboard-panel.c:95
+#, fuzzy
+#| msgid "_Mouse Keys"
+msgctxt "keyboard key"
+msgid "Menu Key"
+msgstr "_Hiirinäppäimet"
+
+#: panels/keyboard/cc-keyboard-panel.c:96
+#| msgid "Left thumb"
+msgctxt "keyboard key"
+msgid "Left Super"
+msgstr "Vasen Super"
+
+#: panels/keyboard/cc-keyboard-panel.c:97
+#| msgid "Right thumb"
+msgctxt "keyboard key"
+msgid "Right Super"
+msgstr "Oikea Super"
+
+#: panels/keyboard/cc-keyboard-panel.c:98
+#| msgid "Left+Right Alt"
+msgctxt "keyboard key"
+msgid "Left Alt"
+msgstr "Vasen Alt"
+
+#: panels/keyboard/cc-keyboard-panel.c:99
+#| msgid "Left+Right Alt"
+msgctxt "keyboard key"
+msgid "Right Alt"
+msgstr "Oikea Alt"
+
+#: panels/keyboard/cc-keyboard-panel.c:201
 msgid "Reset All Shortcuts?"
 msgstr "Palautetaanko kaikkien pikanäppäinten oletukset?"
 
-#: panels/keyboard/cc-keyboard-panel.c:183
+#: panels/keyboard/cc-keyboard-panel.c:204
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
@@ -2070,38 +2413,45 @@ msgstr ""
 "Pikanäppäinten oletusten palauttaminen vaikuttaa asettamiisi pikanäppäimiin. "
 "Tätä toimintoa ei voi perua."
 
-#: panels/keyboard/cc-keyboard-panel.c:187
-#: panels/keyboard/shortcut-editor.ui:346
+#: panels/keyboard/cc-keyboard-panel.c:208
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:346
 #: panels/printers/authentication-dialog.ui:29
 #: panels/printers/ppd-selection-dialog.ui:27
 msgid "Cancel"
 msgstr "Peru"
 
-#: panels/keyboard/cc-keyboard-panel.c:188
+#: panels/keyboard/cc-keyboard-panel.c:209
 msgid "Reset All"
 msgstr "Palauta kaikki oletusasetukset"
 
-#: panels/keyboard/cc-keyboard-panel.c:284
+#: panels/keyboard/cc-keyboard-panel.c:305
 msgid "Reset the shortcut to its default value"
 msgstr "Palauta pikanäppäin oletusarvoon"
 
-#: panels/keyboard/cc-keyboard-panel.ui:116
+#: panels/keyboard/cc-keyboard-panel.ui:73
+#, fuzzy
+#| msgid "The new password does not contain enough different characters"
+msgid "Hold down and type to enter different characters"
+msgstr "Uusi salasana ei sisällä riittävästi eri merkkejä"
+
+#: panels/keyboard/cc-keyboard-panel.ui:147
 msgid "Reset All…"
 msgstr "Palauta kaikki oletusasetukset…"
 
-#: panels/keyboard/cc-keyboard-panel.ui:117
+#: panels/keyboard/cc-keyboard-panel.ui:148
 msgid "Reset all shortcuts to their default keybindings"
 msgstr "Palauta kaikki pikanäppäimet oletusarvoihin"
 
-#: panels/keyboard/cc-keyboard-panel.ui:146
+#: panels/keyboard/cc-keyboard-panel.ui:177
 msgid "No keyboard shortcut found"
 msgstr "Näppäimistön pikanäppäintä ei löytynyt"
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:411
-#, c-format
-msgid ""
-"%s is already being used for <b>%s</b>. If you replace it, %s will be "
-"disabled"
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:413
+#, fuzzy, c-format
+#| msgid ""
+#| "%s is already being used for <b>%s</b>. If you replace it, %s will be "
+#| "disabled"
+msgid "%s is already being used for %s. If you replace it, %s will be disabled"
 msgstr ""
 "Pikanäppäin %s on jo asetettu toimintoon <b>%s</b>. Jos korvaat sen, "
 "poistetaan toiminto %s poistetaan käytöstä"
@@ -2114,235 +2464,438 @@ msgstr "Aseta oma pikanäppäin"
 msgid "Set Shortcut"
 msgstr "Aseta pikanäppäin"
 
-#. Setup the top label
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:590
-#, c-format
-msgid "Enter new shortcut to change <b>%s</b>."
+#. TRANSLATORS: %s is replaced with a description of the keyboard shortcut
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:592
+#, fuzzy, c-format
+#| msgid "Enter new shortcut to change <b>%s</b>."
+msgid "Enter new shortcut to change %s."
 msgstr "Anna uusi pikanäppäin vaihtaaksesi <b>%s</b>."
 
-#: panels/keyboard/cc-keyboard-shortcut-editor.c:1017
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:1016
 msgid "Add Custom Shortcut"
 msgstr "Lisää oma pikanäppäin"
 
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
-#: panels/region/cc-region-panel.ui:394 shell/cc-window.ui:340
-msgid "Keyboard Shortcuts"
-msgstr "Pikanäppäimet"
-
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
-msgid "View and change keyboard shortcuts and set your typing preferences"
-msgstr ""
-"Katsele ja muuta näppäimistön pikanäppäimiä ja aseta kirjoitusasetuksesi"
-
-#. Translators: Search terms to find the Keyboard panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
-#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:19
-msgid ""
-"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
-msgstr ""
-"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
-"pikanäppäin;työtila;ikkuna;syöte;"
-
-#: panels/keyboard/shortcut-editor.ui:68 panels/keyboard/shortcut-editor.ui:318
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:68
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:318
 msgid "Press Esc to cancel or Backspace to disable the keyboard shortcut."
 msgstr ""
 "Paina Esc peruaksesi tai askelpalautinta poistaaksesi pikanäppäimen käytöstä."
 
-#: panels/keyboard/shortcut-editor.ui:156 panels/printers/details-dialog.ui:38
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:156
+#: panels/printers/pp-details-dialog.ui:40
 msgid "Name"
 msgstr "Nimi"
 
-#: panels/keyboard/shortcut-editor.ui:168
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:168
 msgid "Command"
 msgstr "Komento"
 
-#: panels/keyboard/shortcut-editor.ui:180
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:180
 msgid "Shortcut"
 msgstr "Pikanäppäin"
 
-#: panels/keyboard/shortcut-editor.ui:259
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:259
 msgid "Set Shortcut…"
 msgstr "Aseta pikanäppäin…"
 
-#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:593
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:272
 msgid "None"
 msgstr "Ei mikään"
 
-#: panels/keyboard/shortcut-editor.ui:303
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:303
 msgid "Enter the new shortcut"
 msgstr "Anna uusi pikanäppäin"
 
-#: panels/keyboard/shortcut-editor.ui:357
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:357
 msgid "Remove"
 msgstr "Poista"
 
-#: panels/keyboard/shortcut-editor.ui:367
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:367
 msgid "Add"
 msgstr "Lisää"
 
-#: panels/keyboard/shortcut-editor.ui:382
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:382
 msgid "Replace"
 msgstr "Korvaa"
 
-#: panels/keyboard/shortcut-editor.ui:395
+#: panels/keyboard/cc-keyboard-shortcut-editor.ui:395
 msgid "Set"
 msgstr "Aseta"
 
-#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:463
-msgid "Test Your _Settings"
-msgstr "_Testaa asetukset"
-
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
-msgid "Mouse & Touchpad"
-msgstr "Hiiri ja kosketuslevy"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
+#: panels/region/cc-region-panel.ui:394 shell/cc-window.ui:327
+msgid "Keyboard Shortcuts"
+msgstr "Pikanäppäimet"
 
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
-msgid ""
-"Change your mouse or touchpad sensitivity and select right or left-handed"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
+msgid "View and change keyboard shortcuts and set your typing preferences"
 msgstr ""
-"Muuta hiiren tai kosketuslevyn herkkyyttä ja valitse kumpaa kättä käytät"
+"Katsele ja muuta näppäimistön pikanäppäimiä ja aseta kirjoitusasetuksesi"
 
-#. Translators: Search terms to find the Mouse and Touchpad panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/mouse/gnome-mouse-panel.desktop.in.in:19
-msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
+#. Translators: Search terms to find the Keyboard panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:19
+msgid ""
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 msgstr ""
-"Kosketuslevy;Trackpad;Osoitin;Kohdistin;Napsauta;Klikkaa;Painike;Nappi;"
-"Kaksois;Pallohiiri;Trackball;vieritä;Tap;Double;Button;Tuplaklikkaa;Kaksois;"
-"Scroll;"
+"Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
+"pikanäppäin;työtila;ikkuna;syöte;"
 
-#: panels/mouse/gnome-mouse-properties.ui:50
-msgid "General"
-msgstr "Yleiset"
+#: panels/location/cc-location-panel.ui:31
+msgid "Location services turned off"
+msgstr "Sijaintipalvelut on sammutettu"
 
-#: panels/mouse/gnome-mouse-properties.ui:88
-msgid "Primary Button"
-msgstr "Ensisijainen painike"
+#: panels/location/cc-location-panel.ui:40
+msgid "No applications can obtain location information."
+msgstr "Mikään sovellus ei voi saada sijaintitietoa."
 
-#: panels/mouse/gnome-mouse-properties.ui:107
-msgid "Sets the order of physical buttons on mice and touchpads."
+#: panels/location/cc-location-panel.ui:74
+msgid ""
+"Location services allow applications to know your location. Using Wi-Fi and "
+"mobile broadband increases accuracy."
 msgstr ""
-"Aseta fyysisten painikkeiden järjestys hiirien ja kosketuslevyjen kohdalla."
+"Sijaintipalvelut mahdollistavat sovellusten paikantaa sijaintisi. Tarkkuus "
+"paranee wifiä ja mobiiliyhteyttä käyttäen."
 
-#: panels/mouse/gnome-mouse-properties.ui:136
-#: panels/sound/cc-balance-slider.ui:13
-msgid "Left"
-msgstr "Vasen"
+#: panels/location/cc-location-panel.ui:83
+msgid ""
+"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
+"com/privacy'>Privacy Policy</a>"
+msgstr ""
+"Käyttää Mozillan paikannuspalvelua: <a href='https://location.services.";
+"mozilla.com/privacy'>yksityisyyskäytäntö</a>"
 
-#: panels/mouse/gnome-mouse-properties.ui:146
-#: panels/sound/cc-balance-slider.ui:15
-msgid "Right"
-msgstr "Oikea"
+#: panels/location/cc-location-panel.ui:95
+msgid "Allow the applications below to determine your location."
+msgstr "Salli alla listattujen sovellusten määrittää sijaintisi."
 
-#: panels/mouse/gnome-mouse-properties.ui:182
-msgid "Mouse"
-msgstr "Hiiri"
+#: panels/location/cc-location-panel.ui:115
+msgid "No Applications Have Asked for Location Access"
+msgstr "Mikään sovellus ei ole pyytänyt sijainnin käyttöoikeutta"
 
-#: panels/mouse/gnome-mouse-properties.ui:221
-msgid "Mouse Speed"
-msgstr "Hiiren nopeus"
+#: panels/location/gnome-location-panel.desktop.in.in:4
+msgid "Protect your location information"
+msgstr "Suojaa sijaintitietoasi"
 
-#: panels/mouse/gnome-mouse-properties.ui:243
-#: panels/mouse/gnome-mouse-properties.ui:535
-msgid "Double-click timeout"
-msgstr "Kaksoisnapsautuksen aikaraja"
+#. FIXME
+#: panels/lock/cc-lock-panel.ui:29
+msgid ""
+"Automatically locking the screen prevents others from access the computer "
+"while you're away."
+msgstr ""
+"Näytön automaattinen lukitus estää muita käyttämästä laitetta "
+"käyttäjätililläsi, kun olet pois."
 
-#. Translators: This switch reverses the scrolling direction for mices. The term used comes from OS X so use 
the same translation if possible.
-#. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
-#: panels/mouse/gnome-mouse-properties.ui:280
-#: panels/mouse/gnome-mouse-properties.ui:443
-msgid "Natural Scrolling"
-msgstr "Luonnollinen vieritys"
+#: panels/lock/cc-lock-panel.ui:46
+msgid "Blank Screen Delay"
+msgstr "Tyhjän näytön viive"
 
-#: panels/mouse/gnome-mouse-properties.ui:296
-#: panels/mouse/gnome-mouse-properties.ui:459
-msgid "Scrolling moves the content, not the view."
-msgstr "Vieritys liikuttaa sisältöä, ei näkymää."
+#: panels/lock/cc-lock-panel.ui:47
+msgid "Period of inactivity after which the screen will go blank."
+msgstr ""
 
-#: panels/mouse/gnome-mouse-properties.ui:346
-#: panels/mouse/gnome-mouse-properties.ui:391
-msgid "Touchpad"
-msgstr "Kosketuslevy"
+#: panels/lock/cc-lock-panel.ui:67
+msgid "Automatic Screen _Lock"
+msgstr "_Automaattinen näytön lukitus"
 
-#: panels/mouse/gnome-mouse-properties.ui:514
-msgid "Touchpad Speed"
-msgstr "Kosketuslevyn nopeus"
+#: panels/lock/cc-lock-panel.ui:84
+msgid "Automatic _Screen Lock Delay"
+msgstr "_Automaattisen näytön lukituksen viive"
 
-#: panels/mouse/gnome-mouse-properties.ui:573
-msgid "Tap to Click"
-msgstr "Napsauta napauttamalla"
+#: panels/lock/cc-lock-panel.ui:85
+msgid "Period after the screen blanks when the screen is automatically locked."
+msgstr ""
 
-#: panels/mouse/gnome-mouse-properties.ui:625
-msgid "Two-finger Scrolling"
-msgstr "Kahden sormen vieritys"
+#: panels/lock/cc-lock-panel.ui:105
+msgid "Show _Notifications on Lock Screen"
+msgstr "_Näytä ilmoitukset lukitusnäytöllä"
 
-#: panels/mouse/gnome-mouse-properties.ui:678
-msgid "Edge Scrolling"
-msgstr "Reunavieritys"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:149
+msgctxt "lock_screen"
+msgid "Screen Turns Off"
+msgstr "Näyttö sammuu"
 
-#: panels/mouse/gnome-mouse-test.c:132 panels/mouse/gnome-mouse-test.ui:25
-msgid "Try clicking, double clicking, scrolling"
-msgstr "Kokeile napsauttamista, kaksoisnapsauttamista ja vierittämistä"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:153
+msgctxt "lock_screen"
+msgid "30 seconds"
+msgstr "30 sekuntia"
 
-#: panels/mouse/gnome-mouse-test.c:137
-msgid "Five clicks, GEGL time!"
-msgstr "Viisi napsautusta, GEGL-aika!"
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:157
+msgctxt "lock_screen"
+msgid "1 minute"
+msgstr "1 minuutti"
 
-#: panels/mouse/gnome-mouse-test.c:142
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:161
+msgctxt "lock_screen"
+msgid "2 minutes"
+msgstr "2 minuuttia"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:165
+msgctxt "lock_screen"
+msgid "3 minutes"
+msgstr "3 minuuttia"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:169
+msgctxt "lock_screen"
+msgid "5 minutes"
+msgstr "5 minuuttia"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:173
+msgctxt "lock_screen"
+msgid "30 minutes"
+msgstr "30 minuuttia"
+
+#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
+#: panels/lock/cc-lock-panel.ui:177
+msgctxt "lock_screen"
+msgid "1 hour"
+msgstr "1 tunti"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:192 panels/power/cc-power-panel.ui:63
+msgctxt "blank_screen"
+msgid "1 minute"
+msgstr "1 minuutti"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:196 panels/power/cc-power-panel.ui:67
+msgctxt "blank_screen"
+msgid "2 minutes"
+msgstr "2 minuuttia"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:200 panels/power/cc-power-panel.ui:71
+msgctxt "blank_screen"
+msgid "3 minutes"
+msgstr "3 minuuttia"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:204 panels/power/cc-power-panel.ui:75
+msgctxt "blank_screen"
+msgid "4 minutes"
+msgstr "4 minuuttia"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:208 panels/power/cc-power-panel.ui:79
+msgctxt "blank_screen"
+msgid "5 minutes"
+msgstr "5 minuuttia"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:212 panels/power/cc-power-panel.ui:83
+msgctxt "blank_screen"
+msgid "8 minutes"
+msgstr "8 minuuttia"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:216 panels/power/cc-power-panel.ui:87
+msgctxt "blank_screen"
+msgid "10 minutes"
+msgstr "10 minuuttia"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:220 panels/power/cc-power-panel.ui:91
+msgctxt "blank_screen"
+msgid "12 minutes"
+msgstr "12 minuuttia"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:224 panels/power/cc-power-panel.ui:95
+msgctxt "blank_screen"
+msgid "15 minutes"
+msgstr "15 minuuttia"
+
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/lock/cc-lock-panel.ui:228 panels/power/cc-power-panel.ui:99
+msgctxt "blank_screen"
+msgid "Never"
+msgstr "Ei koskaan"
+
+#: panels/lock/gnome-lock-panel.desktop.in.in:3
+msgid "Screen Lock"
+msgstr "Näytön lukitus"
+
+#: panels/lock/gnome-lock-panel.desktop.in.in:4
+msgid "Lock your screen"
+msgstr "Lukitse näyttö"
+
+#. FIXME
+#: panels/microphone/cc-microphone-panel.ui:34
+msgid "Microphone is turned off"
+msgstr "Mikrofoni on sammutettu"
+
+#: panels/microphone/cc-microphone-panel.ui:43
+msgid "No applications can record sound."
+msgstr "Sovellukset eivät voi tallentaa ääntä."
+
+#: panels/microphone/cc-microphone-panel.ui:77
+#, fuzzy
+#| msgid ""
+#| "Use of the microphone allows applications to capture sounds. Disabling "
+#| "the microphone may cause some applications to not function properly."
+msgid ""
+"Use of the microphone allows applications to record and listen to audio. "
+"Disabling the microphone may cause some applications to not function "
+"properly."
+msgstr ""
+"Mikrofonin käyttö mahdollistaa sovellusten tallentaa ääntä. Mikrofonin "
+"poistaminen käytöstä saattaa aiheuttaa ongelmia joidenkin sovellusten "
+"toimintaan."
+
+#: panels/microphone/cc-microphone-panel.ui:87
+msgid "Allow the applications below to use your microphone."
+msgstr "Salli alla listattujen sovellusten käyttää mikrofonia."
+
+#: panels/microphone/cc-microphone-panel.ui:107
+msgid "No Applications Have Asked for Microphone Access"
+msgstr "Mikään sovellus ei ole pyytänyt mikrofonin käyttöoikeutta"
+
+#: panels/microphone/gnome-microphone-panel.desktop.in.in:4
+msgid "Protect your conversations"
+msgstr "Suojaa keskustelusi"
+
+#. FIXME
+#: panels/mouse/cc-mouse-panel.ui:37
+msgid "General"
+msgstr "Yleiset"
+
+#: panels/mouse/cc-mouse-panel.ui:75
+msgid "Primary Button"
+msgstr "Ensisijainen painike"
+
+#: panels/mouse/cc-mouse-panel.ui:94
+msgid "Sets the order of physical buttons on mice and touchpads."
+msgstr ""
+"Aseta fyysisten painikkeiden järjestys hiirien ja kosketuslevyjen kohdalla."
+
+#: panels/mouse/cc-mouse-panel.ui:123 panels/sound/cc-balance-slider.ui:13
+msgid "Left"
+msgstr "Vasen"
+
+#: panels/mouse/cc-mouse-panel.ui:133 panels/sound/cc-balance-slider.ui:15
+msgid "Right"
+msgstr "Oikea"
+
+#: panels/mouse/cc-mouse-panel.ui:169
+msgid "Mouse"
+msgstr "Hiiri"
+
+#: panels/mouse/cc-mouse-panel.ui:208
+msgid "Mouse Speed"
+msgstr "Hiiren nopeus"
+
+#: panels/mouse/cc-mouse-panel.ui:230 panels/mouse/cc-mouse-panel.ui:522
+msgid "Double-click timeout"
+msgstr "Kaksoisnapsautuksen aikaraja"
+
+#. Translators: This switch reverses the scrolling direction for mices. The term used comes from OS X so use 
the same translation if possible.
+#. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so 
use the same translation if possible.
+#: panels/mouse/cc-mouse-panel.ui:267 panels/mouse/cc-mouse-panel.ui:430
+msgid "Natural Scrolling"
+msgstr "Luonnollinen vieritys"
+
+#: panels/mouse/cc-mouse-panel.ui:283 panels/mouse/cc-mouse-panel.ui:446
+msgid "Scrolling moves the content, not the view."
+msgstr "Vieritys liikuttaa sisältöä, ei näkymää."
+
+#: panels/mouse/cc-mouse-panel.ui:333 panels/mouse/cc-mouse-panel.ui:378
+msgid "Touchpad"
+msgstr "Kosketuslevy"
+
+#: panels/mouse/cc-mouse-panel.ui:501
+msgid "Touchpad Speed"
+msgstr "Kosketuslevyn nopeus"
+
+#: panels/mouse/cc-mouse-panel.ui:560
+msgid "Tap to Click"
+msgstr "Napsauta napauttamalla"
+
+#: panels/mouse/cc-mouse-panel.ui:612
+msgid "Two-finger Scrolling"
+msgstr "Kahden sormen vieritys"
+
+#: panels/mouse/cc-mouse-panel.ui:665
+msgid "Edge Scrolling"
+msgstr "Reunavieritys"
+
+#: panels/mouse/cc-mouse-panel.ui:719 panels/wacom/cc-wacom-panel.c:438
+msgid "Test Your _Settings"
+msgstr "_Testaa asetukset"
+
+#: panels/mouse/cc-mouse-test.c:132 panels/mouse/cc-mouse-test.ui:25
+msgid "Try clicking, double clicking, scrolling"
+msgstr "Kokeile napsauttamista, kaksoisnapsauttamista ja vierittämistä"
+
+#: panels/mouse/cc-mouse-test.c:137
+msgid "Five clicks, GEGL time!"
+msgstr "Viisi napsautusta, GEGL-aika!"
+
+#: panels/mouse/cc-mouse-test.c:142
 msgid "Double click, primary button"
 msgstr "Kaksoisnapsautus, ensisijainen painike"
 
-#: panels/mouse/gnome-mouse-test.c:142
+#: panels/mouse/cc-mouse-test.c:142
 msgid "Single click, primary button"
 msgstr "Yksi napsautus, ensisijainen painike"
 
-#: panels/mouse/gnome-mouse-test.c:145
+#: panels/mouse/cc-mouse-test.c:145
 msgid "Double click, middle button"
 msgstr "Kaksoisnapsautus, keskimmäinen painike"
 
-#: panels/mouse/gnome-mouse-test.c:145
+#: panels/mouse/cc-mouse-test.c:145
 msgid "Single click, middle button"
 msgstr "Yksi napsautus, keskimmäinen painike"
 
-#: panels/mouse/gnome-mouse-test.c:148
+#: panels/mouse/cc-mouse-test.c:148
 msgid "Double click, secondary button"
 msgstr "Kaksoisnapsautus, toissijainen painike"
 
-#: panels/mouse/gnome-mouse-test.c:148
+#: panels/mouse/cc-mouse-test.c:148
 msgid "Single click, secondary button"
 msgstr "Yksi napsautus, toissijainen painike"
 
-#. add proxy to device list
-#: panels/network/cc-network-panel.c:590
-msgid "Network proxy"
-msgstr "Verkon välityspalvelin"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
+msgid "Mouse & Touchpad"
+msgstr "Hiiri ja kosketuslevy"
 
-#. Translators: this is the title of the connection details
-#. * window for vpn connections, it is also used to display
-#. * vpn connections in the device list.
-#.
-#: panels/network/cc-network-panel.c:725 panels/network/net-vpn.c:167
-#: panels/network/net-vpn.c:295
-#, c-format
-msgid "%s VPN"
-msgstr "%s - VPN"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
+msgid ""
+"Change your mouse or touchpad sensitivity and select right or left-handed"
+msgstr ""
+"Muuta hiiren tai kosketuslevyn herkkyyttä ja valitse kumpaa kättä käytät"
+
+#. Translators: Search terms to find the Mouse and Touchpad panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:19
+msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
+msgstr ""
+"Kosketuslevy;Trackpad;Osoitin;Kohdistin;Napsauta;Klikkaa;Painike;Nappi;"
+"Kaksois;Pallohiiri;Trackball;vieritä;Tap;Double;Button;Tuplaklikkaa;Kaksois;"
+"Scroll;"
 
-#: panels/network/cc-network-panel.c:789 panels/network/cc-wifi-panel.ui:306
+#: panels/network/cc-network-panel.c:648 panels/network/cc-wifi-panel.ui:306
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "Hups, jokin taisi mennä pieleen. Ota yhteys sovellustoimittajaan."
 
-#: panels/network/cc-network-panel.c:795
+#: panels/network/cc-network-panel.c:654
 msgid "NetworkManager needs to be running."
 msgstr "NetworkManagerin tulee olla käynnissä."
 
-#: panels/network/cc-network-panel.ui:102
+#: panels/network/cc-network-panel.ui:68
 msgid "Other Devices"
 msgstr "Muut laitteet"
 
-#: panels/network/cc-network-panel.ui:143
-#: panels/network/connection-editor/net-connection-editor.c:581
+#: panels/network/cc-network-panel.ui:109
+#: panels/network/connection-editor/net-connection-editor.c:596
 msgid "VPN"
 msgstr "VPN"
 
-#: panels/network/cc-network-panel.ui:195
+#: panels/network/cc-network-panel.ui:153
 msgid "Not set up"
 msgstr "Ei määritetty"
 
@@ -2353,16 +2906,81 @@ msgctxt "Wi-Fi Connection"
 msgid "%s (SSID: %s)"
 msgstr "%s (SSID: %s)"
 
+#: panels/network/cc-wifi-connection-row.c:249
+msgid "Insecure network (WEP)"
+msgstr "Turvaton verkko (WEP)"
+
+#: panels/network/cc-wifi-connection-row.c:254
+msgid "Secure network (WPA)"
+msgstr "Turvallinen verkko (WPA)"
+
+#: panels/network/cc-wifi-connection-row.c:259
+msgid "Secure network (WPA2)"
+msgstr "Turvallinen verkko (WPA2)"
+
+#: panels/network/cc-wifi-connection-row.c:264
+msgid "Secure network"
+msgstr "Turvallinen verkko"
+
 #: panels/network/cc-wifi-connection-row.ui:102
-#: panels/network/net-device-ethernet.c:359
-#: panels/network/network-ethernet.ui:120 panels/network/network-mobile.ui:394
-#: panels/network/network-simple.ui:75 panels/network/network-vpn.ui:79
+#: panels/network/net-device-ethernet.c:318
+#: panels/network/network-bluetooth.ui:76
+#: panels/network/network-ethernet.ui:102 panels/network/network-mobile.ui:414
+#: panels/network/network-vpn.ui:78
 msgid "Options…"
 msgstr "Valinnat…"
 
-#: panels/network/cc-wifi-panel.c:284
+#. TRANSLATORS: ‘%s’ is a Wi-Fi Network(SSID) name
+#: panels/network/cc-wifi-hotspot-dialog.c:132
+#, c-format
+msgid ""
+"Turning on the hotspot will disconnect from %s, and it will not be possible "
+"to access the internet through Wi-Fi."
+msgstr ""
+
+#: panels/network/cc-wifi-hotspot-dialog.c:248
+msgid "Must have a minimum of 8 characters"
+msgstr "Tulee olla vähintään 8 merkkiä"
+
+#: panels/network/cc-wifi-hotspot-dialog.c:458
+msgid "Turn On Wi-Fi Hotspot?"
+msgstr "Otetaanko wifi-yhteyspiste käyttöön?"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:19
+msgid ""
+"Wi-Fi hotspot allows others to share your internet connection, by creating a "
+"Wi-Fi network that they can connect to. To do this, you must have an "
+"internet connection through a source other than Wi-Fi."
+msgstr ""
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:44
+#: panels/network/network-wifi.ui:105
+msgid "Network Name"
+msgstr "Verkon nimi"
+
+#. Translators: This is a password needed for printing.
+#: panels/network/cc-wifi-hotspot-dialog.ui:69
+#: panels/printers/authentication-dialog.ui:96
+#: panels/printers/jobs-dialog.ui:70 panels/printers/new-printer-dialog.ui:383
+#: panels/user-accounts/cc-add-user-dialog.ui:249
+msgid "Password"
+msgstr "Salasana"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:83
+msgid "Generate Random Password"
+msgstr "Luo satunnainen salasana"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:84
+msgid "Autogenerate Password"
+msgstr "Luo automaattisesti salasana"
+
+#: panels/network/cc-wifi-hotspot-dialog.ui:130
+msgid "_Turn On"
+msgstr "_Ota käyttöön"
+
+#: panels/network/cc-wifi-panel.c:277
 #: panels/network/gnome-wifi-panel.desktop.in.in:3
-#: panels/network/network-wifi.ui:1738
+#: panels/network/network-wifi.ui:233
 msgid "Wi-Fi"
 msgstr "Wifi"
 
@@ -2398,57 +3016,33 @@ msgstr "Näkyvissä olevat verkot"
 msgid "NetworkManager needs to be running"
 msgstr "NetworkManagerin tulee olla käynnissä"
 
-#: panels/network/connection-editor/8021x-security-page.ui:26
+#: panels/network/connection-editor/8021x-security-page.ui:20
 msgid "802.1x _Security"
 msgstr "802.1x-suojaus"
 
-#: panels/network/connection-editor/8021x-security-page.ui:73
-#: panels/network/connection-editor/security-page.ui:72
-msgid "page 1"
-msgstr "sivu 1"
-
-#: panels/network/connection-editor/8021x-security-page.ui:224
-#: panels/network/connection-editor/security-page.ui:223
-#: panels/network/wireless-security/eap-method-fast.ui:50
-#: panels/network/wireless-security/eap-method-peap.ui:48
-#: panels/network/wireless-security/eap-method-ttls.ui:31
-msgid "Anony_mous identity"
-msgstr "Anony_ymi identiteetti"
-
-#: panels/network/connection-editor/8021x-security-page.ui:238
-#: panels/network/connection-editor/security-page.ui:237
-msgid "Inner _authentication"
-msgstr "_Sisempi tunnistautuminen"
-
-#: panels/network/connection-editor/8021x-security-page.ui:281
-#: panels/network/connection-editor/security-page.ui:280
-msgid "page 2"
-msgstr "sivu 2"
-
-#: panels/network/connection-editor/ce-page-8021x-security.c:101
-#: panels/network/connection-editor/ce-page-security.c:445
-#: panels/network/connection-editor/details-page.ui:86
-#: panels/network/network-wifi.ui:239
+#: panels/network/connection-editor/ce-page-8021x-security.c:114
+#: panels/network/connection-editor/ce-page-security.c:386
+#: panels/network/connection-editor/details-page.ui:90
 msgid "Security"
 msgstr "Tietoturva"
 
-#: panels/network/connection-editor/ce-page.c:396
+#: panels/network/connection-editor/ce-page.c:234
 msgid "Preserve"
 msgstr "Varaa"
 
-#: panels/network/connection-editor/ce-page.c:397
+#: panels/network/connection-editor/ce-page.c:235
 msgid "Permanent"
 msgstr "Pysyvä"
 
-#: panels/network/connection-editor/ce-page.c:398
+#: panels/network/connection-editor/ce-page.c:236
 msgid "Random"
 msgstr "Satunnainen"
 
-#: panels/network/connection-editor/ce-page.c:399
+#: panels/network/connection-editor/ce-page.c:237
 msgid "Stable"
 msgstr "Vakaa"
 
-#: panels/network/connection-editor/ce-page.c:403
+#: panels/network/connection-editor/ce-page.c:241
 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 "
@@ -2458,303 +3052,272 @@ msgstr ""
 "verkkolaitteelle, jolle tämä yhteys aktivoidaan. Ominaisuus tunnetaan "
 "termeillä MAC-kloonaus tai -spooffaus. Esimerkki: 00:11:22:33:44:55"
 
-#: panels/network/connection-editor/ce-page.c:538
-msgid "automatic"
-msgstr "automaattinen"
-
-#: panels/network/connection-editor/ce-page.c:578
+#: panels/network/connection-editor/ce-page.c:399
 #, c-format
 msgid "Profile %d"
 msgstr "Profiili %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: panels/network/connection-editor/ce-page-details.c:56
-#: panels/network/net-device-wifi.c:134 panels/network/net-device-wifi.c:314
+#: panels/network/connection-editor/ce-page-details.c:93
+#: panels/network/net-device-wifi.c:235
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:60
-#: panels/network/net-device-wifi.c:138 panels/network/net-device-wifi.c:319
-#: panels/network/network-wifi.ui:592
+#: panels/network/connection-editor/ce-page-details.c:97
+#: panels/network/net-device-wifi.c:240
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: panels/network/connection-editor/ce-page-details.c:64
-#: panels/network/net-device-wifi.c:142
+#: panels/network/connection-editor/ce-page-details.c:101
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: panels/network/connection-editor/ce-page-details.c:69
-#: panels/network/net-device-wifi.c:147
+#: panels/network/connection-editor/ce-page-details.c:106
 msgid "Enterprise"
 msgstr "Yritys"
 
-#: panels/network/connection-editor/ce-page-details.c:74
-#: panels/network/net-device-wifi.c:152 panels/network/net-device-wifi.c:304
+#: panels/network/connection-editor/ce-page-details.c:111
+#: panels/network/net-device-wifi.c:225
 msgctxt "Wifi security"
 msgid "None"
 msgstr "Ei mitään"
 
-#: panels/network/connection-editor/ce-page-details.c:95
+#: panels/network/connection-editor/ce-page-details.c:132
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: panels/network/connection-editor/ce-page-details.c:110
-#: panels/network/net-device-ethernet.c:137
-#: panels/network/net-device-wifi.c:413
+#: panels/network/connection-editor/ce-page-details.c:147
+#: panels/network/net-device-ethernet.c:108
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i päivä sitten"
 msgstr[1] "%i päivää sitten"
 
+#: panels/network/connection-editor/ce-page-details.c:272
+#, c-format
+msgid "%d Mb/s (%1.1f GHz)"
+msgstr "%d Mb/s (%1.1f GHz)"
+
 #. Translators: network device speed
-#: panels/network/connection-editor/ce-page-details.c:228
-#: panels/network/net-device-ethernet.c:66 panels/network/net-device-wifi.c:536
+#: panels/network/connection-editor/ce-page-details.c:274
+#: panels/network/net-device-ethernet.c:202
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: panels/network/connection-editor/ce-page-details.c:249
-#: panels/network/net-device-wifi.c:565
+#: panels/network/connection-editor/ce-page-details.c:291
+msgid "2.4 GHz / 5 GHz"
+msgstr "2.4 GHz / 5 GHz"
+
+#: panels/network/connection-editor/ce-page-details.c:293
+msgid "2.4 GHz"
+msgstr "2.4 GHz"
+
+#: panels/network/connection-editor/ce-page-details.c:295
+msgid "5 GHz"
+msgstr "5 GHz"
+
+#: panels/network/connection-editor/ce-page-details.c:315
 msgctxt "Signal strength"
 msgid "None"
 msgstr "Ei mitään"
 
-#: panels/network/connection-editor/ce-page-details.c:251
-#: panels/network/net-device-wifi.c:567
+#: panels/network/connection-editor/ce-page-details.c:317
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Heikko"
 
-#: panels/network/connection-editor/ce-page-details.c:253
-#: panels/network/net-device-wifi.c:569
+#: panels/network/connection-editor/ce-page-details.c:319
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "OK"
 
-#: panels/network/connection-editor/ce-page-details.c:255
-#: panels/network/net-device-wifi.c:571
+#: panels/network/connection-editor/ce-page-details.c:321
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Hyvä"
 
-#: panels/network/connection-editor/ce-page-details.c:257
-#: panels/network/net-device-wifi.c:573
+#: panels/network/connection-editor/ce-page-details.c:323
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Erinomainen"
 
-#: panels/network/connection-editor/ce-page-details.c:300
+#: panels/network/connection-editor/ce-page-details.c:381
+#: panels/network/connection-editor/details-page.ui:108
+#: panels/network/net-device-ethernet.c:143
+#: panels/network/net-device-mobile.c:431
+msgid "IPv4 Address"
+msgstr "IPv4-osoite"
+
+#: panels/network/connection-editor/ce-page-details.c:382
+#: panels/network/connection-editor/details-page.ui:126
+#: panels/network/net-device-ethernet.c:144
+#: panels/network/net-device-ethernet.c:148
+#: panels/network/net-device-mobile.c:432 panels/network/network-mobile.ui:200
+msgid "IPv6 Address"
+msgstr "IPv6-osoite"
+
+#: panels/network/connection-editor/ce-page-details.c:385
+#: panels/network/connection-editor/ce-page-details.c:386
+#: panels/network/net-device-ethernet.c:146
+#: panels/network/net-device-mobile.c:435
+#: panels/network/net-device-mobile.c:436 panels/network/network-mobile.ui:183
+msgid "IP Address"
+msgstr "IP-osoite"
+
+#: panels/network/connection-editor/ce-page-details.c:420
 msgid "Forget Connection"
 msgstr "Unohda yhteys"
 
-#: panels/network/connection-editor/ce-page-details.c:302
+#: panels/network/connection-editor/ce-page-details.c:422
 msgid "Remove Connection Profile"
 msgstr "Poista yhteysprofiili"
 
-#: panels/network/connection-editor/ce-page-details.c:304
+#: panels/network/connection-editor/ce-page-details.c:424
 msgid "Remove VPN"
 msgstr "Poista VPN"
 
-#: panels/network/connection-editor/ce-page-details.c:332
-#: panels/network/network-wifi.ui:1433 shell/cc-panel-list.ui:103
-#: shell/cc-window.c:269
+#: panels/network/connection-editor/ce-page-details.c:442
 msgid "Details"
 msgstr "Tiedot"
 
-#: panels/network/connection-editor/ce-page-ethernet.c:177
-#: panels/network/connection-editor/ce-page-vpn.c:188
-#: panels/network/connection-editor/ce-page-wifi.c:196
-#: panels/network/network-wifi.ui:1437
+#: panels/network/connection-editor/ce-page-ethernet.c:71
+msgid "automatic"
+msgstr "automaattinen"
+
+#: panels/network/connection-editor/ce-page-ethernet.c:144
+#: panels/network/connection-editor/ce-page-vpn.c:150
+#: panels/network/connection-editor/ce-page-wifi.c:129
 msgid "Identity"
 msgstr "Identiteetti"
 
-#: panels/network/connection-editor/ce-page-ip4.c:251
-#: panels/network/connection-editor/ce-page-ip6.c:230
+#: panels/network/connection-editor/ce-page-ip4.c:268
+#: panels/network/connection-editor/ce-page-ip6.c:249
 msgid "Delete Address"
 msgstr "Poista osoite"
 
-#: panels/network/connection-editor/ce-page-ip4.c:422
-#: panels/network/connection-editor/ce-page-ip6.c:390
+#: panels/network/connection-editor/ce-page-ip4.c:428
+#: panels/network/connection-editor/ce-page-ip6.c:398
 msgid "Delete Route"
 msgstr "Poista reitti"
 
-#: panels/network/connection-editor/ce-page-ip4.c:896
-#: panels/network/network-wifi.ui:1441
+#: panels/network/connection-editor/ce-page-ip4.c:852
 msgid "IPv4"
 msgstr "IPv4"
 
-#: panels/network/connection-editor/ce-page-ip6.c:828
-#: panels/network/network-wifi.ui:1445
+#: panels/network/connection-editor/ce-page-ip6.c:783
 msgid "IPv6"
 msgstr "IPv6"
 
-#: panels/network/connection-editor/ce-page-security.c:245
+#: panels/network/connection-editor/ce-page-security.c:257
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ei mitään"
 
-#: panels/network/connection-editor/ce-page-security.c:268
+#: panels/network/connection-editor/ce-page-security.c:280
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bittinen avain (Hex tai ASCII)"
 
-#: panels/network/connection-editor/ce-page-security.c:278
+#: panels/network/connection-editor/ce-page-security.c:290
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bittinen salalause"
 
-#: panels/network/connection-editor/ce-page-security.c:291
-#: panels/network/wireless-security/wireless-security.c:465
+#: panels/network/connection-editor/ce-page-security.c:303
+#: panels/network/wireless-security/ws-dynamic-wep.ui:20
+#: panels/network/wireless-security/ws-wpa-eap.ui:25
 msgid "LEAP"
 msgstr "LEAP"
 
-#: panels/network/connection-editor/ce-page-security.c:304
+#: panels/network/connection-editor/ce-page-security.c:316
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynaaminen WEP (802.1x)"
 
-#: panels/network/connection-editor/ce-page-security.c:318
+#: panels/network/connection-editor/ce-page-security.c:330
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: panels/network/connection-editor/ce-page-security.c:332
+#: panels/network/connection-editor/ce-page-security.c:344
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
 #: panels/network/connection-editor/details-page.ui:18
-#: panels/network/network-wifi.ui:174
 msgid "Signal Strength"
 msgstr "Signaalin vahvuus"
 
-#: panels/network/connection-editor/details-page.ui:52
-#: panels/network/network-wifi.ui:207
+#: panels/network/connection-editor/details-page.ui:54
 msgid "Link speed"
 msgstr "Yhteysnopeus"
 
-#: panels/network/connection-editor/details-page.ui:104
-#: panels/network/net-device-ethernet.c:170 panels/network/network-wifi.ui:256
-#: panels/network/panel-common.c:644
-msgid "IPv4 Address"
-msgstr "IPv4-osoite"
-
-#: panels/network/connection-editor/details-page.ui:122
-#: panels/network/net-device-ethernet.c:171
-#: panels/network/net-device-ethernet.c:175
-#: panels/network/network-mobile.ui:189 panels/network/network-wifi.ui:273
-#: panels/network/panel-common.c:645
-msgid "IPv6 Address"
-msgstr "IPv6-osoite"
-
-#: panels/network/connection-editor/details-page.ui:140
-#: panels/network/net-device-ethernet.c:178 panels/network/network-wifi.ui:290
+#: panels/network/connection-editor/details-page.ui:144
+#: panels/network/net-device-ethernet.c:151
 msgid "Hardware Address"
 msgstr "Laiteosoite"
 
-#: panels/network/connection-editor/details-page.ui:158
-#: panels/network/net-device-ethernet.c:182
-#: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
+#: panels/network/connection-editor/details-page.ui:162
+msgid "Supported Frequencies"
+msgstr "Tuetut taajuudet"
+
+#: panels/network/connection-editor/details-page.ui:180
+#: panels/network/net-device-ethernet.c:155
+#: panels/network/network-mobile.ui:217
 msgid "Default Route"
 msgstr "Oletusreitti"
 
-#: panels/network/connection-editor/details-page.ui:177
-#: panels/network/connection-editor/ip4-page.ui:197
-#: panels/network/connection-editor/ip6-page.ui:211
-#: panels/network/net-device-ethernet.c:184
-#: panels/network/network-mobile.ui:224 panels/network/network-wifi.ui:325
-#: panels/network/network-wifi.ui:831 panels/network/network-wifi.ui:1108
+#: panels/network/connection-editor/details-page.ui:199
+#: panels/network/connection-editor/ip4-page.ui:211
+#: panels/network/connection-editor/ip6-page.ui:225
+#: panels/network/net-device-ethernet.c:157
+#: panels/network/network-mobile.ui:235
 msgid "DNS"
 msgstr "DNS"
 
-#: panels/network/connection-editor/details-page.ui:195
+#: panels/network/connection-editor/details-page.ui:217
 msgid "Last Used"
 msgstr "Viimeksi käytetty"
 
-#: panels/network/connection-editor/details-page.ui:324
+#: panels/network/connection-editor/details-page.ui:376
 msgid "Connect _automatically"
 msgstr "_Yhdistä automaattisesti"
 
-#: panels/network/connection-editor/details-page.ui:343
+#: panels/network/connection-editor/details-page.ui:395
 msgid "Make available to _other users"
 msgstr "Aseta _kaikkien käyttäjien käytettäväksi"
 
-#: panels/network/connection-editor/details-page.ui:376
-msgid "Restrict _background data usage"
-msgstr "Rajoita _datan taustakäyttöä"
-
-#: panels/network/connection-editor/details-page.ui:387
-msgid "Appropriate for connections that have data charges or limits."
+#: panels/network/connection-editor/details-page.ui:428
+msgid "_Metered connection: has data limits or can incur charges"
 msgstr ""
-"Sopiva yhteyksille, mihin sovelletaan datan määrään pohjautuvaa hinnoittelua "
-"tai siirtorajoituksia."
-
-#: panels/network/connection-editor/ethernet-page.ui:16
-#: panels/network/connection-editor/ethernet-page.ui:39
-#: panels/network/connection-editor/ip4-page.ui:209
-#: panels/network/connection-editor/ip4-page.ui:277
-#: panels/network/connection-editor/ip6-page.ui:42
-#: panels/network/connection-editor/ip6-page.ui:223
-#: panels/network/connection-editor/ip6-page.ui:291
-#: panels/network/net-proxy.c:58 panels/network/network-proxy.ui:103
-#: panels/network/wireless-security/eap-method-peap.ui:22
-#: panels/privacy/cc-privacy-panel.c:239
-msgid "Automatic"
-msgstr "Automaattinen"
-
-#: panels/network/connection-editor/ethernet-page.ui:19
-msgid "Twisted Pair (TP)"
-msgstr "Parikaapeli (TP)"
 
-#: panels/network/connection-editor/ethernet-page.ui:22
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Attachment Unit Interface (AUI)"
+#: panels/network/connection-editor/details-page.ui:439
+msgid ""
+"Software updates and other large downloads will not be started automatically."
+msgstr ""
+"Ohjelmistopäivityksiä ja muita suurikokoisia latauksia ei aloiteta "
+"automaattisesti."
 
 #: panels/network/connection-editor/ethernet-page.ui:25
-msgid "BNC"
-msgstr "BNC"
+#: panels/network/connection-editor/vpn-page.ui:23
+msgid "_Name"
+msgstr "_Nimi"
 
-#: panels/network/connection-editor/ethernet-page.ui:28
-msgid "Media Independent Interface (MII)"
-msgstr "Media Independent Interface (MII)"
-
-#: panels/network/connection-editor/ethernet-page.ui:42
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:45
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:48
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:51
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
-
-#: panels/network/connection-editor/ethernet-page.ui:71
-#: panels/network/connection-editor/vpn-page.ui:23
-msgid "_Name"
-msgstr "_Nimi"
-
-#: panels/network/connection-editor/ethernet-page.ui:100
+#: panels/network/connection-editor/ethernet-page.ui:54
 #: panels/network/connection-editor/wifi-page.ui:67
-#: panels/network/network-wifi.ui:1260
 msgid "_MAC Address"
 msgstr "_MAC-osoite"
 
-#: panels/network/connection-editor/ethernet-page.ui:151
+#: panels/network/connection-editor/ethernet-page.ui:105
 msgid "M_TU"
 msgstr "M_TU"
 
-#: panels/network/connection-editor/ethernet-page.ui:168
+#: panels/network/connection-editor/ethernet-page.ui:122
 #: panels/network/connection-editor/wifi-page.ui:102
 msgid "_Cloned Address"
 msgstr "_Kloonattu osoite"
 
-#: panels/network/connection-editor/ethernet-page.ui:183
+#: panels/network/connection-editor/ethernet-page.ui:137
 msgid "bytes"
 msgstr "tavua"
 
@@ -2763,7 +3326,6 @@ msgid "IPv_4 Method"
 msgstr "IPv_4-tapa"
 
 #: panels/network/connection-editor/ip4-page.ui:42
-#: panels/network/network-wifi.ui:777 panels/network/network-wifi.ui:1054
 msgid "Automatic (DHCP)"
 msgstr "Automaattinen (DHCP)"
 
@@ -2774,9 +3336,7 @@ msgstr "Vain linkkiyhteys"
 
 #: panels/network/connection-editor/ip4-page.ui:69
 #: panels/network/connection-editor/ip6-page.ui:83
-#: panels/network/net-proxy.c:56 panels/network/network-proxy.ui:113
-#: panels/network/network-wifi.ui:776 panels/network/network-wifi.ui:1053
-#: panels/privacy/cc-privacy-panel.c:239
+#: panels/network/net-proxy.c:72 panels/network/network-proxy.ui:116
 msgid "Manual"
 msgstr "Manuaalinen"
 
@@ -2785,61 +3345,74 @@ msgstr "Manuaalinen"
 msgid "Disable"
 msgstr "Poista käytöstä"
 
-#: panels/network/connection-editor/ip4-page.ui:111
-#: panels/network/connection-editor/ip6-page.ui:125
+#: panels/network/connection-editor/ip4-page.ui:97
+#: panels/network/connection-editor/ip6-page.ui:111
+msgid "Shared to other computers"
+msgstr "Jaettu muille tietokoneille"
+
+#: panels/network/connection-editor/ip4-page.ui:125
+#: panels/network/connection-editor/ip6-page.ui:139
 msgid "Addresses"
 msgstr "Osoitteet"
 
-#: panels/network/connection-editor/ip4-page.ui:129
-#: panels/network/connection-editor/ip4-page.ui:313
-#: panels/network/connection-editor/ip6-page.ui:143
-#: panels/network/connection-editor/ip6-page.ui:327
-#: panels/printers/details-dialog.ui:89
+#: panels/network/connection-editor/ip4-page.ui:143
+#: panels/network/connection-editor/ip4-page.ui:327
+#: panels/network/connection-editor/ip6-page.ui:157
+#: panels/network/connection-editor/ip6-page.ui:341
+#: panels/printers/pp-details-dialog.ui:95
 msgid "Address"
 msgstr "Osoite"
 
-#: panels/network/connection-editor/ip4-page.ui:143
-#: panels/network/connection-editor/ip4-page.ui:327
+#: panels/network/connection-editor/ip4-page.ui:157
+#: panels/network/connection-editor/ip4-page.ui:341
 msgid "Netmask"
 msgstr "Aliverkon peite"
 
-#: panels/network/connection-editor/ip4-page.ui:157
-#: panels/network/connection-editor/ip4-page.ui:341
-#: panels/network/connection-editor/ip6-page.ui:171
-#: panels/network/connection-editor/ip6-page.ui:355
+#: panels/network/connection-editor/ip4-page.ui:171
+#: panels/network/connection-editor/ip4-page.ui:355
+#: panels/network/connection-editor/ip6-page.ui:185
+#: panels/network/connection-editor/ip6-page.ui:369
 msgid "Gateway"
 msgstr "Yhdyskäytävä"
 
-#: panels/network/connection-editor/ip4-page.ui:220
-#: panels/network/connection-editor/ip6-page.ui:234
+#: panels/network/connection-editor/ip4-page.ui:223
+#: panels/network/connection-editor/ip4-page.ui:291
+#: panels/network/connection-editor/ip6-page.ui:42
+#: panels/network/connection-editor/ip6-page.ui:237
+#: panels/network/connection-editor/ip6-page.ui:305
+#: panels/network/net-proxy.c:74 panels/network/network-proxy.ui:106
+#: panels/network/wireless-security/eap-method-peap.ui:33
+msgid "Automatic"
+msgstr "Automaattinen"
+
+#: panels/network/connection-editor/ip4-page.ui:234
+#: panels/network/connection-editor/ip6-page.ui:248
 msgid "Automatic DNS"
 msgstr "Automaattinen DNS"
 
-#: panels/network/connection-editor/ip4-page.ui:244
-#: panels/network/connection-editor/ip6-page.ui:258
+#: panels/network/connection-editor/ip4-page.ui:258
+#: panels/network/connection-editor/ip6-page.ui:272
 msgid "Separate IP addresses with commas"
 msgstr "Erota IP-osoitteet pilkuin"
 
-#: panels/network/connection-editor/ip4-page.ui:265
-#: panels/network/connection-editor/ip6-page.ui:279
-#: panels/network/network-wifi.ui:876 panels/network/network-wifi.ui:1153
+#: panels/network/connection-editor/ip4-page.ui:279
+#: panels/network/connection-editor/ip6-page.ui:293
 msgid "Routes"
 msgstr "Reitit"
 
-#: panels/network/connection-editor/ip4-page.ui:288
-#: panels/network/connection-editor/ip6-page.ui:302
+#: panels/network/connection-editor/ip4-page.ui:302
+#: panels/network/connection-editor/ip6-page.ui:316
 msgid "Automatic Routes"
 msgstr "Automaattiset reitit"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: panels/network/connection-editor/ip4-page.ui:354
-#: panels/network/connection-editor/ip6-page.ui:368
+#: panels/network/connection-editor/ip4-page.ui:368
+#: panels/network/connection-editor/ip6-page.ui:382
 msgid "Metric"
 msgstr "Metriikka"
 
-#: panels/network/connection-editor/ip4-page.ui:384
-#: panels/network/connection-editor/ip6-page.ui:398
-#: panels/network/network-wifi.ui:932 panels/network/network-wifi.ui:1209
+#: panels/network/connection-editor/ip4-page.ui:398
+#: panels/network/connection-editor/ip6-page.ui:412
 msgid "Use this connection _only for resources on its network"
 msgstr "Käytä tätä yhteyttä _vain tässä verkossa oleviin resursseihin"
 
@@ -2851,37 +3424,36 @@ msgstr "IPv_6-tapa"
 msgid "Automatic, DHCP only"
 msgstr "Automaattinen, vain DHCP"
 
-#: panels/network/connection-editor/ip6-page.ui:157
-#: panels/network/connection-editor/ip6-page.ui:341
+#: panels/network/connection-editor/ip6-page.ui:171
+#: panels/network/connection-editor/ip6-page.ui:355
 msgid "Prefix"
 msgstr "Etuliite"
 
-#: panels/network/connection-editor/net-connection-editor.c:261
+#: panels/network/connection-editor/net-connection-editor.c:291
 msgid "Unable to open connection editor"
 msgstr "Yhteyseditorin avaaminen epäonnistui"
 
-#: panels/network/connection-editor/net-connection-editor.c:279
+#: panels/network/connection-editor/net-connection-editor.c:307
 msgid "New Profile"
 msgstr "Uusi profiili"
 
-#: panels/network/connection-editor/net-connection-editor.c:727
+#: panels/network/connection-editor/net-connection-editor.c:740
 msgid "Import from file…"
 msgstr "Tuo tiedostosta…"
 
-#: panels/network/connection-editor/net-connection-editor.c:759
+#: panels/network/connection-editor/net-connection-editor.c:772
 msgid "Add VPN"
 msgstr "Lisää VPN"
 
-#: panels/network/connection-editor/security-page.ui:26
-#: panels/network/network-wifi.ui:529
+#: panels/network/connection-editor/security-page.ui:20
 msgid "S_ecurity"
 msgstr "_Tietoturva"
 
-#: panels/network/connection-editor/vpn-helpers.c:141
+#: panels/network/connection-editor/vpn-helpers.c:139
 msgid "Cannot import VPN connection"
 msgstr "VPN-yhteyden tuonti epäonnistui"
 
-#: panels/network/connection-editor/vpn-helpers.c:143
+#: panels/network/connection-editor/vpn-helpers.c:141
 #, c-format
 msgid ""
 "The file “%s” could not be read or does not contain recognized VPN "
@@ -2894,30 +3466,30 @@ msgstr ""
 "\n"
 "Virhe: %s."
 
-#: panels/network/connection-editor/vpn-helpers.c:178
+#: panels/network/connection-editor/vpn-helpers.c:173
 msgid "Select file to import"
 msgstr "Valitse tuotava tiedosto"
 
-#: panels/network/connection-editor/vpn-helpers.c:230
+#: panels/network/connection-editor/vpn-helpers.c:225
 #, c-format
 msgid "A file named “%s” already exists."
 msgstr "Tiedosto nimeltä ”%s” on jo olemassa."
 
-#: panels/network/connection-editor/vpn-helpers.c:232
+#: panels/network/connection-editor/vpn-helpers.c:227
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: panels/network/connection-editor/vpn-helpers.c:234
+#: panels/network/connection-editor/vpn-helpers.c:229
 #, 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?"
 
-#: panels/network/connection-editor/vpn-helpers.c:270
+#: panels/network/connection-editor/vpn-helpers.c:264
 msgid "Cannot export VPN connection"
 msgstr "VPN-yhteyden vienti epäonnistui"
 
-#: panels/network/connection-editor/vpn-helpers.c:272
+#: panels/network/connection-editor/vpn-helpers.c:266
 #, c-format
 msgid ""
 "The VPN connection “%s” could not be exported to %s.\n"
@@ -2928,7 +3500,7 @@ msgstr ""
 "\n"
 "Virhe: %s."
 
-#: panels/network/connection-editor/vpn-helpers.c:307
+#: panels/network/connection-editor/vpn-helpers.c:296
 msgid "Export VPN connection"
 msgstr "Vie VPN-yhteys"
 
@@ -2937,12 +3509,10 @@ msgid "(Error: unable to load VPN connection editor)"
 msgstr "(Virhe: VPN-yhteyseditoria ei voitu ladata)"
 
 #: panels/network/connection-editor/wifi-page.ui:20
-#: panels/network/network-wifi.ui:497
 msgid "_SSID"
 msgstr "_SSID"
 
 #: panels/network/connection-editor/wifi-page.ui:36
-#: panels/network/network-wifi.ui:513
 msgid "_BSSID"
 msgstr "_BSSID"
 
@@ -2968,28 +3538,19 @@ msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;Hotspot;verkko;langaton;"
 "laajakaista;nimipalvelu;tukiasema;"
 
-#: panels/network/net-device-ethernet.c:123
-#: panels/network/net-device-wifi.c:399
+#: panels/network/net-device-ethernet.c:96
 msgid "never"
 msgstr "ei koskaan"
 
-#: panels/network/net-device-ethernet.c:133
-#: panels/network/net-device-wifi.c:409
+#: panels/network/net-device-ethernet.c:104
 msgid "today"
 msgstr "tänään"
 
-#: panels/network/net-device-ethernet.c:135
-#: panels/network/net-device-wifi.c:411
+#: panels/network/net-device-ethernet.c:106
 msgid "yesterday"
 msgstr "eilen"
 
-#: panels/network/net-device-ethernet.c:173
-#: panels/network/network-mobile.ui:172 panels/network/panel-common.c:647
-#: panels/network/panel-common.c:649
-msgid "IP Address"
-msgstr "IP-osoite"
-
-#: panels/network/net-device-ethernet.c:189 panels/network/network-wifi.ui:342
+#: panels/network/net-device-ethernet.c:162
 msgid "Last used"
 msgstr "Viimeksi käytetty"
 
@@ -2998,92 +3559,60 @@ msgstr "Viimeksi käytetty"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: panels/network/net-device-ethernet.c:291
-#: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
+#: panels/network/net-device-ethernet.c:252
+#: panels/network/network-bluetooth.ui:38 panels/network/network-ethernet.ui:18
 msgid "Wired"
 msgstr "Kiinteä"
 
-#: panels/network/net-device-mobile.c:236
+#: panels/network/net-device-mobile.c:208
 msgid "Add new connection"
 msgstr "Lisää uusi yhteys"
 
-#: panels/network/net-device-wifi.c:1217
-#, c-format
-msgid "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
-msgstr ""
-"Yhteyspisteen käyttöönotto katkaisee yhteyden langattomaan verkkoon <b>%s</"
-"b>."
-
-#: panels/network/net-device-wifi.c:1221
-msgid ""
-"It is not possible to access the Internet through your wireless while the "
-"hotspot is active."
-msgstr ""
-"Yhteyspisteen ollessa käytössä langattoman internetyhteyden käyttö ei ole "
-"mahdollista."
-
-#: panels/network/net-device-wifi.c:1228
-msgid "Turn On Wi-Fi Hotspot?"
-msgstr "Otetaanko wifi-yhteyspiste käyttöön?"
-
-#: panels/network/net-device-wifi.c:1250
-msgid ""
-"Wi-Fi hotspots are usually used to share an additional Internet connection "
-"over Wi-Fi."
-msgstr ""
-"Wifi-yhteyspisteitä käytetään yleensä Internet-yhteyden jakamiseen "
-"langattomasti."
-
-#: panels/network/net-device-wifi.c:1261
-msgid "_Turn On"
-msgstr "_Ota käyttöön"
-
-#: panels/network/net-device-wifi.c:1338
+#: panels/network/net-device-wifi.c:798
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Suljetaanko yhteyspiste ja katkaistaanko kaikkien käyttäjien yhteydet?"
 
-#: panels/network/net-device-wifi.c:1341
+#: panels/network/net-device-wifi.c:801
 msgid "_Stop Hotspot"
 msgstr "_Sulje yhteyspiste"
 
-#: panels/network/net-device-wifi.c:1397
-msgid "System policy prohibits use as a Hotspot"
-msgstr "Järjestelmäkäytännöt estävät käytön yhteyspisteenä"
-
-#: panels/network/net-device-wifi.c:1400
-msgid "Wireless device does not support Hotspot mode"
-msgstr "Langaton verkkolaite ei tue yhteyspisteeksi asettamista"
-
-#: panels/network/net-device-wifi.c:1558
+#: panels/network/net-device-wifi.c:905
 msgid ""
 "Network details for the selected networks, including passwords and any "
 "custom configuration will be lost."
 msgstr ""
 "Valittujen verkkojen tiedot, kuten salasanat ja omat asetukset, häviävät."
 
-#: panels/network/net-device-wifi.c:1562 panels/network/network-wifi.ui:1350
+#: panels/network/net-device-wifi.c:909
 msgid "_Forget"
 msgstr "_Unohda"
 
-#: panels/network/net-device-wifi.c:1725 panels/network/net-device-wifi.c:1732
+#: panels/network/net-device-wifi.c:1065 panels/network/net-device-wifi.c:1072
 msgid "Known Wi-Fi Networks"
 msgstr "Tunnetut wifi-verkot"
 
 #. translators: This is the label for the "Forget wireless network" functionality
-#: panels/network/net-device-wifi.c:1769
+#: panels/network/net-device-wifi.c:1107
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Unohda"
 
-#: panels/network/net-proxy.c:54
+#: panels/network/net-device-wifi.c:1268
+msgid "System policy prohibits use as a Hotspot"
+msgstr "Järjestelmäkäytännöt estävät käytön yhteyspisteenä"
+
+#: panels/network/net-device-wifi.c:1271
+msgid "Wireless device does not support Hotspot mode"
+msgstr "Langaton verkkolaite ei tue yhteyspisteeksi asettamista"
+
+#: panels/network/net-proxy.c:70
 #: panels/notifications/cc-notifications-panel.c:270
-#: panels/power/cc-power-panel.c:2074 panels/power/cc-power-panel.c:2085
-#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289
-#: panels/universal-access/cc-ua-panel.c:477
-#: panels/universal-access/cc-ua-panel.c:840
-#: panels/universal-access/cc-ua-panel.c:853
-#: panels/universal-access/cc-ua-panel.c:865
-#: panels/universal-access/cc-ua-panel.c:1030
+#: panels/power/cc-power-panel.c:2066 panels/power/cc-power-panel.c:2077
+#: panels/universal-access/cc-ua-panel.c:480
+#: panels/universal-access/cc-ua-panel.c:843
+#: panels/universal-access/cc-ua-panel.c:856
+#: panels/universal-access/cc-ua-panel.c:868
+#: panels/universal-access/cc-ua-panel.c:1033
 #: panels/universal-access/cc-ua-panel.ui:323
 #: panels/universal-access/cc-ua-panel.ui:369
 #: panels/universal-access/cc-ua-panel.ui:415
@@ -3091,12 +3620,12 @@ msgstr "_Unohda"
 #: panels/universal-access/cc-ua-panel.ui:674
 #: panels/universal-access/cc-ua-panel.ui:720
 #: panels/universal-access/cc-ua-panel.ui:766
-#: panels/universal-access/cc-ua-panel.ui:918
+#: panels/universal-access/cc-ua-panel.ui:950
 msgid "Off"
 msgstr "Pois"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: panels/network/net-proxy.c:102
+#: panels/network/net-proxy.c:113
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr "WPAD-automaattietsintää käytetään, kun hallinta-URL ei ole määritelty."
@@ -3105,668 +3634,565 @@ msgstr "WPAD-automaattietsintää käytetään, kun hallinta-URL ei ole määrit
 #. * network, then anyone else on that network can tell your
 #. * machine that it should proxy all of your web traffic
 #. * through them.
-#: panels/network/net-proxy.c:110
+#: panels/network/net-proxy.c:121
 msgid "This is not recommended for untrusted public networks."
 msgstr "Tämä ei ole suositeltavaa julkisissa verkoissa."
 
-#: panels/network/network-mobile.ui:30
+#. update title
+#. Translators: this is the title of the connection details
+#. * window for vpn connections, it is also used to display
+#. * vpn connections in the device list.
+#.
+#: panels/network/net-vpn.c:66 panels/network/net-vpn.c:163
+#, c-format
+msgid "%s VPN"
+msgstr "%s - VPN"
+
+#: panels/network/network-bluetooth.ui:50
+msgid "Turn device off"
+msgstr "Käännä laite pois päältä"
+
+#: panels/network/network-mobile.ui:29
 msgid "IMEI"
 msgstr "IMEI"
 
-#: panels/network/network-mobile.ui:48
+#: panels/network/network-mobile.ui:47
 msgid "Provider"
 msgstr "Tarjoaja"
 
-#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:92
+#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:95
 msgid "Network Proxy"
 msgstr "Verkon välityspalvelin"
 
-#: panels/network/network-proxy.ui:173
+#: panels/network/network-proxy.ui:176
 msgid "_HTTP Proxy"
 msgstr "_HTTP-välityspalvelin"
 
-#: panels/network/network-proxy.ui:192
+#: panels/network/network-proxy.ui:195
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS-välityspalvelin"
 
-#: panels/network/network-proxy.ui:211
+#: panels/network/network-proxy.ui:214
 msgid "_FTP Proxy"
 msgstr "_FTP-välityspalvelin"
 
-#: panels/network/network-proxy.ui:230
+#: panels/network/network-proxy.ui:233
 msgid "_Socks Host"
 msgstr "_Socks-palvelin"
 
-#: panels/network/network-proxy.ui:249
+#: panels/network/network-proxy.ui:252
 msgid "_Ignore Hosts"
 msgstr "_Ohita koneet"
 
-#: panels/network/network-proxy.ui:287
+#: panels/network/network-proxy.ui:290
 msgid "HTTP proxy port"
 msgstr "HTTP-välityspalvelimen portti"
 
-#: panels/network/network-proxy.ui:364
+#: panels/network/network-proxy.ui:367
 msgid "HTTPS proxy port"
 msgstr "HTTPS-välityspalvelimen portti"
 
-#: panels/network/network-proxy.ui:385
+#: panels/network/network-proxy.ui:388
 msgid "FTP proxy port"
 msgstr "FTP-välityspalvelimen portti"
 
-#: panels/network/network-proxy.ui:406
+#: panels/network/network-proxy.ui:409
 msgid "Socks proxy port"
 msgstr "Socks-välityspalvelimen portti"
 
-#: panels/network/network-proxy.ui:435
+#: panels/network/network-proxy.ui:438
 msgid "_Configuration URL"
 msgstr "_Määritys-URL"
 
-#: panels/network/network-simple.ui:50
-msgid "Turn device off"
-msgstr "Käännä laite pois päältä"
-
-#: panels/network/network-vpn.ui:56
+#: panels/network/network-vpn.ui:55
 msgid "Turn VPN connection off"
 msgstr "Katkaise VPN-yhteys"
 
-#: panels/network/network-wifi.ui:127
-msgid "Automatic _Connect"
-msgstr "Automaattinen _yhdistäminen"
-
-#: panels/network/network-wifi.ui:474
-msgid "details"
-msgstr "tiedot"
-
-#: panels/network/network-wifi.ui:545
-#: panels/network/wireless-security/eap-method-leap.ui:40
-#: panels/network/wireless-security/eap-method-simple.ui:40
-#: panels/network/wireless-security/ws-leap.ui:40
-#: panels/network/wireless-security/ws-wpa-psk.ui:22
-#: panels/sharing/cc-sharing-panel.ui:351
-#: panels/user-accounts/cc-add-user-dialog.ui:310
-#: panels/user-accounts/cc-add-user-dialog.ui:547
-#: panels/user-accounts/cc-user-panel.ui:216
-msgid "_Password"
-msgstr "_Salasana"
-
-#: panels/network/network-wifi.ui:621
-msgid "Show P_assword"
-msgstr "_Näytä salasana"
-
-#: panels/network/network-wifi.ui:651
-msgid "Make available to other users"
-msgstr "Aseta kaikkien käyttäjien käytettäväksi"
-
-#: panels/network/network-wifi.ui:679
-msgid "identity"
-msgstr "identiteetti"
-
-#: panels/network/network-wifi.ui:713
-msgid "IPv_4"
-msgstr "IPv_4"
-
-#: panels/network/network-wifi.ui:754 panels/network/network-wifi.ui:1031
-msgid "_Addresses"
-msgstr "_Osoitteet"
-
-#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055
-msgid "Automatic (DHCP) addresses only"
-msgstr "Vain automaattiset (DHCP-) osoitteet"
-
-#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
-msgid "Link-local only"
-msgstr "Vain linkkiyhteys"
-
-#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057
-msgid "Shared with other computers"
-msgstr "Jaettu muille tietokoneille"
-
-#: panels/network/network-wifi.ui:916 panels/network/network-wifi.ui:1193
-msgid "_Ignore automatically obtained routes"
-msgstr "_Älä huomioi automaattisesti saatuja reittejä"
-
-#: panels/network/network-wifi.ui:959
-msgid "ipv4"
-msgstr "ipv4"
-
-#: panels/network/network-wifi.ui:990
-msgid "IPv_6"
-msgstr "IPv_6"
-
-#: panels/network/network-wifi.ui:1236
-msgid "ipv6"
-msgstr "ipv6"
-
-#: panels/network/network-wifi.ui:1276
-msgid "_Cloned MAC Address"
-msgstr "_Kloonattu MAC-osoite"
-
-#: panels/network/network-wifi.ui:1334
-msgid "_Reset"
-msgstr "_Tyhjennä"
-
-#: panels/network/network-wifi.ui:1370
-msgid ""
-"Reset the settings for this connection to their defaults, but remember as a "
-"preferred connection."
-msgstr ""
-"Tyhjennä tämän yhteyden asetukset ja palauta oletusasetukset, mutta muista "
-"yhteys ensisijaisena."
-
-#: panels/network/network-wifi.ui:1387
-msgid ""
-"Remove all details relating to this network and do not try to automatically "
-"connect to it."
-msgstr ""
-"Poista kaikki tähän verkkoon liittyvä tieto äläkä yritä yhdistää "
-"automaattisesti."
-
-#: panels/network/network-wifi.ui:1449
-msgid "Hardware"
-msgstr "Laitteisto"
-
-#: panels/network/network-wifi.ui:1453
-msgctxt "tab"
-msgid "Reset"
-msgstr "Tyhjennä asetukset"
-
-#: panels/network/network-wifi.ui:1505
+#: panels/network/network-wifi.ui:37
 msgid "Wi-Fi Hotspot"
 msgstr "Wifi-yhteyspiste"
 
-#: panels/network/network-wifi.ui:1523
+#: panels/network/network-wifi.ui:55
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "Katkaise yhdistääksesi langattomaan verkkoon"
 
-#: panels/network/network-wifi.ui:1572
-msgid "Network Name"
-msgstr "Verkon nimi"
-
-#: panels/network/network-wifi.ui:1590
-msgid "Connected Devices"
-msgstr "Yhdistetyt laitteet"
-
-#: panels/network/network-wifi.ui:1608
+#: panels/network/network-wifi.ui:123
 msgid "Security type"
 msgstr "Salauksen tyyppi"
 
-#: panels/network/network-wifi.ui:1671
+#: panels/network/network-wifi.ui:175
 msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "Salasana"
 
-#: panels/network/network-wifi.ui:1768
+#: panels/network/network-wifi.ui:264
 msgid "Turn Wi-Fi off"
 msgstr "Kytke wifi pois päältä"
 
-#: panels/network/network-wifi.ui:1800
+#: panels/network/network-wifi.ui:296
 msgid "_Connect to Hidden Network…"
 msgstr "Y_hdistä piilotettuun verkkoon…"
 
-#: panels/network/network-wifi.ui:1810
+#: panels/network/network-wifi.ui:307
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "_Käynnistä wifi-yhteyspiste…"
 
-#: panels/network/network-wifi.ui:1820
+#: panels/network/network-wifi.ui:318
 msgid "_Known Wi-Fi Networks"
 msgstr "_Tunnetut wifi-verkot"
 
-#. TRANSLATORS: AP type
-#: panels/network/panel-common.c:127
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
-
-#. TRANSLATORS: AP type
-#: panels/network/panel-common.c:131
-msgid "Infrastructure"
-msgstr "Infrastruktuuri"
-
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:147 panels/network/panel-common.c:201
+#: panels/network/panel-common.c:37
 msgid "Status unknown"
 msgstr "Tuntematon tila"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:151
+#: panels/network/panel-common.c:41
 msgid "Unmanaged"
 msgstr "Hallitsematon"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:155
+#: panels/network/panel-common.c:45
 msgid "Unavailable"
 msgstr "Ei saatavilla"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:165 panels/network/panel-common.c:207
+#: panels/network/panel-common.c:55
 msgid "Connecting"
 msgstr "Yhdistetään"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:169 panels/network/panel-common.c:211
+#: panels/network/panel-common.c:59
 msgid "Authentication required"
 msgstr "Tunnistautuminen vaaditaan"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:173 panels/network/panel-common.c:215
+#: panels/network/panel-common.c:63
 msgid "Connected"
 msgstr "Yhdistetty"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:177
+#: panels/network/panel-common.c:67
 msgid "Disconnecting"
 msgstr "Katkaistaan yhteyttä"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:181 panels/network/panel-common.c:219
+#: panels/network/panel-common.c:71
 msgid "Connection failed"
 msgstr "Yhteys epäonnistui"
 
 #. TRANSLATORS: device status
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:185 panels/network/panel-common.c:227
+#: panels/network/panel-common.c:75
 msgid "Status unknown (missing)"
 msgstr "Tila tuntematon (puuttuu)"
 
-#. TRANSLATORS: VPN status
-#: panels/network/panel-common.c:223
-msgid "Not connected"
-msgstr "Ei yhteyttä"
-
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:248
+#: panels/network/panel-common.c:96
 msgid "Configuration failed"
 msgstr "Kokoonpanon käyttö epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:252
+#: panels/network/panel-common.c:100
 msgid "IP configuration failed"
 msgstr "IP-asetukset epäonnistuivat"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:256
+#: panels/network/panel-common.c:104
 msgid "IP configuration expired"
 msgstr "IP-asetukset vanhenivat"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:260
+#: panels/network/panel-common.c:108
 msgid "Secrets were required, but not provided"
 msgstr "Salaisuuksia ei annettu, vaikka niitä pyydettiin"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:264
+#: panels/network/panel-common.c:112
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x-anojan yhteys katkaistu"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:268
+#: panels/network/panel-common.c:116
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1x-anojan asetukset epäonnistuivat"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:272
+#: panels/network/panel-common.c:120
 msgid "802.1x supplicant failed"
 msgstr "802.1x-anoja epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:276
+#: panels/network/panel-common.c:124
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1x-anojalla kesti liian kauan tunnistautua"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:280
+#: panels/network/panel-common.c:128
 msgid "PPP service failed to start"
 msgstr "PPP-palvelun käynnistys epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:284
+#: panels/network/panel-common.c:132
 msgid "PPP service disconnected"
 msgstr "PPP-palvelun yhteys katkaistu"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:288
+#: panels/network/panel-common.c:136
 msgid "PPP failed"
 msgstr "PPP epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:292
+#: panels/network/panel-common.c:140
 msgid "DHCP client failed to start"
 msgstr "DHCP-asiakkaan käynnistys epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:296
+#: panels/network/panel-common.c:144
 msgid "DHCP client error"
 msgstr "DHCP-asiakkaan virhe"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:300
+#: panels/network/panel-common.c:148
 msgid "DHCP client failed"
 msgstr "DHCP-asiakas epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:304
+#: panels/network/panel-common.c:152
 msgid "Shared connection service failed to start"
 msgstr "Jaetun yhteyden palvelun käynnistys epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:308
+#: panels/network/panel-common.c:156
 msgid "Shared connection service failed"
 msgstr "Jaetun yhteyden palvelu epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:312
+#: panels/network/panel-common.c:160
 msgid "AutoIP service failed to start"
 msgstr "AutoIP-palvelun käynnistys epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:316
+#: panels/network/panel-common.c:164
 msgid "AutoIP service error"
 msgstr "AutoIP-palvelun virhe"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:320
+#: panels/network/panel-common.c:168
 msgid "AutoIP service failed"
 msgstr "AutoIP-palvelu epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:324
+#: panels/network/panel-common.c:172
 msgid "Line busy"
 msgstr "Linja on varattu"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:328
+#: panels/network/panel-common.c:176
 msgid "No dial tone"
 msgstr "Ei valintaääntä"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:332
+#: panels/network/panel-common.c:180
 msgid "No carrier could be established"
 msgstr "Kantoaaltoa ei voitu muodostaa"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:336
+#: panels/network/panel-common.c:184
 msgid "Dialing request timed out"
 msgstr "Soittopyyntö aikatkaistiin"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:340
+#: panels/network/panel-common.c:188
 msgid "Dialing attempt failed"
 msgstr "Soittoyritys epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:344
+#: panels/network/panel-common.c:192
 msgid "Modem initialization failed"
 msgstr "Modeemin alustus epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:348
+#: panels/network/panel-common.c:196
 msgid "Failed to select the specified APN"
 msgstr "Halutun APN:n valinta epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:352
+#: panels/network/panel-common.c:200
 msgid "Not searching for networks"
 msgstr "Verkkoja ei etsitä"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:356
+#: panels/network/panel-common.c:204
 msgid "Network registration denied"
 msgstr "Verkkoon rekisteröinti estettiin"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:360
+#: panels/network/panel-common.c:208
 msgid "Network registration timed out"
 msgstr "Rekisteröinti verkkoon aikakatkaistiin"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:364
+#: panels/network/panel-common.c:212
 msgid "Failed to register with the requested network"
 msgstr "Määritettyyn verkkoon rekisteröinti epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:368
+#: panels/network/panel-common.c:216
 msgid "PIN check failed"
 msgstr "PIN-tarkistus epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:372
+#: panels/network/panel-common.c:220
 msgid "Firmware for the device may be missing"
 msgstr "Laitteen laiteohjelmisto saattaa puuttua"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:376
+#: panels/network/panel-common.c:224
 msgid "Connection disappeared"
 msgstr "Yhteys katosi"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:380
+#: panels/network/panel-common.c:228
 msgid "Existing connection was assumed"
 msgstr "Oletettiin olemassa oleva yhteys"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:384
+#: panels/network/panel-common.c:232
 msgid "Modem not found"
 msgstr "Modeemia ei löytynyt"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:388
+#: panels/network/panel-common.c:236
 msgid "Bluetooth connection failed"
 msgstr "Bluetooth-yhteys epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:392
+#: panels/network/panel-common.c:240
 msgid "SIM Card not inserted"
 msgstr "SIM-korttia ei ole liitetty"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:396
+#: panels/network/panel-common.c:244
 msgid "SIM Pin required"
 msgstr "SIM-kortin PIN vaaditaan"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:400
+#: panels/network/panel-common.c:248
 msgid "SIM Puk required"
 msgstr "SIM-kortin PUK vaaditaan"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:404
+#: panels/network/panel-common.c:252
 msgid "SIM wrong"
 msgstr "SIM väärin"
 
 #. TRANSLATORS: device status reason
-#: panels/network/panel-common.c:408
+#: panels/network/panel-common.c:256
 msgid "Connection dependency failed"
 msgstr "Yhteysriippuvuus epäonnistui"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:433
+#: panels/network/panel-common.c:351
 msgid "Firmware missing"
 msgstr "Laiteohjelmisto puuttuu"
 
 #. TRANSLATORS: device status
-#: panels/network/panel-common.c:437
+#: panels/network/panel-common.c:355
 msgid "Cable unplugged"
 msgstr "Johto on irti"
 
-#: panels/network/wireless-security/eap-method.c:69
+#: panels/network/wireless-security/eap-method.c:92
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "määrittelemätön virhe 802.1X-tietoturvassa (wpa-eap)"
 
-#: panels/network/wireless-security/eap-method.c:245
+#: panels/network/wireless-security/eap-method.c:153
 msgid "no file selected"
 msgstr "ei tiedostoa valittuna"
 
-#: panels/network/wireless-security/eap-method.c:276
+#: panels/network/wireless-security/eap-method.c:180
 msgid "unspecified error validating eap-method file"
 msgstr "määrittämätön virhe eap-method-tiedostoa vahvistaessa"
 
-#: panels/network/wireless-security/eap-method.c:451
+#: panels/network/wireless-security/eap-method.c:355
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER-, PEM-, tai PKCS#12-yksityisavaimet (*.der, *.pem, *.p12, *.key)"
 
-#: panels/network/wireless-security/eap-method.c:454
+#: panels/network/wireless-security/eap-method.c:358
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER- tai PEM-varmenteet (*.der, *.pem, *.crt, *.cer)"
 
-#: panels/network/wireless-security/eap-method-fast.c:72
+#: panels/network/wireless-security/eap-method-fast.c:90
 msgid "missing EAP-FAST PAC file"
 msgstr "puuttuva EAP-FAST PAC -tiedosto"
 
-#: panels/network/wireless-security/eap-method-fast.c:268
-#: panels/network/wireless-security/eap-method-peap.c:302
-#: panels/network/wireless-security/eap-method-ttls.c:361
-msgid "GTC"
-msgstr "GTC"
-
-#: panels/network/wireless-security/eap-method-fast.c:283
-#: panels/network/wireless-security/eap-method-peap.c:272
-#: panels/network/wireless-security/eap-method-ttls.c:299
-msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
-
-#: panels/network/wireless-security/eap-method-fast.c:406
+#: panels/network/wireless-security/eap-method-fast.c:300
 msgid "Choose a PAC file"
 msgstr "Valitse PAC-tiedosto"
 
-#: panels/network/wireless-security/eap-method-fast.c:413
+#: panels/network/wireless-security/eap-method-fast.c:305
 msgid "PAC files (*.pac)"
 msgstr "PAC-tiedostot (*.pac)"
 
-#: panels/network/wireless-security/eap-method-fast.ui:22
+#: panels/network/wireless-security/eap-method-fast.ui:13
+#: panels/network/wireless-security/eap-method-peap.ui:21
+#: panels/network/wireless-security/eap-method-ttls.ui:37
+msgid "GTC"
+msgstr "GTC"
+
+#: panels/network/wireless-security/eap-method-fast.ui:17
+#: panels/network/wireless-security/eap-method-peap.ui:13
+#: panels/network/wireless-security/eap-method-ttls.ui:21
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: panels/network/wireless-security/eap-method-fast.ui:29
 msgid "Anonymous"
 msgstr "Anonyymi"
 
-#: panels/network/wireless-security/eap-method-fast.ui:25
+#: panels/network/wireless-security/eap-method-fast.ui:32
 msgid "Authenticated"
 msgstr "Todennettu"
 
-#: panels/network/wireless-security/eap-method-fast.ui:28
+#: panels/network/wireless-security/eap-method-fast.ui:35
 msgid "Both"
 msgstr "Molemmat"
 
-#: panels/network/wireless-security/eap-method-fast.ui:76
+#: panels/network/wireless-security/eap-method-fast.ui:49
+#: panels/network/wireless-security/eap-method-peap.ui:52
+#: panels/network/wireless-security/eap-method-ttls.ui:51
+msgid "Anony_mous identity"
+msgstr "Anony_ymi identiteetti"
+
+#: panels/network/wireless-security/eap-method-fast.ui:75
 msgid "PAC _file"
 msgstr "PA_C-tiedosto"
 
-#: panels/network/wireless-security/eap-method-fast.ui:122
-#: panels/network/wireless-security/eap-method-peap.ui:146
-#: panels/network/wireless-security/eap-method-ttls.ui:123
+#: panels/network/wireless-security/eap-method-fast.ui:115
+#: panels/network/wireless-security/eap-method-peap.ui:150
+#: panels/network/wireless-security/eap-method-ttls.ui:143
 msgid "_Inner authentication"
 msgstr "_Sisempi tunnistautuminen"
 
-#: panels/network/wireless-security/eap-method-fast.ui:156
+#: panels/network/wireless-security/eap-method-fast.ui:144
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Salli automaattinen PAC-pro_visiointi"
 
-#: panels/network/wireless-security/eap-method-leap.c:65
+#: panels/network/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP username"
 msgstr "puuttuva EAP-LEAP-käyttäjätunnus"
 
-#: panels/network/wireless-security/eap-method-leap.c:74
+#: panels/network/wireless-security/eap-method-leap.c:78
 msgid "missing EAP-LEAP password"
 msgstr "puuttuva EAP-LEAP-salasana"
 
-#: panels/network/wireless-security/eap-method-leap.ui:26
-#: panels/network/wireless-security/eap-method-simple.ui:26
-#: panels/network/wireless-security/ws-leap.ui:26
+#: panels/network/wireless-security/eap-method-leap.ui:17
+#: panels/network/wireless-security/eap-method-simple.ui:17
+#: panels/network/wireless-security/ws-leap.ui:18
 #: panels/user-accounts/cc-add-user-dialog.ui:146
 #: panels/user-accounts/cc-add-user-dialog.ui:527
 msgid "_Username"
 msgstr "_Käyttäjätunnus"
 
-#: panels/network/wireless-security/eap-method-leap.ui:68
-#: panels/network/wireless-security/eap-method-simple.ui:85
-#: panels/network/wireless-security/eap-method-tls.ui:164
-#: panels/network/wireless-security/ws-leap.ui:68
-#: panels/network/wireless-security/ws-wpa-psk.ui:76
+#: panels/network/wireless-security/eap-method-leap.ui:31
+#: panels/network/wireless-security/eap-method-simple.ui:31
+#: panels/network/wireless-security/ws-leap.ui:32
+#: panels/network/wireless-security/ws-wpa-psk.ui:14
+#: panels/sharing/cc-sharing-panel.ui:351
+#: panels/user-accounts/cc-add-user-dialog.ui:310
+#: panels/user-accounts/cc-add-user-dialog.ui:547
+#: panels/user-accounts/cc-user-panel.ui:204
+msgid "_Password"
+msgstr "_Salasana"
+
+#: panels/network/wireless-security/eap-method-leap.ui:55
+#: panels/network/wireless-security/eap-method-simple.ui:73
+#: panels/network/wireless-security/eap-method-tls.ui:157
+#: panels/network/wireless-security/ws-leap.ui:56
+#: panels/network/wireless-security/ws-wpa-psk.ui:64
 msgid "Sho_w password"
 msgstr "N_äytä salasana"
 
-#: panels/network/wireless-security/eap-method-peap.c:63
+#: panels/network/wireless-security/eap-method-peap.c:90
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "virheellinen EAP-PEAP CA -varmenne: %s"
 
-#: panels/network/wireless-security/eap-method-peap.c:68
+#: panels/network/wireless-security/eap-method-peap.c:99
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "virheellinen EAP-PEAP CA -varmenne: varmennetta ei määritetty"
 
-#: panels/network/wireless-security/eap-method-peap.c:287
-#: panels/network/wireless-security/eap-method-ttls.c:346
-#: panels/network/wireless-security/wireless-security.c:441
-msgid "MD5"
-msgstr "MD5"
-
-#: panels/network/wireless-security/eap-method-peap.c:381
-#: panels/network/wireless-security/eap-method-tls.c:492
-#: panels/network/wireless-security/eap-method-ttls.c:440
+#: panels/network/wireless-security/eap-method-peap.c:281
+#: panels/network/wireless-security/eap-method-tls.c:496
+#: panels/network/wireless-security/eap-method-ttls.c:289
 msgid "Choose a Certificate Authority certificate"
 msgstr "Valitse varmentajavarmenne"
 
-#: panels/network/wireless-security/eap-method-peap.ui:25
+#: panels/network/wireless-security/eap-method-peap.ui:17
+#: panels/network/wireless-security/eap-method-ttls.ui:33
+#: panels/network/wireless-security/ws-wpa-eap.ui:15
+msgid "MD5"
+msgstr "MD5"
+
+#: panels/network/wireless-security/eap-method-peap.ui:36
 msgid "Version 0"
 msgstr "Versio 0"
 
-#: panels/network/wireless-security/eap-method-peap.ui:28
+#: panels/network/wireless-security/eap-method-peap.ui:39
 msgid "Version 1"
 msgstr "Versio 1"
 
-#: panels/network/wireless-security/eap-method-peap.ui:74
-#: panels/network/wireless-security/eap-method-tls.ui:75
-#: panels/network/wireless-security/eap-method-ttls.ui:82
+#: panels/network/wireless-security/eap-method-peap.ui:78
+#: panels/network/wireless-security/eap-method-tls.ui:68
+#: panels/network/wireless-security/eap-method-ttls.ui:102
 msgid "C_A certificate"
 msgstr "_Varmentajavarmenne (CA-varmenne)"
 
-#: panels/network/wireless-security/eap-method-peap.ui:96
-#: panels/network/wireless-security/eap-method-tls.ui:97
-#: panels/network/wireless-security/eap-method-ttls.ui:105
+#: panels/network/wireless-security/eap-method-peap.ui:100
+#: panels/network/wireless-security/eap-method-tls.ui:90
+#: panels/network/wireless-security/eap-method-ttls.ui:125
 msgid "No CA certificate is _required"
 msgstr "_CA-varmennetta ei vaadita"
 
-#: panels/network/wireless-security/eap-method-peap.ui:114
+#: panels/network/wireless-security/eap-method-peap.ui:118
 msgid "PEAP _version"
 msgstr "PEAP-_versio"
 
-#: panels/network/wireless-security/eap-method-simple.c:74
+#: panels/network/wireless-security/eap-method-simple.c:80
 msgid "missing EAP username"
 msgstr "puuttuva EAP-käyttäjätunnus"
 
-#: panels/network/wireless-security/eap-method-simple.c:87
+#: panels/network/wireless-security/eap-method-simple.c:93
 msgid "missing EAP password"
 msgstr "puuttuva EAP-salasana"
 
-#: panels/network/wireless-security/eap-method-tls.c:68
+#: panels/network/wireless-security/eap-method-tls.c:81
 msgid "missing EAP-TLS identity"
 msgstr "puuttuva EAP-TLS-identiteetti"
 
-#: panels/network/wireless-security/eap-method-tls.c:77
+#: panels/network/wireless-security/eap-method-tls.c:91
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "virheellinen EAP-TLS CA -varmenne: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:84
+#: panels/network/wireless-security/eap-method-tls.c:100
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "virheellinen EAP-TLS:n CA-varmenne: varmennetta ei määritetty"
 
-#: panels/network/wireless-security/eap-method-tls.c:100
+#: panels/network/wireless-security/eap-method-tls.c:113
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "virheellinen EAP-TLS:n yksityinen avain: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:110
+#: panels/network/wireless-security/eap-method-tls.c:123
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "virheellinen EAP-TLS-käyttäjävarmenne: %s"
 
-#: panels/network/wireless-security/eap-method-tls.c:307
+#: panels/network/wireless-security/eap-method-tls.c:279
 msgid "Unencrypted private keys are insecure"
 msgstr "Salaamattomat yksityiset avaimet ovat epäluotettavia"
 
-#: panels/network/wireless-security/eap-method-tls.c:310
+#: panels/network/wireless-security/eap-method-tls.c:282
 msgid ""
 "The selected private key does not appear to be protected by a password. This "
 "could allow your security credentials to be compromised. Please select a "
@@ -3780,126 +4206,131 @@ msgstr ""
 "\n"
 "(Voit salasanasuojata yksityisen avaimesi openssl:llä)"
 
-#: panels/network/wireless-security/eap-method-tls.c:486
+#: panels/network/wireless-security/eap-method-tls.c:489
 msgid "Choose your personal certificate"
 msgstr "Valitse henkilökohtainen varmenteesi"
 
-#: panels/network/wireless-security/eap-method-tls.c:498
+#: panels/network/wireless-security/eap-method-tls.c:503
 msgid "Choose your private key"
 msgstr "Valitse yksityinen avaimesi"
 
-#: panels/network/wireless-security/eap-method-tls.ui:24
+#: panels/network/wireless-security/eap-method-tls.ui:17
 msgid "I_dentity"
 msgstr "I_dentiteetti"
 
-#: panels/network/wireless-security/eap-method-tls.ui:50
+#: panels/network/wireless-security/eap-method-tls.ui:43
 msgid "_User certificate"
 msgstr "_Käyttäjävarmenne"
 
-#: panels/network/wireless-security/eap-method-tls.ui:115
+#: panels/network/wireless-security/eap-method-tls.ui:108
 msgid "Private _key"
 msgstr "_Yksityinen avain"
 
-#: panels/network/wireless-security/eap-method-tls.ui:140
+#: panels/network/wireless-security/eap-method-tls.ui:133
 msgid "_Private key password"
 msgstr "Yksityisen avaimen _salasana"
 
-#: panels/network/wireless-security/eap-method-ttls.c:63
+#: panels/network/wireless-security/eap-method-ttls.c:101
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "virheellinen EAP-TTLS CA -varmenne: %s"
 
-#: panels/network/wireless-security/eap-method-ttls.c:68
+#: panels/network/wireless-security/eap-method-ttls.c:109
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "virheellinen EAP-TTLS CA -varmenne: varmennetta ei määritetty"
 
-#: panels/network/wireless-security/eap-method-ttls.c:269
+#: panels/network/wireless-security/eap-method-ttls.ui:13
 msgid "PAP"
 msgstr "PAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:284
+#: panels/network/wireless-security/eap-method-ttls.ui:17
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: panels/network/wireless-security/eap-method-ttls.c:315
+#: panels/network/wireless-security/eap-method-ttls.ui:25
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (ei EAP:tä)"
 
-#: panels/network/wireless-security/eap-method-ttls.c:331
+#: panels/network/wireless-security/eap-method-ttls.ui:29
 msgid "CHAP"
 msgstr "CHAP"
 
-#: panels/network/wireless-security/eap-method-ttls.ui:56
+#: panels/network/wireless-security/eap-method-ttls.ui:76
 #: panels/user-accounts/cc-add-user-dialog.ui:507
 #: panels/user-accounts/data/join-dialog.ui:116
 msgid "_Domain"
 msgstr "T_oimialue"
 
-#: panels/network/wireless-security/wireless-security.c:87
+#: panels/network/wireless-security/wireless-security.c:107
 msgid "Unknown error validating 802.1X security"
 msgstr "Tuntematon virhe 802.1X-tietoturvaa vahvistaessa"
 
-#: panels/network/wireless-security/wireless-security.c:453
+#: panels/network/wireless-security/ws-dynamic-wep.ui:15
+#: panels/network/wireless-security/ws-wpa-eap.ui:20
 msgid "TLS"
 msgstr "TLS"
 
-#: panels/network/wireless-security/wireless-security.c:477
+#: panels/network/wireless-security/ws-dynamic-wep.ui:25
+#: panels/network/wireless-security/ws-wpa-eap.ui:30
 msgid "PWD"
 msgstr "PWD"
 
-#: panels/network/wireless-security/wireless-security.c:488
+#: panels/network/wireless-security/ws-dynamic-wep.ui:30
+#: panels/network/wireless-security/ws-wpa-eap.ui:35
 msgid "FAST"
 msgstr "FAST"
 
-#: panels/network/wireless-security/wireless-security.c:499
+#: panels/network/wireless-security/ws-dynamic-wep.ui:35
+#: panels/network/wireless-security/ws-wpa-eap.ui:40
 msgid "Tunneled TLS"
 msgstr "Tunneloitu TLS"
 
-#: panels/network/wireless-security/wireless-security.c:510
+#: panels/network/wireless-security/ws-dynamic-wep.ui:40
+#: panels/network/wireless-security/ws-wpa-eap.ui:45
 msgid "Protected EAP (PEAP)"
 msgstr "Suojattu EAP (PEAP)"
 
-#: panels/network/wireless-security/ws-dynamic-wep.ui:39
-#: panels/network/wireless-security/ws-wep-key.ui:115
-#: panels/network/wireless-security/ws-wpa-eap.ui:33
+#: panels/network/wireless-security/ws-dynamic-wep.ui:56
+#: panels/network/wireless-security/ws-wep-key.ui:102
+#: panels/network/wireless-security/ws-wpa-eap.ui:61
 msgid "Au_thentication"
 msgstr "_Tunnistautuminen"
 
-#: panels/network/wireless-security/ws-leap.c:63
+#: panels/network/wireless-security/ws-leap.c:84
 msgid "missing leap-username"
 msgstr "puuttuva leap-käyttäjätunnus"
 
-#: panels/network/wireless-security/ws-leap.c:74
+#: panels/network/wireless-security/ws-leap.c:93
 msgid "missing leap-password"
 msgstr "puuttuva leap-salasana"
 
-#: panels/network/wireless-security/ws-wep-key.c:107
+#: panels/network/wireless-security/ws-wep-key.c:117
 msgid "missing wep-key"
 msgstr "puuttuva wep-avain"
 
-#: panels/network/wireless-security/ws-wep-key.c:116
+#: panels/network/wireless-security/ws-wep-key.c:126
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: panels/network/wireless-security/ws-wep-key.c:124
+#: panels/network/wireless-security/ws-wep-key.c:134
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: panels/network/wireless-security/ws-wep-key.c:130
+#: panels/network/wireless-security/ws-wep-key.c:140
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: panels/network/wireless-security/ws-wep-key.c:137
+#: panels/network/wireless-security/ws-wep-key.c:147
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "virheellinen wep-avain: tunnuslause ei voi olla tyhjä"
 
-#: panels/network/wireless-security/ws-wep-key.c:139
+#: panels/network/wireless-security/ws-wep-key.c:149
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "virheellinen wep-avain: tunnuslause tulee olla vähemmän kuin 64 merkkiä"
@@ -3916,30 +4347,30 @@ msgstr "Avoin järjestelmä"
 msgid "Shared Key"
 msgstr "Jaettu avain"
 
-#: panels/network/wireless-security/ws-wep-key.ui:56
+#: panels/network/wireless-security/ws-wep-key.ui:48
 msgid "_Key"
 msgstr "_Avain"
 
-#: panels/network/wireless-security/ws-wep-key.ui:94
+#: panels/network/wireless-security/ws-wep-key.ui:84
 msgid "Sho_w key"
 msgstr "N_äytä avain"
 
-#: panels/network/wireless-security/ws-wep-key.ui:152
+#: panels/network/wireless-security/ws-wep-key.ui:134
 msgid "WEP inde_x"
 msgstr "WEP-inde_ksi"
 
-#: panels/network/wireless-security/ws-wpa-psk.c:70
+#: panels/network/wireless-security/ws-wpa-psk.c:89
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: panels/network/wireless-security/ws-wpa-psk.c:79
+#: panels/network/wireless-security/ws-wpa-psk.c:98
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: panels/network/wireless-security/ws-wpa-psk.ui:50
+#: panels/network/wireless-security/ws-wpa-psk.ui:42
 msgid "_Type"
 msgstr "_Tyyppi"
 
@@ -3984,13 +4415,12 @@ msgid "Show Message C_ontent on Lock Screen"
 msgstr "Näytä viestin sisältö _lukitusnäytöllä"
 
 #: panels/notifications/cc-notifications-panel.c:270
-#: panels/power/cc-power-panel.c:2080 panels/power/cc-power-panel.c:2087
-#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:289
-#: panels/universal-access/cc-ua-panel.c:477
-#: panels/universal-access/cc-ua-panel.c:840
-#: panels/universal-access/cc-ua-panel.c:853
-#: panels/universal-access/cc-ua-panel.c:865
-#: panels/universal-access/cc-ua-panel.c:1030
+#: panels/power/cc-power-panel.c:2072 panels/power/cc-power-panel.c:2079
+#: panels/universal-access/cc-ua-panel.c:480
+#: panels/universal-access/cc-ua-panel.c:843
+#: panels/universal-access/cc-ua-panel.c:856
+#: panels/universal-access/cc-ua-panel.c:868
+#: panels/universal-access/cc-ua-panel.c:1033
 msgid "On"
 msgstr "Päällä"
 
@@ -4031,10 +4461,11 @@ msgstr "Virhe tiliä poistaessa"
 #. Translators: The %s is the username (eg., debarshi ray gmail com
 #. * or rishi).
 #.
-#: panels/online-accounts/cc-online-accounts-panel.c:989
+#: panels/online-accounts/cc-online-accounts-panel.c:991
 #, c-format
-msgid "<b>%s</b> removed"
-msgstr "<b>%s</b> poistettu"
+#| msgid "<b>%s</b> removed"
+msgid "%s removed"
+msgstr "%s poistettu"
 
 #: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:3
 msgid "Online Accounts"
@@ -4078,18 +4509,18 @@ msgstr "Lisää tili"
 msgid "Remove Account"
 msgstr "Poista tili"
 
-#: panels/power/cc-power-panel.c:327
+#: panels/power/cc-power-panel.c:334
 msgid "Unknown time"
 msgstr "Tuntematon aika"
 
-#: panels/power/cc-power-panel.c:333
+#: panels/power/cc-power-panel.c:340
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuutti"
 msgstr[1] "%i minuuttia"
 
-#: panels/power/cc-power-panel.c:345
+#: panels/power/cc-power-panel.c:352
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -4098,298 +4529,258 @@ msgstr[1] "%i tuntia"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: panels/power/cc-power-panel.c:353
+#: panels/power/cc-power-panel.c:360
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: panels/power/cc-power-panel.c:354
+#: panels/power/cc-power-panel.c:361
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: panels/power/cc-power-panel.c:355
+#: panels/power/cc-power-panel.c:362
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:373
+#: panels/power/cc-power-panel.c:380
 #, c-format
 msgid "%s until fully charged"
 msgstr "%s kunnes ladattu täyteen"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:380
+#: panels/power/cc-power-panel.c:387
 #, c-format
 msgid "Caution: %s remaining"
 msgstr "Varoitus: %s jäljellä"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:385
+#: panels/power/cc-power-panel.c:392
 #, c-format
 msgid "%s remaining"
 msgstr "%s jäljellä"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:390 panels/power/cc-power-panel.c:420
+#: panels/power/cc-power-panel.c:397 panels/power/cc-power-panel.c:427
 msgid "Fully charged"
 msgstr "Ladattu täyteen"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:394 panels/power/cc-power-panel.c:424
+#: panels/power/cc-power-panel.c:401 panels/power/cc-power-panel.c:431
 msgid "Not charging"
 msgstr "Ei lataudu"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:398 panels/power/cc-power-panel.c:428
+#: panels/power/cc-power-panel.c:405 panels/power/cc-power-panel.c:435
 msgid "Empty"
 msgstr "Tyhjä"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:411
+#: panels/power/cc-power-panel.c:418
 msgid "Charging"
 msgstr "Latautuu"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:416
+#: panels/power/cc-power-panel.c:423
 msgid "Discharging"
 msgstr "Purkautuu"
 
-#: panels/power/cc-power-panel.c:549
+#: panels/power/cc-power-panel.c:556
 msgctxt "Battery name"
 msgid "Main"
 msgstr "Pääakku"
 
-#: panels/power/cc-power-panel.c:551
+#: panels/power/cc-power-panel.c:558
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "Lisäakku"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:626
+#: panels/power/cc-power-panel.c:633
 msgid "Wireless mouse"
 msgstr "Langaton hiiri"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:629
+#: panels/power/cc-power-panel.c:636
 msgid "Wireless keyboard"
 msgstr "Langaton näppäimistö"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:632
+#: panels/power/cc-power-panel.c:639
 msgid "Uninterruptible power supply"
 msgstr "Keskeytymätön virransyöttö"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:635
+#: panels/power/cc-power-panel.c:642
 msgid "Personal digital assistant"
 msgstr "Henkilökohtainen digitaalinen avustaja (PDA)"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:638
+#: panels/power/cc-power-panel.c:645
 msgid "Cellphone"
 msgstr "Matkapuhelin"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:641
+#: panels/power/cc-power-panel.c:648
 msgid "Media player"
 msgstr "Mediasoitin"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:644 panels/wacom/cc-wacom-panel.c:848
+#: panels/power/cc-power-panel.c:651 panels/wacom/cc-wacom-panel.c:815
 msgid "Tablet"
 msgstr "Piirtopöytä"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:647
+#: panels/power/cc-power-panel.c:654
 msgid "Computer"
 msgstr "Tietokone"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:650
+#: panels/power/cc-power-panel.c:657
 msgid "Gaming input device"
 msgstr "Pelaamiseen tarkoitettu syötelaite"
 
 #. TRANSLATORS: secondary battery, misc
-#: panels/power/cc-power-panel.c:653 panels/power/cc-power-panel.c:911
-#: panels/power/cc-power-panel.c:2430
+#: panels/power/cc-power-panel.c:660 panels/power/cc-power-panel.c:942
+#: panels/power/cc-power-panel.c:2422
 msgid "Battery"
 msgstr "Akku"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:714
+#: panels/power/cc-power-panel.c:721
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Latautuu"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:721
+#: panels/power/cc-power-panel.c:728
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Varoitus"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:726
+#: panels/power/cc-power-panel.c:733
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Matala"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:731
+#: panels/power/cc-power-panel.c:738
 msgctxt "Battery power"
 msgid "Good"
 msgstr "Hyvä"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:736
+#: panels/power/cc-power-panel.c:743
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "Täyteen ladattu"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:740
+#: panels/power/cc-power-panel.c:747
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "Tyhjä"
 
-#: panels/power/cc-power-panel.c:909
+#: panels/power/cc-power-panel.c:940
 msgid "Batteries"
 msgstr "Akut"
 
-#: panels/power/cc-power-panel.c:1274
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d tunti"
-msgstr[1] "%d tuntia"
-
-#: panels/power/cc-power-panel.c:1276
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuutti"
-msgstr[1] "%d minuuttia"
-
-#: panels/power/cc-power-panel.c:1279
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekunti"
-msgstr[1] "%d sekuntia"
-
-#. 5 hours 2 minutes 12 seconds
-#: panels/power/cc-power-panel.c:1284
-#, c-format
-msgctxt "time"
-msgid "%s %s %s"
-msgstr "%s %s %s"
-
-#. 2 minutes 12 seconds
-#: panels/power/cc-power-panel.c:1287
-#, c-format
-msgctxt "time"
-msgid "%s %s"
-msgstr "%s %s"
-
-#. 0 seconds
-#: panels/power/cc-power-panel.c:1293
-msgid "0 seconds"
-msgstr "0 sekuntia"
-
-#: panels/power/cc-power-panel.c:1390
+#: panels/power/cc-power-panel.c:1381
 msgid "When _idle"
 msgstr "Kun _käyttämättä"
 
-#: panels/power/cc-power-panel.c:1835
+#: panels/power/cc-power-panel.c:1827
 msgid "Power Saving"
 msgstr "Virransäästö"
 
-#: panels/power/cc-power-panel.c:1869
+#: panels/power/cc-power-panel.c:1861
 msgid "_Screen Brightness"
 msgstr "_Näytön kirkkaus"
 
-#: panels/power/cc-power-panel.c:1890
+#: panels/power/cc-power-panel.c:1882
 msgid "Automatic Brightness"
 msgstr "Automaattinen kirkkaus"
 
-#: panels/power/cc-power-panel.c:1903
+#: panels/power/cc-power-panel.c:1895
 msgid "_Keyboard Brightness"
 msgstr "Näppäimistön _kirkkaus"
 
-#: panels/power/cc-power-panel.c:1914
+#: panels/power/cc-power-panel.c:1906
 msgid "_Dim Screen When Inactive"
 msgstr "_Himmennä näyttö koneen ollessa käyttämättä"
 
-#: panels/power/cc-power-panel.c:1932
+#: panels/power/cc-power-panel.c:1924
 msgid "_Blank Screen"
 msgstr "_Tyhjä näyttö"
 
-#: panels/power/cc-power-panel.c:1955
+#: panels/power/cc-power-panel.c:1947
 msgid "_Wi-Fi"
 msgstr "_Wifi"
 
-#: panels/power/cc-power-panel.c:1956
+#: panels/power/cc-power-panel.c:1948
 msgid "Wi-Fi can be turned off to save power."
 msgstr "Wifi voidaan sammuttaa virran säästämiseksi."
 
-#: panels/power/cc-power-panel.c:1972
+#: panels/power/cc-power-panel.c:1964
 msgid "_Mobile Broadband"
 msgstr "_Mobiililaajakaista"
 
-#: panels/power/cc-power-panel.c:1973
+#: panels/power/cc-power-panel.c:1965
 msgid "Mobile broadband (LTE, 4G, 3G, etc.) can be turned off to save power."
 msgstr ""
 "Mobiililaajakaista (3G, 4G, LTE jne.) voidaan sammuttaa virran säästämiseksi."
 
-#: panels/power/cc-power-panel.c:2023
+#: panels/power/cc-power-panel.c:2015
 msgid "_Bluetooth"
 msgstr "_Bluetooth"
 
-#: panels/power/cc-power-panel.c:2024
+#: panels/power/cc-power-panel.c:2016
 msgid "Bluetooth can be turned off to save power."
 msgstr "Bluetooth voidaan sammuttaa virran säästämiseksi."
 
-#: panels/power/cc-power-panel.c:2076
+#: panels/power/cc-power-panel.c:2068
 msgid "When on battery power"
 msgstr "Käytettäessä akkua"
 
-#: panels/power/cc-power-panel.c:2078
+#: panels/power/cc-power-panel.c:2070
 msgid "When plugged in"
 msgstr "Käytettäessä verkkovirtaa"
 
-#: panels/power/cc-power-panel.c:2172
+#: panels/power/cc-power-panel.c:2164
 msgid "Suspend"
 msgstr "Valmiustila"
 
-#: panels/power/cc-power-panel.c:2173
+#: panels/power/cc-power-panel.c:2165
 msgid "Power Off"
 msgstr "Virta pois päältä"
 
-#: panels/power/cc-power-panel.c:2174
+#: panels/power/cc-power-panel.c:2166
 msgid "Hibernate"
 msgstr "Lepotila"
 
-#: panels/power/cc-power-panel.c:2175
+#: panels/power/cc-power-panel.c:2167
 msgid "Nothing"
 msgstr "Ei mitään"
 
 #. Frame header
-#: panels/power/cc-power-panel.c:2275
+#: panels/power/cc-power-panel.c:2267
 msgid "Suspend & Power Button"
 msgstr "Valmiustila ja virran katkaisu"
 
-#: panels/power/cc-power-panel.c:2316
+#: panels/power/cc-power-panel.c:2308
 msgid "_Automatic Suspend"
 msgstr "_Automaattinen valmiustila"
 
-#: panels/power/cc-power-panel.c:2317
+#: panels/power/cc-power-panel.c:2309
 msgid "Automatic suspend"
 msgstr "Automaattinen valmiustila"
 
-#: panels/power/cc-power-panel.c:2374
+#: panels/power/cc-power-panel.c:2366
 msgid "Po_wer Button Action"
 msgstr "_Virtapainikkeen toiminto"
 
@@ -4453,66 +4844,6 @@ msgctxt "automatic_suspend"
 msgid "2 hours"
 msgstr "2 tuntia"
 
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:63
-msgctxt "blank_screen"
-msgid "1 minute"
-msgstr "1 minuutti"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:67
-msgctxt "blank_screen"
-msgid "2 minutes"
-msgstr "2 minuuttia"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:71
-msgctxt "blank_screen"
-msgid "3 minutes"
-msgstr "3 minuuttia"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:75
-msgctxt "blank_screen"
-msgid "4 minutes"
-msgstr "4 minuuttia"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:79
-msgctxt "blank_screen"
-msgid "5 minutes"
-msgstr "5 minuuttia"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:83
-msgctxt "blank_screen"
-msgid "8 minutes"
-msgstr "8 minuuttia"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:87
-msgctxt "blank_screen"
-msgid "10 minutes"
-msgstr "10 minuuttia"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:91
-msgctxt "blank_screen"
-msgid "12 minutes"
-msgstr "12 minuuttia"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:95
-msgctxt "blank_screen"
-msgid "15 minutes"
-msgstr "15 minuuttia"
-
-#. Translators: Option for "Blank screen" in "Power" panel.
-#: panels/power/cc-power-panel.ui:99
-msgctxt "blank_screen"
-msgid "Never"
-msgstr "Ei koskaan"
-
 #: panels/power/cc-power-panel.ui:147
 msgid "Automatic Suspend"
 msgstr "Automaattinen valmiustila"
@@ -4526,7 +4857,7 @@ msgid "On _Battery Power"
 msgstr "Käytettäessä _akkua"
 
 #: panels/power/cc-power-panel.ui:233 panels/power/cc-power-panel.ui:293
-#: panels/universal-access/cc-ua-panel.ui:1495
+#: panels/universal-access/cc-ua-panel.ui:1527
 msgid "Delay"
 msgstr "Viive"
 
@@ -4561,13 +4892,6 @@ msgstr "Tunnistaudu"
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
-#. Translators: This is a password needed for printing.
-#: panels/printers/authentication-dialog.ui:96
-#: panels/printers/jobs-dialog.ui:70 panels/printers/new-printer-dialog.ui:383
-#: panels/user-accounts/cc-add-user-dialog.ui:249
-msgid "Password"
-msgstr "Salasana"
-
 #: panels/printers/authentication-dialog.ui:139
 #: panels/printers/new-printer-dialog.ui:337
 msgid "Authentication Required"
@@ -4590,35 +4914,9 @@ msgstr "Uuden tulostimen lisäys epäonnistui."
 msgid "Could not load ui: %s"
 msgstr "Käyttöliittymätiedoston lataus epäonnistui: %s"
 
-#: panels/printers/details-dialog.ui:64 panels/printers/printer-entry.ui:223
-msgid "Location"
-msgstr "Sijainti"
-
-#. Translators: Name of column showing printer drivers
-#: panels/printers/details-dialog.ui:114
-#: panels/printers/pp-ppd-selection-dialog.c:250
-msgid "Driver"
-msgstr "Ajuri"
-
-#: panels/printers/details-dialog.ui:152
-msgid "Searching for preferred drivers…"
-msgstr "Etsitään ensisijaisia ajureita…"
-
-#: panels/printers/details-dialog.ui:174
-msgid "Search for Drivers"
-msgstr "Etsi ajureita"
-
-#: panels/printers/details-dialog.ui:182
-msgid "Select from Database…"
-msgstr "Valitse tietokannasta…"
-
-#: panels/printers/details-dialog.ui:190
-msgid "Install PPD File…"
-msgstr "Asenna PPD-tiedosto…"
-
-#: panels/printers/gnome-printers-panel.desktop.in.in:3
-msgid "Printers"
-msgstr "Tulostimet"
+#: panels/printers/gnome-printers-panel.desktop.in.in:3
+msgid "Printers"
+msgstr "Tulostimet"
 
 #: panels/printers/gnome-printers-panel.desktop.in.in:4
 msgid "Add printers, view printer jobs and decide how you want to print"
@@ -4686,28 +4984,22 @@ msgstr ""
 "Syötä käyttäjätunnus ja salasana nähdäksesi tulostuspalvelimella olevat "
 "tulostimet."
 
-#. Translators: This button triggers the printing of a test page.
-#. Translators: Name of job which makes printer to print test page
-#: panels/printers/options-dialog.ui:22 panels/printers/pp-options-dialog.c:907
-msgid "Test Page"
-msgstr "Testisivu"
-
 #. Translators: This is the title of the dialog. %s is the printer name.
-#: panels/printers/pp-details-dialog.c:133
-#: panels/printers/pp-details-dialog.c:417
+#: panels/printers/pp-details-dialog.c:75
+#: panels/printers/pp-details-dialog.c:370
 #, c-format
 msgid "%s Details"
 msgstr "Tulostimen %s tiedot"
 
-#: panels/printers/pp-details-dialog.c:180
+#: panels/printers/pp-details-dialog.c:122
 msgid "No suitable driver found"
 msgstr "Soveltuvaa ajuria ei löytynyt"
 
-#: panels/printers/pp-details-dialog.c:310
+#: panels/printers/pp-details-dialog.c:249
 msgid "Select PPD File"
 msgstr "Valitse PPD-tiedosto"
 
-#: panels/printers/pp-details-dialog.c:319
+#: panels/printers/pp-details-dialog.c:258
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -4715,6 +5007,32 @@ msgstr ""
 "PostScript Printer Description -tiedostot (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, "
 "*.PPD.GZ)"
 
+#: panels/printers/pp-details-dialog.ui:68 panels/printers/printer-entry.ui:223
+msgid "Location"
+msgstr "Sijainti"
+
+#. Translators: Name of column showing printer drivers
+#: panels/printers/pp-details-dialog.ui:122
+#: panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
+msgstr "Ajuri"
+
+#: panels/printers/pp-details-dialog.ui:162
+msgid "Searching for preferred drivers…"
+msgstr "Etsitään ensisijaisia ajureita…"
+
+#: panels/printers/pp-details-dialog.ui:183
+msgid "Search for Drivers"
+msgstr "Etsi ajureita"
+
+#: panels/printers/pp-details-dialog.ui:192
+msgid "Select from Database…"
+msgstr "Valitse tietokannasta…"
+
+#: panels/printers/pp-details-dialog.ui:201
+msgid "Install PPD File…"
+msgstr "Asenna PPD-tiedosto…"
+
 #: panels/printers/ppd-selection-dialog.ui:10
 msgid "Select Printer Driver"
 msgstr "Valitse tulostinajuri"
@@ -4729,12 +5047,12 @@ msgid "Loading drivers database…"
 msgstr "Ladataan ajuritietokantaa…"
 
 #. Translators: The found device is a JetDirect printer
-#: panels/printers/pp-host.c:472
+#: panels/printers/pp-host.c:479
 msgid "JetDirect Printer"
 msgstr "JetDirect-tulostin"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: panels/printers/pp-host.c:707
+#: panels/printers/pp-host.c:714
 msgid "LPD Printer"
 msgstr "LPD-tulostin"
 
@@ -4868,127 +5186,134 @@ msgid "Searching for Printers"
 msgstr "Etsitään tulostimia"
 
 #. Translators: The found device is a printer connected via USB
-#: panels/printers/pp-new-printer-dialog.c:1680
+#: panels/printers/pp-new-printer-dialog.c:1697
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: panels/printers/pp-new-printer-dialog.c:1685
+#: panels/printers/pp-new-printer-dialog.c:1702
 msgid "Serial Port"
 msgstr "Sarjaportti"
 
 #. Translators: The found device is a printer connected via parallel port
-#: panels/printers/pp-new-printer-dialog.c:1692
+#: panels/printers/pp-new-printer-dialog.c:1709
 msgid "Parallel Port"
 msgstr "Rinnakkaisportti"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: panels/printers/pp-new-printer-dialog.c:1734
+#: panels/printers/pp-new-printer-dialog.c:1751
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. Translators: Network address of found printer
-#: panels/printers/pp-new-printer-dialog.c:1739
+#: panels/printers/pp-new-printer-dialog.c:1756
 #, c-format
 msgid "Address: %s"
 msgstr "Osoite: %s"
 
 #. Translators: This item is a server which needs authentication to show its printers
-#: panels/printers/pp-new-printer-dialog.c:1766
+#: panels/printers/pp-new-printer-dialog.c:1783
 msgid "Server requires authentication"
 msgstr "Palvelin vaatii tunnistautumisen"
 
-#: panels/printers/pp-options-dialog.c:90
+#: panels/printers/pp-options-dialog.c:91
 msgid "Two Sided"
 msgstr "Kaksipuoleinen"
 
-#: panels/printers/pp-options-dialog.c:91
+#: panels/printers/pp-options-dialog.c:92
 msgid "Paper Type"
 msgstr "Paperin tyyppi"
 
-#: panels/printers/pp-options-dialog.c:92
+#: panels/printers/pp-options-dialog.c:93
 msgid "Paper Source"
 msgstr "Paperin lähde"
 
-#: panels/printers/pp-options-dialog.c:93
+#: panels/printers/pp-options-dialog.c:94
 msgid "Output Tray"
 msgstr "Ulostulo"
 
-#: panels/printers/pp-options-dialog.c:94
+#: panels/printers/pp-options-dialog.c:95
 msgctxt "printing option"
 msgid "Resolution"
 msgstr "Tarkkuus"
 
-#: panels/printers/pp-options-dialog.c:95
+#: panels/printers/pp-options-dialog.c:96
 msgid "GhostScript pre-filtering"
 msgstr "GhostScriptin esisuodatus"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: panels/printers/pp-options-dialog.c:548
+#: panels/printers/pp-options-dialog.c:534
 msgid "Pages per side"
 msgstr "Sivuja per puoli"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: panels/printers/pp-options-dialog.c:560
+#: panels/printers/pp-options-dialog.c:546
 msgid "Two-sided"
 msgstr "Kaksipuoleinen"
 
 #. Translators: This option sets orientation of print (portrait, landscape...)
-#: panels/printers/pp-options-dialog.c:572
+#: panels/printers/pp-options-dialog.c:558
 msgid "Orientation"
 msgstr "Suunta"
 
 #. Translators: "General" tab contains general printer options
-#: panels/printers/pp-options-dialog.c:669
+#: panels/printers/pp-options-dialog.c:655
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "Yleiset"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: panels/printers/pp-options-dialog.c:672
+#: panels/printers/pp-options-dialog.c:658
 msgctxt "Printer Option Group"
 msgid "Page Setup"
 msgstr "Sivun asetukset"
 
 #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, 
duplex unit, etc.)
-#: panels/printers/pp-options-dialog.c:675
+#: panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "Asennettavat valinnat"
 
 #. Translators: "Job" tab contains settings for jobs
-#: panels/printers/pp-options-dialog.c:678
+#: panels/printers/pp-options-dialog.c:664
 msgctxt "Printer Option Group"
 msgid "Job"
 msgstr "Työ"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: panels/printers/pp-options-dialog.c:681
+#: panels/printers/pp-options-dialog.c:667
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "Kuvalaatu"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: panels/printers/pp-options-dialog.c:684
+#: panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "Väri"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: panels/printers/pp-options-dialog.c:687
+#: panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "Viimeistely"
 
 #. Translators: "Advanced" tab contains all others settings
-#: panels/printers/pp-options-dialog.c:690
+#: panels/printers/pp-options-dialog.c:676
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
 #. Translators: Name of job which makes printer to print test page
-#: panels/printers/pp-options-dialog.c:920
+#. Translators: This button triggers the printing of a test page.
+#: panels/printers/pp-options-dialog.c:869
+#: panels/printers/pp-options-dialog.ui:18
+msgid "Test Page"
+msgstr "Testisivu"
+
+#. Translators: Name of job which makes printer to print test page
+#: panels/printers/pp-options-dialog.c:882
 msgid "Test page"
 msgstr "Testisivu"
 
@@ -5034,12 +5359,12 @@ msgid "Manufacturer"
 msgstr "Valmistaja"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:606 panels/printers/printer-entry.ui:166
+#: panels/printers/pp-printer-entry.c:597 panels/printers/printer-entry.ui:166
 msgid "No Active Jobs"
 msgstr "Ei aktiivisia töitä"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:611
+#: panels/printers/pp-printer-entry.c:602
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
@@ -5047,598 +5372,247 @@ msgstr[0] "%u työ"
 msgstr[1] "%u työtä"
 
 #. Translators: The printer is low on toner
-#: panels/printers/pp-printer-entry.c:766
+#: panels/printers/pp-printer-entry.c:757
 msgid "Low on toner"
 msgstr "Muste on vähissä"
 
 #. Translators: The printer has no toner left
-#: panels/printers/pp-printer-entry.c:768
+#: panels/printers/pp-printer-entry.c:759
 msgid "Out of toner"
 msgstr "Muste on loppu"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: panels/printers/pp-printer-entry.c:771
+#: panels/printers/pp-printer-entry.c:762
 msgid "Low on developer"
 msgstr "Kehite on vähissä"
 
 #. Translators: "Developer" is a chemical for photo development,
 #. * http://en.wikipedia.org/wiki/Photographic_developer
-#: panels/printers/pp-printer-entry.c:774
+#: panels/printers/pp-printer-entry.c:765
 msgid "Out of developer"
 msgstr "Kehite on loppu"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:776
+#: panels/printers/pp-printer-entry.c:767
 msgid "Low on a marker supply"
 msgstr "Väriaine vähissä"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:778
+#: panels/printers/pp-printer-entry.c:769
 msgid "Out of a marker supply"
 msgstr "Väriaine loppu"
 
 #. Translators: One or more covers on the printer are open
-#: panels/printers/pp-printer-entry.c:780
+#: panels/printers/pp-printer-entry.c:771
 msgid "Open cover"
 msgstr "Avaa kansi"
 
 #. Translators: One or more doors on the printer are open
-#: panels/printers/pp-printer-entry.c:782
+#: panels/printers/pp-printer-entry.c:773
 msgid "Open door"
 msgstr "Avaa ovi"
 
 #. Translators: At least one input tray is low on media
-#: panels/printers/pp-printer-entry.c:784
+#: panels/printers/pp-printer-entry.c:775
 msgid "Low on paper"
 msgstr "Paperi vähissä"
 
 #. Translators: At least one input tray is empty
-#: panels/printers/pp-printer-entry.c:786
+#: panels/printers/pp-printer-entry.c:777
 msgid "Out of paper"
 msgstr "Paperi on loppu"
 
 #. Translators: The printer is offline
-#: panels/printers/pp-printer-entry.c:788
+#: panels/printers/pp-printer-entry.c:779
 msgctxt "printer state"
 msgid "Offline"
 msgstr "Poissa verkosta"
 
 #. Translators: Someone has stopped the Printer
 #. Translators: Printer's state (no jobs can be processed)
-#: panels/printers/pp-printer-entry.c:790
-#: panels/printers/pp-printer-entry.c:918
+#: panels/printers/pp-printer-entry.c:781
+#: panels/printers/pp-printer-entry.c:909
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Pysäytetty"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: panels/printers/pp-printer-entry.c:792
+#: panels/printers/pp-printer-entry.c:783
 msgid "Waste receptacle almost full"
 msgstr "Jätesäiliö melkein täynnä"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: panels/printers/pp-printer-entry.c:794
+#: panels/printers/pp-printer-entry.c:785
 msgid "Waste receptacle full"
 msgstr "Jätesäiliö täynnä"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: panels/printers/pp-printer-entry.c:796
+#: panels/printers/pp-printer-entry.c:787
 msgid "The optical photo conductor is near end of life"
 msgstr "Valojohdeyksikkö on vaihdettava pian"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: panels/printers/pp-printer-entry.c:798
+#: panels/printers/pp-printer-entry.c:789
 msgid "The optical photo conductor is no longer functioning"
 msgstr "Valojohdeyksikkö on rikki"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: panels/printers/pp-printer-entry.c:904
+#: panels/printers/pp-printer-entry.c:895
 msgctxt "printer state"
 msgid "Ready"
 msgstr "Valmiina"
 
 #. Translators: Printer's state (printer is ready but doesn't accept new jobs)
-#: panels/printers/pp-printer-entry.c:909
+#: panels/printers/pp-printer-entry.c:900
 msgctxt "printer state"
 msgid "Does not accept jobs"
 msgstr "Ei hyväksy töitä"
 
 #. Translators: Printer's state (jobs are processing)
-#: panels/printers/pp-printer-entry.c:914
+#: panels/printers/pp-printer-entry.c:905
 msgctxt "printer state"
 msgid "Processing"
 msgstr "Käsitellään"
 
 #. Translators: Name of job which makes printer to clean its heads
-#: panels/printers/pp-printer-entry.c:938
+#: panels/printers/pp-printer-entry.c:929
 msgid "Clean print heads"
 msgstr "Puhdista tulostuspäät"
 
 #: panels/printers/printer-entry.ui:14
 msgid "Printing Options"
-msgstr "Tulostusvalinnat"
-
-#: panels/printers/printer-entry.ui:26
-msgid "Printer Details"
-msgstr "Tulostimen tiedot"
-
-#. Set this printer as default
-#: panels/printers/printer-entry.ui:38
-msgid "Use Printer by Default"
-msgstr "Käytä tulostinta oletuksena"
-
-#. Translators: This button executes command which cleans print heads of the printer.
-#: panels/printers/printer-entry.ui:50
-msgid "Clean Print Heads"
-msgstr "Puhdista tulostuspäät"
-
-#: panels/printers/printer-entry.ui:61
-msgid "Remove Printer"
-msgstr "Poista tulostin"
-
-#: panels/printers/printer-entry.ui:193
-msgid "Model"
-msgstr "Malli"
-
-#: panels/printers/printer-entry.ui:251
-msgid "Ink Level"
-msgstr "Musteen taso"
-
-#. Translators: This is the message which follows the printer error.
-#: panels/printers/printer-entry.ui:312
-msgid "Please restart when the problem is resolved."
-msgstr "Käynnistä uudelleen kun ongelma on selvitetty."
-
-#. Translators: This is the button which restarts the printer.
-#: panels/printers/printer-entry.ui:319
-msgid "Restart"
-msgstr "Käynnistä uudelleen"
-
-#. Translators: This button adds new printer.
-#: panels/printers/printers.ui:20
-msgid "Add…"
-msgstr "Lisää…"
-
-#: panels/printers/printers.ui:186
-msgid "No printers"
-msgstr "Ei tulostimia"
-
-#. Translators: This button adds new printer.
-#: panels/printers/printers.ui:200
-msgid "Add a Printer…"
-msgstr "Lisää tulostin…"
-
-#. Translators: The CUPS server is not running (we can not connect to it).
-#: panels/printers/printers.ui:232
-msgid ""
-"Sorry! The system printing service\n"
-"doesn’t seem to be available."
-msgstr ""
-"Valitettavasti tulostuspalvelu\n"
-"ei vaikuta olevan käytettävissä."
-
-#: panels/privacy/cc-privacy-panel.c:423 panels/privacy/cc-privacy-panel.ui:280
-msgid "Screen Lock"
-msgstr "Näytön lukitus"
-
-#: panels/privacy/cc-privacy-panel.c:467
-msgid "In use"
-msgstr "Käytössä"
-
-#: panels/privacy/cc-privacy-panel.c:472
-msgctxt "Location services status"
-msgid "On"
-msgstr "Päällä"
-
-#: panels/privacy/cc-privacy-panel.c:473
-msgctxt "Location services status"
-msgid "Off"
-msgstr "Pois"
-
-#: panels/privacy/cc-privacy-panel.c:895
-msgctxt "Camera status"
-msgid "Off"
-msgstr "Pois"
-
-#: panels/privacy/cc-privacy-panel.c:897
-msgctxt "Camera status"
-msgid "On"
-msgstr "Päällä"
-
-#: panels/privacy/cc-privacy-panel.c:928
-msgctxt "Microphone status"
-msgid "Off"
-msgstr "Pois"
-
-#: panels/privacy/cc-privacy-panel.c:930
-msgctxt "Microphone status"
-msgid "On"
-msgstr "Päällä"
-
-#: panels/privacy/cc-privacy-panel.c:1036
-#: panels/privacy/cc-privacy-panel.ui:127
-msgid "Usage & History"
-msgstr "Käyttö ja historia"
-
-#: panels/privacy/cc-privacy-panel.c:1157
-msgid "Empty all items from Trash?"
-msgstr "Tyhjennetäänkö roskakorin koko sisältö?"
-
-#: panels/privacy/cc-privacy-panel.c:1158
-msgid "All items in the Trash will be permanently deleted."
-msgstr "Kaikki roskakorissa olevat kohteet poistetaan pysyvästi."
-
-#: panels/privacy/cc-privacy-panel.c:1159
-msgid "_Empty Trash"
-msgstr "_Tyhjennä roskakori"
-
-#: panels/privacy/cc-privacy-panel.c:1180
-msgid "Delete all the temporary files?"
-msgstr "Poistetaanko kaikki väliaikaiset tiedostot?"
-
-#: panels/privacy/cc-privacy-panel.c:1181
-msgid "All the temporary files will be permanently deleted."
-msgstr "Kaikki väliaikaiset tiedostot poistetaan pysyvästi."
-
-#: panels/privacy/cc-privacy-panel.c:1182
-msgid "_Purge Temporary Files"
-msgstr "Tu_hoa väliaikaistiedostot"
-
-#: panels/privacy/cc-privacy-panel.c:1204
-#: panels/privacy/cc-privacy-panel.ui:432
-msgid "Purge Trash & Temporary Files"
-msgstr "Tuhoa väliaikaiset ja roskakorin tiedostot"
-
-#: panels/privacy/cc-privacy-panel.c:1237
-#: panels/privacy/cc-privacy-panel.ui:637
-msgid "Software Usage"
-msgstr "Ohjelmistojen käyttö"
-
-#: panels/privacy/cc-privacy-panel.c:1276
-#: panels/privacy/cc-privacy-panel.ui:1169
-msgid "Problem Reporting"
-msgstr "Vikailmoitukset"
-
-#. translators: '%s' is the distributor's name, such as 'Fedora'
-#: panels/privacy/cc-privacy-panel.c:1288
-#, c-format
-msgid ""
-"Sending reports of technical problems helps us improve %s. Reports are sent "
-"anonymously and are scrubbed of personal data."
-msgstr ""
-"Vikailmoitusten lähettäminen auttaa parantamaan %sa. Ilmoitukset eivät "
-"sisällä henkilökohtaisia tietoja. Ilmoitukset lähetetään anonyymisti."
-
-#: panels/privacy/cc-privacy-panel.c:1300
-#: panels/privacy/cc-privacy-panel.ui:719
-msgid "Privacy Policy"
-msgstr "Tietosuoja"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:14
-msgctxt "lock_screen"
-msgid "Screen Turns Off"
-msgstr "Näyttö sammuu"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:18
-msgctxt "lock_screen"
-msgid "30 seconds"
-msgstr "30 sekuntia"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:22
-msgctxt "lock_screen"
-msgid "1 minute"
-msgstr "1 minuutti"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:26
-msgctxt "lock_screen"
-msgid "2 minutes"
-msgstr "2 minuuttia"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:30
-msgctxt "lock_screen"
-msgid "3 minutes"
-msgstr "3 minuuttia"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:34
-msgctxt "lock_screen"
-msgid "5 minutes"
-msgstr "5 minuuttia"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:38
-msgctxt "lock_screen"
-msgid "30 minutes"
-msgstr "30 minuuttia"
-
-#. Translators: Option for "Lock screen after blank for" in "Screen Lock" dialog.
-#: panels/privacy/cc-privacy-panel.ui:42
-msgctxt "lock_screen"
-msgid "1 hour"
-msgstr "1 tunti"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:56
-msgctxt "purge_files"
-msgid "1 hour"
-msgstr "1 tunti"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:60
-msgctxt "purge_files"
-msgid "1 day"
-msgstr "1 päivä"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:64
-msgctxt "purge_files"
-msgid "2 days"
-msgstr "2 päivää"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:68
-msgctxt "purge_files"
-msgid "3 days"
-msgstr "3 päivää"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:72
-msgctxt "purge_files"
-msgid "4 days"
-msgstr "4 päivää"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:76
-msgctxt "purge_files"
-msgid "5 days"
-msgstr "5 päivää"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:80
-msgctxt "purge_files"
-msgid "6 days"
-msgstr "6 päivää"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:84
-msgctxt "purge_files"
-msgid "7 days"
-msgstr "7 päivää"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:88
-msgctxt "purge_files"
-msgid "14 days"
-msgstr "14 päivää"
-
-#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
-#: panels/privacy/cc-privacy-panel.ui:92
-msgctxt "purge_files"
-msgid "30 days"
-msgstr "30 päivää"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/privacy/cc-privacy-panel.ui:106
-msgctxt "retain_history"
-msgid "1 day"
-msgstr "1 päivä"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/privacy/cc-privacy-panel.ui:110
-msgctxt "retain_history"
-msgid "7 days"
-msgstr "7 päivää"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/privacy/cc-privacy-panel.ui:114
-msgctxt "retain_history"
-msgid "30 days"
-msgstr "30 päivää"
-
-#. Translators: Option for "Retain History" in "Usage & History" dialog.
-#: panels/privacy/cc-privacy-panel.ui:118
-msgctxt "retain_history"
-msgid "Forever"
-msgstr "Ikuisesti"
-
-#: panels/privacy/cc-privacy-panel.ui:148
-msgid ""
-"Remembering your history makes things easier to find again. These items are "
-"never shared over the network."
-msgstr ""
-"Historian muistaminen helpottaa asioiden löytämistä uudelleen. Näitä tietoja "
-"ei koskaan jaeta verkossa."
-
-#: panels/privacy/cc-privacy-panel.ui:176
-msgid "_Recently Used"
-msgstr "_Äskettäin käytetyt"
-
-#: panels/privacy/cc-privacy-panel.ui:207
-msgid "Retain _History"
-msgstr "_Säilytä historia"
-
-#: panels/privacy/cc-privacy-panel.ui:247
-msgid "Cl_ear Recent History"
-msgstr "Poista historiatietoja"
-
-#: panels/privacy/cc-privacy-panel.ui:301
-msgid "The Screen Lock protects your privacy when you are away."
-msgstr "Näyttölukko suojaa yksityisyyttäsi kun olet poissa."
-
-#: panels/privacy/cc-privacy-panel.ui:328
-msgid "Automatic Screen _Lock"
-msgstr "_Automaattinen näytön lukitus"
-
-#: panels/privacy/cc-privacy-panel.ui:362
-msgid "Lock screen _after blank for"
-msgstr "Lukitse näyttö kun se on ollut _tyhjänä"
-
-#: panels/privacy/cc-privacy-panel.ui:394
-msgid "Lock Screen _Notifications"
-msgstr "_Lukitusnäytön ilmoitukset"
-
-#: panels/privacy/cc-privacy-panel.ui:454
-msgid ""
-"Automatically purge the Trash and temporary files to help keep your computer "
-"free of unnecessary sensitive information."
-msgstr ""
-"Tyhjennä roskakori ja tuhoa väliaikaistiedostot automaattisesti, jotta "
-"koneelle ei jää turhaa yksityistä tietoa."
-
-#: panels/privacy/cc-privacy-panel.ui:483
-msgid "Automatically empty _Trash"
-msgstr "Tyh_jennä roskakori automaattisesti"
-
-#: panels/privacy/cc-privacy-panel.ui:515
-msgid "Automatically purge Temporary _Files"
-msgstr "Tuhoa _väliaikaistiedostot automaattisesti"
-
-#: panels/privacy/cc-privacy-panel.ui:546
-msgid "Purge _After"
-msgstr "Tyhjennä/tuhoa _viiveellä"
-
-#: panels/privacy/cc-privacy-panel.ui:590
-msgid "_Empty Trash…"
-msgstr "_Tyhjennä roskakori…"
-
-#: panels/privacy/cc-privacy-panel.ui:606
-msgid "_Purge Temporary Files…"
-msgstr "Tu_hoa väliaikaistiedostot…"
-
-#: panels/privacy/cc-privacy-panel.ui:654
-msgid ""
-"Sending us information about which software you use helps us provide you "
-"with more accurate recommendations. It also helps us to improve our "
-"software.\n"
-"\n"
-"All the information we collect is made anonymous, and we will never share "
-"your data with third parties."
-msgstr ""
-"Lähettämällä käyttämiesi ohjelmistojen käyttötilastot saat parempia "
-"suosituksia. Samalla autat parantamaan ohjelmistoja.\n"
-"\n"
-"Keräämäämme tietoa ei voi yhdistää yksittäisiin käyttäjiin, eikä tietojasi "
-"tulla koskaan jakamaan kolmansien osapuolien kanssa."
-
-#: panels/privacy/cc-privacy-panel.ui:681
-msgid "_Send software usage statistics"
-msgstr "Lä_hetä ohjelmistojen käyttötilastot"
-
-#: panels/privacy/cc-privacy-panel.ui:764
-msgid ""
-"Use of the camera allows applications to capture photos and video. Disabling "
-"the camera may cause some applications to not function properly."
-msgstr ""
-"Kameran käyttö mahdollistaa sovellusten ottaa valo- ja videokuvaa. Kameran "
-"poistaminen käytöstä saattaa aiheuttaa ongelmia joidenkin sovellusten "
-"toimintaan."
+msgstr "Tulostusvalinnat"
 
-#: panels/privacy/cc-privacy-panel.ui:812
-msgid "_Camera"
-msgstr "_Kamera"
+#: panels/printers/printer-entry.ui:26
+msgid "Printer Details"
+msgstr "Tulostimen tiedot"
 
-#: panels/privacy/cc-privacy-panel.ui:869
-msgid ""
-"Use of the microphone allows applications to capture sounds. Disabling the "
-"microphone may cause some applications to not function properly."
-msgstr ""
-"Mikrofonin käyttö mahdollistaa sovellusten tallentaa ääntä. Mikrofonin "
-"poistaminen käytöstä saattaa aiheuttaa ongelmia joidenkin sovellusten "
-"toimintaan."
+#. Set this printer as default
+#: panels/printers/printer-entry.ui:38
+msgid "Use Printer by Default"
+msgstr "Käytä tulostinta oletuksena"
 
-#: panels/privacy/cc-privacy-panel.ui:917
-msgid "_Microphone"
-msgstr "_Mikrofoni"
+#. Translators: This button executes command which cleans print heads of the printer.
+#: panels/printers/printer-entry.ui:50
+msgid "Clean Print Heads"
+msgstr "Puhdista tulostuspäät"
 
-#: panels/privacy/cc-privacy-panel.ui:974
-msgid ""
-"Location services allow applications to know your location. Using Wi-Fi and "
-"mobile broadband increases accuracy."
-msgstr ""
-"Sijaintipalvelut mahdollistavat sovellusten paikantaa sijaintisi. Tarkkuus "
-"paranee wifiä ja mobiiliyhteyttä käyttäen."
+#: panels/printers/printer-entry.ui:61
+msgid "Remove Printer"
+msgstr "Poista tulostin"
 
-#: panels/privacy/cc-privacy-panel.ui:988
-msgid ""
-"Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
-"com/privacy'>Privacy Policy</a>"
-msgstr ""
-"Käyttää Mozillan paikannuspalvelua: <a href='https://location.services.";
-"mozilla.com/privacy'>yksityisyyskäytäntö</a>"
+#: panels/printers/printer-entry.ui:193
+msgid "Model"
+msgstr "Malli"
 
-#: panels/privacy/cc-privacy-panel.ui:1038
-msgid "_Location Services"
-msgstr "Sijai_ntipalvelut"
+#: panels/printers/printer-entry.ui:251
+msgid "Ink Level"
+msgstr "Musteen taso"
 
-#: panels/privacy/cc-privacy-panel.ui:1236
-msgid "_Automatic Problem Reporting"
-msgstr "_Automaattiset vikailmoitukset"
+#. Translators: This is the message which follows the printer error.
+#: panels/printers/printer-entry.ui:312
+msgid "Please restart when the problem is resolved."
+msgstr "Käynnistä uudelleen kun ongelma on selvitetty."
 
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
-msgid "Privacy"
-msgstr "Yksityisyys"
+#. Translators: This is the button which restarts the printer.
+#: panels/printers/printer-entry.ui:319
+msgid "Restart"
+msgstr "Käynnistä uudelleen"
 
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:4
-msgid "Protect your personal information and control what others might see"
-msgstr ""
-"Suojaa henkilökohtaisia tietojasi ja hallitse, mitä tietoja muut voivat nähdä"
+#. Translators: This button adds new printer.
+#: panels/printers/printers.ui:20
+msgid "Add…"
+msgstr "Lisää…"
 
-#. FIXME
-#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:20
+#: panels/printers/printers.ui:186
+msgid "No printers"
+msgstr "Ei tulostimia"
+
+#. Translators: This button adds new printer.
+#: panels/printers/printers.ui:200
+msgid "Add a Printer…"
+msgstr "Lisää tulostin…"
+
+#. Translators: The CUPS server is not running (we can not connect to it).
+#: panels/printers/printers.ui:232
 msgid ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;"
+"Sorry! The system printing service\n"
+"doesn’t seem to be available."
 msgstr ""
-"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
-"network;identity;näyttö;lukitus;diagnostikka;kaatuminen;yksityinen;"
-"viimeisimmät;väliaikset;nimi;verkko;identiteetti;"
+"Valitettavasti tulostuspalvelu\n"
+"ei vaikuta olevan käytettävissä."
 
-#: panels/region/cc-format-chooser.c:133
+#: panels/region/cc-format-chooser.c:148
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "Imperiaalinen"
 
-#: panels/region/cc-format-chooser.c:135
+#: panels/region/cc-format-chooser.c:150
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "Metrinen"
 
-#: panels/region/cc-format-chooser.c:314
-msgid "No regions found"
-msgstr "Alueita ei löytynyt"
-
-#: panels/region/cc-format-chooser.ui:7
+#: panels/region/cc-format-chooser.c:255 panels/region/cc-format-chooser.c:296
+#: panels/region/cc-format-chooser.ui:6
 msgid "Formats"
 msgstr "Muotoilut"
 
-#: panels/region/cc-format-chooser.ui:106
+#: panels/region/cc-format-chooser.ui:48 panels/wacom/wacom-stylus-page.ui:37
+#: shell/cc-window.ui:232
+msgid "Back"
+msgstr "Takaisin"
+
+#: panels/region/cc-format-chooser.ui:103
+msgid ""
+"Choose the format for numbers, dates and currencies. Changes take effect on "
+"next login."
+msgstr ""
+"Valitse muotoilu numeroille, päiväyksille ja valuutoille. Muutokset tulevat "
+"voimaan seuraavan kirjautumisen myötä."
+
+#: panels/region/cc-format-chooser.ui:119
+#| msgid "Search Locations"
+msgid "Search locales..."
+msgstr "Etsi maa-asetustoja..."
+
+#: panels/region/cc-format-chooser.ui:160
+msgid "Common Formats"
+msgstr "Yleiset muotoilut"
+
+#: panels/region/cc-format-chooser.ui:191
+msgid "All Formats"
+msgstr "Kaikki muotoilut"
+
+#: panels/region/cc-format-chooser.ui:244
+msgid "No Search Results"
+msgstr "Ei hakutuloksia"
+
+#: panels/region/cc-format-chooser.ui:257
+msgid "Searches can be for countries or languages."
+msgstr ""
+
+#: panels/region/cc-format-chooser.ui:309
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: panels/region/cc-format-chooser.ui:123
+#: panels/region/cc-format-chooser.ui:324
 msgid "Dates"
 msgstr "Päivämäärät"
 
-#: panels/region/cc-format-chooser.ui:185
+#: panels/region/cc-format-chooser.ui:368
 msgid "Dates & Times"
 msgstr "Päivä ja aika"
 
-#: panels/region/cc-format-chooser.ui:216
+#: panels/region/cc-format-chooser.ui:390
 msgid "Numbers"
 msgstr "Numerot"
 
-#: panels/region/cc-format-chooser.ui:233
+#: panels/region/cc-format-chooser.ui:412
 msgid "Measurement"
 msgstr "Mitat"
 
-#: panels/region/cc-format-chooser.ui:250
+#: panels/region/cc-format-chooser.ui:434
 msgid "Paper"
 msgstr "Paperi"
 
@@ -5659,12 +5633,12 @@ msgstr "Lisää syötelähde"
 msgid "Input methods can’t be used on the login screen"
 msgstr "Syötemenetelmiä ei voi käyttää kirjautumisruudussa"
 
-#: panels/region/cc-region-panel.c:1512
+#: panels/region/cc-region-panel.c:1511
 msgid "Login _Screen"
 msgstr "Kirjautumisnäytt_ö"
 
 #: panels/region/cc-region-panel.ui:64
-#: panels/user-accounts/cc-user-panel.ui:364
+#: panels/user-accounts/cc-user-panel.ui:352
 msgid "_Language"
 msgstr "_Kieli"
 
@@ -5748,14 +5722,189 @@ msgstr ""
 msgid "Language;Layout;Keyboard;Input;"
 msgstr "Kieli;Asettelu;Näppäimistö;Syöte;"
 
-#: panels/search/cc-search-locations-dialog.c:611
+#: panels/removable-media/cc-removable-media-panel.c:267
+msgid "Ask what to do"
+msgstr "Kysy mitä tehdään"
+
+#: panels/removable-media/cc-removable-media-panel.c:271
+msgid "Do nothing"
+msgstr "Älä tee mitään"
+
+#: panels/removable-media/cc-removable-media-panel.c:275
+msgid "Open folder"
+msgstr "Avaa kansio"
+
+#: panels/removable-media/cc-removable-media-panel.c:341
+msgid "Other Media"
+msgstr "Muu media"
+
+#: panels/removable-media/cc-removable-media-panel.c:362
+msgid "Select an application for audio CDs"
+msgstr "Valitse sovellus ääni-CD-levyille"
+
+#: panels/removable-media/cc-removable-media-panel.c:363
+msgid "Select an application for video DVDs"
+msgstr "Valitse sovellus video-DVD-levyille"
+
+#: panels/removable-media/cc-removable-media-panel.c:364
+msgid "Select an application to run when a music player is connected"
+msgstr "Valitse sovellus ajettavaksi kun musiikkisoitin kytketään"
+
+#: panels/removable-media/cc-removable-media-panel.c:365
+msgid "Select an application to run when a camera is connected"
+msgstr "Valitse sovellus ajettavaksi kun kamera kytketään"
+
+#: panels/removable-media/cc-removable-media-panel.c:366
+msgid "Select an application for software CDs"
+msgstr "Valitse sovellus ohjelmisto-CD-levyille"
+
+#. translators: these strings are duplicates of shared-mime-info
+#. * strings, just here to fix capitalization of the English originals.
+#. * If the shared-mime-info translation works for your language,
+#. * simply leave these untranslated.
+#.
+#: panels/removable-media/cc-removable-media-panel.c:378
+msgid "audio DVD"
+msgstr "ääni-DVD"
+
+#: panels/removable-media/cc-removable-media-panel.c:379
+msgid "blank Blu-ray disc"
+msgstr "tyhjä Blu-ray-levy"
+
+#: panels/removable-media/cc-removable-media-panel.c:380
+msgid "blank CD disc"
+msgstr "tyhjä CD-levy"
+
+#: panels/removable-media/cc-removable-media-panel.c:381
+msgid "blank DVD disc"
+msgstr "tyhjä DVD-levy"
+
+#: panels/removable-media/cc-removable-media-panel.c:382
+msgid "blank HD DVD disc"
+msgstr "tyhjä HD DVD -levy"
+
+#: panels/removable-media/cc-removable-media-panel.c:383
+msgid "Blu-ray video disc"
+msgstr "Blu-ray-videolevy"
+
+#: panels/removable-media/cc-removable-media-panel.c:384
+msgid "e-book reader"
+msgstr "e-kirjalukija"
+
+#: panels/removable-media/cc-removable-media-panel.c:385
+msgid "HD DVD video disc"
+msgstr "HD DVD -videolevy"
+
+#: panels/removable-media/cc-removable-media-panel.c:386
+msgid "Picture CD"
+msgstr "Kuva-CD"
+
+#: panels/removable-media/cc-removable-media-panel.c:387
+msgid "Super Video CD"
+msgstr "Super Video CD"
+
+#: panels/removable-media/cc-removable-media-panel.c:388
+msgid "Video CD"
+msgstr "Video-CD"
+
+#: panels/removable-media/cc-removable-media-panel.c:389
+msgid "Windows software"
+msgstr "Windows-ohjelmisto"
+
+#: panels/removable-media/cc-removable-media-panel.ui:44
+msgid "Select how media should be handled"
+msgstr "Valitse kuinka mediaa käsitellään"
+
+#: panels/removable-media/cc-removable-media-panel.ui:75
+msgid "CD _audio"
+msgstr "_Ääni-CD"
+
+#: panels/removable-media/cc-removable-media-panel.ui:92
+msgid "_DVD video"
+msgstr "_DVD-video"
+
+#: panels/removable-media/cc-removable-media-panel.ui:133
+msgid "_Music player"
+msgstr "_Musiikkisoitin"
+
+#: panels/removable-media/cc-removable-media-panel.ui:191
+msgid "_Software"
+msgstr "_Ohjelmisto"
+
+#: panels/removable-media/cc-removable-media-panel.ui:229
+msgid "_Other Media…"
+msgstr "_Muu media…"
+
+#: panels/removable-media/cc-removable-media-panel.ui:288
+msgid "_Never prompt or start programs on media insertion"
+msgstr "_Älä koskaan kysy tai käynnistä ohjelmia liitettäessä media"
+
+#: panels/removable-media/cc-removable-media-panel.ui:342
+msgid "Select how other media should be handled"
+msgstr "Valitse kuinka muita medioita käsitellään"
+
+#: panels/removable-media/cc-removable-media-panel.ui:389
+msgid "_Action:"
+msgstr "_Toiminto:"
+
+#: panels/removable-media/cc-removable-media-panel.ui:412
+msgid "_Type:"
+msgstr "_Tyyppi:"
+
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:3
+msgid "Removable Media"
+msgstr "Erilliset tallennusvälineet"
+
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:4
+msgid "Configure Removable Media settings"
+msgstr "Määritä erillisten tallennusvälineiden asetukset"
+
+#. Translators: Search terms to find the Removable Media panel. Do NOT translate or localize the semicolons! 
The list MUST also end with a semicolon!
+#: panels/removable-media/gnome-removable-media-panel.desktop.in.in:19
+msgid ""
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;"
+msgstr ""
+"device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
+"removable;media;autorun;laite;järjestelmä;tiedot;muisti;suoritin;prosessori;"
+"versio;oletukset;sovellus;suositellut;automaattikäynnistys;ääni;irrotettava;"
+"ulkoinen;"
+
+#: panels/search/cc-search-locations-dialog.c:635
 msgid "Select Location"
 msgstr "Valitse sijainti"
 
-#: panels/search/cc-search-locations-dialog.c:615
+#: panels/search/cc-search-locations-dialog.c:639
 msgid "_OK"
 msgstr "_OK"
 
+#: panels/search/cc-search-locations-dialog.ui:9
+#: panels/search/cc-search-panel.ui:61
+msgid "Search Locations"
+msgstr "Hakukohteet"
+
+#: panels/search/cc-search-locations-dialog.ui:32
+#: panels/search/cc-search-locations-dialog.ui:69
+#: panels/search/cc-search-locations-dialog.ui:107
+msgid ""
+"Folders which are searched by system applications, such as Files, Photos and "
+"Videos."
+msgstr ""
+"Kansiot, joista järjestelmäsovellukset kuten tiedostonhallinta, kuva- ja "
+"videosovellukset, suorittavat haun."
+
+#: panels/search/cc-search-locations-dialog.ui:52
+msgid "Places"
+msgstr "Sijainnit"
+
+#: panels/search/cc-search-locations-dialog.ui:91
+msgid "Bookmarks"
+msgstr "Kirjanmerkit"
+
+#: panels/search/cc-search-locations-dialog.ui:156
+msgid "Other"
+msgstr "Muu"
+
 #: panels/search/cc-search-panel.c:153
 msgid "No applications found"
 msgstr "Sovelluksia ei löytynyt"
@@ -5768,7 +5917,7 @@ msgstr "Siirrä _ylös"
 msgid "Move Down"
 msgstr "Siirrä _alas"
 
-#: panels/search/cc-search-panel.ui:32
+#: panels/search/cc-search-panel.ui:33
 msgid ""
 "Control which search results are shown in the Activities Overview. The order "
 "of search results can also be changed by moving rows in the list."
@@ -5776,11 +5925,6 @@ msgstr ""
 "Määrittää mitä hakutuloksia näytetään Toiminnot-yleisnäkymässä. Hakutulosten "
 "järjestystä voi muuttaa siirtämällä rivejä listassa."
 
-#: panels/search/cc-search-panel.ui:60
-#: panels/search/search-locations-dialog.ui:9
-msgid "Search Locations"
-msgstr "Hakukohteet"
-
 #: panels/search/gnome-search-panel.desktop.in.in:4
 msgid ""
 "Control which applications show search results in the Activities Overview"
@@ -5793,33 +5937,15 @@ msgstr ""
 "Search;Find;Index;Hide;Privacy;Results;Haku;Etsi;Indeksi;Piilota;Yksityisyys;"
 "Tulokset;Hakutulokset;"
 
-#: panels/search/search-locations-dialog.ui:32
-#: panels/search/search-locations-dialog.ui:69
-#: panels/search/search-locations-dialog.ui:107
-msgid ""
-"Folders which are searched by system applications, such as Files, Photos and "
-"Videos."
-msgstr ""
-"Kansiot, joista järjestelmäsovellukset kuten tiedostonhallinta, kuva- ja "
-"videosovellukset, suorittavat haun."
-
-#: panels/search/search-locations-dialog.ui:52
-msgid "Places"
-msgstr "Sijainnit"
-
-#: panels/search/search-locations-dialog.ui:91
-msgid "Bookmarks"
-msgstr "Kirjanmerkit"
-
-#: panels/search/search-locations-dialog.ui:156
-msgid "Other"
-msgstr "Muu"
-
 #. Label
 #: panels/sharing/cc-sharing-networks.c:307
 msgid "No networks selected for sharing"
 msgstr "Ei verkkoja valittu jakamista varten"
 
+#: panels/sharing/cc-sharing-networks.ui:19
+msgid "Networks"
+msgstr "Verkot"
+
 #: panels/sharing/cc-sharing-panel.c:320
 msgctxt "service is enabled"
 msgid "On"
@@ -5844,41 +5970,43 @@ msgstr "Aktiivinen"
 msgid "Choose a Folder"
 msgstr "Valitse kansio"
 
-#: panels/sharing/cc-sharing-panel.c:726
+#. TRANSLATORS: %s is replaced with a link to a dav://<hostname> URL
+#: panels/sharing/cc-sharing-panel.c:729
 #, c-format
 msgid ""
 "File Sharing allows you to share your Public folder with others on your "
-"current network using: <a href=\"dav://%s\">dav://%s</a>"
+"current network using: %s"
 msgstr ""
-"Henkilökohtaisen tiedostonjaon avulla voit jakaa julkisen kansiosi sisällön "
-"verkon muiden käyttäjien kanssa käyttäen osoitetta <a href=\"dav://%s"
-"\">dav://%s</a>"
+"Tiedostonjaon avulla voit jakaa julkisen kansiosi sisällön verkon muiden "
+"käyttäjien kanssa käyttäen osoitetta: %s"
 
-#: panels/sharing/cc-sharing-panel.c:728
+#. TRANSLATORS: %s is replaced with a link to a "ssh <hostname>" command to run
+#: panels/sharing/cc-sharing-panel.c:735
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
 "Shell command:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
+"%s"
 msgstr ""
-"Kun etäkirjautuminen on sallittu, etäkäyttäjät voivat yhdistää käyttäen "
+"Kun etäkirjautuminen on käytössä, etäkäyttäjät voivat yhdistää käyttäen "
 "Secure Shell -komentoa:\n"
-"<a href=\"ssh %s\">ssh %s</a>"
+"%s"
 
-#: panels/sharing/cc-sharing-panel.c:730
+#. TRANSLATORS: %s is replaced with a link to a vnc://<hostname> URL
+#: panels/sharing/cc-sharing-panel.c:741
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
-"connecting to <a href=\"vnc://%s\">vnc://%s</a>"
+"connecting to %s"
 msgstr ""
 "Näytön jakaminen sallii etäkäyttäjien seurata ja hallita näyttöäsi "
-"yhdistämällä kohteeseen <a href=\"vnc://%s\">vnc://%s</a>"
+"yhdistämällä kohteeseen %s"
 
-#: panels/sharing/cc-sharing-panel.c:834
+#: panels/sharing/cc-sharing-panel.c:846
 msgid "Copy"
 msgstr "Kopioi"
 
-#: panels/sharing/cc-sharing-panel.c:1287
+#: panels/sharing/cc-sharing-panel.c:1299
 #: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "Jakaminen"
@@ -5976,10 +6104,6 @@ msgstr ""
 "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
 "movies;server;renderer;jako;jakaminen;etä;työpöytä;ääni;video;kuvat;palvelin;"
 
-#: panels/sharing/networks.ui:19
-msgid "Networks"
-msgstr "Verkot"
-
 #: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:11
 msgid "Enable or disable remote login"
 msgstr "Käytä tai poista käytöstä etäkirjautuminen"
@@ -6077,7 +6201,7 @@ msgstr "Äänenvoimakkuus"
 msgid "Alert Sound"
 msgstr "Hälytysääni"
 
-#: panels/sound/cc-volume-slider.c:92
+#: panels/sound/cc-volume-slider.c:115
 msgctxt "volume"
 msgid "100%"
 msgstr "100 %"
@@ -6276,32 +6400,32 @@ msgstr "Thunderbolt;"
 
 #. translators: the labels will read:
 #. * Cursor Size: Default
-#: panels/universal-access/cc-ua-panel.c:497
+#: panels/universal-access/cc-ua-panel.c:500
 msgctxt "cursor size"
 msgid "Default"
 msgstr "Oletus"
 
-#: panels/universal-access/cc-ua-panel.c:500
+#: panels/universal-access/cc-ua-panel.c:503
 msgctxt "cursor size"
 msgid "Medium"
 msgstr "Keskikoko"
 
-#: panels/universal-access/cc-ua-panel.c:503
+#: panels/universal-access/cc-ua-panel.c:506
 msgctxt "cursor size"
 msgid "Large"
 msgstr "Suuri"
 
-#: panels/universal-access/cc-ua-panel.c:506
+#: panels/universal-access/cc-ua-panel.c:509
 msgctxt "cursor size"
 msgid "Larger"
 msgstr "Suurempi"
 
-#: panels/universal-access/cc-ua-panel.c:509
+#: panels/universal-access/cc-ua-panel.c:512
 msgctxt "cursor size"
 msgid "Largest"
 msgstr "Suurin"
 
-#: panels/universal-access/cc-ua-panel.c:513
+#: panels/universal-access/cc-ua-panel.c:516
 #, c-format
 msgid "%d pixel"
 msgid_plural "%d pixels"
@@ -6338,7 +6462,7 @@ msgid "Screen _Reader"
 msgstr "_Näytönlukija"
 
 #: panels/universal-access/cc-ua-panel.ui:397
-#: panels/universal-access/cc-ua-panel.ui:1231
+#: panels/universal-access/cc-ua-panel.ui:1263
 msgid "_Sound Keys"
 msgstr "_Äänekkäät näppäimet"
 
@@ -6347,7 +6471,7 @@ msgid "Hearing"
 msgstr "Kuuleminen"
 
 #: panels/universal-access/cc-ua-panel.ui:503
-#: panels/universal-access/cc-ua-panel.ui:1334
+#: panels/universal-access/cc-ua-panel.ui:1366
 msgid "_Visual Alerts"
 msgstr "_Visuaaliset hälytykset"
 
@@ -6376,252 +6500,256 @@ msgid "_Mouse Keys"
 msgstr "_Hiirinäppäimet"
 
 #: panels/universal-access/cc-ua-panel.ui:900
+msgid "_Locate Pointer"
+msgstr "_Paikanna kohdistin"
+
+#: panels/universal-access/cc-ua-panel.ui:932
 msgid "_Click Assist"
 msgstr "N_apsautusapu"
 
-#: panels/universal-access/cc-ua-panel.ui:946
+#: panels/universal-access/cc-ua-panel.ui:978
 msgid "_Double-Click Delay"
 msgstr "Kaksoisnapsautuksen _viive"
 
-#: panels/universal-access/cc-ua-panel.ui:966
+#: panels/universal-access/cc-ua-panel.ui:998
 msgid "Double-Click Delay"
 msgstr "Kaksoisnapsautuksen viive"
 
-#: panels/universal-access/cc-ua-panel.ui:1036
+#: panels/universal-access/cc-ua-panel.ui:1068
 msgid "Cursor Size"
 msgstr "Kohdistimen koko"
 
-#: panels/universal-access/cc-ua-panel.ui:1063
+#: panels/universal-access/cc-ua-panel.ui:1095
 msgid ""
 "Cursor size can be combined with zoom to make it easier to see the cursor."
 msgstr ""
 "Kohdistimen koon muuttamisella ja suurennuksella on mahdollista tehdä "
 "kohdistimen erottaminen helpommaksi."
 
-#: panels/universal-access/cc-ua-panel.ui:1099
+#: panels/universal-access/cc-ua-panel.ui:1131
 msgid "Screen Reader"
 msgstr "Näytönlukija"
 
-#: panels/universal-access/cc-ua-panel.ui:1116
+#: panels/universal-access/cc-ua-panel.ui:1148
 msgid "The screen reader reads displayed text as you move the focus."
 msgstr ""
 "Näytönlukija lukee ääneen näytöllä olevan tekstin vaihtaessasi kohdistusta."
 
-#: panels/universal-access/cc-ua-panel.ui:1149
+#: panels/universal-access/cc-ua-panel.ui:1181
 msgid "_Screen Reader"
 msgstr "_Näytönlukija"
 
-#: panels/universal-access/cc-ua-panel.ui:1188
+#: panels/universal-access/cc-ua-panel.ui:1220
 msgid "Sound Keys"
 msgstr "_Äänekkäät näppäimet"
 
-#: panels/universal-access/cc-ua-panel.ui:1206
+#: panels/universal-access/cc-ua-panel.ui:1238
 msgid "Beep when Num Lock or Caps Lock are turned on or off."
 msgstr "Piippaa kun Num Lock tai Caps Lock otetaan käyttöön."
 
-#: panels/universal-access/cc-ua-panel.ui:1276
+#: panels/universal-access/cc-ua-panel.ui:1308
 msgid "Visual Alerts"
 msgstr "Visuaaliset hälytykset"
 
-#: panels/universal-access/cc-ua-panel.ui:1280
+#: panels/universal-access/cc-ua-panel.ui:1312
 msgid "_Test flash"
 msgstr "_Testaa välähdystä"
 
-#: panels/universal-access/cc-ua-panel.ui:1309
+#: panels/universal-access/cc-ua-panel.ui:1341
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "Käytä visuaalista ilmoitusta, kun hälytyksen äänitehoste toistetaan."
 
-#: panels/universal-access/cc-ua-panel.ui:1360
-msgid "Flash the _window title"
-msgstr "Väläytä _ikkunan reunusta"
+#: panels/universal-access/cc-ua-panel.ui:1392
+msgid "Flash the entire _window"
+msgstr "Väläytä _koko ikkunaa"
 
-#: panels/universal-access/cc-ua-panel.ui:1378
+#: panels/universal-access/cc-ua-panel.ui:1410
 msgid "Flash the entire _screen"
 msgstr "Väläytä _koko näyttöä"
 
-#: panels/universal-access/cc-ua-panel.ui:1423
+#: panels/universal-access/cc-ua-panel.ui:1455
 msgid "Repeat Keys"
 msgstr "Toistonäppäimet"
 
-#: panels/universal-access/cc-ua-panel.ui:1453
+#: panels/universal-access/cc-ua-panel.ui:1485
 msgid "Key presses repeat when key is held down."
 msgstr "Painallus toistuu, kun näppäintä pidetään painettuna."
 
-#: panels/universal-access/cc-ua-panel.ui:1533
+#: panels/universal-access/cc-ua-panel.ui:1565
 msgid "Repeat keys delay"
 msgstr "Näppäinten toiston viive"
 
-#: panels/universal-access/cc-ua-panel.ui:1581
-#: panels/universal-access/cc-ua-panel.ui:1716
+#: panels/universal-access/cc-ua-panel.ui:1613
+#: panels/universal-access/cc-ua-panel.ui:1748
 msgid "Speed"
 msgstr "Nopeus"
 
-#: panels/universal-access/cc-ua-panel.ui:1620
+#: panels/universal-access/cc-ua-panel.ui:1652
 msgid "Repeat keys speed"
 msgstr "Näppäinten toiston nopeus"
 
-#: panels/universal-access/cc-ua-panel.ui:1644
+#: panels/universal-access/cc-ua-panel.ui:1676
 msgid "Cursor Blinking"
 msgstr "Kohdistimen vilkunta"
 
-#: panels/universal-access/cc-ua-panel.ui:1674
+#: panels/universal-access/cc-ua-panel.ui:1706
 msgid "Cursor blinks in text fields."
 msgstr "Kohdistin vilkkuu tekstikentissä."
 
-#: panels/universal-access/cc-ua-panel.ui:1753
+#: panels/universal-access/cc-ua-panel.ui:1785
 msgid "Cursor blinking speed"
 msgstr "Kohdistimen vilkkumisnopeus"
 
-#: panels/universal-access/cc-ua-panel.ui:1789
+#: panels/universal-access/cc-ua-panel.ui:1821
 msgid "Typing Assist"
 msgstr "Kirjoitusapu"
 
-#: panels/universal-access/cc-ua-panel.ui:1828
+#: panels/universal-access/cc-ua-panel.ui:1860
 msgid "_Sticky Keys"
 msgstr "_Pohjaan jäävät näppäimet"
 
-#: panels/universal-access/cc-ua-panel.ui:1845
+#: panels/universal-access/cc-ua-panel.ui:1877
 msgid "Treats a sequence of modifier keys as a key combination"
 msgstr "Kohtelee määritenäppäinten sarjaa näppäinyhdistelmänä"
 
-#: panels/universal-access/cc-ua-panel.ui:1869
+#: panels/universal-access/cc-ua-panel.ui:1901
 msgid "_Disable if two keys are pressed together"
 msgstr "_Poista käytöstä, jos kahta näppäintä painetaan samanaikaisesti"
 
-#: panels/universal-access/cc-ua-panel.ui:1887
+#: panels/universal-access/cc-ua-panel.ui:1919
 msgid "Beep when a _modifier key is pressed"
 msgstr "Soita äänimerkki, kun _määritenäppäintä painetaan"
 
-#: panels/universal-access/cc-ua-panel.ui:1935
+#: panels/universal-access/cc-ua-panel.ui:1967
 msgid "S_low Keys"
 msgstr "_Hitaat näppäimet"
 
-#: panels/universal-access/cc-ua-panel.ui:1952
+#: panels/universal-access/cc-ua-panel.ui:1984
 msgid "Puts a delay between when a key is pressed and when it is accepted"
 msgstr "Aseta viive hyväksyttyjen näppäinpainallusten välille"
 
-#: panels/universal-access/cc-ua-panel.ui:1985
-#: panels/universal-access/cc-ua-panel.ui:2198
-#: panels/universal-access/cc-ua-panel.ui:2535
+#: panels/universal-access/cc-ua-panel.ui:2017
+#: panels/universal-access/cc-ua-panel.ui:2230
+#: panels/universal-access/cc-ua-panel.ui:2567
 msgid "A_cceptance delay:"
 msgstr "V_iiveen kesto:"
 
-#: panels/universal-access/cc-ua-panel.ui:2007
+#: panels/universal-access/cc-ua-panel.ui:2039
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "Lyhyt"
 
-#: panels/universal-access/cc-ua-panel.ui:2026
+#: panels/universal-access/cc-ua-panel.ui:2058
 msgid "Slow keys typing delay"
 msgstr "Hitaiden näppäinten kirjoitusviive"
 
-#: panels/universal-access/cc-ua-panel.ui:2041
+#: panels/universal-access/cc-ua-panel.ui:2073
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "Pitkä"
 
-#: panels/universal-access/cc-ua-panel.ui:2068
+#: panels/universal-access/cc-ua-panel.ui:2100
 msgid "Beep when a key is pr_essed"
 msgstr "Soita äänimerkki, kun näppäintä _painetaan"
 
-#: panels/universal-access/cc-ua-panel.ui:2085
+#: panels/universal-access/cc-ua-panel.ui:2117
 msgid "Beep when a key is _accepted"
 msgstr "Soita äänimerkki, kun näppäinpainallus _hyväksytään"
 
-#: panels/universal-access/cc-ua-panel.ui:2102
-#: panels/universal-access/cc-ua-panel.ui:2281
+#: panels/universal-access/cc-ua-panel.ui:2134
+#: panels/universal-access/cc-ua-panel.ui:2313
 msgid "Beep when a key is _rejected"
 msgstr "Soita äänimerkki, kun näppäinpainallusta _ei hyväksytty"
 
-#: panels/universal-access/cc-ua-panel.ui:2148
+#: panels/universal-access/cc-ua-panel.ui:2180
 msgid "_Bounce Keys"
 msgstr "_Kimmonäppäimet"
 
-#: panels/universal-access/cc-ua-panel.ui:2165
+#: panels/universal-access/cc-ua-panel.ui:2197
 msgid "Ignores fast duplicate keypresses"
 msgstr "Älä huomioi nopeita kahden näppäimen painalluksia"
 
-#: panels/universal-access/cc-ua-panel.ui:2220
+#: panels/universal-access/cc-ua-panel.ui:2252
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "Lyhyt"
 
-#: panels/universal-access/cc-ua-panel.ui:2239
+#: panels/universal-access/cc-ua-panel.ui:2271
 msgid "Bounce keys typing delay"
 msgstr "Kimmonäppäinten kirjoitusviive"
 
-#: panels/universal-access/cc-ua-panel.ui:2254
+#: panels/universal-access/cc-ua-panel.ui:2286
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "Pitkä"
 
-#: panels/universal-access/cc-ua-panel.ui:2367
+#: panels/universal-access/cc-ua-panel.ui:2399
 msgid "_Enable by Keyboard"
 msgstr "_Ota käyttöön näppäimistöä käyttäen"
 
-#: panels/universal-access/cc-ua-panel.ui:2384
+#: panels/universal-access/cc-ua-panel.ui:2416
 msgid "Turn accessibility features on and off using the keyboard"
 msgstr ""
 "Ota käyttöön/poista käytöstä esteettömyystoiminnot näppäimistöä käyttäen"
 
-#: panels/universal-access/cc-ua-panel.ui:2448
+#: panels/universal-access/cc-ua-panel.ui:2480
 msgid "Click Assist"
 msgstr "Napsautusapu"
 
-#: panels/universal-access/cc-ua-panel.ui:2484
+#: panels/universal-access/cc-ua-panel.ui:2516
 msgid "_Simulated Secondary Click"
 msgstr "Kakkospainikkeen simuloitu _napsautus"
 
-#: panels/universal-access/cc-ua-panel.ui:2502
+#: panels/universal-access/cc-ua-panel.ui:2534
 msgid "Trigger a secondary click by holding down the primary button"
 msgstr "Käytä hiiren kakkosnäppäintä pitämällä ykkösnäppäintä pohjassa"
 
-#: panels/universal-access/cc-ua-panel.ui:2556
+#: panels/universal-access/cc-ua-panel.ui:2588
 msgctxt "secondary click"
 msgid "Short"
 msgstr "Lyhyt"
 
-#: panels/universal-access/cc-ua-panel.ui:2575
+#: panels/universal-access/cc-ua-panel.ui:2607
 msgid "Secondary click delay"
 msgstr "Kakkosnäppäimen viive"
 
-#: panels/universal-access/cc-ua-panel.ui:2590
+#: panels/universal-access/cc-ua-panel.ui:2622
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "Pitkä"
 
-#: panels/universal-access/cc-ua-panel.ui:2647
+#: panels/universal-access/cc-ua-panel.ui:2679
 msgid "_Hover Click"
 msgstr "Napsautus _kohdistamalla"
 
-#: panels/universal-access/cc-ua-panel.ui:2665
+#: panels/universal-access/cc-ua-panel.ui:2697
 msgid "Trigger a click when the pointer hovers"
 msgstr "Toteuta painallus, kun hiiren kohdistin kohdistetaan"
 
-#: panels/universal-access/cc-ua-panel.ui:2698
+#: panels/universal-access/cc-ua-panel.ui:2730
 msgid "D_elay:"
 msgstr "Viiv_e:"
 
-#: panels/universal-access/cc-ua-panel.ui:2720
+#: panels/universal-access/cc-ua-panel.ui:2752
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "Lyhyt"
 
-#: panels/universal-access/cc-ua-panel.ui:2751
+#: panels/universal-access/cc-ua-panel.ui:2783
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "Pitkä"
 
-#: panels/universal-access/cc-ua-panel.ui:2787
+#: panels/universal-access/cc-ua-panel.ui:2819
 msgid "Motion _threshold:"
 msgstr "Liikkeen _kynnysarvo:"
 
-#: panels/universal-access/cc-ua-panel.ui:2809
+#: panels/universal-access/cc-ua-panel.ui:2841
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "Pieni"
 
-#: panels/universal-access/cc-ua-panel.ui:2840
+#: panels/universal-access/cc-ua-panel.ui:2872
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "Suuri"
@@ -6821,6 +6949,178 @@ msgstr "Väritehosteet:"
 msgid "Color Effects"
 msgstr "Väritehosteet"
 
+#: panels/usage/cc-usage-panel.c:155
+msgid "Empty all items from Trash?"
+msgstr "Tyhjennetäänkö roskakorin koko sisältö?"
+
+#: panels/usage/cc-usage-panel.c:156
+msgid "All items in the Trash will be permanently deleted."
+msgstr "Kaikki roskakorissa olevat kohteet poistetaan pysyvästi."
+
+#: panels/usage/cc-usage-panel.c:157
+msgid "_Empty Trash"
+msgstr "_Tyhjennä roskakori"
+
+#: panels/usage/cc-usage-panel.c:178
+msgid "Delete all the temporary files?"
+msgstr "Poistetaanko kaikki väliaikaiset tiedostot?"
+
+#: panels/usage/cc-usage-panel.c:179
+msgid "All the temporary files will be permanently deleted."
+msgstr "Kaikki väliaikaiset tiedostot poistetaan pysyvästi."
+
+#: panels/usage/cc-usage-panel.c:180
+msgid "_Purge Temporary Files"
+msgstr "Tu_hoa väliaikaistiedostot"
+
+#: panels/usage/cc-usage-panel.ui:31
+msgid "File History"
+msgstr "Tiedostohistoria"
+
+#: panels/usage/cc-usage-panel.ui:43
+msgid ""
+"File history keeps a record of files that you have used. This information is "
+"shared between applications, and makes it easier to find files that you "
+"might want to use."
+msgstr ""
+
+#: panels/usage/cc-usage-panel.ui:58
+msgid "File H_istory"
+msgstr "Tiedosto_historia"
+
+#: panels/usage/cc-usage-panel.ui:80
+msgid "File _History Duration"
+msgstr "_Tiedostohistorian kesto"
+
+#: panels/usage/cc-usage-panel.ui:121
+#| msgid "Cl_ear Recent History"
+msgid "_Clear History…"
+msgstr "_Tyhjennä historia…"
+
+#: panels/usage/cc-usage-panel.ui:137
+msgid "Trash & Temporary Files"
+msgstr "Roskakori ja väliaikaiset tiedostot"
+
+#: panels/usage/cc-usage-panel.ui:147
+msgid ""
+"Trash and temporary files can sometimes include personal or sensitive "
+"information. Automatically deleting them can help to protect privacy."
+msgstr ""
+
+#: panels/usage/cc-usage-panel.ui:161
+msgid "Automatically Delete _Trash Content"
+msgstr "Poista _roskakorin sisältö automaattisesti"
+
+#: panels/usage/cc-usage-panel.ui:176
+msgid "Automatically Delete Temporary _Files"
+msgstr "Poista _väliaikaistiedostot automaattisesti"
+
+#: panels/usage/cc-usage-panel.ui:198
+msgid "Automatically Delete _Period"
+msgstr "Poista _ajanjakso automaattisesti"
+
+#: panels/usage/cc-usage-panel.ui:240
+msgid "_Empty Trash…"
+msgstr "_Tyhjennä roskakori…"
+
+#: panels/usage/cc-usage-panel.ui:252
+#| msgid "_Purge Temporary Files…"
+msgid "_Delete Temporary Files…"
+msgstr "_Poista väliaikaistiedostot…"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:280
+msgctxt "purge_files"
+msgid "1 hour"
+msgstr "1 tunti"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:284
+msgctxt "purge_files"
+msgid "1 day"
+msgstr "1 päivä"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:288
+msgctxt "purge_files"
+msgid "2 days"
+msgstr "2 päivää"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:292
+msgctxt "purge_files"
+msgid "3 days"
+msgstr "3 päivää"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:296
+msgctxt "purge_files"
+msgid "4 days"
+msgstr "4 päivää"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:300
+msgctxt "purge_files"
+msgid "5 days"
+msgstr "5 päivää"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:304
+msgctxt "purge_files"
+msgid "6 days"
+msgstr "6 päivää"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:308
+msgctxt "purge_files"
+msgid "7 days"
+msgstr "7 päivää"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:312
+msgctxt "purge_files"
+msgid "14 days"
+msgstr "14 päivää"
+
+#. Translators: Option for "Purge After" in "Purge Trash & Temporary Files" dialog.
+#: panels/usage/cc-usage-panel.ui:316
+msgctxt "purge_files"
+msgid "30 days"
+msgstr "30 päivää"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:331
+msgctxt "retain_history"
+msgid "1 day"
+msgstr "1 päivä"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:335
+msgctxt "retain_history"
+msgid "7 days"
+msgstr "7 päivää"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:339
+msgctxt "retain_history"
+msgid "30 days"
+msgstr "30 päivää"
+
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/usage/cc-usage-panel.ui:343
+msgctxt "retain_history"
+msgid "Forever"
+msgstr "Ikuisesti"
+
+#: panels/usage/gnome-usage-panel.desktop.in.in:3
+msgid "File History & Trash"
+msgstr "Tiedostohistoria ja roskakori"
+
+#: panels/usage/gnome-usage-panel.desktop.in.in:4
+msgid "Don't leave traces"
+msgstr "Älä jätä jälkiä"
+
+#. FIXME
 #: panels/user-accounts/cc-add-user-dialog.c:34
 msgid "Should match the web address of your login provider."
 msgstr "Tulisi vastata kirjautumistilisi myöntäjän verkko-osoitetta."
@@ -6883,17 +7183,17 @@ msgid "_Full Name"
 msgstr "K_oko nimi"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:206
-#: panels/user-accounts/cc-user-panel.ui:153
+#: panels/user-accounts/cc-user-panel.ui:141
 msgid "Standard"
 msgstr "Normaali"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:216
-#: panels/user-accounts/cc-user-panel.ui:163
+#: panels/user-accounts/cc-user-panel.ui:151
 msgid "Administrator"
 msgstr "Ylläpitäjä"
 
 #: panels/user-accounts/cc-add-user-dialog.ui:232
-#: panels/user-accounts/cc-user-panel.ui:181
+#: panels/user-accounts/cc-user-panel.ui:169
 msgid "Account _Type"
 msgstr "Tilin _tyyppi"
 
@@ -6980,7 +7280,7 @@ msgstr "%s — %s"
 #. Translators: This is a time format string in the style of "22:58".
 #. It indicates a login time which follows a date.
 #: panels/user-accounts/cc-login-history-dialog.c:173
-#: panels/user-accounts/cc-user-panel.c:771
+#: panels/user-accounts/cc-user-panel.c:765
 msgctxt "login date-time"
 msgid "%k:%M"
 msgstr "%k:%M"
@@ -6988,7 +7288,7 @@ msgstr "%k:%M"
 #. Translators: This indicates a login date-time.
 #. The first %s is a date, and the second %s a time.
 #: panels/user-accounts/cc-login-history-dialog.c:176
-#: panels/user-accounts/cc-user-panel.c:775
+#: panels/user-accounts/cc-user-panel.c:769
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
@@ -7072,30 +7372,30 @@ msgstr "Virheellinen salasana, yritä uudelleen"
 msgid "Couldn’t connect to the %s domain: %s"
 msgstr "Toimialueeseen %s yhdistäminen epäonnistui: %s"
 
-#: panels/user-accounts/cc-user-panel.c:214
+#: panels/user-accounts/cc-user-panel.c:208
 msgid "Your account"
 msgstr "Tilisi"
 
-#: panels/user-accounts/cc-user-panel.c:389
+#: panels/user-accounts/cc-user-panel.c:383
 msgid "Failed to delete user"
 msgstr "Käyttäjän poisto epäonnistui"
 
-#: panels/user-accounts/cc-user-panel.c:447
-#: panels/user-accounts/cc-user-panel.c:506
-#: panels/user-accounts/cc-user-panel.c:558
+#: panels/user-accounts/cc-user-panel.c:441
+#: panels/user-accounts/cc-user-panel.c:500
+#: panels/user-accounts/cc-user-panel.c:552
 msgid "Failed to revoke remotely managed user"
 msgstr "Etähallitun käyttäjän kumoaminen epäonnistui"
 
-#: panels/user-accounts/cc-user-panel.c:610
+#: panels/user-accounts/cc-user-panel.c:604
 msgid "You cannot delete your own account."
 msgstr "Et voi poistaa omaa tunnustasi."
 
-#: panels/user-accounts/cc-user-panel.c:619
+#: panels/user-accounts/cc-user-panel.c:613
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s on yhä sisäänkirjautuneena"
 
-#: panels/user-accounts/cc-user-panel.c:623
+#: panels/user-accounts/cc-user-panel.c:617
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -7103,12 +7403,12 @@ msgstr ""
 "Jos käyttäjä poistetaan hänen ollessaan sisäänkirjautuneena, järjestelmässä "
 "voi ilmetä ongelmia."
 
-#: panels/user-accounts/cc-user-panel.c:632
+#: panels/user-accounts/cc-user-panel.c:626
 #, c-format
 msgid "Do you want to keep %s’s files?"
 msgstr "Haluatko säilyttää käyttäjän %s tiedostot?"
 
-#: panels/user-accounts/cc-user-panel.c:636
+#: panels/user-accounts/cc-user-panel.c:630
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -7116,47 +7416,47 @@ msgstr ""
 "Voit halutessasi säilyttää kotikansion, sähköpostit ja väliaikaistiedostot "
 "käyttäjätilin poiston yhteydessä."
 
-#: panels/user-accounts/cc-user-panel.c:639
+#: panels/user-accounts/cc-user-panel.c:633
 msgid "_Delete Files"
 msgstr "P_oista tiedostot"
 
-#: panels/user-accounts/cc-user-panel.c:640
+#: panels/user-accounts/cc-user-panel.c:634
 msgid "_Keep Files"
 msgstr "_Säilytä tiedostot"
 
-#: panels/user-accounts/cc-user-panel.c:654
+#: panels/user-accounts/cc-user-panel.c:648
 #, c-format
 msgid "Are you sure you want to revoke remotely managed %s’s account?"
 msgstr "Haluatko varmasti kumota käyttöoikeudet etähallitulta tililtä %s?"
 
-#: panels/user-accounts/cc-user-panel.c:658
+#: panels/user-accounts/cc-user-panel.c:652
 msgid "_Delete"
 msgstr "_Poista"
 
-#: panels/user-accounts/cc-user-panel.c:708
+#: panels/user-accounts/cc-user-panel.c:702
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "Käyttäjätili pois käytöstä"
 
-#: panels/user-accounts/cc-user-panel.c:716
+#: panels/user-accounts/cc-user-panel.c:710
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "Asetetaan seuraavalla kirjautumiskerralla"
 
-#: panels/user-accounts/cc-user-panel.c:719
+#: panels/user-accounts/cc-user-panel.c:713
 msgctxt "Password mode"
 msgid "None"
 msgstr "Ei mitään"
 
-#: panels/user-accounts/cc-user-panel.c:764
+#: panels/user-accounts/cc-user-panel.c:758
 msgid "Logged in"
 msgstr "Sisäänkirjautuneena"
 
-#: panels/user-accounts/cc-user-panel.c:1098
+#: panels/user-accounts/cc-user-panel.c:1092
 msgid "Failed to contact the accounts service"
 msgstr "Yhteys tilipalveluun (accounts service) epäonnistui"
 
-#: panels/user-accounts/cc-user-panel.c:1100
+#: panels/user-accounts/cc-user-panel.c:1094
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "Varmista, että AccountService on asennettu ja käytössä."
 
@@ -7164,7 +7464,7 @@ msgstr "Varmista, että AccountService on asennettu ja käytössä."
 #. * We split the line in 2 here to "make it look good", as there's
 #. * no good way to do this in GTK+ for tooltips. See:
 #. * https://bugzilla.gnome.org/show_bug.cgi?id=657168
-#: panels/user-accounts/cc-user-panel.c:1132
+#: panels/user-accounts/cc-user-panel.c:1126
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -7172,12 +7472,12 @@ msgstr ""
 "Tee muutoksia\n"
 "napsauttamalla ensin *-kuvaketta"
 
-#: panels/user-accounts/cc-user-panel.c:1205
+#: panels/user-accounts/cc-user-panel.c:1199
 msgid "Create a user account"
 msgstr "Luo käyttäjätili"
 
-#: panels/user-accounts/cc-user-panel.c:1216
-#: panels/user-accounts/cc-user-panel.c:1344
+#: panels/user-accounts/cc-user-panel.c:1210
+#: panels/user-accounts/cc-user-panel.c:1338
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -7185,12 +7485,12 @@ msgstr ""
 "Luo käyttäjätili\n"
 "napsauttamalla ensin *-kuvaketta"
 
-#: panels/user-accounts/cc-user-panel.c:1225
+#: panels/user-accounts/cc-user-panel.c:1219
 msgid "Delete the selected user account"
 msgstr "Poista valittu käyttäjätili"
 
-#: panels/user-accounts/cc-user-panel.c:1237
-#: panels/user-accounts/cc-user-panel.c:1348
+#: panels/user-accounts/cc-user-panel.c:1231
+#: panels/user-accounts/cc-user-panel.c:1342
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -7198,45 +7498,45 @@ msgstr ""
 "Poista valittu käyttäjä\n"
 "napsauttamalla ensin *-kuvaketta"
 
-#: panels/user-accounts/cc-user-panel.ui:18
+#: panels/user-accounts/cc-user-panel.ui:5
 msgid "_Add User…"
 msgstr "_Lisää käyttäjä…"
 
-#: panels/user-accounts/cc-user-panel.ui:70
+#: panels/user-accounts/cc-user-panel.ui:52
 msgid "Your session needs to be restarted for changes to take effect"
 msgstr "Istunto täytyy käynnistää uudelleen, jotta muutokset tulevat voimaan"
 
-#: panels/user-accounts/cc-user-panel.ui:78
+#: panels/user-accounts/cc-user-panel.ui:60
 msgid "Restart Now"
 msgstr "Käynnistä uudelleen nyt"
 
-#: panels/user-accounts/cc-user-panel.ui:256
+#: panels/user-accounts/cc-user-panel.ui:244
 msgid "A_utomatic Login"
 msgstr "A_utomaattinen kirjautuminen"
 
-#: panels/user-accounts/cc-user-panel.ui:298
+#: panels/user-accounts/cc-user-panel.ui:286
 msgid "_Fingerprint Login"
 msgstr "_Sormenjäljellä kirjautuminen"
 
-#: panels/user-accounts/cc-user-panel.ui:324
-#: panels/user-accounts/cc-user-panel.ui:340
+#: panels/user-accounts/cc-user-panel.ui:312
+#: panels/user-accounts/cc-user-panel.ui:328
 msgid "User Icon"
 msgstr "Käyttäjän kuvake"
 
-#: panels/user-accounts/cc-user-panel.ui:404
+#: panels/user-accounts/cc-user-panel.ui:392
 msgid "Last Login"
 msgstr "Viimeisin kirjautuminen"
 
-#: panels/user-accounts/cc-user-panel.ui:453
+#: panels/user-accounts/cc-user-panel.ui:441
 msgid "Remove User…"
 msgstr "Poista käyttäjätili…"
 
 #. Translators: This is the empty state page label which states that there are no users to show in the panel.
-#: panels/user-accounts/cc-user-panel.ui:486
+#: panels/user-accounts/cc-user-panel.ui:471
 msgid "No Users Found"
 msgstr "Käyttäjiä ei löytynyt"
 
-#: panels/user-accounts/cc-user-panel.ui:496
+#: panels/user-accounts/cc-user-panel.ui:481
 msgid "Unlock to add a user account."
 msgstr "Avaa lukitus lisätäksesi käyttäjätilin."
 
@@ -7452,77 +7752,55 @@ msgid ""
 msgstr ""
 "Mitä enemmän kirjaimia, numeroita ja erikoismerkkejä, sitä vahvempi salasana."
 
-#: panels/user-accounts/run-passwd.c:422
+#: panels/user-accounts/run-passwd.c:424
 msgid "Authentication failed"
 msgstr "Tunnistautuminen epäonnistui"
 
-#: panels/user-accounts/run-passwd.c:502
+#: panels/user-accounts/run-passwd.c:504
 #, c-format
 msgid "The new password is too short"
 msgstr "Uusi salasana on liian lyhyt"
 
-#: panels/user-accounts/run-passwd.c:508
+#: panels/user-accounts/run-passwd.c:510
 #, c-format
 msgid "The new password is too simple"
 msgstr "Uusi salasana on liian yksinkertainen"
 
-#: panels/user-accounts/run-passwd.c:514
+#: panels/user-accounts/run-passwd.c:516
 #, c-format
 msgid "The old and new passwords are too similar"
 msgstr "Vanha ja uusi salasana ovat liian samankaltaiset"
 
-#: panels/user-accounts/run-passwd.c:517
+#: panels/user-accounts/run-passwd.c:519
 #, c-format
 msgid "The new password has already been used recently."
 msgstr "Uusi salasana on ollut jo käytössä äskettäin."
 
-#: panels/user-accounts/run-passwd.c:520
+#: panels/user-accounts/run-passwd.c:522
 #, c-format
 msgid "The new password must contain numeric or special characters"
 msgstr "Uuden salasanan tulee sisältää numeroita tai erikoismerkkejä"
 
-#: panels/user-accounts/run-passwd.c:524
+#: panels/user-accounts/run-passwd.c:526
 #, c-format
 msgid "The old and new passwords are the same"
 msgstr "Vanha ja uusi salasana ovat samat"
 
-#: panels/user-accounts/run-passwd.c:528
+#: panels/user-accounts/run-passwd.c:530
 #, c-format
 msgid "Your password has been changed since you initially authenticated!"
 msgstr "Salasanasi on vaihtunut ensimmäisen todennuksen jälkeen!"
 
-#: panels/user-accounts/run-passwd.c:532
+#: panels/user-accounts/run-passwd.c:534
 #, c-format
 msgid "The new password does not contain enough different characters"
 msgstr "Uusi salasana ei sisällä riittävästi eri merkkejä"
 
-#: panels/user-accounts/run-passwd.c:536
+#: panels/user-accounts/run-passwd.c:538
 #, c-format
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: panels/user-accounts/user-utils.c:427
-msgid ""
-"The username should usually only consist of lower case letters from a-z, "
-"digits and the following characters: - _"
-msgstr ""
-"Käyttäjätunnuksen tulisi yleensä koostua vain pienistä kirjaimista välillä a-"
-"z, numeroista sekä seuraavista merkeistä: - _"
-
-#: panels/user-accounts/user-utils.c:431
-msgid "Sorry, that user name isn’t available. Please try another."
-msgstr ""
-"Valitettavasti kyseinen käyttäjätunnus ei ole saatavilla. Valitse toinen "
-"käyttäjätunnus."
-
-#: panels/user-accounts/user-utils.c:476
-msgid "The username is too long."
-msgstr "Käyttäjätunnus on liian pitkä."
-
-#: panels/user-accounts/user-utils.c:526
-msgid "This will be used to name your home folder and can’t be changed."
-msgstr "Tätä käytetään kotikansiosi nimeämiseen, eikä sitä voi vaihtaa."
-
 #: panels/user-accounts/um-fingerprint-dialog.c:139
 msgid ""
 "You are not allowed to access the device. Contact your system administrator."
@@ -7608,11 +7886,33 @@ msgstr "Valitaan sormea"
 msgid "Enrolling fingerprints"
 msgstr "Kirjataan sormenjälkiä"
 
+#: panels/user-accounts/user-utils.c:439
+msgid ""
+"The username should usually only consist of lower case letters from a-z, "
+"digits and the following characters: - _"
+msgstr ""
+"Käyttäjätunnuksen tulisi yleensä koostua vain pienistä kirjaimista välillä a-"
+"z, numeroista sekä seuraavista merkeistä: - _"
+
+#: panels/user-accounts/user-utils.c:443
+msgid "Sorry, that user name isn’t available. Please try another."
+msgstr ""
+"Valitettavasti kyseinen käyttäjätunnus ei ole saatavilla. Valitse toinen "
+"käyttäjätunnus."
+
+#: panels/user-accounts/user-utils.c:488
+msgid "The username is too long."
+msgstr "Käyttäjätunnus on liian pitkä."
+
+#: panels/user-accounts/user-utils.c:550
+msgid "This will be used to name your home folder and can’t be changed."
+msgstr "Tätä käytetään kotikansiosi nimeämiseen, eikä sitä voi vaihtaa."
+
 #: panels/wacom/button-mapping.ui:9
 msgid "Map Buttons"
 msgstr "Määritä painikkeet"
 
-#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:533
+#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:519
 #: panels/wacom/gnome-wacom-properties.ui:60
 msgid "_Close"
 msgstr "_Sulje"
@@ -7641,7 +7941,7 @@ msgstr "Kosketa näytöllä näkyviä kohdemerkkejä piirtopöydän kalibroimise
 msgid "Mis-click detected, restarting…"
 msgstr "Tunnistettiin ohi mennyt kosketus, aloitetaan alusta…"
 
-#: panels/wacom/cc-wacom-button-row.c:253
+#: panels/wacom/cc-wacom-button-row.c:249
 #, c-format
 msgid "Button %d"
 msgstr "Painike %d"
@@ -7666,17 +7966,17 @@ msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "Näytä ohjeet näytöllä"
 
-#: panels/wacom/cc-wacom-mapping-panel.c:256
+#: panels/wacom/cc-wacom-mapping-panel.c:249
 msgid "Output:"
 msgstr "Ulostulo:"
 
 #. Keep ratio switch
-#: panels/wacom/cc-wacom-mapping-panel.c:268
+#: panels/wacom/cc-wacom-mapping-panel.c:261
 msgid "Keep aspect ratio (letterbox):"
 msgstr "Säilytä kuvasuhde (letterbox):"
 
 #. Whole-desktop checkbox
-#: panels/wacom/cc-wacom-mapping-panel.c:279
+#: panels/wacom/cc-wacom-mapping-panel.c:272
 msgid "Map to single monitor"
 msgstr "Kohdista näyttöön"
 
@@ -7685,15 +7985,15 @@ msgstr "Kohdista näyttöön"
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: panels/wacom/cc-wacom-page.c:530
+#: panels/wacom/cc-wacom-page.c:516
 msgid "Display Mapping"
 msgstr "Kohdistus näyttöön"
 
-#: panels/wacom/cc-wacom-panel.c:845 panels/wacom/wacom-stylus-page.ui:119
+#: panels/wacom/cc-wacom-panel.c:812 panels/wacom/wacom-stylus-page.ui:119
 msgid "Stylus"
 msgstr "Osoitinkynä"
 
-#: panels/wacom/cc-wacom-stylus-page.c:355
+#: panels/wacom/cc-wacom-stylus-page.c:360
 msgid "Button"
 msgstr "Painike"
 
@@ -7748,6 +8048,7 @@ msgid "Left-Handed Orientation"
 msgstr "Vasenkätinen suunta"
 
 #: panels/wacom/gnome-wacom-properties.ui:296
+#: panels/wacom/gnome-wacom-properties.ui:401
 msgid "Map to Monitor…"
 msgstr "Kohdista näyttöön…"
 
@@ -7767,6 +8068,12 @@ msgstr "Muuta hiiren asetuksia"
 msgid "Adjust display resolution"
 msgstr "Säädä näytön tarkkuutta"
 
+#: panels/wacom/gnome-wacom-properties.ui:376
+#, fuzzy
+#| msgid "Single Display"
+msgid "Decouple Display"
+msgstr "Yksi näyttö"
+
 #: panels/wacom/gsd-wacom-key-shortcut-button.c:217
 msgid "New shortcut…"
 msgstr "Uusi pikanäppäin…"
@@ -7783,10 +8090,6 @@ msgstr "Hiiren keskimmäisen painikkeen napsautus"
 msgid "Right Mouse Button Click"
 msgstr "Hiiren oikean painikkeen napsautus"
 
-#: panels/wacom/wacom-stylus-page.ui:37 shell/cc-window.ui:242
-msgid "Back"
-msgstr "Takaisin"
-
 #: panels/wacom/wacom-stylus-page.ui:41
 msgid "Forward"
 msgstr "Eteenpäin"
@@ -7803,27 +8106,27 @@ msgstr "Siirrä osoitinkynä piirtopöydän läheisyyteen tehdäksesi määrityk
 msgid "Eraser Pressure Feel"
 msgstr "Pyyhekumin paineentuntu"
 
-#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:340
+#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:341
 msgid "Soft"
 msgstr "Pehmeä"
 
-#: panels/wacom/wacom-stylus-page.ui:210 panels/wacom/wacom-stylus-page.ui:370
+#: panels/wacom/wacom-stylus-page.ui:211 panels/wacom/wacom-stylus-page.ui:372
 msgid "Firm"
 msgstr "Kova"
 
-#: panels/wacom/wacom-stylus-page.ui:233
+#: panels/wacom/wacom-stylus-page.ui:234
 msgid "Top Button"
 msgstr "Yläpainike"
 
-#: panels/wacom/wacom-stylus-page.ui:262
+#: panels/wacom/wacom-stylus-page.ui:263
 msgid "Lower Button"
 msgstr "Alempi painike"
 
-#: panels/wacom/wacom-stylus-page.ui:291
+#: panels/wacom/wacom-stylus-page.ui:292
 msgid "Lowest Button"
 msgstr "Alimmaisin painike"
 
-#: panels/wacom/wacom-stylus-page.ui:320
+#: panels/wacom/wacom-stylus-page.ui:321
 msgid "Tip Pressure Feel"
 msgstr "Kynän kärjen paineentuntu"
 
@@ -7869,23 +8172,27 @@ msgstr "Näytettävä paneeli"
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANEELI] [ARGUMENTTI…]"
 
-#: shell/cc-panel-loader.c:279
+#: shell/cc-panel-list.ui:45 shell/cc-window.c:277
+msgid "Privacy"
+msgstr "Yksityisyys"
+
+#: shell/cc-panel-loader.c:292
 msgid "Available panels:"
 msgstr "Käytettävissä olevat paneelit:"
 
-#: shell/cc-window.ui:147
+#: shell/cc-window.ui:140
 msgid "All Settings"
 msgstr "Kaikki asetukset"
 
-#: shell/cc-window.ui:185
+#: shell/cc-window.ui:178
 msgid "Primary Menu"
 msgstr "Ensisijainen valikko"
 
-#: shell/cc-window.ui:332
+#: shell/cc-window.ui:319
 msgid "Warning: Development Version"
 msgstr "Varoitus: kehitysversio"
 
-#: shell/cc-window.ui:333
+#: shell/cc-window.ui:320
 msgid ""
 "This version of Settings should only be used for development purposes. You "
 "may experience incorrect system behavior, data loss, and other unexpected "
@@ -7895,7 +8202,7 @@ msgstr ""
 "Saatat kohdata virheellistä järjestelmän toimintaa, tietojen menetystä tai "
 "muita odottamattomia ongelmia. "
 
-#: shell/cc-window.ui:344
+#: shell/cc-window.ui:331
 msgid "Help"
 msgstr "Ohje"
 
@@ -7977,6 +8284,265 @@ msgstr[1] "%u sisääntuloa"
 msgid "System Sounds"
 msgstr "Järjestelmän äänet"
 
+#~ msgid "Version %s"
+#~ msgstr "Versio %s"
+
+#~ msgid "OS name"
+#~ msgstr "Käyttöjärjestelmän nimi"
+
+#~ msgid "OS type"
+#~ msgstr "Käyttöjärjestelmän tyyppi"
+
+#~ msgid "Disk"
+#~ msgstr "Levy"
+
+#~ msgid "Check for updates"
+#~ msgstr "Tarkista päivitykset"
+
+#~ msgid "Network proxy"
+#~ msgstr "Verkon välityspalvelin"
+
+#~ msgid "page 1"
+#~ msgstr "sivu 1"
+
+#~ msgid "Inner _authentication"
+#~ msgstr "_Sisempi tunnistautuminen"
+
+#~ msgid "page 2"
+#~ msgstr "sivu 2"
+
+#~ msgid "Restrict _background data usage"
+#~ msgstr "Rajoita _datan taustakäyttöä"
+
+#~ msgid "Appropriate for connections that have data charges or limits."
+#~ msgstr ""
+#~ "Sopiva yhteyksille, mihin sovelletaan datan määrään pohjautuvaa "
+#~ "hinnoittelua tai siirtorajoituksia."
+
+#~ msgid "Twisted Pair (TP)"
+#~ msgstr "Parikaapeli (TP)"
+
+#~ msgid "Attachment Unit Interface (AUI)"
+#~ msgstr "Attachment Unit Interface (AUI)"
+
+#~ msgid "BNC"
+#~ msgstr "BNC"
+
+#~ msgid "Media Independent Interface (MII)"
+#~ msgstr "Media Independent Interface (MII)"
+
+#~ msgid "10 Mb/s"
+#~ msgstr "10 Mb/s"
+
+#~ msgid "100 Mb/s"
+#~ msgstr "100 Mb/s"
+
+#~ msgid "1 Gb/s"
+#~ msgstr "1 Gb/s"
+
+#~ msgid "10 Gb/s"
+#~ msgstr "10 Gb/s"
+
+#~ msgid ""
+#~ "Switching on the wireless hotspot will disconnect you from <b>%s</b>."
+#~ msgstr ""
+#~ "Yhteyspisteen käyttöönotto katkaisee yhteyden langattomaan verkkoon <b>"
+#~ "%s</b>."
+
+#~ msgid ""
+#~ "It is not possible to access the Internet through your wireless while the "
+#~ "hotspot is active."
+#~ msgstr ""
+#~ "Yhteyspisteen ollessa käytössä langattoman internetyhteyden käyttö ei ole "
+#~ "mahdollista."
+
+#~ msgid ""
+#~ "Wi-Fi hotspots are usually used to share an additional Internet "
+#~ "connection over Wi-Fi."
+#~ msgstr ""
+#~ "Wifi-yhteyspisteitä käytetään yleensä Internet-yhteyden jakamiseen "
+#~ "langattomasti."
+
+#~ msgid "Automatic _Connect"
+#~ msgstr "Automaattinen _yhdistäminen"
+
+#~ msgid "details"
+#~ msgstr "tiedot"
+
+#~ msgid "Show P_assword"
+#~ msgstr "_Näytä salasana"
+
+#~ msgid "Make available to other users"
+#~ msgstr "Aseta kaikkien käyttäjien käytettäväksi"
+
+#~ msgid "identity"
+#~ msgstr "identiteetti"
+
+#~ msgid "IPv_4"
+#~ msgstr "IPv_4"
+
+#~ msgid "_Addresses"
+#~ msgstr "_Osoitteet"
+
+#~ msgid "Automatic (DHCP) addresses only"
+#~ msgstr "Vain automaattiset (DHCP-) osoitteet"
+
+#~ msgid "Link-local only"
+#~ msgstr "Vain linkkiyhteys"
+
+#~ msgid "_Ignore automatically obtained routes"
+#~ msgstr "_Älä huomioi automaattisesti saatuja reittejä"
+
+#~ msgid "ipv4"
+#~ msgstr "ipv4"
+
+#~ msgid "IPv_6"
+#~ msgstr "IPv_6"
+
+#~ msgid "ipv6"
+#~ msgstr "ipv6"
+
+#~ msgid "_Cloned MAC Address"
+#~ msgstr "_Kloonattu MAC-osoite"
+
+#~ msgid "_Reset"
+#~ msgstr "_Tyhjennä"
+
+#~ msgid ""
+#~ "Reset the settings for this connection to their defaults, but remember as "
+#~ "a preferred connection."
+#~ msgstr ""
+#~ "Tyhjennä tämän yhteyden asetukset ja palauta oletusasetukset, mutta "
+#~ "muista yhteys ensisijaisena."
+
+#~ msgid ""
+#~ "Remove all details relating to this network and do not try to "
+#~ "automatically connect to it."
+#~ msgstr ""
+#~ "Poista kaikki tähän verkkoon liittyvä tieto äläkä yritä yhdistää "
+#~ "automaattisesti."
+
+#~ msgid "Hardware"
+#~ msgstr "Laitteisto"
+
+#~ msgctxt "tab"
+#~ msgid "Reset"
+#~ msgstr "Tyhjennä asetukset"
+
+#~ msgid "Connected Devices"
+#~ msgstr "Yhdistetyt laitteet"
+
+#~ msgid "Ad-hoc"
+#~ msgstr "Ad-hoc"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastruktuuri"
+
+#~ msgid "Not connected"
+#~ msgstr "Ei yhteyttä"
+
+#~ msgid "In use"
+#~ msgstr "Käytössä"
+
+#~ msgctxt "Location services status"
+#~ msgid "On"
+#~ msgstr "Päällä"
+
+#~ msgctxt "Location services status"
+#~ msgid "Off"
+#~ msgstr "Pois"
+
+#~ msgctxt "Camera status"
+#~ msgid "Off"
+#~ msgstr "Pois"
+
+#~ msgctxt "Camera status"
+#~ msgid "On"
+#~ msgstr "Päällä"
+
+#~ msgctxt "Microphone status"
+#~ msgid "Off"
+#~ msgstr "Pois"
+
+#~ msgctxt "Microphone status"
+#~ msgid "On"
+#~ msgstr "Päällä"
+
+#~ msgid "Usage & History"
+#~ msgstr "Käyttö ja historia"
+
+#~ msgid "Privacy Policy"
+#~ msgstr "Tietosuoja"
+
+#~ msgid ""
+#~ "Remembering your history makes things easier to find again. These items "
+#~ "are never shared over the network."
+#~ msgstr ""
+#~ "Historian muistaminen helpottaa asioiden löytämistä uudelleen. Näitä "
+#~ "tietoja ei koskaan jaeta verkossa."
+
+#~ msgid "_Recently Used"
+#~ msgstr "_Äskettäin käytetyt"
+
+#~ msgid "Retain _History"
+#~ msgstr "_Säilytä historia"
+
+#~ msgid "The Screen Lock protects your privacy when you are away."
+#~ msgstr "Näyttölukko suojaa yksityisyyttäsi kun olet poissa."
+
+#~ msgid "Lock screen _after blank for"
+#~ msgstr "Lukitse näyttö kun se on ollut _tyhjänä"
+
+#~ msgid "Lock Screen _Notifications"
+#~ msgstr "_Lukitusnäytön ilmoitukset"
+
+#~ msgid ""
+#~ "Automatically purge the Trash and temporary files to help keep your "
+#~ "computer free of unnecessary sensitive information."
+#~ msgstr ""
+#~ "Tyhjennä roskakori ja tuhoa väliaikaistiedostot automaattisesti, jotta "
+#~ "koneelle ei jää turhaa yksityistä tietoa."
+
+#~ msgid "Purge _After"
+#~ msgstr "Tyhjennä/tuhoa _viiveellä"
+
+#~ msgid ""
+#~ "Sending us information about which software you use helps us provide you "
+#~ "with more accurate recommendations. It also helps us to improve our "
+#~ "software.\n"
+#~ "\n"
+#~ "All the information we collect is made anonymous, and we will never share "
+#~ "your data with third parties."
+#~ msgstr ""
+#~ "Lähettämällä käyttämiesi ohjelmistojen käyttötilastot saat parempia "
+#~ "suosituksia. Samalla autat parantamaan ohjelmistoja.\n"
+#~ "\n"
+#~ "Keräämäämme tietoa ei voi yhdistää yksittäisiin käyttäjiin, eikä "
+#~ "tietojasi tulla koskaan jakamaan kolmansien osapuolien kanssa."
+
+#~ msgid "_Send software usage statistics"
+#~ msgstr "Lä_hetä ohjelmistojen käyttötilastot"
+
+#~ msgid "_Camera"
+#~ msgstr "_Kamera"
+
+#~ msgid "_Microphone"
+#~ msgstr "_Mikrofoni"
+
+#~ msgid "_Location Services"
+#~ msgstr "Sijai_ntipalvelut"
+
+#~ msgid "Protect your personal information and control what others might see"
+#~ msgstr ""
+#~ "Suojaa henkilökohtaisia tietojasi ja hallitse, mitä tietoja muut voivat "
+#~ "nähdä"
+
+#~ msgid "No regions found"
+#~ msgstr "Alueita ei löytynyt"
+
+#~ msgid "Flash the _window title"
+#~ msgstr "Väläytä _ikkunan reunusta"
+
 #~ msgid "The username cannot start with a “-”."
 #~ msgstr "Käyttäjätunnus ei voi alkaa merkillä ”-”."
 
@@ -8040,9 +8606,6 @@ msgstr "Järjestelmän äänet"
 #~ msgid "_When the Power Button is pressed"
 #~ msgstr "_Kun virtapainiketta painetaan"
 
-#~ msgid "Show _Notifications"
-#~ msgstr "_Näytä ilmoitukset"
-
 #~ msgid "Preferences"
 #~ msgstr "Asetukset"
 
@@ -8130,9 +8693,6 @@ msgstr "Järjestelmän äänet"
 #~ msgid "Drag displays to match your setup."
 #~ msgstr "Järjestä näytöt vastaamaan kokoonpanoasi vetämällä niitä."
 
-#~ msgid "Primary Display"
-#~ msgstr "Ensisijainen näyttö"
-
 #~ msgid "_Night Light"
 #~ msgstr "_Yövalo"
 
@@ -8175,9 +8735,6 @@ msgstr "Järjestelmän äänet"
 #~ msgid "Move input source down"
 #~ msgstr "Siirrä syötelähde alas"
 
-#~ msgid "Configure input source"
-#~ msgstr "Muokkaa syötelähdettä"
-
 #~ msgid "Show input source keyboard layout"
 #~ msgstr "Näytä syötelähteenä olevan näppäimistön asettelu"
 
@@ -8234,9 +8791,6 @@ msgstr "Järjestelmän äänet"
 #~ msgid "Sound Effects"
 #~ msgstr "Äänitehosteet"
 
-#~ msgid "No application is currently playing or recording audio."
-#~ msgstr "Mikään sovellus ei nyt soita tai tallenna ääntä."
-
 #~ msgid "Built-in"
 #~ msgstr "Sisäänrakennettu"
 
@@ -8558,9 +9112,6 @@ msgstr "Järjestelmän äänet"
 #~ "Jos käytössäsi on myös muu kuin langaton internetyhteys, voit käyttää "
 #~ "sitä kyseisen yhteyden jakamiseen muiden käyttäjien kanssa."
 
-#~ msgid "History"
-#~ msgstr "Historia"
-
 #~ msgid "Proxy"
 #~ msgstr "Välityspalvelin"
 
@@ -8579,15 +9130,9 @@ msgstr "Järjestelmän äänet"
 #~ msgid "Automatic"
 #~ msgstr "Automaattinen"
 
-#~ msgid "VPN Type"
-#~ msgstr "VPN-tyyppi"
-
 #~ msgid "Group Name"
 #~ msgstr "Ryhmän nimi"
 
-#~ msgid "Group Password"
-#~ msgstr "Ryhmäsalasana"
-
 #~ msgid "_Use as Hotspot…"
 #~ msgstr "_Käytä yhteyspisteenä…"
 
@@ -8824,9 +9369,6 @@ msgstr "Järjestelmän äänet"
 #~ msgid "Scroll Right"
 #~ msgstr "Vieritys oikealle"
 
-#~ msgid "Wayland"
-#~ msgstr "Wayland"
-
 #~ msgid "Keyboard shortcut for <b>%s</b>. Enter new shortcut to change."
 #~ msgstr ""
 #~ "Pikanäppäin toiminnolle <b>%s</b>. Anna uusi pikanäppäin vaihtaaksesi."
@@ -9095,9 +9637,6 @@ msgstr "Järjestelmän äänet"
 #~ msgid "Bluetooth is disabled"
 #~ msgstr "Bluetooth on pois käytöstä"
 
-#~ msgid "Security key"
-#~ msgstr "Salausavain"
-
 #~ msgid "Wireless devices require extra power"
 #~ msgstr "Langattomat laitteet tarvitsevat lisävirtaa"
 



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