[gnome-control-center] Update Finnish translation



commit 8d31eb70bcbc6e0fc2abc79e7473eaa01a4470e0
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Thu Feb 7 21:20:02 2019 +0000

    Update Finnish translation

 po/fi.po | 4892 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 2685 insertions(+), 2207 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 3c62fc6d9..2f65a6c80 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: 2018-07-23 14:26+0000\n"
-"PO-Revision-Date: 2018-08-17 20:28+0300\n"
+"POT-Creation-Date: 2019-02-07 08:04+0000\n"
+"PO-Revision-Date: 2019-02-07 23:19+0200\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <lokalisointi-lista googlegroups com>\n"
 "Language: fi\n"
@@ -39,6 +39,321 @@ msgstr ""
 "X-POT-Import-Date: 2012-03-07 10:37:43+0000\n"
 "X-Project-Style: gnome\n"
 
+#: panels/applications/cc-applications-panel.c:558
+msgid "System Bus"
+msgstr "Järjestelmäväylä"
+
+#: panels/applications/cc-applications-panel.c:558
+#: panels/applications/cc-applications-panel.c:560
+#: panels/applications/cc-applications-panel.c:576
+#: panels/applications/cc-applications-panel.c:581
+msgid "Full access"
+msgstr "Täydet oikeudet"
+
+#: panels/applications/cc-applications-panel.c:560
+msgid "Session Bus"
+msgstr "Istuntoväylä"
+
+#: panels/applications/cc-applications-panel.c:565
+#: panels/power/cc-power-panel.c:2528 panels/thunderbolt/cc-bolt-panel.ui:466
+#: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45
+#: shell/cc-window.c:268
+msgid "Devices"
+msgstr "Laitteet"
+
+#: panels/applications/cc-applications-panel.c:565
+msgid "Full access to /dev"
+msgstr "Täysi pääsy kohteeseen /dev"
+
+#: panels/applications/cc-applications-panel.c:570
+#: panels/network/gnome-network-panel.desktop.in.in:3
+#: panels/network/network-mobile.ui:241
+msgid "Network"
+msgstr "Verkko"
+
+#: panels/applications/cc-applications-panel.c:570
+msgid "Has network access"
+msgstr "Verkon käyttö"
+
+#. translators: "Home" is used in place of the Pictures
+#. * directory in the string below when XDG_PICTURES_DIR is
+#. * undefined
+#: panels/applications/cc-applications-panel.c:576
+#: panels/applications/cc-applications-panel.c:578
+#: panels/background/cc-background-chooser-dialog.c:536
+#: panels/search/cc-search-locations-dialog.c:286
+msgid "Home"
+msgstr "Koti"
+
+#: panels/applications/cc-applications-panel.c:578
+#: panels/applications/cc-applications-panel.c:583
+msgid "Read-only"
+msgstr "Vain luku"
+
+#: panels/applications/cc-applications-panel.c:581
+#: panels/applications/cc-applications-panel.c:583
+msgid "File System"
+msgstr "Tiedostojärjestelmä"
+
+#: panels/applications/cc-applications-panel.c:588
+#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:272
+#: shell/cc-window.c:930 shell/cc-window.ui:131
+#: shell/gnome-control-center.desktop.in.in:3
+msgid "Settings"
+msgstr "Asetukset"
+
+#: panels/applications/cc-applications-panel.c:588
+msgid "Can change settings"
+msgstr "Voi muuttaa asetuksia"
+
+#: panels/applications/cc-applications-panel.c:593
+#, c-format
+msgid ""
+"%s has the following permissions built-in. These cannot be altered. If you "
+"are concerned about these permissions, consider removing this application."
+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:735
+msgid "Web Links"
+msgstr "Verkkolinkit"
+
+#: panels/applications/cc-applications-panel.c:745
+msgid "Git Links"
+msgstr "Git-linkit"
+
+#: panels/applications/cc-applications-panel.c:751
+#, c-format
+msgid "%s Links"
+msgstr "%s-linkit"
+
+#: panels/applications/cc-applications-panel.c:759
+#: panels/applications/cc-applications-panel.c:795
+msgid "Unset"
+msgstr "Poista asetus"
+
+#: panels/applications/cc-applications-panel.c:850
+msgid "Links"
+msgstr "Linkit"
+
+#: panels/applications/cc-applications-panel.c:858
+msgid "Hypertext Files"
+msgstr "Hypertekstitiedostot"
+
+#: panels/applications/cc-applications-panel.c:872
+msgid "Text Files"
+msgstr "Tekstitiedostot"
+
+#: panels/applications/cc-applications-panel.c:886
+msgid "Image Files"
+msgstr "Kuvatiedostot"
+
+#: panels/applications/cc-applications-panel.c:902
+msgid "Font Files"
+msgstr "Fonttitiedostot"
+
+#: panels/applications/cc-applications-panel.c:963
+msgid "Archive Files"
+msgstr "Arkistotiedostot"
+
+#: panels/applications/cc-applications-panel.c:983
+msgid "Package Files"
+msgstr "Pakettitiedostot"
+
+#: panels/applications/cc-applications-panel.c:1006
+msgid "Audio Files"
+msgstr "Äänitiedostot"
+
+#: panels/applications/cc-applications-panel.c:1023
+msgid "Video Files"
+msgstr "Videotiedostot"
+
+#: panels/applications/cc-applications-panel.c:1031
+msgid "Other Files"
+msgstr "Muut tiedostot"
+
+#. List of applications.
+#: panels/applications/cc-applications-panel.c:1353
+#: panels/applications/cc-applications-panel.ui:406
+#: 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"
+
+#: panels/applications/cc-applications-panel.ui:45
+msgid "No applications"
+msgstr "Ei sovelluksia"
+
+#: panels/applications/cc-applications-panel.ui:59
+#| msgid "Install PPD File…"
+msgid "Install some…"
+msgstr "Asenna joitain…"
+
+#: panels/applications/cc-applications-panel.ui:99
+msgid "Permissions & Access"
+msgstr "Käyttö- ja pääsyoikeudet"
+
+#: panels/applications/cc-applications-panel.ui:111
+msgid ""
+"Data and services that this app has asked for access to and permissions that "
+"it requires."
+msgstr ""
+"Tiedot ja palvelut, joihin tämä sovellus on pyytänyt oikeudet, ja "
+"sovelluksen vaatimat pakolliset oikeudet."
+
+#: panels/applications/cc-applications-panel.ui:126
+#: panels/applications/cc-applications-panel.ui:132
+#: panels/privacy/cc-privacy-panel.c:894 panels/privacy/cc-privacy-panel.ui:745
+msgid "Camera"
+msgstr "Kamera"
+
+#. This label is displayed in a treeview cell displaying
+#. * a disabled accelerator key combination.
+#.
+#. translators:
+#. * The device has been disabled
+#: panels/applications/cc-applications-panel.ui:133
+#: 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/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/user-accounts/um-fingerprint-dialog.c:211
+#: subprojects/gvc/gvc-mixer-control.c:1864
+msgid "Disabled"
+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:927 panels/privacy/cc-privacy-panel.ui:850
+msgid "Microphone"
+msgstr "Mikrofoni"
+
+#: panels/applications/cc-applications-panel.ui:150
+#: panels/applications/cc-applications-panel.ui:156
+#: panels/privacy/cc-privacy-panel.c:836 panels/privacy/cc-privacy-panel.ui:955
+msgid "Location Services"
+msgstr "Sijaintipalvelut"
+
+#: panels/applications/cc-applications-panel.ui:162
+#: panels/applications/cc-applications-panel.ui:422
+msgid "Built-in Permissions"
+msgstr "Sisäänrakennetut oikeudet"
+
+#: panels/applications/cc-applications-panel.ui:163
+msgid "Cannot be changed"
+msgstr "Ei voi muuttaa"
+
+#: panels/applications/cc-applications-panel.ui:180
+msgid ""
+"Individual permissions for applications can be reviewed in the <a href="
+"\"privacy\">Privacy</a> Settings."
+msgstr ""
+"Sovellusten yksittäiset oikeudet on mahdollista katselmoida <a href=\"privacy"
+"\">yksityisyysasetuksissa</a>."
+
+#: panels/applications/cc-applications-panel.ui:204
+msgid "Integration"
+msgstr "Integraatio"
+
+#: panels/applications/cc-applications-panel.ui:216
+msgid "System features used by this application."
+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:161
+msgid "Search"
+msgstr "Haku"
+
+#: panels/applications/cc-applications-panel.ui:242
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
+msgid "Notifications"
+msgstr "Ilmoitukset"
+
+#: panels/applications/cc-applications-panel.ui:248
+#: panels/applications/cc-applications-panel.ui:254
+msgid "Sounds"
+msgstr "Äänet"
+
+#: panels/applications/cc-applications-panel.ui:287
+msgid "Default Handlers"
+msgstr "Oletuskäsittelimet"
+
+#: panels/applications/cc-applications-panel.ui:299
+msgid "Types of files and links that this application opens."
+msgstr "Sovelluksen avaamat tiedosto- ja linkkityypit."
+
+#: panels/applications/cc-applications-panel.ui:315
+msgid "Reset"
+msgstr "Tyhjennä asetukset"
+
+#: panels/applications/cc-applications-panel.ui:351
+msgid "Usage"
+msgstr "Käyttö"
+
+#: panels/applications/cc-applications-panel.ui:363
+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:458
+msgid "Storage"
+msgstr "Tallennustila"
+
+#: panels/applications/cc-applications-panel.ui:413
+msgid "Open in Software"
+msgstr "Avaa ohjelmistokeskuksessa"
+
+#: panels/applications/cc-applications-panel.ui:475
+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:484
+msgid "Application"
+msgstr "Sovellus"
+
+#: panels/applications/cc-applications-panel.ui:490
+msgid "Data"
+msgstr "Tiedot"
+
+#: panels/applications/cc-applications-panel.ui:496
+msgid "Cache"
+msgstr "Välimuisti"
+
+#: panels/applications/cc-applications-panel.ui:502
+msgid "<b>Total</b>"
+msgstr "<b>Yhteensä</b>"
+
+#: panels/applications/cc-applications-panel.ui:519
+msgid "Clear Cache…"
+msgstr "Tyhjennä välimuisti…"
+
+#: panels/applications/gnome-applications-panel.desktop.in.in:4
+msgid "Control various application permissions and settings"
+msgstr "Hallitse sovellusten eri oikeuksia ja asetuksia"
+
+#. FIXME
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/applications/gnome-applications-panel.desktop.in.in:8
+msgid "application-x-executable"
+msgstr "application-x-executable"
+
+#. Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/applications/gnome-applications-panel.desktop.in.in:16
+msgid "application;flatpak;permission;setting;"
+msgstr "application;flatpak;permission;setting;sovellus;käyttöoikeudet;asetus;"
+
 #: panels/background/background.ui:49
 msgid "_Background"
 msgstr "_Taustakuva"
@@ -83,71 +398,64 @@ msgctxt "background, style"
 msgid "Span"
 msgstr "Peitetty"
 
-#: panels/background/cc-background-chooser-dialog.c:424
+#: panels/background/cc-background-chooser-dialog.c:412
 msgid "Wallpapers"
 msgstr "Taustakuvat"
 
-#: panels/background/cc-background-chooser-dialog.c:433
+#: panels/background/cc-background-chooser-dialog.c:423
 msgid "Colors"
 msgstr "Värit"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: panels/background/cc-background-chooser-dialog.c:468
+#: panels/background/cc-background-chooser-dialog.c:455
 msgid "Select Background"
 msgstr "Valitse taustakuva"
 
-#: panels/background/cc-background-chooser-dialog.c:496
+#: panels/background/cc-background-chooser-dialog.c:484
 msgid "Pictures"
 msgstr "Kuvat"
 
 #. translators: No pictures were found
-#: panels/background/cc-background-chooser-dialog.c:528
+#: panels/background/cc-background-chooser-dialog.c:519
 msgid "No Pictures Found"
 msgstr "Kuvia ei löytynyt"
 
-#. translators: "Home" is used in place of the Pictures
-#. * directory in the string below when XDG_PICTURES_DIR is
-#. * undefined
-#: panels/background/cc-background-chooser-dialog.c:545
-#: panels/search/cc-search-locations-dialog.c:286
-msgid "Home"
-msgstr "Koti"
-
 #. translators: %s here is the name of the Pictures directory, the string should be translated in
 #. * the context "You can add images to your Pictures folder and they will show up here"
-#: panels/background/cc-background-chooser-dialog.c:555
+#: panels/background/cc-background-chooser-dialog.c:546
 #, c-format
 msgid "You can add images to your %s folder and they will show up here"
 msgstr "Voit lisätä kuvia %s-kansioon, jolloin ne näkyvät täällä"
 
-#: panels/background/cc-background-chooser-dialog.c:560
-#: panels/color/cc-color-panel.c:240 panels/color/cc-color-panel.c:893
-#: panels/color/color-calibrate.ui:25 panels/color/color.ui:657
-#: panels/common/cc-language-chooser.ui:22
-#: panels/display/cc-display-panel.c:1896
-#: panels/network/connection-editor/connection-editor.ui:15
+#: panels/background/cc-background-chooser-dialog.c:550
+#: 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/common/cc-language-chooser.ui:24
+#: panels/display/cc-display-panel.c:880
+#: 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:1411 panels/network/net-device-wifi.c:1491
-#: panels/network/net-device-wifi.c:1736 panels/network/network-wifi.ui:24
+#: panels/network/net-device-wifi.c:1200 panels/network/net-device-wifi.c:1280
+#: panels/network/net-device-wifi.c:1474 panels/network/network-wifi.ui:24
 #: panels/printers/new-printer-dialog.ui:45
-#: panels/printers/pp-details-dialog.c:330
-#: panels/privacy/cc-privacy-panel.c:1049 panels/region/cc-format-chooser.ui:24
-#: panels/region/input-chooser.ui:13
-#: panels/search/cc-search-locations-dialog.c:603
-#: panels/sharing/cc-sharing-panel.c:426
-#: panels/user-accounts/data/account-dialog.ui:28
+#: panels/printers/pp-details-dialog.c:313
+#: panels/privacy/cc-privacy-panel.c:1123 panels/region/cc-format-chooser.ui:24
+#: panels/region/cc-input-chooser.ui:11
+#: panels/search/cc-search-locations-dialog.c:607
+#: panels/sharing/cc-sharing-panel.c:427
+#: panels/user-accounts/cc-add-user-dialog.ui:28
+#: panels/user-accounts/cc-avatar-chooser.c:105
+#: panels/user-accounts/cc-avatar-chooser.c:233
+#: panels/user-accounts/cc-password-dialog.ui:20
+#: panels/user-accounts/cc-user-panel.c:638
+#: panels/user-accounts/cc-user-panel.c:656
 #: panels/user-accounts/data/join-dialog.ui:20
-#: panels/user-accounts/data/password-dialog.ui:21
 #: panels/user-accounts/um-fingerprint-dialog.c:261
-#: panels/user-accounts/um-photo-dialog.c:103
-#: panels/user-accounts/um-photo-dialog.c:230
-#: panels/user-accounts/um-user-panel.c:631
-#: panels/user-accounts/um-user-panel.c:649
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: panels/background/cc-background-chooser-dialog.c:561
+#: panels/background/cc-background-chooser-dialog.c:551
+#: panels/common/cc-language-chooser.ui:12
 msgid "_Select"
 msgstr "_Valitse"
 
@@ -188,46 +496,46 @@ msgstr "preferences-desktop-wallpaper"
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Taustakuva;Näyttö;Työpöytä;Wallpaper;Screen;Desktop;"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:266
-msgid "Turn Off Airplane Mode"
-msgstr "Poista lentokonetila käytöstä"
-
-#: panels/bluetooth/cc-bluetooth-panel.c:329
+#: panels/bluetooth/cc-bluetooth-panel.c:309
 msgid "No Bluetooth Found"
 msgstr "Bluetoothia ei löytynyt"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:329
+#: panels/bluetooth/cc-bluetooth-panel.c:310
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "Liitä sovitin käyttääksesi Bluetoothia."
 
-#: panels/bluetooth/cc-bluetooth-panel.c:330
+#: panels/bluetooth/cc-bluetooth-panel.c:313
 msgid "Bluetooth Turned Off"
 msgstr "Bluetooth on pois päältä"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:330
+#: panels/bluetooth/cc-bluetooth-panel.c:314
 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:331
+#: panels/bluetooth/cc-bluetooth-panel.c:317
 msgid "Airplane Mode is on"
 msgstr "Lentokonetila on päällä"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:331
+#: panels/bluetooth/cc-bluetooth-panel.c:318
 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:332
+#: panels/bluetooth/cc-bluetooth-panel.c:321
 msgid "Hardware Airplane Mode is on"
 msgstr "Laitetason lentokonetila on päällä"
 
-#: panels/bluetooth/cc-bluetooth-panel.c:332
+#: panels/bluetooth/cc-bluetooth-panel.c:322
 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/network/cc-network-panel.ui:101
-#: panels/printers/pp-new-printer-dialog.c:1831
+#: panels/printers/pp-new-printer-dialog.c:1697
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
@@ -246,14 +554,14 @@ msgid "share;sharing;bluetooth;obex;"
 msgstr "share;sharing;bluetooth;obex;jakaminen;jaot;"
 
 #. TRANSLATORS: The user has to attach the sensor to the screen
-#: panels/color/cc-color-calibrate.c:350
+#: panels/color/cc-color-calibrate.c:348
 msgid "Place your calibration device over the square and press “Start”"
 msgstr "Aseta kalibrointilaite neliön päälle ja napsauta ”Käynnistä”"
 
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: panels/color/cc-color-calibrate.c:356
+#: panels/color/cc-color-calibrate.c:354
 msgid ""
 "Move your calibration device to the calibrate position and press “Continue”"
 msgstr "Vaihda kalibrointilaite kalibrointiasentoon ja napsauta ”Jatka”"
@@ -261,7 +569,7 @@ msgstr "Vaihda kalibrointilaite kalibrointiasentoon ja napsauta ”Jatka”"
 #. TRANSLATORS: Some calibration devices need the user to move a
 #. * dial or switch manually. We also show a picture showing them
 #. * what to do...
-#: panels/color/cc-color-calibrate.c:362
+#: panels/color/cc-color-calibrate.c:360
 msgid ""
 "Move your calibration device to the surface position and press “Continue”"
 msgstr "Vaihda kalibrointilaite kalibrointiasentoon ja napsauta ”Jatka”"
@@ -269,54 +577,54 @@ msgstr "Vaihda kalibrointilaite kalibrointiasentoon ja napsauta ”Jatka”"
 #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor
 #. * is built into the palmrest and we need to fullscreen the
 #. * sample widget and shut the lid.
-#: panels/color/cc-color-calibrate.c:368
+#: panels/color/cc-color-calibrate.c:366
 msgid "Shut the laptop lid"
 msgstr "Sulje kannettavan kansi"
 
 #. TRANSLATORS: We suck, the calibation failed and we have no
 #. * good idea why or any suggestions
-#: panels/color/cc-color-calibrate.c:399
+#: panels/color/cc-color-calibrate.c:397
 msgid "An internal error occurred that could not be recovered."
 msgstr "Tapahtui sisäinen virhe josta ei voitu toipua."
 
 #. TRANSLATORS: Some required-at-runtime tools were not
 #. * installed, which should only affect insane distros
-#: panels/color/cc-color-calibrate.c:404
+#: panels/color/cc-color-calibrate.c:402
 msgid "Tools required for calibration are not installed."
 msgstr "Kalibrointiin vaadittavia työkaluja ei ole asennettu."
 
 #. TRANSLATORS: The profile failed for some reason
-#: panels/color/cc-color-calibrate.c:410
+#: panels/color/cc-color-calibrate.c:408
 msgid "The profile could not be generated."
 msgstr "Profiilin luonti ei onnistunut."
 
 #. TRANSLATORS: The user specified a whitepoint that was
 #. * unobtainable with the hardware they've got -- see
 #. * https://en.wikipedia.org/wiki/White_point for details
-#: panels/color/cc-color-calibrate.c:416
+#: panels/color/cc-color-calibrate.c:414
 msgid "The target whitepoint was not obtainable."
 msgstr "Kohdevalkopiste ei ole saavutettavissa."
 
 #. TRANSLATORS: the display calibration process is finished
-#: panels/color/cc-color-calibrate.c:455
+#: panels/color/cc-color-calibrate.c:453
 msgid "Complete!"
 msgstr "Valmis!"
 
 #. TRANSLATORS: the display calibration failed, and we also show
 #. * the translated (or untranslated) error string after this
-#: panels/color/cc-color-calibrate.c:463
+#: panels/color/cc-color-calibrate.c:461
 msgid "Calibration failed!"
 msgstr "Kalibrointi epäonnistui!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: panels/color/cc-color-calibrate.c:470
+#: panels/color/cc-color-calibrate.c:468
 msgid "You can remove the calibration device."
 msgstr "Voit irrottaa kalibrointilaitteen."
 
 #. TRANSLATORS: The user has to be careful not to knock the
 #. * display off the screen (although we do cope if this is
 #. * detected early enough)
-#: panels/color/cc-color-calibrate.c:539
+#: panels/color/cc-color-calibrate.c:537
 msgid "Do not disturb the calibration device while in progress"
 msgstr "Älä liikuta kalibrointilaitetta kesken kalibroinnin"
 
@@ -372,54 +680,54 @@ msgid "Show color profiles for %s"
 msgstr "Näytä laitteen %s väriprofiilit"
 
 #. not calibrated
-#: panels/color/cc-color-device.c:301
+#: panels/color/cc-color-device.c:303
 msgid "Not calibrated"
 msgstr "Ei kalibroitu"
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile has been auto-generated for this hardware
-#: panels/color/cc-color-panel.c:169
+#: panels/color/cc-color-panel.c:170
 msgid "Default: "
 msgstr "Oletus: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile his a standard space like AdobeRGB
-#: panels/color/cc-color-panel.c:177
+#: panels/color/cc-color-panel.c:178
 msgid "Colorspace: "
 msgstr "Väriavaruus: "
 
 #. TRANSLATORS: this is a profile prefix to signify the
 #. * profile is a test profile
-#: panels/color/cc-color-panel.c:184
+#: panels/color/cc-color-panel.c:185
 msgid "Test profile: "
 msgstr "Testiprofiili: "
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: panels/color/cc-color-panel.c:238
+#: panels/color/cc-color-panel.c:239
 msgid "Select ICC Profile File"
 msgstr "Valitse ICC-profiilitiedosto"
 
-#: panels/color/cc-color-panel.c:241
+#: panels/color/cc-color-panel.c:242
 msgid "_Import"
 msgstr "_Tuo"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: panels/color/cc-color-panel.c:252
+#: panels/color/cc-color-panel.c:253
 msgid "Supported ICC profiles"
 msgstr "Tuetut ICC-profiilit"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: panels/color/cc-color-panel.c:259
+#: panels/color/cc-color-panel.c:260
 #: panels/network/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: panels/color/cc-color-panel.c:554
+#: panels/color/cc-color-panel.c:555
 msgid "Screen"
 msgstr "Näyttö"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: panels/color/cc-color-panel.c:846
+#: panels/color/cc-color-panel.c:847
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "Tiedoston lähetys epäonnistui: %s"
@@ -427,40 +735,40 @@ msgstr "Tiedoston lähetys epäonnistui: %s"
 #. TRANSLATORS: these are instructions on how to recover
 #. * the ICC profile on the native operating system and are
 #. * only shown when the user uses a LiveCD to calibrate
-#: panels/color/cc-color-panel.c:858
+#: panels/color/cc-color-panel.c:859
 msgid "The profile has been uploaded to:"
 msgstr "Profiili on lähetetty:"
 
-#: panels/color/cc-color-panel.c:860
+#: panels/color/cc-color-panel.c:861
 msgid "Write down this URL."
 msgstr "Kirjoita ylös tämä osoite."
 
-#: panels/color/cc-color-panel.c:861
+#: panels/color/cc-color-panel.c:862
 msgid "Restart this computer and boot your normal operating system."
 msgstr ""
 "Käynnistä tietokone uudelleen ja käynnistä normaali käyttöjärjestelmäsi."
 
-#: panels/color/cc-color-panel.c:862
+#: panels/color/cc-color-panel.c:863
 msgid "Type the URL into your browser to download and install the profile."
 msgstr "Kirjoita osoite selaimen osoitekenttään, lataa ja asenna profiili."
 
 #. TRANSLATORS: this is the dialog to save the ICC profile
-#: panels/color/cc-color-panel.c:890
+#: panels/color/cc-color-panel.c:891
 msgid "Save Profile"
 msgstr "Tallenna profiili"
 
-#: panels/color/cc-color-panel.c:894
+#: panels/color/cc-color-panel.c:895
 #: panels/network/connection-editor/vpn-helpers.c:311
 msgid "_Save"
 msgstr "_Tallenna"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: panels/color/cc-color-panel.c:1208
+#: panels/color/cc-color-panel.c:1209
 msgid "Create a color profile for the selected device"
 msgstr "Luo väriprofiili valitulle laitteelle"
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1223 panels/color/cc-color-panel.c:1247
+#: panels/color/cc-color-panel.c:1224 panels/color/cc-color-panel.c:1248
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -469,120 +777,20 @@ msgstr ""
 "siinä on virta päällä."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1257
+#: panels/color/cc-color-panel.c:1258
 msgid "The measuring instrument does not support printer profiling."
 msgstr "Mittalaite ei tue tulostimien profilointia."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: panels/color/cc-color-panel.c:1268
+#: panels/color/cc-color-panel.c:1269
 msgid "The device type is not currently supported."
 msgstr "Laitetyyppi ei ole tällä hetkellä tuettu."
 
-#. TRANSLATORS: standard spaces are well known colorspaces like
-#. * sRGB, AdobeRGB and ProPhotoRGB
-#: panels/color/cc-color-profile.c:100
-msgid "Standard Space"
-msgstr "Standardiavaruus"
-
-#. TRANSLATORS: test profiles do things like changing the screen
-#. * a different color, or swap the red and green channels
-#: panels/color/cc-color-profile.c:106
-msgid "Test Profile"
-msgstr "Testiprofiili"
-
-#. TRANSLATORS: automatic profiles are generated automatically
-#. * by the color management system based on manufacturing data,
-#. * for instance the default monitor profile is created from the
-#. * primaries specified in the monitor EDID
-#: panels/color/cc-color-profile.c:114
-msgctxt "Automatically generated profile"
-msgid "Automatic"
-msgstr "Automaattinen"
-
-#. TRANSLATORS: the profile quality - low quality profiles take
-#. * much less time to generate but may be a poor reflection of the
-#. * device capability
-#: panels/color/cc-color-profile.c:124
-msgctxt "Profile quality"
-msgid "Low Quality"
-msgstr "Matala laatu"
-
-#. TRANSLATORS: the profile quality
-#: panels/color/cc-color-profile.c:129
-msgctxt "Profile quality"
-msgid "Medium Quality"
-msgstr "Keskimääräinen laatu"
-
-#. TRANSLATORS: the profile quality - high quality profiles take
-#. * a *long* time, and have the best calibration and
-#. * characterisation data.
-#: panels/color/cc-color-profile.c:136
-msgctxt "Profile quality"
-msgid "High Quality"
-msgstr "Korkea laatu"
-
-#. TRANSLATORS: this default RGB space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: panels/color/cc-color-profile.c:153
-msgctxt "Colorspace fallback"
-msgid "Default RGB"
-msgstr "Oletus-RGB"
-
-#. TRANSLATORS: this default CMYK space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: panels/color/cc-color-profile.c:160
-msgctxt "Colorspace fallback"
-msgid "Default CMYK"
-msgstr "Oletus-CMYK"
-
-#. TRANSLATORS: this default gray space is used for printers that
-#. * do not have additional printer profiles specified in the PPD
-#: panels/color/cc-color-profile.c:167
-msgctxt "Colorspace fallback"
-msgid "Default Gray"
-msgstr "Oletusharmaasävy"
-
-#: panels/color/cc-color-profile.c:190
-msgid "Vendor supplied factory calibration data"
-msgstr "Valmistajan toimittaja tehdaskalibrointidata"
-
-#: panels/color/cc-color-profile.c:199
-msgid "Full-screen display correction not possible with this profile"
-msgstr "Koko ruudun näyttökorjaus ei ole mahdollista tällä profiililla"
-
-#: panels/color/cc-color-profile.c:221
-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/common/cc-language-chooser.ui:11
-#: panels/region/cc-format-chooser.ui:13
-msgid "_Done"
-msgstr "_Valmis"
-
-#. Timeout parameters
-#. 15000 = 15 sec
-#. 750 = 0.75 sec
-#. Text printed on screen
-#: panels/color/color.ui:6 panels/wacom/calibrator/calibrator-gui.c:82
+#: panels/color/cc-color-panel.ui:6 panels/wacom/calibrator/calibrator.ui:47
 msgid "Screen Calibration"
 msgstr "Näytön kalibrointi"
 
-#: panels/color/color.ui:23
+#: panels/color/cc-color-panel.ui:23
 msgid ""
 "Calibration will produce a profile that you can use to color manage your "
 "screen. The longer you spend on calibration, the better the quality of the "
@@ -591,42 +799,42 @@ msgstr ""
 "Kalibrointi tuottaa profiilin, jota voi käyttää näytön värien hallintaan. "
 "Profiilista tulee sitä parempi mitä kauemmin aikaa kalibrointiin käytetään."
 
-#: panels/color/color.ui:38
+#: panels/color/cc-color-panel.ui:38
 msgid ""
 "You will not be able to use your computer while calibration takes place."
 msgstr "Et voi käyttää tietokonettasi, kun kalibrointi on meneillään."
 
 #. This is the approximate time it takes to calibrate the display.
-#: panels/color/color.ui:58
+#: panels/color/cc-color-panel.ui:58
 msgid "Quality"
 msgstr "Laatu"
 
 #. This is the approximate time it takes to calibrate the display.
-#: panels/color/color.ui:75
+#: panels/color/cc-color-panel.ui:75
 msgid "Approximate Time"
 msgstr "Arvioitu aika"
 
-#: panels/color/color.ui:121
+#: panels/color/cc-color-panel.ui:121
 msgid "Calibration Quality"
 msgstr "Kalibrointilaatu"
 
-#: panels/color/color.ui:137
+#: panels/color/cc-color-panel.ui:137
 msgid "Select the sensor device you want to use for calibration."
 msgstr "Valitse anturilaite jota haluat käyttää kalibrointiin."
 
-#: panels/color/color.ui:174
+#: panels/color/cc-color-panel.ui:174
 msgid "Calibration Device"
 msgstr "Kalibrointilaite"
 
-#: panels/color/color.ui:189
+#: panels/color/cc-color-panel.ui:189
 msgid "Select the type of display that is connected."
 msgstr "Valitse yhdistetyn näytön tyyppi."
 
-#: panels/color/color.ui:226
+#: panels/color/cc-color-panel.ui:226
 msgid "Display Type"
 msgstr "Näytön tyyppi"
 
-#: panels/color/color.ui:241
+#: panels/color/cc-color-panel.ui:241
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
@@ -634,11 +842,11 @@ msgstr ""
 "Valitse näytön valkopiste. Useimmat näytöt tulisi kalibroida D65-"
 "valonlähteeseen."
 
-#: panels/color/color.ui:278
+#: panels/color/cc-color-panel.ui:278
 msgid "Profile Whitepoint"
 msgstr "Profiilin valkopiste"
 
-#: panels/color/color.ui:293
+#: panels/color/cc-color-panel.ui:293
 msgid ""
 "Please set the display to a brightness that is typical for you. Color "
 "management will be most accurate at this brightness level."
@@ -646,7 +854,7 @@ msgstr ""
 "Aseta näyttö siihen kirkkauteen, jolla yleensä käytät sitä. Värienhallinta "
 "tulee olemaan tarkinta tällä kirkkaustasolla."
 
-#: panels/color/color.ui:307
+#: panels/color/cc-color-panel.ui:307
 msgid ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
@@ -654,11 +862,11 @@ msgstr ""
 "Voit myös käyttää samaa kirkkaustasoa kuin muut tätä laitetta varten tehdyt "
 "profiilit."
 
-#: panels/color/color.ui:318
+#: panels/color/cc-color-panel.ui:318
 msgid "Display Brightness"
 msgstr "Näytön kirkkaus"
 
-#: panels/color/color.ui:333
+#: panels/color/cc-color-panel.ui:333
 msgid ""
 "You can use a color profile on different computers, or even create profiles "
 "for different lighting conditions."
@@ -666,35 +874,35 @@ msgstr ""
 "Voit käyttää väriprofiilia eri tietokoneilla, tai vaikkapa luoda profiileja "
 "eri valaistuksia varten."
 
-#: panels/color/color.ui:348
+#: panels/color/cc-color-panel.ui:348
 msgid "Profile Name:"
 msgstr "Profiilin nimi:"
 
-#: panels/color/color.ui:377
+#: panels/color/cc-color-panel.ui:377
 msgid "Profile Name"
 msgstr "Profiilin nimi"
 
-#: panels/color/color.ui:392
+#: panels/color/cc-color-panel.ui:392
 msgid "Profile successfully created!"
 msgstr "Profiili luotiin onnistuneesti!"
 
-#: panels/color/color.ui:443
+#: panels/color/cc-color-panel.ui:443
 msgid "Copy profile"
 msgstr "Kopioi profiili"
 
-#: panels/color/color.ui:456
+#: panels/color/cc-color-panel.ui:456
 msgid "Requires writable media"
 msgstr "Vaatii median, johon on mahdollista kirjoittaa"
 
-#: panels/color/color.ui:519
+#: panels/color/cc-color-panel.ui:519
 msgid "Upload profile"
 msgstr "Lähetä profiili"
 
-#: panels/color/color.ui:532
+#: panels/color/cc-color-panel.ui:532
 msgid "Requires Internet connection"
 msgstr "Vaatii internetyhteyden"
 
-#: panels/color/color.ui:591
+#: panels/color/cc-color-panel.ui:591
 msgid ""
 "You may find these instructions on how to use the profile on <a href=\"linux"
 "\">GNU/Linux</a>, <a href=\"osx\">Apple OS X</a> and <a href=\"windows"
@@ -704,26 +912,28 @@ msgstr ""
 "href=\"osx\">Apple OS X:llä</a> ja <a href=\"windows\">Windowsilla</a> "
 "saattaa olla hyötyä."
 
-#: panels/color/color.ui:607 panels/user-accounts/um-fingerprint-dialog.c:720
+#: panels/color/cc-color-panel.ui:607
+#: panels/user-accounts/um-fingerprint-dialog.c:720
 msgid "Summary"
 msgstr "Yhteenveto"
 
-#: panels/color/color.ui:621
+#: panels/color/cc-color-panel.ui:621
 msgid "Add Profile"
 msgstr "Lisää profiili"
 
-#: panels/color/color.ui:643
+#: panels/color/cc-color-panel.ui:643
 msgid "_Import File…"
 msgstr "_Tuo tiedosto\t…"
 
-#: panels/color/color.ui:672
-#: panels/network/connection-editor/net-connection-editor.c:519
-#: panels/printers/new-printer-dialog.ui:80 panels/region/input-chooser.ui:22
-#: panels/user-accounts/data/account-dialog.ui:47
+#: panels/color/cc-color-panel.ui:672
+#: panels/network/connection-editor/net-connection-editor.c:497
+#: panels/printers/new-printer-dialog.ui:80
+#: panels/region/cc-input-chooser.ui:20
+#: panels/user-accounts/cc-add-user-dialog.ui:47
 msgid "_Add"
 msgstr "_Lisää"
 
-#: panels/color/color.ui:732
+#: panels/color/cc-color-panel.ui:732
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
@@ -731,170 +941,264 @@ msgstr ""
 "Ongelmia havaittu. Profiili ei välttämättä toimi kunnolla. <a href="
 "\"\">Näytä tiedot.</a>"
 
-#: panels/color/color.ui:811
+#: panels/color/cc-color-panel.ui:790
 msgid "Each device needs an up to date color profile to be color managed."
 msgstr ""
 "Laitteet vaativat ajan tasalla olevan väriprofiilin, jotta niiden värejä on "
 "mahdollista hallita."
 
-#: panels/color/color.ui:833
+#: panels/color/cc-color-panel.ui:812
 msgid "Learn more"
 msgstr "Lue lisää"
 
-#: panels/color/color.ui:838
+#: panels/color/cc-color-panel.ui:817
 msgid "Learn more about color management"
 msgstr "Lue lisää värienhallinnasta"
 
-#: panels/color/color.ui:886
+#: panels/color/cc-color-panel.ui:865
 msgid "_Set for all users"
 msgstr "Aseta _kaikille käyttäjille"
 
-#: panels/color/color.ui:890 panels/color/color.ui:905
-#: panels/color/color.ui:906
+#: panels/color/cc-color-panel.ui:869 panels/color/cc-color-panel.ui:884
+#: panels/color/cc-color-panel.ui:885
 msgid "Set this profile for all users on this computer"
 msgstr "Aseta tämä profiili kaikille tietokoneen käyttäjille"
 
-#: panels/color/color.ui:901
+#: panels/color/cc-color-panel.ui:880
 msgid "_Enable"
 msgstr "K_äytä"
 
-#: panels/color/color.ui:932
+#: panels/color/cc-color-panel.ui:911
 msgid "_Add profile"
 msgstr "_Lisää profiili"
 
-#: panels/color/color.ui:945
+#: panels/color/cc-color-panel.ui:924
 msgid "_Calibrate…"
 msgstr "_Kalibroi…"
 
-#: panels/color/color.ui:949
+#: panels/color/cc-color-panel.ui:928
 msgid "Calibrate the device"
 msgstr "Kalibroi laite"
 
-#: panels/color/color.ui:960
+#: panels/color/cc-color-panel.ui:939
 msgid "_Remove profile"
 msgstr "_Poista profiili"
 
-#: panels/color/color.ui:973
+#: panels/color/cc-color-panel.ui:952
 msgid "_View details"
 msgstr "Näytä yk_sityiskohdat"
 
-#: panels/color/color.ui:1009
+#: panels/color/cc-color-panel.ui:988
 msgid "Unable to detect any devices that can be color managed"
 msgstr "Värihallinnan piiriin sopivia laitteita ei havaittu"
 
-#: panels/color/color.ui:1053
+#: panels/color/cc-color-panel.ui:1032
 msgid "LCD"
 msgstr "LCD"
 
-#: panels/color/color.ui:1058
+#: panels/color/cc-color-panel.ui:1037
 msgid "LED"
 msgstr "LED"
 
-#: panels/color/color.ui:1063
+#: panels/color/cc-color-panel.ui:1042
 msgid "CRT"
 msgstr "CRT"
 
-#: panels/color/color.ui:1068
+#: panels/color/cc-color-panel.ui:1047
 msgid "Projector"
 msgstr "Projektori"
 
-#: panels/color/color.ui:1073
+#: panels/color/cc-color-panel.ui:1052
 msgid "Plasma"
 msgstr "Plasma"
 
-#: panels/color/color.ui:1078
+#: panels/color/cc-color-panel.ui:1057
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL-taustalamppu)"
 
-#: panels/color/color.ui:1083
+#: panels/color/cc-color-panel.ui:1062
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED -taustalamppu)"
 
-#: panels/color/color.ui:1088
+#: panels/color/cc-color-panel.ui:1067
 msgid "LCD (white LED backlight)"
 msgstr "LCD (valkoinen LED-taustalamppu)"
 
-#: panels/color/color.ui:1093
+#: panels/color/cc-color-panel.ui:1072
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "Laajan gamutin LCD (CCFL-taustalamppu)"
 
-#: panels/color/color.ui:1098
+#: panels/color/cc-color-panel.ui:1077
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "Laajan gamutin LCD (RGB LED -taustalamppu)"
 
-#: panels/color/color.ui:1115
+#: panels/color/cc-color-panel.ui:1094
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "Korkea"
 
-#: panels/color/color.ui:1116
+#: panels/color/cc-color-panel.ui:1095
 msgid "40 minutes"
 msgstr "40 minuuttia"
 
-#: panels/color/color.ui:1120
+#: panels/color/cc-color-panel.ui:1099
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "Keskitaso"
 
-#: panels/color/color.ui:1121 panels/power/power.ui:25
-#: panels/privacy/privacy.ui:38
+#: panels/color/cc-color-panel.ui:1100
 msgid "30 minutes"
 msgstr "30 minuuttia"
 
-#: panels/color/color.ui:1125
+#: panels/color/cc-color-panel.ui:1104
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "Matala"
 
-#: panels/color/color.ui:1126 panels/power/power.ui:13 panels/power/power.ui:95
+#: panels/color/cc-color-panel.ui:1105
 msgid "15 minutes"
 msgstr "15 minuuttia"
 
-#: panels/color/color.ui:1148
+#: panels/color/cc-color-panel.ui:1127
 msgid "Native to display"
 msgstr "Näytön natiivi"
 
-#: panels/color/color.ui:1152
+#: panels/color/cc-color-panel.ui:1131
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (Tulostus ja julkaisu)"
 
-#: panels/color/color.ui:1156
+#: panels/color/cc-color-panel.ui:1135
 msgid "D55"
 msgstr "D55"
 
-#: panels/color/color.ui:1160
+#: panels/color/cc-color-panel.ui:1139
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (Valokuvaus ja grafiikka)"
 
-#: panels/color/color.ui:1164
+#: panels/color/cc-color-panel.ui:1143
 msgid "D75"
 msgstr "D75"
 
-#: panels/color/gnome-color-panel.desktop.in.in:3
-msgid "Color"
-msgstr "Värit"
-
-#: panels/color/gnome-color-panel.desktop.in.in:4
-msgid ""
-"Calibrate the color of your devices, such as displays, cameras or printers"
-msgstr "Kalibroi laitteidesi, kuten näytön, kameran ja tulostimen värejä"
+#. TRANSLATORS: standard spaces are well known colorspaces like
+#. * sRGB, AdobeRGB and ProPhotoRGB
+#: panels/color/cc-color-profile.c:100
+msgid "Standard Space"
+msgstr "Standardiavaruus"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/color/gnome-color-panel.desktop.in.in:7
-msgid "preferences-color"
-msgstr "preferences-color"
+#. TRANSLATORS: test profiles do things like changing the screen
+#. * a different color, or swap the red and green channels
+#: panels/color/cc-color-profile.c:106
+msgid "Test Profile"
+msgstr "Testiprofiili"
 
-#. Translators: Search terms to find the Color panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: panels/color/gnome-color-panel.desktop.in.in:19
-msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
-msgstr "Väri;ICC;color;profiili;kalibrointi;Calibrate;Tulostin;Printer;Näyttö;"
+#. TRANSLATORS: automatic profiles are generated automatically
+#. * by the color management system based on manufacturing data,
+#. * for instance the default monitor profile is created from the
+#. * primaries specified in the monitor EDID
+#: panels/color/cc-color-profile.c:114
+msgctxt "Automatically generated profile"
+msgid "Automatic"
+msgstr "Automaattinen"
+
+#. TRANSLATORS: the profile quality - low quality profiles take
+#. * much less time to generate but may be a poor reflection of the
+#. * device capability
+#: panels/color/cc-color-profile.c:124
+msgctxt "Profile quality"
+msgid "Low Quality"
+msgstr "Matala laatu"
+
+#. TRANSLATORS: the profile quality
+#: panels/color/cc-color-profile.c:129
+msgctxt "Profile quality"
+msgid "Medium Quality"
+msgstr "Keskimääräinen laatu"
+
+#. TRANSLATORS: the profile quality - high quality profiles take
+#. * a *long* time, and have the best calibration and
+#. * characterisation data.
+#: panels/color/cc-color-profile.c:136
+msgctxt "Profile quality"
+msgid "High Quality"
+msgstr "Korkea laatu"
+
+#. TRANSLATORS: this default RGB space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:153
+msgctxt "Colorspace fallback"
+msgid "Default RGB"
+msgstr "Oletus-RGB"
+
+#. TRANSLATORS: this default CMYK space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:160
+msgctxt "Colorspace fallback"
+msgid "Default CMYK"
+msgstr "Oletus-CMYK"
+
+#. TRANSLATORS: this default gray space is used for printers that
+#. * do not have additional printer profiles specified in the PPD
+#: panels/color/cc-color-profile.c:167
+msgctxt "Colorspace fallback"
+msgid "Default Gray"
+msgstr "Oletusharmaasävy"
+
+#: panels/color/cc-color-profile.c:190
+msgid "Vendor supplied factory calibration data"
+msgstr "Valmistajan toimittaja tehdaskalibrointidata"
+
+#: panels/color/cc-color-profile.c:199
+msgid "Full-screen display correction not possible with this profile"
+msgstr "Koko ruudun näyttökorjaus ei ole mahdollista tällä profiililla"
+
+#: panels/color/cc-color-profile.c:221
+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"
+
+#: panels/color/gnome-color-panel.desktop.in.in:4
+msgid ""
+"Calibrate the color of your devices, such as displays, cameras or printers"
+msgstr "Kalibroi laitteidesi, kuten näytön, kameran ja tulostimen värejä"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/color/gnome-color-panel.desktop.in.in:7
+msgid "preferences-color"
+msgstr "preferences-color"
+
+#. Translators: Search terms to find the Color panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/color/gnome-color-panel.desktop.in.in:19
+msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
+msgstr "Väri;ICC;color;profiili;kalibrointi;Calibrate;Tulostin;Printer;Näyttö;"
 
 #: panels/common/cc-common-language.c:300
 msgid "Other…"
 msgstr "Muu…"
 
-#: panels/common/cc-language-chooser.c:126
-#: panels/region/cc-format-chooser.c:261 panels/region/cc-input-chooser.c:169
+#: panels/common/cc-language-chooser.c:125
+#: panels/region/cc-format-chooser.c:268 panels/region/cc-input-chooser.c:178
 msgid "More…"
 msgstr "Lisää…"
 
@@ -903,8 +1207,8 @@ msgid "No languages found"
 msgstr "Kieli ei löytynyt"
 
 #: panels/common/cc-language-chooser.ui:5
-msgid "Language"
-msgstr "Kieli"
+msgid "Select Language"
+msgstr "Valitse kieli"
 
 #: panels/common/cc-util.c:127
 #: panels/network/connection-editor/ce-page-details.c:106
@@ -948,17 +1252,17 @@ msgid "Year"
 msgstr "Vuosi"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:326
+#: panels/datetime/cc-datetime-panel.c:332
 msgid "%e %B %Y, %l:%M %p"
 msgstr "%e. %Bta %Y, %l:%M %p"
 
 #. Translators: This is the full date and time format used in 24-hour mode.
-#: panels/datetime/cc-datetime-panel.c:331
+#: panels/datetime/cc-datetime-panel.c:337
 msgid "%e %B %Y, %R"
 msgstr "%e. %Bta %Y, %R"
 
 #. Translators: "city, country"
-#: panels/datetime/cc-datetime-panel.c:496
+#: panels/datetime/cc-datetime-panel.c:502
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -966,7 +1270,7 @@ msgstr "%s, %s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: panels/datetime/cc-datetime-panel.c:523
+#: panels/datetime/cc-datetime-panel.c:529
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -974,131 +1278,140 @@ msgstr "%s (%s)"
 
 #. Translators: UTC here means the Coordinated Universal Time.
 #. * %:::z will be replaced by the offset from UTC e.g. UTC+02
-#: panels/datetime/cc-datetime-panel.c:530
+#: panels/datetime/cc-datetime-panel.c:536
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: panels/datetime/cc-datetime-panel.c:535
+#: panels/datetime/cc-datetime-panel.c:541
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
 #. Translators: This is the time format used in 24-hour mode.
-#: panels/datetime/cc-datetime-panel.c:540
+#: panels/datetime/cc-datetime-panel.c:546
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: panels/datetime/cc-datetime-panel.c:545
+#: panels/datetime/cc-datetime-panel.c:551
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: panels/datetime/datetime.ui:22
+#: panels/datetime/cc-datetime-panel.ui:26
 msgid "January"
 msgstr "Tammikuu"
 
-#: panels/datetime/datetime.ui:25
+#: panels/datetime/cc-datetime-panel.ui:29
 msgid "February"
 msgstr "Helmikuu"
 
-#: panels/datetime/datetime.ui:28
+#: panels/datetime/cc-datetime-panel.ui:32
 msgid "March"
 msgstr "Maaliskuu"
 
-#: panels/datetime/datetime.ui:31
+#: panels/datetime/cc-datetime-panel.ui:35
 msgid "April"
 msgstr "Huhtikuu"
 
-#: panels/datetime/datetime.ui:34
+#: panels/datetime/cc-datetime-panel.ui:38
 msgid "May"
 msgstr "Toukokuu"
 
-#: panels/datetime/datetime.ui:37
+#: panels/datetime/cc-datetime-panel.ui:41
 msgid "June"
 msgstr "Kesäkuu"
 
-#: panels/datetime/datetime.ui:40
+#: panels/datetime/cc-datetime-panel.ui:44
 msgid "July"
 msgstr "Heinäkuu"
 
-#: panels/datetime/datetime.ui:43
+#: panels/datetime/cc-datetime-panel.ui:47
 msgid "August"
 msgstr "Elokuu"
 
-#: panels/datetime/datetime.ui:46
+#: panels/datetime/cc-datetime-panel.ui:50
 msgid "September"
 msgstr "Syyskuu"
 
-#: panels/datetime/datetime.ui:49
+#: panels/datetime/cc-datetime-panel.ui:53
 msgid "October"
 msgstr "Lokakuu"
 
-#: panels/datetime/datetime.ui:52
+#: panels/datetime/cc-datetime-panel.ui:56
 msgid "November"
 msgstr "Marraskuu"
 
-#: panels/datetime/datetime.ui:55
+#: panels/datetime/cc-datetime-panel.ui:59
 msgid "December"
 msgstr "Joulukuu"
 
-#: panels/datetime/datetime.ui:61
+#: panels/datetime/cc-datetime-panel.ui:65
 #: panels/datetime/gnome-datetime-panel.desktop.in.in:3
 msgid "Date & Time"
 msgstr "Päivä ja aika"
 
-#: panels/datetime/datetime.ui:109
+#: panels/datetime/cc-datetime-panel.ui:113
+#: panels/display/cc-night-light-dialog.ui:245
+#: panels/display/cc-night-light-dialog.ui:352
 msgid "Hour"
 msgstr "Tunti"
 
 #. Translator: this is the separator between hours and minutes, like in HH∶MM
-#: panels/datetime/datetime.ui:124
+#: panels/datetime/cc-datetime-panel.ui:128
 msgid "∶"
 msgstr "∶"
 
-#: panels/datetime/datetime.ui:148
+#: panels/datetime/cc-datetime-panel.ui:152
+#: panels/display/cc-night-light-dialog.ui:273
+#: panels/display/cc-night-light-dialog.ui:380
 msgid "Minute"
 msgstr "Minuutti"
 
-#: panels/datetime/datetime.ui:215
+#: panels/datetime/cc-datetime-panel.ui:219
 msgid "Time Zone"
 msgstr "Aikavyöhyke"
 
-#: panels/datetime/datetime.ui:236
+#: panels/datetime/cc-datetime-panel.ui:240
 msgid "Search for a city"
 msgstr "Etsi kaupunkia"
 
-#: panels/datetime/datetime.ui:318
+#: panels/datetime/cc-datetime-panel.ui:313
 msgid "Automatic _Date & Time"
 msgstr "Automaattinen _päivä ja aika"
 
-#: panels/datetime/datetime.ui:333 panels/datetime/datetime.ui:411
+#: panels/datetime/cc-datetime-panel.ui:314
 msgid "Requires internet access"
 msgstr "Vaatii internetyhteyden"
 
-#: panels/datetime/datetime.ui:396
+#: panels/datetime/cc-datetime-panel.ui:334
 msgid "Automatic Time _Zone"
 msgstr "Automaattinen _aikavyöhyke"
 
-#: panels/datetime/datetime.ui:468
+#: panels/datetime/cc-datetime-panel.ui:335
+msgid "Requires location services enabled and internet access"
+msgstr ""
+"Vaatii paikannuspalvelun olevan käytössä ja aktiivisen internetyhteyden"
+
+#: panels/datetime/cc-datetime-panel.ui:350
 msgid "Date & _Time"
 msgstr "Päivä _ja aika"
 
-#: panels/datetime/datetime.ui:516
+#: panels/datetime/cc-datetime-panel.ui:366
 msgid "Time Z_one"
 msgstr "Aikav_yöhyke"
 
-#: panels/datetime/datetime.ui:586
+#: panels/datetime/cc-datetime-panel.ui:405
 msgid "Time _Format"
 msgstr "Ajan _muoto"
 
-#: panels/datetime/datetime.ui:605
+#: panels/datetime/cc-datetime-panel.ui:414
 msgid "24-hour"
 msgstr "24 tuntia"
 
-#: panels/datetime/datetime.ui:606
+#: panels/datetime/cc-datetime-panel.ui:415
 msgid "AM / PM"
 msgstr "AM / PM"
 
@@ -1124,109 +1437,29 @@ 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/display/cc-display-panel.c:515
-msgctxt "Display rotation"
-msgid "Landscape"
-msgstr "Vaaka"
-
-#: panels/display/cc-display-panel.c:518
-msgctxt "Display rotation"
-msgid "Portrait Right"
-msgstr "Pysty oikea"
-
-#: panels/display/cc-display-panel.c:521
-msgctxt "Display rotation"
-msgid "Portrait Left"
-msgstr "Pysty vasen"
-
-#: panels/display/cc-display-panel.c:524
-msgctxt "Display rotation"
-msgid "Landscape (flipped)"
-msgstr "Vaaka (käännetty)"
-
-#. Translators: This option sets orientation of print (portrait, landscape...)
-#: panels/display/cc-display-panel.c:591
-#: panels/printers/pp-options-dialog.c:558
-msgid "Orientation"
-msgstr "Suunta"
-
-#: panels/display/cc-display-panel.c:658 panels/display/cc-display-panel.c:1423
-#: panels/printers/pp-options-dialog.c:87
-msgid "Resolution"
-msgstr "Tarkkuus"
-
-#: panels/display/cc-display-panel.c:745
-msgid "Refresh Rate"
-msgstr "Päivitystaajuus"
-
-#: panels/display/cc-display-panel.c:880
-msgid "Scale"
-msgstr "Skaalattu"
-
-#: panels/display/cc-display-panel.c:932
-msgid "Adjust for TV"
-msgstr "Sovita TV:hen"
-
-#: panels/display/cc-display-panel.c:1167
-msgid "Primary Display"
-msgstr "Ensisijainen näyttö"
-
-#: panels/display/cc-display-panel.c:1195
-msgid "Display Arrangement"
-msgstr "Näyttöjen järjestys"
-
-#: panels/display/cc-display-panel.c:1196
-msgid ""
-"Drag displays to match your setup. The top bar is placed on the primary "
-"display."
-msgstr ""
-"Vedä näytöt vastaamaan näyttöjesi järjestystä. Yläpalkki asetetaan "
-"ensisijaiselle näytölle."
-
-#: panels/display/cc-display-panel.c:1610
-msgid "Display Mode"
-msgstr "Näyttötila"
-
-#: panels/display/cc-display-panel.c:1626
-msgid "Join Displays"
-msgstr "Liitä näytöt"
-
-#: panels/display/cc-display-panel.c:1629
-msgid "Mirror"
-msgstr "Peili"
-
-#: panels/display/cc-display-panel.c:1632
-msgid "Single Display"
-msgstr "Yksi näyttö"
-
-#: panels/display/cc-display-panel.c:1906
-#: panels/network/connection-editor/connection-editor.ui:24
+#: panels/display/cc-display-panel.c:891
+#: panels/network/connection-editor/connection-editor.ui:27
 #: panels/network/network-wifi.ui:38
 msgid "_Apply"
 msgstr "_Toteuta"
 
-#: panels/display/cc-display-panel.c:1927
+#: panels/display/cc-display-panel.c:912
 msgid "Apply Changes?"
 msgstr "Toteutetaanko muutokset?"
 
-#: panels/display/cc-display-panel.c:1932
+#: panels/display/cc-display-panel.c:917
 msgid "Changes Cannot be Applied"
 msgstr "Muutoksia ei voitu toteuttaa"
 
-#: panels/display/cc-display-panel.c:1933
+#: panels/display/cc-display-panel.c:918
 msgid "This could be due to hardware limitations."
 msgstr "Tämä saattaa johtua laitteiston rajoituksista."
 
-#: panels/display/cc-display-panel.c:2064
-#, c-format
-msgid "%.2lf Hz"
-msgstr "%.2lf Hz"
-
 #. TRANSLATORS: the state of the night light setting
-#: panels/display/cc-display-panel.c:2236
-#: panels/notifications/cc-notifications-panel.c:288
-#: panels/power/cc-power-panel.c:2038 panels/power/cc-power-panel.c:2045
-#: panels/privacy/cc-privacy-panel.c:193 panels/privacy/cc-privacy-panel.c:260
+#: panels/display/cc-display-panel.c:1091
+#: panels/notifications/cc-notifications-panel.c:270
+#: panels/power/cc-power-panel.c:2111 panels/power/cc-power-panel.c:2118
+#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:279
 #: panels/universal-access/cc-ua-panel.c:478
 #: panels/universal-access/cc-ua-panel.c:841
 #: panels/universal-access/cc-ua-panel.c:854
@@ -1235,41 +1468,98 @@ msgstr "%.2lf Hz"
 msgid "On"
 msgstr "Päällä"
 
-#: panels/display/cc-display-panel.c:2236 panels/network/net-proxy.c:54
-#: panels/notifications/cc-notifications-panel.c:288
-#: panels/power/cc-power-panel.c:2032 panels/power/cc-power-panel.c:2043
-#: panels/privacy/cc-privacy-panel.c:193 panels/privacy/cc-privacy-panel.c:260
+#: panels/display/cc-display-panel.c:1091 panels/network/net-proxy.c:54
+#: panels/notifications/cc-notifications-panel.c:270
+#: panels/power/cc-power-panel.c:2105 panels/power/cc-power-panel.c:2116
+#: panels/privacy/cc-privacy-panel.c:212 panels/privacy/cc-privacy-panel.c:279
 #: panels/universal-access/cc-ua-panel.c:478
 #: panels/universal-access/cc-ua-panel.c:841
 #: panels/universal-access/cc-ua-panel.c:854
 #: panels/universal-access/cc-ua-panel.c:866
 #: panels/universal-access/cc-ua-panel.c:1031
-#: panels/universal-access/uap.ui:338 panels/universal-access/uap.ui:384
-#: panels/universal-access/uap.ui:430 panels/universal-access/uap.ui:536
-#: panels/universal-access/uap.ui:689 panels/universal-access/uap.ui:735
-#: panels/universal-access/uap.ui:781 panels/universal-access/uap.ui:933
+#: panels/universal-access/cc-ua-panel.ui:338
+#: panels/universal-access/cc-ua-panel.ui:384
+#: panels/universal-access/cc-ua-panel.ui:430
+#: panels/universal-access/cc-ua-panel.ui:536
+#: panels/universal-access/cc-ua-panel.ui:689
+#: panels/universal-access/cc-ua-panel.ui:735
+#: panels/universal-access/cc-ua-panel.ui:781
+#: panels/universal-access/cc-ua-panel.ui:933
 msgid "Off"
 msgstr "Pois"
 
-#: panels/display/cc-display-panel.c:2256
-msgid "_Night Light"
-msgstr "_Yövalo"
+#: panels/display/cc-display-panel.ui:81
+msgid "Single Display"
+msgstr "Yksi näyttö"
+
+#: panels/display/cc-display-panel.ui:100
+#: panels/display/cc-display-panel.ui:329
+msgid "Join Displays"
+msgstr "Liitä näytöt"
+
+#: panels/display/cc-display-panel.ui:118
+msgid "Mirror"
+msgstr "Peili"
+
+#: panels/display/cc-display-panel.ui:143
+msgid "Display Mode"
+msgstr "Näyttötila"
+
+#: panels/display/cc-display-panel.ui:201
+msgid "Drag displays to match your setup."
+msgstr "Järjestä näytöt vastaamaan kokoonpanoasi vetämällä niitä."
+
+#: panels/display/cc-display-panel.ui:266
+msgid "Display Arrangement"
+msgstr "Näyttöjen järjestys"
+
+#: panels/display/cc-display-panel.ui:447
+msgid "Display Configuration"
+msgstr "Näyttömääritykset"
+
+#. This is the redshift functionality where we suppress blue light when the sun has gone down
+#: panels/display/cc-display-panel.ui:474
+#: panels/display/cc-display-panel.ui:492
+#: panels/display/cc-night-light-dialog.ui:505
+msgid "Night Light"
+msgstr "Yövalo"
+
+#: panels/display/cc-display-settings.c:103
+msgctxt "Display rotation"
+msgid "Landscape"
+msgstr "Vaaka"
+
+#: panels/display/cc-display-settings.c:106
+msgctxt "Display rotation"
+msgid "Portrait Right"
+msgstr "Pysty oikea"
+
+#: panels/display/cc-display-settings.c:109
+msgctxt "Display rotation"
+msgid "Portrait Left"
+msgstr "Pysty vasen"
+
+#: panels/display/cc-display-settings.c:112
+msgctxt "Display rotation"
+msgid "Landscape (flipped)"
+msgstr "Vaaka (käännetty)"
 
-#: panels/display/cc-display-panel.c:2317
-msgid "Could not get screen information"
-msgstr "Näytön tietoja ei saatu"
+#: panels/display/cc-display-settings.c:186
+#, c-format
+msgid "%.2lf Hz"
+msgstr "%.2lf Hz"
 
 #. This cancels the redshift inhibit.
-#: panels/display/cc-night-light-dialog.ui:47
+#: panels/display/cc-night-light-dialog.ui:46
 msgid "Restart Filter"
 msgstr "Käynnistä suodatin uudelleen"
 
 #. Inhibit the redshift functionality until the next day starts
-#: panels/display/cc-night-light-dialog.ui:80
+#: panels/display/cc-night-light-dialog.ui:79
 msgid "Temporarily Disabled Until Tomorrow"
 msgstr "Poistettu väliaikaisesti käytöstä huomiseen asti"
 
-#: panels/display/cc-night-light-dialog.ui:107
+#: panels/display/cc-night-light-dialog.ui:106
 msgid ""
 "Night light makes the screen color warmer. This can help to prevent eye "
 "strain and sleeplessness."
@@ -1277,54 +1567,56 @@ msgstr ""
 "Yövalo tekee näytön väreistä tavallista lämpimämpiä. Sen on tarkoitus estää "
 "silmien rasittumista ja unettomuutta."
 
-#. This is the redshift functionality where we suppress blue light when the sun has gone down
-#: panels/display/cc-night-light-dialog.ui:129
-#: panels/display/cc-night-light-dialog.ui:466
-msgid "Night Light"
-msgstr "Yövalo"
-
-#: panels/display/cc-night-light-dialog.ui:145
+#: panels/display/cc-night-light-dialog.ui:127
 msgid "Schedule"
 msgstr "Aikataulu"
 
-#: panels/display/cc-night-light-dialog.ui:174
+#: panels/display/cc-night-light-dialog.ui:148
 msgid "Sunset to Sunrise"
 msgstr "Auringonlaskusta auringonnousuun"
 
-#: panels/display/cc-night-light-dialog.ui:189
+#: panels/display/cc-night-light-dialog.ui:164
 #: 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:777 panels/network/network-wifi.ui:1054
-#: panels/privacy/cc-privacy-panel.c:220
+#: panels/network/network-wifi.ui:776 panels/network/network-wifi.ui:1053
+#: panels/privacy/cc-privacy-panel.c:239
 msgid "Manual"
 msgstr "Manuaalinen"
 
-#: panels/display/cc-night-light-dialog.ui:224
+#: panels/display/cc-night-light-dialog.ui:180
+msgid "_Off"
+msgstr "_Pois"
+
+#: panels/display/cc-night-light-dialog.ui:216
 msgid "From"
 msgstr "Alkaa"
 
-#: panels/display/cc-night-light-dialog.ui:256
-#: panels/display/cc-night-light-dialog.ui:353
+#: panels/display/cc-night-light-dialog.ui:254
+#: panels/display/cc-night-light-dialog.ui:361
 msgid ":"
 msgstr ":"
 
 #. This is the short form for the time period in the morning
-#: panels/display/cc-night-light-dialog.ui:281
-#: panels/display/cc-night-light-dialog.ui:378
+#: panels/display/cc-night-light-dialog.ui:284
+#: panels/display/cc-night-light-dialog.ui:391
 msgid "AM"
 msgstr "AM"
 
 #. This is the short form for the time period in the afternoon
-#: panels/display/cc-night-light-dialog.ui:297
-#: panels/display/cc-night-light-dialog.ui:394
+#: panels/display/cc-night-light-dialog.ui:300
+#: panels/display/cc-night-light-dialog.ui:407
 msgid "PM"
 msgstr "PM"
 
-#: panels/display/cc-night-light-dialog.ui:436
+#: panels/display/cc-night-light-dialog.ui:449
 msgid "To"
 msgstr "Päättyy"
 
+#: panels/display/cc-night-light-dialog.ui:470
+msgid "Color Temperature"
+msgstr "Värilämpötila"
+
 #: panels/display/gnome-display-panel.desktop.in.in:3
 msgid "Displays"
 msgstr "Näytöt"
@@ -1348,9 +1640,34 @@ 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:161
+msgid "_Photos"
+msgstr "_Kuvat"
+
 #. TRANSLATORS: AP type
-#: panels/info/cc-info-overview-panel.c:373
-#: panels/info/cc-info-overview-panel.c:456 panels/network/panel-common.c:123
+#: panels/info/cc-info-overview-panel.c:374
+#: panels/info/cc-info-overview-panel.c:457 panels/network/panel-common.c:123
 msgid "Unknown"
 msgstr "Tuntematon"
 
@@ -1358,28 +1675,70 @@ 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:464
+#: panels/info/cc-info-overview-panel.c:465
 #, 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:481
+#: panels/info/cc-info-overview-panel.c:482
 #, 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:484
+#: panels/info/cc-info-overview-panel.c:485
 #, c-format
 msgid "32-bit"
 msgstr "32-bit"
 
-#: panels/info/cc-info-overview-panel.c:773
+#: panels/info/cc-info-overview-panel.c:775
 #, c-format
 msgid "Version %s"
 msgstr "Versio %s"
 
+#: panels/info/cc-info-overview-panel.ui:70
+msgid "Device name"
+msgstr "Laitteen nimi"
+
+#: panels/info/cc-info-overview-panel.ui:86
+msgid "Memory"
+msgstr "Muisti"
+
+#: panels/info/cc-info-overview-panel.ui:102
+msgid "Processor"
+msgstr "Suoritin"
+
+#: panels/info/cc-info-overview-panel.ui:118
+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"
+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"
+msgstr "Käyttöjärjestelmän tyyppi"
+
+#: panels/info/cc-info-overview-panel.ui:165
+msgid "Virtualization"
+msgstr "Virtualisointi"
+
+#: panels/info/cc-info-overview-panel.ui:181
+msgid "Disk"
+msgstr "Levy"
+
+#: panels/info/cc-info-overview-panel.ui:293
+msgid "Calculating…"
+msgstr "Lasketaan…"
+
+#: panels/info/cc-info-overview-panel.ui:333
+msgid "Check for updates"
+msgstr "Tarkista päivitykset"
+
 #: panels/info/cc-info-removable-media-panel.c:298
 msgid "Ask what to do"
 msgstr "Kysy mitä tehdään"
@@ -1469,9 +1828,49 @@ msgstr "Video-CD"
 msgid "Windows software"
 msgstr "Windows-ohjelmisto"
 
-#: panels/info/gnome-default-apps-panel.desktop.in.in:3
-msgid "Default Applications"
-msgstr "Oletussovellukset"
+#: panels/info/cc-info-removable-media-panel.ui:43
+msgid "Select how media should be handled"
+msgstr "Valitse kuinka mediaa käsitellään"
+
+#: panels/info/cc-info-removable-media-panel.ui:74
+msgid "CD _audio"
+msgstr "_Ääni-CD"
+
+#: panels/info/cc-info-removable-media-panel.ui:91
+msgid "_DVD video"
+msgstr "_DVD-video"
+
+#: panels/info/cc-info-removable-media-panel.ui:132
+msgid "_Music player"
+msgstr "_Musiikkisoitin"
+
+#: panels/info/cc-info-removable-media-panel.ui:190
+msgid "_Software"
+msgstr "_Ohjelmisto"
+
+#: panels/info/cc-info-removable-media-panel.ui:228
+msgid "_Other Media…"
+msgstr "_Muu media…"
+
+#: panels/info/cc-info-removable-media-panel.ui:272
+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:331
+msgid "Select how other media should be handled"
+msgstr "Valitse kuinka muita medioita käsitellään"
+
+#: panels/info/cc-info-removable-media-panel.ui:370
+msgid "_Action:"
+msgstr "_Toiminto:"
+
+#: panels/info/cc-info-removable-media-panel.ui:393
+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"
@@ -1539,112 +1938,6 @@ msgstr ""
 "versio;oletukset;sovellus;suositellut;automaattikäynnistys;ääni;irrotettava;"
 "ulkoinen;"
 
-#: panels/info/info-default-apps.ui:31
-msgid "_Web"
-msgstr "_Verkko"
-
-#: panels/info/info-default-apps.ui:43
-msgid "_Mail"
-msgstr "_Sähköposti"
-
-#: panels/info/info-default-apps.ui:59
-msgid "_Calendar"
-msgstr "_Kalenteri"
-
-#: panels/info/info-default-apps.ui:75
-msgid "M_usic"
-msgstr "M_usiikki"
-
-#: panels/info/info-default-apps.ui:91
-msgid "_Video"
-msgstr "_Video"
-
-#: panels/info/info-default-apps.ui:162 panels/info/info-removable-media.ui:161
-msgid "_Photos"
-msgstr "_Kuvat"
-
-#: panels/info/info-overview.ui:58
-msgid "Device name"
-msgstr "Laitteen nimi"
-
-#: panels/info/info-overview.ui:74
-msgid "Memory"
-msgstr "Muisti"
-
-#: panels/info/info-overview.ui:90
-msgid "Processor"
-msgstr "Suoritin"
-
-#: panels/info/info-overview.ui:106
-msgid "Graphics"
-msgstr "Grafiikka"
-
-#. To translators: this field contains the distro name and version
-#: panels/info/info-overview.ui:121
-msgid "OS name"
-msgstr "Käyttöjärjestelmän nimi"
-
-#. To translators: this field contains the distro type
-#: panels/info/info-overview.ui:137
-msgid "OS type"
-msgstr "Käyttöjärjestelmän tyyppi"
-
-#: panels/info/info-overview.ui:153
-msgid "Virtualization"
-msgstr "Virtualisointi"
-
-#: panels/info/info-overview.ui:169
-msgid "Disk"
-msgstr "Levy"
-
-#: panels/info/info-overview.ui:274
-msgid "Calculating…"
-msgstr "Lasketaan…"
-
-#: panels/info/info-overview.ui:314
-msgid "Check for updates"
-msgstr "Tarkista päivitykset"
-
-#: panels/info/info-removable-media.ui:43
-msgid "Select how media should be handled"
-msgstr "Valitse kuinka mediaa käsitellään"
-
-#: panels/info/info-removable-media.ui:74
-msgid "CD _audio"
-msgstr "_Ääni-CD"
-
-#: panels/info/info-removable-media.ui:91
-msgid "_DVD video"
-msgstr "_DVD-video"
-
-#: panels/info/info-removable-media.ui:132
-msgid "_Music player"
-msgstr "_Musiikkisoitin"
-
-#: panels/info/info-removable-media.ui:190
-msgid "_Software"
-msgstr "_Ohjelmisto"
-
-#: panels/info/info-removable-media.ui:228
-msgid "_Other Media…"
-msgstr "_Muu media…"
-
-#: panels/info/info-removable-media.ui:272
-msgid "_Never prompt or start programs on media insertion"
-msgstr "_Älä koskaan kysy tai käynnistä ohjelmia liitettäessä media"
-
-#: panels/info/info-removable-media.ui:331
-msgid "Select how other media should be handled"
-msgstr "Valitse kuinka muita medioita käsitellään"
-
-#: panels/info/info-removable-media.ui:370
-msgid "_Action:"
-msgstr "_Toiminto:"
-
-#: panels/info/info-removable-media.ui:393
-msgid "_Type:"
-msgstr "_Tyyppi:"
-
 #: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
 msgstr "Ääni ja media"
@@ -1689,7 +1982,8 @@ msgstr "Seuraava kappale"
 msgid "Eject"
 msgstr "Irrota"
 
-#: panels/keyboard/01-input-sources.xml.in:4 panels/universal-access/uap.ui:580
+#: panels/keyboard/01-input-sources.xml.in:4
+#: panels/universal-access/cc-ua-panel.ui:580
 msgid "Typing"
 msgstr "Kirjoittaminen"
 
@@ -1709,12 +2003,6 @@ msgstr "Käynnistimet"
 msgid "Launch help browser"
 msgstr "Käynnistä ohjeselain"
 
-#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:276
-#: shell/cc-window.c:912 shell/cc-window.ui:124
-#: shell/gnome-control-center.desktop.in.in:3
-msgid "Settings"
-msgstr "Asetukset"
-
 #: panels/keyboard/01-launchers.xml.in:8
 msgid "Launch calculator"
 msgstr "Käynnistä laskin"
@@ -1731,11 +2019,6 @@ msgstr "Käynnistä internetselain"
 msgid "Home folder"
 msgstr "Kotikansio"
 
-#: panels/keyboard/01-launchers.xml.in:16
-#: panels/search/gnome-search-panel.desktop.in.in:3 shell/cc-window.ui:156
-msgid "Search"
-msgstr "Haku"
-
 #: panels/keyboard/01-screenshot.xml.in:2
 msgid "Screenshots"
 msgstr "Kuvakaappaukset"
@@ -1823,21 +2106,6 @@ msgstr "Korkea kontrasti päälle/pois"
 msgid "Custom Shortcuts"
 msgstr "Omat pikanäppäimet"
 
-#. This label is displayed in a treeview cell displaying
-#. * a disabled accelerator key combination.
-#.
-#. translators:
-#. * The device has been disabled
-#: 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:782 panels/network/network-wifi.ui:1059
-#: panels/user-accounts/um-fingerprint-dialog.c:211
-#: subprojects/gvc/gvc-mixer-control.c:1866
-msgid "Disabled"
-msgstr "Ei käytössä"
-
 #. Translators: This key is also known as 'third level
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
@@ -1883,10 +2151,31 @@ msgstr "Peru"
 msgid "Reset All"
 msgstr "Palauta kaikki oletusasetukset"
 
-#: panels/keyboard/cc-keyboard-panel.c:279
+#: panels/keyboard/cc-keyboard-panel.c:283
 msgid "Reset the shortcut to its default value"
 msgstr "Palauta pikanäppäin oletusarvoon"
 
+#: panels/keyboard/cc-keyboard-panel.ui:67 panels/region/cc-region-panel.ui:404
+#: shell/cc-window.ui:334
+msgid "Keyboard Shortcuts"
+msgstr "Pikanäppäimet"
+
+#: panels/keyboard/cc-keyboard-panel.ui:77
+msgid "Reset All…"
+msgstr "Palauta kaikki oletusasetukset…"
+
+#: panels/keyboard/cc-keyboard-panel.ui:78
+msgid "Reset all shortcuts to their default keybindings"
+msgstr "Palauta kaikki pikanäppäimet oletusarvoihin"
+
+#: panels/keyboard/cc-keyboard-panel.ui:164
+msgid "No keyboard shortcut found"
+msgstr "Näppäimistön pikanäppäintä ei löytynyt"
+
+#: panels/keyboard/cc-keyboard-panel.ui:175 shell/cc-panel-list.ui:206
+msgid "Try a different search"
+msgstr "Yritä eri hakuehdoilla"
+
 #: panels/keyboard/cc-keyboard-shortcut-editor.c:411
 #, c-format
 msgid ""
@@ -1936,34 +2225,11 @@ msgstr ""
 "Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 "pikanäppäin;työtila;ikkuna;syöte;"
 
-#: panels/keyboard/gnome-keyboard-panel.ui:67 panels/region/input-options.ui:68
-#: shell/cc-application.c:252
-msgid "Keyboard Shortcuts"
-msgstr "Pikanäppäimet"
-
-#: panels/keyboard/gnome-keyboard-panel.ui:77
-msgid "Reset All…"
-msgstr "Palauta kaikki oletusasetukset…"
-
-#: panels/keyboard/gnome-keyboard-panel.ui:78
-msgid "Reset all shortcuts to their default keybindings"
-msgstr "Palauta kaikki pikanäppäimet oletusarvoihin"
-
-#: panels/keyboard/gnome-keyboard-panel.ui:164
-msgid "No keyboard shortcut found"
-msgstr "Näppäimistön pikanäppäintä ei löytynyt"
-
-#: panels/keyboard/gnome-keyboard-panel.ui:175 shell/cc-panel-list.ui:206
-msgid "Try a different search"
-msgstr "Yritä eri hakuehdoilla"
-
 #: panels/keyboard/shortcut-editor.ui:68 panels/keyboard/shortcut-editor.ui:318
 msgid "Press Esc to cancel or Backspace to reset the keyboard shortcut."
 msgstr "Paina Esc peruaksesi tai askelpalautinta nollataksesi pikanäppäimen."
 
 #: panels/keyboard/shortcut-editor.ui:156 panels/printers/details-dialog.ui:38
-#: panels/sound/gvc-mixer-dialog.c:1480
-#: panels/sound/gvc-sound-theme-chooser.c:554
 msgid "Name"
 msgstr "Nimi"
 
@@ -1979,7 +2245,7 @@ msgstr "Pikanäppäin"
 msgid "Set Shortcut…"
 msgstr "Aseta pikanäppäin…"
 
-#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:594
+#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:593
 msgid "None"
 msgstr "Ei mikään"
 
@@ -2003,7 +2269,7 @@ msgstr "Korvaa"
 msgid "Set"
 msgstr "Aseta"
 
-#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:439
+#: panels/mouse/cc-mouse-panel.c:80 panels/wacom/cc-wacom-panel.c:448
 msgid "Test Your _Settings"
 msgstr "_Testaa asetukset"
 
@@ -2044,10 +2310,12 @@ msgstr ""
 "Aseta fyysisten painikkeiden järjestys hiirien ja kosketuslevyjen kohdalla."
 
 #: panels/mouse/gnome-mouse-properties.ui:136
+#: panels/sound/cc-balance-slider.ui:13
 msgid "Left"
 msgstr "Vasen"
 
 #: panels/mouse/gnome-mouse-properties.ui:146
+#: panels/sound/cc-balance-slider.ui:15
 msgid "Right"
 msgstr "Oikea"
 
@@ -2060,19 +2328,19 @@ msgid "Mouse Speed"
 msgstr "Hiiren nopeus"
 
 #: panels/mouse/gnome-mouse-properties.ui:243
-#: panels/mouse/gnome-mouse-properties.ui:548
+#: panels/mouse/gnome-mouse-properties.ui:535
 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/gnome-mouse-properties.ui:280
-#: panels/mouse/gnome-mouse-properties.ui:456
+#: panels/mouse/gnome-mouse-properties.ui:443
 msgid "Natural Scrolling"
 msgstr "Luonnollinen vieritys"
 
 #: panels/mouse/gnome-mouse-properties.ui:296
-#: panels/mouse/gnome-mouse-properties.ui:472
+#: panels/mouse/gnome-mouse-properties.ui:459
 msgid "Scrolling moves the content, not the view."
 msgstr "Vieritys liikuttaa sisältöä, ei näkymää."
 
@@ -2081,19 +2349,19 @@ msgstr "Vieritys liikuttaa sisältöä, ei näkymää."
 msgid "Touchpad"
 msgstr "Kosketuslevy"
 
-#: panels/mouse/gnome-mouse-properties.ui:527
+#: panels/mouse/gnome-mouse-properties.ui:514
 msgid "Touchpad Speed"
 msgstr "Kosketuslevyn nopeus"
 
-#: panels/mouse/gnome-mouse-properties.ui:586
+#: panels/mouse/gnome-mouse-properties.ui:573
 msgid "Tap to Click"
 msgstr "Napsauta napauttamalla"
 
-#: panels/mouse/gnome-mouse-properties.ui:639
+#: panels/mouse/gnome-mouse-properties.ui:625
 msgid "Two-finger Scrolling"
 msgstr "Kahden sormen vieritys"
 
-#: panels/mouse/gnome-mouse-properties.ui:693
+#: panels/mouse/gnome-mouse-properties.ui:678
 msgid "Edge Scrolling"
 msgstr "Reunavieritys"
 
@@ -2138,13 +2406,13 @@ msgstr "Verkon välityspalvelin"
 #. * window for vpn connections, it is also used to display
 #. * vpn connections in the device list.
 #.
-#: panels/network/cc-network-panel.c:719 panels/network/net-vpn.c:170
-#: panels/network/net-vpn.c:299
+#: panels/network/cc-network-panel.c:719 panels/network/net-vpn.c:167
+#: panels/network/net-vpn.c:295
 #, c-format
 msgid "%s VPN"
 msgstr "%s - VPN"
 
-#: panels/network/cc-network-panel.c:783 panels/network/cc-wifi-panel.ui:320
+#: panels/network/cc-network-panel.c:783 panels/network/cc-wifi-panel.ui:303
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "Hups, jokin taisi mennä pieleen. Ota yhteys sovellustoimittajaan."
 
@@ -2153,7 +2421,7 @@ msgid "NetworkManager needs to be running."
 msgstr "NetworkManagerin tulee olla käynnissä."
 
 #: panels/network/cc-network-panel.ui:142
-#: panels/network/connection-editor/net-connection-editor.c:603
+#: panels/network/connection-editor/net-connection-editor.c:581
 msgid "VPN"
 msgstr "VPN"
 
@@ -2161,41 +2429,62 @@ msgstr "VPN"
 msgid "Not set up"
 msgstr "Ei määritetty"
 
+#. TRANSLATORS: This happens when the connection name does not contain the SSID.
+#: panels/network/cc-wifi-connection-row.c:189
+#, c-format
+#| msgctxt "timezone desc"
+#| msgid "%s (%s)"
+msgctxt "Wi-Fi Connection"
+msgid "%s (SSID: %s)"
+msgstr "%s (SSID: %s)"
+
+#: panels/network/cc-wifi-connection-row.ui:36
+#| msgid "Connecting"
+msgid "Connection/SSID"
+msgstr "Yhteys/SSID"
+
+#: panels/network/cc-wifi-connection-row.ui:73
+#: 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
+msgid "Options…"
+msgstr "Valinnat…"
+
 #: panels/network/cc-wifi-panel.c:281
 #: panels/network/gnome-wifi-panel.desktop.in.in:3
-#: panels/network/network-wifi.ui:1769
+#: panels/network/network-wifi.ui:1738
 msgid "Wi-Fi"
 msgstr "Wifi"
 
-#: panels/network/cc-wifi-panel.ui:73
+#: panels/network/cc-wifi-panel.ui:56
 msgid "Airplane Mode"
 msgstr "Lentokonetila"
 
-#: panels/network/cc-wifi-panel.ui:88
+#: panels/network/cc-wifi-panel.ui:71
 msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
 msgstr "Poistaa käytöstä wifin, Bluetoothin ja mobiililaajakaistan"
 
-#: panels/network/cc-wifi-panel.ui:157
+#: panels/network/cc-wifi-panel.ui:140
 msgid "No Wi-Fi Adapter Found"
 msgstr "Wifi-sovitinta ei löytynyt"
 
-#: panels/network/cc-wifi-panel.ui:169
+#: panels/network/cc-wifi-panel.ui:152
 msgid "Make sure you have a Wi-Fi adapter plugged and turned on"
 msgstr "Varmista, että wifi-sovitin on kiinnitetty ja käynnistetty"
 
-#: panels/network/cc-wifi-panel.ui:204
+#: panels/network/cc-wifi-panel.ui:187
 msgid "Airplane Mode On"
 msgstr "Lentokonetila päällä"
 
-#: panels/network/cc-wifi-panel.ui:216
+#: panels/network/cc-wifi-panel.ui:199
 msgid "Turn off to use Wi-Fi"
 msgstr "Sammuta käyttääksesi wifiä"
 
-#: panels/network/cc-wifi-panel.ui:242
+#: panels/network/cc-wifi-panel.ui:225
 msgid "Visible Networks"
 msgstr "Näkyvissä olevat verkot"
 
-#: panels/network/cc-wifi-panel.ui:309
+#: panels/network/cc-wifi-panel.ui:292
 msgid "NetworkManager needs to be running"
 msgstr "NetworkManagerin tulee olla käynnissä"
 
@@ -2205,7 +2494,6 @@ msgstr "802.1x-suojaus"
 
 #: panels/network/connection-editor/8021x-security-page.ui:73
 #: panels/network/connection-editor/security-page.ui:72
-#: panels/wacom/wacom-stylus-page.ui:110
 msgid "page 1"
 msgstr "sivu 1"
 
@@ -2224,7 +2512,6 @@ msgstr "_Sisempi tunnistautuminen"
 
 #: panels/network/connection-editor/8021x-security-page.ui:281
 #: panels/network/connection-editor/security-page.ui:280
-#: panels/wacom/wacom-stylus-page.ui:428
 msgid "page 2"
 msgstr "sivu 2"
 
@@ -2246,43 +2533,42 @@ msgstr "Profiili %d"
 
 #. TRANSLATORS: this WEP WiFi security
 #: panels/network/connection-editor/ce-page-details.c:56
-#: panels/network/net-device-wifi.c:235 panels/network/net-device-wifi.c:468
+#: panels/network/net-device-wifi.c:123 panels/network/net-device-wifi.c:299
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
 #: panels/network/connection-editor/ce-page-details.c:60
-#: panels/network/net-device-wifi.c:239 panels/network/net-device-wifi.c:473
-#: panels/network/network-wifi.ui:593
+#: panels/network/net-device-wifi.c:127 panels/network/net-device-wifi.c:304
+#: panels/network/network-wifi.ui:592
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
 #: panels/network/connection-editor/ce-page-details.c:64
-#: panels/network/net-device-wifi.c:243
+#: panels/network/net-device-wifi.c:131
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
 #: panels/network/connection-editor/ce-page-details.c:69
-#: panels/network/net-device-wifi.c:248
+#: panels/network/net-device-wifi.c:136
 msgid "Enterprise"
 msgstr "Yritys"
 
 #: panels/network/connection-editor/ce-page-details.c:74
-#: panels/network/net-device-wifi.c:253 panels/network/net-device-wifi.c:458
+#: panels/network/net-device-wifi.c:141 panels/network/net-device-wifi.c:289
 msgctxt "Wifi security"
 msgid "None"
 msgstr "Ei mitään"
 
 #: panels/network/connection-editor/ce-page-details.c:95
-#: panels/power/power.ui:99
 msgid "Never"
 msgstr "Ei koskaan"
 
 #: panels/network/connection-editor/ce-page-details.c:110
-#: panels/network/net-device-ethernet.c:121
-#: panels/network/net-device-wifi.c:567
+#: panels/network/net-device-ethernet.c:137
+#: panels/network/net-device-wifi.c:398
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2290,64 +2576,64 @@ msgstr[0] "%i päivä sitten"
 msgstr[1] "%i päivää sitten"
 
 #. Translators: network device speed
-#: panels/network/connection-editor/ce-page-details.c:225
-#: panels/network/net-device-ethernet.c:50 panels/network/net-device-wifi.c:646
+#: panels/network/connection-editor/ce-page-details.c:228
+#: panels/network/net-device-ethernet.c:66 panels/network/net-device-wifi.c:476
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: panels/network/connection-editor/ce-page-details.c:251
-#: panels/network/net-device-wifi.c:675
+#: panels/network/connection-editor/ce-page-details.c:249
+#: panels/network/net-device-wifi.c:505
 msgctxt "Signal strength"
 msgid "None"
 msgstr "Ei mitään"
 
-#: panels/network/connection-editor/ce-page-details.c:253
-#: panels/network/net-device-wifi.c:677
+#: panels/network/connection-editor/ce-page-details.c:251
+#: panels/network/net-device-wifi.c:507
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Heikko"
 
-#: panels/network/connection-editor/ce-page-details.c:255
-#: panels/network/net-device-wifi.c:679
+#: panels/network/connection-editor/ce-page-details.c:253
+#: panels/network/net-device-wifi.c:509
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "OK"
 
-#: panels/network/connection-editor/ce-page-details.c:257
-#: panels/network/net-device-wifi.c:681
+#: panels/network/connection-editor/ce-page-details.c:255
+#: panels/network/net-device-wifi.c:511
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Hyvä"
 
-#: panels/network/connection-editor/ce-page-details.c:259
-#: panels/network/net-device-wifi.c:683
+#: panels/network/connection-editor/ce-page-details.c:257
+#: panels/network/net-device-wifi.c:513
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Erinomainen"
 
-#: panels/network/connection-editor/ce-page-details.c:302
+#: panels/network/connection-editor/ce-page-details.c:300
 msgid "Forget Connection"
 msgstr "Unohda yhteys"
 
-#: panels/network/connection-editor/ce-page-details.c:304
+#: panels/network/connection-editor/ce-page-details.c:302
 msgid "Remove Connection Profile"
 msgstr "Poista yhteysprofiili"
 
-#: panels/network/connection-editor/ce-page-details.c:306
+#: panels/network/connection-editor/ce-page-details.c:304
 msgid "Remove VPN"
 msgstr "Poista VPN"
 
-#: panels/network/connection-editor/ce-page-details.c:334
-#: panels/network/network-wifi.ui:1456 shell/cc-panel-list.ui:103
-#: shell/cc-window.c:268
+#: 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:264
 msgid "Details"
 msgstr "Tiedot"
 
 #: panels/network/connection-editor/ce-page-ethernet.c:174
 #: panels/network/connection-editor/ce-page-vpn.c:188
 #: panels/network/connection-editor/ce-page-wifi.c:194
-#: panels/network/network-wifi.ui:1460
+#: panels/network/network-wifi.ui:1437
 msgid "Identity"
 msgstr "Identiteetti"
 
@@ -2362,12 +2648,12 @@ msgid "Delete Route"
 msgstr "Poista reitti"
 
 #: panels/network/connection-editor/ce-page-ip4.c:896
-#: panels/network/network-wifi.ui:1464
+#: panels/network/network-wifi.ui:1441
 msgid "IPv4"
 msgstr "IPv4"
 
 #: panels/network/connection-editor/ce-page-ip6.c:828
-#: panels/network/network-wifi.ui:1468
+#: panels/network/network-wifi.ui:1445
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -2412,26 +2698,26 @@ msgid "Link speed"
 msgstr "Yhteysnopeus"
 
 #: panels/network/connection-editor/details-page.ui:104
-#: panels/network/net-device-ethernet.c:154 panels/network/network-wifi.ui:256
+#: 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:155
-#: panels/network/net-device-ethernet.c:159
+#: 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:162 panels/network/network-wifi.ui:290
+#: panels/network/net-device-ethernet.c:178 panels/network/network-wifi.ui:290
 msgid "Hardware Address"
 msgstr "Laiteosoite"
 
 #: panels/network/connection-editor/details-page.ui:158
-#: panels/network/net-device-ethernet.c:166
+#: panels/network/net-device-ethernet.c:182
 #: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
 msgid "Default Route"
 msgstr "Oletusreitti"
@@ -2439,9 +2725,9 @@ 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:168
+#: panels/network/net-device-ethernet.c:184
 #: panels/network/network-mobile.ui:224 panels/network/network-wifi.ui:325
-#: panels/network/network-wifi.ui:832 panels/network/network-wifi.ui:1109
+#: panels/network/network-wifi.ui:831 panels/network/network-wifi.ui:1108
 msgid "DNS"
 msgstr "DNS"
 
@@ -2476,7 +2762,7 @@ msgstr ""
 #: 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:220
+#: panels/privacy/cc-privacy-panel.c:239
 msgid "Automatic"
 msgstr "Automaattinen"
 
@@ -2518,8 +2804,8 @@ msgid "_Name"
 msgstr "_Nimi"
 
 #: panels/network/connection-editor/ethernet-page.ui:100
-#: panels/network/connection-editor/wifi-page.ui:68
-#: panels/network/network-wifi.ui:1261
+#: panels/network/connection-editor/wifi-page.ui:67
+#: panels/network/network-wifi.ui:1260
 msgid "_MAC Address"
 msgstr "_MAC-osoite"
 
@@ -2528,7 +2814,7 @@ msgid "M_TU"
 msgstr "M_TU"
 
 #: panels/network/connection-editor/ethernet-page.ui:163
-#: panels/network/connection-editor/wifi-page.ui:98
+#: panels/network/connection-editor/wifi-page.ui:97
 msgid "_Cloned Address"
 msgstr "_Kloonattu osoite"
 
@@ -2541,7 +2827,7 @@ msgid "IPv_4 Method"
 msgstr "IPv_4-tapa"
 
 #: panels/network/connection-editor/ip4-page.ui:42
-#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055
+#: panels/network/network-wifi.ui:777 panels/network/network-wifi.ui:1054
 msgid "Automatic (DHCP)"
 msgstr "Automaattinen (DHCP)"
 
@@ -2564,7 +2850,7 @@ msgstr "Osoitteet"
 #: 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:87
+#: panels/printers/details-dialog.ui:89
 msgid "Address"
 msgstr "Osoite"
 
@@ -2592,7 +2878,7 @@ 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:877 panels/network/network-wifi.ui:1154
+#: panels/network/network-wifi.ui:876 panels/network/network-wifi.ui:1153
 msgid "Routes"
 msgstr "Reitit"
 
@@ -2609,7 +2895,7 @@ msgstr "Metriikka"
 
 #: panels/network/connection-editor/ip4-page.ui:384
 #: panels/network/connection-editor/ip6-page.ui:398
-#: panels/network/network-wifi.ui:933 panels/network/network-wifi.ui:1210
+#: panels/network/network-wifi.ui:932 panels/network/network-wifi.ui:1209
 msgid "Use this connection _only for resources on its network"
 msgstr "Käytä tätä yhteyttä _vain tässä verkossa oleviin resursseihin"
 
@@ -2626,19 +2912,19 @@ msgstr "Automaattinen, vain DHCP"
 msgid "Prefix"
 msgstr "Etuliite"
 
-#: panels/network/connection-editor/net-connection-editor.c:273
+#: panels/network/connection-editor/net-connection-editor.c:261
 msgid "Unable to open connection editor"
 msgstr "Yhteyseditorin avaaminen epäonnistui"
 
-#: panels/network/connection-editor/net-connection-editor.c:291
+#: panels/network/connection-editor/net-connection-editor.c:279
 msgid "New Profile"
 msgstr "Uusi profiili"
 
-#: panels/network/connection-editor/net-connection-editor.c:751
+#: panels/network/connection-editor/net-connection-editor.c:727
 msgid "Import from file…"
 msgstr "Tuo tiedostosta…"
 
-#: panels/network/connection-editor/net-connection-editor.c:785
+#: panels/network/connection-editor/net-connection-editor.c:759
 msgid "Add VPN"
 msgstr "Lisää VPN"
 
@@ -2669,9 +2955,9 @@ msgid "Select file to import"
 msgstr "Valitse tuotava tiedosto"
 
 #: panels/network/connection-editor/vpn-helpers.c:182
-#: panels/printers/pp-details-dialog.c:331
-#: panels/sharing/cc-sharing-panel.c:427
-#: panels/user-accounts/um-photo-dialog.c:231
+#: panels/printers/pp-details-dialog.c:314
+#: panels/sharing/cc-sharing-panel.c:428
+#: panels/user-accounts/cc-avatar-chooser.c:234
 msgid "_Open"
 msgstr "_Avaa"
 
@@ -2723,16 +3009,6 @@ msgstr "_SSID"
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: panels/network/connection-editor/wifi-page.ui:53
-#: panels/network/network-wifi.ui:562
-msgid "My Home Network"
-msgstr "Kotiverkko"
-
-#: panels/network/gnome-network-panel.desktop.in.in:3
-#: panels/network/network-mobile.ui:241
-msgid "Network"
-msgstr "Verkko"
-
 #: panels/network/gnome-network-panel.desktop.in.in:4
 msgid "Control how you connect to the Internet"
 msgstr "Hallitse internetyhteyden asetuksia"
@@ -2768,28 +3044,28 @@ msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;verkko;langaton;laajakaista;"
 "nimipalvelu;"
 
-#: panels/network/net-device-ethernet.c:107
-#: panels/network/net-device-wifi.c:553
+#: panels/network/net-device-ethernet.c:123
+#: panels/network/net-device-wifi.c:384
 msgid "never"
 msgstr "ei koskaan"
 
-#: panels/network/net-device-ethernet.c:117
-#: panels/network/net-device-wifi.c:563
+#: panels/network/net-device-ethernet.c:133
+#: panels/network/net-device-wifi.c:394
 msgid "today"
 msgstr "tänään"
 
-#: panels/network/net-device-ethernet.c:119
-#: panels/network/net-device-wifi.c:565
+#: panels/network/net-device-ethernet.c:135
+#: panels/network/net-device-wifi.c:396
 msgid "yesterday"
 msgstr "eilen"
 
-#: panels/network/net-device-ethernet.c:157
+#: 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:173 panels/network/network-wifi.ui:342
+#: panels/network/net-device-ethernet.c:189 panels/network/network-wifi.ui:342
 msgid "Last used"
 msgstr "Viimeksi käytetty"
 
@@ -2798,30 +3074,23 @@ msgstr "Viimeksi käytetty"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: panels/network/net-device-ethernet.c:276
+#: panels/network/net-device-ethernet.c:291
 #: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
 msgid "Wired"
 msgstr "Kiinteä"
 
-#: panels/network/net-device-ethernet.c:344
-#: panels/network/net-device-wifi.c:1895 panels/network/network-ethernet.ui:120
-#: panels/network/network-mobile.ui:394 panels/network/network-simple.ui:75
-#: panels/network/network-vpn.ui:79
-msgid "Options…"
-msgstr "Valinnat…"
-
-#: panels/network/net-device-mobile.c:238
+#: panels/network/net-device-mobile.c:236
 msgid "Add new connection"
 msgstr "Lisää uusi yhteys"
 
-#: panels/network/net-device-wifi.c:1368
+#: panels/network/net-device-wifi.c:1157
 #, 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:1372
+#: panels/network/net-device-wifi.c:1161
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2829,11 +3098,11 @@ msgstr ""
 "Yhteyspisteen ollessa käytössä langattoman internetyhteyden käyttö ei ole "
 "mahdollista."
 
-#: panels/network/net-device-wifi.c:1379
+#: panels/network/net-device-wifi.c:1168
 msgid "Turn On Wi-Fi Hotspot?"
 msgstr "Otetaanko wifi-yhteyspiste käyttöön?"
 
-#: panels/network/net-device-wifi.c:1401
+#: panels/network/net-device-wifi.c:1190
 msgid ""
 "Wi-Fi hotspots are usually used to share an additional Internet connection "
 "over Wi-Fi."
@@ -2841,43 +3110,43 @@ msgstr ""
 "Wifi-yhteyspisteitä käytetään yleensä Internet-yhteyden jakamiseen "
 "langattomasti."
 
-#: panels/network/net-device-wifi.c:1412
+#: panels/network/net-device-wifi.c:1201
 msgid "_Turn On"
 msgstr "_Ota käyttöön"
 
-#: panels/network/net-device-wifi.c:1489
+#: panels/network/net-device-wifi.c:1278
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Suljetaanko yhteyspiste ja katkaistaanko kaikkien käyttäjien yhteydet?"
 
-#: panels/network/net-device-wifi.c:1492
+#: panels/network/net-device-wifi.c:1281
 msgid "_Stop Hotspot"
 msgstr "_Sulje yhteyspiste"
 
-#: panels/network/net-device-wifi.c:1592
+#: panels/network/net-device-wifi.c:1337
 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:1595
+#: panels/network/net-device-wifi.c:1340
 msgid "Wireless device does not support Hotspot mode"
 msgstr "Langaton verkkolaite ei tue yhteyspisteeksi asettamista"
 
-#: panels/network/net-device-wifi.c:1733
+#: panels/network/net-device-wifi.c:1471
 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:1737 panels/network/network-wifi.ui:1362
+#: panels/network/net-device-wifi.c:1475 panels/network/network-wifi.ui:1350
 msgid "_Forget"
 msgstr "_Unohda"
 
-#: panels/network/net-device-wifi.c:2046 panels/network/net-device-wifi.c:2053
+#: panels/network/net-device-wifi.c:1638 panels/network/net-device-wifi.c:1645
 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:2086
+#: panels/network/net-device-wifi.c:1682
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Unohda"
@@ -2969,74 +3238,70 @@ msgstr "tiedot"
 #: 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/sharing.ui:357
-#: panels/user-accounts/data/account-dialog.ui:300
-#: panels/user-accounts/data/account-dialog.ui:525
-#: panels/user-accounts/data/user-accounts-dialog.ui:205
+#: panels/sharing/cc-sharing-panel.ui:357
+#: panels/user-accounts/cc-add-user-dialog.ui:309
+#: panels/user-accounts/cc-add-user-dialog.ui:546
+#: panels/user-accounts/cc-user-panel.ui:213
 msgid "_Password"
 msgstr "_Salasana"
 
-#: panels/network/network-wifi.ui:622
+#: panels/network/network-wifi.ui:621
 msgid "Show P_assword"
 msgstr "_Näytä salasana"
 
-#: panels/network/network-wifi.ui:652
+#: 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:680
+#: panels/network/network-wifi.ui:679
 msgid "identity"
 msgstr "identiteetti"
 
-#: panels/network/network-wifi.ui:714
+#: panels/network/network-wifi.ui:713
 msgid "IPv_4"
 msgstr "IPv_4"
 
-#: panels/network/network-wifi.ui:755 panels/network/network-wifi.ui:1032
+#: panels/network/network-wifi.ui:754 panels/network/network-wifi.ui:1031
 msgid "_Addresses"
 msgstr "_Osoitteet"
 
-#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
+#: 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:780 panels/network/network-wifi.ui:1057
+#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
 msgid "Link-local only"
 msgstr "Vain linkkiyhteys"
 
-#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
+#: 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:917 panels/network/network-wifi.ui:1194
+#: 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:960
+#: panels/network/network-wifi.ui:959
 msgid "ipv4"
 msgstr "ipv4"
 
-#: panels/network/network-wifi.ui:991
+#: panels/network/network-wifi.ui:990
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: panels/network/network-wifi.ui:1237
+#: panels/network/network-wifi.ui:1236
 msgid "ipv6"
 msgstr "ipv6"
 
-#: panels/network/network-wifi.ui:1277
+#: panels/network/network-wifi.ui:1276
 msgid "_Cloned MAC Address"
 msgstr "_Kloonattu MAC-osoite"
 
-#: panels/network/network-wifi.ui:1327
-msgid "hardware"
-msgstr "laitteisto"
-
-#: panels/network/network-wifi.ui:1346
+#: panels/network/network-wifi.ui:1334
 msgid "_Reset"
 msgstr "_Tyhjennä"
 
-#: panels/network/network-wifi.ui:1382
+#: panels/network/network-wifi.ui:1370
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
@@ -3044,7 +3309,7 @@ msgstr ""
 "Tyhjennä tämän yhteyden asetukset ja palauta oletusasetukset, mutta muista "
 "yhteys ensisijaisena."
 
-#: panels/network/network-wifi.ui:1399
+#: panels/network/network-wifi.ui:1387
 msgid ""
 "Remove all details relating to this network and do not try to automatically "
 "connect to it."
@@ -3052,57 +3317,53 @@ msgstr ""
 "Poista kaikki tähän verkkoon liittyvä tieto äläkä yritä yhdistää "
 "automaattisesti."
 
-#: panels/network/network-wifi.ui:1419
-msgid "reset"
-msgstr "tyhjennä"
-
-#: panels/network/network-wifi.ui:1472
+#: panels/network/network-wifi.ui:1449
 msgid "Hardware"
 msgstr "Laitteisto"
 
-#: panels/network/network-wifi.ui:1476
+#: panels/network/network-wifi.ui:1453
 msgctxt "tab"
 msgid "Reset"
 msgstr "Tyhjennä asetukset"
 
-#: panels/network/network-wifi.ui:1537
+#: panels/network/network-wifi.ui:1505
 msgid "Wi-Fi Hotspot"
 msgstr "Wifi-yhteyspiste"
 
-#: panels/network/network-wifi.ui:1554
+#: panels/network/network-wifi.ui:1523
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "Katkaise yhdistääksesi langattomaan verkkoon"
 
-#: panels/network/network-wifi.ui:1603
+#: panels/network/network-wifi.ui:1572
 msgid "Network Name"
 msgstr "Verkon nimi"
 
-#: panels/network/network-wifi.ui:1621
+#: panels/network/network-wifi.ui:1590
 msgid "Connected Devices"
 msgstr "Yhdistetyt laitteet"
 
-#: panels/network/network-wifi.ui:1639
+#: panels/network/network-wifi.ui:1608
 msgid "Security type"
 msgstr "Salauksen tyyppi"
 
-#: panels/network/network-wifi.ui:1702
+#: panels/network/network-wifi.ui:1671
 msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "Salasana"
 
-#: panels/network/network-wifi.ui:1799
+#: panels/network/network-wifi.ui:1768
 msgid "Turn Wi-Fi off"
 msgstr "Kytke wifi pois päältä"
 
-#: panels/network/network-wifi.ui:1831
+#: panels/network/network-wifi.ui:1800
 msgid "_Connect to Hidden Network…"
 msgstr "Y_hdistä piilotettuun verkkoon…"
 
-#: panels/network/network-wifi.ui:1841
+#: panels/network/network-wifi.ui:1810
 msgid "_Turn On Wi-Fi Hotspot…"
 msgstr "_Käynnistä wifi-yhteyspiste…"
 
-#: panels/network/network-wifi.ui:1851
+#: panels/network/network-wifi.ui:1820
 msgid "_Known Wi-Fi Networks"
 msgstr "_Tunnetut wifi-verkot"
 
@@ -3468,8 +3729,8 @@ 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/user-accounts/data/account-dialog.ui:142
-#: panels/user-accounts/data/account-dialog.ui:505
+#: panels/user-accounts/cc-add-user-dialog.ui:146
+#: panels/user-accounts/cc-add-user-dialog.ui:526
 msgid "_Username"
 msgstr "_Käyttäjätunnus"
 
@@ -3772,9 +4033,13 @@ msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "Näytä viestin sisältö _lukitusnäytöllä"
 
-#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
-msgid "Notifications"
-msgstr "Ilmoitukset"
+#: panels/notifications/cc-notifications-panel.ui:70
+msgid "Notification _Popups"
+msgstr "_Ponnahdusilmoitukset"
+
+#: panels/notifications/cc-notifications-panel.ui:121
+msgid "_Lock Screen Notifications"
+msgstr "_Lukitusnäytön ilmoitukset"
 
 #: panels/notifications/gnome-notifications-panel.desktop.in.in:4
 msgid "Control which notifications are displayed and what they show"
@@ -3791,40 +4056,26 @@ msgid "Notifications;Banner;Message;Tray;Popup;"
 msgstr ""
 "Notifications;Banner;Message;Tray;Popup;ilmoitus;ilmoitukset;banneri;viesti;"
 
-#: panels/notifications/notifications.ui:84
-msgid "Notification _Popups"
-msgstr "_Ponnahdusilmoitukset"
-
-#: panels/notifications/notifications.ui:134
-msgid "_Lock Screen Notifications"
-msgstr "_Lukitusnäytön ilmoitukset"
-
-#. List of applications.
-#: panels/notifications/notifications.ui:180 panels/privacy/privacy.ui:875
-#: panels/sound/gvc-mixer-dialog.c:1768
-msgid "Applications"
-msgstr "Sovellukset"
-
-#: panels/online-accounts/cc-online-accounts-panel.c:148
+#: panels/online-accounts/cc-online-accounts-panel.c:150
 msgctxt "Online Account"
 msgid "Other"
 msgstr "Muu"
 
 #. translators: This is the title of the "Show Account" dialog. The
 #. * %s is the name of the provider. e.g., 'Google'.
-#: panels/online-accounts/cc-online-accounts-panel.c:612
+#: panels/online-accounts/cc-online-accounts-panel.c:620
 #, c-format
 msgid "%s Account"
 msgstr "%s-tili"
 
-#: panels/online-accounts/cc-online-accounts-panel.c:904
+#: panels/online-accounts/cc-online-accounts-panel.c:917
 msgid "Error removing account"
 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:969
+#: panels/online-accounts/cc-online-accounts-panel.c:982
 #, c-format
 msgid "<b>%s</b> removed"
 msgstr "<b>%s</b> poistettu"
@@ -3860,19 +4111,19 @@ msgstr ""
 msgid "Undo"
 msgstr "Kumoa"
 
-#: panels/online-accounts/online-accounts.ui:125
+#: panels/online-accounts/online-accounts.ui:96
 msgid "Connect to your data in the cloud"
 msgstr "Muodosta yhteys pilvessä oleviin tietoihisi"
 
-#: panels/online-accounts/online-accounts.ui:137
+#: panels/online-accounts/online-accounts.ui:111
 msgid "No internet connection — connect to set up new online accounts"
 msgstr "Ei internetyhteyttä — muodosta yhteys määrittääksesi verkkotilisi"
 
-#: panels/online-accounts/online-accounts.ui:159
+#: panels/online-accounts/online-accounts.ui:136
 msgid "Add an account"
 msgstr "Lisää tili"
 
-#: panels/online-accounts/online-accounts.ui:264
+#: panels/online-accounts/online-accounts.ui:243
 msgid "Remove Account"
 msgstr "Poista tili"
 
@@ -3914,395 +4165,442 @@ msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: panels/power/cc-power-panel.c:307
+#: panels/power/cc-power-panel.c:306
 #, 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:314
+#: panels/power/cc-power-panel.c:313
 #, 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:319
+#: panels/power/cc-power-panel.c:318
 #, c-format
 msgid "%s remaining"
 msgstr "%s jäljellä"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:324 panels/power/cc-power-panel.c:351
+#: panels/power/cc-power-panel.c:323 panels/power/cc-power-panel.c:353
 msgid "Fully charged"
 msgstr "Ladattu täyteen"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:328 panels/power/cc-power-panel.c:355
+#: panels/power/cc-power-panel.c:327 panels/power/cc-power-panel.c:357
+msgid "Not charging"
+msgstr "Ei lataudu"
+
+#. TRANSLATORS: primary battery
+#: panels/power/cc-power-panel.c:331 panels/power/cc-power-panel.c:361
 msgid "Empty"
 msgstr "Tyhjä"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:342
+#: panels/power/cc-power-panel.c:344
 msgid "Charging"
 msgstr "Latautuu"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:347
+#: panels/power/cc-power-panel.c:349
 msgid "Discharging"
 msgstr "Purkautuu"
 
-#: panels/power/cc-power-panel.c:465
+#: panels/power/cc-power-panel.c:479
 msgctxt "Battery name"
 msgid "Main"
 msgstr "Pääakku"
 
-#: panels/power/cc-power-panel.c:467
+#: panels/power/cc-power-panel.c:481
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "Lisäakku"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:535
+#: panels/power/cc-power-panel.c:559
 msgid "Wireless mouse"
 msgstr "Langaton hiiri"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:538
+#: panels/power/cc-power-panel.c:562
 msgid "Wireless keyboard"
 msgstr "Langaton näppäimistö"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:541
+#: panels/power/cc-power-panel.c:565
 msgid "Uninterruptible power supply"
 msgstr "Keskeytymätön virransyöttö"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:544
+#: panels/power/cc-power-panel.c:568
 msgid "Personal digital assistant"
 msgstr "Henkilökohtainen digitaalinen avustaja (PDA)"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:547
+#: panels/power/cc-power-panel.c:571
 msgid "Cellphone"
 msgstr "Matkapuhelin"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:550
+#: panels/power/cc-power-panel.c:574
 msgid "Media player"
 msgstr "Mediasoitin"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:553 panels/wacom/cc-wacom-panel.c:830
+#: panels/power/cc-power-panel.c:577 panels/wacom/cc-wacom-panel.c:828
 msgid "Tablet"
 msgstr "Piirtopöytä"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:556
+#: panels/power/cc-power-panel.c:580
 msgid "Computer"
 msgstr "Tietokone"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:559
+#: panels/power/cc-power-panel.c:583
 msgid "Gaming input device"
 msgstr "Pelaamiseen tarkoitettu syötelaite"
 
 #. TRANSLATORS: secondary battery, misc
-#: panels/power/cc-power-panel.c:562 panels/power/cc-power-panel.c:814
-#: panels/power/cc-power-panel.c:2400
+#: panels/power/cc-power-panel.c:586 panels/power/cc-power-panel.c:847
+#: panels/power/cc-power-panel.c:2481
 msgid "Battery"
 msgstr "Akku"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:622
+#: panels/power/cc-power-panel.c:646
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Latautuu"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:629
+#: panels/power/cc-power-panel.c:653
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Varoitus"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:634
+#: panels/power/cc-power-panel.c:658
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Matala"
 
 #. TRANSLATORS: secondary battery
-#: panels/power/cc-power-panel.c:639
+#: panels/power/cc-power-panel.c:663
 msgctxt "Battery power"
 msgid "Good"
 msgstr "Hyvä"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:644
+#: panels/power/cc-power-panel.c:668
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "Täyteen ladattu"
 
 #. TRANSLATORS: primary battery
-#: panels/power/cc-power-panel.c:648
+#: panels/power/cc-power-panel.c:672
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "Tyhjä"
 
-#: panels/power/cc-power-panel.c:812
+#: panels/power/cc-power-panel.c:845
 msgid "Batteries"
 msgstr "Akut"
 
-#: panels/power/cc-power-panel.c:1172
+#: panels/power/cc-power-panel.c:1206
 #, c-format
-#| msgid "%i hour"
-#| msgid_plural "%i hours"
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
-#: panels/power/cc-power-panel.c:1174
+#: panels/power/cc-power-panel.c:1208
 #, c-format
-#| msgid "%i minute"
-#| msgid_plural "%i minutes"
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutti"
 msgstr[1] "%d minuuttia"
 
-#: panels/power/cc-power-panel.c:1177
+#: panels/power/cc-power-panel.c:1211
 #, c-format
-#| msgid "30 seconds"
 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:1182
+#: panels/power/cc-power-panel.c:1216
 #, c-format
-#| msgid "%i %s %i %s"
 msgctxt "time"
 msgid "%s %s %s"
 msgstr "%s %s %s"
 
 #. 2 minutes 12 seconds
-#: panels/power/cc-power-panel.c:1185
+#: panels/power/cc-power-panel.c:1219
 #, c-format
-#| msgid "%i %s %i %s"
 msgctxt "time"
 msgid "%s %s"
 msgstr "%s %s"
 
 #. 0 seconds
-#: panels/power/cc-power-panel.c:1191
+#: panels/power/cc-power-panel.c:1225
 msgid "0 seconds"
 msgstr "0 sekuntia"
 
-#: panels/power/cc-power-panel.c:1286
+#: panels/power/cc-power-panel.c:1322
 msgid "When _idle"
 msgstr "Kun _käyttämättä"
 
-#: panels/power/cc-power-panel.c:1736
+#: panels/power/cc-power-panel.c:1779
 msgid "Power Saving"
 msgstr "Virransäästö"
 
-#: panels/power/cc-power-panel.c:1766
+#: panels/power/cc-power-panel.c:1811
 msgid "_Screen brightness"
 msgstr "_Näytön kirkkaus"
 
-#: panels/power/cc-power-panel.c:1785
+#: panels/power/cc-power-panel.c:1833
 msgid "Automatic brightness"
 msgstr "Automaattinen kirkkaus"
 
-#: panels/power/cc-power-panel.c:1805
+#: panels/power/cc-power-panel.c:1855
 msgid "_Keyboard brightness"
 msgstr "Näppäimistön _kirkkaus"
 
-#: panels/power/cc-power-panel.c:1815
+#: panels/power/cc-power-panel.c:1868
 msgid "_Dim screen when inactive"
 msgstr "_Himmennä näyttö koneen ollessa käyttämättä"
 
-#: panels/power/cc-power-panel.c:1840
+#: panels/power/cc-power-panel.c:1897
 msgid "_Blank screen"
 msgstr "_Tyhjä näyttö"
 
-#: panels/power/cc-power-panel.c:1877
+#: panels/power/cc-power-panel.c:1939
 msgid "_Wi-Fi"
 msgstr "_Wifi"
 
-#: panels/power/cc-power-panel.c:1882
+#: panels/power/cc-power-panel.c:1945
 msgid "Wi-Fi can be turned off to save power."
 msgstr "Wifi voidaan sammuttaa virran säästämiseksi."
 
-#: panels/power/cc-power-panel.c:1907
+#: panels/power/cc-power-panel.c:1975
 msgid "_Mobile broadband"
 msgstr "_Mobiililaajakaista"
 
-#: panels/power/cc-power-panel.c:1912
+#: panels/power/cc-power-panel.c:1981
 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:1971
+#: panels/power/cc-power-panel.c:2045
 msgid "_Bluetooth"
 msgstr "_Bluetooth"
 
-#: panels/power/cc-power-panel.c:1976
+#: panels/power/cc-power-panel.c:2051
 msgid "Bluetooth can be turned off to save power."
 msgstr "Bluetooth voidaan sammuttaa virran säästämiseksi."
 
-#: panels/power/cc-power-panel.c:2034
+#: panels/power/cc-power-panel.c:2107
 msgid "When on battery power"
 msgstr "Käytettäessä akkua"
 
-#: panels/power/cc-power-panel.c:2036
+#: panels/power/cc-power-panel.c:2109
 msgid "When plugged in"
 msgstr "Käytettäessä verkkovirtaa"
 
-#: panels/power/cc-power-panel.c:2130
+#: panels/power/cc-power-panel.c:2203
 msgid "Suspend"
 msgstr "Valmiustila"
 
-#: panels/power/cc-power-panel.c:2131
+#: panels/power/cc-power-panel.c:2204
 msgid "Power Off"
 msgstr "Virta pois päältä"
 
-#: panels/power/cc-power-panel.c:2132
+#: panels/power/cc-power-panel.c:2205
 msgid "Hibernate"
 msgstr "Lepotila"
 
-#: panels/power/cc-power-panel.c:2133
+#: panels/power/cc-power-panel.c:2206
 msgid "Nothing"
 msgstr "Ei mitään"
 
 #. Frame header
-#: panels/power/cc-power-panel.c:2233
+#: panels/power/cc-power-panel.c:2306
 msgid "Suspend & Power Button"
 msgstr "Valmiustila ja virran katkaisu"
 
-#: panels/power/cc-power-panel.c:2271
+#: panels/power/cc-power-panel.c:2348
 msgid "_Automatic suspend"
 msgstr "_Automaattinen valmiustila"
 
-#: panels/power/cc-power-panel.c:2272
+#: panels/power/cc-power-panel.c:2350
 msgid "Automatic suspend"
 msgstr "Automaattinen valmiustila"
 
-#: panels/power/cc-power-panel.c:2335
+#: panels/power/cc-power-panel.c:2416
 msgid "_When the Power Button is pressed"
 msgstr "_Kun virtapainiketta painetaan"
 
-#: panels/power/cc-power-panel.c:2445 panels/thunderbolt/cc-bolt-panel.ui:466
-#: panels/thunderbolt/cc-bolt-panel.ui:525 shell/cc-panel-list.ui:45
-#: shell/cc-window.c:272
-msgid "Devices"
-msgstr "Laitteet"
-
-#: panels/power/gnome-power-panel.desktop.in.in:3
-msgid "Power"
-msgstr "Virransäästö"
-
-#: panels/power/gnome-power-panel.desktop.in.in:4
-msgid "View your battery status and change power saving settings"
-msgstr "Tarkkaile akkusi tilaa ja muuta virransäästöasetuksia"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/power/gnome-power-panel.desktop.in.in:7
-msgid "gnome-power-manager"
-msgstr "gnome-power-manager"
-
-#. Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: panels/power/gnome-power-panel.desktop.in.in:19
-msgid ""
-"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-msgstr ""
-"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
-"virta;uni;valmiustila;lepotila;akku;kirkkaus;himmennys;tyhjä;näyttö;jouten;"
-"virransäästö;"
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:13
+msgctxt "automatic_suspend"
+msgid "15 minutes"
+msgstr "15 minuuttia"
 
-#: panels/power/power.ui:17
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:17
+msgctxt "automatic_suspend"
 msgid "20 minutes"
 msgstr "20 minuuttia"
 
-#: panels/power/power.ui:21
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:21
+msgctxt "automatic_suspend"
 msgid "25 minutes"
 msgstr "25 minuuttia"
 
-#: panels/power/power.ui:29
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:25
+msgctxt "automatic_suspend"
+msgid "30 minutes"
+msgstr "30 minuuttia"
+
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:29
+msgctxt "automatic_suspend"
 msgid "45 minutes"
 msgstr "45 minuuttia"
 
-#: panels/power/power.ui:33 panels/privacy/privacy.ui:42
-#: panels/privacy/privacy.ui:56
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:33
+msgctxt "automatic_suspend"
 msgid "1 hour"
 msgstr "1 tunti"
 
-#: panels/power/power.ui:37
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:37
+msgctxt "automatic_suspend"
 msgid "80 minutes"
 msgstr "80 minuuttia"
 
-#: panels/power/power.ui:41
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:41
+msgctxt "automatic_suspend"
 msgid "90 minutes"
 msgstr "90 minuuttia"
 
-#: panels/power/power.ui:45
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:45
+msgctxt "automatic_suspend"
 msgid "100 minutes"
 msgstr "100 minuuttia"
 
-#: panels/power/power.ui:49
+#. Translators: Option for "Delay" in "Automatic suspend" dialog.
+#: panels/power/cc-power-panel.ui:49
+msgctxt "automatic_suspend"
 msgid "2 hours"
 msgstr "2 tuntia"
 
-#: panels/power/power.ui:63 panels/privacy/privacy.ui:22
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:63
+msgctxt "blank_screen"
 msgid "1 minute"
 msgstr "1 minuutti"
 
-#: panels/power/power.ui:67 panels/privacy/privacy.ui:26
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:67
+msgctxt "blank_screen"
 msgid "2 minutes"
 msgstr "2 minuuttia"
 
-#: panels/power/power.ui:71 panels/privacy/privacy.ui:30
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:71
+msgctxt "blank_screen"
 msgid "3 minutes"
 msgstr "3 minuuttia"
 
-#: panels/power/power.ui:75
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:75
+msgctxt "blank_screen"
 msgid "4 minutes"
 msgstr "4 minuuttia"
 
-#: panels/power/power.ui:79 panels/privacy/privacy.ui:34
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:79
+msgctxt "blank_screen"
 msgid "5 minutes"
 msgstr "5 minuuttia"
 
-#: panels/power/power.ui:83
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:83
+msgctxt "blank_screen"
 msgid "8 minutes"
 msgstr "8 minuuttia"
 
-#: panels/power/power.ui:87
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:87
+msgctxt "blank_screen"
 msgid "10 minutes"
 msgstr "10 minuuttia"
 
-#: panels/power/power.ui:91
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:91
+msgctxt "blank_screen"
 msgid "12 minutes"
 msgstr "12 minuuttia"
 
-#: panels/power/power.ui:167
-msgid "Automatic Suspend"
-msgstr "Automaattinen valmiustila"
+#. Translators: Option for "Blank screen" in "Power" panel.
+#: panels/power/cc-power-panel.ui:95
+msgctxt "blank_screen"
+msgid "15 minutes"
+msgstr "15 minuuttia"
 
-#: panels/power/power.ui:192
-msgid "_Plugged In"
+#. 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:167
+msgid "Automatic Suspend"
+msgstr "Automaattinen valmiustila"
+
+#: panels/power/cc-power-panel.ui:192
+msgid "_Plugged In"
 msgstr "Käytettäessä _verkkovirtaa"
 
-#: panels/power/power.ui:208
+#: panels/power/cc-power-panel.ui:208
 msgid "On _Battery Power"
 msgstr "Käytettäessä _akkua"
 
-#: panels/power/power.ui:253 panels/power/power.ui:313
-#: panels/universal-access/uap.ui:1507
+#: panels/power/cc-power-panel.ui:253 panels/power/cc-power-panel.ui:313
+#: panels/universal-access/cc-ua-panel.ui:1507
 msgid "Delay"
 msgstr "Viive"
 
+#: panels/power/gnome-power-panel.desktop.in.in:3
+msgid "Power"
+msgstr "Virransäästö"
+
+#: panels/power/gnome-power-panel.desktop.in.in:4
+msgid "View your battery status and change power saving settings"
+msgstr "Tarkkaile akkusi tilaa ja muuta virransäästöasetuksia"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/power/gnome-power-panel.desktop.in.in:7
+msgid "gnome-power-manager"
+msgstr "gnome-power-manager"
+
+#. Translators: Search terms to find the Power panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/power/gnome-power-panel.desktop.in.in:19
+msgid ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+msgstr ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+"virta;uni;valmiustila;lepotila;akku;kirkkaus;himmennys;tyhjä;näyttö;jouten;"
+"virransäästö;"
+
 #: panels/printers/authentication-dialog.ui:11
 msgid " "
 msgstr " "
@@ -4320,7 +4618,7 @@ 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/data/account-dialog.ui:240
+#: panels/user-accounts/cc-add-user-dialog.ui:248
 msgid "Password"
 msgstr "Salasana"
 
@@ -4330,45 +4628,45 @@ msgid "Authentication Required"
 msgstr "Tunnistautuminen vaaditaan"
 
 #. Translators: %s is the printer name
-#: panels/printers/cc-printers-panel.c:809
+#: panels/printers/cc-printers-panel.c:715
 #, c-format
 msgid "Printer “%s” has been deleted"
 msgstr "Tulostin “%s” on poistettu"
 
 #. Translators: Addition of the new printer failed.
-#: panels/printers/cc-printers-panel.c:1057
+#: panels/printers/cc-printers-panel.c:938
 msgid "Failed to add new printer."
 msgstr "Uuden tulostimen lisäys epäonnistui."
 
 #. Translators: The XML file containing user interface can not be loaded
-#: panels/printers/cc-printers-panel.c:1394
+#: panels/printers/cc-printers-panel.c:1242
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Käyttöliittymätiedoston lataus epäonnistui: %s"
 
-#: panels/printers/details-dialog.ui:63 panels/printers/printer-entry.ui:223
+#: 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:111
+#: panels/printers/details-dialog.ui:114
 #: panels/printers/pp-ppd-selection-dialog.c:250
 msgid "Driver"
 msgstr "Ajuri"
 
-#: panels/printers/details-dialog.ui:147
+#: panels/printers/details-dialog.ui:152
 msgid "Searching for preferred drivers…"
 msgstr "Etsitään ensisijaisia ajureita…"
 
-#: panels/printers/details-dialog.ui:169
+#: panels/printers/details-dialog.ui:174
 msgid "Search for Drivers"
 msgstr "Etsi ajureita"
 
-#: panels/printers/details-dialog.ui:177
+#: panels/printers/details-dialog.ui:182
 msgid "Select from Database…"
 msgstr "Valitse tietokannasta…"
 
-#: panels/printers/details-dialog.ui:185
+#: panels/printers/details-dialog.ui:190
 msgid "Install PPD File…"
 msgstr "Asenna PPD-tiedosto…"
 
@@ -4419,8 +4717,8 @@ msgstr "Ei aktiivisia tulostustöitä"
 
 #. Translators: This is the title presented at top of the dialog.
 #: panels/printers/new-printer-dialog.ui:29
-#: panels/printers/pp-new-printer-dialog.c:384
-#: panels/printers/pp-new-printer-dialog.c:456
+#: panels/printers/pp-new-printer-dialog.c:363
+#: panels/printers/pp-new-printer-dialog.c:427
 msgid "Add Printer"
 msgstr "Lisää tulostin"
 
@@ -4449,26 +4747,26 @@ msgstr ""
 
 #. 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:893
+#: panels/printers/options-dialog.ui:22 panels/printers/pp-options-dialog.c:895
 msgid "Test Page"
 msgstr "Testisivu"
 
 #. Translators: This is the title of the dialog. %s is the printer name.
-#: panels/printers/pp-details-dialog.c:134
-#: panels/printers/pp-details-dialog.c:434
+#: panels/printers/pp-details-dialog.c:133
+#: panels/printers/pp-details-dialog.c:417
 #, c-format
 msgid "%s Details"
 msgstr "Tulostimen %s tiedot"
 
-#: panels/printers/pp-details-dialog.c:183
+#: panels/printers/pp-details-dialog.c:180
 msgid "No suitable driver found"
 msgstr "Soveltuvaa ajuria ei löytynyt"
 
-#: panels/printers/pp-details-dialog.c:327
+#: panels/printers/pp-details-dialog.c:310
 msgid "Select PPD File"
 msgstr "Valitse PPD-tiedosto"
 
-#: panels/printers/pp-details-dialog.c:336
+#: panels/printers/pp-details-dialog.c:319
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -4481,7 +4779,7 @@ msgid "Select Printer Driver"
 msgstr "Valitse tulostinajuri"
 
 #: panels/printers/ppd-selection-dialog.ui:40
-#: panels/user-accounts/um-photo-dialog.c:105
+#: panels/user-accounts/cc-avatar-chooser.c:107
 msgid "Select"
 msgstr "Valitse"
 
@@ -4490,50 +4788,50 @@ msgid "Loading drivers database…"
 msgstr "Ladataan ajuritietokantaa…"
 
 #. Translators: The found device is a JetDirect printer
-#: panels/printers/pp-host.c:539
+#: panels/printers/pp-host.c:472
 msgid "JetDirect Printer"
 msgstr "JetDirect-tulostin"
 
 #. Translators: The found device is a Line Printer Daemon printer
-#: panels/printers/pp-host.c:795
+#: panels/printers/pp-host.c:707
 msgid "LPD Printer"
 msgstr "LPD-tulostin"
 
 #. Translators: this is an option of "Two Sided"
-#: panels/printers/pp-ipp-option-widget.c:66
-#: panels/printers/pp-ppd-option-widget.c:70
+#: panels/printers/pp-ipp-option-widget.c:65
+#: panels/printers/pp-ppd-option-widget.c:69
 msgid "One Sided"
 msgstr "Yksipuoleinen"
 
 #. Translators: this is an option of "Two Sided"
-#: panels/printers/pp-ipp-option-widget.c:68
-#: panels/printers/pp-ppd-option-widget.c:72
+#: panels/printers/pp-ipp-option-widget.c:67
+#: panels/printers/pp-ppd-option-widget.c:71
 msgid "Long Edge (Standard)"
 msgstr "PItkä reuna"
 
 #. Translators: this is an option of "Two Sided"
-#: panels/printers/pp-ipp-option-widget.c:70
-#: panels/printers/pp-ppd-option-widget.c:74
+#: panels/printers/pp-ipp-option-widget.c:69
+#: panels/printers/pp-ppd-option-widget.c:73
 msgid "Short Edge (Flip)"
 msgstr "Lyhyt reuna"
 
 #. Translators: this is an option of "Orientation"
-#: panels/printers/pp-ipp-option-widget.c:72
+#: panels/printers/pp-ipp-option-widget.c:71
 msgid "Portrait"
 msgstr "Pysty"
 
 #. Translators: this is an option of "Orientation"
-#: panels/printers/pp-ipp-option-widget.c:74
+#: panels/printers/pp-ipp-option-widget.c:73
 msgid "Landscape"
 msgstr "Vaaka"
 
 #. Translators: this is an option of "Orientation"
-#: panels/printers/pp-ipp-option-widget.c:76
+#: panels/printers/pp-ipp-option-widget.c:75
 msgid "Reverse landscape"
 msgstr "Käänteinen vaaka"
 
 #. Translators: this is an option of "Orientation"
-#: panels/printers/pp-ipp-option-widget.c:78
+#: panels/printers/pp-ipp-option-widget.c:77
 msgid "Reverse portrait"
 msgstr "Käänteinen pysty"
 
@@ -4594,69 +4892,69 @@ msgstr[0] "%u työ vaatii tunnistautumisen"
 msgstr[1] "%u työtä vaatii tunnistautumisen"
 
 #. Translators: This is the printer name for which we are showing the active jobs
-#: panels/printers/pp-jobs-dialog.c:617
+#: panels/printers/pp-jobs-dialog.c:613
 #, c-format
 msgctxt "Printer jobs dialog title"
 msgid "%s — Active Jobs"
 msgstr "%s — Aktiiviset työt"
 
 #. Translators: The printer needs authentication info to print.
-#: panels/printers/pp-jobs-dialog.c:622
+#: panels/printers/pp-jobs-dialog.c:617
 #, c-format
 msgid "Enter credentials to print from %s."
 msgstr "Syötä kirjautumistietosi tulostaaksesi tulostimesta %s."
 
-#: panels/printers/pp-new-printer-dialog.c:402
+#: panels/printers/pp-new-printer-dialog.c:380
 msgid "Unlock Print Server"
 msgstr "Avaa tulostuspalvelimen lukitus"
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: panels/printers/pp-new-printer-dialog.c:406
+#: panels/printers/pp-new-printer-dialog.c:384
 #, c-format
 msgid "Unlock %s."
 msgstr "Avaa kohteen %s lukitus."
 
 #. Translators: Samba server needs authentication of the user to show list of its printers.
-#: panels/printers/pp-new-printer-dialog.c:411
+#: panels/printers/pp-new-printer-dialog.c:388
 #, c-format
 msgid "Enter username and password to view printers on %s."
 msgstr ""
 "Syötä käyttäjätunnus ja salasana nähdäksesi palvelimella %s olevat "
 "tulostimet."
 
-#: panels/printers/pp-new-printer-dialog.c:894
+#: panels/printers/pp-new-printer-dialog.c:838
 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:1814
+#: panels/printers/pp-new-printer-dialog.c:1680
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: panels/printers/pp-new-printer-dialog.c:1819
+#: panels/printers/pp-new-printer-dialog.c:1685
 msgid "Serial Port"
 msgstr "Sarjaportti"
 
 #. Translators: The found device is a printer connected via parallel port
-#: panels/printers/pp-new-printer-dialog.c:1826
+#: panels/printers/pp-new-printer-dialog.c:1692
 msgid "Parallel Port"
 msgstr "Rinnakkaisportti"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: panels/printers/pp-new-printer-dialog.c:1868
+#: panels/printers/pp-new-printer-dialog.c:1734
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. Translators: Network address of found printer
-#: panels/printers/pp-new-printer-dialog.c:1873
+#: panels/printers/pp-new-printer-dialog.c:1739
 #, 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:1902
+#: panels/printers/pp-new-printer-dialog.c:1766
 msgid "Server requires authentication"
 msgstr "Palvelin vaatii tunnistautumisen"
 
@@ -4676,64 +4974,73 @@ msgstr "Paperin lähde"
 msgid "Output Tray"
 msgstr "Ulostulo"
 
+#: panels/printers/pp-options-dialog.c:87
+msgid "Resolution"
+msgstr "Tarkkuus"
+
 #: panels/printers/pp-options-dialog.c:88
 msgid "GhostScript pre-filtering"
 msgstr "GhostScriptin esisuodatus"
 
 #. Translators: This option sets number of pages printed on one sheet
-#: panels/printers/pp-options-dialog.c:534
+#: panels/printers/pp-options-dialog.c:536
 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:546
+#: panels/printers/pp-options-dialog.c:548
 msgid "Two-sided"
 msgstr "Kaksipuoleinen"
 
+#. Translators: This option sets orientation of print (portrait, landscape...)
+#: panels/printers/pp-options-dialog.c:560
+msgid "Orientation"
+msgstr "Suunta"
+
 #. Translators: "General" tab contains general printer options
-#: panels/printers/pp-options-dialog.c:655
+#: panels/printers/pp-options-dialog.c:657
 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:658
+#: panels/printers/pp-options-dialog.c:660
 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:661
+#: panels/printers/pp-options-dialog.c:663
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "Asennettavat valinnat"
 
 #. Translators: "Job" tab contains settings for jobs
-#: panels/printers/pp-options-dialog.c:664
+#: panels/printers/pp-options-dialog.c:666
 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:667
+#: panels/printers/pp-options-dialog.c:669
 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:670
+#: panels/printers/pp-options-dialog.c:672
 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:673
+#: panels/printers/pp-options-dialog.c:675
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "Viimeistely"
 
 #. Translators: "Advanced" tab contains all others settings
-#: panels/printers/pp-options-dialog.c:676
+#: panels/printers/pp-options-dialog.c:678
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "Lisäasetukset"
@@ -4744,38 +5051,38 @@ msgid "Test page"
 msgstr "Testisivu"
 
 #. Translators: this is an option of "Paper Source"
-#: panels/printers/pp-ppd-option-widget.c:76
-#: panels/printers/pp-ppd-option-widget.c:78
-#: panels/printers/pp-ppd-option-widget.c:86
+#: panels/printers/pp-ppd-option-widget.c:75
+#: panels/printers/pp-ppd-option-widget.c:77
+#: panels/printers/pp-ppd-option-widget.c:85
 msgid "Auto Select"
 msgstr "Valitse automaattisesti"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
-#: panels/printers/pp-ppd-option-widget.c:80
-#: panels/printers/pp-ppd-option-widget.c:82
-#: panels/printers/pp-ppd-option-widget.c:84
-#: panels/printers/pp-ppd-option-widget.c:88
+#: panels/printers/pp-ppd-option-widget.c:79
+#: panels/printers/pp-ppd-option-widget.c:81
+#: panels/printers/pp-ppd-option-widget.c:83
+#: panels/printers/pp-ppd-option-widget.c:87
 msgid "Printer Default"
 msgstr "Tulostimen oletus"
 
 #. Translators: this is an option of "GhostScript"
-#: panels/printers/pp-ppd-option-widget.c:90
+#: panels/printers/pp-ppd-option-widget.c:89
 msgid "Embed GhostScript fonts only"
 msgstr "Upota vain GhostScript-fontit"
 
 #. Translators: this is an option of "GhostScript"
-#: panels/printers/pp-ppd-option-widget.c:92
+#: panels/printers/pp-ppd-option-widget.c:91
 msgid "Convert to PS level 1"
 msgstr "Muunna PS 1 -tasolle"
 
 #. Translators: this is an option of "GhostScript"
-#: panels/printers/pp-ppd-option-widget.c:94
+#: panels/printers/pp-ppd-option-widget.c:93
 msgid "Convert to PS level 2"
 msgstr "Muunna PS 2 -tasolle"
 
 #. Translators: this is an option of "GhostScript"
-#: panels/printers/pp-ppd-option-widget.c:96
+#: panels/printers/pp-ppd-option-widget.c:95
 msgid "No pre-filtering"
 msgstr "Ei esisuodatusta"
 
@@ -4785,12 +5092,12 @@ msgid "Manufacturer"
 msgstr "Valmistaja"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: panels/printers/pp-printer-entry.c:615 panels/printers/printer-entry.ui:166
+#: panels/printers/pp-printer-entry.c:606 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:620
+#: panels/printers/pp-printer-entry.c:611
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
@@ -4798,111 +5105,111 @@ msgstr[0] "%u työ"
 msgstr[1] "%u työtä"
 
 #. Translators: The printer is low on toner
-#: panels/printers/pp-printer-entry.c:780
+#: panels/printers/pp-printer-entry.c:766
 msgid "Low on toner"
 msgstr "Muste on vähissä"
 
 #. Translators: The printer has no toner left
-#: panels/printers/pp-printer-entry.c:782
+#: panels/printers/pp-printer-entry.c:768
 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:785
+#: panels/printers/pp-printer-entry.c:771
 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:788
+#: panels/printers/pp-printer-entry.c:774
 msgid "Out of developer"
 msgstr "Kehite on loppu"
 
 #. Translators: "marker" is one color bin of the printer
-#: panels/printers/pp-printer-entry.c:790
+#: panels/printers/pp-printer-entry.c:776
 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:792
+#: panels/printers/pp-printer-entry.c:778
 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:794
+#: panels/printers/pp-printer-entry.c:780
 msgid "Open cover"
 msgstr "Avaa kansi"
 
 #. Translators: One or more doors on the printer are open
-#: panels/printers/pp-printer-entry.c:796
+#: panels/printers/pp-printer-entry.c:782
 msgid "Open door"
 msgstr "Avaa ovi"
 
 #. Translators: At least one input tray is low on media
-#: panels/printers/pp-printer-entry.c:798
+#: panels/printers/pp-printer-entry.c:784
 msgid "Low on paper"
 msgstr "Paperi vähissä"
 
 #. Translators: At least one input tray is empty
-#: panels/printers/pp-printer-entry.c:800
+#: panels/printers/pp-printer-entry.c:786
 msgid "Out of paper"
 msgstr "Paperi on loppu"
 
 #. Translators: The printer is offline
-#: panels/printers/pp-printer-entry.c:802
+#: panels/printers/pp-printer-entry.c:788
 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:804
-#: panels/printers/pp-printer-entry.c:932
+#: panels/printers/pp-printer-entry.c:790
+#: panels/printers/pp-printer-entry.c:918
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "Pysäytetty"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: panels/printers/pp-printer-entry.c:806
+#: panels/printers/pp-printer-entry.c:792
 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:808
+#: panels/printers/pp-printer-entry.c:794
 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:810
+#: panels/printers/pp-printer-entry.c:796
 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:812
+#: panels/printers/pp-printer-entry.c:798
 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:918
+#: panels/printers/pp-printer-entry.c:904
 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:923
+#: panels/printers/pp-printer-entry.c:909
 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:928
+#: panels/printers/pp-printer-entry.c:914
 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:952
+#: panels/printers/pp-printer-entry.c:938
 msgid "Clean print heads"
 msgstr "Puhdista tulostuspäät"
 
@@ -4969,70 +5276,90 @@ msgstr ""
 "Valitettavasti tulostuspalvelu\n"
 "ei vaikuta olevan käytettävissä."
 
-#: panels/privacy/cc-privacy-panel.c:390 panels/privacy/privacy.ui:280
+#: panels/privacy/cc-privacy-panel.c:409 panels/privacy/cc-privacy-panel.ui:280
 msgid "Screen Lock"
 msgstr "Näytön lukitus"
 
-#: panels/privacy/cc-privacy-panel.c:440
+#: panels/privacy/cc-privacy-panel.c:453
 msgid "In use"
 msgstr "Käytössä"
 
-#: panels/privacy/cc-privacy-panel.c:445
+#: panels/privacy/cc-privacy-panel.c:458
 msgctxt "Location services status"
 msgid "On"
 msgstr "Päällä"
 
-#: panels/privacy/cc-privacy-panel.c:446
+#: panels/privacy/cc-privacy-panel.c:459
 msgctxt "Location services status"
 msgid "Off"
 msgstr "Pois"
 
-#: panels/privacy/cc-privacy-panel.c:821 panels/privacy/privacy.ui:745
-msgid "Location Services"
-msgstr "Sijaintipalvelut"
+#: panels/privacy/cc-privacy-panel.c:881
+msgctxt "Camera status"
+msgid "Off"
+msgstr "Pois"
+
+#: panels/privacy/cc-privacy-panel.c:883
+msgctxt "Camera status"
+msgid "On"
+msgstr "Päällä"
+
+#: panels/privacy/cc-privacy-panel.c:914
+msgctxt "Microphone status"
+msgid "Off"
+msgstr "Pois"
+
+#: panels/privacy/cc-privacy-panel.c:916
+msgctxt "Microphone status"
+msgid "On"
+msgstr "Päällä"
 
-#: panels/privacy/cc-privacy-panel.c:942 panels/privacy/privacy.ui:127
+#: panels/privacy/cc-privacy-panel.c:1022
+#: panels/privacy/cc-privacy-panel.ui:127
 msgid "Usage & History"
 msgstr "Käyttö ja historia"
 
-#: panels/privacy/cc-privacy-panel.c:1071
+#: panels/privacy/cc-privacy-panel.c:1143
 msgid "Empty all items from Trash?"
 msgstr "Tyhjennetäänkö roskakorin koko sisältö?"
 
-#: panels/privacy/cc-privacy-panel.c:1072
+#: panels/privacy/cc-privacy-panel.c:1144
 msgid "All items in the Trash will be permanently deleted."
 msgstr "Kaikki roskakorissa olevat kohteet poistetaan pysyvästi."
 
-#: panels/privacy/cc-privacy-panel.c:1073
+#: panels/privacy/cc-privacy-panel.c:1145
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: panels/privacy/cc-privacy-panel.c:1096
+#: panels/privacy/cc-privacy-panel.c:1166
 msgid "Delete all the temporary files?"
 msgstr "Poistetaanko kaikki väliaikaiset tiedostot?"
 
-#: panels/privacy/cc-privacy-panel.c:1097
+#: panels/privacy/cc-privacy-panel.c:1167
 msgid "All the temporary files will be permanently deleted."
 msgstr "Kaikki väliaikaiset tiedostot poistetaan pysyvästi."
 
-#: panels/privacy/cc-privacy-panel.c:1098
+#: panels/privacy/cc-privacy-panel.c:1168
 msgid "_Purge Temporary Files"
 msgstr "Tu_hoa väliaikaistiedostot"
 
-#: panels/privacy/cc-privacy-panel.c:1120 panels/privacy/privacy.ui:432
+#: panels/privacy/cc-privacy-panel.c:1190
+#: 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:1160 panels/privacy/privacy.ui:637
+#: panels/privacy/cc-privacy-panel.c:1223
+#: panels/privacy/cc-privacy-panel.ui:637
 msgid "Software Usage"
 msgstr "Ohjelmistojen käyttö"
 
-#: panels/privacy/cc-privacy-panel.c:1201 panels/privacy/privacy.ui:959
+#: panels/privacy/cc-privacy-panel.c:1262
+#: 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:1215
+#: panels/privacy/cc-privacy-panel.c:1274
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -5041,84 +5368,144 @@ 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:1227 panels/privacy/privacy.ui:719
+#: panels/privacy/cc-privacy-panel.c:1286
+#: panels/privacy/cc-privacy-panel.ui:719
 msgid "Privacy Policy"
 msgstr "Tietosuoja"
 
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
-msgid "Privacy"
-msgstr "Yksityisyys"
-
-#: 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ä"
-
-#. FIXME
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/privacy/gnome-privacy-panel.desktop.in.in:8
-msgid "preferences-system-privacy"
-msgstr "preferences-system-privacy"
-
-#. 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
-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;"
-
-#: panels/privacy/privacy.ui:14
+#. 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"
 
-#: panels/privacy/privacy.ui:18
+#. 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"
 
-#: panels/privacy/privacy.ui:60 panels/privacy/privacy.ui:106
+#. 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ä"
 
-#: panels/privacy/privacy.ui:64
+#. 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ää"
 
-#: panels/privacy/privacy.ui:68
+#. 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ää"
 
-#: panels/privacy/privacy.ui:72
+#. 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ää"
 
-#: panels/privacy/privacy.ui:76
+#. 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ää"
 
-#: panels/privacy/privacy.ui:80
+#. 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ää"
 
-#: panels/privacy/privacy.ui:84 panels/privacy/privacy.ui:110
+#. 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ää"
 
-#: panels/privacy/privacy.ui:88
+#. 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ää"
 
-#: panels/privacy/privacy.ui:92 panels/privacy/privacy.ui:114
+#. 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ää"
 
-#: panels/privacy/privacy.ui:118
+#. Translators: Option for "Retain History" in "Usage & History" dialog.
+#: panels/privacy/cc-privacy-panel.ui:118
+msgctxt "retain_history"
 msgid "Forever"
-msgstr "Aina"
+msgstr "Ikuisesti"
 
-#: panels/privacy/privacy.ui:148
+#: 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."
@@ -5126,35 +5513,35 @@ msgstr ""
 "Historian muistaminen helpottaa asioiden löytämistä uudelleen. Näitä tietoja "
 "ei koskaan jaeta verkossa."
 
-#: panels/privacy/privacy.ui:176
+#: panels/privacy/cc-privacy-panel.ui:176
 msgid "_Recently Used"
 msgstr "_Äskettäin käytetyt"
 
-#: panels/privacy/privacy.ui:207
+#: panels/privacy/cc-privacy-panel.ui:207
 msgid "Retain _History"
 msgstr "_Säilytä historia"
 
-#: panels/privacy/privacy.ui:247
+#: panels/privacy/cc-privacy-panel.ui:247
 msgid "Cl_ear Recent History"
 msgstr "Poista historiatietoja"
 
-#: panels/privacy/privacy.ui:301
+#: 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/privacy.ui:328
+#: panels/privacy/cc-privacy-panel.ui:328
 msgid "Automatic Screen _Lock"
 msgstr "_Automaattinen näytön lukitus"
 
-#: panels/privacy/privacy.ui:362
+#: 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/privacy.ui:394
+#: panels/privacy/cc-privacy-panel.ui:394
 msgid "Show _Notifications"
 msgstr "_Näytä ilmoitukset"
 
-#: panels/privacy/privacy.ui:454
+#: 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."
@@ -5162,27 +5549,27 @@ msgstr ""
 "Tyhjennä roskakori ja tuhoa väliaikaistiedostot automaattisesti, jotta "
 "koneelle ei jää turhaa yksityistä tietoa."
 
-#: panels/privacy/privacy.ui:483
+#: panels/privacy/cc-privacy-panel.ui:483
 msgid "Automatically empty _Trash"
 msgstr "Tyh_jennä roskakori automaattisesti"
 
-#: panels/privacy/privacy.ui:515
+#: panels/privacy/cc-privacy-panel.ui:515
 msgid "Automatically purge Temporary _Files"
 msgstr "Tuhoa _väliaikaistiedostot automaattisesti"
 
-#: panels/privacy/privacy.ui:546
+#: panels/privacy/cc-privacy-panel.ui:546
 msgid "Purge _After"
 msgstr "Tyhjennä/tuhoa _viiveellä"
 
-#: panels/privacy/privacy.ui:590
+#: panels/privacy/cc-privacy-panel.ui:590
 msgid "_Empty Trash…"
 msgstr "_Tyhjennä roskakori…"
 
-#: panels/privacy/privacy.ui:606
+#: panels/privacy/cc-privacy-panel.ui:606
 msgid "_Purge Temporary Files…"
 msgstr "Tu_hoa väliaikaistiedostot…"
 
-#: panels/privacy/privacy.ui:654
+#: 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 "
@@ -5197,11 +5584,37 @@ msgstr ""
 "Keräämäämme tietoa ei voi yhdistää yksittäisiin käyttäjiin, eikä tietojasi "
 "tulla koskaan jakamaan kolmansien osapuolien kanssa."
 
-#: panels/privacy/privacy.ui:681
+#: panels/privacy/cc-privacy-panel.ui:681
 msgid "_Send software usage statistics"
 msgstr "Lä_hetä ohjelmistojen käyttötilastot"
 
-#: panels/privacy/privacy.ui:764
+#: 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."
+
+#: panels/privacy/cc-privacy-panel.ui:812
+msgid "_Camera"
+msgstr "_Kamera"
+
+#: 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."
+
+#: panels/privacy/cc-privacy-panel.ui:917
+msgid "_Microphone"
+msgstr "_Mikrofoni"
+
+#: panels/privacy/cc-privacy-panel.ui:974
 msgid ""
 "Location services allow applications to know your location. Using Wi-Fi and "
 "mobile broadband increases accuracy."
@@ -5209,7 +5622,7 @@ msgstr ""
 "Sijaintipalvelut mahdollistavat sovellusten paikantaa sijaintisi. Tarkkuus "
 "paranee wifiä ja mobiiliyhteyttä käyttäen."
 
-#: panels/privacy/privacy.ui:778
+#: panels/privacy/cc-privacy-panel.ui:988
 msgid ""
 "Uses Mozilla Location Service: <a href='https://location.services.mozilla.";
 "com/privacy'>Privacy Policy</a>"
@@ -5217,14 +5630,39 @@ msgstr ""
 "Käyttää Mozillan paikannuspalvelua: <a href='https://location.services.";
 "mozilla.com/privacy'>yksityisyyskäytäntö</a>"
 
-#: panels/privacy/privacy.ui:828
+#: panels/privacy/cc-privacy-panel.ui:1038
 msgid "_Location Services"
 msgstr "Sijai_ntipalvelut"
 
-#: panels/privacy/privacy.ui:1026
+#: panels/privacy/cc-privacy-panel.ui:1236
 msgid "_Automatic Problem Reporting"
 msgstr "_Automaattiset vikailmoitukset"
 
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
+msgid "Privacy"
+msgstr "Yksityisyys"
+
+#: 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ä"
+
+#. FIXME
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:8
+msgid "preferences-system-privacy"
+msgstr "preferences-system-privacy"
+
+#. 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
+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;"
+
 #: panels/region/cc-format-chooser.c:114
 msgctxt "measurement format"
 msgid "Imperial"
@@ -5235,7 +5673,7 @@ msgctxt "measurement format"
 msgid "Metric"
 msgstr "Metrinen"
 
-#: panels/region/cc-format-chooser.c:277
+#: panels/region/cc-format-chooser.c:286
 msgid "No regions found"
 msgstr "Alueita ei löytynyt"
 
@@ -5243,186 +5681,150 @@ msgstr "Alueita ei löytynyt"
 msgid "Formats"
 msgstr "Muotoilut"
 
-#: panels/region/cc-format-chooser.ui:120
+#: panels/region/cc-format-chooser.ui:106
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: panels/region/cc-format-chooser.ui:137
+#: panels/region/cc-format-chooser.ui:123
 msgid "Dates"
 msgstr "Päivämäärät"
 
-#: panels/region/cc-format-chooser.ui:168
+#: panels/region/cc-format-chooser.ui:154
 msgid "Times"
 msgstr "Aika"
 
-#: panels/region/cc-format-chooser.ui:199
+#: panels/region/cc-format-chooser.ui:185
 msgid "Dates & Times"
 msgstr "Päivä ja aika"
 
-#: panels/region/cc-format-chooser.ui:230
+#: panels/region/cc-format-chooser.ui:216
 msgid "Numbers"
 msgstr "Numerot"
 
-#: panels/region/cc-format-chooser.ui:247
+#: panels/region/cc-format-chooser.ui:233
 msgid "Measurement"
 msgstr "Mitat"
 
-#: panels/region/cc-format-chooser.ui:264
+#: panels/region/cc-format-chooser.ui:250
 msgid "Paper"
 msgstr "Paperi"
 
-#: panels/region/cc-input-chooser.c:182
+#: panels/region/cc-input-chooser.c:193
 msgid "No input sources found"
 msgstr "Syötelähteitä ei löytynyt"
 
-#: panels/region/cc-input-chooser.c:981
+#: panels/region/cc-input-chooser.c:948
 msgctxt "Input Source"
 msgid "Other"
 msgstr "Muu"
 
-#: panels/region/cc-region-panel.c:802
-msgid "No input source selected"
-msgstr "Syötelähdettä ei valittu"
+#: panels/region/cc-input-chooser.ui:5
+msgid "Add an Input Source"
+msgstr "Lisää syötelähde"
 
-#: panels/region/cc-region-panel.c:1597
+#: panels/region/cc-input-chooser.ui:77
+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:1505
 msgid "Login _Screen"
 msgstr "Kirjautumisnäytt_ö"
 
-#: panels/region/gnome-region-panel.desktop.in.in:3
-msgid "Region & Language"
-msgstr "Alue ja kielet"
+#: panels/region/cc-region-panel.ui:60
+#: panels/user-accounts/cc-user-panel.ui:361
+msgid "_Language"
+msgstr "_Kieli"
 
-#: panels/region/gnome-region-panel.desktop.in.in:4
-msgid ""
-"Select your display language, formats, keyboard layouts and input sources"
-msgstr ""
-"Valitse näytettävä kieli, formaatit, näppäimistöasettelu ja syötelähteet"
+#: panels/region/cc-region-panel.ui:95
+msgid "Restart the session for changes to take effect"
+msgstr "Käynnistä istunto uudelleen, jotta muutokset tulevat voimaan"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/region/gnome-region-panel.desktop.in.in:7
-msgid "preferences-desktop-locale"
-msgstr "preferences-desktop-locale"
+#: panels/region/cc-region-panel.ui:112
+msgid "Restart…"
+msgstr "Käynnistä uudelleen…"
 
-#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/region/gnome-region-panel.desktop.in.in:19
-msgid "Language;Layout;Keyboard;Input;"
-msgstr "Kieli;Asettelu;Näppäimistö;Syöte;"
+#: panels/region/cc-region-panel.ui:143
+msgid "_Formats"
+msgstr "_Muotoilut"
 
-#: panels/region/input-chooser.ui:5
-msgid "Add an Input Source"
-msgstr "Lisää syötelähde"
+#: panels/region/cc-region-panel.ui:193
+msgid "Input Sources"
+msgstr "Syötelähteet"
 
-#: panels/region/input-chooser.ui:77
-msgid "Input methods can’t be used on the login screen"
-msgstr "Syötemenetelmiä ei voi käyttää kirjautumisruudussa"
+#: panels/region/cc-region-panel.ui:207
+msgid "Choose keyboard layouts or input methods."
+msgstr "Valitse näppäimistöasettelu ja syötetavat."
+
+#: panels/region/cc-region-panel.ui:271
+msgid "No input source selected"
+msgstr "Syötelähdettä ei valittu"
 
-#: panels/region/input-options.ui:7
+#: panels/region/cc-region-panel.ui:303
+msgid "Login settings are used by all users when logging into the system"
+msgstr ""
+"Kaikki käyttäjät käyttävät kirjautumisasetuksia kirjautuessaan järjestelmään"
+
+#: panels/region/cc-region-panel.ui:347
 msgid "Input Source Options"
 msgstr "Syötelähteen asetukset"
 
-#: panels/region/input-options.ui:27
+#: panels/region/cc-region-panel.ui:362
 msgid "Use the _same source for all windows"
 msgstr "Käytä _samaa lähdettä kaikille ikkunoille"
 
-#: panels/region/input-options.ui:45
+#: panels/region/cc-region-panel.ui:380
 msgid "Allow _different sources for each window"
 msgstr "Salli _eri lähteet yksittäisille ikkunoille"
 
-#: panels/region/input-options.ui:85
-msgid "Switch to previous source"
-msgstr "Vaihda edelliseen lähteeseen"
+#: panels/region/cc-region-panel.ui:422
+msgid "Previous source"
+msgstr "Edellinen lähde"
 
-#: panels/region/input-options.ui:102
+#: panels/region/cc-region-panel.ui:440
 msgid "Super+Shift+Space"
 msgstr "Super+Shift+Välilyönti"
 
-#: panels/region/input-options.ui:116
-msgid "Switch to next source"
-msgstr "Vaihda seuraavaan lähteeseen"
+#: panels/region/cc-region-panel.ui:455
+msgid "Next source"
+msgstr "Seuraava lähde"
 
-#: panels/region/input-options.ui:133
+#: panels/region/cc-region-panel.ui:473
 msgid "Super+Space"
 msgstr "Super+Välilyönti"
 
-#: panels/region/input-options.ui:147
-msgid "You can change these shortcuts in the keyboard settings"
-msgstr "Näitä pikanäppäimiä voi vaihtaa näppäimistöasetuksissa"
-
-#: panels/region/input-options.ui:164
-msgid "Alternative switch to next source"
-msgstr "Vaihtoehtoinen vaihto seuraavaan lähteeseen"
-
-#: panels/region/input-options.ui:181
+#: panels/region/cc-region-panel.ui:488
 msgid "Left+Right Alt"
 msgstr "Vasen+Oikea Alt"
 
-#: panels/region/region.ui:71
-#: panels/user-accounts/data/user-accounts-dialog.ui:348
-msgid "_Language"
-msgstr "_Kieli"
-
-#: panels/region/region.ui:89
-msgid "English (United Kingdom)"
-msgstr "Englanti (Yhdistynyt kuningaskunta)"
-
-#: panels/region/region.ui:116
-msgid "Restart the session for changes to take effect"
-msgstr "Käynnistä istunto uudelleen, jotta muutokset tulevat voimaan"
-
-#: panels/region/region.ui:138
-msgid "Restart…"
-msgstr "Käynnistä uudelleen…"
-
-#: panels/region/region.ui:174
-msgid "_Formats"
-msgstr "_Muotoilut"
-
-#: panels/region/region.ui:192
-msgid "United Kingdom"
-msgstr "Yhdistynyt kuningaskunta"
-
-#: panels/region/region.ui:234
-msgid "Input Sources"
-msgstr "Syötelähteet"
-
-#: panels/region/region.ui:250
-msgid "_Options"
-msgstr "_Valinnat"
-
-#: panels/region/region.ui:318
-msgid "Add input source"
-msgstr "Lisää syötelähde"
-
-#: panels/region/region.ui:344
-msgid "Remove input source"
-msgstr "Poista syötelähde"
+#: panels/region/cc-region-panel.ui:504
+msgid "These keyboard shortcuts can be changed in the keyboard settings"
+msgstr "Näitä pikanäppäimiä voi muuttaa näppäimistön asetuksissa"
 
-#: panels/region/region.ui:395
-msgid "Move input source up"
-msgstr "Siirrä syötelähde ylös"
-
-#: panels/region/region.ui:421
-msgid "Move input source down"
-msgstr "Siirrä syötelähde alas"
+#: panels/region/gnome-region-panel.desktop.in.in:3
+msgid "Region & Language"
+msgstr "Alue ja kielet"
 
-#: panels/region/region.ui:472
-msgid "Configure input source"
-msgstr "Muokkaa syötelähdettä"
+#: panels/region/gnome-region-panel.desktop.in.in:4
+msgid ""
+"Select your display language, formats, keyboard layouts and input sources"
+msgstr ""
+"Valitse näytettävä kieli, formaatit, näppäimistöasettelu ja syötelähteet"
 
-#: panels/region/region.ui:498
-msgid "Show input source keyboard layout"
-msgstr "Näytä syötelähteenä olevan näppäimistön asettelu"
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/region/gnome-region-panel.desktop.in.in:7
+msgid "preferences-desktop-locale"
+msgstr "preferences-desktop-locale"
 
-#: panels/region/region.ui:542
-msgid "Login settings are used by all users when logging into the system"
-msgstr ""
-"Kaikki käyttäjät käyttävät kirjautumisasetuksia kirjautuessaan järjestelmään"
+#. Translators: Search terms to find the Region and Language panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/region/gnome-region-panel.desktop.in.in:19
+msgid "Language;Layout;Keyboard;Input;"
+msgstr "Kieli;Asettelu;Näppäimistö;Syöte;"
 
-#: panels/search/cc-search-locations-dialog.c:600
+#: panels/search/cc-search-locations-dialog.c:604
 msgid "Select Location"
 msgstr "Valitse sijainti"
 
-#: panels/search/cc-search-locations-dialog.c:604
+#: panels/search/cc-search-locations-dialog.c:608
 msgid "_OK"
 msgstr "_OK"
 
@@ -5430,10 +5832,22 @@ msgstr "_OK"
 msgid "No applications found"
 msgstr "Sovelluksia ei löytynyt"
 
-#: panels/search/gnome-search-panel.desktop.in.in:4
-msgid ""
-"Control which applications show search results in the Activities Overview"
-msgstr "Mitkä ohjelmat näyttävät hakutuloksia Toiminnot-näkymässä"
+#: panels/search/cc-search-panel.ui:52
+msgid "Move Up"
+msgstr "Siirrä _ylös"
+
+#: panels/search/cc-search-panel.ui:69
+msgid "Move Down"
+msgstr "Siirrä _alas"
+
+#: panels/search/cc-search-panel.ui:105
+msgid "Preferences"
+msgstr "Asetukset"
+
+#: panels/search/gnome-search-panel.desktop.in.in:4
+msgid ""
+"Control which applications show search results in the Activities Overview"
+msgstr "Mitkä ohjelmat näyttävät hakutuloksia Toiminnot-näkymässä"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: panels/search/gnome-search-panel.desktop.in.in:7
@@ -5463,48 +5877,36 @@ msgstr "Kirjanmerkit"
 msgid "Other"
 msgstr "Muu"
 
-#: panels/search/search.ui:71
-msgid "Move Up"
-msgstr "Siirrä _ylös"
-
-#: panels/search/search.ui:88
-msgid "Move Down"
-msgstr "Siirrä _alas"
-
-#: panels/search/search.ui:124
-msgid "Preferences"
-msgstr "Asetukset"
-
 #. Label
-#: panels/sharing/cc-sharing-networks.c:302
+#: panels/sharing/cc-sharing-networks.c:307
 msgid "No networks selected for sharing"
 msgstr "Ei verkkoja valittu jakamista varten"
 
-#: panels/sharing/cc-sharing-panel.c:318
+#: panels/sharing/cc-sharing-panel.c:319
 msgctxt "service is enabled"
 msgid "On"
 msgstr "Päällä"
 
-#: panels/sharing/cc-sharing-panel.c:320 panels/sharing/cc-sharing-panel.c:347
+#: panels/sharing/cc-sharing-panel.c:321 panels/sharing/cc-sharing-panel.c:348
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Pois"
 
-#: panels/sharing/cc-sharing-panel.c:350
+#: panels/sharing/cc-sharing-panel.c:351
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: panels/sharing/cc-sharing-panel.c:353
+#: panels/sharing/cc-sharing-panel.c:354
 msgctxt "service is active"
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: panels/sharing/cc-sharing-panel.c:423
+#: panels/sharing/cc-sharing-panel.c:424
 msgid "Choose a Folder"
 msgstr "Valitse kansio"
 
-#: panels/sharing/cc-sharing-panel.c:720
+#: panels/sharing/cc-sharing-panel.c:724
 #, c-format
 msgid ""
 "File Sharing allows you to share your Public folder with others on your "
@@ -5514,7 +5916,7 @@ msgstr ""
 "verkon muiden käyttäjien kanssa käyttäen osoitetta <a href=\"dav://%s"
 "\">dav://%s</a>"
 
-#: panels/sharing/cc-sharing-panel.c:722
+#: panels/sharing/cc-sharing-panel.c:726
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
@@ -5525,7 +5927,7 @@ msgstr ""
 "Secure Shell -komentoa:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: panels/sharing/cc-sharing-panel.c:724
+#: panels/sharing/cc-sharing-panel.c:728
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
@@ -5534,398 +5936,317 @@ 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>"
 
-#: panels/sharing/cc-sharing-panel.c:828
+#: panels/sharing/cc-sharing-panel.c:832
 msgid "Copy"
 msgstr "Kopioi"
 
-#: panels/sharing/cc-sharing-panel.c:1279
+#: panels/sharing/cc-sharing-panel.c:1285
 #: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "Jakaminen"
 
-#: panels/sharing/gnome-sharing-panel.desktop.in.in:4
-msgid "Control what you want to share with others"
-msgstr "Valitse mitä haluat jakaa muiden kanssa"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/sharing/gnome-sharing-panel.desktop.in.in:7
-msgid "preferences-system-sharing"
-msgstr "preferences-system-sharing"
-
-#. Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
-#: panels/sharing/gnome-sharing-panel.desktop.in.in:16
-msgid ""
-"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
-"movies;server;renderer;"
-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"
-
-#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:12
-msgid "Authentication is required to enable or disable remote login"
-msgstr "Etäkirjautumisen hallinta vaatii tunnistautuminen"
-
-#: panels/sharing/sharing.ui:50
+#: panels/sharing/cc-sharing-panel.ui:50
 msgid "_Computer Name"
 msgstr "Ti_etokoneen nimi"
 
-#: panels/sharing/sharing.ui:108
+#: panels/sharing/cc-sharing-panel.ui:108
 msgid "_File Sharing"
 msgstr "_Tiedostonjako"
 
-#: panels/sharing/sharing.ui:151
+#: panels/sharing/cc-sharing-panel.ui:151
 msgid "_Screen Sharing"
 msgstr "_Näytön jakaminen"
 
-#: panels/sharing/sharing.ui:194
+#: panels/sharing/cc-sharing-panel.ui:194
 msgid "_Media Sharing"
 msgstr "_Mediajako"
 
-#: panels/sharing/sharing.ui:237
+#: panels/sharing/cc-sharing-panel.ui:237
 msgid "_Remote Login"
 msgstr "_Etäkirjautuminen"
 
-#: panels/sharing/sharing.ui:276
+#: panels/sharing/cc-sharing-panel.ui:276
 msgid "Some services are disabled because of no network access."
 msgstr "Jotkut palvelut ovat poissa käytöstä, koska verkkoyhteyttä ei ole."
 
-#: panels/sharing/sharing.ui:292 panels/sharing/sharing.ui:419
+#: panels/sharing/cc-sharing-panel.ui:292
+#: panels/sharing/cc-sharing-panel.ui:419
 msgid "File Sharing"
 msgstr "Tiedostojako"
 
-#: panels/sharing/sharing.ui:339
+#: panels/sharing/cc-sharing-panel.ui:339
 msgid "_Require Password"
 msgstr "Vaa_di salasana"
 
-#: panels/sharing/sharing.ui:430 panels/sharing/sharing.ui:502
+#: panels/sharing/cc-sharing-panel.ui:430
+#: panels/sharing/cc-sharing-panel.ui:502
 msgid "Remote Login"
 msgstr "Etäkirjautuminen"
 
-#: panels/sharing/sharing.ui:525 panels/sharing/sharing.ui:771
+#: panels/sharing/cc-sharing-panel.ui:525
+#: panels/sharing/cc-sharing-panel.ui:771
 msgid "Screen Sharing"
 msgstr "Näytön jakaminen"
 
-#: panels/sharing/sharing.ui:583
+#: panels/sharing/cc-sharing-panel.ui:583
 msgid "_Allow connections to control the screen"
 msgstr "Sa_lli yhteydet näytön hallintaan"
 
-#: panels/sharing/sharing.ui:628
+#: panels/sharing/cc-sharing-panel.ui:628
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: panels/sharing/sharing.ui:658
+#: panels/sharing/cc-sharing-panel.ui:658
 msgid "_Show Password"
 msgstr "_Näytä salasana"
 
-#: panels/sharing/sharing.ui:689
+#: panels/sharing/cc-sharing-panel.ui:689
 msgid "Access Options"
 msgstr "Käyttövalinnat"
 
-#: panels/sharing/sharing.ui:703
+#: panels/sharing/cc-sharing-panel.ui:703
 msgid "_New connections must ask for access"
 msgstr "Uusien yhteyksien tulee ky_syä lupa"
 
-#: panels/sharing/sharing.ui:721
+#: panels/sharing/cc-sharing-panel.ui:721
 msgid "_Require a password"
 msgstr "_Vaadi salasana"
 
-#: panels/sharing/sharing.ui:782 panels/sharing/sharing.ui:876
+#: panels/sharing/cc-sharing-panel.ui:782
+#: panels/sharing/cc-sharing-panel.ui:876
 msgid "Media Sharing"
 msgstr "Mediajako"
 
-#: panels/sharing/sharing.ui:815
+#: panels/sharing/cc-sharing-panel.ui:815
 msgid "Share music, photos and videos over the network."
 msgstr "Jaa musiikkia, kuvia ja videoita verkon kautta."
 
-#: panels/sharing/sharing.ui:830
+#: panels/sharing/cc-sharing-panel.ui:830
 msgid "Folders"
 msgstr "Kansiot"
 
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:3
-msgid "Sound"
-msgstr "Ääni"
-
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:4
-msgid "Change sound levels, inputs, outputs, and alert sounds"
-msgstr "Muuta äänenvoimakkuutta, sisään- ja ulostuloja sekä äänitapahtumia"
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:4
+msgid "Control what you want to share with others"
+msgstr "Valitse mitä haluat jakaa muiden kanssa"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:7
-msgid "multimedia-volume-control"
-msgstr "multimedia-volume-control"
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:7
+msgid "preferences-system-sharing"
+msgstr "preferences-system-sharing"
 
-#. Translators: Search terms to find the Sound panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
-#: panels/sound/data/gnome-sound-panel.desktop.in.in:20
-msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
+#. Translators: Search terms to find the Sharing panel. Do NOT translate or localize the semicolons! The 
list MUST also end with a semicolon!
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:16
+msgid ""
+"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
+"movies;server;renderer;"
 msgstr ""
-"Kortti;mikrofoni;äänenvoimakkuus;häivytys;tasapaino;Bluetooth;kuulokkeet;"
-"headset;Audio;"
+"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"
 
-#. Translators: This is the name of an audio file that sounds like the bark of a dog.
-#. You might want to translate it into the equivalent words of your language.
-#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:6
+#: 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"
+
+#: panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in:12
+msgid "Authentication is required to enable or disable remote login"
+msgstr "Etäkirjautumisen hallinta vaatii tunnistautuminen"
+
+#: panels/sound/cc-alert-chooser.c:151
+msgid "Custom"
+msgstr "Oma"
+
+#: panels/sound/cc-alert-chooser.ui:12 panels/sound/cc-alert-selector.ui:9
 msgid "Bark"
 msgstr "Haukunta"
 
-#. Translators: This is the name of an audio file that sounds like a water drip.
-#. You might want to translate it into the equivalent words of your language.
-#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:12
+#: panels/sound/cc-alert-chooser.ui:19 panels/sound/cc-alert-selector.ui:15
 msgid "Drip"
 msgstr "Vesipisara"
 
-#. Translators: This is the name of an audio file that sounds like tapping glass.
-#. You might want to translate it into the equivalent words of your language.
-#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:18
+#: panels/sound/cc-alert-chooser.ui:26 panels/sound/cc-alert-selector.ui:21
 msgid "Glass"
 msgstr "Lasi"
 
-#. Translators: This is the name of an audio file that sounds sort of like a submarine sonar ping.
-#. You might want to translate it into the equivalent words of your language.
-#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:24
+#: panels/sound/cc-alert-chooser.ui:33 panels/sound/cc-alert-selector.ui:27
 msgid "Sonar"
 msgstr "Kaikuluotain"
 
-#: panels/sound/gvc-balance-bar.c:104
-msgctxt "balance"
-msgid "Left"
-msgstr "Vasen"
-
-#: panels/sound/gvc-balance-bar.c:105
-msgctxt "balance"
-msgid "Right"
-msgstr "Oikea"
-
-#: panels/sound/gvc-balance-bar.c:108
-msgctxt "balance"
+#: panels/sound/cc-fade-slider.ui:13
 msgid "Rear"
 msgstr "Taka"
 
-#: panels/sound/gvc-balance-bar.c:109
-msgctxt "balance"
+#: panels/sound/cc-fade-slider.ui:15
 msgid "Front"
 msgstr "Etu"
 
-#: panels/sound/gvc-balance-bar.c:112
-msgctxt "balance"
-msgid "Minimum"
-msgstr "Minimi"
-
-#: panels/sound/gvc-balance-bar.c:113
-msgctxt "balance"
-msgid "Maximum"
-msgstr "Maksimi"
-
-#: panels/sound/gvc-balance-bar.c:288
-msgid "_Balance:"
-msgstr "_Tasapaino:"
-
-#: panels/sound/gvc-balance-bar.c:291
-msgid "_Fade:"
-msgstr "_Häivytys:"
-
-#: panels/sound/gvc-balance-bar.c:294
-msgid "_Subwoofer:"
-msgstr "_Subwoofer:"
-
-#: panels/sound/gvc-channel-bar.c:610 panels/sound/gvc-channel-bar.c:619
-msgctxt "volume"
-msgid "100%"
-msgstr "100 %"
-
-#: panels/sound/gvc-channel-bar.c:614
-msgctxt "volume"
-msgid "Unamplified"
-msgstr "Vahvistamaton"
-
-#: panels/sound/gvc-combo-box.c:166 panels/sound/gvc-mixer-dialog.c:253
-#: panels/sound/gvc-mixer-dialog.c:520
-msgid "_Profile:"
-msgstr "_Profiili:"
-
-#: panels/sound/gvc-mixer-dialog.c:255
-msgid "_Test Speakers"
-msgstr "_Testaa kaiuttimia"
-
-#: panels/sound/gvc-mixer-dialog.c:424
-msgid "Peak detect"
-msgstr "Havaitse piikit"
+#: panels/sound/cc-output-test-dialog.c:134
+#, c-format
+#| msgid "Settings"
+msgid "Testing %s"
+msgstr "Testataan %s"
 
-#: panels/sound/gvc-mixer-dialog.c:1499
-msgid "Device"
-msgstr "Laite"
+#: panels/sound/cc-output-test-dialog.ui:127
+msgid "Click a speaker to test"
+msgstr "Napsauta kaiutinta testataksesi"
 
-#: panels/sound/gvc-mixer-dialog.c:1562
-#, c-format
-msgid "Speaker Testing for %s"
-msgstr "Kaiutintesti: %s"
+#: panels/sound/cc-sound-panel.ui:30
+msgid "System Volume"
+msgstr "Järjestelmän äänenvoimakkuus"
 
-#: panels/sound/gvc-mixer-dialog.c:1617
-msgid "_Output volume:"
-msgstr "_Toistovoimakkuus:"
+#: panels/sound/cc-sound-panel.ui:46
+msgid "Volume Levels"
+msgstr "Äänitasot"
 
-#: panels/sound/gvc-mixer-dialog.c:1631
+#: panels/sound/cc-sound-panel.ui:68
 msgid "Output"
 msgstr "Ulostulo"
 
-#: panels/sound/gvc-mixer-dialog.c:1636
-msgid "C_hoose a device for sound output:"
-msgstr "_Valitse laite äänen toistamiseksi:"
+#: panels/sound/cc-sound-panel.ui:94
+msgid "Output Device"
+msgstr "Ulostulolaite"
 
-#: panels/sound/gvc-mixer-dialog.c:1658
-msgid "Settings for the selected device:"
-msgstr "Valitun laitteen asetukset:"
-
-#: panels/sound/gvc-mixer-dialog.c:1669
-msgid "Input"
-msgstr "Sisääntulo"
-
-#: panels/sound/gvc-mixer-dialog.c:1676
-msgid "_Input volume:"
-msgstr "_Äänitysvoimakkuus:"
-
-#: panels/sound/gvc-mixer-dialog.c:1697
-msgid "Input level:"
-msgstr "Äänitystaso:"
-
-#: panels/sound/gvc-mixer-dialog.c:1723
-msgid "C_hoose a device for sound input:"
-msgstr "_Valitse laite äänen tallentamiseksi:"
+#: panels/sound/cc-sound-panel.ui:117
+msgid "Test"
+msgstr "Testaa"
 
-#: panels/sound/gvc-mixer-dialog.c:1747
-msgid "Sound Effects"
-msgstr "Äänitehosteet"
+#: panels/sound/cc-sound-panel.ui:147 panels/sound/cc-sound-panel.ui:319
+msgid "Configuration"
+msgstr "Määritys"
 
-#: panels/sound/gvc-mixer-dialog.c:1754
-msgid "_Alert volume:"
-msgstr "_Hälytysten voimakkuus:"
+#: panels/sound/cc-sound-panel.ui:179
+msgid "Balance"
+msgstr "Tasapaino"
 
-#: panels/sound/gvc-mixer-dialog.c:1775
-msgid "No application is currently playing or recording audio."
-msgstr "Mikään sovellus ei nyt soita tai tallenna ääntä."
+#: panels/sound/cc-sound-panel.ui:205
+msgid "Fade"
+msgstr "Häivytys"
 
-#: panels/sound/gvc-sound-theme-chooser.c:187
-msgid "Built-in"
-msgstr "Sisäänrakennettu"
+#: panels/sound/cc-sound-panel.ui:231
+msgid "Subwoofer"
+msgstr "Subwoofer"
 
-#: panels/sound/gvc-sound-theme-chooser.c:446
-#: panels/sound/gvc-sound-theme-chooser.c:458
-#: panels/sound/gvc-sound-theme-chooser.c:470
-msgid "Sound Preferences"
-msgstr "Ääniasetukset"
+#: panels/sound/cc-sound-panel.ui:253
+msgid "Input"
+msgstr "Sisääntulo"
 
-#: panels/sound/gvc-sound-theme-chooser.c:449
-#: panels/sound/gvc-sound-theme-chooser.c:460
-#: panels/sound/gvc-sound-theme-chooser.c:472
-msgid "Testing event sound"
-msgstr "Kokeillaan tapahtuman ääntä"
+#: panels/sound/cc-sound-panel.ui:279
+msgid "Input Device"
+msgstr "Sisääntulolaite"
 
-#: panels/sound/gvc-sound-theme-chooser.c:544
-#: panels/wacom/wacom-stylus-page.ui:25
-msgid "Default"
-msgstr "Oletus"
+#: panels/sound/cc-sound-panel.ui:351
+msgid "Volume"
+msgstr "Äänenvoimakkuus"
 
-#: panels/sound/gvc-sound-theme-chooser.c:545
-msgid "From theme"
-msgstr "Teemasta"
+#: panels/sound/cc-sound-panel.ui:373
+msgid "Alert Sound"
+msgstr "Hälytysääni"
 
-#: panels/sound/gvc-sound-theme-chooser.c:720
-msgid "C_hoose an alert sound:"
-msgstr "_Valitse hälytysääni:"
+#: panels/sound/cc-volume-slider.c:178
+msgctxt "volume"
+msgid "100%"
+msgstr "100 %"
 
-#: panels/sound/gvc-speaker-test.c:229
-msgid "Stop"
-msgstr "Pysäytä"
+#: panels/sound/gnome-sound-panel.desktop.in.in:3
+msgid "Sound"
+msgstr "Ääni"
 
-#: panels/sound/gvc-speaker-test.c:229 panels/sound/gvc-speaker-test.c:341
-msgid "Test"
-msgstr "Testaa"
+#: panels/sound/gnome-sound-panel.desktop.in.in:4
+msgid "Change sound levels, inputs, outputs, and alert sounds"
+msgstr "Muuta äänenvoimakkuutta, sisään- ja ulostuloja sekä äänitapahtumia"
 
-#: panels/sound/gvc-speaker-test.c:237
-msgid "Subwoofer"
-msgstr "Subwoofer"
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/sound/gnome-sound-panel.desktop.in.in:7
+msgid "multimedia-volume-control"
+msgstr "multimedia-volume-control"
 
-#: panels/sound/sound-theme-file-utils.c:288
-msgid "Custom"
-msgstr "Oma"
+#. Translators: Search terms to find the Sound panel. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: panels/sound/gnome-sound-panel.desktop.in.in:20
+msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
+msgstr ""
+"Kortti;mikrofoni;äänenvoimakkuus;häivytys;tasapaino;Bluetooth;kuulokkeet;"
+"headset;Audio;"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:86
-#: panels/thunderbolt/cc-bolt-device-entry.c:119
+#: panels/thunderbolt/cc-bolt-device-dialog.c:94
+#: panels/thunderbolt/cc-bolt-device-entry.c:125
 msgctxt "Thunderbolt Device Status"
 msgid "Disconnected"
 msgstr "Yhteys katkaistu"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:89
-#: panels/thunderbolt/cc-bolt-device-entry.c:122
+#: panels/thunderbolt/cc-bolt-device-dialog.c:97
+#: panels/thunderbolt/cc-bolt-device-entry.c:128
 msgctxt "Thunderbolt Device Status"
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:92
-#: panels/thunderbolt/cc-bolt-device-entry.c:126
-#: panels/thunderbolt/cc-bolt-device-entry.c:138
+#: panels/thunderbolt/cc-bolt-device-dialog.c:100
+#: panels/thunderbolt/cc-bolt-device-entry.c:132
+#: panels/thunderbolt/cc-bolt-device-entry.c:144
 msgctxt "Thunderbolt Device Status"
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:95
+#: panels/thunderbolt/cc-bolt-device-dialog.c:103
 msgctxt "Thunderbolt Device Status"
 msgid "Authorization Error"
 msgstr "Valtuutusvirhe"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:98
-#: panels/thunderbolt/cc-bolt-device-entry.c:132
+#: panels/thunderbolt/cc-bolt-device-dialog.c:106
+#: panels/thunderbolt/cc-bolt-device-entry.c:138
 msgctxt "Thunderbolt Device Status"
 msgid "Authorizing"
 msgstr "Valtuutetaan"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:105
+#: panels/thunderbolt/cc-bolt-device-dialog.c:113
 msgctxt "Thunderbolt Device Status"
 msgid "Reduced Functionality"
 msgstr "Alentunut toiminnallisuus"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:107
+#: panels/thunderbolt/cc-bolt-device-dialog.c:115
 msgctxt "Thunderbolt Device Status"
 msgid "Connected & Authorized"
 msgstr "Yhdistetty ja valtuutettu"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:113
-#: panels/thunderbolt/cc-bolt-device-entry.c:146
+#: panels/thunderbolt/cc-bolt-device-dialog.c:121
+#: panels/thunderbolt/cc-bolt-device-entry.c:152
 msgctxt "Thunderbolt Device Status"
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #. Translators: The time point the device was authorized.
-#: panels/thunderbolt/cc-bolt-device-dialog.c:169
+#: panels/thunderbolt/cc-bolt-device-dialog.c:177
 msgid "Authorized at:"
 msgstr "Valtuutettu:"
 
 #. Translators: The time point the device was connected.
-#: panels/thunderbolt/cc-bolt-device-dialog.c:175
+#: panels/thunderbolt/cc-bolt-device-dialog.c:183
 msgid "Connected at:"
 msgstr "Yhdistetty:"
 
 #. Translators: The time point the device was enrolled,
 #. * i.e. authorized and stored in the device database.
-#: panels/thunderbolt/cc-bolt-device-dialog.c:182
+#: panels/thunderbolt/cc-bolt-device-dialog.c:190
 msgid "Enrolled at:"
 msgstr "Käyttöönotettu:"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:250
+#: panels/thunderbolt/cc-bolt-device-dialog.c:264
 msgid "Failed to authorize device: "
 msgstr "Laitteen valtuuttaminen epäonnistui: "
 
-#: panels/thunderbolt/cc-bolt-device-dialog.c:327
+#: panels/thunderbolt/cc-bolt-device-dialog.c:333
 msgid "Failed to forget device: "
 msgstr "Laitteen unohtaminen epäonnistui: "
 
+#: panels/thunderbolt/cc-bolt-device-dialog.c:491
+#, c-format
+msgid "Depends on %u other device"
+msgid_plural "Depends on %u other devices"
+msgstr[0] "Riippuvainen %u muusta laitteesta"
+msgstr[1] "Riippuvainen %u muusta laitteesta"
+
 #: panels/thunderbolt/cc-bolt-device-dialog.ui:109
 msgid "Name:"
 msgstr "Nimi:"
@@ -5938,32 +6259,32 @@ msgstr "Tila:"
 msgid "UUID:"
 msgstr "UUID:"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:280
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:324
 msgid "Authorize and Connect"
 msgstr "Valtuuta ja yhdistä"
 
-#: panels/thunderbolt/cc-bolt-device-dialog.ui:303
+#: panels/thunderbolt/cc-bolt-device-dialog.ui:347
 msgid "Forget Device"
 msgstr "Unohda laite"
 
-#: panels/thunderbolt/cc-bolt-device-entry.c:129
+#: panels/thunderbolt/cc-bolt-device-entry.c:135
 msgctxt "Thunderbolt Device Status"
 msgid "Error"
 msgstr "Virhe"
 
-#: panels/thunderbolt/cc-bolt-device-entry.c:140
+#: panels/thunderbolt/cc-bolt-device-entry.c:146
 msgctxt "Thunderbolt Device Status"
 msgid "Authorized"
 msgstr "Valtuutettu"
 
-#: panels/thunderbolt/cc-bolt-panel.c:175
+#: panels/thunderbolt/cc-bolt-panel.c:176
 msgid ""
 "The Thunderbolt subsystem (boltd) is not installed or not set up properly."
 msgstr ""
 "Thunderbolt-alijärjestelmää (boltd) ei ole asennettu tai sen asetukset eivät "
 "ole kunnossa."
 
-#: panels/thunderbolt/cc-bolt-panel.c:460
+#: panels/thunderbolt/cc-bolt-panel.c:469
 msgid ""
 "Thunderbolt could not be detected.\n"
 "Either the system lacks Thunderbolt support, it has been disabled in the "
@@ -5973,11 +6294,15 @@ msgstr ""
 "Järjestelmästä puuttuu Thunderbolt-tuki, tai se on poistettu käytöstä BIOS:"
 "in kautta, tai BIOS:in kautta sille asetettu turvataso ei ole tuettu."
 
-#: panels/thunderbolt/cc-bolt-panel.c:504
+#: panels/thunderbolt/cc-bolt-panel.c:513
 msgid "Thunderbolt support has been disabled in the BIOS."
 msgstr "Thunderbolt-tuki on poistettu käytöstä BIOS:in kautta."
 
-#: panels/thunderbolt/cc-bolt-panel.c:613
+#: panels/thunderbolt/cc-bolt-panel.c:517
+msgid "Thunderbolt security level could not be determined."
+msgstr "Thunderbolt-turvatasoa ei voitu määrittää."
+
+#: panels/thunderbolt/cc-bolt-panel.c:622
 #, c-format
 msgid "Error switching direct mode: %s"
 msgstr "Virhe vaihtaessa direct-tilaan: %s"
@@ -6059,341 +6384,348 @@ msgid_plural "%d pixels"
 msgstr[0] "%d pikseli"
 msgstr[1] "%d pikseliä"
 
-#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
-msgid "Make it easier to see, hear, type, point and click"
-msgstr "Helpota näkemistä, kuulemista, kirjoittamista ja hiiren käyttöä"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:7
-msgid "preferences-desktop-accessibility"
-msgstr "preferences-desktop-accessibility"
-
-#. Translators: Search terms to find the Universal Access panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
-#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:19
-msgid ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
-msgstr ""
-"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
-"AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
-"Näppäimistö;Hiiri;a11y;Esteettömyys;Kontrasti;Zoom;Mittakaava;Lähennys;"
-"Loitonnus;Näytönlukija;teksti;fontti;kirjasin;koko;AccessX;Pohjaan jäävät "
-"näppäimet;Hitaat näppäimet;Kimmonäppäimet;Hiiren painikkeet;kaksois;viive;"
-"vilkkuminen;"
-
-#: panels/universal-access/uap.ui:93
+#: panels/universal-access/cc-ua-panel.ui:93
 msgid "_Always Show Universal Access Menu"
 msgstr "_Näytä esteettömyysvalikko aina"
 
-#: panels/universal-access/uap.ui:135
+#: panels/universal-access/cc-ua-panel.ui:135
 msgid "Seeing"
 msgstr "Näkeminen"
 
-#: panels/universal-access/uap.ui:181
+#: panels/universal-access/cc-ua-panel.ui:181
 msgid "_High Contrast"
 msgstr "_Suuri kontrasti"
 
-#: panels/universal-access/uap.ui:228
+#: panels/universal-access/cc-ua-panel.ui:228
 msgid "_Large Text"
 msgstr "Suuri _teksti"
 
-#: panels/universal-access/uap.ui:273
+#: panels/universal-access/cc-ua-panel.ui:273
 msgid "C_ursor Size"
 msgstr "Ko_hdistimen koko"
 
-#: panels/universal-access/uap.ui:320
+#: panels/universal-access/cc-ua-panel.ui:320
 #: panels/universal-access/zoom-options.ui:99
 msgid "_Zoom"
 msgstr "S_uurennus"
 
-#: panels/universal-access/uap.ui:366
+#: panels/universal-access/cc-ua-panel.ui:366
 msgid "Screen _Reader"
 msgstr "_Näytönlukija"
 
-#: panels/universal-access/uap.ui:412 panels/universal-access/uap.ui:1243
+#: panels/universal-access/cc-ua-panel.ui:412
+#: panels/universal-access/cc-ua-panel.ui:1243
 msgid "_Sound Keys"
 msgstr "_Äänekkäät näppäimet"
 
-#: panels/universal-access/uap.ui:474
+#: panels/universal-access/cc-ua-panel.ui:474
 msgid "Hearing"
 msgstr "Kuuleminen"
 
-#: panels/universal-access/uap.ui:518 panels/universal-access/uap.ui:1346
+#: panels/universal-access/cc-ua-panel.ui:518
+#: panels/universal-access/cc-ua-panel.ui:1346
 msgid "_Visual Alerts"
 msgstr "_Visuaaliset hälytykset"
 
-#: panels/universal-access/uap.ui:626
+#: panels/universal-access/cc-ua-panel.ui:626
 msgid "Screen _Keyboard"
 msgstr "N_äppäimistö näytöllä"
 
-#: panels/universal-access/uap.ui:671
+#: panels/universal-access/cc-ua-panel.ui:671
 msgid "R_epeat Keys"
 msgstr "Toist_onäppäimet"
 
-#: panels/universal-access/uap.ui:717
+#: panels/universal-access/cc-ua-panel.ui:717
 msgid "Cursor _Blinking"
 msgstr "Kohdistimen _vilkunta"
 
-#: panels/universal-access/uap.ui:763
+#: panels/universal-access/cc-ua-panel.ui:763
 msgid "_Typing Assist (AccessX)"
 msgstr "_Kirjoitusapu (AccessX)"
 
-#: panels/universal-access/uap.ui:824
+#: panels/universal-access/cc-ua-panel.ui:824
 msgid "Pointing & Clicking"
 msgstr "Kohdistaminen ja napsauttaminen"
 
-#: panels/universal-access/uap.ui:870
+#: panels/universal-access/cc-ua-panel.ui:870
 msgid "_Mouse Keys"
 msgstr "_Hiirinäppäimet"
 
-#: panels/universal-access/uap.ui:915
+#: panels/universal-access/cc-ua-panel.ui:915
 msgid "_Click Assist"
 msgstr "N_apsautusapu"
 
-#: panels/universal-access/uap.ui:961
+#: panels/universal-access/cc-ua-panel.ui:961
 msgid "_Double-Click Delay"
 msgstr "Kaksoisnapsautuksen _viive"
 
-#: panels/universal-access/uap.ui:981
+#: panels/universal-access/cc-ua-panel.ui:981
 msgid "Double-Click Delay"
 msgstr "Kaksoisnapsautuksen viive"
 
-#: panels/universal-access/uap.ui:1048
+#: panels/universal-access/cc-ua-panel.ui:1048
 msgid "Cursor Size"
 msgstr "Kohdistimen koko"
 
-#: panels/universal-access/uap.ui:1075
+#: panels/universal-access/cc-ua-panel.ui:1075
 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/uap.ui:1111
+#: panels/universal-access/cc-ua-panel.ui:1111
 msgid "Screen Reader"
 msgstr "Näytönlukija"
 
-#: panels/universal-access/uap.ui:1128
+#: panels/universal-access/cc-ua-panel.ui:1128
 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/uap.ui:1161
+#: panels/universal-access/cc-ua-panel.ui:1161
 msgid "_Screen Reader"
 msgstr "_Näytönlukija"
 
-#: panels/universal-access/uap.ui:1200
+#: panels/universal-access/cc-ua-panel.ui:1200
 msgid "Sound Keys"
 msgstr "_Äänekkäät näppäimet"
 
-#: panels/universal-access/uap.ui:1218
+#: panels/universal-access/cc-ua-panel.ui:1218
 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/uap.ui:1288
+#: panels/universal-access/cc-ua-panel.ui:1288
 msgid "Visual Alerts"
 msgstr "Visuaaliset hälytykset"
 
-#: panels/universal-access/uap.ui:1292
+#: panels/universal-access/cc-ua-panel.ui:1292
 msgid "_Test flash"
 msgstr "_Testaa välähdystä"
 
-#: panels/universal-access/uap.ui:1321
+#: panels/universal-access/cc-ua-panel.ui:1321
 msgid "Use a visual indication when an alert sound occurs."
 msgstr "Käytä visuaalista ilmoitusta, kun hälytyksen äänitehoste toistetaan."
 
-#: panels/universal-access/uap.ui:1372
+#: panels/universal-access/cc-ua-panel.ui:1372
 msgid "Flash the _window title"
 msgstr "Väläytä _ikkunan reunusta"
 
-#: panels/universal-access/uap.ui:1390
+#: panels/universal-access/cc-ua-panel.ui:1390
 msgid "Flash the entire _screen"
 msgstr "Väläytä _koko näyttöä"
 
-#: panels/universal-access/uap.ui:1435
+#: panels/universal-access/cc-ua-panel.ui:1435
 msgid "Repeat Keys"
 msgstr "Toistonäppäimet"
 
-#: panels/universal-access/uap.ui:1465
+#: panels/universal-access/cc-ua-panel.ui:1465
 msgid "Key presses repeat when key is held down."
 msgstr "Painallus toistuu, kun näppäintä pidetään painettuna."
 
-#: panels/universal-access/uap.ui:1544
+#: panels/universal-access/cc-ua-panel.ui:1545
 msgid "Repeat keys delay"
 msgstr "Näppäinten toiston viive"
 
-#: panels/universal-access/uap.ui:1592 panels/universal-access/uap.ui:1725
+#: panels/universal-access/cc-ua-panel.ui:1593
+#: panels/universal-access/cc-ua-panel.ui:1728
 msgid "Speed"
 msgstr "Nopeus"
 
-#: panels/universal-access/uap.ui:1629
+#: panels/universal-access/cc-ua-panel.ui:1632
 msgid "Repeat keys speed"
 msgstr "Näppäinten toiston nopeus"
 
-#: panels/universal-access/uap.ui:1653
+#: panels/universal-access/cc-ua-panel.ui:1656
 msgid "Cursor Blinking"
 msgstr "Kohdistimen vilkunta"
 
-#: panels/universal-access/uap.ui:1683
+#: panels/universal-access/cc-ua-panel.ui:1686
 msgid "Cursor blinks in text fields."
 msgstr "Kohdistin vilkkuu tekstikentissä."
 
-#: panels/universal-access/uap.ui:1762
+#: panels/universal-access/cc-ua-panel.ui:1765
 msgid "Cursor blinking speed"
 msgstr "Kohdistimen vilkkumisnopeus"
 
-#: panels/universal-access/uap.ui:1798
+#: panels/universal-access/cc-ua-panel.ui:1801
 msgid "Typing Assist"
 msgstr "Kirjoitusapu"
 
-#: panels/universal-access/uap.ui:1837
+#: panels/universal-access/cc-ua-panel.ui:1840
 msgid "_Sticky Keys"
 msgstr "_Pohjaan jäävät näppäimet"
 
-#: panels/universal-access/uap.ui:1854
+#: panels/universal-access/cc-ua-panel.ui:1857
 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/uap.ui:1878
+#: panels/universal-access/cc-ua-panel.ui:1881
 msgid "_Disable if two keys are pressed together"
 msgstr "_Poista käytöstä, jos kahta näppäintä painetaan samanaikaisesti"
 
-#: panels/universal-access/uap.ui:1896
+#: panels/universal-access/cc-ua-panel.ui:1899
 msgid "Beep when a _modifier key is pressed"
 msgstr "Soita äänimerkki, kun _määritenäppäintä painetaan"
 
-#: panels/universal-access/uap.ui:1944
+#: panels/universal-access/cc-ua-panel.ui:1947
 msgid "S_low Keys"
 msgstr "_Hitaat näppäimet"
 
-#: panels/universal-access/uap.ui:1961
+#: panels/universal-access/cc-ua-panel.ui:1964
 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/uap.ui:1994 panels/universal-access/uap.ui:2207
-#: panels/universal-access/uap.ui:2544
+#: panels/universal-access/cc-ua-panel.ui:1997
+#: panels/universal-access/cc-ua-panel.ui:2210
+#: panels/universal-access/cc-ua-panel.ui:2547
 msgid "A_cceptance delay:"
 msgstr "V_iiveen kesto:"
 
-#: panels/universal-access/uap.ui:2016
+#: panels/universal-access/cc-ua-panel.ui:2019
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "Lyhyt"
 
-#: panels/universal-access/uap.ui:2035
+#: panels/universal-access/cc-ua-panel.ui:2038
 msgid "Slow keys typing delay"
 msgstr "Hitaiden näppäinten kirjoitusviive"
 
-#: panels/universal-access/uap.ui:2050
+#: panels/universal-access/cc-ua-panel.ui:2053
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "Pitkä"
 
-#: panels/universal-access/uap.ui:2077
+#: panels/universal-access/cc-ua-panel.ui:2080
 msgid "Beep when a key is pr_essed"
 msgstr "Soita äänimerkki, kun näppäintä _painetaan"
 
-#: panels/universal-access/uap.ui:2094
+#: panels/universal-access/cc-ua-panel.ui:2097
 msgid "Beep when a key is _accepted"
 msgstr "Soita äänimerkki, kun näppäinpainallus _hyväksytään"
 
-#: panels/universal-access/uap.ui:2111 panels/universal-access/uap.ui:2290
+#: panels/universal-access/cc-ua-panel.ui:2114
+#: panels/universal-access/cc-ua-panel.ui:2293
 msgid "Beep when a key is _rejected"
 msgstr "Soita äänimerkki, kun näppäinpainallusta _ei hyväksytty"
 
-#: panels/universal-access/uap.ui:2157
+#: panels/universal-access/cc-ua-panel.ui:2160
 msgid "_Bounce Keys"
 msgstr "_Kimmonäppäimet"
 
-#: panels/universal-access/uap.ui:2174
+#: panels/universal-access/cc-ua-panel.ui:2177
 msgid "Ignores fast duplicate keypresses"
 msgstr "Älä huomioi nopeita kahden näppäimen painalluksia"
 
-#: panels/universal-access/uap.ui:2229
+#: panels/universal-access/cc-ua-panel.ui:2232
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "Lyhyt"
 
-#: panels/universal-access/uap.ui:2248
+#: panels/universal-access/cc-ua-panel.ui:2251
 msgid "Bounce keys typing delay"
 msgstr "Kimmonäppäinten kirjoitusviive"
 
-#: panels/universal-access/uap.ui:2263
+#: panels/universal-access/cc-ua-panel.ui:2266
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "Pitkä"
 
-#: panels/universal-access/uap.ui:2376
+#: panels/universal-access/cc-ua-panel.ui:2379
 msgid "_Enable by Keyboard"
 msgstr "_Ota käyttöön näppäimistöä käyttäen"
 
-#: panels/universal-access/uap.ui:2393
+#: panels/universal-access/cc-ua-panel.ui:2396
 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/uap.ui:2457
+#: panels/universal-access/cc-ua-panel.ui:2460
 msgid "Click Assist"
 msgstr "Napsautusapu"
 
-#: panels/universal-access/uap.ui:2493
+#: panels/universal-access/cc-ua-panel.ui:2496
 msgid "_Simulated Secondary Click"
 msgstr "Kakkospainikkeen simuloitu _napsautus"
 
-#: panels/universal-access/uap.ui:2511
+#: panels/universal-access/cc-ua-panel.ui:2514
 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/uap.ui:2565
+#: panels/universal-access/cc-ua-panel.ui:2568
 msgctxt "secondary click"
 msgid "Short"
 msgstr "Lyhyt"
 
-#: panels/universal-access/uap.ui:2584
+#: panels/universal-access/cc-ua-panel.ui:2587
 msgid "Secondary click delay"
 msgstr "Kakkosnäppäimen viive"
 
-#: panels/universal-access/uap.ui:2599
+#: panels/universal-access/cc-ua-panel.ui:2602
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "Pitkä"
 
-#: panels/universal-access/uap.ui:2656
+#: panels/universal-access/cc-ua-panel.ui:2659
 msgid "_Hover Click"
 msgstr "Napsautus _kohdistamalla"
 
-#: panels/universal-access/uap.ui:2674
+#: panels/universal-access/cc-ua-panel.ui:2677
 msgid "Trigger a click when the pointer hovers"
 msgstr "Toteuta painallus, kun hiiren kohdistin kohdistetaan"
 
-#: panels/universal-access/uap.ui:2707
+#: panels/universal-access/cc-ua-panel.ui:2710
 msgid "D_elay:"
 msgstr "Viiv_e:"
 
-#: panels/universal-access/uap.ui:2729
+#: panels/universal-access/cc-ua-panel.ui:2732
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "Lyhyt"
 
-#: panels/universal-access/uap.ui:2760
+#: panels/universal-access/cc-ua-panel.ui:2763
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "Pitkä"
 
-#: panels/universal-access/uap.ui:2796
+#: panels/universal-access/cc-ua-panel.ui:2799
 msgid "Motion _threshold:"
 msgstr "Liikkeen _kynnysarvo:"
 
-#: panels/universal-access/uap.ui:2818
+#: panels/universal-access/cc-ua-panel.ui:2821
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "Pieni"
 
-#: panels/universal-access/uap.ui:2849
+#: panels/universal-access/cc-ua-panel.ui:2852
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "Suuri"
 
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:4
+msgid "Make it easier to see, hear, type, point and click"
+msgstr "Helpota näkemistä, kuulemista, kirjoittamista ja hiiren käyttöä"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:7
+msgid "preferences-desktop-accessibility"
+msgstr "preferences-desktop-accessibility"
+
+#. Translators: Search terms to find the Universal Access panel. Do NOT translate or localize the 
semicolons! The list MUST also end with a semicolon!
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:19
+msgid ""
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Cursor;Sound;Zoom;Screen;Reader;"
+"big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;"
+"click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;audio;typing;"
+msgstr ""
+"Keyboard;Mouse;a11y;Accessibility;Contrast;Cursor;Sound;Zoom;Screen;Reader;"
+"big;high;large;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;"
+"click;Delay;Speed;Assist;Repeat;Blink;visual;hearing;audio;typing;"
+"Näppäimistö;Hiiri;a11y;Esteettömyys;saavutettavuus;Kontrasti;Zoom;Mittakaava;"
+"Lähennys;Loitonnus;Näytönlukija;teksti;fontti;kirjasin;koko;Pohjaan jäävät "
+"näppäimet;Hitaat näppäimet;Kimmonäppäimet;Hiiren painikkeet;kaksois;viive;"
+"vilkkuminen;kuuleminen;kirjoittaminen;"
+
 #: panels/universal-access/zoom-options.c:334
 msgctxt "Distance"
 msgid "Short"
@@ -6443,171 +6775,223 @@ msgstr "Oikea puoli"
 msgid "Zoom Options"
 msgstr "Suurennuksen valinnat"
 
-#: panels/universal-access/zoom-options.ui:188
+#: panels/universal-access/zoom-options.ui:185
 msgid "_Magnification:"
 msgstr "_Suurennus:"
 
-#: panels/universal-access/zoom-options.ui:252
+#: panels/universal-access/zoom-options.ui:249
 msgid "_Follow mouse cursor"
 msgstr "Seuraa _hiiren osoitinta"
 
-#: panels/universal-access/zoom-options.ui:272
+#: panels/universal-access/zoom-options.ui:269
 msgid "_Screen part:"
 msgstr "_Näytön osa:"
 
-#: panels/universal-access/zoom-options.ui:334
+#: panels/universal-access/zoom-options.ui:331
 msgid "Magnifier _extends outside of screen"
 msgstr "Suu_rennuslasi ulottuu näytön ulkopuolelle"
 
-#: panels/universal-access/zoom-options.ui:353
+#: panels/universal-access/zoom-options.ui:350
 msgid "_Keep magnifier cursor centered"
 msgstr "Pi_dä suurennuslasin osoitin keskitettynä"
 
-#: panels/universal-access/zoom-options.ui:372
+#: panels/universal-access/zoom-options.ui:369
 msgid "Magnifier cursor _pushes contents around"
 msgstr "Suur_ennuslasin osoitin työntää sisältöä"
 
-#: panels/universal-access/zoom-options.ui:391
+#: panels/universal-access/zoom-options.ui:388
 msgid "Magnifier cursor moves with _contents"
 msgstr "Suurennuslasin osoit_in siirtyy sisällön kanssa"
 
-#: panels/universal-access/zoom-options.ui:425
+#: panels/universal-access/zoom-options.ui:422
 msgid "Magnifier Position:"
 msgstr "Suurennuslasin sijainti:"
 
-#: panels/universal-access/zoom-options.ui:446
+#: panels/universal-access/zoom-options.ui:443
 msgid "Magnifier"
 msgstr "Suurennuslasi"
 
-#: panels/universal-access/zoom-options.ui:493
+#: panels/universal-access/zoom-options.ui:490
 msgid "_Thickness:"
 msgstr "_Paksuus:"
 
-#: panels/universal-access/zoom-options.ui:519
+#: panels/universal-access/zoom-options.ui:516
 msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "Ohut"
 
-#: panels/universal-access/zoom-options.ui:551
+#: panels/universal-access/zoom-options.ui:548
 msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "Paksu"
 
-#: panels/universal-access/zoom-options.ui:577
+#: panels/universal-access/zoom-options.ui:574
 msgid "_Length:"
 msgstr "Pit_uus:"
 
 #. The color of the accessibility crosshair
-#: panels/universal-access/zoom-options.ui:629
+#: panels/universal-access/zoom-options.ui:623
 msgid "Co_lor:"
 msgstr "Vä_ri:"
 
-#: panels/universal-access/zoom-options.ui:693
+#: panels/universal-access/zoom-options.ui:687
 msgid "_Crosshairs:"
 msgstr "Tähtäi_n:"
 
-#: panels/universal-access/zoom-options.ui:744
+#: panels/universal-access/zoom-options.ui:735
 msgid "_Overlaps mouse cursor"
 msgstr "Hii_ren osoittimen päällä"
 
-#: panels/universal-access/zoom-options.ui:782
+#: panels/universal-access/zoom-options.ui:773
 msgid "Crosshairs"
 msgstr "Tähtäimet"
 
-#: panels/universal-access/zoom-options.ui:831
+#: panels/universal-access/zoom-options.ui:822
 msgid "_White on black:"
 msgstr "Valkoista _mustalla:"
 
-#: panels/universal-access/zoom-options.ui:854
+#: panels/universal-access/zoom-options.ui:842
 msgid "_Brightness:"
 msgstr "K_irkkaus:"
 
-#: panels/universal-access/zoom-options.ui:878
+#: panels/universal-access/zoom-options.ui:863
 msgid "_Contrast:"
 msgstr "_Kontrasti:"
 
 #. The contrast scale goes from Color to None (grayscale)
-#: panels/universal-access/zoom-options.ui:901
+#: panels/universal-access/zoom-options.ui:883
 msgctxt "universal access, contrast"
 msgid "Co_lor"
 msgstr "V_äri"
 
-#: panels/universal-access/zoom-options.ui:929
+#: panels/universal-access/zoom-options.ui:908
 msgctxt "universal access, color"
 msgid "None"
 msgstr "Ei mitään"
 
-#: panels/universal-access/zoom-options.ui:961
+#: panels/universal-access/zoom-options.ui:940
 msgctxt "universal access, color"
 msgid "Full"
 msgstr "Täysi"
 
-#: panels/universal-access/zoom-options.ui:1027
+#: panels/universal-access/zoom-options.ui:1003
 msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "Matala"
 
-#: panels/universal-access/zoom-options.ui:1060
+#: panels/universal-access/zoom-options.ui:1036
 msgctxt "universal access, brightness"
 msgid "High"
 msgstr "Korkea"
 
-#: panels/universal-access/zoom-options.ui:1091
+#: panels/universal-access/zoom-options.ui:1067
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "Matala"
 
-#: panels/universal-access/zoom-options.ui:1124
+#: panels/universal-access/zoom-options.ui:1100
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "Korkea"
 
-#: panels/universal-access/zoom-options.ui:1160
+#: panels/universal-access/zoom-options.ui:1136
 msgid "Color Effects:"
 msgstr "Väritehosteet:"
 
-#: panels/universal-access/zoom-options.ui:1185
+#: panels/universal-access/zoom-options.ui:1161
 msgid "Color Effects"
 msgstr "Väritehosteet"
 
-#: panels/user-accounts/data/account-dialog.ui:18
+#: 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."
+
+#: panels/user-accounts/cc-add-user-dialog.c:204
+msgid "Failed to add account"
+msgstr "Tilin lisäys epäonnistui"
+
+#: panels/user-accounts/cc-add-user-dialog.c:652
+#: panels/user-accounts/cc-password-dialog.c:261
+msgid "The passwords do not match."
+msgstr "Salasanat eivät täsmää."
+
+#: panels/user-accounts/cc-add-user-dialog.c:874
+#: panels/user-accounts/cc-add-user-dialog.c:920
+#: panels/user-accounts/cc-add-user-dialog.c:941
+msgid "Failed to register account"
+msgstr "Tilin rekisteröinti epäonnistui"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1064
+msgid "No supported way to authenticate with this domain"
+msgstr ""
+"Tähän toimialueeseen vaadittavaa tunnistautumistapaa ei ole käytettävissä"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1137
+msgid "Failed to join domain"
+msgstr "Toimialueeseen liittyminen epäonnistui"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1198
+msgid ""
+"That login name didn’t work.\n"
+"Please try again."
+msgstr ""
+"Käyttäjätunnus ei kelvannut.\n"
+"Yritä uudelleen."
+
+#: panels/user-accounts/cc-add-user-dialog.c:1205
+msgid ""
+"That login password didn’t work.\n"
+"Please try again."
+msgstr ""
+"Salasana ei kelvannut.\n"
+"Yritä uudelleen."
+
+#: panels/user-accounts/cc-add-user-dialog.c:1213
+msgid "Failed to log into domain"
+msgstr "Toimialueeseen kirjautuminen epäonnistui"
+
+#: panels/user-accounts/cc-add-user-dialog.c:1271
+msgid "Unable to find the domain. Maybe you misspelled it?"
+msgstr "Toimialuetta ei löytynyt. Kirjoititko sen oikein?"
+
+#: panels/user-accounts/cc-add-user-dialog.ui:18
 #: panels/user-accounts/data/join-dialog.ui:11
 msgid "Add User"
 msgstr "Lisää käyttäjä"
 
-#: panels/user-accounts/data/account-dialog.ui:171
+#: panels/user-accounts/cc-add-user-dialog.ui:179
 msgid "_Full Name"
 msgstr "K_oko nimi"
 
-#: panels/user-accounts/data/account-dialog.ui:197
-#: panels/user-accounts/data/user-accounts-dialog.ui:146
+#: panels/user-accounts/cc-add-user-dialog.ui:205
+#: panels/user-accounts/cc-user-panel.ui:151
 msgid "Standard"
 msgstr "Normaali"
 
-#: panels/user-accounts/data/account-dialog.ui:207
-#: panels/user-accounts/data/user-accounts-dialog.ui:155
+#: panels/user-accounts/cc-add-user-dialog.ui:215
+#: panels/user-accounts/cc-user-panel.ui:161
 msgid "Administrator"
 msgstr "Ylläpitäjä"
 
-#: panels/user-accounts/data/account-dialog.ui:223
-#: panels/user-accounts/data/user-accounts-dialog.ui:173
+#: panels/user-accounts/cc-add-user-dialog.ui:231
+#: panels/user-accounts/cc-user-panel.ui:179
 msgid "Account _Type"
 msgstr "Tilin _tyyppi"
 
-#: panels/user-accounts/data/account-dialog.ui:260
+#: panels/user-accounts/cc-add-user-dialog.ui:268
 msgid "Allow user to set a password when they next _login"
 msgstr "Salli käyttäjän vaihtaa salasana seuraavalla ki_rjautumiskerralla"
 
-#: panels/user-accounts/data/account-dialog.ui:274
+#: panels/user-accounts/cc-add-user-dialog.ui:282
 msgid "Set a password _now"
 msgstr "_Aseta salasana nyt"
 
-#: panels/user-accounts/data/account-dialog.ui:387
+#: panels/user-accounts/cc-add-user-dialog.ui:404
 msgid "_Confirm"
 msgstr "_Vahvista"
 
-#: panels/user-accounts/data/account-dialog.ui:463
-#: panels/user-accounts/data/account-dialog.ui:667
+#: panels/user-accounts/cc-add-user-dialog.ui:484
+#: panels/user-accounts/cc-add-user-dialog.ui:691
 msgid ""
 "Enterprise login allows an existing centrally managed user account to be "
 "used on this device. You can also use this account to access company "
@@ -6617,46 +7001,354 @@ msgstr ""
 "käyttäjätilin käytön tällä laitteella. Voit käyttää tätä tiliä myös "
 "yrityksen resurssien käyttöön internetissä."
 
-#: panels/user-accounts/data/account-dialog.ui:485
+#: panels/user-accounts/cc-add-user-dialog.ui:506
 #: panels/user-accounts/data/join-dialog.ui:116
 msgid "_Domain"
 msgstr "T_oimialue"
 
-#: panels/user-accounts/data/account-dialog.ui:707
+#: panels/user-accounts/cc-add-user-dialog.ui:731
 msgid "You are Offline"
 msgstr "Olet poissa verkosta"
 
-#: panels/user-accounts/data/account-dialog.ui:726
+#: panels/user-accounts/cc-add-user-dialog.ui:750
 msgid "You must be online in order to add enterprise users."
 msgstr "Muodosta verkkoyhteys lisätäksesi yrityskirjautumistilejä."
 
-#: panels/user-accounts/data/account-dialog.ui:760
+#: panels/user-accounts/cc-add-user-dialog.ui:781
 msgid "_Enterprise Login"
 msgstr "_Yrityskirjautumisen vaativa tili"
 
-#: panels/user-accounts/data/account-fingerprint.ui:12
-msgid "Left thumb"
-msgstr "Vasen peukalo"
+#: panels/user-accounts/cc-avatar-chooser.c:230
+msgid "Browse for more pictures"
+msgstr "Selaa lisää kuvia"
 
-#: panels/user-accounts/data/account-fingerprint.ui:15
-msgid "Left middle finger"
-msgstr "Vasen keskisormi"
+#: panels/user-accounts/cc-avatar-chooser.ui:27
+msgid "Take a Picture…"
+msgstr "Ota kuva…"
 
-#: panels/user-accounts/data/account-fingerprint.ui:18
-msgid "Left ring finger"
-msgstr "Vasen nimetön"
+#: panels/user-accounts/cc-avatar-chooser.ui:34
+msgid "Select a File…"
+msgstr "Valitse tiedosto…"
 
-#: panels/user-accounts/data/account-fingerprint.ui:21
-msgid "Left little finger"
-msgstr "Vasen pikkurilli"
+#: panels/user-accounts/cc-login-history-dialog.c:69
+msgid "This Week"
+msgstr "Tällä viikolla"
 
-#: panels/user-accounts/data/account-fingerprint.ui:24
-msgid "Right thumb"
-msgstr "Oikea peukalo"
+#: panels/user-accounts/cc-login-history-dialog.c:72
+msgid "Last Week"
+msgstr "Viime viikolla"
 
-#: panels/user-accounts/data/account-fingerprint.ui:27
-msgid "Right middle finger"
-msgstr "Oikea keskisormi"
+#. Translators: This is a date format string in the style of "Feb 18",
+#. shown as the first day of a week on login history dialog.
+#. Translators: This is a date format string in the style of "Feb 24",
+#. shown as the last day of a week on login history dialog.
+#: panels/user-accounts/cc-login-history-dialog.c:82
+#: panels/user-accounts/cc-login-history-dialog.c:86
+msgctxt "login history week label"
+msgid "%b %e"
+msgstr "%e. %b"
+
+#. Translators: This is a date format string in the style of "Feb 24, 2013",
+#. shown as the last day of a week on login history dialog.
+#: panels/user-accounts/cc-login-history-dialog.c:91
+msgctxt "login history week label"
+msgid "%b %e, %Y"
+msgstr "%e. %b %Y"
+
+#. Translators: This indicates a week label on a login history.
+#. The first %s is the first day of a week, and the second %s the last day.
+#: panels/user-accounts/cc-login-history-dialog.c:96
+#, c-format
+msgctxt "login history week label"
+msgid "%s — %s"
+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:768
+msgctxt "login date-time"
+msgid "%k:%M"
+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:772
+#, c-format
+msgctxt "login date-time"
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: panels/user-accounts/cc-login-history-dialog.c:243
+msgid "Session Ended"
+msgstr "Istunto päättyi"
+
+#: panels/user-accounts/cc-login-history-dialog.c:249
+msgid "Session Started"
+msgstr "Istunto alkoi"
+
+#. Translators: This is the title of the "Account Activity" dialog.
+#. The %s is the user real name.
+#: panels/user-accounts/cc-login-history-dialog.c:343
+#, c-format
+msgid "%s — Account Activity"
+msgstr "%s — Tilin käyttöhistoria"
+
+#: panels/user-accounts/cc-password-dialog.c:125
+msgid "Please choose another password."
+msgstr "Valitse jokin toinen salasana."
+
+#: panels/user-accounts/cc-password-dialog.c:134
+msgid "Please type your current password again."
+msgstr "Syötä nykyinen salasana uudelleen."
+
+#: panels/user-accounts/cc-password-dialog.c:140
+msgid "Password could not be changed"
+msgstr "Salasanaa ei voitu vaihtaa"
+
+#: panels/user-accounts/cc-password-dialog.ui:7
+msgid "Change Password"
+msgstr "Vaihda salasana"
+
+#: panels/user-accounts/cc-password-dialog.ui:37
+msgid "Ch_ange"
+msgstr "_Vaihda"
+
+#: panels/user-accounts/cc-password-dialog.ui:145
+msgid "_Confirm New Password"
+msgstr "_Vahvista uusi salasana"
+
+#: panels/user-accounts/cc-password-dialog.ui:162
+msgid "_New Password"
+msgstr "_Uusi salasana"
+
+#: panels/user-accounts/cc-password-dialog.ui:216
+msgid "Current _Password"
+msgstr "_Nykyinen salasana"
+
+#: panels/user-accounts/cc-password-dialog.ui:254
+msgid "Allow user to change their password on next login"
+msgstr "Salli käyttäjän vaihtaa salasana seuraavalla kirjautumiskerralla"
+
+#: panels/user-accounts/cc-password-dialog.ui:267
+msgid "Set a password now"
+msgstr "Aseta salasana nyt"
+
+#: panels/user-accounts/cc-realm-manager.c:307
+msgid "Cannot automatically join this type of domain"
+msgstr "Tämän tyyppiseen toimialueeseen ei voi liittyä automaattisesti"
+
+#: panels/user-accounts/cc-realm-manager.c:310
+msgid "No such domain or realm found"
+msgstr "Määriteltyä toimialuetta tai realmia ei löytynyt"
+
+#: panels/user-accounts/cc-realm-manager.c:732
+#: panels/user-accounts/cc-realm-manager.c:746
+#, c-format
+msgid "Cannot log in as %s at the %s domain"
+msgstr "Kirjautuminen tunnuksella %s toimialueeseen %s ei onnistu"
+
+#: panels/user-accounts/cc-realm-manager.c:738
+msgid "Invalid password, please try again"
+msgstr "Virheellinen salasana, yritä uudelleen"
+
+#: panels/user-accounts/cc-realm-manager.c:751
+#, c-format
+msgid "Couldn’t connect to the %s domain: %s"
+msgstr "Toimialueeseen %s yhdistäminen epäonnistui: %s"
+
+#: panels/user-accounts/cc-user-panel.c:212
+msgid "Your account"
+msgstr "Tilisi"
+
+#: panels/user-accounts/cc-user-panel.c:386
+msgid "Failed to delete user"
+msgstr "Käyttäjän poisto epäonnistui"
+
+#: panels/user-accounts/cc-user-panel.c:444
+#: panels/user-accounts/cc-user-panel.c:503
+#: panels/user-accounts/cc-user-panel.c:555
+msgid "Failed to revoke remotely managed user"
+msgstr "Etähallitun käyttäjän kumoaminen epäonnistui"
+
+#: panels/user-accounts/cc-user-panel.c:607
+msgid "You cannot delete your own account."
+msgstr "Et voi poistaa omaa tunnustasi."
+
+#: panels/user-accounts/cc-user-panel.c:616
+#, c-format
+msgid "%s is still logged in"
+msgstr "%s on yhä sisäänkirjautuneena"
+
+#: panels/user-accounts/cc-user-panel.c:620
+msgid ""
+"Deleting a user while they are logged in can leave the system in an "
+"inconsistent state."
+msgstr ""
+"Jos käyttäjä poistetaan hänen ollessaan sisäänkirjautuneena, järjestelmässä "
+"voi ilmetä ongelmia."
+
+#: panels/user-accounts/cc-user-panel.c:629
+#, 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:633
+msgid ""
+"It is possible to keep the home directory, mail spool and temporary files "
+"around when deleting a user account."
+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:636
+msgid "_Delete Files"
+msgstr "P_oista tiedostot"
+
+#: panels/user-accounts/cc-user-panel.c:637
+msgid "_Keep Files"
+msgstr "_Säilytä tiedostot"
+
+#: panels/user-accounts/cc-user-panel.c:651
+#, 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:655
+msgid "_Delete"
+msgstr "_Poista"
+
+#: panels/user-accounts/cc-user-panel.c:705
+msgctxt "Password mode"
+msgid "Account disabled"
+msgstr "Käyttäjätili pois käytöstä"
+
+#: panels/user-accounts/cc-user-panel.c:713
+msgctxt "Password mode"
+msgid "To be set at next login"
+msgstr "Asetetaan seuraavalla kirjautumiskerralla"
+
+#: panels/user-accounts/cc-user-panel.c:716
+msgctxt "Password mode"
+msgid "None"
+msgstr "Ei mitään"
+
+#: panels/user-accounts/cc-user-panel.c:761
+msgid "Logged in"
+msgstr "Sisäänkirjautuneena"
+
+#: panels/user-accounts/cc-user-panel.c:1091
+msgid "Failed to contact the accounts service"
+msgstr "Yhteys tilipalveluun (accounts service) epäonnistui"
+
+#: panels/user-accounts/cc-user-panel.c:1093
+msgid "Please make sure that the AccountService is installed and enabled."
+msgstr "Varmista, että AccountService on asennettu ja käytössä."
+
+#. Translator comments:
+#. * 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:1125
+msgid ""
+"To make changes,\n"
+"click the * icon first"
+msgstr ""
+"Tee muutoksia\n"
+"napsauttamalla ensin *-kuvaketta"
+
+#: panels/user-accounts/cc-user-panel.c:1198
+msgid "Create a user account"
+msgstr "Luo käyttäjätili"
+
+#: panels/user-accounts/cc-user-panel.c:1209
+#: panels/user-accounts/cc-user-panel.c:1337
+msgid ""
+"To create a user account,\n"
+"click the * icon first"
+msgstr ""
+"Luo käyttäjätili\n"
+"napsauttamalla ensin *-kuvaketta"
+
+#: panels/user-accounts/cc-user-panel.c:1218
+msgid "Delete the selected user account"
+msgstr "Poista valittu käyttäjätili"
+
+#: panels/user-accounts/cc-user-panel.c:1230
+#: panels/user-accounts/cc-user-panel.c:1341
+msgid ""
+"To delete the selected user account,\n"
+"click the * icon first"
+msgstr ""
+"Poista valittu käyttäjä\n"
+"napsauttamalla ensin *-kuvaketta"
+
+#: panels/user-accounts/cc-user-panel.ui:18
+msgid "_Add User…"
+msgstr "_Lisää käyttäjä…"
+
+#: panels/user-accounts/cc-user-panel.ui:70
+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
+msgid "Restart Now"
+msgstr "Käynnistä uudelleen nyt"
+
+#: panels/user-accounts/cc-user-panel.ui:253
+msgid "A_utomatic Login"
+msgstr "A_utomaattinen kirjautuminen"
+
+#: panels/user-accounts/cc-user-panel.ui:295
+msgid "_Fingerprint Login"
+msgstr "_Sormenjäljellä kirjautuminen"
+
+#: panels/user-accounts/cc-user-panel.ui:321
+#: panels/user-accounts/cc-user-panel.ui:337
+msgid "User Icon"
+msgstr "Käyttäjän kuvake"
+
+#: panels/user-accounts/cc-user-panel.ui:401
+msgid "Last Login"
+msgstr "Viimeisin kirjautuminen"
+
+#: panels/user-accounts/cc-user-panel.ui:450
+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:483
+msgid "No Users Found"
+msgstr "Käyttäjiä ei löytynyt"
+
+#: panels/user-accounts/cc-user-panel.ui:493
+msgid "Unlock to add a user account."
+msgstr "Avaa lukitus lisätäksesi käyttäjätilin."
+
+#: panels/user-accounts/data/account-fingerprint.ui:12
+msgid "Left thumb"
+msgstr "Vasen peukalo"
+
+#: panels/user-accounts/data/account-fingerprint.ui:15
+msgid "Left middle finger"
+msgstr "Vasen keskisormi"
+
+#: panels/user-accounts/data/account-fingerprint.ui:18
+msgid "Left ring finger"
+msgstr "Vasen nimetön"
+
+#: panels/user-accounts/data/account-fingerprint.ui:21
+msgid "Left little finger"
+msgstr "Vasen pikkurilli"
+
+#: panels/user-accounts/data/account-fingerprint.ui:24
+msgid "Right thumb"
+msgstr "Oikea peukalo"
+
+#: panels/user-accounts/data/account-fingerprint.ui:27
+msgid "Right middle finger"
+msgstr "Oikea keskisormi"
 
 #: panels/user-accounts/data/account-fingerprint.ui:30
 msgid "Right ring finger"
@@ -6691,14 +7383,6 @@ msgstr ""
 "Sormenjälkesi tallennettiin onnistuneesti. Sinun pitäisi nyt pystyä "
 "kirjautumaan sisään sormenjäljen avulla."
 
-#: panels/user-accounts/data/avatar-chooser.ui:27
-msgid "Take a Picture…"
-msgstr "Ota kuva…"
-
-#: panels/user-accounts/data/avatar-chooser.ui:34
-msgid "Select a File…"
-msgstr "Valitse tiedosto…"
-
 #: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
 msgid "Users"
 msgstr "Käyttäjät"
@@ -6746,76 +7430,6 @@ msgstr "Ylläpitäjän _nimi"
 msgid "Administrator Password"
 msgstr "Ylläpitäjän salasana"
 
-#: panels/user-accounts/data/password-dialog.ui:7
-msgid "Change Password"
-msgstr "Vaihda salasana"
-
-#: panels/user-accounts/data/password-dialog.ui:38
-msgid "Ch_ange"
-msgstr "_Vaihda"
-
-#: panels/user-accounts/data/password-dialog.ui:142
-msgid "_Confirm New Password"
-msgstr "_Vahvista uusi salasana"
-
-#: panels/user-accounts/data/password-dialog.ui:159
-msgid "_New Password"
-msgstr "_Uusi salasana"
-
-#: panels/user-accounts/data/password-dialog.ui:208
-msgid "Current _Password"
-msgstr "_Nykyinen salasana"
-
-#: panels/user-accounts/data/password-dialog.ui:243
-msgid "Allow user to change their password on next login"
-msgstr "Salli käyttäjän vaihtaa salasana seuraavalla kirjautumiskerralla"
-
-#: panels/user-accounts/data/password-dialog.ui:256
-msgid "Set a password now"
-msgstr "Aseta salasana nyt"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:20
-msgid "_Add User…"
-msgstr "_Lisää käyttäjä…"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:69
-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/data/user-accounts-dialog.ui:77
-msgid "Restart Now"
-msgstr "Käynnistä uudelleen nyt"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:244
-msgid "A_utomatic Login"
-msgstr "A_utomaattinen kirjautuminen"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:285
-msgid "_Fingerprint Login"
-msgstr "_Sormenjäljellä kirjautuminen"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:311
-#: panels/user-accounts/data/user-accounts-dialog.ui:324
-msgid "User Icon"
-msgstr "Käyttäjän kuvake"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:387
-msgid "Last Login"
-msgstr "Viimeisin kirjautuminen"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:434
-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/data/user-accounts-dialog.ui:466
-msgid "No Users Found"
-msgstr "Käyttäjiä ei löytynyt"
-
-#: panels/user-accounts/data/user-accounts-dialog.ui:476
-msgid "Unlock to add a user account."
-msgstr "Avaa lukitus lisätäksesi käyttäjätilin."
-
 #: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:11
 msgid "Manage user accounts"
 msgstr "Hallitse käyttäjätilejä"
@@ -6824,77 +7438,77 @@ msgstr "Hallitse käyttäjätilejä"
 msgid "Authentication is required to change user data"
 msgstr "Käyttäjätietojen muuttaminen vaatii tunnistautuminen"
 
-#: panels/user-accounts/pw-utils.c:81
+#: panels/user-accounts/pw-utils.c:94
 msgctxt "Password hint"
 msgid "The new password needs to be different from the old one."
 msgstr "Uusi salasana ei saa olla vanhan salasanan kaltainen."
 
-#: panels/user-accounts/pw-utils.c:83
+#: panels/user-accounts/pw-utils.c:96
 msgctxt "Password hint"
 msgid "Try changing some letters and numbers."
 msgstr "Vaihda kirjaimia ja numeroita."
 
-#: panels/user-accounts/pw-utils.c:85 panels/user-accounts/pw-utils.c:93
+#: panels/user-accounts/pw-utils.c:98 panels/user-accounts/pw-utils.c:106
 msgctxt "Password hint"
 msgid "Try changing the password a bit more."
 msgstr "Yritä muuttaa salasanaa vielä hieman."
 
-#: panels/user-accounts/pw-utils.c:87
+#: panels/user-accounts/pw-utils.c:100
 msgctxt "Password hint"
 msgid "A password without your user name would be stronger."
 msgstr "Älä laita käyttäjätunnustasi salasanaasi."
 
-#: panels/user-accounts/pw-utils.c:89
+#: panels/user-accounts/pw-utils.c:102
 msgctxt "Password hint"
 msgid "Try to avoid using your name in the password."
 msgstr "Älä laita nimeäsi salasanaasi."
 
-#: panels/user-accounts/pw-utils.c:91
+#: panels/user-accounts/pw-utils.c:104
 msgctxt "Password hint"
 msgid "Try to avoid some of the words included in the password."
 msgstr "Vältä salasanassasi olevia sanoja."
 
-#: panels/user-accounts/pw-utils.c:95
+#: panels/user-accounts/pw-utils.c:108
 msgctxt "Password hint"
 msgid "Try to avoid common words."
 msgstr "Vältä yleisiä, sanakirjoista löytyviä sanoja."
 
-#: panels/user-accounts/pw-utils.c:97
+#: panels/user-accounts/pw-utils.c:110
 msgctxt "Password hint"
 msgid "Try to avoid reordering existing words."
 msgstr "Älä käytä samoja sanoja eri järjestyksessä."
 
-#: panels/user-accounts/pw-utils.c:99
+#: panels/user-accounts/pw-utils.c:112
 msgctxt "Password hint"
 msgid "Try to use more numbers."
 msgstr "Käytä enemmän numeroita."
 
-#: panels/user-accounts/pw-utils.c:101
+#: panels/user-accounts/pw-utils.c:114
 msgctxt "Password hint"
 msgid "Try to use more uppercase letters."
 msgstr "Käytä enemmän isoja kirjaimia."
 
-#: panels/user-accounts/pw-utils.c:103
+#: panels/user-accounts/pw-utils.c:116
 msgctxt "Password hint"
 msgid "Try to use more lowercase letters."
 msgstr "Käytä enemmän pieniä kirjaimia."
 
-#: panels/user-accounts/pw-utils.c:105
+#: panels/user-accounts/pw-utils.c:118
 msgctxt "Password hint"
 msgid "Try to use more special characters, like punctuation."
 msgstr "Käytä erikois- ja välimerkkejä."
 
-#: panels/user-accounts/pw-utils.c:107
+#: panels/user-accounts/pw-utils.c:120
 msgctxt "Password hint"
 msgid "Try to use a mixture of letters, numbers and punctuation."
 msgstr "Sekoita kirjaimia, numeroita ja välimerkkejä."
 
-#: panels/user-accounts/pw-utils.c:109
+#: panels/user-accounts/pw-utils.c:122
 msgctxt "Password hint"
 msgid "Try to avoid repeating the same character."
 msgstr "Vältä toistamasta samaa merkkiä."
 
-#: panels/user-accounts/pw-utils.c:111
+#: panels/user-accounts/pw-utils.c:124
 msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
@@ -6903,12 +7517,12 @@ msgstr ""
 "Vältä saman merkkityylin käyttöä: sekoita kirjaimia, numeroita ja "
 "välimerkkejä."
 
-#: panels/user-accounts/pw-utils.c:113
+#: panels/user-accounts/pw-utils.c:126
 msgctxt "Password hint"
 msgid "Try to avoid sequences like 1234 or abcd."
 msgstr "Vältä sarjan kaltaisia jonoja, kuten 1234 tai abcd."
 
-#: panels/user-accounts/pw-utils.c:115
+#: panels/user-accounts/pw-utils.c:128
 msgctxt "Password hint"
 msgid ""
 "Password needs to be longer. Try to add more letters, numbers and "
@@ -6917,12 +7531,12 @@ msgstr ""
 "Salasanan tulee olla nykyistä pidempi. Lisää kirjaimia, numeroita ja "
 "erikoismerkkejä."
 
-#: panels/user-accounts/pw-utils.c:117
+#: panels/user-accounts/pw-utils.c:130
 msgctxt "Password hint"
 msgid "Mix uppercase and lowercase and try to use a number or two."
 msgstr "Käytä isoja ja pieniä kirjaimia sekä joitain numeroita."
 
-#: panels/user-accounts/pw-utils.c:119
+#: panels/user-accounts/pw-utils.c:132
 msgctxt "Password hint"
 msgid ""
 "Adding more letters, numbers and punctuation will make the password stronger."
@@ -6933,444 +7547,67 @@ msgstr ""
 msgid "Authentication failed"
 msgstr "Tunnistautuminen epäonnistui"
 
-#: panels/user-accounts/run-passwd.c:502
-#, c-format
-msgid "The new password is too short"
-msgstr "Uusi salasana on liian lyhyt"
-
-#: panels/user-accounts/run-passwd.c:508
-#, c-format
-msgid "The new password is too simple"
-msgstr "Uusi salasana on liian yksinkertainen"
-
-#: panels/user-accounts/run-passwd.c:514
-#, 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
-#, 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
-#, 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
-#, 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
-#, 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
-#, 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
-#, c-format
-msgid "Unknown error"
-msgstr "Tuntematon virhe"
-
-#: panels/user-accounts/um-account-dialog.c:34
-msgid "Should match the web address of your login provider."
-msgstr "Tulisi vastata kirjautumistilisi myöntäjän verkko-osoitetta."
-
-#: panels/user-accounts/um-account-dialog.c:225
-msgid "Failed to add account"
-msgstr "Tilin lisäys epäonnistui"
-
-#: panels/user-accounts/um-account-dialog.c:465
-#: panels/user-accounts/um-password-dialog.c:291
-msgid "The passwords do not match."
-msgstr "Salasanat eivät täsmää."
-
-#: panels/user-accounts/um-account-dialog.c:736
-#: panels/user-accounts/um-account-dialog.c:782
-#: panels/user-accounts/um-account-dialog.c:803
-msgid "Failed to register account"
-msgstr "Tilin rekisteröinti epäonnistui"
-
-#: panels/user-accounts/um-account-dialog.c:926
-msgid "No supported way to authenticate with this domain"
-msgstr ""
-"Tähän toimialueeseen vaadittavaa tunnistautumistapaa ei ole käytettävissä"
-
-#: panels/user-accounts/um-account-dialog.c:999
-msgid "Failed to join domain"
-msgstr "Toimialueeseen liittyminen epäonnistui"
-
-#: panels/user-accounts/um-account-dialog.c:1060
-msgid ""
-"That login name didn’t work.\n"
-"Please try again."
-msgstr ""
-"Käyttäjätunnus ei kelvannut.\n"
-"Yritä uudelleen."
-
-#: panels/user-accounts/um-account-dialog.c:1067
-msgid ""
-"That login password didn’t work.\n"
-"Please try again."
-msgstr ""
-"Salasana ei kelvannut.\n"
-"Yritä uudelleen."
-
-#: panels/user-accounts/um-account-dialog.c:1075
-msgid "Failed to log into domain"
-msgstr "Toimialueeseen kirjautuminen epäonnistui"
-
-#: panels/user-accounts/um-account-dialog.c:1133
-msgid "Unable to find the domain. Maybe you misspelled it?"
-msgstr "Toimialuetta ei löytynyt. Kirjoititko sen oikein?"
-
-#: panels/user-accounts/um-account-type.c:34
-msgctxt "Account type"
-msgid "Standard"
-msgstr "Normaali"
-
-#: panels/user-accounts/um-account-type.c:36
-msgctxt "Account type"
-msgid "Administrator"
-msgstr "Ylläpitäjä"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:139
-msgid ""
-"You are not allowed to access the device. Contact your system administrator."
-msgstr ""
-"Sinulla ei ole oikeutta käyttää laitetta. Ota yhteyttä ylläpitäjäjääsi."
-
-#: panels/user-accounts/um-fingerprint-dialog.c:141
-msgid "The device is already in use."
-msgstr "Laite on jo käytössä."
-
-#: panels/user-accounts/um-fingerprint-dialog.c:143
-msgid "An internal error occurred."
-msgstr "Tapahtui sisäinen virhe."
-
-#: panels/user-accounts/um-fingerprint-dialog.c:214
-msgid "Enabled"
-msgstr "Käytössä"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:260
-msgid "Delete registered fingerprints?"
-msgstr "Poistetaanko rekisteröidyt sormenjäljet?"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:264
-msgid "_Delete Fingerprints"
-msgstr "_Poista sormenjäljet"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:270
-msgid ""
-"Do you want to delete your registered fingerprints so fingerprint login is "
-"disabled?"
-msgstr ""
-"Haluatko poistaa rekisteröidyt sormenjälkesi, jolloin sormenjäljillä "
-"kirjautuminen poistetaan käytöstä?"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:440
-msgid "Done!"
-msgstr "Valmis!"
-
-#. translators:
-#. * The variable is the name of the device, for example:
-#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: panels/user-accounts/um-fingerprint-dialog.c:501
-#: panels/user-accounts/um-fingerprint-dialog.c:543
-#, c-format
-msgid "Could not access “%s” device"
-msgstr "Laitetta ”%s” ei voitu käsitellä"
-
-#. translators:
-#. * The variable is the name of the device, for example:
-#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
-#: panels/user-accounts/um-fingerprint-dialog.c:584
-#, c-format
-msgid "Could not start finger capture on “%s” device"
-msgstr "Sormenjäljen tunnistusta ei voitu aloittaa laitteella ”%s”"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:628
-msgid "Could not access any fingerprint readers"
-msgstr "Sormenjälkilukijoita ei voitu käyttää"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:629
-msgid "Please contact your system administrator for help."
-msgstr "Kysy apua järjestelmäsi ylläpitäjältä."
-
-#. translators:
-#. * The variable is the name of the device, for example:
-#. * "To enable fingerprint login, you need to save one of your fingerprints, using the
-#. * 'Digital Persona U.are.U 4000/4000B' device."
-#.
-#: panels/user-accounts/um-fingerprint-dialog.c:711
-#, c-format
-msgid ""
-"To enable fingerprint login, you need to save one of your fingerprints, "
-"using the “%s” device."
-msgstr ""
-"Jotta voit ottaa sormenjäljellä kirjautumisen käyttöön, täytyy yksi "
-"sormenjäljistä tallentaa käyttäen laitetta ”%s”."
-
-#: panels/user-accounts/um-fingerprint-dialog.c:718
-msgid "Selecting finger"
-msgstr "Valitaan sormea"
-
-#: panels/user-accounts/um-fingerprint-dialog.c:719
-msgid "Enrolling fingerprints"
-msgstr "Kirjataan sormenjälkiä"
-
-#: panels/user-accounts/um-history-dialog.c:70
-msgid "This Week"
-msgstr "Tällä viikolla"
-
-#: panels/user-accounts/um-history-dialog.c:73
-msgid "Last Week"
-msgstr "Viime viikolla"
-
-#. Translators: This is a date format string in the style of "Feb 18",
-#. shown as the first day of a week on login history dialog.
-#. Translators: This is a date format string in the style of "Feb 24",
-#. shown as the last day of a week on login history dialog.
-#: panels/user-accounts/um-history-dialog.c:79
-#: panels/user-accounts/um-history-dialog.c:83
-msgctxt "login history week label"
-msgid "%b %e"
-msgstr "%e. %b"
-
-#. Translators: This is a date format string in the style of "Feb 24, 2013",
-#. shown as the last day of a week on login history dialog.
-#: panels/user-accounts/um-history-dialog.c:88
-msgctxt "login history week label"
-msgid "%b %e, %Y"
-msgstr "%e. %b %Y"
-
-#. Translators: This indicates a week label on a login history.
-#. The first %s is the first day of a week, and the second %s the last day.
-#: panels/user-accounts/um-history-dialog.c:93
-#, c-format
-msgctxt "login history week label"
-msgid "%s — %s"
-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/um-history-dialog.c:177
-#: panels/user-accounts/um-user-panel.c:763
-msgctxt "login date-time"
-msgid "%k:%M"
-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/um-history-dialog.c:180
-#: panels/user-accounts/um-user-panel.c:767
-#, c-format
-msgctxt "login date-time"
-msgid "%s, %s"
-msgstr "%s, %s"
-
-#: panels/user-accounts/um-history-dialog.c:250
-msgid "Session Ended"
-msgstr "Istunto päättyi"
-
-#: panels/user-accounts/um-history-dialog.c:256
-msgid "Session Started"
-msgstr "Istunto alkoi"
-
-#. Translators: This is the title of the "Account Activity" dialog.
-#. The %s is the user real name.
-#: panels/user-accounts/um-history-dialog.c:299
-#, c-format
-msgid "%s — Account Activity"
-msgstr "%s — Tilin käyttöhistoria"
-
-#: panels/user-accounts/um-password-dialog.c:150
-msgid "Please choose another password."
-msgstr "Valitse jokin toinen salasana."
-
-#: panels/user-accounts/um-password-dialog.c:159
-msgid "Please type your current password again."
-msgstr "Syötä nykyinen salasana uudelleen."
-
-#: panels/user-accounts/um-password-dialog.c:165
-msgid "Password could not be changed"
-msgstr "Salasanaa ei voitu vaihtaa"
-
-#: panels/user-accounts/um-photo-dialog.c:227
-msgid "Browse for more pictures"
-msgstr "Selaa lisää kuvia"
-
-#: panels/user-accounts/um-realm-manager.c:307
-msgid "Cannot automatically join this type of domain"
-msgstr "Tämän tyyppiseen toimialueeseen ei voi liittyä automaattisesti"
-
-#: panels/user-accounts/um-realm-manager.c:310
-msgid "No such domain or realm found"
-msgstr "Määriteltyä toimialuetta tai realmia ei löytynyt"
-
-#: panels/user-accounts/um-realm-manager.c:732
-#: panels/user-accounts/um-realm-manager.c:746
-#, c-format
-msgid "Cannot log in as %s at the %s domain"
-msgstr "Kirjautuminen tunnuksella %s toimialueeseen %s ei onnistu"
-
-#: panels/user-accounts/um-realm-manager.c:738
-msgid "Invalid password, please try again"
-msgstr "Virheellinen salasana, yritä uudelleen"
-
-#: panels/user-accounts/um-realm-manager.c:751
-#, c-format
-msgid "Couldn’t connect to the %s domain: %s"
-msgstr "Toimialueeseen %s yhdistäminen epäonnistui: %s"
-
-#: panels/user-accounts/um-user-panel.c:199
-msgid "Your account"
-msgstr "Tilisi"
-
-#: panels/user-accounts/um-user-panel.c:379
-msgid "Failed to delete user"
-msgstr "Käyttäjän poisto epäonnistui"
-
-#: panels/user-accounts/um-user-panel.c:437
-#: panels/user-accounts/um-user-panel.c:496
-#: panels/user-accounts/um-user-panel.c:548
-msgid "Failed to revoke remotely managed user"
-msgstr "Etähallitun käyttäjän kumoaminen epäonnistui"
-
-#: panels/user-accounts/um-user-panel.c:600
-msgid "You cannot delete your own account."
-msgstr "Et voi poistaa omaa tunnustasi."
-
-#: panels/user-accounts/um-user-panel.c:609
-#, c-format
-msgid "%s is still logged in"
-msgstr "%s on yhä sisäänkirjautuneena"
-
-#: panels/user-accounts/um-user-panel.c:613
-msgid ""
-"Deleting a user while they are logged in can leave the system in an "
-"inconsistent state."
-msgstr ""
-"Jos käyttäjä poistetaan hänen ollessaan sisäänkirjautuneena, järjestelmässä "
-"voi ilmetä ongelmia."
-
-#: panels/user-accounts/um-user-panel.c:622
-#, c-format
-msgid "Do you want to keep %s’s files?"
-msgstr "Haluatko säilyttää käyttäjän %s tiedostot?"
-
-#: panels/user-accounts/um-user-panel.c:626
-msgid ""
-"It is possible to keep the home directory, mail spool and temporary files "
-"around when deleting a user account."
-msgstr ""
-"Voit halutessasi säilyttää kotikansion, sähköpostit ja väliaikaistiedostot "
-"käyttäjätilin poiston yhteydessä."
-
-#: panels/user-accounts/um-user-panel.c:629
-msgid "_Delete Files"
-msgstr "P_oista tiedostot"
-
-#: panels/user-accounts/um-user-panel.c:630
-msgid "_Keep Files"
-msgstr "_Säilytä tiedostot"
-
-#: panels/user-accounts/um-user-panel.c:644
-#, 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/um-user-panel.c:648
-msgid "_Delete"
-msgstr "_Poista"
-
-#: panels/user-accounts/um-user-panel.c:698
-msgctxt "Password mode"
-msgid "Account disabled"
-msgstr "Käyttäjätili pois käytöstä"
-
-#: panels/user-accounts/um-user-panel.c:706
-msgctxt "Password mode"
-msgid "To be set at next login"
-msgstr "Asetetaan seuraavalla kirjautumiskerralla"
-
-#: panels/user-accounts/um-user-panel.c:709
-msgctxt "Password mode"
-msgid "None"
-msgstr "Ei mitään"
+#: panels/user-accounts/run-passwd.c:502
+#, c-format
+msgid "The new password is too short"
+msgstr "Uusi salasana on liian lyhyt"
 
-#: panels/user-accounts/um-user-panel.c:756
-msgid "Logged in"
-msgstr "Sisäänkirjautuneena"
+#: panels/user-accounts/run-passwd.c:508
+#, c-format
+msgid "The new password is too simple"
+msgstr "Uusi salasana on liian yksinkertainen"
 
-#: panels/user-accounts/um-user-panel.c:1105
-msgid "Failed to contact the accounts service"
-msgstr "Yhteys tilipalveluun (accounts service) epäonnistui"
+#: panels/user-accounts/run-passwd.c:514
+#, c-format
+msgid "The old and new passwords are too similar"
+msgstr "Vanha ja uusi salasana ovat liian samankaltaiset"
 
-#: panels/user-accounts/um-user-panel.c:1107
-msgid "Please make sure that the AccountService is installed and enabled."
-msgstr "Varmista, että AccountService on asennettu ja käytössä."
+#: panels/user-accounts/run-passwd.c:517
+#, c-format
+msgid "The new password has already been used recently."
+msgstr "Uusi salasana on ollut jo käytössä äskettäin."
 
-#. Translator comments:
-#. * 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/um-user-panel.c:1139
-msgid ""
-"To make changes,\n"
-"click the * icon first"
-msgstr ""
-"Tee muutoksia\n"
-"napsauttamalla ensin *-kuvaketta"
+#: panels/user-accounts/run-passwd.c:520
+#, c-format
+msgid "The new password must contain numeric or special characters"
+msgstr "Uuden salasanan tulee sisältää numeroita tai erikoismerkkejä"
 
-#: panels/user-accounts/um-user-panel.c:1179
-msgid "Create a user account"
-msgstr "Luo käyttäjätili"
+#: panels/user-accounts/run-passwd.c:524
+#, c-format
+msgid "The old and new passwords are the same"
+msgstr "Vanha ja uusi salasana ovat samat"
 
-#: panels/user-accounts/um-user-panel.c:1190
-#: panels/user-accounts/um-user-panel.c:1368
-msgid ""
-"To create a user account,\n"
-"click the * icon first"
-msgstr ""
-"Luo käyttäjätili\n"
-"napsauttamalla ensin *-kuvaketta"
+#: panels/user-accounts/run-passwd.c:528
+#, c-format
+msgid "Your password has been changed since you initially authenticated!"
+msgstr "Salasanasi on vaihtunut ensimmäisen todennuksen jälkeen!"
 
-#: panels/user-accounts/um-user-panel.c:1200
-msgid "Delete the selected user account"
-msgstr "Poista valittu käyttäjätili"
+#: panels/user-accounts/run-passwd.c:532
+#, 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/um-user-panel.c:1212
-#: panels/user-accounts/um-user-panel.c:1373
-msgid ""
-"To delete the selected user account,\n"
-"click the * icon first"
-msgstr ""
-"Poista valittu käyttäjä\n"
-"napsauttamalla ensin *-kuvaketta"
+#: panels/user-accounts/run-passwd.c:536
+#, c-format
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
 
-#: panels/user-accounts/um-utils.c:496
+#: panels/user-accounts/user-utils.c:430
 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/um-utils.c:499
+#: panels/user-accounts/user-utils.c:433
 #, c-format
 msgid "The username is too long."
 msgstr "Käyttäjätunnus on liian pitkä."
 
-#: panels/user-accounts/um-utils.c:502
+#: panels/user-accounts/user-utils.c:436
 msgid "The username cannot start with a “-”."
 msgstr "Käyttäjätunnus ei voi alkaa merkillä ”-”."
 
-#: panels/user-accounts/um-utils.c:505
+#: panels/user-accounts/user-utils.c:439
 msgid ""
 "The username should only consist of upper and lower case letters from a-z, "
 "digits and the following characters: . - _"
@@ -7378,15 +7615,100 @@ msgstr ""
 "Käyttäjätunnus voi koostua pienistä ja isoista kirjaimista välillä a-z, "
 "numeroista sekä seuraavista merkeistä: . - _"
 
-#: panels/user-accounts/um-utils.c:509
+#: panels/user-accounts/user-utils.c:443
 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."
+msgstr ""
+"Sinulla ei ole oikeutta käyttää laitetta. Ota yhteyttä ylläpitäjäjääsi."
+
+#: panels/user-accounts/um-fingerprint-dialog.c:141
+msgid "The device is already in use."
+msgstr "Laite on jo käytössä."
+
+#: panels/user-accounts/um-fingerprint-dialog.c:143
+msgid "An internal error occurred."
+msgstr "Tapahtui sisäinen virhe."
+
+#: panels/user-accounts/um-fingerprint-dialog.c:214
+msgid "Enabled"
+msgstr "Käytössä"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:260
+msgid "Delete registered fingerprints?"
+msgstr "Poistetaanko rekisteröidyt sormenjäljet?"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:264
+msgid "_Delete Fingerprints"
+msgstr "_Poista sormenjäljet"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:270
+msgid ""
+"Do you want to delete your registered fingerprints so fingerprint login is "
+"disabled?"
+msgstr ""
+"Haluatko poistaa rekisteröidyt sormenjälkesi, jolloin sormenjäljillä "
+"kirjautuminen poistetaan käytöstä?"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:440
+msgid "Done!"
+msgstr "Valmis!"
+
+#. translators:
+#. * The variable is the name of the device, for example:
+#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
+#: panels/user-accounts/um-fingerprint-dialog.c:501
+#: panels/user-accounts/um-fingerprint-dialog.c:543
+#, c-format
+msgid "Could not access “%s” device"
+msgstr "Laitetta ”%s” ei voitu käsitellä"
+
+#. translators:
+#. * The variable is the name of the device, for example:
+#. * "Could you not access "Digital Persona U.are.U 4000/4000B" device
+#: panels/user-accounts/um-fingerprint-dialog.c:584
+#, c-format
+msgid "Could not start finger capture on “%s” device"
+msgstr "Sormenjäljen tunnistusta ei voitu aloittaa laitteella “%s”"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:628
+msgid "Could not access any fingerprint readers"
+msgstr "Sormenjälkilukijoita ei voitu käyttää"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:629
+msgid "Please contact your system administrator for help."
+msgstr "Kysy apua järjestelmäsi ylläpitäjältä."
+
+#. translators:
+#. * The variable is the name of the device, for example:
+#. * "To enable fingerprint login, you need to save one of your fingerprints, using the
+#. * 'Digital Persona U.are.U 4000/4000B' device."
+#.
+#: panels/user-accounts/um-fingerprint-dialog.c:711
+#, c-format
+msgid ""
+"To enable fingerprint login, you need to save one of your fingerprints, "
+"using the “%s” device."
+msgstr ""
+"Jotta voit ottaa sormenjäljellä kirjautumisen käyttöön, täytyy yksi "
+"sormenjäljistä tallentaa käyttäen laitetta ”%s”."
+
+#: panels/user-accounts/um-fingerprint-dialog.c:718
+msgid "Selecting finger"
+msgstr "Valitaan sormea"
+
+#: panels/user-accounts/um-fingerprint-dialog.c:719
+msgid "Enrolling fingerprints"
+msgstr "Kirjataan sormenjälkiä"
+
 #: 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:556
+#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:533
 #: panels/wacom/gnome-wacom-properties.ui:60
 msgid "_Close"
 msgstr "_Sulje"
@@ -7405,69 +7727,69 @@ msgstr ""
 "näppäimet pohjaan. Pikanäppäimen voi poistaa käytöstä painamalla "
 "askelpalautinta."
 
-#: panels/wacom/calibrator/calibrator-gui.c:83
+#: panels/wacom/calibrator/calibrator.ui:60
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
 msgstr "Kosketa näytöllä näkyviä kohdemerkkejä piirtopöydän kalibroimiseksi."
 
-#: panels/wacom/calibrator/calibrator-gui.c:87
+#: panels/wacom/calibrator/calibrator.ui:77
 msgid "Mis-click detected, restarting…"
 msgstr "Tunnistettiin ohi mennyt kosketus, aloitetaan alusta…"
 
-#: panels/wacom/cc-wacom-button-row.c:266
+#: panels/wacom/cc-wacom-button-row.c:253
 #, c-format
 msgid "Button %d"
 msgstr "Painike %d"
 
-#: panels/wacom/cc-wacom-button-row.h:53
+#: panels/wacom/cc-wacom-button-row.h:34
 msgctxt "Wacom action-type"
 msgid "Application defined"
 msgstr "Sovelluksen määrittämä"
 
-#: panels/wacom/cc-wacom-button-row.h:54
+#: panels/wacom/cc-wacom-button-row.h:35
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
 msgstr "Lähetä näppäinpainallus"
 
-#: panels/wacom/cc-wacom-button-row.h:55
+#: panels/wacom/cc-wacom-button-row.h:36
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "Vaihda näyttöä"
 
-#: panels/wacom/cc-wacom-button-row.h:56
+#: panels/wacom/cc-wacom-button-row.h:37
 msgctxt "Wacom action-type"
 msgid "Show On-Screen Help"
 msgstr "Näytä ohjeet näytöllä"
 
-#: panels/wacom/cc-wacom-mapping-panel.c:260
+#: panels/wacom/cc-wacom-mapping-panel.c:256
 msgid "Output:"
 msgstr "Ulostulo:"
 
 #. Keep ratio switch
-#: panels/wacom/cc-wacom-mapping-panel.c:272
+#: panels/wacom/cc-wacom-mapping-panel.c:268
 msgid "Keep aspect ratio (letterbox):"
 msgstr "Säilytä kuvasuhde (letterbox):"
 
 #. Whole-desktop checkbox
-#: panels/wacom/cc-wacom-mapping-panel.c:283
+#: panels/wacom/cc-wacom-mapping-panel.c:279
 msgid "Map to single monitor"
 msgstr "Kohdista näyttöön"
 
-#: panels/wacom/cc-wacom-nav-button.c:86
+#: panels/wacom/cc-wacom-nav-button.c:84
 #, c-format
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: panels/wacom/cc-wacom-page.c:553
+#: panels/wacom/cc-wacom-page.c:530
 msgid "Display Mapping"
 msgstr "Kohdistus näyttöön"
 
-#: panels/wacom/cc-wacom-panel.c:827 panels/wacom/wacom-stylus-page.ui:129
+#: panels/wacom/cc-wacom-panel.c:825 panels/wacom/wacom-stylus-page.ui:119
 msgid "Stylus"
 msgstr "Osoitinkynä"
 
-#: panels/wacom/cc-wacom-stylus-page.c:362
+#: panels/wacom/cc-wacom-stylus-page.c:355
 msgid "Button"
 msgstr "Painike"
 
@@ -7518,38 +7840,42 @@ msgstr "Liitä tai käynnistä Wacom-piirtopöytä"
 msgid "Bluetooth Settings"
 msgstr "Bluetooth-asetukset"
 
-#: panels/wacom/gnome-wacom-properties.ui:233
+#: panels/wacom/gnome-wacom-properties.ui:238
+msgid "Tracking Mode"
+msgstr "Seurantatila"
+
+#: panels/wacom/gnome-wacom-properties.ui:266
+msgid "Left-Handed Orientation"
+msgstr "Vasenkätinen suunta"
+
+#: panels/wacom/gnome-wacom-properties.ui:296
 msgid "Map to Monitor…"
 msgstr "Kohdista näyttöön…"
 
-#: panels/wacom/gnome-wacom-properties.ui:249
+#: panels/wacom/gnome-wacom-properties.ui:309
 msgid "Map Buttons…"
 msgstr "Määritä painikkeet…"
 
-#: panels/wacom/gnome-wacom-properties.ui:265
+#: panels/wacom/gnome-wacom-properties.ui:322
 msgid "Calibrate…"
 msgstr "Kalibroi…"
 
-#: panels/wacom/gnome-wacom-properties.ui:286
-msgid "Adjust display resolution"
-msgstr "Säädä näytön tarkkuutta"
-
-#: panels/wacom/gnome-wacom-properties.ui:302
+#: panels/wacom/gnome-wacom-properties.ui:340
 msgid "Adjust mouse settings"
 msgstr "Muuta hiiren asetuksia"
 
-#: panels/wacom/gnome-wacom-properties.ui:330
-msgid "Tracking Mode"
-msgstr "Seurantatila"
-
-#: panels/wacom/gnome-wacom-properties.ui:358
-msgid "Left-Handed Orientation"
-msgstr "Vasenkätinen suunta"
+#: panels/wacom/gnome-wacom-properties.ui:356
+msgid "Adjust display resolution"
+msgstr "Säädä näytön tarkkuutta"
 
-#: panels/wacom/gsd-wacom-key-shortcut-button.c:222
+#: panels/wacom/gsd-wacom-key-shortcut-button.c:217
 msgid "New shortcut…"
 msgstr "Uusi pikanäppäin…"
 
+#: panels/wacom/wacom-stylus-page.ui:25
+msgid "Default"
+msgstr "Oletus"
+
 #: panels/wacom/wacom-stylus-page.ui:29
 msgid "Middle Mouse Button Click"
 msgstr "Hiiren keskimmäisen painikkeen napsautus"
@@ -7558,7 +7884,7 @@ msgstr "Hiiren keskimmäisen painikkeen napsautus"
 msgid "Right Mouse Button Click"
 msgstr "Hiiren oikean painikkeen napsautus"
 
-#: panels/wacom/wacom-stylus-page.ui:37
+#: panels/wacom/wacom-stylus-page.ui:37 shell/cc-window.ui:242
 msgid "Back"
 msgstr "Takaisin"
 
@@ -7574,103 +7900,97 @@ msgstr "Osoitinkynää ei löytynyt"
 msgid "Please move your stylus to the proximity of the tablet to configure it"
 msgstr "Siirrä osoitinkynä piirtopöydän läheisyyteen tehdäksesi määritykset"
 
-#: panels/wacom/wacom-stylus-page.ui:169
+#: panels/wacom/wacom-stylus-page.ui:159
 msgid "Eraser Pressure Feel"
 msgstr "Pyyhekumin paineentuntu"
 
-#: panels/wacom/wacom-stylus-page.ui:190 panels/wacom/wacom-stylus-page.ui:350
+#: panels/wacom/wacom-stylus-page.ui:180 panels/wacom/wacom-stylus-page.ui:340
 msgid "Soft"
 msgstr "Pehmeä"
 
-#: panels/wacom/wacom-stylus-page.ui:220 panels/wacom/wacom-stylus-page.ui:380
+#: panels/wacom/wacom-stylus-page.ui:210 panels/wacom/wacom-stylus-page.ui:370
 msgid "Firm"
 msgstr "Kova"
 
-#: panels/wacom/wacom-stylus-page.ui:243
+#: panels/wacom/wacom-stylus-page.ui:233
 msgid "Top Button"
 msgstr "Yläpainike"
 
-#: panels/wacom/wacom-stylus-page.ui:272
+#: panels/wacom/wacom-stylus-page.ui:262
 msgid "Lower Button"
 msgstr "Alempi painike"
 
-#: panels/wacom/wacom-stylus-page.ui:301
+#: panels/wacom/wacom-stylus-page.ui:291
 msgid "Lowest Button"
 msgstr "Alimmaisin painike"
 
-#: panels/wacom/wacom-stylus-page.ui:330
+#: panels/wacom/wacom-stylus-page.ui:320
 msgid "Tip Pressure Feel"
 msgstr "Kynän kärjen paineentuntu"
 
-#: panels/wacom/wacom-stylus-page.ui:442
-msgid "page 3"
-msgstr "sivu 3"
-
 #: shell/appdata/gnome-control-center.appdata.xml.in:7
-msgid "GNOME Control Center"
-msgstr "Gnomen asetuskeskus"
+msgid "GNOME Settings"
+msgstr "Gnomen asetukset"
 
 #: shell/appdata/gnome-control-center.appdata.xml.in:8
-msgid "Utilities to configure the GNOME desktop"
-msgstr "Työkalut Gnome-työpöydän hallintaan"
+msgid "Utility to configure the GNOME desktop"
+msgstr "Työkalu Gnome-työpöydän asetusten muokkaukseen"
 
 #: shell/appdata/gnome-control-center.appdata.xml.in:10
-msgid ""
-"The control center is GNOME’s main interface for configuration of various "
-"aspects of your desktop."
+msgid "Settings is the primary interface for configuring your system."
 msgstr ""
-"Asetuskeskus on Gnomen ensisijainen käyttöliittymä työpöydän monien eri "
-"asetusten muokkaamiseen."
+"Asetukset on ensisijainen käyttöliittymä järjestelmäsi asetusten "
+"määrittämiseen."
 
-#: shell/cc-application.c:62
+#: shell/appdata/gnome-control-center.appdata.xml.in:20
+msgid "The GNOME Project"
+msgstr "Gnome-projekti"
+
+#: shell/cc-application.c:58
 msgid "Display version number"
 msgstr "Näytä versionumero"
 
-#: shell/cc-application.c:63
+#: shell/cc-application.c:59
 msgid "Enable verbose mode"
 msgstr "Ota käyttöön lisätietoja tulostava tila"
 
-#: shell/cc-application.c:64
+#: shell/cc-application.c:60
 msgid "Search for the string"
 msgstr "Etsi merkkijonoa"
 
-#: shell/cc-application.c:65
+#: shell/cc-application.c:61
 msgid "List possible panel names and exit"
 msgstr "Näytä mahdolliset paneelinimet ja lopeta"
 
-#: shell/cc-application.c:66
+#: shell/cc-application.c:62
 msgid "Panel to display"
 msgstr "Näytettävä paneeli"
 
-#: shell/cc-application.c:66
+#: shell/cc-application.c:62
 msgid "[PANEL] [ARGUMENT…]"
 msgstr "[PANEELI] [ARGUMENTTI…]"
 
-#: shell/cc-application.c:137
-msgid "Available panels:"
-msgstr "Käytettävissä olevat paneelit:"
-
-#: shell/cc-application.c:253
-msgid "Help"
-msgstr "Ohje"
-
-#: shell/cc-application.c:254
-msgid "Quit"
-msgstr "Lopeta"
-
 #: shell/cc-panel-list.ui:195
 msgid "No results found"
 msgstr "Tuloksia ei löytynyt"
 
-#: shell/cc-window.ui:140
+#: shell/cc-panel-loader.c:279
+msgid "Available panels:"
+msgstr "Käytettävissä olevat paneelit:"
+
+#: shell/cc-window.ui:146
 msgid "All Settings"
 msgstr "Kaikki asetukset"
 
-#: shell/cc-window.ui:234
+#: shell/cc-window.ui:184
+msgid "Primary Menu"
+msgstr "Ensisijainen valikko"
+
+#: shell/cc-window.ui:326
 msgid "Warning: Development Version"
 msgstr "Varoitus: kehitysversio"
 
-#: shell/cc-window.ui:235
+#: shell/cc-window.ui:327
 msgid ""
 "This version of Settings should only be used for development purposes. You "
 "may experience incorrect system behavior, data loss, and other unexpected "
@@ -7680,10 +8000,15 @@ msgstr ""
 "Saatat kohdata virheellistä järjestelmän toimintaa, tietojen menetystä tai "
 "muita odottamattomia ongelmia. "
 
+#: shell/cc-window.ui:338
+msgid "Help"
+msgstr "Ohje"
+
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: shell/gnome-control-center.desktop.in.in:5
-msgid "gnome-control-center"
-msgstr "gnome-control-center"
+#| msgid "Settings"
+msgid "org.gnome.Settings"
+msgstr "org.gnome.Settings"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: shell/gnome-control-center.desktop.in.in:17
@@ -7743,7 +8068,7 @@ msgstr ""
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: subprojects/gvc/gvc-mixer-control.c:1873
+#: subprojects/gvc/gvc-mixer-control.c:1871
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -7752,17 +8077,188 @@ msgstr[1] "%u ulostuloa"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: subprojects/gvc/gvc-mixer-control.c:1883
+#: subprojects/gvc/gvc-mixer-control.c:1881
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u sisääntulo"
 msgstr[1] "%u sisääntuloa"
 
-#: subprojects/gvc/gvc-mixer-control.c:2738
+#: subprojects/gvc/gvc-mixer-control.c:2736
 msgid "System Sounds"
 msgstr "Järjestelmän äänet"
 
+#~ msgid "Refresh Rate"
+#~ msgstr "Päivitystaajuus"
+
+#~ msgid "Scale"
+#~ msgstr "Skaalattu"
+
+#~ msgid "Adjust for TV"
+#~ msgstr "Sovita TV:hen"
+
+#~ msgid "Primary Display"
+#~ msgstr "Ensisijainen näyttö"
+
+#~ msgid ""
+#~ "Drag displays to match your setup. The top bar is placed on the primary "
+#~ "display."
+#~ msgstr ""
+#~ "Vedä näytöt vastaamaan näyttöjesi järjestystä. Yläpalkki asetetaan "
+#~ "ensisijaiselle näytölle."
+
+#~ msgid "_Night Light"
+#~ msgstr "_Yövalo"
+
+#~ msgid "Could not get screen information"
+#~ msgstr "Näytön tietoja ei saatu"
+
+#~ msgid "My Home Network"
+#~ msgstr "Kotiverkko"
+
+#~ msgid "hardware"
+#~ msgstr "laitteisto"
+
+#~ msgid "reset"
+#~ msgstr "tyhjennä"
+
+#~ msgid "Switch to previous source"
+#~ msgstr "Vaihda edelliseen lähteeseen"
+
+#~ msgid "Switch to next source"
+#~ msgstr "Vaihda seuraavaan lähteeseen"
+
+#~ msgid "Alternative switch to next source"
+#~ msgstr "Vaihtoehtoinen vaihto seuraavaan lähteeseen"
+
+#~ msgid "English (United Kingdom)"
+#~ msgstr "Englanti (Yhdistynyt kuningaskunta)"
+
+#~ msgid "United Kingdom"
+#~ msgstr "Yhdistynyt kuningaskunta"
+
+#~ msgid "_Options"
+#~ msgstr "_Valinnat"
+
+#~ msgid "Add input source"
+#~ msgstr "Lisää syötelähde"
+
+#~ msgid "Remove input source"
+#~ msgstr "Poista syötelähde"
+
+#~ msgid "Move input source up"
+#~ msgstr "Siirrä syötelähde ylös"
+
+#~ 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"
+
+#~ msgctxt "balance"
+#~ msgid "Left"
+#~ msgstr "Vasen"
+
+#~ msgctxt "balance"
+#~ msgid "Right"
+#~ msgstr "Oikea"
+
+#~ msgctxt "balance"
+#~ msgid "Minimum"
+#~ msgstr "Minimi"
+
+#~ msgctxt "balance"
+#~ msgid "Maximum"
+#~ msgstr "Maksimi"
+
+#~ msgid "_Subwoofer:"
+#~ msgstr "_Subwoofer:"
+
+#~ msgctxt "volume"
+#~ msgid "Unamplified"
+#~ msgstr "Vahvistamaton"
+
+#~ msgid "_Profile:"
+#~ msgstr "_Profiili:"
+
+#~ msgid "_Test Speakers"
+#~ msgstr "_Testaa kaiuttimia"
+
+#~ msgid "Peak detect"
+#~ msgstr "Havaitse piikit"
+
+#~ msgid "Device"
+#~ msgstr "Laite"
+
+#~ msgid "Speaker Testing for %s"
+#~ msgstr "Kaiutintesti: %s"
+
+#~ msgid "C_hoose a device for sound output:"
+#~ msgstr "_Valitse laite äänen toistamiseksi:"
+
+#~ msgid "Settings for the selected device:"
+#~ msgstr "Valitun laitteen asetukset:"
+
+#~ msgid "_Input volume:"
+#~ msgstr "_Äänitysvoimakkuus:"
+
+#~ msgid "C_hoose a device for sound input:"
+#~ msgstr "_Valitse laite äänen tallentamiseksi:"
+
+#~ 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"
+
+#~ msgid "Sound Preferences"
+#~ msgstr "Ääniasetukset"
+
+#~ msgid "Testing event sound"
+#~ msgstr "Kokeillaan tapahtuman ääntä"
+
+#~ msgid "From theme"
+#~ msgstr "Teemasta"
+
+#~ msgid "C_hoose an alert sound:"
+#~ msgstr "_Valitse hälytysääni:"
+
+#~ msgid "Stop"
+#~ msgstr "Pysäytä"
+
+#~ msgctxt "Account type"
+#~ msgid "Standard"
+#~ msgstr "Normaali"
+
+#~ msgctxt "Account type"
+#~ msgid "Administrator"
+#~ msgstr "Ylläpitäjä"
+
+#~ msgid "page 3"
+#~ msgstr "sivu 3"
+
+#~ msgid "GNOME Control Center"
+#~ msgstr "Gnomen asetuskeskus"
+
+#~ msgid ""
+#~ "The control center is GNOME’s main interface for configuration of various "
+#~ "aspects of your desktop."
+#~ msgstr ""
+#~ "Asetuskeskus on Gnomen ensisijainen käyttöliittymä työpöydän monien eri "
+#~ "asetusten muokkaamiseen."
+
+#~ msgid "Quit"
+#~ msgstr "Lopeta"
+
+#~ msgid "gnome-control-center"
+#~ msgstr "gnome-control-center"
+
 #~ msgid "_Verify New Password"
 #~ msgstr "V_ahvista uusi salasana"
 
@@ -7937,18 +8433,12 @@ msgstr "Järjestelmän äänet"
 #~ msgid "Mirrored"
 #~ msgstr "Peilattu"
 
-#~ msgid "Primary"
-#~ msgstr "Ensisijainen"
-
 #~ msgid "Secondary"
 #~ msgstr "Toissijainen"
 
 #~ msgid "Arrange Combined Displays"
 #~ msgstr "Järjestä yhdistetyt näytöt"
 
-#~ msgid "Drag displays to rearrange them"
-#~ msgstr "Järjestä näytöt vetämällä niitä"
-
 #~ msgid "%d Hz (NTSC)"
 #~ msgstr "%d Hz (NTSC)"
 
@@ -8015,9 +8505,6 @@ msgstr "Järjestelmän äänet"
 #~ msgid "Delete DNS Server"
 #~ msgstr "Poista DNS-palvelin"
 
-#~ msgid "Reset"
-#~ msgstr "Tyhjennä asetukset"
-
 #~ msgid "Make available to other _users"
 #~ msgstr "Aseta kaikkien _käyttäjien käytettäväksi"
 
@@ -8145,9 +8632,6 @@ msgstr "Järjestelmän äänet"
 #~ msgid "Chat"
 #~ msgstr "Keskustelu"
 
-#~ msgid "Resources"
-#~ msgstr "Resurssit"
-
 #~ msgctxt "printer state"
 #~ msgid "Configuring"
 #~ msgstr "Määritetään asetuksia"
@@ -8175,9 +8659,6 @@ msgstr "Järjestelmän äänet"
 #~ msgid "Supply"
 #~ msgstr "Väri"
 
-#~ msgid "_Default printer"
-#~ msgstr "_Oletustulostin"
-
 #~ msgid "Jobs"
 #~ msgstr "Työt"
 
@@ -8623,9 +9104,6 @@ msgstr "Järjestelmän äänet"
 #~ msgid "Show help options"
 #~ msgstr "Näytä ohjevalitsimet"
 
-#~ msgid "- Settings"
-#~ msgstr "- Asetukset"
-
 #~ msgid ""
 #~ "%s\n"
 #~ "Run '%s --help' to see a full list of available command line options.\n"


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