[gnome-control-center] Update Finnish translation

From: Translations User D-L <translations src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-control-center] Update Finnish translation
Date: Thu, 1 Feb 2018 08:32:20 +0000 (UTC)
commit 34b9e4f94dba645a9c1587802aef85a23f1ae00a
Author: Jiri GrÃ¶nroos <jiri gronroos iki fi>
Date:   Thu Feb 1 08:32:10 2018 +0000

    Update Finnish translation

 po/fi.po | 4120 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 2187 insertions(+), 1933 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 9ca992b..a94c0d6 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://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-01-21 10:43+0000\n"
-"PO-Revision-Date: 2018-02-01 10:19+0200\n"
+"POT-Creation-Date: 2018-02-01 08:21+0000\n"
+"PO-Revision-Date: 2018-02-01 10:31+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,212 +39,218 @@ msgstr ""
 "X-POT-Import-Date: 2012-03-07 10:37:43+0000\n"
 "X-Project-Style: gnome\n"
 
-#: ../panels/background/background.ui.h:1
+#: panels/background/background.ui:49
 msgid "_Background"
 msgstr "_Taustakuva"
 
 #. This refers to a slideshow background
-#: ../panels/background/background.ui.h:3
+#: panels/background/background.ui:99 panels/background/background.ui:212
 msgid "Changes throughout the day"
 msgstr "Muuttuu pÃ¤ivÃ¤n aikana"
 
 #. To translators: This is a noun, not a verb
-#: ../panels/background/background.ui.h:5
+#: panels/background/background.ui:162
 msgid "_Lock Screen"
 msgstr "L_ukitusnÃ¤yttÃ¶"
 
-#: ../panels/background/background.ui.h:6
+#: panels/background/background.ui:268
 msgctxt "background, style"
 msgid "Tile"
 msgstr "Laatoitettu"
 
-#: ../panels/background/background.ui.h:7
+#: panels/background/background.ui:272
 msgctxt "background, style"
 msgid "Zoom"
 msgstr "LÃ¤hennys"
 
-#: ../panels/background/background.ui.h:8
+#: panels/background/background.ui:276
 msgctxt "background, style"
 msgid "Center"
 msgstr "Keskitetty"
 
-#: ../panels/background/background.ui.h:9
+#: panels/background/background.ui:280
 msgctxt "background, style"
 msgid "Scale"
 msgstr "Skaalattu"
 
-#: ../panels/background/background.ui.h:10
+#: panels/background/background.ui:284
 msgctxt "background, style"
 msgid "Fill"
 msgstr "TÃ¤yttÃ¶"
 
-#: ../panels/background/background.ui.h:11
+#: panels/background/background.ui:288
 msgctxt "background, style"
 msgid "Span"
 msgstr "Peitetty"
 
-#: ../panels/background/cc-background-chooser-dialog.c:430
+#: panels/background/cc-background-chooser-dialog.c:424
 msgid "Wallpapers"
 msgstr "Taustakuvat"
 
-#: ../panels/background/cc-background-chooser-dialog.c:439
+#: panels/background/cc-background-chooser-dialog.c:433
 msgid "Colors"
 msgstr "VÃ¤rit"
 
 #. translators: This is the title of the wallpaper chooser dialog.
-#: ../panels/background/cc-background-chooser-dialog.c:476
+#: panels/background/cc-background-chooser-dialog.c:468
 msgid "Select Background"
 msgstr "Valitse taustakuva"
 
-#: ../panels/background/cc-background-chooser-dialog.c:504
+#: panels/background/cc-background-chooser-dialog.c:496
 msgid "Pictures"
 msgstr "Kuvat"
 
 #. translators: No pictures were found
-#: ../panels/background/cc-background-chooser-dialog.c:536
+#: panels/background/cc-background-chooser-dialog.c:528
 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:554
-#: ../panels/search/cc-search-locations-dialog.c:302
+#: panels/background/cc-background-chooser-dialog.c:545
+#: panels/search/cc-search-locations-dialog.c:302
 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:566
+#: panels/background/cc-background-chooser-dialog.c:555
 #, 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:573
-#: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963
-#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30
-#: ../panels/common/language-chooser.ui.h:3
-#: ../panels/display/cc-display-panel.c:2744
-#: ../panels/network/connection-editor/connection-editor.ui.h:1
-#: ../panels/network/connection-editor/vpn-helpers.c:181
-#: ../panels/network/connection-editor/vpn-helpers.c:310
-#: ../panels/network/net-device-wifi.c:1325
-#: ../panels/network/net-device-wifi.c:1405
-#: ../panels/network/net-device-wifi.c:1641
-#: ../panels/network/network-wifi.ui.h:1
-#: ../panels/printers/new-printer-dialog.ui.h:3
-#: ../panels/printers/pp-details-dialog.c:319
-#: ../panels/privacy/cc-privacy-panel.c:1053
-#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2
-#: ../panels/search/cc-search-locations-dialog.c:642
-#: ../panels/sharing/cc-sharing-panel.c:382
-#: ../panels/user-accounts/data/account-dialog.ui.h:2
-#: ../panels/user-accounts/data/join-dialog.ui.h:2
-#: ../panels/user-accounts/data/password-dialog.ui.h:2
-#: ../panels/user-accounts/um-fingerprint-dialog.c:264
-#: ../panels/user-accounts/um-photo-dialog.c:94
-#: ../panels/user-accounts/um-photo-dialog.c:221
-#: ../panels/user-accounts/um-user-panel.c:644
-#: ../panels/user-accounts/um-user-panel.c:662
+#: panels/background/cc-background-chooser-dialog.c:560
+#: panels/color/cc-color-panel.c:225 panels/color/cc-color-panel.c:963
+#: panels/color/color-calibrate.ui:25 panels/color/color.ui:657
+#: panels/common/language-chooser.ui:23 panels/display/cc-display-panel.c:2594
+#: panels/network/connection-editor/connection-editor.ui:15
+#: panels/network/connection-editor/vpn-helpers.c:181
+#: panels/network/connection-editor/vpn-helpers.c:310
+#: panels/network/net-device-wifi.c:1387 panels/network/net-device-wifi.c:1467
+#: panels/network/net-device-wifi.c:1706 panels/network/network-wifi.ui:24
+#: panels/printers/new-printer-dialog.ui:45
+#: panels/printers/pp-details-dialog.c:319
+#: panels/privacy/cc-privacy-panel.c:1053 panels/region/format-chooser.ui:25
+#: panels/region/input-chooser.ui:13
+#: panels/search/cc-search-locations-dialog.c:642
+#: panels/sharing/cc-sharing-panel.c:384
+#: panels/user-accounts/data/account-dialog.ui:28
+#: panels/user-accounts/data/join-dialog.ui:20
+#: panels/user-accounts/data/password-dialog.ui:21
+#: panels/user-accounts/um-fingerprint-dialog.c:264
+#: panels/user-accounts/um-photo-dialog.c:94
+#: panels/user-accounts/um-photo-dialog.c:221
+#: panels/user-accounts/um-user-panel.c:644
+#: panels/user-accounts/um-user-panel.c:662
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../panels/background/cc-background-chooser-dialog.c:574
+#: panels/background/cc-background-chooser-dialog.c:561
 msgid "_Select"
 msgstr "_Valitse"
 
-#: ../panels/background/cc-background-item.c:203
+#: panels/background/cc-background-item.c:192
 msgid "multiple sizes"
 msgstr "useita kokoja"
 
 #. translators: 100 Ã— 100px
 #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN
-#: ../panels/background/cc-background-item.c:207
+#: panels/background/cc-background-item.c:196
 #, c-format
 msgid "%d Ã— %d"
 msgstr "%d Ã— %d"
 
-#: ../panels/background/cc-background-item.c:333
+#: panels/background/cc-background-item.c:321
 msgid "No Desktop Background"
 msgstr "Ei tyÃ¶pÃ¶ydÃ¤n taustaa"
 
-#: ../panels/background/cc-background-panel.c:292
+#: panels/background/cc-background-panel.c:291
 msgid "Current background"
 msgstr "Nykyinen taustakuva"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-msgid "BackÂground"
+#: panels/background/gnome-background-panel.desktop.in.in:3
+msgid "Background"
 msgstr "Taustakuva"
 
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:3
+#: panels/background/gnome-background-panel.desktop.in.in:4
 msgid "Change your background image to a wallpaper or photo"
 msgstr "Vaihda taustakuva"
 
+#: panels/background/gnome-background-panel.desktop.in.in:6
+msgid "preferences-desktop-wallpaper"
+msgstr "preferences-desktop-wallpaper"
+
 #. Translators: those are keywords for the background control-center panel
-#: ../panels/background/gnome-background-panel.desktop.in.in.h:5
+#: panels/background/gnome-background-panel.desktop.in.in:14
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Taustakuva;NÃ¤yttÃ¶;TyÃ¶pÃ¶ytÃ¤;Wallpaper;Screen;Desktop;"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:268
+#: panels/bluetooth/cc-bluetooth-panel.c:265
 msgid "Turn Off Airplane Mode"
 msgstr "Poista lentokonetila kÃ¤ytÃ¶stÃ¤"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:334
+#: panels/bluetooth/cc-bluetooth-panel.c:330
 msgid "No Bluetooth Found"
 msgstr "Bluetoothia ei lÃ¶ytynyt"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:334
+#: panels/bluetooth/cc-bluetooth-panel.c:330
 msgid "Plug in a dongle to use Bluetooth."
 msgstr "LiitÃ¤ sovitin kÃ¤yttÃ¤Ã¤ksesi Bluetoothia."
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:335
+#: panels/bluetooth/cc-bluetooth-panel.c:331
 msgid "Bluetooth Turned Off"
 msgstr "Bluetooth on pois pÃ¤Ã¤ltÃ¤"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:335
+#: panels/bluetooth/cc-bluetooth-panel.c:331
 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:336
+#: panels/bluetooth/cc-bluetooth-panel.c:332
 msgid "Airplane Mode is on"
 msgstr "Lentokonetila on pÃ¤Ã¤llÃ¤"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:336
+#: panels/bluetooth/cc-bluetooth-panel.c:332
 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:337
+#: panels/bluetooth/cc-bluetooth-panel.c:333
 msgid "Hardware Airplane Mode is on"
 msgstr "Laitetason lentokonetila on pÃ¤Ã¤llÃ¤"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:337
+#: panels/bluetooth/cc-bluetooth-panel.c:333
 msgid "Turn off the Airplane mode switch to enable Bluetooth."
 msgstr "Poista lentokonetila kÃ¤ytÃ¶stÃ¤ kÃ¤yttÃ¤Ã¤ksesi Bluetoothia."
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
-msgid "BlueÂtooth"
+#. Translators: The found device is a printer connected via Bluetooth
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:3
+#: panels/network/network.ui:101 panels/printers/pp-new-printer-dialog.c:1816
+msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:4
 msgid "Turn Bluetooth on and off and connect your devices"
 msgstr "Kytke Bluetooth pÃ¤Ã¤lle tai pois ja yhdistÃ¤ laitteita"
 
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:5
+#| msgid "Bluetooth"
+msgid "bluetooth"
+msgstr "bluetooth"
+
 #. Translators: those are keywords for the bluetooth control-center panel
-#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5
+#: panels/bluetooth/gnome-bluetooth-panel.desktop.in.in:18
 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:361
+#: panels/color/cc-color-calibrate.c:361
 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:367
+#: panels/color/cc-color-calibrate.c:367
 msgid ""
 "Move your calibration device to the calibrate position and press â€œContinueâ€"
 msgstr "Vaihda kalibrointilaite kalibrointiasentoon ja napsauta â€Jatkaâ€"
@@ -252,7 +258,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:373
+#: panels/color/cc-color-calibrate.c:373
 msgid ""
 "Move your calibration device to the surface position and press â€œContinueâ€"
 msgstr "Vaihda kalibrointilaite kalibrointiasentoon ja napsauta â€Jatkaâ€"
@@ -260,157 +266,157 @@ 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:379
+#: panels/color/cc-color-calibrate.c:379
 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:410
+#: panels/color/cc-color-calibrate.c:410
 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:415
+#: panels/color/cc-color-calibrate.c:415
 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:421
+#: panels/color/cc-color-calibrate.c:421
 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:427
+#: panels/color/cc-color-calibrate.c:427
 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:467
+#: panels/color/cc-color-calibrate.c:467
 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:475
+#: panels/color/cc-color-calibrate.c:475
 msgid "Calibration failed!"
 msgstr "Kalibrointi epÃ¤onnistui!"
 
 #. TRANSLATORS: The user can now remove the sensor from the screen
-#: ../panels/color/cc-color-calibrate.c:482
+#: panels/color/cc-color-calibrate.c:482
 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:553
+#: panels/color/cc-color-calibrate.c:553
 msgid "Do not disturb the calibration device while in progress"
 msgstr "Ã„lÃ¤ liikuta kalibrointilaitetta kesken kalibroinnin"
 
 #. TRANSLATORS: This refers to the TFT display on a laptop
-#: ../panels/color/cc-color-common.c:41
+#: panels/color/cc-color-common.c:41
 msgid "Laptop Screen"
 msgstr "Kannettavan nÃ¤yttÃ¶"
 
 #. TRANSLATORS: This refers to the embedded webcam on a laptop
-#: ../panels/color/cc-color-common.c:50
+#: panels/color/cc-color-common.c:50
 msgid "Built-in Webcam"
 msgstr "SisÃ¤Ã¤nrakennettu web-kamera"
 
 #. TRANSLATORS: an externally connected display, where %s is either the
 #. * model, vendor or ID, e.g. 'LP2480zx Monitor'
-#: ../panels/color/cc-color-common.c:65
+#: panels/color/cc-color-common.c:65
 #, c-format
 msgid "%s Monitor"
 msgstr "NÃ¤yttÃ¶ - %s"
 
 #. TRANSLATORS: a flatbed scanner device, e.g. 'Epson Scanner'
-#: ../panels/color/cc-color-common.c:69
+#: panels/color/cc-color-common.c:69
 #, c-format
 msgid "%s Scanner"
 msgstr "Kuvanlukija - %s"
 
 #. TRANSLATORS: a camera device, e.g. 'Nikon D60 Camera'
-#: ../panels/color/cc-color-common.c:73
+#: panels/color/cc-color-common.c:73
 #, c-format
 msgid "%s Camera"
 msgstr "Kamera - %s"
 
 #. TRANSLATORS: a printer device, e.g. 'Epson Photosmart Printer'
-#: ../panels/color/cc-color-common.c:77
+#: panels/color/cc-color-common.c:77
 #, c-format
 msgid "%s Printer"
 msgstr "Tulostin - %s"
 
 #. TRANSLATORS: a webcam device, e.g. 'Philips HiDef Camera'
-#: ../panels/color/cc-color-common.c:81
+#: panels/color/cc-color-common.c:81
 #, c-format
 msgid "%s Webcam"
 msgstr "Web-kamera - %s"
 
-#: ../panels/color/cc-color-device.c:89
+#: panels/color/cc-color-device.c:89
 #, c-format
 msgid "Enable color management for %s"
 msgstr "KÃ¤ytÃ¤ vÃ¤rinhallintaa laitteelle %s"
 
-#: ../panels/color/cc-color-device.c:93
+#: panels/color/cc-color-device.c:93
 #, c-format
 msgid "Show color profiles for %s"
 msgstr "NÃ¤ytÃ¤ laitteen %s vÃ¤riprofiilit"
 
 #. not calibrated
-#: ../panels/color/cc-color-device.c:323
+#: panels/color/cc-color-device.c:323
 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:141
+#: panels/color/cc-color-panel.c:141
 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:149
+#: panels/color/cc-color-panel.c:149
 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:156
+#: panels/color/cc-color-panel.c:156
 msgid "Test profile: "
 msgstr "Testiprofiili:"
 
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:223
+#: panels/color/cc-color-panel.c:223
 msgid "Select ICC Profile File"
 msgstr "Valitse ICC-profiilitiedosto"
 
-#: ../panels/color/cc-color-panel.c:226
+#: panels/color/cc-color-panel.c:226
 msgid "_Import"
 msgstr "_Tuo"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:237
+#: panels/color/cc-color-panel.c:237
 msgid "Supported ICC profiles"
 msgstr "Tuetut ICC-profiilit"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:244
-#: ../panels/network/wireless-security/eap-method-fast.c:417
+#: panels/color/cc-color-panel.c:244
+#: panels/network/wireless-security/eap-method-fast.c:417
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: ../panels/color/cc-color-panel.c:583
+#: panels/color/cc-color-panel.c:583
 msgid "Screen"
 msgstr "NÃ¤yttÃ¶"
 
 #. TRANSLATORS: this is when the upload of the profile failed
-#: ../panels/color/cc-color-panel.c:908
+#: panels/color/cc-color-panel.c:908
 #, c-format
 msgid "Failed to upload file: %s"
 msgstr "Tiedoston lÃ¤hetys epÃ¤onnistui: %s"
@@ -418,40 +424,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:922
+#: panels/color/cc-color-panel.c:922
 msgid "The profile has been uploaded to:"
 msgstr "Profiili on lÃ¤hetetty:"
 
-#: ../panels/color/cc-color-panel.c:924
+#: panels/color/cc-color-panel.c:924
 msgid "Write down this URL."
 msgstr "Kirjoita ylÃ¶s tÃ¤mÃ¤ osoite."
 
-#: ../panels/color/cc-color-panel.c:925
+#: panels/color/cc-color-panel.c:925
 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:926
+#: panels/color/cc-color-panel.c:926
 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:960
+#: panels/color/cc-color-panel.c:960
 msgid "Save Profile"
 msgstr "Tallenna profiili"
 
-#: ../panels/color/cc-color-panel.c:964
-#: ../panels/network/connection-editor/vpn-helpers.c:311
+#: panels/color/cc-color-panel.c:964
+#: 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:1324
+#: panels/color/cc-color-panel.c:1325
 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:1339 ../panels/color/cc-color-panel.c:1363
+#: panels/color/cc-color-panel.c:1340 panels/color/cc-color-panel.c:1364
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
@@ -460,24 +466,24 @@ msgstr ""
 "siinÃ¤ on virta pÃ¤Ã¤llÃ¤."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:1373
+#: panels/color/cc-color-panel.c:1374
 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:1384
+#: panels/color/cc-color-panel.c:1385
 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:103
+#: panels/color/cc-color-profile.c:103
 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:109
+#: panels/color/cc-color-profile.c:109
 msgid "Test Profile"
 msgstr "Testiprofiili"
 
@@ -485,7 +491,7 @@ msgstr "Testiprofiili"
 #. * 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:117
+#: panels/color/cc-color-profile.c:117
 msgctxt "Automatically generated profile"
 msgid "Automatic"
 msgstr "Automaattinen"
@@ -493,13 +499,13 @@ 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:127
+#: panels/color/cc-color-profile.c:127
 msgctxt "Profile quality"
 msgid "Low Quality"
 msgstr "Matala laatu"
 
 #. TRANSLATORS: the profile quality
-#: ../panels/color/cc-color-profile.c:132
+#: panels/color/cc-color-profile.c:132
 msgctxt "Profile quality"
 msgid "Medium Quality"
 msgstr "KeskimÃ¤Ã¤rÃ¤inen laatu"
@@ -507,62 +513,61 @@ 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:139
+#: panels/color/cc-color-profile.c:139
 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:156
+#: panels/color/cc-color-profile.c:156
 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:163
+#: panels/color/cc-color-profile.c:163
 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:170
+#: panels/color/cc-color-profile.c:170
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "OletusharmaasÃ¤vy"
 
-#: ../panels/color/cc-color-profile.c:194
+#: panels/color/cc-color-profile.c:194
 msgid "Vendor supplied factory calibration data"
 msgstr "Valmistajan toimittaja tehdaskalibrointidata"
 
-#: ../panels/color/cc-color-profile.c:203
+#: panels/color/cc-color-profile.c:203
 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:225
+#: panels/color/cc-color-profile.c:225
 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.h:1
+#: panels/color/color-calibrate.ui:7
 msgid "Display Calibration"
 msgstr "NÃ¤ytÃ¶n kalibrointi"
 
 #. This starts the calibration process
-#: ../panels/color/color-calibrate.ui.h:4
+#: panels/color/color-calibrate.ui:40
 msgid "_Start"
 msgstr "_KÃ¤ynnistÃ¤"
 
 #. This resumes the calibration process
-#: ../panels/color/color-calibrate.ui.h:6
+#: 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.h:8
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/region/format-chooser.ui.h:2
+#: panels/color/color-calibrate.ui:67 panels/common/language-chooser.ui:12
+#: panels/region/format-chooser.ui:14
 msgid "_Done"
 msgstr "_Valmis"
 
@@ -570,11 +575,11 @@ msgstr "_Valmis"
 #. 15000 = 15 sec
 #. 750 = 0.75 sec
 #. Text printed on screen
-#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:82
+#: panels/color/color.ui:6 panels/wacom/calibrator/calibrator-gui.c:82
 msgid "Screen Calibration"
 msgstr "NÃ¤ytÃ¶n kalibrointi"
 
-#: ../panels/color/color.ui.h:2
+#: panels/color/color.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 "
@@ -583,42 +588,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.h:3
+#: panels/color/color.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.h:5
+#: panels/color/color.ui:58
 msgid "Quality"
 msgstr "Laatu"
 
 #. This is the approximate time it takes to calibrate the display.
-#: ../panels/color/color.ui.h:7
+#: panels/color/color.ui:75
 msgid "Approximate Time"
 msgstr "Arvioitu aika"
 
-#: ../panels/color/color.ui.h:8
+#: panels/color/color.ui:121
 msgid "Calibration Quality"
 msgstr "Kalibrointilaatu"
 
-#: ../panels/color/color.ui.h:9
+#: panels/color/color.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.h:10
+#: panels/color/color.ui:174
 msgid "Calibration Device"
 msgstr "Kalibrointilaite"
 
-#: ../panels/color/color.ui.h:11
+#: panels/color/color.ui:189
 msgid "Select the type of display that is connected."
 msgstr "Valitse yhdistetyn nÃ¤ytÃ¶n tyyppi."
 
-#: ../panels/color/color.ui.h:12
+#: panels/color/color.ui:226
 msgid "Display Type"
 msgstr "NÃ¤ytÃ¶n tyyppi"
 
-#: ../panels/color/color.ui.h:13
+#: panels/color/color.ui:241
 msgid ""
 "Select a display target white point. Most displays should be calibrated to a "
 "D65 illuminant."
@@ -626,11 +631,11 @@ msgstr ""
 "Valitse nÃ¤ytÃ¶n valkopiste. Useimmat nÃ¤ytÃ¶t tulisi kalibroida D65-"
 "valonlÃ¤hteeseen."
 
-#: ../panels/color/color.ui.h:14
+#: panels/color/color.ui:278
 msgid "Profile Whitepoint"
 msgstr "Profiilin valkopiste"
 
-#: ../panels/color/color.ui.h:15
+#: panels/color/color.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."
@@ -638,7 +643,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.h:16
+#: panels/color/color.ui:307
 msgid ""
 "Alternatively, you can use the brightness level used with one of the other "
 "profiles for this device."
@@ -646,11 +651,11 @@ msgstr ""
 "Voit myÃ¶s kÃ¤yttÃ¤Ã¤ samaa kirkkaustasoa kuin muut tÃ¤tÃ¤ laitetta varten tehdyt "
 "profiilit."
 
-#: ../panels/color/color.ui.h:17
+#: panels/color/color.ui:318
 msgid "Display Brightness"
 msgstr "NÃ¤ytÃ¶n kirkkaus"
 
-#: ../panels/color/color.ui.h:18
+#: panels/color/color.ui:333
 msgid ""
 "You can use a color profile on different computers, or even create profiles "
 "for different lighting conditions."
@@ -658,35 +663,35 @@ msgstr ""
 "Voit kÃ¤yttÃ¤Ã¤ vÃ¤riprofiilia eri tietokoneilla, tai vaikkapa luoda profiileja "
 "eri valaistuksia varten."
 
-#: ../panels/color/color.ui.h:19
+#: panels/color/color.ui:348
 msgid "Profile Name:"
 msgstr "Profiilin nimi:"
 
-#: ../panels/color/color.ui.h:20
+#: panels/color/color.ui:377
 msgid "Profile Name"
 msgstr "Profiilin nimi"
 
-#: ../panels/color/color.ui.h:21
+#: panels/color/color.ui:392
 msgid "Profile successfully created!"
 msgstr "Profiili luotiin onnistuneesti!"
 
-#: ../panels/color/color.ui.h:22
+#: panels/color/color.ui:443
 msgid "Copy profile"
 msgstr "Kopioi profiili"
 
-#: ../panels/color/color.ui.h:23
+#: panels/color/color.ui:456
 msgid "Requires writable media"
 msgstr "Vaatii median, johon on mahdollista kirjoittaa"
 
-#: ../panels/color/color.ui.h:24
+#: panels/color/color.ui:519
 msgid "Upload profile"
 msgstr "LÃ¤hetÃ¤ profiili"
 
-#: ../panels/color/color.ui.h:25
+#: panels/color/color.ui:532
 msgid "Requires Internet connection"
 msgstr "Vaatii internetyhteyden"
 
-#: ../panels/color/color.ui.h:26
+#: panels/color/color.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"
@@ -696,28 +701,26 @@ msgstr ""
 "href=\"osx\">Apple OS X:llÃ¤</a> ja <a href=\"windows\">Windowsilla</a> "
 "saattaa olla hyÃ¶tyÃ¤."
 
-#: ../panels/color/color.ui.h:27
-#: ../panels/user-accounts/um-fingerprint-dialog.c:723
+#: panels/color/color.ui:607 panels/user-accounts/um-fingerprint-dialog.c:723
 msgid "Summary"
 msgstr "Yhteenveto"
 
-#: ../panels/color/color.ui.h:28
+#: panels/color/color.ui:621
 msgid "Add Profile"
 msgstr "LisÃ¤Ã¤ profiili"
 
-#: ../panels/color/color.ui.h:29
+#: panels/color/color.ui:643
 msgid "_Import Fileâ€¦"
 msgstr "_Tuo tiedosto\tâ€¦"
 
-#: ../panels/color/color.ui.h:31
-#: ../panels/network/connection-editor/net-connection-editor.c:519
-#: ../panels/printers/new-printer-dialog.ui.h:4
-#: ../panels/region/input-chooser.ui.h:3
-#: ../panels/user-accounts/data/account-dialog.ui.h:3
+#: 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
 msgid "_Add"
 msgstr "_LisÃ¤Ã¤"
 
-#: ../panels/color/color.ui.h:32
+#: panels/color/color.ui:732
 msgid ""
 "Problems detected. The profile may not work correctly. <a href=\"\">Show "
 "details.</a>"
@@ -725,224 +728,228 @@ msgstr ""
 "Ongelmia havaittu. Profiili ei vÃ¤lttÃ¤mÃ¤ttÃ¤ toimi kunnolla. <a href="
 "\"\">NÃ¤ytÃ¤ tiedot.</a>"
 
-#: ../panels/color/color.ui.h:33
+#: panels/color/color.ui:807
 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.h:34
+#: panels/color/color.ui:829
 msgid "Learn more"
 msgstr "Lue lisÃ¤Ã¤"
 
-#: ../panels/color/color.ui.h:35
+#: panels/color/color.ui:834
 msgid "Learn more about color management"
 msgstr "Lue lisÃ¤Ã¤ vÃ¤rienhallinnasta"
 
-#: ../panels/color/color.ui.h:36
+#: panels/color/color.ui:882
 msgid "_Set for all users"
 msgstr "Aseta _kaikille kÃ¤yttÃ¤jille"
 
-#: ../panels/color/color.ui.h:37
+#: panels/color/color.ui:886 panels/color/color.ui:901
+#: panels/color/color.ui:902
 msgid "Set this profile for all users on this computer"
 msgstr "Aseta tÃ¤mÃ¤ profiili kaikille tietokoneen kÃ¤yttÃ¤jille"
 
-#: ../panels/color/color.ui.h:38
+#: panels/color/color.ui:897
 msgid "_Enable"
 msgstr "K_Ã¤ytÃ¤"
 
-#: ../panels/color/color.ui.h:39
+#: panels/color/color.ui:928
 msgid "_Add profile"
 msgstr "_LisÃ¤Ã¤ profiili"
 
-#: ../panels/color/color.ui.h:40
+#: panels/color/color.ui:941
 msgid "_Calibrateâ€¦"
 msgstr "_Kalibroiâ€¦"
 
-#: ../panels/color/color.ui.h:41
+#: panels/color/color.ui:945
 msgid "Calibrate the device"
 msgstr "Kalibroi laite"
 
-#: ../panels/color/color.ui.h:42
+#: panels/color/color.ui:956
 msgid "_Remove profile"
 msgstr "_Poista profiili"
 
-#: ../panels/color/color.ui.h:43
+#: panels/color/color.ui:969
 msgid "_View details"
 msgstr "NÃ¤ytÃ¤ yk_sityiskohdat"
 
-#: ../panels/color/color.ui.h:44
+#: panels/color/color.ui:1005
 msgid "Unable to detect any devices that can be color managed"
 msgstr "VÃ¤rihallinnan piiriin sopivia laitteita ei havaittu"
 
-#: ../panels/color/color.ui.h:45
+#: panels/color/color.ui:1047
 msgid "LCD"
 msgstr "LCD"
 
-#: ../panels/color/color.ui.h:46
+#: panels/color/color.ui:1052
 msgid "LED"
 msgstr "LED"
 
-#: ../panels/color/color.ui.h:47
+#: panels/color/color.ui:1057
 msgid "CRT"
 msgstr "CRT"
 
-#: ../panels/color/color.ui.h:48
+#: panels/color/color.ui:1062
 msgid "Projector"
 msgstr "Projektori"
 
-#: ../panels/color/color.ui.h:49
+#: panels/color/color.ui:1067
 msgid "Plasma"
 msgstr "Plasma"
 
-#: ../panels/color/color.ui.h:50
+#: panels/color/color.ui:1072
 msgid "LCD (CCFL backlight)"
 msgstr "LCD (CCFL-taustalamppu)"
 
-#: ../panels/color/color.ui.h:51
+#: panels/color/color.ui:1077
 msgid "LCD (RGB LED backlight)"
 msgstr "LCD (RGB LED -taustalamppu)"
 
-#: ../panels/color/color.ui.h:52
+#: panels/color/color.ui:1082
 msgid "LCD (white LED backlight)"
 msgstr "LCD (valkoinen LED-taustalamppu)"
 
-#: ../panels/color/color.ui.h:53
+#: panels/color/color.ui:1087
 msgid "Wide gamut LCD (CCFL backlight)"
 msgstr "Laajan gamutin LCD (CCFL-taustalamppu)"
 
-#: ../panels/color/color.ui.h:54
+#: panels/color/color.ui:1092
 msgid "Wide gamut LCD (RGB LED backlight)"
 msgstr "Laajan gamutin LCD (RGB LED -taustalamppu)"
 
-#: ../panels/color/color.ui.h:55
+#: panels/color/color.ui:1109
 msgctxt "Calibration quality"
 msgid "High"
 msgstr "Korkea"
 
-#: ../panels/color/color.ui.h:56
+#: panels/color/color.ui:1110
 msgid "40 minutes"
 msgstr "40 minuuttia"
 
-#: ../panels/color/color.ui.h:57
+#: panels/color/color.ui:1114
 msgctxt "Calibration quality"
 msgid "Medium"
 msgstr "Keskitaso"
 
-#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2
-#: ../panels/privacy/privacy.ui.h:7
+#: panels/color/color.ui:1115 panels/power/power.ui:25
+#: panels/privacy/privacy.ui:38
 msgid "30 minutes"
 msgstr "30 minuuttia"
 
-#: ../panels/color/color.ui.h:59
+#: panels/color/color.ui:1119
 msgctxt "Calibration quality"
 msgid "Low"
 msgstr "Matala"
 
-#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1
+#: panels/color/color.ui:1120 panels/power/power.ui:13 panels/power/power.ui:95
 msgid "15 minutes"
 msgstr "15 minuuttia"
 
-#: ../panels/color/color.ui.h:61
+#: panels/color/color.ui:1142
 msgid "Native to display"
 msgstr "NÃ¤ytÃ¶n natiivi"
 
-#: ../panels/color/color.ui.h:62
+#: panels/color/color.ui:1146
 msgid "D50 (Printing and publishing)"
 msgstr "D50 (Tulostus ja julkaisu)"
 
-#: ../panels/color/color.ui.h:63
+#: panels/color/color.ui:1150
 msgid "D55"
 msgstr "D55"
 
-#: ../panels/color/color.ui.h:64
+#: panels/color/color.ui:1154
 msgid "D65 (Photography and graphics)"
 msgstr "D65 (Valokuvaus ja grafiikka)"
 
-#: ../panels/color/color.ui.h:65
+#: panels/color/color.ui:1158
 msgid "D75"
 msgstr "D75"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
-msgid "CoÂlor"
-msgstr "VÃ¤ri"
+#: panels/color/gnome-color-panel.desktop.in.in:3
+msgid "Color"
+msgstr "VÃ¤rit"
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:3
+#: 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Ã¤"
 
+#: panels/color/gnome-color-panel.desktop.in.in:6
+#| msgid "Preferences"
+msgid "preferences-color"
+msgstr "preferences-color"
+
 #. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:5
+#: panels/color/gnome-color-panel.desktop.in.in:18
 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:323
+#: panels/common/cc-common-language.c:323
 msgid "Otherâ€¦"
 msgstr "Muuâ€¦"
 
-#: ../panels/common/cc-language-chooser.c:124
-#: ../panels/region/cc-format-chooser.c:269
-#: ../panels/region/cc-input-chooser.c:169
+#: panels/common/cc-language-chooser.c:124
+#: panels/region/cc-format-chooser.c:269 panels/region/cc-input-chooser.c:169
 msgid "Moreâ€¦"
 msgstr "LisÃ¤Ã¤â€¦"
 
-#: ../panels/common/cc-language-chooser.c:140
+#: panels/common/cc-language-chooser.c:140
 msgid "No languages found"
 msgstr "Kieli ei lÃ¶ytynyt"
 
-#: ../panels/common/cc-util.c:127
-#: ../panels/network/connection-editor/ce-page-details.c:106
+#: panels/common/cc-util.c:127
+#: panels/network/connection-editor/ce-page-details.c:106
 msgid "Today"
 msgstr "TÃ¤nÃ¤Ã¤n"
 
-#: ../panels/common/cc-util.c:131
-#: ../panels/network/connection-editor/ce-page-details.c:108
+#: panels/common/cc-util.c:131
+#: panels/network/connection-editor/ce-page-details.c:108
 msgid "Yesterday"
 msgstr "Eilen"
 
 #. Translators: This is a date format string in the style of "Feb 24".
-#: ../panels/common/cc-util.c:138
+#: panels/common/cc-util.c:138
 msgid "%b %e"
 msgstr "%e. %b"
 
 #. Translators: This is a date format string in the style of "Feb 24, 2013".
-#: ../panels/common/cc-util.c:143
+#: panels/common/cc-util.c:143
 msgid "%b %e, %Y"
 msgstr "%e. %b %Y"
 
-#: ../panels/common/language-chooser.ui.h:1
+#: panels/common/language-chooser.ui:5
 msgid "Language"
 msgstr "Kieli"
 
-#: ../panels/datetime/big.ui.h:1 ../panels/datetime/little.ui.h:1
-#: ../panels/datetime/middle.ui.h:1 ../panels/datetime/ydm.ui.h:1
+#: panels/datetime/big.ui:16 panels/datetime/little.ui:16
+#: panels/datetime/middle.ui:16 panels/datetime/ydm.ui:16
 msgid "Day"
 msgstr "PÃ¤ivÃ¤"
 
-#: ../panels/datetime/big.ui.h:2 ../panels/datetime/little.ui.h:2
-#: ../panels/datetime/middle.ui.h:2 ../panels/datetime/ydm.ui.h:2
+#: panels/datetime/big.ui:32 panels/datetime/little.ui:32
+#: panels/datetime/middle.ui:32 panels/datetime/ydm.ui:32
 msgid "Month"
 msgstr "Kuukausi"
 
-#: ../panels/datetime/big.ui.h:3 ../panels/datetime/little.ui.h:3
-#: ../panels/datetime/middle.ui.h:3 ../panels/datetime/ydm.ui.h:3
+#: panels/datetime/big.ui:48 panels/datetime/little.ui:48
+#: panels/datetime/middle.ui:48 panels/datetime/ydm.ui:48
 msgid "Year"
 msgstr "Vuosi"
 
 #. Translators: This is the full date and time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:339
+#: panels/datetime/cc-datetime-panel.c:333
 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:344
+#: panels/datetime/cc-datetime-panel.c:338
 msgid "%e %B %Y, %R"
 msgstr "%e. %Bta %Y, %R"
 
 #. Translators: "city, country"
-#: ../panels/datetime/cc-datetime-panel.c:522
+#: panels/datetime/cc-datetime-panel.c:503
 #, c-format
 msgctxt "timezone loc"
 msgid "%s, %s"
@@ -950,7 +957,7 @@ msgstr "%s, %s"
 
 #. Update the timezone on the listbow row
 #. Translators: "timezone (details)"
-#: ../panels/datetime/cc-datetime-panel.c:552
+#: panels/datetime/cc-datetime-panel.c:530
 #, c-format
 msgctxt "timezone desc"
 msgid "%s (%s)"
@@ -958,210 +965,207 @@ 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:560
+#: panels/datetime/cc-datetime-panel.c:537
 msgid "UTC%:::z"
 msgstr "UTC%:::z"
 
 #. Translators: This is the time format used in 12-hour mode.
-#: ../panels/datetime/cc-datetime-panel.c:565
+#: panels/datetime/cc-datetime-panel.c:542
 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:570
+#: panels/datetime/cc-datetime-panel.c:547
 msgid "%R"
 msgstr "%R"
 
 #. Update the text bubble in the timezone map
 #. Translators: "timezone (utc shift)"
-#: ../panels/datetime/cc-datetime-panel.c:575
+#: panels/datetime/cc-datetime-panel.c:552
 #, c-format
 msgctxt "timezone map"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../panels/datetime/datetime.ui.h:1
+#: panels/datetime/datetime.ui:22
 msgid "January"
 msgstr "Tammikuu"
 
-#: ../panels/datetime/datetime.ui.h:2
+#: panels/datetime/datetime.ui:25
 msgid "February"
 msgstr "Helmikuu"
 
-#: ../panels/datetime/datetime.ui.h:3
+#: panels/datetime/datetime.ui:28
 msgid "March"
 msgstr "Maaliskuu"
 
-#: ../panels/datetime/datetime.ui.h:4
+#: panels/datetime/datetime.ui:31
 msgid "April"
 msgstr "Huhtikuu"
 
-#: ../panels/datetime/datetime.ui.h:5
+#: panels/datetime/datetime.ui:34
 msgid "May"
 msgstr "Toukokuu"
 
-#: ../panels/datetime/datetime.ui.h:6
+#: panels/datetime/datetime.ui:37
 msgid "June"
 msgstr "KesÃ¤kuu"
 
-#: ../panels/datetime/datetime.ui.h:7
+#: panels/datetime/datetime.ui:40
 msgid "July"
 msgstr "HeinÃ¤kuu"
 
-#: ../panels/datetime/datetime.ui.h:8
+#: panels/datetime/datetime.ui:43
 msgid "August"
 msgstr "Elokuu"
 
-#: ../panels/datetime/datetime.ui.h:9
+#: panels/datetime/datetime.ui:46
 msgid "September"
 msgstr "Syyskuu"
 
-#: ../panels/datetime/datetime.ui.h:10
+#: panels/datetime/datetime.ui:49
 msgid "October"
 msgstr "Lokakuu"
 
-#: ../panels/datetime/datetime.ui.h:11
+#: panels/datetime/datetime.ui:52
 msgid "November"
 msgstr "Marraskuu"
 
-#: ../panels/datetime/datetime.ui.h:12
+#: panels/datetime/datetime.ui:55
 msgid "December"
 msgstr "Joulukuu"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/datetime/datetime.ui.h:13
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
+#: panels/datetime/datetime.ui:61
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:3
 msgid "Date & Time"
 msgstr "PÃ¤ivÃ¤ ja aika"
 
-#: ../panels/datetime/datetime.ui.h:14
+#: panels/datetime/datetime.ui:106
 msgid "Hour"
 msgstr "Tunti"
 
 #. Translator: this is the separator between hours and minutes, like in HHâˆ¶MM
-#: ../panels/datetime/datetime.ui.h:16
+#: panels/datetime/datetime.ui:121
 msgid "âˆ¶"
 msgstr "âˆ¶"
 
-#: ../panels/datetime/datetime.ui.h:17
+#: panels/datetime/datetime.ui:143
 msgid "Minute"
 msgstr "Minuutti"
 
-#: ../panels/datetime/datetime.ui.h:18
+#: panels/datetime/datetime.ui:208
 msgid "Time Zone"
 msgstr "AikavyÃ¶hyke"
 
-#: ../panels/datetime/datetime.ui.h:19
+#: panels/datetime/datetime.ui:228
 msgid "Search for a city"
 msgstr "Etsi kaupunkia"
 
-#: ../panels/datetime/datetime.ui.h:20
+#: panels/datetime/datetime.ui:304
 msgid "Automatic _Date & Time"
 msgstr "Automaattinen _pÃ¤ivÃ¤ ja aika"
 
-#: ../panels/datetime/datetime.ui.h:21
+#: panels/datetime/datetime.ui:319 panels/datetime/datetime.ui:397
 msgid "Requires internet access"
 msgstr "Vaatii internetyhteyden"
 
-#: ../panels/datetime/datetime.ui.h:22
+#: panels/datetime/datetime.ui:382
 msgid "Automatic Time _Zone"
 msgstr "Automaattinen _aikavyÃ¶hyke"
 
-#: ../panels/datetime/datetime.ui.h:23
+#: panels/datetime/datetime.ui:454
 msgid "Date & _Time"
 msgstr "PÃ¤ivÃ¤ _ja aika"
 
-#: ../panels/datetime/datetime.ui.h:24
+#: panels/datetime/datetime.ui:502
 msgid "Time Z_one"
 msgstr "Aikav_yÃ¶hyke"
 
-#: ../panels/datetime/datetime.ui.h:25
+#: panels/datetime/datetime.ui:570
 msgid "Time _Format"
 msgstr "Ajan _muoto"
 
-#: ../panels/datetime/datetime.ui.h:26
+#: panels/datetime/datetime.ui:588
 msgid "24-hour"
 msgstr "24 tuntia"
 
-#: ../panels/datetime/datetime.ui.h:27
+#: panels/datetime/datetime.ui:589
 msgid "AM / PM"
 msgstr "AM / PM"
 
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:4
 msgid "Change the date and time, including time zone"
 msgstr "Vaihda aikaa, pÃ¤ivÃ¤Ã¤ tai aikavyÃ¶hykettÃ¤"
 
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:6
+msgid "preferences-system-time"
+msgstr "preferences-system-time"
+
 #. Translators: those are keywords for the date and time control-center panel
-#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5
+#: panels/datetime/gnome-datetime-panel.desktop.in.in:14
 msgid "Clock;Timezone;Location;"
 msgstr "Kello;AikavyÃ¶hyke;Sijainti;"
 
-#: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:1
+#: panels/datetime/org.gnome.controlcenter.datetime.policy.in:11
 msgid "Change system time and date settings"
 msgstr "Muuta jÃ¤rjestelmÃ¤n aika-asetuksia"
 
-#: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:2
+#: panels/datetime/org.gnome.controlcenter.datetime.policy.in:12
 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:747
+#: panels/display/cc-display-panel.c:729
 msgctxt "Display rotation"
 msgid "Landscape"
 msgstr "Vaaka"
 
-#: ../panels/display/cc-display-panel.c:750
+#: panels/display/cc-display-panel.c:732
 msgctxt "Display rotation"
 msgid "Portrait Right"
 msgstr "Pysty oikea"
 
-#: ../panels/display/cc-display-panel.c:753
+#: panels/display/cc-display-panel.c:735
 msgctxt "Display rotation"
 msgid "Portrait Left"
 msgstr "Pysty vasen"
 
-#: ../panels/display/cc-display-panel.c:756
+#: panels/display/cc-display-panel.c:738
 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:797
-#: ../panels/display/cc-display-panel.c:847
-#: ../panels/printers/pp-options-dialog.c:558
+#: panels/display/cc-display-panel.c:805
+#: panels/printers/pp-options-dialog.c:558
 msgid "Orientation"
 msgstr "Suunta"
 
-#: ../panels/display/cc-display-panel.c:890
-#: ../panels/display/cc-display-panel.c:942
-#: ../panels/display/cc-display-panel.c:1769
-#: ../panels/display/cc-display-panel.c:1815
-#: ../panels/printers/pp-options-dialog.c:87
+#: panels/display/cc-display-panel.c:870 panels/display/cc-display-panel.c:1673
+#: panels/printers/pp-options-dialog.c:87
 msgid "Resolution"
 msgstr "Tarkkuus"
 
-#: ../panels/display/cc-display-panel.c:987
-#: ../panels/display/cc-display-panel.c:1058
+#: panels/display/cc-display-panel.c:958
 msgid "Refresh Rate"
 msgstr "PÃ¤ivitystaajuus"
 
-#: ../panels/display/cc-display-panel.c:1195
+#: panels/display/cc-display-panel.c:1095
 msgid "Scale"
 msgstr "Skaalattu"
 
-#: ../panels/display/cc-display-panel.c:1248
+#: panels/display/cc-display-panel.c:1148
 msgid "Adjust for TV"
 msgstr "Sovita TV:hen"
 
-#: ../panels/display/cc-display-panel.c:1486
-#: ../panels/display/cc-display-panel.c:1535
+#: panels/display/cc-display-panel.c:1410
 msgid "Primary Display"
 msgstr "Ensisijainen nÃ¤yttÃ¶"
 
-#: ../panels/display/cc-display-panel.c:1564
+#: panels/display/cc-display-panel.c:1439
 msgid "Display Arrangement"
 msgstr "NÃ¤yttÃ¶jen jÃ¤rjestys"
 
-#: ../panels/display/cc-display-panel.c:1565
+#: panels/display/cc-display-panel.c:1440
 msgid ""
 "Drag displays to match your setup. The top bar is placed on the primary "
 "display."
@@ -1169,84 +1173,85 @@ msgstr ""
 "VedÃ¤ nÃ¤ytÃ¶t vastaamaan nÃ¤yttÃ¶jesi jÃ¤rjestystÃ¤. YlÃ¤palkki asetetaan "
 "ensisijaiselle nÃ¤ytÃ¶lle."
 
-#: ../panels/display/cc-display-panel.c:2005
+#: panels/display/cc-display-panel.c:1863
 msgid "Display Mode"
 msgstr "NÃ¤yttÃ¶tila"
 
-#: ../panels/display/cc-display-panel.c:2021
+#: panels/display/cc-display-panel.c:1879
 msgid "Join Displays"
 msgstr "LiitÃ¤ nÃ¤ytÃ¶t"
 
-#: ../panels/display/cc-display-panel.c:2024
+#: panels/display/cc-display-panel.c:1882
 msgid "Mirror"
 msgstr "Peili"
 
-#: ../panels/display/cc-display-panel.c:2027
+#: panels/display/cc-display-panel.c:1885
 msgid "Single Display"
 msgstr "Yksi nÃ¤yttÃ¶"
 
-#: ../panels/display/cc-display-panel.c:2740
+#: panels/display/cc-display-panel.c:2590
 msgid "Apply Changes?"
 msgstr "Toteutetaanko muutokset?"
 
-#: ../panels/display/cc-display-panel.c:2754
-#: ../panels/network/connection-editor/connection-editor.ui.h:2
-#: ../panels/network/network-wifi.ui.h:2
+#: panels/display/cc-display-panel.c:2604
+#: panels/network/connection-editor/connection-editor.ui:24
+#: panels/network/network-wifi.ui:38
 msgid "_Apply"
 msgstr "_Toteuta"
 
-#: ../panels/display/cc-display-panel.c:3129
+#: panels/display/cc-display-panel.c:2979
 #, c-format
 msgid "%.2lf Hz"
 msgstr "%.2lf Hz"
 
 #. TRANSLATORS: the state of the night light setting
-#: ../panels/display/cc-display-panel.c:3345
-#: ../panels/notifications/cc-notifications-panel.c:292
-#: ../panels/power/cc-power-panel.c:1970 ../panels/power/cc-power-panel.c:1977
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:331
-#: ../panels/universal-access/cc-ua-panel.c:712
-#: ../panels/universal-access/cc-ua-panel.c:725
-#: ../panels/universal-access/cc-ua-panel.c:737
-#: ../panels/universal-access/cc-ua-panel.c:908
+#: panels/display/cc-display-panel.c:3195
+#: panels/notifications/cc-notifications-panel.c:292
+#: panels/power/cc-power-panel.c:1982 panels/power/cc-power-panel.c:1989
+#: panels/privacy/cc-privacy-panel.c:190 panels/privacy/cc-privacy-panel.c:257
+#: panels/universal-access/cc-ua-panel.c:331
+#: panels/universal-access/cc-ua-panel.c:712
+#: panels/universal-access/cc-ua-panel.c:725
+#: panels/universal-access/cc-ua-panel.c:737
+#: panels/universal-access/cc-ua-panel.c:908
 msgid "On"
 msgstr "PÃ¤Ã¤llÃ¤"
 
-#: ../panels/display/cc-display-panel.c:3345 ../panels/network/net-proxy.c:54
-#: ../panels/notifications/cc-notifications-panel.c:292
-#: ../panels/power/cc-power-panel.c:1964 ../panels/power/cc-power-panel.c:1975
-#: ../panels/privacy/cc-privacy-panel.c:190
-#: ../panels/privacy/cc-privacy-panel.c:257
-#: ../panels/universal-access/cc-ua-panel.c:331
-#: ../panels/universal-access/cc-ua-panel.c:712
-#: ../panels/universal-access/cc-ua-panel.c:725
-#: ../panels/universal-access/cc-ua-panel.c:737
-#: ../panels/universal-access/cc-ua-panel.c:908
-#: ../panels/universal-access/uap.ui.h:7
+#: panels/display/cc-display-panel.c:3195 panels/network/net-proxy.c:54
+#: panels/notifications/cc-notifications-panel.c:292
+#: panels/power/cc-power-panel.c:1976 panels/power/cc-power-panel.c:1987
+#: panels/privacy/cc-privacy-panel.c:190 panels/privacy/cc-privacy-panel.c:257
+#: panels/universal-access/cc-ua-panel.c:331
+#: panels/universal-access/cc-ua-panel.c:712
+#: panels/universal-access/cc-ua-panel.c:725
+#: panels/universal-access/cc-ua-panel.c:737
+#: panels/universal-access/cc-ua-panel.c:908 panels/universal-access/uap.ui:334
+#: panels/universal-access/uap.ui:380 panels/universal-access/uap.ui:426
+#: panels/universal-access/uap.ui:532 panels/universal-access/uap.ui:685
+#: panels/universal-access/uap.ui:731 panels/universal-access/uap.ui:777
+#: panels/universal-access/uap.ui:929
 msgid "Off"
 msgstr "Pois"
 
-#: ../panels/display/cc-display-panel.c:3366
+#: panels/display/cc-display-panel.c:3216
 msgid "_Night Light"
 msgstr "_YÃ¶valo"
 
-#: ../panels/display/cc-display-panel.c:3431
+#: panels/display/cc-display-panel.c:3281
 msgid "Could not get screen information"
 msgstr "NÃ¤ytÃ¶n tietoja ei saatu"
 
 #. This cancels the redshift inhibit.
-#: ../panels/display/display.ui.h:2
+#: panels/display/display.ui:71
 msgid "Restart Filter"
 msgstr "KÃ¤ynnistÃ¤ suodatin uudelleen"
 
 #. Inhibit the redshift functionality until the next day starts
-#: ../panels/display/display.ui.h:4
+#: panels/display/display.ui:103
 msgid "Temporarily Disabled Until Tomorrow"
 msgstr "Poistettu vÃ¤liaikaisesti kÃ¤ytÃ¶stÃ¤ huomiseen asti"
 
-#: ../panels/display/display.ui.h:5
+#: panels/display/display.ui:144
 msgid ""
 "Night light makes the screen color warmer. This can help to prevent eye "
 "strain and sleeplessness."
@@ -1255,60 +1260,63 @@ msgstr ""
 "silmien rasittumista ja unettomuutta."
 
 #. This is the redshift functionality where we suppress blue light when the sun has gone down
-#: ../panels/display/display.ui.h:7
+#: panels/display/display.ui:171 panels/display/display.ui:567
 msgid "Night Light"
 msgstr "YÃ¶valo"
 
-#: ../panels/display/display.ui.h:8
+#: panels/display/display.ui:187
 msgid "Schedule"
 msgstr "Aikataulu"
 
-#: ../panels/display/display.ui.h:9
+#: panels/display/display.ui:215
 msgid "Sunset to Sunrise"
 msgstr "Auringonlaskusta auringonnousuun"
 
-#: ../panels/display/display.ui.h:10
-#: ../panels/network/connection-editor/ip4-page.ui.h:4
-#: ../panels/network/connection-editor/ip6-page.ui.h:5
-#: ../panels/network/net-proxy.c:56 ../panels/network/network-proxy.ui.h:3
-#: ../panels/network/network-wifi.ui.h:26
-#: ../panels/privacy/cc-privacy-panel.c:217
+#: panels/display/display.ui:229
+#: 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:217
 msgid "Manual"
 msgstr "Manuaalinen"
 
-#: ../panels/display/display.ui.h:11
+#: panels/display/display.ui:268
 msgid "From"
 msgstr "Alkaa"
 
-#: ../panels/display/display.ui.h:12
+#: panels/display/display.ui:309 panels/display/display.ui:430
 msgid ":"
 msgstr ":"
 
 #. This is the short form for the time period in the morning
-#: ../panels/display/display.ui.h:14
+#: panels/display/display.ui:343 panels/display/display.ui:464
 msgid "AM"
 msgstr "AM"
 
 #. This is the short form for the time period in the afternoon
-#: ../panels/display/display.ui.h:16
+#: panels/display/display.ui:359 panels/display/display.ui:480
 msgid "PM"
 msgstr "PM"
 
-#: ../panels/display/display.ui.h:17
+#: panels/display/display.ui:528
 msgid "To"
 msgstr "PÃ¤Ã¤ttyy"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "DisÂplays"
+#: panels/display/gnome-display-panel.desktop.in.in:3
+msgid "Displays"
 msgstr "NÃ¤ytÃ¶t"
 
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:3
+#: panels/display/gnome-display-panel.desktop.in.in:4
 msgid "Choose how to use connected monitors and projectors"
 msgstr "Valitse kuinka nÃ¤yttÃ¶jÃ¤ ja projektoreja kÃ¤sitellÃ¤Ã¤n"
 
+#: panels/display/gnome-display-panel.desktop.in.in:6
+msgid "preferences-desktop-display"
+msgstr "preferences-desktop-display"
+
 #. Translators: those are keywords for the display control-center panel
-#: ../panels/display/gnome-display-panel.desktop.in.in.h:5
+#: panels/display/gnome-display-panel.desktop.in.in:18
 msgid ""
 "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Night;Light;Blue;"
 "redshift;color;sunset;sunrise;"
@@ -1318,9 +1326,8 @@ msgstr ""
 "Virkistystaajuus;yÃ¶valo;"
 
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-overview-panel.c:381
-#: ../panels/info/cc-info-overview-panel.c:468
-#: ../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"
 
@@ -1328,77 +1335,61 @@ 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:476
+#: 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:493
+#: 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:496
+#: panels/info/cc-info-overview-panel.c:485
 #, c-format
 msgid "32-bit"
 msgstr "32-bit"
 
-#: ../panels/info/cc-info-overview-panel.c:807
+#: panels/info/cc-info-overview-panel.c:775
 #, c-format
 msgid "Version %s"
 msgstr "Versio %s"
 
-#: ../panels/info/cc-info-panel.c:138
-msgid "Section"
-msgstr "Osio"
-
-#: ../panels/info/cc-info-panel.c:147 ../panels/info/info.ui.h:1
-msgid "Overview"
-msgstr "Yhteenveto"
-
-#: ../panels/info/cc-info-panel.c:153 ../panels/info/info.ui.h:2
-msgid "Default Applications"
-msgstr "Oletussovellukset"
-
-#: ../panels/info/cc-info-panel.c:158 ../panels/info/info.ui.h:3
-msgid "Removable Media"
-msgstr "Erilliset tallennusvÃ¤lineet"
-
-#: ../panels/info/cc-info-removable-media-panel.c:312
+#: panels/info/cc-info-removable-media-panel.c:298
 msgid "Ask what to do"
 msgstr "Kysy mitÃ¤ tehdÃ¤Ã¤n"
 
-#: ../panels/info/cc-info-removable-media-panel.c:316
+#: panels/info/cc-info-removable-media-panel.c:302
 msgid "Do nothing"
 msgstr "Ã„lÃ¤ tee mitÃ¤Ã¤n"
 
-#: ../panels/info/cc-info-removable-media-panel.c:320
+#: panels/info/cc-info-removable-media-panel.c:306
 msgid "Open folder"
 msgstr "Avaa kansio"
 
-#: ../panels/info/cc-info-removable-media-panel.c:411
+#: panels/info/cc-info-removable-media-panel.c:391
 msgid "Other Media"
 msgstr "Muu media"
 
-#: ../panels/info/cc-info-removable-media-panel.c:444
+#: panels/info/cc-info-removable-media-panel.c:424
 msgid "Select an application for audio CDs"
 msgstr "Valitse sovellus Ã¤Ã¤ni-CD-levyille"
 
-#: ../panels/info/cc-info-removable-media-panel.c:445
+#: panels/info/cc-info-removable-media-panel.c:425
 msgid "Select an application for video DVDs"
 msgstr "Valitse sovellus video-DVD-levyille"
 
-#: ../panels/info/cc-info-removable-media-panel.c:446
+#: panels/info/cc-info-removable-media-panel.c:426
 msgid "Select an application to run when a music player is connected"
 msgstr "Valitse sovellus ajettavaksi kun musiikkisoitin kytketÃ¤Ã¤n"
 
-#: ../panels/info/cc-info-removable-media-panel.c:447
+#: panels/info/cc-info-removable-media-panel.c:427
 msgid "Select an application to run when a camera is connected"
 msgstr "Valitse sovellus ajettavaksi kun kamera kytketÃ¤Ã¤n"
 
-#: ../panels/info/cc-info-removable-media-panel.c:448
+#: panels/info/cc-info-removable-media-panel.c:428
 msgid "Select an application for software CDs"
 msgstr "Valitse sovellus ohjelmisto-CD-levyille"
 
@@ -1407,81 +1398,87 @@ msgstr "Valitse sovellus ohjelmisto-CD-levyille"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-removable-media-panel.c:460
+#: panels/info/cc-info-removable-media-panel.c:440
 msgid "audio DVD"
 msgstr "Ã¤Ã¤ni-DVD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:461
+#: panels/info/cc-info-removable-media-panel.c:441
 msgid "blank Blu-ray disc"
 msgstr "tyhjÃ¤ Blu-ray-levy"
 
-#: ../panels/info/cc-info-removable-media-panel.c:462
+#: panels/info/cc-info-removable-media-panel.c:442
 msgid "blank CD disc"
 msgstr "tyhjÃ¤ CD-levy"
 
-#: ../panels/info/cc-info-removable-media-panel.c:463
+#: panels/info/cc-info-removable-media-panel.c:443
 msgid "blank DVD disc"
 msgstr "tyhjÃ¤ DVD-levy"
 
-#: ../panels/info/cc-info-removable-media-panel.c:464
+#: panels/info/cc-info-removable-media-panel.c:444
 msgid "blank HD DVD disc"
 msgstr "tyhjÃ¤ HD DVD -levy"
 
-#: ../panels/info/cc-info-removable-media-panel.c:465
+#: panels/info/cc-info-removable-media-panel.c:445
 msgid "Blu-ray video disc"
 msgstr "Blu-ray-videolevy"
 
-#: ../panels/info/cc-info-removable-media-panel.c:466
+#: panels/info/cc-info-removable-media-panel.c:446
 msgid "e-book reader"
 msgstr "e-kirjalukija"
 
-#: ../panels/info/cc-info-removable-media-panel.c:467
+#: panels/info/cc-info-removable-media-panel.c:447
 msgid "HD DVD video disc"
 msgstr "HD DVD -videolevy"
 
-#: ../panels/info/cc-info-removable-media-panel.c:468
+#: panels/info/cc-info-removable-media-panel.c:448
 msgid "Picture CD"
 msgstr "Kuva-CD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:469
+#: panels/info/cc-info-removable-media-panel.c:449
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:470
+#: panels/info/cc-info-removable-media-panel.c:450
 msgid "Video CD"
 msgstr "Video-CD"
 
-#: ../panels/info/cc-info-removable-media-panel.c:471
+#: panels/info/cc-info-removable-media-panel.c:451
 msgid "Windows software"
 msgstr "Windows-ohjelmisto"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:2
-msgid "DefaÂult Applications"
+#: panels/info/gnome-default-apps-panel.desktop.in.in:3
+msgid "Default Applications"
 msgstr "Oletussovellukset"
 
-#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:3
+#: panels/info/gnome-default-apps-panel.desktop.in.in:4
 msgid "Configure Default Applications"
 msgstr "MÃ¤Ã¤ritÃ¤ oletussovellukset"
 
+#: panels/info/gnome-default-apps-panel.desktop.in.in:6
+msgid "starred"
+msgstr "starred"
+
 #. Translators: those are keywords for the Default Applications panel
-#: ../panels/info/gnome-default-apps-panel.desktop.in.in.h:5
+#: panels/info/gnome-default-apps-panel.desktop.in.in:18
 msgid "default;application;preferred;media;"
 msgstr "default;application;preferred;media;oletussovellus;ensisijainen;"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:2
-msgid "AbÂout"
-msgstr "JÃ¤rjestelmÃ¤tiedot"
+#: panels/info/gnome-info-overview-panel.desktop.in.in:3
+msgid "About"
+msgstr "Tietoja"
 
-#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:3
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:3
+#: panels/info/gnome-info-overview-panel.desktop.in.in:4
 msgid "View information about your system"
 msgstr "Katsele jÃ¤rjestelmÃ¤n tietoja"
 
+#: panels/info/gnome-info-overview-panel.desktop.in.in:6
+msgid "help-about"
+msgstr "help-about"
+
+#. Translators: those are keywords for the System Information panel
+#. "Preferred Applications" is the old name for the preference, so make
 #. sure that you use the same "translation" for those keywords
-#: ../panels/info/gnome-info-overview-panel.desktop.in.in.h:5
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:5
+#: panels/info/gnome-info-overview-panel.desktop.in.in:20
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
 "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
@@ -1491,22 +1488,20 @@ msgstr ""
 "jÃ¤rjestelmÃ¤;tiedot;muisti;suoritin;prosessori;versio;oletukset;sovellus;"
 "suositellut;automaattikÃ¤ynnistys;Ã¤Ã¤ni;irrotettava;ulkoinen;"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "DeÂtails"
-msgstr "Tiedot"
-
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:2
-msgid "RemoÂvable Media"
+#: panels/info/gnome-removable-media-panel.desktop.in.in:3
+msgid "Removable Media"
 msgstr "Erilliset tallennusvÃ¤lineet"
 
-#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:3
+#: panels/info/gnome-removable-media-panel.desktop.in.in:4
 msgid "Configure Removable Media settings"
 msgstr "MÃ¤Ã¤ritÃ¤ erillisten tallennusvÃ¤lineiden asetukset"
 
+#: panels/info/gnome-removable-media-panel.desktop.in.in:6
+msgid "media-removable"
+msgstr "media-removable"
+
 #. Translators: those are keywords for the Removable Media panel
-#: ../panels/info/gnome-removable-media-panel.desktop.in.in.h:5
+#: panels/info/gnome-removable-media-panel.desktop.in.in:18
 msgid ""
 "device;system;default;application;preferred;cd;dvd;usb;audio;video;disc;"
 "removable;media;autorun;"
@@ -1516,291 +1511,287 @@ msgstr ""
 "versio;oletukset;sovellus;suositellut;automaattikÃ¤ynnistys;Ã¤Ã¤ni;irrotettava;"
 "ulkoinen;"
 
-#: ../panels/info/info-default-apps.ui.h:1
+#: panels/info/info-default-apps.ui:31
 msgid "_Web"
 msgstr "_Verkko"
 
-#: ../panels/info/info-default-apps.ui.h:2
+#: panels/info/info-default-apps.ui:43
 msgid "_Mail"
 msgstr "_SÃ¤hkÃ¶posti"
 
-#: ../panels/info/info-default-apps.ui.h:3
+#: panels/info/info-default-apps.ui:59
 msgid "_Calendar"
 msgstr "_Kalenteri"
 
-#: ../panels/info/info-default-apps.ui.h:4
+#: panels/info/info-default-apps.ui:75
 msgid "M_usic"
 msgstr "M_usiikki"
 
-#: ../panels/info/info-default-apps.ui.h:5
+#: panels/info/info-default-apps.ui:91
 msgid "_Video"
 msgstr "_Video"
 
-#: ../panels/info/info-default-apps.ui.h:6
-#: ../panels/info/info-removable-media.ui.h:5
+#: panels/info/info-default-apps.ui:162 panels/info/info-removable-media.ui:161
 msgid "_Photos"
 msgstr "_Kuvat"
 
-#: ../panels/info/info-overview.ui.h:1
+#: panels/info/info-overview.ui:58
 msgid "Device name"
 msgstr "Laitteen nimi"
 
-#: ../panels/info/info-overview.ui.h:2
+#: panels/info/info-overview.ui:74
 msgid "Memory"
 msgstr "Muisti"
 
-#: ../panels/info/info-overview.ui.h:3
+#: panels/info/info-overview.ui:90
 msgid "Processor"
 msgstr "Suoritin"
 
-#: ../panels/info/info-overview.ui.h:4
+#: 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.h:6
+#: 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.h:8
+#: panels/info/info-overview.ui:137
 msgid "OS type"
 msgstr "KÃ¤yttÃ¶jÃ¤rjestelmÃ¤n tyyppi"
 
-#: ../panels/info/info-overview.ui.h:9
+#: panels/info/info-overview.ui:153
 msgid "Virtualization"
 msgstr "Virtualisointi"
 
-#: ../panels/info/info-overview.ui.h:10
+#: panels/info/info-overview.ui:169
 msgid "Disk"
 msgstr "Levy"
 
-#: ../panels/info/info-overview.ui.h:11
+#: panels/info/info-overview.ui:274
 msgid "Calculatingâ€¦"
 msgstr "Lasketaanâ€¦"
 
-#: ../panels/info/info-overview.ui.h:12
+#: panels/info/info-overview.ui:314
 msgid "Check for updates"
 msgstr "Tarkista pÃ¤ivitykset"
 
-#: ../panels/info/info-removable-media.ui.h:1
+#: 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.h:2
+#: panels/info/info-removable-media.ui:74
 msgid "CD _audio"
 msgstr "_Ã„Ã¤ni-CD"
 
-#: ../panels/info/info-removable-media.ui.h:3
+#: panels/info/info-removable-media.ui:91
 msgid "_DVD video"
 msgstr "_DVD-video"
 
-#: ../panels/info/info-removable-media.ui.h:4
+#: panels/info/info-removable-media.ui:132
 msgid "_Music player"
 msgstr "_Musiikkisoitin"
 
-#: ../panels/info/info-removable-media.ui.h:6
+#: panels/info/info-removable-media.ui:190
 msgid "_Software"
 msgstr "_Ohjelmisto"
 
-#: ../panels/info/info-removable-media.ui.h:7
+#: panels/info/info-removable-media.ui:228
 msgid "_Other Mediaâ€¦"
 msgstr "_Muu mediaâ€¦"
 
-#: ../panels/info/info-removable-media.ui.h:8
+#: 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.h:9
+#: 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.h:10
+#: panels/info/info-removable-media.ui:370
 msgid "_Action:"
 msgstr "_Toiminto:"
 
-#: ../panels/info/info-removable-media.ui.h:11
+#: panels/info/info-removable-media.ui:393
 msgid "_Type:"
 msgstr "_Tyyppi:"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:1
+#: panels/keyboard/00-multimedia.xml.in:2
 msgid "Sound and Media"
 msgstr "Ã„Ã¤ni ja media"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:2
+#: panels/keyboard/00-multimedia.xml.in:4
 msgid "Volume mute"
 msgstr "HiljennÃ¤ Ã¤Ã¤ni"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:3
+#: panels/keyboard/00-multimedia.xml.in:6
 msgid "Volume down"
 msgstr "VÃ¤hennÃ¤ Ã¤Ã¤nenvoimakkuutta"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:4
+#: panels/keyboard/00-multimedia.xml.in:8
 msgid "Volume up"
 msgstr "LisÃ¤Ã¤ Ã¤Ã¤nenvoimakkuutta"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:5
+#: panels/keyboard/00-multimedia.xml.in:10
 msgid "Launch media player"
 msgstr "KÃ¤ynnistÃ¤ mediasoitin"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:6
+#: panels/keyboard/00-multimedia.xml.in:12
 msgid "Play (or play/pause)"
 msgstr "Soita (tai tauko)"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:7
+#: panels/keyboard/00-multimedia.xml.in:14
 msgid "Pause playback"
 msgstr "KeskeytÃ¤ toisto"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:8
+#: panels/keyboard/00-multimedia.xml.in:16
 msgid "Stop playback"
 msgstr "PysÃ¤ytÃ¤ toisto"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:9
+#: panels/keyboard/00-multimedia.xml.in:18
 msgid "Previous track"
 msgstr "Edellinen kappale"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:10
+#: panels/keyboard/00-multimedia.xml.in:20
 msgid "Next track"
 msgstr "Seuraava kappale"
 
-#: ../panels/keyboard/00-multimedia.xml.in.h:11
+#: panels/keyboard/00-multimedia.xml.in:22
 msgid "Eject"
 msgstr "Irrota"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:1
-#: ../panels/universal-access/uap.ui.h:12
+#: panels/keyboard/01-input-sources.xml.in:4 panels/universal-access/uap.ui:576
 msgid "Typing"
 msgstr "Kirjoittaminen"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:2
+#: panels/keyboard/01-input-sources.xml.in:8
 msgid "Switch to next input source"
 msgstr "Vaihda seuraavaan lÃ¤hteeseen"
 
-#: ../panels/keyboard/01-input-sources.xml.in.h:3
+#: panels/keyboard/01-input-sources.xml.in:13
 msgid "Switch to previous input source"
 msgstr "Vaihda edelliseen lÃ¤hteeseen"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:1
+#: panels/keyboard/01-launchers.xml.in:2
 msgid "Launchers"
 msgstr "KÃ¤ynnistimet"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:2
+#: panels/keyboard/01-launchers.xml.in:4
 msgid "Launch help browser"
 msgstr "KÃ¤ynnistÃ¤ ohjeselain"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:1590
-#: ../shell/cc-window.c:251 ../shell/cc-window.c:835
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1
+#: panels/keyboard/01-launchers.xml.in:6 shell/cc-window.c:220
+#: shell/cc-window.c:748 shell/gnome-control-center.desktop.in.in:3
+#: shell/window.ui:125
 msgid "Settings"
 msgstr "Asetukset"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:4
+#: panels/keyboard/01-launchers.xml.in:8
 msgid "Launch calculator"
 msgstr "KÃ¤ynnistÃ¤ laskin"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:5
+#: panels/keyboard/01-launchers.xml.in:10
 msgid "Launch email client"
 msgstr "KÃ¤ynnistÃ¤ sÃ¤hkÃ¶postisovellus"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:6
+#: panels/keyboard/01-launchers.xml.in:12
 msgid "Launch web browser"
 msgstr "KÃ¤ynnistÃ¤ internetselain"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:7
+#: panels/keyboard/01-launchers.xml.in:14
 msgid "Home folder"
 msgstr "Kotikansio"
 
-#: ../panels/keyboard/01-launchers.xml.in.h:8
-msgctxt "keybinding"
+#: panels/keyboard/01-launchers.xml.in:16
+#: panels/search/gnome-search-panel.desktop.in.in:3 shell/window.ui:157
 msgid "Search"
-msgstr "Etsi"
+msgstr "Haku"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:1
+#: panels/keyboard/01-screenshot.xml.in:2
 msgid "Screenshots"
 msgstr "Kuvakaappaukset"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:3
+#: panels/keyboard/01-screenshot.xml.in:6
 msgid "Save a screenshot to $PICTURES"
 msgstr "Tallenna kuvakaappaus kohteeseen $PICTURES"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:5
+#: panels/keyboard/01-screenshot.xml.in:10
 msgid "Save a screenshot of a window to $PICTURES"
 msgstr "Tallenna kuvakaappaus ikkunasta kohteeseen $PICTURES"
 
-#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
-#: ../panels/keyboard/01-screenshot.xml.in.h:7
+#: panels/keyboard/01-screenshot.xml.in:14
 msgid "Save a screenshot of an area to $PICTURES"
 msgstr "Tallenna kuvakaappaus alueesta $PICTURES-kansioon"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:8
+#: panels/keyboard/01-screenshot.xml.in:17
 msgid "Copy a screenshot to clipboard"
 msgstr "Kopioi kuvakaappaus leikepÃ¶ydÃ¤lle"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:9
+#: panels/keyboard/01-screenshot.xml.in:20
 msgid "Copy a screenshot of a window to clipboard"
 msgstr "Kopioi kuvakaappaus ikkunasta leikepÃ¶ydÃ¤lle"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:10
+#: panels/keyboard/01-screenshot.xml.in:23
 msgid "Copy a screenshot of an area to clipboard"
 msgstr "Kopioi kuvakaappaus alueesta leikepÃ¶ydÃ¤lle"
 
-#: ../panels/keyboard/01-screenshot.xml.in.h:11
+#: panels/keyboard/01-screenshot.xml.in:26
 msgid "Record a short screencast"
 msgstr "Nauhoita ruutukaappausvideo"
 
-#: ../panels/keyboard/01-system.xml.in.h:1
+#: panels/keyboard/01-system.xml.in:2
 msgid "System"
 msgstr "JÃ¤rjestelmÃ¤"
 
-#: ../panels/keyboard/01-system.xml.in.h:2
+#: panels/keyboard/01-system.xml.in:4
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
-#: ../panels/keyboard/01-system.xml.in.h:3
+#: panels/keyboard/01-system.xml.in:6
 msgid "Lock screen"
 msgstr "Lukitse nÃ¤yttÃ¶"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:1
+#: panels/keyboard/50-accessibility.xml.in:2
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:3
 msgid "Universal Access"
 msgstr "EsteettÃ¶myys"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:2
+#: panels/keyboard/50-accessibility.xml.in:4
 msgid "Turn zoom on or off"
 msgstr "Suurennus pÃ¤Ã¤llÃ¤/pois"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:3
+#: panels/keyboard/50-accessibility.xml.in:6
 msgid "Zoom in"
 msgstr "LÃ¤hennÃ¤"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:4
+#: panels/keyboard/50-accessibility.xml.in:8
 msgid "Zoom out"
 msgstr "Loitonna"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:5
+#: panels/keyboard/50-accessibility.xml.in:10
 msgid "Turn screen reader on or off"
 msgstr "NÃ¤ytÃ¶nlukija pÃ¤Ã¤llÃ¤/pois"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:6
+#: panels/keyboard/50-accessibility.xml.in:12
 msgid "Turn on-screen keyboard on or off"
 msgstr "VirtuaalinÃ¤ppÃ¤imistÃ¶ pÃ¤Ã¤llÃ¤/pois"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:7
+#: panels/keyboard/50-accessibility.xml.in:14
 msgid "Increase text size"
 msgstr "Suurenna tekstin kokoa"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:8
+#: panels/keyboard/50-accessibility.xml.in:16
 msgid "Decrease text size"
 msgstr "PienennÃ¤ tekstin kokoa"
 
-#: ../panels/keyboard/50-accessibility.xml.in.h:9
+#: panels/keyboard/50-accessibility.xml.in:18
 msgid "High contrast on or off"
 msgstr "Korkea kontrasti pÃ¤Ã¤lle/pois"
 
-#: ../panels/keyboard/cc-keyboard-manager.c:506
-#: ../panels/keyboard/cc-keyboard-manager.c:514
-#: ../panels/keyboard/cc-keyboard-manager.c:822
+#: panels/keyboard/cc-keyboard-manager.c:506
+#: panels/keyboard/cc-keyboard-manager.c:514
+#: panels/keyboard/cc-keyboard-manager.c:822
 msgid "Custom Shortcuts"
 msgstr "Omat pikanÃ¤ppÃ¤imet"
 
@@ -1809,14 +1800,13 @@ msgstr "Omat pikanÃ¤ppÃ¤imet"
 #.
 #. translators:
 #. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:276
-#: ../panels/keyboard/cc-keyboard-option.c:395
-#: ../panels/keyboard/keyboard-shortcuts.c:435
-#: ../panels/keyboard/shortcut-editor.ui.h:2
-#: ../panels/network/network-proxy.ui.h:4
-#: ../panels/network/network-wifi.ui.h:31
-#: ../panels/sound/gvc/gvc-mixer-control.c:1866
-#: ../panels/user-accounts/um-fingerprint-dialog.c:214
+#: panels/keyboard/cc-keyboard-option.c:263
+#: panels/keyboard/cc-keyboard-option.c:382
+#: panels/keyboard/keyboard-shortcuts.c:435
+#: 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:214
+#: subprojects/gvc/gvc-mixer-control.c:1866
 msgid "Disabled"
 msgstr "Ei kÃ¤ytÃ¶ssÃ¤"
 
@@ -1824,7 +1814,7 @@ msgstr "Ei kÃ¤ytÃ¶ssÃ¤"
 #. * chooser'. AltGr is often used for this purpose. See
 #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:354
+#: panels/keyboard/cc-keyboard-option.c:341
 msgid "Alternative Characters Key"
 msgstr "Vaihtoehtoinen merkistÃ¶nÃ¤ppÃ¤in"
 
@@ -1832,21 +1822,21 @@ msgstr "Vaihtoehtoinen merkistÃ¶nÃ¤ppÃ¤in"
 #. * sequences that are combined to form a single character.
 #. * See http://en.wikipedia.org/wiki/Compose_key
 #.
-#: ../panels/keyboard/cc-keyboard-option.c:363
+#: panels/keyboard/cc-keyboard-option.c:350
 msgid "Compose Key"
 msgstr "Compose-nÃ¤ppÃ¤in"
 
-#: ../panels/keyboard/cc-keyboard-option.c:368
+#: panels/keyboard/cc-keyboard-option.c:355
 #, fuzzy
 #| msgid "Switch to next source"
 msgid "Modifiers-only switch to next source"
 msgstr "Vaihda seuraavaan lÃ¤hteeseen"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:181
+#: panels/keyboard/cc-keyboard-panel.c:181
 msgid "Reset All Shortcuts?"
 msgstr "Palautetaanko kaikkien pikanÃ¤ppÃ¤inten oletukset?"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:184
+#: panels/keyboard/cc-keyboard-panel.c:184
 msgid ""
 "Resetting the shortcuts may affect your custom shortcuts. This cannot be "
 "undone."
@@ -1854,22 +1844,22 @@ msgstr ""
 "PikanÃ¤ppÃ¤inten oletusten palauttaminen vaikuttaa asettamiisi pikanÃ¤ppÃ¤imiin. "
 "TÃ¤tÃ¤ toimintoa ei voi perua."
 
-#: ../panels/keyboard/cc-keyboard-panel.c:188
-#: ../panels/keyboard/shortcut-editor.ui.h:9
-#: ../panels/printers/authentication-dialog.ui.h:2
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
+#: panels/keyboard/cc-keyboard-panel.c:188
+#: panels/keyboard/shortcut-editor.ui:346
+#: panels/printers/authentication-dialog.ui:29
+#: panels/printers/ppd-selection-dialog.ui:27
 msgid "Cancel"
 msgstr "Peru"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:189
+#: panels/keyboard/cc-keyboard-panel.c:189
 msgid "Reset All"
 msgstr "Palauta kaikki oletusasetukset"
 
-#: ../panels/keyboard/cc-keyboard-panel.c:281
+#: panels/keyboard/cc-keyboard-panel.c:281
 msgid "Reset the shortcut to its default value"
 msgstr "Palauta pikanÃ¤ppÃ¤in oletusarvoon"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:427
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:427
 #, c-format
 msgid ""
 "%s is already being used for <b>%s</b>. If you replace it, %s will be "
@@ -1878,231 +1868,239 @@ msgstr ""
 "PikanÃ¤ppÃ¤in %s on jo asetettu toimintoon <b>%s</b>. Jos korvaat sen, "
 "poistetaan toiminto %s poistetaan kÃ¤ytÃ¶stÃ¤"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:597
 msgid "Set Custom Shortcut"
 msgstr "Aseta oma pikanÃ¤ppÃ¤in"
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:597
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:597
 msgid "Set Shortcut"
 msgstr "Aseta pikanÃ¤ppÃ¤in"
 
 #. Setup the top label
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:606
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:606
 #, c-format
 msgid "Enter new shortcut to change <b>%s</b>."
 msgstr "Anna uusi pikanÃ¤ppÃ¤in vaihtaaksesi <b>%s</b>."
 
-#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:1033
+#: panels/keyboard/cc-keyboard-shortcut-editor.c:1033
 msgid "Add Custom Shortcut"
 msgstr "LisÃ¤Ã¤ oma pikanÃ¤ppÃ¤in"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "KeyÂboard"
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:3
+msgid "Keyboard"
 msgstr "NÃ¤ppÃ¤imistÃ¶"
 
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:4
 msgid "View and change keyboard shortcuts and set your typing preferences"
 msgstr ""
 "Katsele ja muuta nÃ¤ppÃ¤imistÃ¶n pikanÃ¤ppÃ¤imiÃ¤ ja aseta kirjoitusasetuksesi"
 
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:6
+msgid "input-keyboard"
+msgstr "input-keyboard"
+
 #. Translators: those are keywords for the keyboard control-center panel
-#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5
+#: panels/keyboard/gnome-keyboard-panel.desktop.in.in:18
 msgid ""
 "Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 msgstr ""
 "Shortcut;Workspace;Window;Resize;Zoom;Contrast;Input;Source;Lock;Volume;"
 "pikanÃ¤ppÃ¤in;tyÃ¶tila;ikkuna;syÃ¶te;"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1
-#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251
+#: panels/keyboard/gnome-keyboard-panel.ui:67 panels/region/input-options.ui:68
+#: shell/cc-application.c:255
 msgid "Keyboard Shortcuts"
 msgstr "PikanÃ¤ppÃ¤imet"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2
+#: panels/keyboard/gnome-keyboard-panel.ui:77
 msgid "Reset Allâ€¦"
 msgstr "Palauta kaikki oletusasetuksetâ€¦"
 
-#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3
+#: 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.h:4
+#: 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.h:5 ../shell/panel-list.ui.h:4
+#: panels/keyboard/gnome-keyboard-panel.ui:175 shell/panel-list.ui:206
 msgid "Try a different search"
 msgstr "YritÃ¤ eri hakuehdoilla"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:1
+#: 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.h:3
-#: ../panels/printers/details-dialog.ui.h:1
-#: ../panels/sound/gvc-mixer-dialog.c:1499
-#: ../panels/sound/gvc-sound-theme-chooser.c:564
+#: 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"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:4
+#: panels/keyboard/shortcut-editor.ui:168
 msgid "Command"
 msgstr "Komento"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:5
+#: panels/keyboard/shortcut-editor.ui:180
 msgid "Shortcut"
 msgstr "PikanÃ¤ppÃ¤in"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:6
+#: panels/keyboard/shortcut-editor.ui:259
 msgid "Set Shortcutâ€¦"
 msgstr "Aseta pikanÃ¤ppÃ¤inâ€¦"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:7
-#: ../panels/network/network-wifi.ui.h:20
+#: panels/keyboard/shortcut-editor.ui:272 panels/network/network-wifi.ui:594
 msgid "None"
 msgstr "Ei mikÃ¤Ã¤n"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:8
+#: panels/keyboard/shortcut-editor.ui:303
 msgid "Enter the new shortcut"
 msgstr "Anna uusi pikanÃ¤ppÃ¤in"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:10
+#: panels/keyboard/shortcut-editor.ui:357
 msgid "Remove"
 msgstr "Poista"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:11
+#: panels/keyboard/shortcut-editor.ui:367
 msgid "Add"
 msgstr "LisÃ¤Ã¤"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:12
+#: panels/keyboard/shortcut-editor.ui:382
 msgid "Replace"
 msgstr "Korvaa"
 
-#: ../panels/keyboard/shortcut-editor.ui.h:13
+#: panels/keyboard/shortcut-editor.ui:395
 msgid "Set"
 msgstr "Aseta"
 
-#: ../panels/mouse/cc-mouse-panel.c:82 ../panels/wacom/cc-wacom-panel.c:402
+#: panels/mouse/cc-mouse-panel.c:82 panels/wacom/cc-wacom-panel.c:402
 msgid "Test Your _Settings"
 msgstr "_Testaa asetukset"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Mouse & TouchÂpad"
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:3
+msgid "Mouse & Touchpad"
 msgstr "Hiiri ja kosketuslevy"
 
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:4
 msgid ""
 "Change your mouse or touchpad sensitivity and select right or left-handed"
 msgstr ""
 "Muuta hiiren tai kosketuslevyn herkkyyttÃ¤ ja valitse kumpaa kÃ¤ttÃ¤ kÃ¤ytÃ¤t"
 
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:6
+msgid "input-mouse"
+msgstr "input-mouse"
+
 #. Translators: those are keywords for the mouse and touchpad control-center panel
-#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5
+#: panels/mouse/gnome-mouse-panel.desktop.in.in:18
 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;"
 msgstr ""
 "Kosketuslevy;Trackpad;Osoitin;Kohdistin;Napsauta;Klikkaa;Painike;Nappi;"
 "Kaksois;Pallohiiri;Trackball;vieritÃ¤;Tap;Double;Button;Tuplaklikkaa;Kaksois;"
 "Scroll;"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:1
+#: panels/mouse/gnome-mouse-properties.ui:45
 msgid "General"
 msgstr "Yleiset"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:2
+#: panels/mouse/gnome-mouse-properties.ui:83
 msgid "Primary Button"
 msgstr "Ensisijainen painike"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+#: panels/mouse/gnome-mouse-properties.ui:102
 msgid "Sets the order of physical buttons on mice and touchpads."
 msgstr ""
 "Aseta fyysisten painikkeiden jÃ¤rjestys hiirien ja kosketuslevyjen kohdalla."
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+#: panels/mouse/gnome-mouse-properties.ui:131
 msgid "Left"
 msgstr "Vasen"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: panels/mouse/gnome-mouse-properties.ui:141
 msgid "Right"
 msgstr "Oikea"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:6
+#: panels/mouse/gnome-mouse-properties.ui:177
 msgid "Mouse"
 msgstr "Hiiri"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+#: panels/mouse/gnome-mouse-properties.ui:216
 msgid "Mouse Speed"
 msgstr "Hiiren nopeus"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: panels/mouse/gnome-mouse-properties.ui:238
+#: panels/mouse/gnome-mouse-properties.ui:543
 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.h:10
+#: panels/mouse/gnome-mouse-properties.ui:275
+#: panels/mouse/gnome-mouse-properties.ui:451
 msgid "Natural Scrolling"
 msgstr "Luonnollinen vieritys"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: panels/mouse/gnome-mouse-properties.ui:291
+#: panels/mouse/gnome-mouse-properties.ui:467
 msgid "Scrolling moves the content, not the view."
 msgstr "Vieritys liikuttaa sisÃ¤ltÃ¶Ã¤, ei nÃ¤kymÃ¤Ã¤."
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: panels/mouse/gnome-mouse-properties.ui:341
+#: panels/mouse/gnome-mouse-properties.ui:386
 msgid "Touchpad"
 msgstr "Kosketuslevy"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: panels/mouse/gnome-mouse-properties.ui:522
 msgid "Touchpad Speed"
 msgstr "Kosketuslevyn nopeus"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: panels/mouse/gnome-mouse-properties.ui:581
 msgid "Tap to Click"
 msgstr "Napsauta napauttamalla"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: panels/mouse/gnome-mouse-properties.ui:634
 msgid "Two-finger Scrolling"
 msgstr "Kahden sormen vieritys"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: panels/mouse/gnome-mouse-properties.ui:687
 msgid "Edge Scrolling"
 msgstr "Reunavieritys"
 
-#: ../panels/mouse/gnome-mouse-test.c:130
-#: ../panels/mouse/gnome-mouse-test.ui.h:1
+#: panels/mouse/gnome-mouse-test.c:130 panels/mouse/gnome-mouse-test.ui:23
 msgid "Try clicking, double clicking, scrolling"
 msgstr "Kokeile napsauttamista, kaksoisnapsauttamista ja vierittÃ¤mistÃ¤"
 
-#: ../panels/mouse/gnome-mouse-test.c:135
+#: panels/mouse/gnome-mouse-test.c:135
 msgid "Five clicks, GEGL time!"
 msgstr "Viisi napsautusta, GEGL-aika!"
 
-#: ../panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/gnome-mouse-test.c:140
 msgid "Double click, primary button"
 msgstr "Kaksoisnapsautus, ensisijainen painike"
 
-#: ../panels/mouse/gnome-mouse-test.c:140
+#: panels/mouse/gnome-mouse-test.c:140
 msgid "Single click, primary button"
 msgstr "Yksi napsautus, ensisijainen painike"
 
-#: ../panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/gnome-mouse-test.c:143
 msgid "Double click, middle button"
 msgstr "Kaksoisnapsautus, keskimmÃ¤inen painike"
 
-#: ../panels/mouse/gnome-mouse-test.c:143
+#: panels/mouse/gnome-mouse-test.c:143
 msgid "Single click, middle button"
 msgstr "Yksi napsautus, keskimmÃ¤inen painike"
 
-#: ../panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/gnome-mouse-test.c:146
 msgid "Double click, secondary button"
 msgstr "Kaksoisnapsautus, toissijainen painike"
 
-#: ../panels/mouse/gnome-mouse-test.c:146
+#: panels/mouse/gnome-mouse-test.c:146
 msgid "Single click, secondary button"
 msgstr "Yksi napsautus, toissijainen painike"
 
 #. add proxy to device list
-#: ../panels/network/cc-network-panel.c:579
+#: panels/network/cc-network-panel.c:579
 msgid "Network proxy"
 msgstr "Verkon vÃ¤lityspalvelin"
 
@@ -2110,114 +2108,110 @@ 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:715 ../panels/network/net-vpn.c:192
-#: ../panels/network/net-vpn.c:321
+#: panels/network/cc-network-panel.c:715 panels/network/net-vpn.c:192
+#: panels/network/net-vpn.c:321
 #, c-format
 msgid "%s VPN"
 msgstr "%s - VPN"
 
-#: ../panels/network/cc-network-panel.c:779 ../panels/network/wifi.ui.h:7
+#: panels/network/cc-network-panel.c:779 panels/network/wifi.ui:307
 msgid "Oops, something has gone wrong. Please contact your software vendor."
 msgstr "Hups, jokin taisi mennÃ¤ pieleen. Ota yhteys sovellustoimittajaan."
 
-#: ../panels/network/cc-network-panel.c:785
+#: panels/network/cc-network-panel.c:785
 msgid "NetworkManager needs to be running."
 msgstr "NetworkManagerin tulee olla kÃ¤ynnissÃ¤."
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/network/cc-wifi-panel.c:212
-#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:2
-#: ../panels/network/network-wifi.ui.h:58
+#: panels/network/cc-wifi-panel.c:212
+#: panels/network/gnome-wifi-panel.desktop.in.in:3
+#: panels/network/network-wifi.ui:1766
 msgid "Wi-Fi"
 msgstr "Wifi"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:1
+#: panels/network/connection-editor/8021x-security-page.ui:26
 msgid "802.1x _Security"
 msgstr "802.1x-suojaus"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
-#: ../panels/network/connection-editor/security-page.ui.h:2
-#: ../panels/wacom/wacom-stylus-page.ui.h:8
+#: panels/network/connection-editor/8021x-security-page.ui:73
+#: panels/network/connection-editor/security-page.ui:72
+#: panels/wacom/wacom-stylus-page.ui:108
 msgid "page 1"
 msgstr "sivu 1"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:3
-#: ../panels/network/connection-editor/security-page.ui.h:3
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
+#: panels/network/connection-editor/8021x-security-page.ui:224
+#: panels/network/connection-editor/security-page.ui:223
+#: panels/network/wireless-security/eap-method-fast.ui:50
+#: panels/network/wireless-security/eap-method-peap.ui:48
+#: panels/network/wireless-security/eap-method-ttls.ui:31
 msgid "Anony_mous identity"
 msgstr "Anony_ymi identiteetti"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:4
-#: ../panels/network/connection-editor/security-page.ui.h:4
+#: panels/network/connection-editor/8021x-security-page.ui:238
+#: panels/network/connection-editor/security-page.ui:237
 msgid "Inner _authentication"
 msgstr "_Sisempi tunnistautuminen"
 
-#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
-#: ../panels/network/connection-editor/security-page.ui.h:5
-#: ../panels/wacom/wacom-stylus-page.ui.h:16
+#: panels/network/connection-editor/8021x-security-page.ui:281
+#: panels/network/connection-editor/security-page.ui:280
+#: panels/wacom/wacom-stylus-page.ui:426
 msgid "page 2"
 msgstr "sivu 2"
 
-#: ../panels/network/connection-editor/ce-page-8021x-security.c:101
-#: ../panels/network/connection-editor/ce-page-security.c:445
-#: ../panels/network/connection-editor/details-page.ui.h:3
-#: ../panels/network/network-wifi.ui.h:6
+#: panels/network/connection-editor/ce-page-8021x-security.c:101
+#: panels/network/connection-editor/ce-page-security.c:445
+#: panels/network/connection-editor/details-page.ui:86
+#: panels/network/network-wifi.ui:239
 msgid "Security"
 msgstr "Tietoturva"
 
-#: ../panels/network/connection-editor/ce-page.c:481
+#: panels/network/connection-editor/ce-page.c:481
 msgid "automatic"
 msgstr "automaattinen"
 
-#: ../panels/network/connection-editor/ce-page.c:521
+#: panels/network/connection-editor/ce-page.c:521
 #, c-format
 msgid "Profile %d"
 msgstr "Profiili %d"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:56
-#: ../panels/network/net-device-wifi.c:231
-#: ../panels/network/net-device-wifi.c:407
+#: panels/network/connection-editor/ce-page-details.c:56
+#: panels/network/net-device-wifi.c:247 panels/network/net-device-wifi.c:469
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:60
-#: ../panels/network/net-device-wifi.c:235
-#: ../panels/network/net-device-wifi.c:412
-#: ../panels/network/network-wifi.ui.h:19
+#: panels/network/connection-editor/ce-page-details.c:60
+#: panels/network/net-device-wifi.c:251 panels/network/net-device-wifi.c:474
+#: panels/network/network-wifi.ui:593
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:64
-#: ../panels/network/net-device-wifi.c:239
+#: panels/network/connection-editor/ce-page-details.c:64
+#: panels/network/net-device-wifi.c:255
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/connection-editor/ce-page-details.c:69
-#: ../panels/network/net-device-wifi.c:244
+#: panels/network/connection-editor/ce-page-details.c:69
+#: panels/network/net-device-wifi.c:260
 msgid "Enterprise"
 msgstr "Yritys"
 
-#: ../panels/network/connection-editor/ce-page-details.c:74
-#: ../panels/network/net-device-wifi.c:249
-#: ../panels/network/net-device-wifi.c:397
+#: panels/network/connection-editor/ce-page-details.c:74
+#: panels/network/net-device-wifi.c:265 panels/network/net-device-wifi.c:459
 msgctxt "Wifi security"
 msgid "None"
 msgstr "Ei mitÃ¤Ã¤n"
 
-#: ../panels/network/connection-editor/ce-page-details.c:95
-#: ../panels/power/power.ui.h:17
+#: 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:120
-#: ../panels/network/net-device-wifi.c:506
+#: panels/network/connection-editor/ce-page-details.c:110
+#: panels/network/net-device-ethernet.c:121
+#: panels/network/net-device-wifi.c:568
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
@@ -2225,356 +2219,373 @@ msgstr[0] "%i pÃ¤ivÃ¤ sitten"
 msgstr[1] "%i pÃ¤ivÃ¤Ã¤ sitten"
 
 #. Translators: network device speed
-#: ../panels/network/connection-editor/ce-page-details.c:176
-#: ../panels/network/net-device-ethernet.c:50
-#: ../panels/network/net-device-wifi.c:562
+#: panels/network/connection-editor/ce-page-details.c:222
+#: panels/network/net-device-ethernet.c:50 panels/network/net-device-wifi.c:624
 #, c-format
 msgid "%d Mb/s"
 msgstr "%d Mb/s"
 
-#: ../panels/network/connection-editor/ce-page-details.c:202
-#: ../panels/network/net-device-wifi.c:591
+#: panels/network/connection-editor/ce-page-details.c:248
+#: panels/network/net-device-wifi.c:653
 msgctxt "Signal strength"
 msgid "None"
 msgstr "Ei mitÃ¤Ã¤n"
 
-#: ../panels/network/connection-editor/ce-page-details.c:204
-#: ../panels/network/net-device-wifi.c:593
+#: panels/network/connection-editor/ce-page-details.c:250
+#: panels/network/net-device-wifi.c:655
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Heikko"
 
-#: ../panels/network/connection-editor/ce-page-details.c:206
-#: ../panels/network/net-device-wifi.c:595
+#: panels/network/connection-editor/ce-page-details.c:252
+#: panels/network/net-device-wifi.c:657
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "OK"
 
-#: ../panels/network/connection-editor/ce-page-details.c:208
-#: ../panels/network/net-device-wifi.c:597
+#: panels/network/connection-editor/ce-page-details.c:254
+#: panels/network/net-device-wifi.c:659
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "HyvÃ¤"
 
-#: ../panels/network/connection-editor/ce-page-details.c:210
-#: ../panels/network/net-device-wifi.c:599
+#: panels/network/connection-editor/ce-page-details.c:256
+#: panels/network/net-device-wifi.c:661
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Erinomainen"
 
-#: ../panels/network/connection-editor/ce-page-details.c:248
+#: panels/network/connection-editor/ce-page-details.c:297
 msgid "Forget Connection"
 msgstr "Unohda yhteys"
 
-#: ../panels/network/connection-editor/ce-page-details.c:250
+#: panels/network/connection-editor/ce-page-details.c:299
 msgid "Remove Connection Profile"
 msgstr "Poista yhteysprofiili"
 
-#: ../panels/network/connection-editor/ce-page-details.c:252
+#: panels/network/connection-editor/ce-page-details.c:301
 msgid "Remove VPN"
 msgstr "Poista VPN"
 
-#: ../panels/network/connection-editor/ce-page-details.c:280
-#: ../panels/network/network-wifi.ui.h:46 ../shell/cc-window.c:243
-#: ../shell/panel-list.ui.h:2
+#: panels/network/connection-editor/ce-page-details.c:329
+#: panels/network/network-wifi.ui:1456 shell/cc-window.c:212
+#: shell/panel-list.ui:103
 msgid "Details"
 msgstr "Tiedot"
 
-#: ../panels/network/connection-editor/ce-page-ethernet.c:173
-#: ../panels/network/connection-editor/ce-page-vpn.c:188
-#: ../panels/network/connection-editor/ce-page-wifi.c:194
-#: ../panels/network/network-wifi.ui.h:47
+#: panels/network/connection-editor/ce-page-ethernet.c:173
+#: panels/network/connection-editor/ce-page-vpn.c:188
+#: panels/network/connection-editor/ce-page-wifi.c:194
+#: panels/network/network-wifi.ui:1460
 msgid "Identity"
 msgstr "Identiteetti"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:251
-#: ../panels/network/connection-editor/ce-page-ip6.c:230
+#: panels/network/connection-editor/ce-page-ip4.c:251
+#: panels/network/connection-editor/ce-page-ip6.c:230
 msgid "Delete Address"
 msgstr "Poista osoite"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:422
-#: ../panels/network/connection-editor/ce-page-ip6.c:390
+#: panels/network/connection-editor/ce-page-ip4.c:422
+#: panels/network/connection-editor/ce-page-ip6.c:390
 msgid "Delete Route"
 msgstr "Poista reitti"
 
-#: ../panels/network/connection-editor/ce-page-ip4.c:896
-#: ../panels/network/network-wifi.ui.h:48
+#: panels/network/connection-editor/ce-page-ip4.c:896
+#: panels/network/network-wifi.ui:1464
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../panels/network/connection-editor/ce-page-ip6.c:827
-#: ../panels/network/network-wifi.ui.h:49
+#: panels/network/connection-editor/ce-page-ip6.c:827
+#: panels/network/network-wifi.ui:1468
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../panels/network/connection-editor/ce-page-security.c:245
+#: panels/network/connection-editor/ce-page-security.c:245
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ei mitÃ¤Ã¤n"
 
-#: ../panels/network/connection-editor/ce-page-security.c:268
+#: panels/network/connection-editor/ce-page-security.c:268
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bittinen avain (Hex tai ASCII)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:278
+#: panels/network/connection-editor/ce-page-security.c:278
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bittinen salalause"
 
-#: ../panels/network/connection-editor/ce-page-security.c:291
-#: ../panels/network/wireless-security/wireless-security.c:465
+#: panels/network/connection-editor/ce-page-security.c:291
+#: panels/network/wireless-security/wireless-security.c:465
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../panels/network/connection-editor/ce-page-security.c:304
+#: panels/network/connection-editor/ce-page-security.c:304
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dynaaminen WEP (802.1x)"
 
-#: ../panels/network/connection-editor/ce-page-security.c:318
+#: panels/network/connection-editor/ce-page-security.c:318
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../panels/network/connection-editor/ce-page-security.c:332
+#: panels/network/connection-editor/ce-page-security.c:332
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../panels/network/connection-editor/details-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:4
+#: panels/network/connection-editor/details-page.ui:18
+#: panels/network/network-wifi.ui:174
 msgid "Signal Strength"
 msgstr "Signaalin vahvuus"
 
-#: ../panels/network/connection-editor/details-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:5
+#: panels/network/connection-editor/details-page.ui:52
+#: panels/network/network-wifi.ui:207
 msgid "Link speed"
 msgstr "Yhteysnopeus"
 
-#: ../panels/network/connection-editor/details-page.ui.h:4
-#: ../panels/network/net-device-ethernet.c:153
-#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644
+#: panels/network/connection-editor/details-page.ui:104
+#: panels/network/net-device-ethernet.c:154 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.h:5
-#: ../panels/network/net-device-ethernet.c:154
-#: ../panels/network/net-device-ethernet.c:158
-#: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645
+#: panels/network/connection-editor/details-page.ui:122
+#: panels/network/net-device-ethernet.c:155
+#: panels/network/net-device-ethernet.c:159
+#: 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.h:6
-#: ../panels/network/net-device-ethernet.c:161
-#: ../panels/network/network-wifi.ui.h:9
+#: panels/network/connection-editor/details-page.ui:140
+#: panels/network/net-device-ethernet.c:162 panels/network/network-wifi.ui:290
 msgid "Hardware Address"
 msgstr "Laiteosoite"
 
-#: ../panels/network/connection-editor/details-page.ui.h:7
-#: ../panels/network/net-device-ethernet.c:165
-#: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-wifi.ui.h:10
+#: panels/network/connection-editor/details-page.ui:158
+#: panels/network/net-device-ethernet.c:166
+#: panels/network/network-mobile.ui:206 panels/network/network-wifi.ui:307
 msgid "Default Route"
 msgstr "Oletusreitti"
 
-#: ../panels/network/connection-editor/details-page.ui.h:8
-#: ../panels/network/connection-editor/ip4-page.ui.h:10
-#: ../panels/network/connection-editor/ip6-page.ui.h:11
-#: ../panels/network/net-device-ethernet.c:167
-#: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-wifi.ui.h:11
+#: 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/network-mobile.ui:224 panels/network/network-wifi.ui:325
+#: panels/network/network-wifi.ui:832 panels/network/network-wifi.ui:1109
 msgid "DNS"
 msgstr "DNS"
 
-#: ../panels/network/connection-editor/details-page.ui.h:9
+#: panels/network/connection-editor/details-page.ui:195
 msgid "Last Used"
 msgstr "Viimeksi kÃ¤ytetty"
 
-#: ../panels/network/connection-editor/details-page.ui.h:10
+#: panels/network/connection-editor/details-page.ui:324
 msgid "Connect _automatically"
 msgstr "_YhdistÃ¤ automaattisesti"
 
-#: ../panels/network/connection-editor/details-page.ui.h:11
+#: panels/network/connection-editor/details-page.ui:343
 msgid "Make available to _other users"
 msgstr "Aseta _kaikkien kÃ¤yttÃ¤jien kÃ¤ytettÃ¤vÃ¤ksi"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:1
-#: ../panels/network/connection-editor/ip4-page.ui.h:11
-#: ../panels/network/connection-editor/ip6-page.ui.h:2
-#: ../panels/network/net-proxy.c:58 ../panels/network/network-proxy.ui.h:2
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
-#: ../panels/privacy/cc-privacy-panel.c:217
+#: panels/network/connection-editor/details-page.ui:376
+msgid "Restrict background data usage"
+msgstr "Rajoita datan kÃ¤yttÃ¶Ã¤ taustalla"
+
+#: panels/network/connection-editor/details-page.ui:386
+msgid "Appropriate for connections that have data charges or limits."
+msgstr ""
+"Sopiva yhteyksille, mihin sovelletaan datan mÃ¤Ã¤rÃ¤Ã¤n pohjautuvaa hinnoittelua "
+"tai siirtorajoituksia."
+
+#: panels/network/connection-editor/ethernet-page.ui:16
+#: panels/network/connection-editor/ethernet-page.ui:39
+#: panels/network/connection-editor/ip4-page.ui:209
+#: panels/network/connection-editor/ip4-page.ui:277
+#: panels/network/connection-editor/ip6-page.ui:42
+#: panels/network/connection-editor/ip6-page.ui:223
+#: panels/network/connection-editor/ip6-page.ui:291
+#: panels/network/net-proxy.c:58 panels/network/network-proxy.ui:103
+#: panels/network/wireless-security/eap-method-peap.ui:22
+#: panels/privacy/cc-privacy-panel.c:217
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:2
+#: panels/network/connection-editor/ethernet-page.ui:19
 msgid "Twisted Pair (TP)"
 msgstr "Parikaapeli (TP)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:3
+#: panels/network/connection-editor/ethernet-page.ui:22
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:4
+#: panels/network/connection-editor/ethernet-page.ui:25
 msgid "BNC"
 msgstr "BNC"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:5
+#: panels/network/connection-editor/ethernet-page.ui:28
 msgid "Media Independent Interface (MII)"
 msgstr "Media Independent Interface (MII)"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:6
+#: panels/network/connection-editor/ethernet-page.ui:42
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:7
+#: panels/network/connection-editor/ethernet-page.ui:45
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:8
+#: panels/network/connection-editor/ethernet-page.ui:48
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:9
+#: panels/network/connection-editor/ethernet-page.ui:51
 msgid "10 Gb/s"
 msgstr "10 Gb/s"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:10
-#: ../panels/network/connection-editor/vpn-page.ui.h:1
+#: panels/network/connection-editor/ethernet-page.ui:71
+#: panels/network/connection-editor/vpn-page.ui:23
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:11
-#: ../panels/network/connection-editor/wifi-page.ui.h:4
-#: ../panels/network/network-wifi.ui.h:38
+#: panels/network/connection-editor/ethernet-page.ui:100
+#: panels/network/connection-editor/wifi-page.ui:68
+#: panels/network/network-wifi.ui:1261
 msgid "_MAC Address"
 msgstr "_MAC-osoite"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:12
+#: panels/network/connection-editor/ethernet-page.ui:146
 msgid "M_TU"
 msgstr "M_TU"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:13
-#: ../panels/network/connection-editor/wifi-page.ui.h:5
+#: panels/network/connection-editor/ethernet-page.ui:163
+#: panels/network/connection-editor/wifi-page.ui:98
 msgid "_Cloned Address"
 msgstr "_Kloonattu osoite"
 
-#: ../panels/network/connection-editor/ethernet-page.ui.h:14
+#: panels/network/connection-editor/ethernet-page.ui:178
 msgid "bytes"
 msgstr "tavua"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:1
+#: panels/network/connection-editor/ip4-page.ui:27
 msgid "IPv_4 Method"
 msgstr "IPv_4-tapa"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:27
+#: panels/network/connection-editor/ip4-page.ui:42
+#: panels/network/network-wifi.ui:778 panels/network/network-wifi.ui:1055
 msgid "Automatic (DHCP)"
 msgstr "Automaattinen (DHCP)"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:3
-#: ../panels/network/connection-editor/ip6-page.ui.h:4
+#: panels/network/connection-editor/ip4-page.ui:55
+#: panels/network/connection-editor/ip6-page.ui:69
 msgid "Link-Local Only"
 msgstr "Vain linkkiyhteys"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:5
-#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: panels/network/connection-editor/ip4-page.ui:83
+#: panels/network/connection-editor/ip6-page.ui:97
 msgid "Disable"
 msgstr "Poista kÃ¤ytÃ¶stÃ¤"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:6
-#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#: panels/network/connection-editor/ip4-page.ui:111
+#: panels/network/connection-editor/ip6-page.ui:125
 msgid "Addresses"
 msgstr "Osoitteet"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:7
-#: ../panels/network/connection-editor/ip6-page.ui.h:8
-#: ../panels/printers/details-dialog.ui.h:3
+#: panels/network/connection-editor/ip4-page.ui:129
+#: panels/network/connection-editor/ip4-page.ui:313
+#: panels/network/connection-editor/ip6-page.ui:143
+#: panels/network/connection-editor/ip6-page.ui:327
+#: panels/printers/details-dialog.ui:87
 msgid "Address"
 msgstr "Osoite"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:8
+#: panels/network/connection-editor/ip4-page.ui:143
+#: panels/network/connection-editor/ip4-page.ui:327
 msgid "Netmask"
 msgstr "Aliverkon peite"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:9
-#: ../panels/network/connection-editor/ip6-page.ui.h:10
+#: panels/network/connection-editor/ip4-page.ui:157
+#: panels/network/connection-editor/ip4-page.ui:341
+#: panels/network/connection-editor/ip6-page.ui:171
+#: panels/network/connection-editor/ip6-page.ui:355
 msgid "Gateway"
 msgstr "YhdyskÃ¤ytÃ¤vÃ¤"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:12
-#: ../panels/network/connection-editor/ip6-page.ui.h:12
+#: panels/network/connection-editor/ip4-page.ui:220
+#: panels/network/connection-editor/ip6-page.ui:234
 msgid "Automatic DNS"
 msgstr "Automaattinen DNS"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:13
-#: ../panels/network/connection-editor/ip6-page.ui.h:13
+#: panels/network/connection-editor/ip4-page.ui:244
+#: panels/network/connection-editor/ip6-page.ui:258
 msgid "Separate IP addresses with commas"
 msgstr "Erota IP-osoitteet pilkuin"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:14
-#: ../panels/network/connection-editor/ip6-page.ui.h:14
-#: ../panels/network/network-wifi.ui.h:32
+#: 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
 msgid "Routes"
 msgstr "Reitit"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:15
-#: ../panels/network/connection-editor/ip6-page.ui.h:15
+#: panels/network/connection-editor/ip4-page.ui:288
+#: panels/network/connection-editor/ip6-page.ui:302
 msgid "Automatic Routes"
 msgstr "Automaattiset reitit"
 
 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../panels/network/connection-editor/ip4-page.ui.h:17
-#: ../panels/network/connection-editor/ip6-page.ui.h:17
+#: panels/network/connection-editor/ip4-page.ui:354
+#: panels/network/connection-editor/ip6-page.ui:368
 msgid "Metric"
 msgstr "Metriikka"
 
-#: ../panels/network/connection-editor/ip4-page.ui.h:18
-#: ../panels/network/connection-editor/ip6-page.ui.h:18
-#: ../panels/network/network-wifi.ui.h:34
+#: 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
 msgid "Use this connection _only for resources on its network"
 msgstr "KÃ¤ytÃ¤ tÃ¤tÃ¤ yhteyttÃ¤ _vain tÃ¤ssÃ¤ verkossa oleviin resursseihin"
 
-#: ../panels/network/connection-editor/ip6-page.ui.h:1
+#: panels/network/connection-editor/ip6-page.ui:27
 msgid "IPv_6 Method"
 msgstr "IPv_6-tapa"
 
-#: ../panels/network/connection-editor/ip6-page.ui.h:3
+#: panels/network/connection-editor/ip6-page.ui:55
 msgid "Automatic, DHCP only"
 msgstr "Automaattinen, vain DHCP"
 
-#: ../panels/network/connection-editor/ip6-page.ui.h:9
+#: panels/network/connection-editor/ip6-page.ui:157
+#: panels/network/connection-editor/ip6-page.ui:341
 msgid "Prefix"
 msgstr "Etuliite"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:273
+#: panels/network/connection-editor/net-connection-editor.c:273
 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:291
 msgid "New Profile"
 msgstr "Uusi profiili"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:603
-#: ../panels/network/network.ui.h:2
+#: panels/network/connection-editor/net-connection-editor.c:603
+#: panels/network/network.ui:142
 msgid "VPN"
 msgstr "VPN"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:751
+#: panels/network/connection-editor/net-connection-editor.c:751
 msgid "Import from fileâ€¦"
 msgstr "Tuo tiedostostaâ€¦"
 
-#: ../panels/network/connection-editor/net-connection-editor.c:785
+#: panels/network/connection-editor/net-connection-editor.c:785
 msgid "Add VPN"
 msgstr "LisÃ¤Ã¤ VPN"
 
-#: ../panels/network/connection-editor/security-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:16
+#: panels/network/connection-editor/security-page.ui:26
+#: panels/network/network-wifi.ui:529
 msgid "S_ecurity"
 msgstr "_Tietoturva"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:141
+#: panels/network/connection-editor/vpn-helpers.c:141
 msgid "Cannot import VPN connection"
 msgstr "VPN-yhteyden tuonti epÃ¤onnistui"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:143
+#: panels/network/connection-editor/vpn-helpers.c:143
 #, c-format
 msgid ""
 "The file â€œ%sâ€ could not be read or does not contain recognized VPN "
@@ -2587,37 +2598,37 @@ msgstr ""
 "\n"
 "Virhe: %s."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:178
+#: panels/network/connection-editor/vpn-helpers.c:178
 msgid "Select file to import"
 msgstr "Valitse tuotava tiedosto"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:182
-#: ../panels/printers/pp-details-dialog.c:320
-#: ../panels/sharing/cc-sharing-panel.c:383
-#: ../panels/user-accounts/um-photo-dialog.c:222
+#: panels/network/connection-editor/vpn-helpers.c:182
+#: panels/printers/pp-details-dialog.c:320
+#: panels/sharing/cc-sharing-panel.c:385
+#: panels/user-accounts/um-photo-dialog.c:222
 msgid "_Open"
 msgstr "_Avaa"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:230
+#: panels/network/connection-editor/vpn-helpers.c:230
 #, c-format
 msgid "A file named â€œ%sâ€ already exists."
 msgstr "Tiedosto nimeltÃ¤ â€%sâ€ on jo olemassa."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:232
+#: panels/network/connection-editor/vpn-helpers.c:232
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:234
+#: panels/network/connection-editor/vpn-helpers.c:234
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 "Haluatko korvata tiedoston %s VPN-asetuksilla, joita olet tallentamassa?"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:270
+#: panels/network/connection-editor/vpn-helpers.c:270
 msgid "Cannot export VPN connection"
 msgstr "VPN-yhteyden vienti epÃ¤onnistui"
 
-#: ../panels/network/connection-editor/vpn-helpers.c:272
+#: panels/network/connection-editor/vpn-helpers.c:272
 #, c-format
 msgid ""
 "The VPN connection â€œ%sâ€ could not be exported to %s.\n"
@@ -2628,40 +2639,44 @@ msgstr ""
 "\n"
 "Virhe: %s."
 
-#: ../panels/network/connection-editor/vpn-helpers.c:307
+#: panels/network/connection-editor/vpn-helpers.c:307
 msgid "Export VPN connection"
 msgstr "Vie VPN-yhteys"
 
-#: ../panels/network/connection-editor/vpn-page.ui.h:2
+#: panels/network/connection-editor/vpn-page.ui:58
 msgid "(Error: unable to load VPN connection editor)"
 msgstr "(Virhe: VPN-yhteyseditoria ei voitu ladata)"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:1
-#: ../panels/network/network-wifi.ui.h:14
+#: panels/network/connection-editor/wifi-page.ui:20
+#: panels/network/network-wifi.ui:497
 msgid "_SSID"
 msgstr "_SSID"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:2
-#: ../panels/network/network-wifi.ui.h:15
+#: panels/network/connection-editor/wifi-page.ui:36
+#: panels/network/network-wifi.ui:513
 msgid "_BSSID"
 msgstr "_BSSID"
 
-#: ../panels/network/connection-editor/wifi-page.ui.h:3
-#: ../panels/network/network-wifi.ui.h:18
+#: panels/network/connection-editor/wifi-page.ui:53
+#: panels/network/network-wifi.ui:562
 msgid "My Home Network"
 msgstr "Kotiverkko"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "NetÂwork"
+#: 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.h:3
+#: panels/network/gnome-network-panel.desktop.in.in:4
 msgid "Control how you connect to the Internet"
 msgstr "Hallitse internetyhteyden asetuksia"
 
+#: panels/network/gnome-network-panel.desktop.in.in:6
+msgid "network-workgroup"
+msgstr "network-workgroup"
+
 #. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:5
+#: panels/network/gnome-network-panel.desktop.in.in:18
 msgid ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;"
 "DNS;"
@@ -2670,40 +2685,43 @@ msgstr ""
 "vlan;bridge;bond;DNS;verkko;langaton;lÃ¤hiverkko;vÃ¤lityspalvelin;laajakaista;"
 "modeemi;nimipalvelut;"
 
-#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:3
+#: panels/network/gnome-wifi-panel.desktop.in.in:4
 msgid "Control how you connect to Wi-Fi networks"
 msgstr "MÃ¤Ã¤ritÃ¤ miten wifi-verkkoihin otetaan yhteys"
 
+#: panels/network/gnome-wifi-panel.desktop.in.in:6
+msgid "network-wireless"
+msgstr "network-wireless"
+
 #. Translators: those are keywords for the wi-fi control-center panel
-#: ../panels/network/gnome-wifi-panel.desktop.in.in.h:5
+#: panels/network/gnome-wifi-panel.desktop.in.in:18
 msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;"
 msgstr ""
 "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Broadband;DNS;verkko;langaton;laajakaista;"
 "nimipalvelu;"
 
-#: ../panels/network/net-device-ethernet.c:106
-#: ../panels/network/net-device-wifi.c:492
+#: panels/network/net-device-ethernet.c:107
+#: panels/network/net-device-wifi.c:554
 msgid "never"
 msgstr "ei koskaan"
 
-#: ../panels/network/net-device-ethernet.c:116
-#: ../panels/network/net-device-wifi.c:502
+#: panels/network/net-device-ethernet.c:117
+#: panels/network/net-device-wifi.c:564
 msgid "today"
 msgstr "tÃ¤nÃ¤Ã¤n"
 
-#: ../panels/network/net-device-ethernet.c:118
-#: ../panels/network/net-device-wifi.c:504
+#: panels/network/net-device-ethernet.c:119
+#: panels/network/net-device-wifi.c:566
 msgid "yesterday"
 msgstr "eilen"
 
-#: ../panels/network/net-device-ethernet.c:156
-#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647
-#: ../panels/network/panel-common.c:649
+#: panels/network/net-device-ethernet.c:157
+#: 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:172
-#: ../panels/network/network-wifi.ui.h:12
+#: panels/network/net-device-ethernet.c:173 panels/network/network-wifi.ui:342
 msgid "Last used"
 msgstr "Viimeksi kÃ¤ytetty"
 
@@ -2712,32 +2730,30 @@ msgstr "Viimeksi kÃ¤ytetty"
 #. * profile. It is also used to display ethernet in the
 #. * device list.
 #.
-#: ../panels/network/net-device-ethernet.c:275
-#: ../panels/network/network-ethernet.ui.h:1
-#: ../panels/network/network-simple.ui.h:1
+#: panels/network/net-device-ethernet.c:276
+#: panels/network/network-ethernet.ui:19 panels/network/network-simple.ui:39
 msgid "Wired"
 msgstr "KiinteÃ¤"
 
-#: ../panels/network/net-device-ethernet.c:343
-#: ../panels/network/net-device-wifi.c:1800
-#: ../panels/network/network-ethernet.ui.h:2
-#: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-simple.ui.h:3 ../panels/network/network-vpn.ui.h:2
+#: panels/network/net-device-ethernet.c:344
+#: panels/network/net-device-wifi.c:1865 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:238
 msgid "Add new connection"
 msgstr "LisÃ¤Ã¤ uusi yhteys"
 
-#: ../panels/network/net-device-wifi.c:1282
+#: panels/network/net-device-wifi.c:1344
 #, 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:1286
+#: panels/network/net-device-wifi.c:1348
 msgid ""
 "It is not possible to access the Internet through your wireless while the "
 "hotspot is active."
@@ -2745,11 +2761,11 @@ msgstr ""
 "Yhteyspisteen ollessa kÃ¤ytÃ¶ssÃ¤ langattoman internetyhteyden kÃ¤yttÃ¶ ei ole "
 "mahdollista."
 
-#: ../panels/network/net-device-wifi.c:1293
+#: panels/network/net-device-wifi.c:1355
 msgid "Turn On Wi-Fi Hotspot?"
 msgstr "Otetaanko wifi-yhteyspiste kÃ¤yttÃ¶Ã¶n?"
 
-#: ../panels/network/net-device-wifi.c:1315
+#: panels/network/net-device-wifi.c:1377
 msgid ""
 "Wi-Fi hotspots are usually used to share an additional Internet connection "
 "over Wi-Fi."
@@ -2757,51 +2773,49 @@ msgstr ""
 "Wifi-yhteyspisteitÃ¤ kÃ¤ytetÃ¤Ã¤n yleensÃ¤ Internet-yhteyden jakamiseen "
 "langattomasti."
 
-#: ../panels/network/net-device-wifi.c:1326
+#: panels/network/net-device-wifi.c:1388
 msgid "_Turn On"
 msgstr "_Ota kÃ¤yttÃ¶Ã¶n"
 
-#: ../panels/network/net-device-wifi.c:1403
+#: panels/network/net-device-wifi.c:1465
 msgid "Stop hotspot and disconnect any users?"
 msgstr "Suljetaanko yhteyspiste ja katkaistaanko kaikkien kÃ¤yttÃ¤jien yhteydet?"
 
-#: ../panels/network/net-device-wifi.c:1406
+#: panels/network/net-device-wifi.c:1468
 msgid "_Stop Hotspot"
 msgstr "_Sulje yhteyspiste"
 
-#: ../panels/network/net-device-wifi.c:1503
+#: panels/network/net-device-wifi.c:1568
 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:1506
+#: panels/network/net-device-wifi.c:1571
 msgid "Wireless device does not support Hotspot mode"
 msgstr "Langaton verkkolaite ei tue yhteyspisteeksi asettamista"
 
-#: ../panels/network/net-device-wifi.c:1638
+#: panels/network/net-device-wifi.c:1703
 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:1642
-#: ../panels/network/network-wifi.ui.h:42
+#: panels/network/net-device-wifi.c:1707 panels/network/network-wifi.ui:1362
 msgid "_Forget"
 msgstr "_Unohda"
 
-#: ../panels/network/net-device-wifi.c:1951
-#: ../panels/network/net-device-wifi.c:1958
+#: panels/network/net-device-wifi.c:2016 panels/network/net-device-wifi.c:2023
 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:1991
+#: panels/network/net-device-wifi.c:2056
 msgctxt "Wi-Fi Network"
 msgid "_Forget"
 msgstr "_Unohda"
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/net-proxy.c:102
+#: panels/network/net-proxy.c:102
 msgid ""
 "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr "WPAD-automaattietsintÃ¤Ã¤ kÃ¤ytetÃ¤Ã¤n, kun hallinta-URL ei ole mÃ¤Ã¤ritelty."
@@ -2810,164 +2824,155 @@ msgstr "WPAD-automaattietsintÃ¤Ã¤ kÃ¤ytetÃ¤Ã¤n, kun hallinta-URL ei ole mÃ¤Ã¤rit
 #. * network, then anyone else on that network can tell your
 #. * machine that it should proxy all of your web traffic
 #. * through them.
-#: ../panels/network/net-proxy.c:110
+#: panels/network/net-proxy.c:110
 msgid "This is not recommended for untrusted public networks."
 msgstr "TÃ¤mÃ¤ ei ole suositeltavaa julkisissa verkoissa."
 
-#: ../panels/network/network-mobile.ui.h:1
+#: panels/network/network-mobile.ui:30
 msgid "IMEI"
 msgstr "IMEI"
 
-#: ../panels/network/network-mobile.ui.h:2
+#: panels/network/network-mobile.ui:48
 msgid "Provider"
 msgstr "Tarjoaja"
 
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
-msgstr "Verkko"
-
-#: ../panels/network/network-proxy.ui.h:1
+#: panels/network/network-proxy.ui:47 panels/network/network-proxy.ui:92
 msgid "Network Proxy"
 msgstr "Verkon vÃ¤lityspalvelin"
 
-#: ../panels/network/network-proxy.ui.h:5
+#: panels/network/network-proxy.ui:173
 msgid "_HTTP Proxy"
 msgstr "_HTTP-vÃ¤lityspalvelin"
 
-#: ../panels/network/network-proxy.ui.h:6
+#: panels/network/network-proxy.ui:192
 msgid "H_TTPS Proxy"
 msgstr "H_TTPS-vÃ¤lityspalvelin"
 
-#: ../panels/network/network-proxy.ui.h:7
+#: panels/network/network-proxy.ui:211
 msgid "_FTP Proxy"
 msgstr "_FTP-vÃ¤lityspalvelin"
 
-#: ../panels/network/network-proxy.ui.h:8
+#: panels/network/network-proxy.ui:230
 msgid "_Socks Host"
 msgstr "_Socks-palvelin"
 
-#: ../panels/network/network-proxy.ui.h:9
+#: panels/network/network-proxy.ui:249
 msgid "_Ignore Hosts"
 msgstr "_Ohita koneet"
 
-#: ../panels/network/network-proxy.ui.h:10
+#: panels/network/network-proxy.ui:287
 msgid "HTTP proxy port"
 msgstr "HTTP-vÃ¤lityspalvelimen portti"
 
-#: ../panels/network/network-proxy.ui.h:11
+#: panels/network/network-proxy.ui:364
 msgid "HTTPS proxy port"
 msgstr "HTTPS-vÃ¤lityspalvelimen portti"
 
-#: ../panels/network/network-proxy.ui.h:12
+#: panels/network/network-proxy.ui:385
 msgid "FTP proxy port"
 msgstr "FTP-vÃ¤lityspalvelimen portti"
 
-#: ../panels/network/network-proxy.ui.h:13
+#: panels/network/network-proxy.ui:406
 msgid "Socks proxy port"
 msgstr "Socks-vÃ¤lityspalvelimen portti"
 
-#: ../panels/network/network-proxy.ui.h:14
+#: panels/network/network-proxy.ui:435
 msgid "_Configuration URL"
 msgstr "_MÃ¤Ã¤ritys-URL"
 
-#: ../panels/network/network-simple.ui.h:2
+#: panels/network/network-simple.ui:50
 msgid "Turn device off"
 msgstr "KÃ¤Ã¤nnÃ¤ laite pois pÃ¤Ã¤ltÃ¤"
 
-#. Translators: The found device is a printer connected via Bluetooth
-#: ../panels/network/network.ui.h:1
-#: ../panels/printers/pp-new-printer-dialog.c:1816
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
-#: ../panels/network/network.ui.h:3
+#: panels/network/network.ui:194
 msgid "Not set up"
 msgstr "Ei mÃ¤Ã¤ritetty"
 
-#: ../panels/network/network-vpn.ui.h:1
+#: panels/network/network-vpn.ui:56
 msgid "Turn VPN connection off"
 msgstr "Katkaise VPN-yhteys"
 
-#: ../panels/network/network-wifi.ui.h:3
+#: panels/network/network-wifi.ui:127
 msgid "Automatic _Connect"
 msgstr "Automaattinen _yhdistÃ¤minen"
 
-#: ../panels/network/network-wifi.ui.h:13
+#: panels/network/network-wifi.ui:474
 msgid "details"
 msgstr "tiedot"
 
-#: ../panels/network/network-wifi.ui.h:17
-#: ../panels/network/wireless-security/eap-method-leap.ui.h:2
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:2
-#: ../panels/network/wireless-security/ws-leap.ui.h:2
-#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1
-#: ../panels/sharing/sharing.ui.h:9
-#: ../panels/user-accounts/data/account-dialog.ui.h:12
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7
+#: panels/network/network-wifi.ui:545
+#: panels/network/wireless-security/eap-method-leap.ui:40
+#: panels/network/wireless-security/eap-method-simple.ui:40
+#: panels/network/wireless-security/ws-leap.ui:40
+#: panels/network/wireless-security/ws-wpa-psk.ui:22
+#: panels/sharing/sharing.ui:351
+#: panels/user-accounts/data/account-dialog.ui:300
+#: panels/user-accounts/data/account-dialog.ui:525
+#: panels/user-accounts/data/user-accounts-dialog.ui:200
 msgid "_Password"
 msgstr "_Salasana"
 
-#: ../panels/network/network-wifi.ui.h:21
+#: panels/network/network-wifi.ui:622
 msgid "Show P_assword"
 msgstr "_NÃ¤ytÃ¤ salasana"
 
-#: ../panels/network/network-wifi.ui.h:22
+#: panels/network/network-wifi.ui:652
 msgid "Make available to other users"
 msgstr "Aseta kaikkien kÃ¤yttÃ¤jien kÃ¤ytettÃ¤vÃ¤ksi"
 
-#: ../panels/network/network-wifi.ui.h:23
+#: panels/network/network-wifi.ui:680
 msgid "identity"
 msgstr "identiteetti"
 
-#: ../panels/network/network-wifi.ui.h:24
+#: panels/network/network-wifi.ui:714
 msgid "IPv_4"
 msgstr "IPv_4"
 
-#: ../panels/network/network-wifi.ui.h:25
+#: panels/network/network-wifi.ui:755 panels/network/network-wifi.ui:1032
 msgid "_Addresses"
 msgstr "_Osoitteet"
 
-#: ../panels/network/network-wifi.ui.h:28
+#: panels/network/network-wifi.ui:779 panels/network/network-wifi.ui:1056
 msgid "Automatic (DHCP) addresses only"
 msgstr "Vain automaattiset (DHCP-) osoitteet"
 
-#: ../panels/network/network-wifi.ui.h:29
+#: panels/network/network-wifi.ui:780 panels/network/network-wifi.ui:1057
 msgid "Link-local only"
 msgstr "Vain linkkiyhteys"
 
-#: ../panels/network/network-wifi.ui.h:30
+#: panels/network/network-wifi.ui:781 panels/network/network-wifi.ui:1058
 msgid "Shared with other computers"
 msgstr "Jaettu muille tietokoneille"
 
-#: ../panels/network/network-wifi.ui.h:33
+#: panels/network/network-wifi.ui:917 panels/network/network-wifi.ui:1194
 msgid "_Ignore automatically obtained routes"
 msgstr "_Ã„lÃ¤ huomioi automaattisesti saatuja reittejÃ¤"
 
-#: ../panels/network/network-wifi.ui.h:35
+#: panels/network/network-wifi.ui:960
 msgid "ipv4"
 msgstr "ipv4"
 
-#: ../panels/network/network-wifi.ui.h:36
+#: panels/network/network-wifi.ui:991
 msgid "IPv_6"
 msgstr "IPv_6"
 
-#: ../panels/network/network-wifi.ui.h:37
+#: panels/network/network-wifi.ui:1237
 msgid "ipv6"
 msgstr "ipv6"
 
-#: ../panels/network/network-wifi.ui.h:39
+#: panels/network/network-wifi.ui:1277
 msgid "_Cloned MAC Address"
 msgstr "_Kloonattu MAC-osoite"
 
-#: ../panels/network/network-wifi.ui.h:40
+#: panels/network/network-wifi.ui:1327
 msgid "hardware"
 msgstr "laitteisto"
 
-#: ../panels/network/network-wifi.ui.h:41
+#: panels/network/network-wifi.ui:1346
 msgid "_Reset"
 msgstr "_TyhjennÃ¤"
 
-#: ../panels/network/network-wifi.ui.h:43
+#: panels/network/network-wifi.ui:1382
 msgid ""
 "Reset the settings for this connection to their defaults, but remember as a "
 "preferred connection."
@@ -2975,7 +2980,7 @@ msgstr ""
 "TyhjennÃ¤ tÃ¤mÃ¤n yhteyden asetukset ja palauta oletusasetukset, mutta muista "
 "yhteys ensisijaisena."
 
-#: ../panels/network/network-wifi.ui.h:44
+#: panels/network/network-wifi.ui:1399
 msgid ""
 "Remove all details relating to this network and do not try to automatically "
 "connect to it."
@@ -2983,541 +2988,540 @@ msgstr ""
 "Poista kaikki tÃ¤hÃ¤n verkkoon liittyvÃ¤ tieto Ã¤lÃ¤kÃ¤ yritÃ¤ yhdistÃ¤Ã¤ "
 "automaattisesti."
 
-#: ../panels/network/network-wifi.ui.h:45
+#: panels/network/network-wifi.ui:1419
 msgid "reset"
 msgstr "tyhjennÃ¤"
 
-#: ../panels/network/network-wifi.ui.h:50
+#: panels/network/network-wifi.ui:1472
 msgid "Hardware"
 msgstr "Laitteisto"
 
-#: ../panels/network/network-wifi.ui.h:51
+#: panels/network/network-wifi.ui:1476
 msgctxt "tab"
 msgid "Reset"
 msgstr "TyhjennÃ¤ asetukset"
 
-#: ../panels/network/network-wifi.ui.h:52
+#: panels/network/network-wifi.ui:1537
 msgid "Wi-Fi Hotspot"
 msgstr "Wifi-yhteyspiste"
 
-#: ../panels/network/network-wifi.ui.h:53
+#: panels/network/network-wifi.ui:1554
 msgid "Switch off to connect to a Wi-Fi network"
 msgstr "Katkaise yhdistÃ¤Ã¤ksesi langattomaan verkkoon"
 
-#: ../panels/network/network-wifi.ui.h:54
+#: panels/network/network-wifi.ui:1603
 msgid "Network Name"
 msgstr "Verkon nimi"
 
-#: ../panels/network/network-wifi.ui.h:55
+#: panels/network/network-wifi.ui:1621
 msgid "Connected Devices"
 msgstr "Yhdistetyt laitteet"
 
-#: ../panels/network/network-wifi.ui.h:56
+#: panels/network/network-wifi.ui:1639
 msgid "Security type"
 msgstr "Salauksen tyyppi"
 
-#: ../panels/network/network-wifi.ui.h:57
-#: ../panels/printers/authentication-dialog.ui.h:5
-#: ../panels/printers/new-printer-dialog.ui.h:14
-#: ../panels/user-accounts/data/account-dialog.ui.h:9
+#: panels/network/network-wifi.ui:1702
+msgctxt "Wi-Fi passkey"
 msgid "Password"
 msgstr "Salasana"
 
-#: ../panels/network/network-wifi.ui.h:59
+#: panels/network/network-wifi.ui:1796
 msgid "Turn Wi-Fi off"
 msgstr "Kytke wifi pois pÃ¤Ã¤ltÃ¤"
 
-#: ../panels/network/network-wifi.ui.h:60
+#: panels/network/network-wifi.ui:1828
 msgid "_Connect to Hidden Networkâ€¦"
 msgstr "Y_hdistÃ¤ piilotettuun verkkoonâ€¦"
 
-#: ../panels/network/network-wifi.ui.h:61
+#: panels/network/network-wifi.ui:1838
 msgid "_Turn On Wi-Fi Hotspotâ€¦"
 msgstr "_KÃ¤ynnistÃ¤ wifi-yhteyspisteâ€¦"
 
-#: ../panels/network/network-wifi.ui.h:62
+#: panels/network/network-wifi.ui:1848
 msgid "_Known Wi-Fi Networks"
 msgstr "_Tunnetut wifi-verkot"
 
-#: ../panels/network/wifi.ui.h:1
-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/wifi.ui.h:2
+#: panels/network/wifi.ui:40
 msgid "No Wi-Fi Adapter Found"
 msgstr "Wifi-sovitinta ei lÃ¶ytynyt"
 
-#: ../panels/network/wifi.ui.h:3
+#: panels/network/wifi.ui:52
+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/wifi.ui:127
 msgid "Airplane Mode"
 msgstr "Lentokonetila"
 
-#: ../panels/network/wifi.ui.h:4
+#: panels/network/wifi.ui:142
 msgid "Disables Wi-Fi, Bluetooth and mobile broadband"
 msgstr "Poistaa kÃ¤ytÃ¶stÃ¤ wifin, Bluetoothin ja mobiililaajakaistan"
 
-#: ../panels/network/wifi.ui.h:5
+#: panels/network/wifi.ui:192
 msgid "Visible Networks"
 msgstr "NÃ¤kyvissÃ¤ olevat verkot"
 
-#: ../panels/network/wifi.ui.h:6
+#: panels/network/wifi.ui:296
 msgid "NetworkManager needs to be running"
 msgstr "NetworkManagerin tulee olla kÃ¤ynnissÃ¤"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:127
+#: panels/network/panel-common.c:127
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:131
+#: panels/network/panel-common.c:131
 msgid "Infrastructure"
 msgstr "Infrastruktuuri"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201
+#: panels/network/panel-common.c:147 panels/network/panel-common.c:201
 msgid "Status unknown"
 msgstr "Tuntematon tila"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:151
+#: panels/network/panel-common.c:151
 msgid "Unmanaged"
 msgstr "Hallitsematon"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:155
+#: panels/network/panel-common.c:155
 msgid "Unavailable"
 msgstr "Ei saatavilla"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207
+#: panels/network/panel-common.c:165 panels/network/panel-common.c:207
 msgid "Connecting"
 msgstr "YhdistetÃ¤Ã¤n"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
+#: panels/network/panel-common.c:169 panels/network/panel-common.c:211
 msgid "Authentication required"
 msgstr "Tunnistautuminen vaaditaan"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
+#: panels/network/panel-common.c:173 panels/network/panel-common.c:215
 msgid "Connected"
 msgstr "Yhdistetty"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:177
+#: panels/network/panel-common.c:177
 msgid "Disconnecting"
 msgstr "Katkaistaan yhteyttÃ¤"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219
+#: panels/network/panel-common.c:181 panels/network/panel-common.c:219
 msgid "Connection failed"
 msgstr "Yhteys epÃ¤onnistui"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227
+#: panels/network/panel-common.c:185 panels/network/panel-common.c:227
 msgid "Status unknown (missing)"
 msgstr "Tila tuntematon (puuttuu)"
 
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:223
+#: panels/network/panel-common.c:223
 msgid "Not connected"
 msgstr "Ei yhteyttÃ¤"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:248
+#: panels/network/panel-common.c:248
 msgid "Configuration failed"
 msgstr "Kokoonpanon kÃ¤yttÃ¶ epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:252
+#: panels/network/panel-common.c:252
 msgid "IP configuration failed"
 msgstr "IP-asetukset epÃ¤onnistuivat"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:256
+#: panels/network/panel-common.c:256
 msgid "IP configuration expired"
 msgstr "IP-asetukset vanhenivat"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:260
+#: panels/network/panel-common.c:260
 msgid "Secrets were required, but not provided"
 msgstr "Salaisuuksia ei annettu, vaikka niitÃ¤ pyydettiin"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:264
+#: panels/network/panel-common.c:264
 msgid "802.1x supplicant disconnected"
 msgstr "802.1x-anojan yhteys katkaistu"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:268
+#: panels/network/panel-common.c:268
 msgid "802.1x supplicant configuration failed"
 msgstr "802.1x-anojan asetukset epÃ¤onnistuivat"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:272
+#: panels/network/panel-common.c:272
 msgid "802.1x supplicant failed"
 msgstr "802.1x-anoja epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:276
+#: panels/network/panel-common.c:276
 msgid "802.1x supplicant took too long to authenticate"
 msgstr "802.1x-anojalla kesti liian kauan tunnistautua"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:280
+#: panels/network/panel-common.c:280
 msgid "PPP service failed to start"
 msgstr "PPP-palvelun kÃ¤ynnistys epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:284
+#: panels/network/panel-common.c:284
 msgid "PPP service disconnected"
 msgstr "PPP-palvelun yhteys katkaistu"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:288
+#: panels/network/panel-common.c:288
 msgid "PPP failed"
 msgstr "PPP epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:292
+#: panels/network/panel-common.c:292
 msgid "DHCP client failed to start"
 msgstr "DHCP-asiakkaan kÃ¤ynnistys epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:296
+#: panels/network/panel-common.c:296
 msgid "DHCP client error"
 msgstr "DHCP-asiakkaan virhe"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:300
+#: panels/network/panel-common.c:300
 msgid "DHCP client failed"
 msgstr "DHCP-asiakas epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:304
+#: panels/network/panel-common.c:304
 msgid "Shared connection service failed to start"
 msgstr "Jaetun yhteyden palvelun kÃ¤ynnistys epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:308
+#: panels/network/panel-common.c:308
 msgid "Shared connection service failed"
 msgstr "Jaetun yhteyden palvelu epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:312
+#: panels/network/panel-common.c:312
 msgid "AutoIP service failed to start"
 msgstr "AutoIP-palvelun kÃ¤ynnistys epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:316
+#: panels/network/panel-common.c:316
 msgid "AutoIP service error"
 msgstr "AutoIP-palvelun virhe"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:320
+#: panels/network/panel-common.c:320
 msgid "AutoIP service failed"
 msgstr "AutoIP-palvelu epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:324
+#: panels/network/panel-common.c:324
 msgid "Line busy"
 msgstr "Linja on varattu"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:328
+#: panels/network/panel-common.c:328
 msgid "No dial tone"
 msgstr "Ei valintaÃ¤Ã¤ntÃ¤"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:332
+#: panels/network/panel-common.c:332
 msgid "No carrier could be established"
 msgstr "Kantoaaltoa ei voitu muodostaa"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:336
+#: panels/network/panel-common.c:336
 msgid "Dialing request timed out"
 msgstr "SoittopyyntÃ¶ aikatkaistiin"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:340
+#: panels/network/panel-common.c:340
 msgid "Dialing attempt failed"
 msgstr "Soittoyritys epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:344
+#: panels/network/panel-common.c:344
 msgid "Modem initialization failed"
 msgstr "Modeemin alustus epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:348
+#: panels/network/panel-common.c:348
 msgid "Failed to select the specified APN"
 msgstr "Halutun APN:n valinta epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:352
+#: panels/network/panel-common.c:352
 msgid "Not searching for networks"
 msgstr "Verkkoja ei etsitÃ¤"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:356
+#: panels/network/panel-common.c:356
 msgid "Network registration denied"
 msgstr "Verkkoon rekisterÃ¶inti estettiin"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:360
+#: panels/network/panel-common.c:360
 msgid "Network registration timed out"
 msgstr "RekisterÃ¶inti verkkoon aikakatkaistiin"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:364
+#: panels/network/panel-common.c:364
 msgid "Failed to register with the requested network"
 msgstr "MÃ¤Ã¤ritettyyn verkkoon rekisterÃ¶inti epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:368
+#: panels/network/panel-common.c:368
 msgid "PIN check failed"
 msgstr "PIN-tarkistus epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:372
+#: panels/network/panel-common.c:372
 msgid "Firmware for the device may be missing"
 msgstr "Laitteen laiteohjelmisto saattaa puuttua"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:376
+#: panels/network/panel-common.c:376
 msgid "Connection disappeared"
 msgstr "Yhteys katosi"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:380
+#: panels/network/panel-common.c:380
 msgid "Existing connection was assumed"
 msgstr "Oletettiin olemassa oleva yhteys"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:384
+#: panels/network/panel-common.c:384
 msgid "Modem not found"
 msgstr "Modeemia ei lÃ¶ytynyt"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:388
+#: panels/network/panel-common.c:388
 msgid "Bluetooth connection failed"
 msgstr "Bluetooth-yhteys epÃ¤onnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:392
+#: panels/network/panel-common.c:392
 msgid "SIM Card not inserted"
 msgstr "SIM-korttia ei ole liitetty"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:396
+#: panels/network/panel-common.c:396
 msgid "SIM Pin required"
 msgstr "SIM-kortin PIN vaaditaan"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:400
+#: panels/network/panel-common.c:400
 msgid "SIM Puk required"
 msgstr "SIM-kortin PUK vaaditaan"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:404
+#: panels/network/panel-common.c:404
 msgid "SIM wrong"
 msgstr "SIM vÃ¤Ã¤rin"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:408
+#: panels/network/panel-common.c:408
 msgid "Connection dependency failed"
 msgstr "Yhteysriippuvuus epÃ¤onnistui"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:433
+#: panels/network/panel-common.c:433
 msgid "Firmware missing"
 msgstr "Laiteohjelmisto puuttuu"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:437
+#: panels/network/panel-common.c:437
 msgid "Cable unplugged"
 msgstr "Johto on irti"
 
-#: ../panels/network/wireless-security/eap-method.c:57
+#: panels/network/wireless-security/eap-method.c:57
 msgid "undefined error in 802.1X security (wpa-eap)"
 msgstr "mÃ¤Ã¤rittelemÃ¤tÃ¶n virhe 802.1X-tietoturvassa (wpa-eap)"
 
-#: ../panels/network/wireless-security/eap-method.c:233
+#: panels/network/wireless-security/eap-method.c:233
 msgid "no file selected"
 msgstr "ei tiedostoa valittuna"
 
-#: ../panels/network/wireless-security/eap-method.c:264
+#: panels/network/wireless-security/eap-method.c:264
 msgid "unspecified error validating eap-method file"
 msgstr "mÃ¤Ã¤rittÃ¤mÃ¤tÃ¶n virhe eap-method-tiedostoa vahvistaessa"
 
-#: ../panels/network/wireless-security/eap-method.c:439
+#: panels/network/wireless-security/eap-method.c:439
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER-, PEM-, tai PKCS#12-yksityisavaimet (*.der, *.pem, *.p12, *.key)"
 
-#: ../panels/network/wireless-security/eap-method.c:442
+#: panels/network/wireless-security/eap-method.c:442
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER- tai PEM-varmenteet (*.der, *.pem, *.crt, *.cer)"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:72
+#: panels/network/wireless-security/eap-method-fast.c:72
 msgid "missing EAP-FAST PAC file"
 msgstr "puuttuva EAP-FAST PAC -tiedosto"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:268
-#: ../panels/network/wireless-security/eap-method-peap.c:302
-#: ../panels/network/wireless-security/eap-method-ttls.c:351
+#: panels/network/wireless-security/eap-method-fast.c:268
+#: panels/network/wireless-security/eap-method-peap.c:302
+#: panels/network/wireless-security/eap-method-ttls.c:351
 msgid "GTC"
 msgstr "GTC"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:283
-#: ../panels/network/wireless-security/eap-method-peap.c:272
-#: ../panels/network/wireless-security/eap-method-ttls.c:289
+#: panels/network/wireless-security/eap-method-fast.c:283
+#: panels/network/wireless-security/eap-method-peap.c:272
+#: panels/network/wireless-security/eap-method-ttls.c:289
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:406
+#: panels/network/wireless-security/eap-method-fast.c:406
 msgid "Choose a PAC file"
 msgstr "Valitse PAC-tiedosto"
 
-#: ../panels/network/wireless-security/eap-method-fast.c:413
+#: panels/network/wireless-security/eap-method-fast.c:413
 msgid "PAC files (*.pac)"
 msgstr "PAC-tiedostot (*.pac)"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:1
+#: panels/network/wireless-security/eap-method-fast.ui:22
 msgid "Anonymous"
 msgstr "Anonyymi"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
+#: panels/network/wireless-security/eap-method-fast.ui:25
 msgid "Authenticated"
 msgstr "Todennettu"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: panels/network/wireless-security/eap-method-fast.ui:28
 msgid "Both"
 msgstr "Molemmat"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: panels/network/wireless-security/eap-method-fast.ui:76
 msgid "PAC _file"
 msgstr "PA_C-tiedosto"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#: panels/network/wireless-security/eap-method-fast.ui:122
+#: panels/network/wireless-security/eap-method-peap.ui:146
+#: panels/network/wireless-security/eap-method-ttls.ui:97
 msgid "_Inner authentication"
 msgstr "_Sisempi tunnistautuminen"
 
-#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#: panels/network/wireless-security/eap-method-fast.ui:156
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Salli automaattinen PAC-pro_visiointi"
 
-#: ../panels/network/wireless-security/eap-method-leap.c:65
+#: panels/network/wireless-security/eap-method-leap.c:65
 msgid "missing EAP-LEAP username"
 msgstr "puuttuva EAP-LEAP-kÃ¤yttÃ¤jÃ¤tunnus"
 
-#: ../panels/network/wireless-security/eap-method-leap.c:74
+#: panels/network/wireless-security/eap-method-leap.c:74
 msgid "missing EAP-LEAP password"
 msgstr "puuttuva EAP-LEAP-salasana"
 
-#: ../panels/network/wireless-security/eap-method-leap.ui.h:1
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:1
-#: ../panels/network/wireless-security/ws-leap.ui.h:1
-#: ../panels/user-accounts/data/account-dialog.ui.h:4
+#: 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
 msgid "_Username"
 msgstr "_KÃ¤yttÃ¤jÃ¤tunnus"
 
-#: ../panels/network/wireless-security/eap-method-leap.ui.h:3
-#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:7
-#: ../panels/network/wireless-security/ws-leap.ui.h:3
-#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
+#: panels/network/wireless-security/eap-method-leap.ui:68
+#: panels/network/wireless-security/eap-method-simple.ui:85
+#: panels/network/wireless-security/eap-method-tls.ui:164
+#: panels/network/wireless-security/ws-leap.ui:68
+#: panels/network/wireless-security/ws-wpa-psk.ui:76
 msgid "Sho_w password"
 msgstr "N_Ã¤ytÃ¤ salasana"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:63
+#: panels/network/wireless-security/eap-method-peap.c:63
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "virheellinen EAP-PEAP CA -varmenne: %s"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:68
+#: panels/network/wireless-security/eap-method-peap.c:68
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "virheellinen EAP-PEAP CA -varmenne: varmennetta ei mÃ¤Ã¤ritetty"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:287
-#: ../panels/network/wireless-security/eap-method-ttls.c:336
-#: ../panels/network/wireless-security/wireless-security.c:441
+#: panels/network/wireless-security/eap-method-peap.c:287
+#: panels/network/wireless-security/eap-method-ttls.c:336
+#: panels/network/wireless-security/wireless-security.c:441
 msgid "MD5"
 msgstr "MD5"
 
-#: ../panels/network/wireless-security/eap-method-peap.c:381
-#: ../panels/network/wireless-security/eap-method-tls.c:492
-#: ../panels/network/wireless-security/eap-method-ttls.c:430
+#: panels/network/wireless-security/eap-method-peap.c:381
+#: panels/network/wireless-security/eap-method-tls.c:492
+#: panels/network/wireless-security/eap-method-ttls.c:430
 msgid "Choose a Certificate Authority certificate"
 msgstr "Valitse varmentajavarmenne"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
+#: panels/network/wireless-security/eap-method-peap.ui:25
 msgid "Version 0"
 msgstr "Versio 0"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+#: panels/network/wireless-security/eap-method-peap.ui:28
 msgid "Version 1"
 msgstr "Versio 1"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:3
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+#: panels/network/wireless-security/eap-method-peap.ui:74
+#: panels/network/wireless-security/eap-method-tls.ui:75
+#: panels/network/wireless-security/eap-method-ttls.ui:57
 msgid "C_A certificate"
 msgstr "_Varmentajavarmenne (CA-varmenne)"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
-#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+#: panels/network/wireless-security/eap-method-peap.ui:96
+#: panels/network/wireless-security/eap-method-tls.ui:97
+#: panels/network/wireless-security/eap-method-ttls.ui:79
 msgid "No CA certificate is _required"
 msgstr "_CA-varmennetta ei vaadita"
 
-#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+#: panels/network/wireless-security/eap-method-peap.ui:114
 msgid "PEAP _version"
 msgstr "PEAP-_versio"
 
-#: ../panels/network/wireless-security/eap-method-simple.c:74
+#: panels/network/wireless-security/eap-method-simple.c:74
 msgid "missing EAP username"
 msgstr "puuttuva EAP-kÃ¤yttÃ¤jÃ¤tunnus"
 
-#: ../panels/network/wireless-security/eap-method-simple.c:87
+#: panels/network/wireless-security/eap-method-simple.c:87
 msgid "missing EAP password"
 msgstr "puuttuva EAP-salasana"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:68
+#: panels/network/wireless-security/eap-method-tls.c:68
 msgid "missing EAP-TLS identity"
 msgstr "puuttuva EAP-TLS-identiteetti"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:77
+#: panels/network/wireless-security/eap-method-tls.c:77
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "virheellinen EAP-TLS CA -varmenne: %s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:84
+#: panels/network/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "virheellinen EAP-TLS:n CA-varmenne: varmennetta ei mÃ¤Ã¤ritetty"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:100
+#: panels/network/wireless-security/eap-method-tls.c:100
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr ""
 
-#: ../panels/network/wireless-security/eap-method-tls.c:110
+#: panels/network/wireless-security/eap-method-tls.c:110
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "virheellinen EAP-TLS-kÃ¤yttÃ¤jÃ¤varmenne: %s"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:307
+#: panels/network/wireless-security/eap-method-tls.c:307
 msgid "Unencrypted private keys are insecure"
 msgstr "Salaamattomat yksityiset avaimet ovat epÃ¤luotettavia"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:310
+#: panels/network/wireless-security/eap-method-tls.c:310
 msgid ""
 "The selected private key does not appear to be protected by a password. This "
 "could allow your security credentials to be compromised. Please select a "
@@ -3531,181 +3535,181 @@ msgstr ""
 "\n"
 "(Voit salasanasuojata yksityisen avaimesi openssl:llÃ¤)"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:486
+#: panels/network/wireless-security/eap-method-tls.c:486
 msgid "Choose your personal certificate"
 msgstr "Valitse henkilÃ¶kohtainen varmenteesi"
 
-#: ../panels/network/wireless-security/eap-method-tls.c:498
+#: panels/network/wireless-security/eap-method-tls.c:498
 msgid "Choose your private key"
 msgstr "Valitse yksityinen avaimesi"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:1
+#: panels/network/wireless-security/eap-method-tls.ui:24
 msgid "I_dentity"
 msgstr "I_dentiteetti"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:2
+#: panels/network/wireless-security/eap-method-tls.ui:50
 msgid "_User certificate"
 msgstr "_KÃ¤yttÃ¤jÃ¤varmenne"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#: panels/network/wireless-security/eap-method-tls.ui:115
 msgid "Private _key"
 msgstr "_Yksityinen avain"
 
-#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: panels/network/wireless-security/eap-method-tls.ui:140
 msgid "_Private key password"
 msgstr "Yksityisen avaimen _salasana"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:63
+#: panels/network/wireless-security/eap-method-ttls.c:63
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "virheellinen EAP-TTLS CA -varmenne: %s"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:68
+#: panels/network/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "virheellinen EAP-TTLS CA -varmenne: varmennetta ei mÃ¤Ã¤ritetty"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:259
+#: panels/network/wireless-security/eap-method-ttls.c:259
 msgid "PAP"
 msgstr "PAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:274
+#: panels/network/wireless-security/eap-method-ttls.c:274
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:305
+#: panels/network/wireless-security/eap-method-ttls.c:305
 msgid "MSCHAPv2 (no EAP)"
 msgstr "MSCHAPv2 (ei EAP:tÃ¤)"
 
-#: ../panels/network/wireless-security/eap-method-ttls.c:321
+#: panels/network/wireless-security/eap-method-ttls.c:321
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../panels/network/wireless-security/wireless-security.c:87
+#: panels/network/wireless-security/wireless-security.c:87
 msgid "Unknown error validating 802.1X security"
 msgstr "Tuntematon virhe 802.1X-tietoturvaa vahvistaessa"
 
-#: ../panels/network/wireless-security/wireless-security.c:453
+#: panels/network/wireless-security/wireless-security.c:453
 msgid "TLS"
 msgstr "TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:477
+#: panels/network/wireless-security/wireless-security.c:477
 msgid "PWD"
 msgstr "PWD"
 
-#: ../panels/network/wireless-security/wireless-security.c:488
+#: panels/network/wireless-security/wireless-security.c:488
 msgid "FAST"
 msgstr "FAST"
 
-#: ../panels/network/wireless-security/wireless-security.c:499
+#: panels/network/wireless-security/wireless-security.c:499
 msgid "Tunneled TLS"
 msgstr "Tunneloitu TLS"
 
-#: ../panels/network/wireless-security/wireless-security.c:510
+#: panels/network/wireless-security/wireless-security.c:510
 msgid "Protected EAP (PEAP)"
 msgstr "Suojattu EAP (PEAP)"
 
-#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
-#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
+#: panels/network/wireless-security/ws-dynamic-wep.ui:39
+#: panels/network/wireless-security/ws-wep-key.ui:115
+#: panels/network/wireless-security/ws-wpa-eap.ui:33
 msgid "Au_thentication"
 msgstr "_Tunnistautuminen"
 
-#: ../panels/network/wireless-security/ws-leap.c:63
+#: panels/network/wireless-security/ws-leap.c:63
 msgid "missing leap-username"
 msgstr "puuttuva leap-kÃ¤yttÃ¤jÃ¤tunnus"
 
-#: ../panels/network/wireless-security/ws-leap.c:74
+#: panels/network/wireless-security/ws-leap.c:74
 msgid "missing leap-password"
 msgstr "puuttuva leap-salasana"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:107
+#: panels/network/wireless-security/ws-wep-key.c:107
 msgid "missing wep-key"
 msgstr "puuttuva wep-avain"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:116
+#: panels/network/wireless-security/ws-wep-key.c:116
 #, c-format
 msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../panels/network/wireless-security/ws-wep-key.c:124
+#: panels/network/wireless-security/ws-wep-key.c:124
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
 msgstr ""
 
-#: ../panels/network/wireless-security/ws-wep-key.c:130
+#: panels/network/wireless-security/ws-wep-key.c:130
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
 
-#: ../panels/network/wireless-security/ws-wep-key.c:137
+#: panels/network/wireless-security/ws-wep-key.c:137
 msgid "invalid wep-key: passphrase must be non-empty"
 msgstr "virheellinen wep-avain: tunnuslause ei voi olla tyhjÃ¤"
 
-#: ../panels/network/wireless-security/ws-wep-key.c:139
+#: panels/network/wireless-security/ws-wep-key.c:139
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 "virheellinen wep-avain: tunnuslause tulee olla vÃ¤hemmÃ¤n kuin 64 merkkiÃ¤"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:1
+#: panels/network/wireless-security/ws-wep-key.ui:11
 msgid "1 (Default)"
 msgstr "1 (Oletus)"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:2
+#: panels/network/wireless-security/ws-wep-key.ui:31
 msgid "Open System"
 msgstr "Avoin jÃ¤rjestelmÃ¤"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
+#: panels/network/wireless-security/ws-wep-key.ui:34
 msgid "Shared Key"
 msgstr "Jaettu avain"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
+#: panels/network/wireless-security/ws-wep-key.ui:56
 msgid "_Key"
 msgstr "_Avain"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
+#: panels/network/wireless-security/ws-wep-key.ui:94
 msgid "Sho_w key"
 msgstr "N_Ã¤ytÃ¤ avain"
 
-#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+#: panels/network/wireless-security/ws-wep-key.ui:152
 msgid "WEP inde_x"
 msgstr "WEP-inde_ksi"
 
-#: ../panels/network/wireless-security/ws-wpa-psk.c:70
+#: panels/network/wireless-security/ws-wpa-psk.c:70
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
 "digits"
 msgstr ""
 
-#: ../panels/network/wireless-security/ws-wpa-psk.c:79
+#: panels/network/wireless-security/ws-wpa-psk.c:79
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
-#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
+#: panels/network/wireless-security/ws-wpa-psk.ui:50
 msgid "_Type"
 msgstr "_Tyyppi"
 
 #. This is the per application switch for message tray usage.
-#: ../panels/notifications/edit-dialog.ui.h:2
+#: panels/notifications/edit-dialog.ui:64
 msgctxt "notifications"
 msgid "_Notifications"
 msgstr "_Ilmoitukset"
 
 #. This is the setting to configure sounds associated with notifications.
-#: ../panels/notifications/edit-dialog.ui.h:4
+#: panels/notifications/edit-dialog.ui:116
 msgctxt "notifications"
 msgid "Sound _Alerts"
 msgstr "_Ã„Ã¤ni-ilmoitukset"
 
-#: ../panels/notifications/edit-dialog.ui.h:5
+#: panels/notifications/edit-dialog.ui:172
 msgctxt "notifications"
 msgid "Notification _Popups"
 msgstr "_Ponnahdusilmoitukset"
 
-#: ../panels/notifications/edit-dialog.ui.h:6
+#: panels/notifications/edit-dialog.ui:188
 msgid ""
 "Notifications will continue to appear in the notification list when popups "
 "are disabled."
@@ -3713,85 +3717,93 @@ msgstr ""
 "Ilmoitukset nÃ¤kyvÃ¤t ilmoitusluettelossa ponnahdusten ollessa pois kÃ¤ytÃ¶stÃ¤."
 
 #. Popups here refers to message tray notifications in the middle of the screen.
-#: ../panels/notifications/edit-dialog.ui.h:8
+#: panels/notifications/edit-dialog.ui:253
 msgctxt "notifications"
 msgid "Show Message _Content in Popups"
 msgstr "NÃ¤y_tÃ¤ viestin sisÃ¤ltÃ¶ ponnahduksen yhteydessÃ¤"
 
-#: ../panels/notifications/edit-dialog.ui.h:9
+#: panels/notifications/edit-dialog.ui:304
 msgctxt "notifications"
 msgid "_Lock Screen Notifications"
 msgstr "LukitusnÃ¤ytÃ¶n i_lmoitukset"
 
-#: ../panels/notifications/edit-dialog.ui.h:10
+#: panels/notifications/edit-dialog.ui:355
 msgctxt "notifications"
 msgid "Show Message C_ontent on Lock Screen"
 msgstr "NÃ¤ytÃ¤ viestin sisÃ¤ltÃ¶ _lukitusnÃ¤ytÃ¶llÃ¤"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
-msgid "NoÂtiÂfiÂcaÂtions"
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:3
+msgid "Notifications"
 msgstr "Ilmoitukset"
 
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:4
 msgid "Control which notifications are displayed and what they show"
 msgstr "Hallitse nÃ¤ytettÃ¤viÃ¤ ilmoituksia ja niiden sisÃ¤ltÃ¤mÃ¤Ã¤ tietoa"
 
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:6
+#| msgid "Preferences;Settings;"
+msgid "preferences-system-notifications"
+msgstr "preferences-system-notifications"
+
 #. Translators: those are keywords for the notifications control-center panel
-#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5
+#: panels/notifications/gnome-notifications-panel.desktop.in.in:19
 msgid "Notifications;Banner;Message;Tray;Popup;"
 msgstr ""
 "Notifications;Banner;Message;Tray;Popup;ilmoitus;ilmoitukset;banneri;viesti;"
 
-#: ../panels/notifications/notifications.ui.h:1
+#: panels/notifications/notifications.ui:84
 msgid "Notification _Popups"
 msgstr "_Ponnahdusilmoitukset"
 
-#: ../panels/notifications/notifications.ui.h:2
+#: panels/notifications/notifications.ui:134
 msgid "_Lock Screen Notifications"
 msgstr "_LukitusnÃ¤ytÃ¶n ilmoitukset"
 
 #. List of applications.
-#: ../panels/notifications/notifications.ui.h:4
-#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1787
+#: panels/notifications/notifications.ui:180 panels/privacy/privacy.ui:854
+#: 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:148
 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:603
+#: panels/online-accounts/cc-online-accounts-panel.c:551
 #, c-format
 msgid "%s Account"
 msgstr "%s-tili"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:895
+#: panels/online-accounts/cc-online-accounts-panel.c:843
 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:960
+#: panels/online-accounts/cc-online-accounts-panel.c:908
 #, c-format
 msgid "<b>%s</b> removed"
 msgstr "<b>%s</b> poistettu"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
-msgid "OnÂline Accounts"
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:3
+msgid "Online Accounts"
 msgstr "Verkkotilit"
 
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:4
 msgid "Connect to your online accounts and decide what to use them for"
 msgstr "LiitÃ¤ verkkotilisi ja pÃ¤Ã¤tÃ¤, mihin tarkoituksiin niitÃ¤ kÃ¤ytetÃ¤Ã¤n"
 
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:6
+msgid "goa-panel"
+msgstr "goa-panel"
+
+#. Translators: those are keywords for the online-accounts control-center panel
 #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application)
-#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5
+#: panels/online-accounts/gnome-online-accounts-panel.desktop.in.in:19
 msgid ""
 "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;"
 "Kerberos;IMAP;SMTP;Pocket;ReadItLater;"
@@ -3801,39 +3813,38 @@ msgstr ""
 "yhteystiedot;kontaktit;"
 
 #. Translators: This is the button which allows undoing the removal of the printer.
-#: ../panels/online-accounts/online-accounts.ui.h:1
-#: ../panels/printers/printers.ui.h:4
+#: panels/online-accounts/online-accounts.ui:38 panels/printers/printers.ui:71
 msgid "Undo"
 msgstr "Kumoa"
 
-#: ../panels/online-accounts/online-accounts.ui.h:2
+#: panels/online-accounts/online-accounts.ui:125
 msgid "Connect to your data in the cloud"
 msgstr "Muodosta yhteys pilvessÃ¤ oleviin tietoihisi"
 
-#: ../panels/online-accounts/online-accounts.ui.h:3
+#: panels/online-accounts/online-accounts.ui:137
 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.h:4
+#: panels/online-accounts/online-accounts.ui:159
 msgid "Add an account"
 msgstr "LisÃ¤Ã¤ tili"
 
-#: ../panels/online-accounts/online-accounts.ui.h:5
+#: panels/online-accounts/online-accounts.ui:264
 msgid "Remove Account"
 msgstr "Poista tili"
 
-#: ../panels/power/cc-power-panel.c:253
+#: panels/power/cc-power-panel.c:253
 msgid "Unknown time"
 msgstr "Tuntematon aika"
 
-#: ../panels/power/cc-power-panel.c:259
+#: panels/power/cc-power-panel.c:259
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuutti"
 msgstr[1] "%i minuuttia"
 
-#: ../panels/power/cc-power-panel.c:271
+#: panels/power/cc-power-panel.c:271
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -3842,262 +3853,274 @@ msgstr[1] "%i tuntia"
 
 #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes"
 #. * Swap order with "%2$s %2$i %1$s %1$i if needed
-#: ../panels/power/cc-power-panel.c:279
+#: panels/power/cc-power-panel.c:279
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:280
+#: panels/power/cc-power-panel.c:280
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: ../panels/power/cc-power-panel.c:281
+#: panels/power/cc-power-panel.c:281
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
 #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:300
+#: panels/power/cc-power-panel.c:300
 #, 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:307
+#: panels/power/cc-power-panel.c:307
 #, 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:312
+#: panels/power/cc-power-panel.c:312
 #, c-format
 msgid "%s remaining"
 msgstr "%s jÃ¤ljellÃ¤"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:317 ../panels/power/cc-power-panel.c:345
+#: panels/power/cc-power-panel.c:317 panels/power/cc-power-panel.c:345
 msgid "Fully charged"
 msgstr "Ladattu tÃ¤yteen"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349
+#: panels/power/cc-power-panel.c:321 panels/power/cc-power-panel.c:349
 msgid "Empty"
 msgstr "TyhjÃ¤"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:336
+#: panels/power/cc-power-panel.c:336
 msgid "Charging"
 msgstr "Latautuu"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:341
+#: panels/power/cc-power-panel.c:341
 msgid "Discharging"
 msgstr "Purkautuu"
 
-#: ../panels/power/cc-power-panel.c:464
+#: panels/power/cc-power-panel.c:464
 msgctxt "Battery name"
 msgid "Main"
 msgstr "PÃ¤Ã¤akku"
 
-#: ../panels/power/cc-power-panel.c:466
+#: panels/power/cc-power-panel.c:466
 msgctxt "Battery name"
 msgid "Extra"
 msgstr "LisÃ¤akku"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:537
+#: panels/power/cc-power-panel.c:537
 msgid "Wireless mouse"
 msgstr "Langaton hiiri"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:540
+#: panels/power/cc-power-panel.c:540
 msgid "Wireless keyboard"
 msgstr "Langaton nÃ¤ppÃ¤imistÃ¶"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:543
+#: panels/power/cc-power-panel.c:543
 msgid "Uninterruptible power supply"
 msgstr "KeskeytymÃ¤tÃ¶n virransyÃ¶ttÃ¶"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:546
+#: panels/power/cc-power-panel.c:546
 msgid "Personal digital assistant"
 msgstr "HenkilÃ¶kohtainen digitaalinen avustaja (PDA)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:549
+#: panels/power/cc-power-panel.c:549
 msgid "Cellphone"
 msgstr "Matkapuhelin"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:552
+#: panels/power/cc-power-panel.c:552
 msgid "Media player"
 msgstr "Mediasoitin"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:555 ../panels/wacom/cc-wacom-panel.c:793
+#: panels/power/cc-power-panel.c:555 panels/wacom/cc-wacom-panel.c:793
 msgid "Tablet"
 msgstr "PiirtopÃ¶ytÃ¤"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:558
+#: panels/power/cc-power-panel.c:558
 msgid "Computer"
 msgstr "Tietokone"
 
+#. TRANSLATORS: secondary battery
+#: panels/power/cc-power-panel.c:561
+msgid "Gaming input device"
+msgstr "Pelaamiseen tarkoitettu syÃ¶telaite"
+
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801
-#: ../panels/power/cc-power-panel.c:2356
+#: panels/power/cc-power-panel.c:564 panels/power/cc-power-panel.c:804
+#: panels/power/cc-power-panel.c:2368
 msgid "Battery"
 msgstr "Akku"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:615
+#: panels/power/cc-power-panel.c:618
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Latautuu"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:622
+#: panels/power/cc-power-panel.c:625
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Varoitus"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:627
+#: panels/power/cc-power-panel.c:630
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Matala"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:632
+#: panels/power/cc-power-panel.c:635
 msgctxt "Battery power"
 msgid "Good"
 msgstr "HyvÃ¤"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:637
+#: panels/power/cc-power-panel.c:640
 msgctxt "Battery power"
 msgid "Fully charged"
 msgstr "TÃ¤yteen ladattu"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:641
+#: panels/power/cc-power-panel.c:644
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "TyhjÃ¤"
 
-#: ../panels/power/cc-power-panel.c:799
+#: panels/power/cc-power-panel.c:802
 msgid "Batteries"
 msgstr "Akut"
 
-#: ../panels/power/cc-power-panel.c:1227
+#: panels/power/cc-power-panel.c:1230
 msgid "When _idle"
 msgstr "Kun _kÃ¤yttÃ¤mÃ¤ttÃ¤"
 
-#: ../panels/power/cc-power-panel.c:1681
+#: panels/power/cc-power-panel.c:1684
 msgid "Power Saving"
 msgstr "VirransÃ¤Ã¤stÃ¶"
 
-#: ../panels/power/cc-power-panel.c:1712
+#: panels/power/cc-power-panel.c:1715
 msgid "_Screen brightness"
 msgstr "_NÃ¤ytÃ¶n kirkkaus"
 
-#: ../panels/power/cc-power-panel.c:1731
+#: panels/power/cc-power-panel.c:1734
 msgid "Automatic brightness"
 msgstr "Automaattinen kirkkaus"
 
-#: ../panels/power/cc-power-panel.c:1751
+#: panels/power/cc-power-panel.c:1754
 msgid "_Keyboard brightness"
 msgstr "NÃ¤ppÃ¤imistÃ¶n _kirkkaus"
 
-#: ../panels/power/cc-power-panel.c:1761
+#: panels/power/cc-power-panel.c:1764
 msgid "_Dim screen when inactive"
 msgstr "_HimmennÃ¤ nÃ¤yttÃ¶ koneen ollessa kÃ¤yttÃ¤mÃ¤ttÃ¤"
 
-#: ../panels/power/cc-power-panel.c:1786
+#: panels/power/cc-power-panel.c:1789
 msgid "_Blank screen"
 msgstr "_TyhjÃ¤ nÃ¤yttÃ¶"
 
-#: ../panels/power/cc-power-panel.c:1823
+#: panels/power/cc-power-panel.c:1826
 msgid "_Wi-Fi"
 msgstr "_Wifi"
 
-#: ../panels/power/cc-power-panel.c:1828
+#: panels/power/cc-power-panel.c:1831
 msgid "Turn off Wi-Fi to save power."
 msgstr "Sammuta wifi sÃ¤Ã¤stÃ¤Ã¤ksesi virtaa."
 
-#: ../panels/power/cc-power-panel.c:1853
+#: panels/power/cc-power-panel.c:1856
 msgid "_Mobile broadband"
 msgstr "_Mobiililaajakaista"
 
-#: ../panels/power/cc-power-panel.c:1858
+#: panels/power/cc-power-panel.c:1861
 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power."
 msgstr "Sammuta mobiililaajakaista (3G, 4G, LTE jne.) sÃ¤Ã¤stÃ¤Ã¤ksesi virtaa."
 
-#: ../panels/power/cc-power-panel.c:1903
+#: panels/power/cc-power-panel.c:1914
 msgid "_Bluetooth"
 msgstr "_Bluetooth"
 
-#: ../panels/power/cc-power-panel.c:1966
+#: panels/power/cc-power-panel.c:1919
+msgid "Turn off Bluetooth to save power."
+msgstr "Sammuta bluetooth sÃ¤Ã¤stÃ¤Ã¤ksesi virtaa."
+
+#: panels/power/cc-power-panel.c:1978
 msgid "When on battery power"
 msgstr "KÃ¤ytettÃ¤essÃ¤ akkua"
 
-#: ../panels/power/cc-power-panel.c:1968
+#: panels/power/cc-power-panel.c:1980
 msgid "When plugged in"
 msgstr "KÃ¤ytettÃ¤essÃ¤ verkkovirtaa"
 
-#: ../panels/power/cc-power-panel.c:2063
+#: panels/power/cc-power-panel.c:2075
 msgid "Suspend"
 msgstr "Valmiustila"
 
-#: ../panels/power/cc-power-panel.c:2064
+#: panels/power/cc-power-panel.c:2076
 msgid "Power Off"
 msgstr "Virta pois pÃ¤Ã¤ltÃ¤"
 
-#: ../panels/power/cc-power-panel.c:2065
+#: panels/power/cc-power-panel.c:2077
 msgid "Hibernate"
 msgstr "Lepotila"
 
-#: ../panels/power/cc-power-panel.c:2066
+#: panels/power/cc-power-panel.c:2078
 msgid "Nothing"
 msgstr "Ei mitÃ¤Ã¤n"
 
 #. Frame header
-#: ../panels/power/cc-power-panel.c:2180
+#: panels/power/cc-power-panel.c:2192
 msgid "Suspend & Power Button"
 msgstr "Valmiustila ja virran katkaisu"
 
-#: ../panels/power/cc-power-panel.c:2219
+#: panels/power/cc-power-panel.c:2231
 msgid "_Automatic suspend"
 msgstr "_Automaattinen valmiustila"
 
-#: ../panels/power/cc-power-panel.c:2220
+#: panels/power/cc-power-panel.c:2232
 msgid "Automatic suspend"
 msgstr "Automaattinen valmiustila"
 
-#: ../panels/power/cc-power-panel.c:2287
+#: panels/power/cc-power-panel.c:2299
 msgid "_When the Power Button is pressed"
 msgstr "_Kun virtapainiketta painetaan"
 
-#: ../panels/power/cc-power-panel.c:2406 ../shell/cc-window.c:247
-#: ../shell/panel-list.ui.h:1
+#: panels/power/cc-power-panel.c:2418 shell/cc-window.c:216
+#: shell/panel-list.ui:45
 msgid "Devices"
 msgstr "Laitteet"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:2
-msgid "PoÂwer"
-msgstr "Virranhallinta"
+#: panels/power/gnome-power-panel.desktop.in.in:3
+msgid "Power"
+msgstr "VirransÃ¤Ã¤stÃ¶"
 
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:3
+#: 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"
 
+#: panels/power/gnome-power-panel.desktop.in.in:6
+msgid "gnome-power-manager"
+msgstr "gnome-power-manager"
+
 #. Translators: those are keywords for the power control-center panel
-#: ../panels/power/gnome-power-panel.desktop.in.in.h:5
+#: panels/power/gnome-power-panel.desktop.in.in:18
 msgid ""
 "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
 msgstr ""
@@ -4105,189 +4128,210 @@ msgstr ""
 "virta;uni;valmiustila;lepotila;akku;kirkkaus;himmennys;tyhjÃ¤;nÃ¤yttÃ¶;jouten;"
 "virransÃ¤Ã¤stÃ¶;"
 
-#: ../panels/power/power.ui.h:3
+#: panels/power/power.ui:17
+msgid "20 minutes"
+msgstr "20 minuuttia"
+
+#: panels/power/power.ui:21
+msgid "25 minutes"
+msgstr "25 minuuttia"
+
+#: panels/power/power.ui:29
 msgid "45 minutes"
 msgstr "45 minuuttia"
 
-#: ../panels/power/power.ui.h:4 ../panels/privacy/privacy.ui.h:8
+#: panels/power/power.ui:33 panels/privacy/privacy.ui:42
+#: panels/privacy/privacy.ui:56
 msgid "1 hour"
 msgstr "1 tunti"
 
-#: ../panels/power/power.ui.h:5
+#: panels/power/power.ui:37
 msgid "80 minutes"
 msgstr "80 minuuttia"
 
-#: ../panels/power/power.ui.h:6
+#: panels/power/power.ui:41
 msgid "90 minutes"
 msgstr "90 minuuttia"
 
-#: ../panels/power/power.ui.h:7
+#: panels/power/power.ui:45
 msgid "100 minutes"
 msgstr "100 minuuttia"
 
-#: ../panels/power/power.ui.h:8
+#: panels/power/power.ui:49
 msgid "2 hours"
 msgstr "2 tuntia"
 
-#: ../panels/power/power.ui.h:9 ../panels/privacy/privacy.ui.h:3
+#: panels/power/power.ui:63 panels/privacy/privacy.ui:22
 msgid "1 minute"
 msgstr "1 minuutti"
 
-#: ../panels/power/power.ui.h:10 ../panels/privacy/privacy.ui.h:4
+#: panels/power/power.ui:67 panels/privacy/privacy.ui:26
 msgid "2 minutes"
 msgstr "2 minuuttia"
 
-#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:5
+#: panels/power/power.ui:71 panels/privacy/privacy.ui:30
 msgid "3 minutes"
 msgstr "3 minuuttia"
 
-#: ../panels/power/power.ui.h:12
+#: panels/power/power.ui:75
 msgid "4 minutes"
 msgstr "4 minuuttia"
 
-#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:6
+#: panels/power/power.ui:79 panels/privacy/privacy.ui:34
 msgid "5 minutes"
 msgstr "5 minuuttia"
 
-#: ../panels/power/power.ui.h:14
+#: panels/power/power.ui:83
 msgid "8 minutes"
 msgstr "8 minuuttia"
 
-#: ../panels/power/power.ui.h:15
+#: panels/power/power.ui:87
 msgid "10 minutes"
 msgstr "10 minuuttia"
 
-#: ../panels/power/power.ui.h:16
+#: panels/power/power.ui:91
 msgid "12 minutes"
 msgstr "12 minuuttia"
 
-#: ../panels/power/power.ui.h:18
+#: panels/power/power.ui:155
 msgid "Automatic Suspend"
 msgstr "Automaattinen valmiustila"
 
-#: ../panels/power/power.ui.h:19
+#: panels/power/power.ui:180
 msgid "_Plugged In"
 msgstr "KÃ¤ytettÃ¤essÃ¤ _verkkovirtaa"
 
-#: ../panels/power/power.ui.h:20
+#: panels/power/power.ui:196
 msgid "On _Battery Power"
 msgstr "KÃ¤ytettÃ¤essÃ¤ _akkua"
 
-#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:36
+#: panels/power/power.ui:241 panels/power/power.ui:301
+#: panels/universal-access/uap.ui:1501
 msgid "Delay"
 msgstr "Viive"
 
-#: ../panels/printers/authentication-dialog.ui.h:1
+#: panels/printers/authentication-dialog.ui:11
 msgid " "
 msgstr " "
 
-#: ../panels/printers/authentication-dialog.ui.h:3
+#: panels/printers/authentication-dialog.ui:42
 msgid "Authenticate"
 msgstr "Tunnistaudu"
 
-#: ../panels/printers/authentication-dialog.ui.h:4
-#: ../panels/printers/new-printer-dialog.ui.h:13
+#: panels/printers/authentication-dialog.ui:80
+#: panels/printers/new-printer-dialog.ui:361
 msgid "Username"
 msgstr "KÃ¤yttÃ¤jÃ¤tunnus"
 
-#: ../panels/printers/authentication-dialog.ui.h:6
-#: ../panels/printers/new-printer-dialog.ui.h:11
+#: panels/printers/authentication-dialog.ui:96
+#: panels/printers/new-printer-dialog.ui:382
+#: panels/user-accounts/data/account-dialog.ui:240
+msgid "Password"
+msgstr "Salasana"
+
+#: panels/printers/authentication-dialog.ui:139
+#: panels/printers/new-printer-dialog.ui:336
 msgid "Authentication Required"
 msgstr "Tunnistautuminen vaaditaan"
 
 #. Translators: %s is the printer name
-#: ../panels/printers/cc-printers-panel.c:718
+#: panels/printers/cc-printers-panel.c:718
 #, 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:909
+#: panels/printers/cc-printers-panel.c:909
 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:1221
+#: panels/printers/cc-printers-panel.c:1221
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "KÃ¤yttÃ¶liittymÃ¤tiedoston lataus epÃ¤onnistui: %s"
 
-#: ../panels/printers/details-dialog.ui.h:2
-#: ../panels/printers/printer-entry.ui.h:10
+#: panels/printers/details-dialog.ui:63 panels/printers/printer-entry.ui:223
 msgid "Location"
 msgstr "Sijainti"
 
 #. Translators: Name of column showing printer drivers
-#: ../panels/printers/details-dialog.ui.h:4
-#: ../panels/printers/pp-ppd-selection-dialog.c:250
+#: panels/printers/details-dialog.ui:111
+#: panels/printers/pp-ppd-selection-dialog.c:250
 msgid "Driver"
 msgstr "Ajuri"
 
-#: ../panels/printers/details-dialog.ui.h:5
+#: panels/printers/details-dialog.ui:147
 msgid "Searching for preferred driversâ€¦"
 msgstr "EtsitÃ¤Ã¤n ensisijaisia ajureitaâ€¦"
 
-#: ../panels/printers/details-dialog.ui.h:6
+#: panels/printers/details-dialog.ui:169
 msgid "Search for Drivers"
 msgstr "Etsi ajureita"
 
-#: ../panels/printers/details-dialog.ui.h:7
+#: panels/printers/details-dialog.ui:177
 msgid "Select from Databaseâ€¦"
 msgstr "Valitse tietokannastaâ€¦"
 
-#: ../panels/printers/details-dialog.ui.h:8
+#: panels/printers/details-dialog.ui:185
 msgid "Install PPD Fileâ€¦"
 msgstr "Asenna PPD-tiedostoâ€¦"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "PrinÂters"
+#: panels/printers/gnome-printers-panel.desktop.in.in:3
+msgid "Printers"
 msgstr "Tulostimet"
 
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3
+#: panels/printers/gnome-printers-panel.desktop.in.in:4
 msgid "Add printers, view printer jobs and decide how you want to print"
 msgstr "LisÃ¤Ã¤ tulostimia, seuraa tulostustÃ¶itÃ¤ ja mÃ¤Ã¤ritÃ¤ tulostusasetukset"
 
+#: panels/printers/gnome-printers-panel.desktop.in.in:6
+#| msgid "No printers"
+msgid "printer"
+msgstr "printer"
+
 #. Translators: those are keywords for the printing control-center panel
-#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5
+#: panels/printers/gnome-printers-panel.desktop.in.in:15
 msgid "Printer;Queue;Print;Paper;Ink;Toner;"
 msgstr ""
 "tulostin;jono;tulosta;paperi;muste;vÃ¤rikasetti;Printer;Queue;Print;Paper;Ink;"
 "Toner;"
 
 #. Translators: this action removes (purges) all the listed jobs from the list.
-#: ../panels/printers/jobs-dialog.ui.h:2
+#: panels/printers/jobs-dialog.ui:22
 msgid "Clear All"
 msgstr "TyhjennÃ¤ kaikki"
 
 #. Translators: this label describes the dialog empty state, with no jobs listed.
-#: ../panels/printers/jobs-dialog.ui.h:4
+#: panels/printers/jobs-dialog.ui:96
 msgid "No Active Printer Jobs"
 msgstr "Ei aktiivisia tulostustÃ¶itÃ¤"
 
 #. Translators: This is the title presented at top of the dialog.
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/printers/pp-new-printer-dialog.c:384
-#: ../panels/printers/pp-new-printer-dialog.c:456
+#: panels/printers/new-printer-dialog.ui:29
+#: panels/printers/pp-new-printer-dialog.c:384
+#: panels/printers/pp-new-printer-dialog.c:456
 msgid "Add Printer"
 msgstr "LisÃ¤Ã¤ tulostin"
 
+#. Translators: This button opens authentication dialog for selected server.
 #. Translators: This buttons submits the credentials for the selected server.
-#: ../panels/printers/new-printer-dialog.ui.h:6
+#: panels/printers/new-printer-dialog.ui:96
+#: panels/printers/new-printer-dialog.ui:111
 msgid "_Unlock"
 msgstr "_Avaa lukitus"
 
 #. Translators: No printers were detected
-#: ../panels/printers/new-printer-dialog.ui.h:8
+#: panels/printers/new-printer-dialog.ui:210
 msgid "No Printers Found"
 msgstr "Tulostimia ei lÃ¶ytynyt"
 
 #. Translators: The entered text should contain network address of a printer or a text which will filter 
found devices (their names and locations)
-#: ../panels/printers/new-printer-dialog.ui.h:10
+#: panels/printers/new-printer-dialog.ui:283
 msgid "Enter a network address or search for a printer"
 msgstr "Kirjoita verkko-osoite tai etsi tulostinta"
 
-#: ../panels/printers/new-printer-dialog.ui.h:12
+#: panels/printers/new-printer-dialog.ui:352
 msgid "Enter username and password to view printers on Print Server."
 msgstr ""
 "SyÃ¶tÃ¤ kÃ¤yttÃ¤jÃ¤tunnus ja salasana nÃ¤hdÃ¤ksesi tulostuspalvelimella olevat "
@@ -4295,27 +4339,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.h:2
-#: ../panels/printers/pp-options-dialog.c:893
+#: panels/printers/options-dialog.ui:22 panels/printers/pp-options-dialog.c:893
 msgid "Test Page"
 msgstr "Testisivu"
 
 #. Translators: This is the title of the dialog. %s is the printer name.
-#: ../panels/printers/pp-details-dialog.c:123
-#: ../panels/printers/pp-details-dialog.c:415
+#: panels/printers/pp-details-dialog.c:123
+#: panels/printers/pp-details-dialog.c:415
 #, c-format
 msgid "%s Details"
 msgstr "Tulostimen %s tiedot"
 
-#: ../panels/printers/pp-details-dialog.c:172
+#: panels/printers/pp-details-dialog.c:172
 msgid "No suitable driver found"
 msgstr "Soveltuvaa ajuria ei lÃ¶ytynyt"
 
-#: ../panels/printers/pp-details-dialog.c:316
+#: panels/printers/pp-details-dialog.c:316
 msgid "Select PPD File"
 msgstr "Valitse PPD-tiedosto"
 
-#: ../panels/printers/pp-details-dialog.c:325
+#: panels/printers/pp-details-dialog.c:325
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -4323,302 +4366,301 @@ msgstr ""
 "PostScript Printer Description -tiedostot (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, "
 "*.PPD.GZ)"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:1
+#: panels/printers/ppd-selection-dialog.ui:10
 msgid "Select Printer Driver"
 msgstr "Valitse tulostinajuri"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:3
-#: ../panels/user-accounts/um-photo-dialog.c:96
+#: panels/printers/ppd-selection-dialog.ui:40
+#: panels/user-accounts/um-photo-dialog.c:96
 msgid "Select"
 msgstr "Valitse"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:4
+#: panels/printers/ppd-selection-dialog.ui:73
 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:539
 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:795
 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:66
+#: panels/printers/pp-ppd-option-widget.c:70
 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:68
+#: panels/printers/pp-ppd-option-widget.c:72
 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:70
+#: panels/printers/pp-ppd-option-widget.c:74
 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:72
 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:74
 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:76
 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:78
 msgid "Reverse portrait"
 msgstr "KÃ¤Ã¤nteinen pysty"
 
 #. Translators: Job's state (job is waiting to be printed)
-#: ../panels/printers/pp-jobs-dialog.c:104
+#: panels/printers/pp-jobs-dialog.c:104
 msgctxt "print job"
 msgid "Pending"
 msgstr "Odottaa"
 
 #. Translators: Job's state (job is held for printing)
-#: ../panels/printers/pp-jobs-dialog.c:108
+#: panels/printers/pp-jobs-dialog.c:108
 msgctxt "print job"
 msgid "Paused"
 msgstr "Keskeytetty"
 
 #. Translators: Job's state (job is currently printing)
-#: ../panels/printers/pp-jobs-dialog.c:112
+#: panels/printers/pp-jobs-dialog.c:112
 msgctxt "print job"
 msgid "Processing"
 msgstr "KÃ¤sitellÃ¤Ã¤n"
 
 #. Translators: Job's state (job has been stopped)
-#: ../panels/printers/pp-jobs-dialog.c:116
+#: panels/printers/pp-jobs-dialog.c:116
 msgctxt "print job"
 msgid "Stopped"
 msgstr "PysÃ¤ytetty"
 
 #. Translators: Job's state (job has been canceled)
-#: ../panels/printers/pp-jobs-dialog.c:120
+#: panels/printers/pp-jobs-dialog.c:120
 msgctxt "print job"
 msgid "Canceled"
 msgstr "Peruttu"
 
 #. Translators: Job's state (job has aborted due to error)
-#: ../panels/printers/pp-jobs-dialog.c:124
+#: panels/printers/pp-jobs-dialog.c:124
 msgctxt "print job"
 msgid "Aborted"
 msgstr "Keskeytetynyt"
 
 #. Translators: Job's state (job has completed successfully)
-#: ../panels/printers/pp-jobs-dialog.c:128
+#: panels/printers/pp-jobs-dialog.c:128
 msgctxt "print job"
 msgid "Completed"
 msgstr "Valmis"
 
 #. Translators: This is the printer name for which we are showing the active jobs
-#: ../panels/printers/pp-jobs-dialog.c:310
+#: panels/printers/pp-jobs-dialog.c:310
 #, c-format
 msgctxt "Printer jobs dialog title"
 msgid "%s â€” Active Jobs"
 msgstr "%s â€” Aktiiviset tyÃ¶t"
 
-#: ../panels/printers/pp-new-printer-dialog.c:402
+#: panels/printers/pp-new-printer-dialog.c:402
 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:406
 #, 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:411
 #, 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:876
+#: panels/printers/pp-new-printer-dialog.c:876
 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:1799
+#: panels/printers/pp-new-printer-dialog.c:1799
 msgid "USB"
 msgstr "USB"
 
 #. Translators: The found device is a printer connected via serial port
-#: ../panels/printers/pp-new-printer-dialog.c:1804
+#: panels/printers/pp-new-printer-dialog.c:1804
 msgid "Serial Port"
 msgstr "Sarjaportti"
 
 #. Translators: The found device is a printer connected via parallel port
-#: ../panels/printers/pp-new-printer-dialog.c:1811
+#: panels/printers/pp-new-printer-dialog.c:1811
 msgid "Parallel Port"
 msgstr "Rinnakkaisportti"
 
 #. Translators: Location of found network printer (e.g. Kitchen, Reception)
-#: ../panels/printers/pp-new-printer-dialog.c:1853
+#: panels/printers/pp-new-printer-dialog.c:1853
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. Translators: Network address of found printer
-#: ../panels/printers/pp-new-printer-dialog.c:1858
+#: panels/printers/pp-new-printer-dialog.c:1858
 #, 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:1887
+#: panels/printers/pp-new-printer-dialog.c:1887
 msgid "Server requires authentication"
 msgstr "Palvelin vaatii tunnistautumisen"
 
-#: ../panels/printers/pp-options-dialog.c:83
+#: panels/printers/pp-options-dialog.c:83
 msgid "Two Sided"
 msgstr "Kaksipuoleinen"
 
-#: ../panels/printers/pp-options-dialog.c:84
+#: panels/printers/pp-options-dialog.c:84
 msgid "Paper Type"
 msgstr "Paperin tyyppi"
 
-#: ../panels/printers/pp-options-dialog.c:85
+#: panels/printers/pp-options-dialog.c:85
 msgid "Paper Source"
 msgstr "Paperin lÃ¤hde"
 
-#: ../panels/printers/pp-options-dialog.c:86
+#: panels/printers/pp-options-dialog.c:86
 msgid "Output Tray"
 msgstr "Ulostulo"
 
-#: ../panels/printers/pp-options-dialog.c:88
+#: 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:534
 msgid "Pages per side"
 msgstr "Sivuja per puoli"
 
 #. Translators: This option sets whether to print on both sides of paper
-#: ../panels/printers/pp-options-dialog.c:546
+#: panels/printers/pp-options-dialog.c:546
 msgid "Two-sided"
 msgstr "Kaksipuoleinen"
 
 #. Translators: "General" tab contains general printer options
-#: ../panels/printers/pp-options-dialog.c:655
+#: panels/printers/pp-options-dialog.c:655
 msgctxt "Printer Option Group"
 msgid "General"
 msgstr "Yleiset"
 
 #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.)
-#: ../panels/printers/pp-options-dialog.c:658
+#: panels/printers/pp-options-dialog.c:658
 msgctxt "Printer Option Group"
 msgid "Page Setup"
 msgstr "Sivun asetukset"
 
 #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, 
duplex unit, etc.)
-#: ../panels/printers/pp-options-dialog.c:661
+#: panels/printers/pp-options-dialog.c:661
 msgctxt "Printer Option Group"
 msgid "Installable Options"
 msgstr "Asennettavat valinnat"
 
 #. Translators: "Job" tab contains settings for jobs
-#: ../panels/printers/pp-options-dialog.c:664
+#: panels/printers/pp-options-dialog.c:664
 msgctxt "Printer Option Group"
 msgid "Job"
 msgstr "TyÃ¶"
 
 #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution)
-#: ../panels/printers/pp-options-dialog.c:667
+#: panels/printers/pp-options-dialog.c:667
 msgctxt "Printer Option Group"
 msgid "Image Quality"
 msgstr "Kuvalaatu"
 
 #. Translators: "Color" tab contains color settings (e.g. color printing)
-#: ../panels/printers/pp-options-dialog.c:670
+#: panels/printers/pp-options-dialog.c:670
 msgctxt "Printer Option Group"
 msgid "Color"
 msgstr "VÃ¤ri"
 
 #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing)
-#: ../panels/printers/pp-options-dialog.c:673
+#: panels/printers/pp-options-dialog.c:673
 msgctxt "Printer Option Group"
 msgid "Finishing"
 msgstr "Viimeistely"
 
 #. Translators: "Advanced" tab contains all others settings
-#: ../panels/printers/pp-options-dialog.c:676
+#: panels/printers/pp-options-dialog.c:676
 msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "LisÃ¤asetukset"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/pp-options-dialog.c:908
+#: panels/printers/pp-options-dialog.c:908
 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:76
+#: panels/printers/pp-ppd-option-widget.c:78
+#: panels/printers/pp-ppd-option-widget.c:86
 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: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
 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:90
 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:92
 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:94
 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:96
 msgid "No pre-filtering"
 msgstr "Ei esisuodatusta"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:233
+#: panels/printers/pp-ppd-selection-dialog.c:233
 msgid "Manufacturer"
 msgstr "Valmistaja"
 
 #. Translators: This is the label of the button that opens the Jobs Dialog.
-#: ../panels/printers/pp-printer-entry.c:585
-#: ../panels/printers/printer-entry.ui.h:8
+#: panels/printers/pp-printer-entry.c:585 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:590
+#: panels/printers/pp-printer-entry.c:590
 #, c-format
 msgid "%u Job"
 msgid_plural "%u Jobs"
@@ -4626,170 +4668,170 @@ msgstr[0] "%u tyÃ¶"
 msgstr[1] "%u tyÃ¶tÃ¤"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/pp-printer-entry.c:739
+#: panels/printers/pp-printer-entry.c:739
 msgid "Low on toner"
 msgstr "Muste on vÃ¤hissÃ¤"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/pp-printer-entry.c:741
+#: panels/printers/pp-printer-entry.c:741
 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:744
+#: panels/printers/pp-printer-entry.c:744
 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:747
+#: panels/printers/pp-printer-entry.c:747
 msgid "Out of developer"
 msgstr "Kehite on loppu"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/pp-printer-entry.c:749
+#: panels/printers/pp-printer-entry.c:749
 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:751
+#: panels/printers/pp-printer-entry.c:751
 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:753
+#: panels/printers/pp-printer-entry.c:753
 msgid "Open cover"
 msgstr "Avaa kansi"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/pp-printer-entry.c:755
+#: panels/printers/pp-printer-entry.c:755
 msgid "Open door"
 msgstr "Avaa ovi"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/pp-printer-entry.c:757
+#: panels/printers/pp-printer-entry.c:757
 msgid "Low on paper"
 msgstr "Paperi vÃ¤hissÃ¤"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/pp-printer-entry.c:759
+#: panels/printers/pp-printer-entry.c:759
 msgid "Out of paper"
 msgstr "Paperi on loppu"
 
 #. Translators: The printer is offline
-#: ../panels/printers/pp-printer-entry.c:761
+#: panels/printers/pp-printer-entry.c:761
 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:763
-#: ../panels/printers/pp-printer-entry.c:893
+#: panels/printers/pp-printer-entry.c:763
+#: panels/printers/pp-printer-entry.c:893
 msgctxt "printer state"
 msgid "Stopped"
 msgstr "PysÃ¤ytetty"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/pp-printer-entry.c:765
+#: panels/printers/pp-printer-entry.c:765
 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:767
+#: panels/printers/pp-printer-entry.c:767
 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:769
+#: panels/printers/pp-printer-entry.c:769
 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:771
+#: panels/printers/pp-printer-entry.c:771
 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:879
+#: panels/printers/pp-printer-entry.c:879
 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:884
+#: panels/printers/pp-printer-entry.c:884
 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:889
+#: panels/printers/pp-printer-entry.c:889
 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:913
+#: panels/printers/pp-printer-entry.c:913
 msgid "Clean print heads"
 msgstr "Puhdista tulostuspÃ¤Ã¤t"
 
-#: ../panels/printers/printer-entry.ui.h:1
+#: panels/printers/printer-entry.ui:14
 msgid "Printing Options"
 msgstr "Tulostusvalinnat"
 
-#: ../panels/printers/printer-entry.ui.h:2
+#: panels/printers/printer-entry.ui:26
 msgid "Printer Details"
 msgstr "Tulostimen tiedot"
 
 #. Set this printer as default
-#: ../panels/printers/printer-entry.ui.h:4
+#: panels/printers/printer-entry.ui:38
 msgid "Use Printer by Default"
 msgstr "KÃ¤ytÃ¤ tulostinta oletuksena"
 
 #. Translators: This button executes command which cleans print heads of the printer.
-#: ../panels/printers/printer-entry.ui.h:6
+#: panels/printers/printer-entry.ui:50
 msgid "Clean Print Heads"
 msgstr "Puhdista tulostuspÃ¤Ã¤t"
 
-#: ../panels/printers/printer-entry.ui.h:7
+#: panels/printers/printer-entry.ui:61
 msgid "Remove Printer"
 msgstr "Poista tulostin"
 
-#: ../panels/printers/printer-entry.ui.h:9
+#: panels/printers/printer-entry.ui:193
 msgid "Model"
 msgstr "Malli"
 
-#: ../panels/printers/printer-entry.ui.h:11
+#: panels/printers/printer-entry.ui:251
 msgid "Ink Level"
 msgstr "Musteen taso"
 
 #. Translators: This is the message which follows the printer error.
-#: ../panels/printers/printer-entry.ui.h:13
+#: panels/printers/printer-entry.ui:312
 msgid "Please restart when the problem is resolved."
 msgstr "KÃ¤ynnistÃ¤ uudelleen kun ongelma on selvitetty."
 
 #. Translators: This is the button which restarts the printer.
-#: ../panels/printers/printer-entry.ui.h:15
+#: panels/printers/printer-entry.ui:319
 msgid "Restart"
 msgstr "KÃ¤ynnistÃ¤ uudelleen"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:2
+#: panels/printers/printers.ui:20
 msgid "Addâ€¦"
 msgstr "LisÃ¤Ã¤â€¦"
 
-#: ../panels/printers/printers.ui.h:5
+#: panels/printers/printers.ui:186
 msgid "No printers"
 msgstr "Ei tulostimia"
 
 #. Translators: This button adds new printer.
-#: ../panels/printers/printers.ui.h:7
+#: panels/printers/printers.ui:200
 msgid "Add a Printerâ€¦"
 msgstr "LisÃ¤Ã¤ tulostinâ€¦"
 
 #. Translators: The CUPS server is not running (we can not connect to it).
-#: ../panels/printers/printers.ui.h:9
+#: panels/printers/printers.ui:232
 msgid ""
 "Sorry! The system printing service\n"
 "doesnâ€™t seem to be available."
@@ -4797,70 +4839,70 @@ msgstr ""
 "Valitettavasti tulostuspalvelu\n"
 "ei vaikuta olevan kÃ¤ytettÃ¤vissÃ¤."
 
-#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24
+#: panels/privacy/cc-privacy-panel.c:387 panels/privacy/privacy.ui:280
 msgid "Screen Lock"
 msgstr "NÃ¤ytÃ¶n lukitus"
 
-#: ../panels/privacy/cc-privacy-panel.c:438
+#: panels/privacy/cc-privacy-panel.c:438
 msgid "In use"
 msgstr "KÃ¤ytÃ¶ssÃ¤"
 
-#: ../panels/privacy/cc-privacy-panel.c:443
+#: panels/privacy/cc-privacy-panel.c:443
 msgctxt "Location services status"
 msgid "On"
 msgstr "PÃ¤Ã¤llÃ¤"
 
-#: ../panels/privacy/cc-privacy-panel.c:444
+#: panels/privacy/cc-privacy-panel.c:444
 msgctxt "Location services status"
 msgid "Off"
 msgstr "Pois"
 
-#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42
+#: panels/privacy/cc-privacy-panel.c:823 panels/privacy/privacy.ui:745
 msgid "Location Services"
 msgstr "Sijaintipalvelut"
 
-#: ../panels/privacy/cc-privacy-panel.c:946 ../panels/privacy/privacy.ui.h:19
+#: panels/privacy/cc-privacy-panel.c:946 panels/privacy/privacy.ui:127
 msgid "Usage & History"
 msgstr "KÃ¤yttÃ¶ ja historia"
 
-#: ../panels/privacy/cc-privacy-panel.c:1075
+#: panels/privacy/cc-privacy-panel.c:1075
 msgid "Empty all items from Trash?"
 msgstr "TyhjennetÃ¤Ã¤nkÃ¶ roskakorin koko sisÃ¤ltÃ¶?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1076
+#: panels/privacy/cc-privacy-panel.c:1076
 msgid "All items in the Trash will be permanently deleted."
 msgstr "Kaikki roskakorissa olevat kohteet poistetaan pysyvÃ¤sti."
 
-#: ../panels/privacy/cc-privacy-panel.c:1077
+#: panels/privacy/cc-privacy-panel.c:1077
 msgid "_Empty Trash"
 msgstr "_TyhjennÃ¤ roskakori"
 
-#: ../panels/privacy/cc-privacy-panel.c:1100
+#: panels/privacy/cc-privacy-panel.c:1100
 msgid "Delete all the temporary files?"
 msgstr "Poistetaanko kaikki vÃ¤liaikaiset tiedostot?"
 
-#: ../panels/privacy/cc-privacy-panel.c:1101
+#: panels/privacy/cc-privacy-panel.c:1101
 msgid "All the temporary files will be permanently deleted."
 msgstr "Kaikki vÃ¤liaikaiset tiedostot poistetaan pysyvÃ¤sti."
 
-#: ../panels/privacy/cc-privacy-panel.c:1102
+#: panels/privacy/cc-privacy-panel.c:1102
 msgid "_Purge Temporary Files"
 msgstr "Tu_hoa vÃ¤liaikaistiedostot"
 
-#: ../panels/privacy/cc-privacy-panel.c:1124 ../panels/privacy/privacy.ui.h:29
+#: panels/privacy/cc-privacy-panel.c:1124 panels/privacy/privacy.ui:432
 msgid "Purge Trash & Temporary Files"
 msgstr "Tuhoa vÃ¤liaikaiset ja roskakorin tiedostot"
 
-#: ../panels/privacy/cc-privacy-panel.c:1164 ../panels/privacy/privacy.ui.h:36
+#: panels/privacy/cc-privacy-panel.c:1164 panels/privacy/privacy.ui:637
 msgid "Software Usage"
 msgstr "Ohjelmistojen kÃ¤yttÃ¶"
 
-#: ../panels/privacy/cc-privacy-panel.c:1205 ../panels/privacy/privacy.ui.h:46
+#: panels/privacy/cc-privacy-panel.c:1205 panels/privacy/privacy.ui:938
 msgid "Problem Reporting"
 msgstr "Vikailmoitukset"
 
 #. translators: '%s' is the distributor's name, such as 'Fedora'
-#: ../panels/privacy/cc-privacy-panel.c:1219
+#: panels/privacy/cc-privacy-panel.c:1219
 #, c-format
 msgid ""
 "Sending reports of technical problems helps us improve %s. Reports are sent "
@@ -4869,22 +4911,26 @@ 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:1231 ../panels/privacy/privacy.ui.h:41
+#: panels/privacy/cc-privacy-panel.c:1231 panels/privacy/privacy.ui:719
 msgid "Privacy Policy"
 msgstr "Tietosuoja"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
-msgid "PriÂvaÂcy"
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:3
+msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3
+#: 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
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:7
+msgid "preferences-system-privacy"
+msgstr "preferences-system-privacy"
+
 #. Translators: those are keywords for the privacy control-center panel
-#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5
+#: panels/privacy/gnome-privacy-panel.desktop.in.in:19
 msgid ""
 "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
 "network;identity;"
@@ -4893,55 +4939,55 @@ msgstr ""
 "network;identity;nÃ¤yttÃ¶;lukitus;diagnostikka;kaatuminen;yksityinen;"
 "viimeisimmÃ¤t;vÃ¤liaikset;nimi;verkko;identiteetti;"
 
-#: ../panels/privacy/privacy.ui.h:1
+#: panels/privacy/privacy.ui:14
 msgid "Screen Turns Off"
 msgstr "NÃ¤yttÃ¶ sammuu"
 
-#: ../panels/privacy/privacy.ui.h:2
+#: panels/privacy/privacy.ui:18
 msgid "30 seconds"
 msgstr "30 sekuntia"
 
-#: ../panels/privacy/privacy.ui.h:9
+#: panels/privacy/privacy.ui:60 panels/privacy/privacy.ui:106
 msgid "1 day"
 msgstr "1 pÃ¤ivÃ¤"
 
-#: ../panels/privacy/privacy.ui.h:10
+#: panels/privacy/privacy.ui:64
 msgid "2 days"
 msgstr "2 pÃ¤ivÃ¤Ã¤"
 
-#: ../panels/privacy/privacy.ui.h:11
+#: panels/privacy/privacy.ui:68
 msgid "3 days"
 msgstr "3 pÃ¤ivÃ¤Ã¤"
 
-#: ../panels/privacy/privacy.ui.h:12
+#: panels/privacy/privacy.ui:72
 msgid "4 days"
 msgstr "4 pÃ¤ivÃ¤Ã¤"
 
-#: ../panels/privacy/privacy.ui.h:13
+#: panels/privacy/privacy.ui:76
 msgid "5 days"
 msgstr "5 pÃ¤ivÃ¤Ã¤"
 
-#: ../panels/privacy/privacy.ui.h:14
+#: panels/privacy/privacy.ui:80
 msgid "6 days"
 msgstr "6 pÃ¤ivÃ¤Ã¤"
 
-#: ../panels/privacy/privacy.ui.h:15
+#: panels/privacy/privacy.ui:84 panels/privacy/privacy.ui:110
 msgid "7 days"
 msgstr "7 pÃ¤ivÃ¤Ã¤"
 
-#: ../panels/privacy/privacy.ui.h:16
+#: panels/privacy/privacy.ui:88
 msgid "14 days"
 msgstr "14 pÃ¤ivÃ¤Ã¤"
 
-#: ../panels/privacy/privacy.ui.h:17
+#: panels/privacy/privacy.ui:92 panels/privacy/privacy.ui:114
 msgid "30 days"
 msgstr "30 pÃ¤ivÃ¤Ã¤"
 
-#: ../panels/privacy/privacy.ui.h:18
+#: panels/privacy/privacy.ui:118
 msgid "Forever"
 msgstr "Aina"
 
-#: ../panels/privacy/privacy.ui.h:20
+#: panels/privacy/privacy.ui:148
 msgid ""
 "Remembering your history makes things easier to find again. These items are "
 "never shared over the network."
@@ -4949,35 +4995,35 @@ msgstr ""
 "Historian muistaminen helpottaa asioiden lÃ¶ytÃ¤mistÃ¤ uudelleen. NÃ¤itÃ¤ tietoja "
 "ei koskaan jaeta verkossa."
 
-#: ../panels/privacy/privacy.ui.h:21
+#: panels/privacy/privacy.ui:176
 msgid "_Recently Used"
 msgstr "_Ã„skettÃ¤in kÃ¤ytetyt"
 
-#: ../panels/privacy/privacy.ui.h:22
+#: panels/privacy/privacy.ui:207
 msgid "Retain _History"
 msgstr "_SÃ¤ilytÃ¤ historia"
 
-#: ../panels/privacy/privacy.ui.h:23
+#: panels/privacy/privacy.ui:247
 msgid "Cl_ear Recent History"
 msgstr "Poista historiatietoja"
 
-#: ../panels/privacy/privacy.ui.h:25
+#: panels/privacy/privacy.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.h:26
+#: panels/privacy/privacy.ui:328
 msgid "Automatic Screen _Lock"
 msgstr "_Automaattinen nÃ¤ytÃ¶n lukitus"
 
-#: ../panels/privacy/privacy.ui.h:27
+#: panels/privacy/privacy.ui:362
 msgid "Lock screen _after blank for"
 msgstr "Lukitse nÃ¤yttÃ¶ kun se on ollut _tyhjÃ¤nÃ¤"
 
-#: ../panels/privacy/privacy.ui.h:28
+#: panels/privacy/privacy.ui:394
 msgid "Show _Notifications"
 msgstr "_NÃ¤ytÃ¤ ilmoitukset"
 
-#: ../panels/privacy/privacy.ui.h:30
+#: panels/privacy/privacy.ui:454
 msgid ""
 "Automatically purge the Trash and temporary files to help keep your computer "
 "free of unnecessary sensitive information."
@@ -4985,27 +5031,27 @@ msgstr ""
 "TyhjennÃ¤ roskakori ja tuhoa vÃ¤liaikaistiedostot automaattisesti, jotta "
 "koneelle ei jÃ¤Ã¤ turhaa yksityistÃ¤ tietoa."
 
-#: ../panels/privacy/privacy.ui.h:31
+#: panels/privacy/privacy.ui:483
 msgid "Automatically empty _Trash"
 msgstr "Tyh_jennÃ¤ roskakori automaattisesti"
 
-#: ../panels/privacy/privacy.ui.h:32
+#: panels/privacy/privacy.ui:515
 msgid "Automatically purge Temporary _Files"
 msgstr "Tuhoa _vÃ¤liaikaistiedostot automaattisesti"
 
-#: ../panels/privacy/privacy.ui.h:33
+#: panels/privacy/privacy.ui:546
 msgid "Purge _After"
 msgstr "TyhjennÃ¤/tuhoa _viiveellÃ¤"
 
-#: ../panels/privacy/privacy.ui.h:34
+#: panels/privacy/privacy.ui:590
 msgid "_Empty Trashâ€¦"
 msgstr "_TyhjennÃ¤ roskakoriâ€¦"
 
-#: ../panels/privacy/privacy.ui.h:35
+#: panels/privacy/privacy.ui:606
 msgid "_Purge Temporary Filesâ€¦"
 msgstr "Tu_hoa vÃ¤liaikaistiedostotâ€¦"
 
-#: ../panels/privacy/privacy.ui.h:37
+#: panels/privacy/privacy.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 "
@@ -5020,11 +5066,11 @@ 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.h:40
+#: panels/privacy/privacy.ui:681
 msgid "_Send software usage statistics"
 msgstr "LÃ¤_hetÃ¤ ohjelmistojen kÃ¤yttÃ¶tilastot"
 
-#: ../panels/privacy/privacy.ui.h:43
+#: panels/privacy/privacy.ui:760
 msgid ""
 "Location services allow applications to know your location. Using Wi-Fi and "
 "mobile broadband increases accuracy."
@@ -5032,300 +5078,302 @@ msgstr ""
 "Sijaintipalvelut mahdollistavat sovellusten paikantaa sijaintisi. Tarkkuus "
 "paranee wifiÃ¤ ja mobiiliyhteyttÃ¤ kÃ¤yttÃ¤en."
 
-#: ../panels/privacy/privacy.ui.h:44
+#: panels/privacy/privacy.ui:807
 msgid "_Location Services"
 msgstr "Sijai_ntipalvelut"
 
-#: ../panels/privacy/privacy.ui.h:47
+#: panels/privacy/privacy.ui:1005
 msgid "_Automatic Problem Reporting"
 msgstr "_Automaattiset vikailmoitukset"
 
-#: ../panels/region/cc-format-chooser.c:118
+#: panels/region/cc-format-chooser.c:118
 msgctxt "measurement format"
 msgid "Imperial"
 msgstr "Imperiaalinen"
 
-#: ../panels/region/cc-format-chooser.c:120
+#: panels/region/cc-format-chooser.c:120
 msgctxt "measurement format"
 msgid "Metric"
 msgstr "Metrinen"
 
-#: ../panels/region/cc-format-chooser.c:285
+#: panels/region/cc-format-chooser.c:285
 msgid "No regions found"
 msgstr "Alueita ei lÃ¶ytynyt"
 
-#: ../panels/region/cc-input-chooser.c:182
+#: panels/region/cc-input-chooser.c:182
 msgid "No input sources found"
 msgstr "SyÃ¶telÃ¤hteitÃ¤ ei lÃ¶ytynyt"
 
-#: ../panels/region/cc-input-chooser.c:1012
+#: panels/region/cc-input-chooser.c:1012
 msgctxt "Input Source"
 msgid "Other"
 msgstr "Muu"
 
-#: ../panels/region/cc-region-panel.c:881
+#: panels/region/cc-region-panel.c:881
 msgid "No input source selected"
 msgstr "SyÃ¶telÃ¤hdettÃ¤ ei valittu"
 
-#: ../panels/region/cc-region-panel.c:1773
+#: panels/region/cc-region-panel.c:1773
 msgid "Login _Screen"
 msgstr "KirjautumisnÃ¤ytt_Ã¶"
 
-#: ../panels/region/format-chooser.ui.h:1
+#: panels/region/format-chooser.ui:7
 msgid "Formats"
 msgstr "Muotoilut"
 
-#: ../panels/region/format-chooser.ui.h:4
+#: panels/region/format-chooser.ui:120
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: ../panels/region/format-chooser.ui.h:5
+#: panels/region/format-chooser.ui:137
 msgid "Dates"
 msgstr "PÃ¤ivÃ¤mÃ¤Ã¤rÃ¤t"
 
-#: ../panels/region/format-chooser.ui.h:6
+#: panels/region/format-chooser.ui:168
 msgid "Times"
 msgstr "Aika"
 
-#: ../panels/region/format-chooser.ui.h:7
+#: panels/region/format-chooser.ui:199
 msgid "Dates & Times"
 msgstr "PÃ¤ivÃ¤ ja aika"
 
-#: ../panels/region/format-chooser.ui.h:8
+#: panels/region/format-chooser.ui:230
 msgid "Numbers"
 msgstr "Numerot"
 
-#: ../panels/region/format-chooser.ui.h:9
+#: panels/region/format-chooser.ui:247
 msgid "Measurement"
 msgstr "Mitat"
 
-#: ../panels/region/format-chooser.ui.h:10
+#: panels/region/format-chooser.ui:264
 msgid "Paper"
 msgstr "Paperi"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
-msgid "ReÂgion & LanÂguage"
+#: panels/region/gnome-region-panel.desktop.in.in:3
+msgid "Region & Language"
 msgstr "Alue ja kielet"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:3
+#: 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/gnome-region-panel.desktop.in.in:6
+msgid "preferences-desktop-locale"
+msgstr "preferences-desktop-locale"
+
 #. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:5
+#: panels/region/gnome-region-panel.desktop.in.in:18
 msgid "Language;Layout;Keyboard;Input;"
 msgstr "Kieli;Asettelu;NÃ¤ppÃ¤imistÃ¶;SyÃ¶te;"
 
-#: ../panels/region/input-chooser.ui.h:1
+#: panels/region/input-chooser.ui:5
 msgid "Add an Input Source"
 msgstr "LisÃ¤Ã¤ syÃ¶telÃ¤hde"
 
-#: ../panels/region/input-chooser.ui.h:4
+#: panels/region/input-chooser.ui:76
 msgid "Input methods canâ€™t be used on the login screen"
 msgstr "SyÃ¶temenetelmiÃ¤ ei voi kÃ¤yttÃ¤Ã¤ kirjautumisruudussa"
 
-#: ../panels/region/input-options.ui.h:1
+#: panels/region/input-options.ui:7
 msgid "Input Source Options"
 msgstr "SyÃ¶telÃ¤hteen asetukset"
 
-#: ../panels/region/input-options.ui.h:2
+#: panels/region/input-options.ui:27
 msgid "Use the _same source for all windows"
 msgstr "KÃ¤ytÃ¤ _samaa lÃ¤hdettÃ¤ kaikille ikkunoille"
 
-#: ../panels/region/input-options.ui.h:3
+#: panels/region/input-options.ui:45
 msgid "Allow _different sources for each window"
 msgstr "Salli _eri lÃ¤hteet yksittÃ¤isille ikkunoille"
 
-#: ../panels/region/input-options.ui.h:5
+#: panels/region/input-options.ui:85
 msgid "Switch to previous source"
 msgstr "Vaihda edelliseen lÃ¤hteeseen"
 
-#: ../panels/region/input-options.ui.h:6
+#: panels/region/input-options.ui:102
 msgid "Super+Shift+Space"
 msgstr "Super+Shift+VÃ¤lilyÃ¶nti"
 
-#: ../panels/region/input-options.ui.h:7
+#: panels/region/input-options.ui:116
 msgid "Switch to next source"
 msgstr "Vaihda seuraavaan lÃ¤hteeseen"
 
-#: ../panels/region/input-options.ui.h:8
+#: panels/region/input-options.ui:133
 msgid "Super+Space"
 msgstr "Super+VÃ¤lilyÃ¶nti"
 
-#: ../panels/region/input-options.ui.h:9
+#: 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.h:10
+#: panels/region/input-options.ui:164
 msgid "Alternative switch to next source"
 msgstr "Vaihtoehtoinen vaihto seuraavaan lÃ¤hteeseen"
 
-#: ../panels/region/input-options.ui.h:11
+#: panels/region/input-options.ui:181
 msgid "Left+Right Alt"
 msgstr "Vasen+Oikea Alt"
 
-#: ../panels/region/region.ui.h:1
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11
+#: panels/region/region.ui:67
+#: panels/user-accounts/data/user-accounts-dialog.ui:343
 msgid "_Language"
 msgstr "_Kieli"
 
-#: ../panels/region/region.ui.h:2
+#: panels/region/region.ui:85
 msgid "English (United Kingdom)"
 msgstr "Englanti (Yhdistynyt kuningaskunta)"
 
-#: ../panels/region/region.ui.h:3
+#: panels/region/region.ui:112
 msgid "Restart the session for changes to take effect"
 msgstr "KÃ¤ynnistÃ¤ istunto uudelleen, jotta muutokset tulevat voimaan"
 
-#: ../panels/region/region.ui.h:4
+#: panels/region/region.ui:134
 msgid "Restartâ€¦"
 msgstr "KÃ¤ynnistÃ¤ uudelleenâ€¦"
 
-#: ../panels/region/region.ui.h:5
+#: panels/region/region.ui:169
 msgid "_Formats"
 msgstr "_Muotoilut"
 
-#: ../panels/region/region.ui.h:6
+#: panels/region/region.ui:187
 msgid "United Kingdom"
 msgstr "Yhdistynyt kuningaskunta"
 
-#: ../panels/region/region.ui.h:7
+#: panels/region/region.ui:229
 msgid "Input Sources"
 msgstr "SyÃ¶telÃ¤hteet"
 
-#: ../panels/region/region.ui.h:8
+#: panels/region/region.ui:245
 msgid "_Options"
 msgstr "_Valinnat"
 
-#: ../panels/region/region.ui.h:9
+#: panels/region/region.ui:311
 msgid "Add input source"
 msgstr "LisÃ¤Ã¤ syÃ¶telÃ¤hde"
 
-#: ../panels/region/region.ui.h:10
+#: panels/region/region.ui:336
 msgid "Remove input source"
 msgstr "Poista syÃ¶telÃ¤hde"
 
-#: ../panels/region/region.ui.h:11
+#: panels/region/region.ui:386
 msgid "Move input source up"
 msgstr "SiirrÃ¤ syÃ¶telÃ¤hde ylÃ¶s"
 
-#: ../panels/region/region.ui.h:12
+#: panels/region/region.ui:411
 msgid "Move input source down"
 msgstr "SiirrÃ¤ syÃ¶telÃ¤hde alas"
 
-#: ../panels/region/region.ui.h:13
+#: panels/region/region.ui:461
 msgid "Configure input source"
 msgstr "Muokkaa syÃ¶telÃ¤hdettÃ¤"
 
-#: ../panels/region/region.ui.h:14
+#: panels/region/region.ui:486
 msgid "Show input source keyboard layout"
 msgstr "NÃ¤ytÃ¤ syÃ¶telÃ¤hteenÃ¤ olevan nÃ¤ppÃ¤imistÃ¶n asettelu"
 
-#: ../panels/region/region.ui.h:15
+#: panels/region/region.ui:530
 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/search/cc-search-locations-dialog.c:639
+#: panels/search/cc-search-locations-dialog.c:639
 msgid "Select Location"
 msgstr "Valitse sijainti"
 
-#: ../panels/search/cc-search-locations-dialog.c:643
+#: panels/search/cc-search-locations-dialog.c:643
 msgid "_OK"
 msgstr "_OK"
 
-#: ../panels/search/cc-search-panel.c:178
+#: panels/search/cc-search-panel.c:178
 msgid "No applications found"
 msgstr "Sovelluksia ei lÃ¶ytynyt"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
-msgid "Search"
-msgstr "Haku"
-
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:3
+#: 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/gnome-search-panel.desktop.in.in:6
+msgid "preferences-system-search"
+msgstr "preferences-system-search"
+
 #. Translators: those are keywords for the search control-center panel
-#: ../panels/search/gnome-search-panel.desktop.in.in.h:5
+#: panels/search/gnome-search-panel.desktop.in.in:18
 msgid "Search;Find;Index;Hide;Privacy;Results;"
 msgstr ""
 "Search;Find;Index;Hide;Privacy;Results;Haku;Etsi;Indeksi;Piilota;Yksityisyys;"
 "Tulokset;Hakutulokset;"
 
-#: ../panels/search/search-locations-dialog.ui.h:1
+#: panels/search/search-locations-dialog.ui:9
 msgid "Search Locations"
 msgstr "Hakukohteet"
 
-#: ../panels/search/search-locations-dialog.ui.h:2
+#: panels/search/search-locations-dialog.ui:43
 msgid "Places"
 msgstr "Sijainnit"
 
-#: ../panels/search/search-locations-dialog.ui.h:3
+#: panels/search/search-locations-dialog.ui:73
 msgid "Bookmarks"
 msgstr "Kirjanmerkit"
 
-#: ../panels/search/search-locations-dialog.ui.h:4
+#: panels/search/search-locations-dialog.ui:130
 msgid "Other"
 msgstr "Muu"
 
-#: ../panels/search/search.ui.h:1
+#: panels/search/search.ui:66
 msgid "Move Up"
 msgstr "SiirrÃ¤ _ylÃ¶s"
 
-#: ../panels/search/search.ui.h:2
+#: panels/search/search.ui:83
 msgid "Move Down"
 msgstr "SiirrÃ¤ _alas"
 
-#: ../panels/search/search.ui.h:3
+#: panels/search/search.ui:119
 msgid "Preferences"
 msgstr "Asetukset"
 
 #. Label
-#: ../panels/sharing/cc-sharing-networks.c:303
+#: panels/sharing/cc-sharing-networks.c:305
 msgid "No networks selected for sharing"
 msgstr "Ei verkkoja valittu jakamista varten"
 
-#: ../panels/sharing/cc-sharing-panel.c:273
+#: panels/sharing/cc-sharing-panel.c:275
 msgctxt "service is enabled"
 msgid "On"
 msgstr "PÃ¤Ã¤llÃ¤"
 
-#: ../panels/sharing/cc-sharing-panel.c:275
-#: ../panels/sharing/cc-sharing-panel.c:302
+#: panels/sharing/cc-sharing-panel.c:277 panels/sharing/cc-sharing-panel.c:304
 msgctxt "service is disabled"
 msgid "Off"
 msgstr "Pois"
 
-#: ../panels/sharing/cc-sharing-panel.c:305
+#: panels/sharing/cc-sharing-panel.c:307
 msgctxt "service is enabled"
 msgid "Enabled"
 msgstr "KÃ¤ytÃ¶ssÃ¤"
 
-#: ../panels/sharing/cc-sharing-panel.c:308
+#: panels/sharing/cc-sharing-panel.c:310
 msgctxt "service is active"
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: ../panels/sharing/cc-sharing-panel.c:379
+#: panels/sharing/cc-sharing-panel.c:381
 msgid "Choose a Folder"
 msgstr "Valitse kansio"
 
-#: ../panels/sharing/cc-sharing-panel.c:690
+#: panels/sharing/cc-sharing-panel.c:693
 #, c-format
 msgid ""
-"Personal File Sharing allows you to share your Public folder with others on "
-"your current network using: <a href=\"dav://%s\">dav://%s</a>"
+"File Sharing allows you to share your Public folder with others on your "
+"current network using: <a href=\"dav://%s\">dav://%s</a>"
 msgstr ""
-"HenkilÃ¶kohtaisen tiedostonjaon avulla voit jakaa julkisen kansiosi verkon "
-"muiden kÃ¤yttÃ¤jien kanssa kÃ¤yttÃ¤en osoitetta <a href=\"dav://%s\">dav://%s</a>"
+"HenkilÃ¶kohtaisen tiedostonjaon avulla voit jakaa julkisen kansiosi sisÃ¤llÃ¶n "
+"verkon muiden kÃ¤yttÃ¤jien kanssa kÃ¤yttÃ¤en osoitetta <a href=\"dav://%s"
+"\">dav://%s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:692
+#: panels/sharing/cc-sharing-panel.c:695
 #, c-format
 msgid ""
 "When remote login is enabled, remote users can connect using the Secure "
@@ -5336,7 +5384,7 @@ msgstr ""
 "Secure Shell -komentoa:\n"
 "<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/sharing/cc-sharing-panel.c:694
+#: panels/sharing/cc-sharing-panel.c:697
 #, c-format
 msgid ""
 "Screen sharing allows remote users to view or control your screen by "
@@ -5345,25 +5393,25 @@ 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:806
+#: panels/sharing/cc-sharing-panel.c:809
 msgid "Copy"
 msgstr "Kopioi"
 
-#: ../panels/sharing/cc-sharing-panel.c:1233
+#: panels/sharing/cc-sharing-panel.c:1236
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:3
 msgid "Sharing"
 msgstr "Jakaminen"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
-msgid "ShaÂring"
-msgstr "Jakaminen"
-
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3
+#: 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"
 
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:6
+msgid "preferences-system-sharing"
+msgstr "preferences-system-sharing"
+
 #. Translators: those are keywords for the sharing control-center panel
-#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5
+#: panels/sharing/gnome-sharing-panel.desktop.in.in:15
 msgid ""
 "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;"
 "movies;server;renderer;"
@@ -5371,104 +5419,108 @@ 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.h:1
+#: panels/sharing/networks.ui:19
 msgid "Networks"
 msgstr "Verkot"
 
-#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
+#: 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.h:2
+#: 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.h:1
+#: panels/sharing/sharing.ui:46
 msgid "_Computer Name"
 msgstr "Ti_etokoneen nimi"
 
-#: ../panels/sharing/sharing.ui.h:2
+#: panels/sharing/sharing.ui:104
 msgid "_File Sharing"
 msgstr "_Tiedostonjako"
 
-#: ../panels/sharing/sharing.ui.h:3
+#: panels/sharing/sharing.ui:147
 msgid "_Screen Sharing"
 msgstr "_NÃ¤ytÃ¶n jakaminen"
 
-#: ../panels/sharing/sharing.ui.h:4
+#: panels/sharing/sharing.ui:190
 msgid "_Media Sharing"
 msgstr "_Mediajako"
 
-#: ../panels/sharing/sharing.ui.h:5
+#: panels/sharing/sharing.ui:233
 msgid "_Remote Login"
 msgstr "_EtÃ¤kirjautuminen"
 
-#: ../panels/sharing/sharing.ui.h:6
+#: panels/sharing/sharing.ui:272
 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.h:7
+#: panels/sharing/sharing.ui:286 panels/sharing/sharing.ui:413
 msgid "File Sharing"
 msgstr "Tiedostojako"
 
-#: ../panels/sharing/sharing.ui.h:8
+#: panels/sharing/sharing.ui:333
 msgid "_Require Password"
 msgstr "Vaa_di salasana"
 
-#: ../panels/sharing/sharing.ui.h:10
+#: panels/sharing/sharing.ui:424 panels/sharing/sharing.ui:496
 msgid "Remote Login"
 msgstr "EtÃ¤kirjautuminen"
 
-#: ../panels/sharing/sharing.ui.h:11
+#: panels/sharing/sharing.ui:519 panels/sharing/sharing.ui:765
 msgid "Screen Sharing"
 msgstr "NÃ¤ytÃ¶n jakaminen"
 
-#: ../panels/sharing/sharing.ui.h:12
+#: panels/sharing/sharing.ui:577
 msgid "_Allow connections to control the screen"
 msgstr "Sa_lli yhteydet nÃ¤ytÃ¶n hallintaan"
 
-#: ../panels/sharing/sharing.ui.h:13
+#: panels/sharing/sharing.ui:622
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../panels/sharing/sharing.ui.h:14
+#: panels/sharing/sharing.ui:652
 msgid "_Show Password"
 msgstr "_NÃ¤ytÃ¤ salasana"
 
-#: ../panels/sharing/sharing.ui.h:15
+#: panels/sharing/sharing.ui:683
 msgid "Access Options"
 msgstr "KÃ¤yttÃ¶valinnat"
 
-#: ../panels/sharing/sharing.ui.h:16
+#: panels/sharing/sharing.ui:697
 msgid "_New connections must ask for access"
 msgstr "Uusien yhteyksien tulee ky_syÃ¤ lupa"
 
-#: ../panels/sharing/sharing.ui.h:17
+#: panels/sharing/sharing.ui:715
 msgid "_Require a password"
 msgstr "_Vaadi salasana"
 
-#: ../panels/sharing/sharing.ui.h:18
+#: panels/sharing/sharing.ui:776 panels/sharing/sharing.ui:870
 msgid "Media Sharing"
 msgstr "Mediajako"
 
-#: ../panels/sharing/sharing.ui.h:19
+#: panels/sharing/sharing.ui:809
 msgid "Share music, photos and videos over the network."
 msgstr "Jaa musiikkia, kuvia ja videoita verkon kautta."
 
-#: ../panels/sharing/sharing.ui.h:20
+#: panels/sharing/sharing.ui:824
 msgid "Folders"
 msgstr "Kansiot"
 
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:3
 msgid "Sound"
 msgstr "Ã„Ã¤ni"
 
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
+#: 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/sound/data/gnome-sound-panel.desktop.in.in:6
+msgid "multimedia-volume-control"
+msgstr "multimedia-volume-control"
+
 #. Translators: those are keywords for the sound control-center panel
-#: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
+#: panels/sound/data/gnome-sound-panel.desktop.in.in:19
 msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;"
 msgstr ""
 "Kortti;mikrofoni;Ã¤Ã¤nenvoimakkuus;hÃ¤ivytys;tasapaino;Bluetooth;kuulokkeet;"
@@ -5476,259 +5528,235 @@ msgstr ""
 
 #. 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.h:3
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:6
 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.h:6
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:12
 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.h:9
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:18
 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.h:12
+#: panels/sound/data/sounds/gnome-sounds-default.xml.in.in:24
 msgid "Sonar"
 msgstr "Kaikuluotain"
 
-#: ../panels/sound/gvc-balance-bar.c:105
+#: panels/sound/gvc-balance-bar.c:104
 msgctxt "balance"
 msgid "Left"
 msgstr "Vasen"
 
-#: ../panels/sound/gvc-balance-bar.c:106
+#: panels/sound/gvc-balance-bar.c:105
 msgctxt "balance"
 msgid "Right"
 msgstr "Oikea"
 
-#: ../panels/sound/gvc-balance-bar.c:109
+#: panels/sound/gvc-balance-bar.c:108
 msgctxt "balance"
 msgid "Rear"
 msgstr "Taka"
 
-#: ../panels/sound/gvc-balance-bar.c:110
+#: panels/sound/gvc-balance-bar.c:109
 msgctxt "balance"
 msgid "Front"
 msgstr "Etu"
 
-#: ../panels/sound/gvc-balance-bar.c:113
+#: panels/sound/gvc-balance-bar.c:112
 msgctxt "balance"
 msgid "Minimum"
 msgstr "Minimi"
 
-#: ../panels/sound/gvc-balance-bar.c:114
+#: panels/sound/gvc-balance-bar.c:113
 msgctxt "balance"
 msgid "Maximum"
 msgstr "Maksimi"
 
-#: ../panels/sound/gvc-balance-bar.c:289
+#: panels/sound/gvc-balance-bar.c:288
 msgid "_Balance:"
 msgstr "_Tasapaino:"
 
-#: ../panels/sound/gvc-balance-bar.c:292
+#: panels/sound/gvc-balance-bar.c:291
 msgid "_Fade:"
 msgstr "_HÃ¤ivytys:"
 
-#: ../panels/sound/gvc-balance-bar.c:295
+#: panels/sound/gvc-balance-bar.c:294
 msgid "_Subwoofer:"
 msgstr "_Subwoofer:"
 
-#: ../panels/sound/gvc-channel-bar.c:611 ../panels/sound/gvc-channel-bar.c:620
+#: 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:615
+#: 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:249
-#: ../panels/sound/gvc-mixer-dialog.c:515
+#: 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:"
 
-#. translators:
-#. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1873
-#, c-format
-msgid "%u Output"
-msgid_plural "%u Outputs"
-msgstr[0] "%u ulostulo"
-msgstr[1] "%u ulostuloa"
-
-#. translators:
-#. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc/gvc-mixer-control.c:1883
-#, c-format
-msgid "%u Input"
-msgid_plural "%u Inputs"
-msgstr[0] "%u sisÃ¤Ã¤ntulo"
-msgstr[1] "%u sisÃ¤Ã¤ntuloa"
-
-#: ../panels/sound/gvc/gvc-mixer-control.c:2738
-msgid "System Sounds"
-msgstr "JÃ¤rjestelmÃ¤n Ã¤Ã¤net"
-
-#: ../panels/sound/gvc-mixer-dialog.c:251
+#: panels/sound/gvc-mixer-dialog.c:255
 msgid "_Test Speakers"
 msgstr "_Testaa kaiuttimia"
 
-#: ../panels/sound/gvc-mixer-dialog.c:420
+#: panels/sound/gvc-mixer-dialog.c:424
 msgid "Peak detect"
 msgstr "Havaitse piikit"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1518
+#: panels/sound/gvc-mixer-dialog.c:1499
 msgid "Device"
 msgstr "Laite"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1581
+#: panels/sound/gvc-mixer-dialog.c:1562
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "Kaiutintesti: %s"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1637
+#: panels/sound/gvc-mixer-dialog.c:1617
 msgid "_Output volume:"
 msgstr "_Toistovoimakkuus:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1651
+#: panels/sound/gvc-mixer-dialog.c:1631
 msgid "Output"
 msgstr "Ulostulo"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1656
+#: panels/sound/gvc-mixer-dialog.c:1636
 msgid "C_hoose a device for sound output:"
 msgstr "_Valitse laite Ã¤Ã¤nen toistamiseksi:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1678
+#: panels/sound/gvc-mixer-dialog.c:1658
 msgid "Settings for the selected device:"
 msgstr "Valitun laitteen asetukset:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1689
+#: panels/sound/gvc-mixer-dialog.c:1669
 msgid "Input"
 msgstr "SisÃ¤Ã¤ntulo"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1696
+#: panels/sound/gvc-mixer-dialog.c:1676
 msgid "_Input volume:"
 msgstr "_Ã„Ã¤nitysvoimakkuus:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1717
+#: panels/sound/gvc-mixer-dialog.c:1697
 msgid "Input level:"
 msgstr "Ã„Ã¤nitystaso:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1743
+#: panels/sound/gvc-mixer-dialog.c:1723
 msgid "C_hoose a device for sound input:"
 msgstr "_Valitse laite Ã¤Ã¤nen tallentamiseksi:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1767
+#: panels/sound/gvc-mixer-dialog.c:1747
 msgid "Sound Effects"
 msgstr "Ã„Ã¤nitehosteet"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1774
+#: panels/sound/gvc-mixer-dialog.c:1754
 msgid "_Alert volume:"
 msgstr "_HÃ¤lytysten voimakkuus:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1791
+#: 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/gvc-sound-theme-chooser.c:188
+#: panels/sound/gvc-sound-theme-chooser.c:187
 msgid "Built-in"
 msgstr "SisÃ¤Ã¤nrakennettu"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:454
-#: ../panels/sound/gvc-sound-theme-chooser.c:466
-#: ../panels/sound/gvc-sound-theme-chooser.c:478
+#: 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/gvc-sound-theme-chooser.c:457
-#: ../panels/sound/gvc-sound-theme-chooser.c:468
-#: ../panels/sound/gvc-sound-theme-chooser.c:480
+#: 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/gvc-sound-theme-chooser.c:554
-#: ../panels/wacom/wacom-stylus-page.ui.h:1
+#: panels/sound/gvc-sound-theme-chooser.c:544
+#: panels/wacom/wacom-stylus-page.ui:25
 msgid "Default"
 msgstr "Oletus"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:555
+#: panels/sound/gvc-sound-theme-chooser.c:545
 msgid "From theme"
 msgstr "Teemasta"
 
-#: ../panels/sound/gvc-sound-theme-chooser.c:740
+#: panels/sound/gvc-sound-theme-chooser.c:720
 msgid "C_hoose an alert sound:"
 msgstr "_Valitse hÃ¤lytysÃ¤Ã¤ni:"
 
-#: ../panels/sound/gvc-speaker-test.c:231
+#: panels/sound/gvc-speaker-test.c:229
 msgid "Stop"
 msgstr "PysÃ¤ytÃ¤"
 
-#: ../panels/sound/gvc-speaker-test.c:231
-#: ../panels/sound/gvc-speaker-test.c:343
+#: panels/sound/gvc-speaker-test.c:229 panels/sound/gvc-speaker-test.c:341
 msgid "Test"
 msgstr "Testaa"
 
-#: ../panels/sound/gvc-speaker-test.c:239
+#: panels/sound/gvc-speaker-test.c:237
 msgid "Subwoofer"
 msgstr "Subwoofer"
 
-#: ../panels/sound/sound-theme-file-utils.c:304
+#: panels/sound/sound-theme-file-utils.c:288
 msgid "Custom"
 msgstr "Oma"
 
 #. translators: the labels will read:
 #. * Cursor Size: Default
-#: ../panels/universal-access/cc-ua-panel.c:351
+#: panels/universal-access/cc-ua-panel.c:351
 msgctxt "cursor size"
 msgid "Default"
 msgstr "Oletus"
 
-#: ../panels/universal-access/cc-ua-panel.c:354
+#: panels/universal-access/cc-ua-panel.c:354
 msgctxt "cursor size"
 msgid "Medium"
 msgstr "Keskikoko"
 
-#: ../panels/universal-access/cc-ua-panel.c:357
+#: panels/universal-access/cc-ua-panel.c:357
 msgctxt "cursor size"
 msgid "Large"
 msgstr "Suuri"
 
-#: ../panels/universal-access/cc-ua-panel.c:360
+#: panels/universal-access/cc-ua-panel.c:360
 msgctxt "cursor size"
 msgid "Larger"
 msgstr "Suurempi"
 
-#: ../panels/universal-access/cc-ua-panel.c:363
+#: panels/universal-access/cc-ua-panel.c:363
 msgctxt "cursor size"
 msgid "Largest"
 msgstr "Suurin"
 
-#: ../panels/universal-access/cc-ua-panel.c:367
+#: panels/universal-access/cc-ua-panel.c:367
 #, c-format
 msgid "%d pixel"
 msgid_plural "%d pixels"
 msgstr[0] "%d pikseli"
 msgstr[1] "%d pikseliÃ¤"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-msgid "UniÂverÂsal Access"
-msgstr "EsteettÃ¶myys"
-
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3
+#: 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Ã¶Ã¤"
 
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:6
+msgid "preferences-desktop-accessibility"
+msgstr "preferences-desktop-accessibility"
+
 #. Translators: those are keywords for the universal access control-center panel
-#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5
+#: panels/universal-access/gnome-universal-access-panel.desktop.in.in:18
 msgid ""
 "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;"
 "AccessX;Sticky;Keys;Slow;Bounce;Mouse;Double;click;Delay;Assist;Repeat;Blink;"
@@ -5740,531 +5768,533 @@ msgstr ""
 "nÃ¤ppÃ¤imet;Hitaat nÃ¤ppÃ¤imet;KimmonÃ¤ppÃ¤imet;Hiiren painikkeet;kaksois;viive;"
 "vilkkuminen;"
 
-#: ../panels/universal-access/uap.ui.h:1
+#: panels/universal-access/uap.ui:89
 msgid "_Always Show Universal Access Menu"
 msgstr "_NÃ¤ytÃ¤ esteettÃ¶myysvalikko aina"
 
-#: ../panels/universal-access/uap.ui.h:2
+#: panels/universal-access/uap.ui:131
 msgid "Seeing"
 msgstr "NÃ¤keminen"
 
-#: ../panels/universal-access/uap.ui.h:3
+#: panels/universal-access/uap.ui:177
 msgid "_High Contrast"
 msgstr "_Suuri kontrasti"
 
-#: ../panels/universal-access/uap.ui.h:4
+#: panels/universal-access/uap.ui:224
 msgid "_Large Text"
 msgstr "Suuri _teksti"
 
-#: ../panels/universal-access/uap.ui.h:5
+#: panels/universal-access/uap.ui:269
 msgid "C_ursor Size"
 msgstr "Ko_hdistimen koko"
 
-#: ../panels/universal-access/uap.ui.h:6
-#: ../panels/universal-access/zoom-options.ui.h:7
+#: panels/universal-access/uap.ui:316
+#: panels/universal-access/zoom-options.ui:98
 msgid "_Zoom"
 msgstr "S_uurennus"
 
-#: ../panels/universal-access/uap.ui.h:8
+#: panels/universal-access/uap.ui:362
 msgid "Screen _Reader"
 msgstr "_NÃ¤ytÃ¶nlukija"
 
-#: ../panels/universal-access/uap.ui.h:9
+#: panels/universal-access/uap.ui:408 panels/universal-access/uap.ui:1237
 msgid "_Sound Keys"
 msgstr "_Ã„Ã¤nekkÃ¤Ã¤t nÃ¤ppÃ¤imet"
 
-#: ../panels/universal-access/uap.ui.h:10
+#: panels/universal-access/uap.ui:470
 msgid "Hearing"
 msgstr "Kuuleminen"
 
-#: ../panels/universal-access/uap.ui.h:11
+#: panels/universal-access/uap.ui:514 panels/universal-access/uap.ui:1340
 msgid "_Visual Alerts"
 msgstr "_Visuaaliset hÃ¤lytykset"
 
-#: ../panels/universal-access/uap.ui.h:13
+#: panels/universal-access/uap.ui:622
 msgid "Screen _Keyboard"
 msgstr "N_Ã¤ppÃ¤imistÃ¶ nÃ¤ytÃ¶llÃ¤"
 
-#: ../panels/universal-access/uap.ui.h:14
+#: panels/universal-access/uap.ui:667
 msgid "R_epeat Keys"
 msgstr "Toist_onÃ¤ppÃ¤imet"
 
-#: ../panels/universal-access/uap.ui.h:15
+#: panels/universal-access/uap.ui:713
 msgid "Cursor _Blinking"
 msgstr "Kohdistimen _vilkunta"
 
-#: ../panels/universal-access/uap.ui.h:16
+#: panels/universal-access/uap.ui:759
 msgid "_Typing Assist (AccessX)"
 msgstr "_Kirjoitusapu (AccessX)"
 
-#: ../panels/universal-access/uap.ui.h:17
+#: panels/universal-access/uap.ui:820
 msgid "Pointing & Clicking"
 msgstr "Kohdistaminen ja napsauttaminen"
 
-#: ../panels/universal-access/uap.ui.h:18
+#: panels/universal-access/uap.ui:866
 msgid "_Mouse Keys"
 msgstr "_HiirinÃ¤ppÃ¤imet"
 
-#: ../panels/universal-access/uap.ui.h:19
+#: panels/universal-access/uap.ui:911
 msgid "_Click Assist"
 msgstr "N_apsautusapu"
 
-#: ../panels/universal-access/uap.ui.h:20
+#: panels/universal-access/uap.ui:957
 msgid "_Double-Click Delay"
 msgstr "Kaksoisnapsautuksen _viive"
 
-#: ../panels/universal-access/uap.ui.h:21
+#: panels/universal-access/uap.ui:977
 msgid "Double-Click Delay"
 msgstr "Kaksoisnapsautuksen viive"
 
-#: ../panels/universal-access/uap.ui.h:22
+#: panels/universal-access/uap.ui:1042
 msgid "Cursor Size"
 msgstr "Kohdistimen koko"
 
-#: ../panels/universal-access/uap.ui.h:23
+#: panels/universal-access/uap.ui:1069
 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.h:24
+#: panels/universal-access/uap.ui:1105
 msgid "Screen Reader"
 msgstr "NÃ¤ytÃ¶nlukija"
 
-#: ../panels/universal-access/uap.ui.h:25
+#: panels/universal-access/uap.ui:1122
 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.h:26
+#: panels/universal-access/uap.ui:1155
 msgid "_Screen Reader"
 msgstr "_NÃ¤ytÃ¶nlukija"
 
-#: ../panels/universal-access/uap.ui.h:27
+#: panels/universal-access/uap.ui:1194
 msgid "Sound Keys"
 msgstr "_Ã„Ã¤nekkÃ¤Ã¤t nÃ¤ppÃ¤imet"
 
-#: ../panels/universal-access/uap.ui.h:28
+#: panels/universal-access/uap.ui:1212
 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.h:29
+#: panels/universal-access/uap.ui:1282
 msgid "Visual Alerts"
 msgstr "Visuaaliset hÃ¤lytykset"
 
-#: ../panels/universal-access/uap.ui.h:30
+#: panels/universal-access/uap.ui:1286
 msgid "_Test flash"
 msgstr "_Testaa vÃ¤lÃ¤hdystÃ¤"
 
-#: ../panels/universal-access/uap.ui.h:31
+#: panels/universal-access/uap.ui:1315
 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.h:32
+#: panels/universal-access/uap.ui:1366
 msgid "Flash the _window title"
 msgstr "VÃ¤lÃ¤ytÃ¤ _ikkunan reunusta"
 
-#: ../panels/universal-access/uap.ui.h:33
+#: panels/universal-access/uap.ui:1384
 msgid "Flash the entire _screen"
 msgstr "VÃ¤lÃ¤ytÃ¤ _koko nÃ¤yttÃ¶Ã¤"
 
-#: ../panels/universal-access/uap.ui.h:34
+#: panels/universal-access/uap.ui:1429
 msgid "Repeat Keys"
 msgstr "ToistonÃ¤ppÃ¤imet"
 
-#: ../panels/universal-access/uap.ui.h:35
+#: panels/universal-access/uap.ui:1459
 msgid "Key presses repeat when key is held down."
 msgstr "Painallus toistuu, kun nÃ¤ppÃ¤intÃ¤ pidetÃ¤Ã¤n painettuna."
 
-#: ../panels/universal-access/uap.ui.h:37
+#: panels/universal-access/uap.ui:1538
 msgid "Repeat keys delay"
 msgstr "NÃ¤ppÃ¤inten toiston viive"
 
-#: ../panels/universal-access/uap.ui.h:38
+#: panels/universal-access/uap.ui:1586 panels/universal-access/uap.ui:1719
 msgid "Speed"
 msgstr "Nopeus"
 
-#: ../panels/universal-access/uap.ui.h:39
+#: panels/universal-access/uap.ui:1623
 msgid "Repeat keys speed"
 msgstr "NÃ¤ppÃ¤inten toiston nopeus"
 
-#: ../panels/universal-access/uap.ui.h:40
+#: panels/universal-access/uap.ui:1647
 msgid "Cursor Blinking"
 msgstr "Kohdistimen vilkunta"
 
-#: ../panels/universal-access/uap.ui.h:41
+#: panels/universal-access/uap.ui:1677
 msgid "Cursor blinks in text fields."
 msgstr "Kohdistin vilkkuu tekstikentissÃ¤."
 
-#: ../panels/universal-access/uap.ui.h:42
+#: panels/universal-access/uap.ui:1756
 msgid "Cursor blinking speed"
 msgstr "Kohdistimen vilkkumisnopeus"
 
-#: ../panels/universal-access/uap.ui.h:43
+#: panels/universal-access/uap.ui:1792
 msgid "Typing Assist"
 msgstr "Kirjoitusapu"
 
-#: ../panels/universal-access/uap.ui.h:44
+#: panels/universal-access/uap.ui:1831
 msgid "_Sticky Keys"
 msgstr "_Pohjaan jÃ¤Ã¤vÃ¤t nÃ¤ppÃ¤imet"
 
-#: ../panels/universal-access/uap.ui.h:45
+#: panels/universal-access/uap.ui:1848
 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.h:46
+#: panels/universal-access/uap.ui:1872
 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.h:47
+#: panels/universal-access/uap.ui:1890
 msgid "Beep when a _modifier key is pressed"
 msgstr "Soita Ã¤Ã¤nimerkki, kun _mÃ¤Ã¤ritenÃ¤ppÃ¤intÃ¤ painetaan"
 
-#: ../panels/universal-access/uap.ui.h:48
+#: panels/universal-access/uap.ui:1938
 msgid "S_low Keys"
 msgstr "_Hitaat nÃ¤ppÃ¤imet"
 
-#: ../panels/universal-access/uap.ui.h:49
+#: panels/universal-access/uap.ui:1955
 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.h:50
+#: panels/universal-access/uap.ui:1988 panels/universal-access/uap.ui:2201
+#: panels/universal-access/uap.ui:2538
 msgid "A_cceptance delay:"
 msgstr "V_iiveen kesto:"
 
-#: ../panels/universal-access/uap.ui.h:51
+#: panels/universal-access/uap.ui:2010
 msgctxt "slow keys delay"
 msgid "Short"
 msgstr "Lyhyt"
 
-#: ../panels/universal-access/uap.ui.h:52
+#: panels/universal-access/uap.ui:2029
 msgid "Slow keys typing delay"
 msgstr "Hitaiden nÃ¤ppÃ¤inten kirjoitusviive"
 
-#: ../panels/universal-access/uap.ui.h:53
+#: panels/universal-access/uap.ui:2044
 msgctxt "slow keys delay"
 msgid "Long"
 msgstr "PitkÃ¤"
 
-#: ../panels/universal-access/uap.ui.h:54
+#: panels/universal-access/uap.ui:2071
 msgid "Beep when a key is pr_essed"
 msgstr "Soita Ã¤Ã¤nimerkki, kun nÃ¤ppÃ¤intÃ¤ _painetaan"
 
-#: ../panels/universal-access/uap.ui.h:55
+#: panels/universal-access/uap.ui:2088
 msgid "Beep when a key is _accepted"
 msgstr "Soita Ã¤Ã¤nimerkki, kun nÃ¤ppÃ¤inpainallus _hyvÃ¤ksytÃ¤Ã¤n"
 
-#: ../panels/universal-access/uap.ui.h:56
+#: panels/universal-access/uap.ui:2105 panels/universal-access/uap.ui:2284
 msgid "Beep when a key is _rejected"
 msgstr "Soita Ã¤Ã¤nimerkki, kun nÃ¤ppÃ¤inpainallusta _ei hyvÃ¤ksytty"
 
-#: ../panels/universal-access/uap.ui.h:57
+#: panels/universal-access/uap.ui:2151
 msgid "_Bounce Keys"
 msgstr "_KimmonÃ¤ppÃ¤imet"
 
-#: ../panels/universal-access/uap.ui.h:58
+#: panels/universal-access/uap.ui:2168
 msgid "Ignores fast duplicate keypresses"
 msgstr "Ã„lÃ¤ huomioi nopeita kahden nÃ¤ppÃ¤imen painalluksia"
 
-#: ../panels/universal-access/uap.ui.h:59
+#: panels/universal-access/uap.ui:2223
 msgctxt "bounce keys delay"
 msgid "Short"
 msgstr "Lyhyt"
 
-#: ../panels/universal-access/uap.ui.h:60
+#: panels/universal-access/uap.ui:2242
 msgid "Bounce keys typing delay"
 msgstr "KimmonÃ¤ppÃ¤inten kirjoitusviive"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: panels/universal-access/uap.ui:2257
 msgctxt "bounce keys delay"
 msgid "Long"
 msgstr "PitkÃ¤"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: panels/universal-access/uap.ui:2370
 msgid "_Enable by Keyboard"
 msgstr "_Ota kÃ¤yttÃ¶Ã¶n nÃ¤ppÃ¤imistÃ¶Ã¤ kÃ¤yttÃ¤en"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: panels/universal-access/uap.ui:2387
 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.h:64
+#: panels/universal-access/uap.ui:2451
 msgid "Click Assist"
 msgstr "Napsautusapu"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: panels/universal-access/uap.ui:2487
 msgid "_Simulated Secondary Click"
 msgstr "Kakkospainikkeen simuloitu _napsautus"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: panels/universal-access/uap.ui:2505
 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.h:67
+#: panels/universal-access/uap.ui:2559
 msgctxt "secondary click"
 msgid "Short"
 msgstr "Lyhyt"
 
-#: ../panels/universal-access/uap.ui.h:68
+#: panels/universal-access/uap.ui:2578
 msgid "Secondary click delay"
 msgstr "KakkosnÃ¤ppÃ¤imen viive"
 
-#: ../panels/universal-access/uap.ui.h:69
+#: panels/universal-access/uap.ui:2593
 msgctxt "secondary click delay"
 msgid "Long"
 msgstr "PitkÃ¤"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: panels/universal-access/uap.ui:2650
 msgid "_Hover Click"
 msgstr "Napsautus _kohdistamalla"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: panels/universal-access/uap.ui:2668
 msgid "Trigger a click when the pointer hovers"
 msgstr "Toteuta painallus, kun hiiren kohdistin kohdistetaan"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: panels/universal-access/uap.ui:2701
 msgid "D_elay:"
 msgstr "Viiv_e:"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: panels/universal-access/uap.ui:2723
 msgctxt "dwell click delay"
 msgid "Short"
 msgstr "Lyhyt"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: panels/universal-access/uap.ui:2754
 msgctxt "dwell click delay"
 msgid "Long"
 msgstr "PitkÃ¤"
 
-#: ../panels/universal-access/uap.ui.h:75
+#: panels/universal-access/uap.ui:2790
 msgid "Motion _threshold:"
 msgstr "Liikkeen _kynnysarvo:"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: panels/universal-access/uap.ui:2812
 msgctxt "dwell click threshold"
 msgid "Small"
 msgstr "Pieni"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: panels/universal-access/uap.ui:2843
 msgctxt "dwell click threshold"
 msgid "Large"
 msgstr "Suuri"
 
-#: ../panels/universal-access/zoom-options.c:333
+#: panels/universal-access/zoom-options.c:333
 msgctxt "Distance"
 msgid "Short"
 msgstr "Lyhyt"
 
-#: ../panels/universal-access/zoom-options.c:334
+#: panels/universal-access/zoom-options.c:334
 msgctxt "Distance"
 msgid "Â¼ Screen"
 msgstr "Â¼ nÃ¤yttÃ¶Ã¤"
 
-#: ../panels/universal-access/zoom-options.c:335
+#: panels/universal-access/zoom-options.c:335
 msgctxt "Distance"
 msgid "Â½ Screen"
 msgstr "Â½ nÃ¤yttÃ¶Ã¤"
 
-#: ../panels/universal-access/zoom-options.c:336
+#: panels/universal-access/zoom-options.c:336
 msgctxt "Distance"
 msgid "Â¾ Screen"
 msgstr "Â¾ nÃ¤yttÃ¶Ã¤"
 
-#: ../panels/universal-access/zoom-options.c:337
+#: panels/universal-access/zoom-options.c:337
 msgctxt "Distance"
 msgid "Long"
 msgstr "PitkÃ¤"
 
-#: ../panels/universal-access/zoom-options.ui.h:1
+#: panels/universal-access/zoom-options.ui:48
 msgid "Full Screen"
 msgstr "Koko nÃ¤yttÃ¶"
 
-#: ../panels/universal-access/zoom-options.ui.h:2
+#: panels/universal-access/zoom-options.ui:53
 msgid "Top Half"
 msgstr "YlÃ¤osa"
 
-#: ../panels/universal-access/zoom-options.ui.h:3
+#: panels/universal-access/zoom-options.ui:58
 msgid "Bottom Half"
 msgstr "Alaosa"
 
-#: ../panels/universal-access/zoom-options.ui.h:4
+#: panels/universal-access/zoom-options.ui:63
 msgid "Left Half"
 msgstr "Vasen puoli"
 
-#: ../panels/universal-access/zoom-options.ui.h:5
+#: panels/universal-access/zoom-options.ui:68
 msgid "Right Half"
 msgstr "Oikea puoli"
 
-#: ../panels/universal-access/zoom-options.ui.h:6
+#: panels/universal-access/zoom-options.ui:77
 msgid "Zoom Options"
 msgstr "Suurennuksen valinnat"
 
-#: ../panels/universal-access/zoom-options.ui.h:8
+#: panels/universal-access/zoom-options.ui:186
 msgid "_Magnification:"
 msgstr "_Suurennus:"
 
-#: ../panels/universal-access/zoom-options.ui.h:9
+#: panels/universal-access/zoom-options.ui:250
 msgid "_Follow mouse cursor"
 msgstr "Seuraa _hiiren osoitinta"
 
-#: ../panels/universal-access/zoom-options.ui.h:10
+#: panels/universal-access/zoom-options.ui:270
 msgid "_Screen part:"
 msgstr "_NÃ¤ytÃ¶n osa:"
 
-#: ../panels/universal-access/zoom-options.ui.h:11
+#: panels/universal-access/zoom-options.ui:332
 msgid "Magnifier _extends outside of screen"
 msgstr "Suu_rennuslasi ulottuu nÃ¤ytÃ¶n ulkopuolelle"
 
-#: ../panels/universal-access/zoom-options.ui.h:12
+#: panels/universal-access/zoom-options.ui:351
 msgid "_Keep magnifier cursor centered"
 msgstr "Pi_dÃ¤ suurennuslasin osoitin keskitettynÃ¤"
 
-#: ../panels/universal-access/zoom-options.ui.h:13
+#: panels/universal-access/zoom-options.ui:370
 msgid "Magnifier cursor _pushes contents around"
 msgstr "Suur_ennuslasin osoitin tyÃ¶ntÃ¤Ã¤ sisÃ¤ltÃ¶Ã¤"
 
-#: ../panels/universal-access/zoom-options.ui.h:14
+#: panels/universal-access/zoom-options.ui:389
 msgid "Magnifier cursor moves with _contents"
 msgstr "Suurennuslasin osoit_in siirtyy sisÃ¤llÃ¶n kanssa"
 
-#: ../panels/universal-access/zoom-options.ui.h:15
+#: panels/universal-access/zoom-options.ui:423
 msgid "Magnifier Position:"
 msgstr "Suurennuslasin sijainti:"
 
-#: ../panels/universal-access/zoom-options.ui.h:16
+#: panels/universal-access/zoom-options.ui:444
 msgid "Magnifier"
 msgstr "Suurennuslasi"
 
-#: ../panels/universal-access/zoom-options.ui.h:17
+#: panels/universal-access/zoom-options.ui:490
 msgid "_Thickness:"
 msgstr "_Paksuus:"
 
-#: ../panels/universal-access/zoom-options.ui.h:18
+#: panels/universal-access/zoom-options.ui:516
 msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "Ohut"
 
-#: ../panels/universal-access/zoom-options.ui.h:19
+#: panels/universal-access/zoom-options.ui:548
 msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "Paksu"
 
-#: ../panels/universal-access/zoom-options.ui.h:20
+#: panels/universal-access/zoom-options.ui:574
 msgid "_Length:"
 msgstr "Pit_uus:"
 
 #. The color of the accessibility crosshair
-#: ../panels/universal-access/zoom-options.ui.h:22
+#: panels/universal-access/zoom-options.ui:626
 msgid "Co_lor:"
 msgstr "VÃ¤_ri:"
 
-#: ../panels/universal-access/zoom-options.ui.h:23
+#: panels/universal-access/zoom-options.ui:690
 msgid "_Crosshairs:"
 msgstr "TÃ¤htÃ¤i_n:"
 
-#: ../panels/universal-access/zoom-options.ui.h:24
+#: panels/universal-access/zoom-options.ui:741
 msgid "_Overlaps mouse cursor"
 msgstr "Hii_ren osoittimen pÃ¤Ã¤llÃ¤"
 
-#: ../panels/universal-access/zoom-options.ui.h:25
+#: panels/universal-access/zoom-options.ui:779
 msgid "Crosshairs"
 msgstr "TÃ¤htÃ¤imet"
 
-#: ../panels/universal-access/zoom-options.ui.h:26
+#: panels/universal-access/zoom-options.ui:827
 msgid "_White on black:"
 msgstr "Valkoista _mustalla:"
 
-#: ../panels/universal-access/zoom-options.ui.h:27
+#: panels/universal-access/zoom-options.ui:850
 msgid "_Brightness:"
 msgstr "K_irkkaus:"
 
-#: ../panels/universal-access/zoom-options.ui.h:28
+#: panels/universal-access/zoom-options.ui:874
 msgid "_Contrast:"
 msgstr "_Kontrasti:"
 
 #. The contrast scale goes from Color to None (grayscale)
-#: ../panels/universal-access/zoom-options.ui.h:30
+#: panels/universal-access/zoom-options.ui:897
 msgctxt "universal access, contrast"
 msgid "Co_lor"
 msgstr "V_Ã¤ri"
 
-#: ../panels/universal-access/zoom-options.ui.h:31
+#: panels/universal-access/zoom-options.ui:925
 msgctxt "universal access, color"
 msgid "None"
 msgstr "Ei mitÃ¤Ã¤n"
 
-#: ../panels/universal-access/zoom-options.ui.h:32
+#: panels/universal-access/zoom-options.ui:957
 msgctxt "universal access, color"
 msgid "Full"
 msgstr "TÃ¤ysi"
 
-#: ../panels/universal-access/zoom-options.ui.h:33
+#: panels/universal-access/zoom-options.ui:1023
 msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "Matala"
 
-#: ../panels/universal-access/zoom-options.ui.h:34
+#: panels/universal-access/zoom-options.ui:1056
 msgctxt "universal access, brightness"
 msgid "High"
 msgstr "Korkea"
 
-#: ../panels/universal-access/zoom-options.ui.h:35
+#: panels/universal-access/zoom-options.ui:1087
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "Matala"
 
-#: ../panels/universal-access/zoom-options.ui.h:36
+#: panels/universal-access/zoom-options.ui:1120
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "Korkea"
 
-#: ../panels/universal-access/zoom-options.ui.h:37
+#: panels/universal-access/zoom-options.ui:1156
 msgid "Color Effects:"
 msgstr "VÃ¤ritehosteet:"
 
-#: ../panels/universal-access/zoom-options.ui.h:38
+#: panels/universal-access/zoom-options.ui:1181
 msgid "Color Effects"
 msgstr "VÃ¤ritehosteet"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:1
-#: ../panels/user-accounts/data/join-dialog.ui.h:1
+#: panels/user-accounts/data/account-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.h:5
+#: panels/user-accounts/data/account-dialog.ui:171
 msgid "_Full Name"
 msgstr "K_oko nimi"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4
+#: panels/user-accounts/data/account-dialog.ui:197
+#: panels/user-accounts/data/user-accounts-dialog.ui:141
 msgid "Standard"
 msgstr "Normaali"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:7
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5
+#: panels/user-accounts/data/account-dialog.ui:207
+#: panels/user-accounts/data/user-accounts-dialog.ui:150
 msgid "Administrator"
 msgstr "YllÃ¤pitÃ¤jÃ¤"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:8
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6
+#: panels/user-accounts/data/account-dialog.ui:223
+#: panels/user-accounts/data/user-accounts-dialog.ui:168
 msgid "Account _Type"
 msgstr "Tilin _tyyppi"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:10
+#: panels/user-accounts/data/account-dialog.ui:260
 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.h:11
+#: panels/user-accounts/data/account-dialog.ui:274
 msgid "Set a password _now"
 msgstr "_Aseta salasana nyt"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:13
+#: panels/user-accounts/data/account-dialog.ui:387
 msgid "_Confirm"
 msgstr "_Vahvista"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:14
+#: panels/user-accounts/data/account-dialog.ui:463
+#: panels/user-accounts/data/account-dialog.ui:667
 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 "
@@ -6274,73 +6304,73 @@ 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.h:15
-#: ../panels/user-accounts/data/join-dialog.ui.h:9
+#: panels/user-accounts/data/account-dialog.ui:485
+#: panels/user-accounts/data/join-dialog.ui:116
 msgid "_Domain"
 msgstr "T_oimialue"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:16
+#: panels/user-accounts/data/account-dialog.ui:707
 msgid "You are Offline"
 msgstr "Olet poissa verkosta"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:17
+#: panels/user-accounts/data/account-dialog.ui:726
 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.h:18
+#: panels/user-accounts/data/account-dialog.ui:760
 msgid "_Enterprise Login"
 msgstr "_Yrityskirjautumisen vaativa tili"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:1
+#: panels/user-accounts/data/account-fingerprint.ui:12
 msgid "Left thumb"
 msgstr "Vasen peukalo"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:2
+#: panels/user-accounts/data/account-fingerprint.ui:15
 msgid "Left middle finger"
 msgstr "Vasen keskisormi"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:3
+#: panels/user-accounts/data/account-fingerprint.ui:18
 msgid "Left ring finger"
 msgstr "Vasen nimetÃ¶n"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:4
+#: panels/user-accounts/data/account-fingerprint.ui:21
 msgid "Left little finger"
 msgstr "Vasen pikkurilli"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:5
+#: panels/user-accounts/data/account-fingerprint.ui:24
 msgid "Right thumb"
 msgstr "Oikea peukalo"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:6
+#: panels/user-accounts/data/account-fingerprint.ui:27
 msgid "Right middle finger"
 msgstr "Oikea keskisormi"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:7
+#: panels/user-accounts/data/account-fingerprint.ui:30
 msgid "Right ring finger"
 msgstr "Oikea nimetÃ¶n"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:8
+#: panels/user-accounts/data/account-fingerprint.ui:33
 msgid "Right little finger"
 msgstr "Oikea pikkurilli"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:680
+#: panels/user-accounts/data/account-fingerprint.ui:39
+#: panels/user-accounts/um-fingerprint-dialog.c:680
 msgid "Enable Fingerprint Login"
 msgstr "Ota sormenjÃ¤ljellÃ¤ kirjautuminen kÃ¤yttÃ¶Ã¶n"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:10
+#: panels/user-accounts/data/account-fingerprint.ui:89
 msgid "_Right index finger"
 msgstr "_Oikea etusormi"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:11
+#: panels/user-accounts/data/account-fingerprint.ui:105
 msgid "_Left index finger"
 msgstr "_Vasen etusormi"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:12
+#: panels/user-accounts/data/account-fingerprint.ui:126
 msgid "_Other finger:"
 msgstr "_Muu sormi:"
 
-#: ../panels/user-accounts/data/account-fingerprint.ui.h:13
+#: panels/user-accounts/data/account-fingerprint.ui:262
 msgid ""
 "Your fingerprint was successfully saved. You should now be able to log in "
 "using your fingerprint reader."
@@ -6348,31 +6378,35 @@ msgstr ""
 "SormenjÃ¤lkesi tallennettiin onnistuneesti. Sinun pitÃ¤isi nyt pystyÃ¤ "
 "kirjautumaan sisÃ¤Ã¤n sormenjÃ¤ljen avulla."
 
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:3
 msgid "Users"
 msgstr "KÃ¤yttÃ¤jÃ¤t"
 
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:4
 msgid "Add or remove users and change your password"
 msgstr "LisÃ¤Ã¤ tai poista kÃ¤yttÃ¤jiÃ¤, vaihda salasanasi"
 
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:6
+msgid "system-users"
+msgstr "system-users"
+
 #. Translators: those are keywords for the user accounts control-center panel
-#: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
+#: panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in:19
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
 msgstr ""
 "Login;Name;Fingerprint;Avatar;Logo;Face;Password;kirjautuminen;nimi;"
 "sormenjÃ¤lki;avatar;kasvokuva;salasana;"
 
 #. Translators: This button enrolls the computer in the domain in order to use enterprise logins.
-#: ../panels/user-accounts/data/join-dialog.ui.h:4
+#: panels/user-accounts/data/join-dialog.ui:39
 msgid "_Enroll"
 msgstr "_LiitÃ¤ toimialueeseen"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:5
+#: panels/user-accounts/data/join-dialog.ui:75
 msgid "Domain Administrator Login"
 msgstr "Toimialueen yllÃ¤pitÃ¤jÃ¤n kirjautuminen"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:6
+#: panels/user-accounts/data/join-dialog.ui:93
 msgid ""
 "In order to use enterprise logins, this computer needs to be\n"
 "enrolled in the domain. Please have your network administrator\n"
@@ -6382,153 +6416,304 @@ msgstr ""
 "toimialueeseen. PyydÃ¤ verkkosi yllÃ¤pitÃ¤jÃ¤Ã¤ kirjoittamaan\n"
 "toimialueen salasanan tÃ¤hÃ¤n."
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:10
+#: panels/user-accounts/data/join-dialog.ui:150
 msgid "Administrator _Name"
 msgstr "YllÃ¤pitÃ¤jÃ¤n _nimi"
 
-#: ../panels/user-accounts/data/join-dialog.ui.h:11
+#: panels/user-accounts/data/join-dialog.ui:185
 msgid "Administrator Password"
 msgstr "YllÃ¤pitÃ¤jÃ¤n salasana"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:1
+#: panels/user-accounts/data/password-dialog.ui:7
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:3
+#: panels/user-accounts/data/password-dialog.ui:38
 msgid "Ch_ange"
 msgstr "_Vaihda"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:4
+#: panels/user-accounts/data/password-dialog.ui:142
 msgid "_Verify New Password"
 msgstr "V_ahvista uusi salasana"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:5
+#: panels/user-accounts/data/password-dialog.ui:159
 msgid "_New Password"
 msgstr "_Uusi salasana"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:6
+#: panels/user-accounts/data/password-dialog.ui:208
 msgid "Current _Password"
 msgstr "_Nykyinen salasana"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:7
+#: 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.h:8
+#: 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.h:1
+#: 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.h:2
+#: panels/user-accounts/data/user-accounts-dialog.ui:64
 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.h:3
+#: panels/user-accounts/data/user-accounts-dialog.ui:72
 msgid "Restart Now"
 msgstr "KÃ¤ynnistÃ¤ uudelleen nyt"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+#: panels/user-accounts/data/user-accounts-dialog.ui:239
 msgid "A_utomatic Login"
 msgstr "A_utomaattinen kirjautuminen"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9
+#: panels/user-accounts/data/user-accounts-dialog.ui:280
 msgid "_Fingerprint Login"
 msgstr "_SormenjÃ¤ljellÃ¤ kirjautuminen"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10
+#: panels/user-accounts/data/user-accounts-dialog.ui:306
+#: panels/user-accounts/data/user-accounts-dialog.ui:319
 msgid "User Icon"
 msgstr "KÃ¤yttÃ¤jÃ¤n kuvake"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12
+#: panels/user-accounts/data/user-accounts-dialog.ui:382
 msgid "Last Login"
 msgstr "Viimeisin kirjautuminen"
 
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+#: panels/user-accounts/data/user-accounts-dialog.ui:429
 msgid "Remove Userâ€¦"
 msgstr "Poista kÃ¤yttÃ¤jÃ¤tiliâ€¦"
 
-#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
+#: panels/user-accounts/fingerprint-strings.h:28
+#, c-format
+msgid "Place your left thumb on %s"
+msgstr ""
+
+#: panels/user-accounts/fingerprint-strings.h:28
+#, c-format
+msgid "Swipe your left thumb on %s"
+msgstr ""
+
+#: panels/user-accounts/fingerprint-strings.h:29
+#, fuzzy, c-format
+#| msgid "_Left index finger"
+msgid "Place your left index finger on %s"
+msgstr "_Vasen etusormi"
+
+#: panels/user-accounts/fingerprint-strings.h:29
+#, fuzzy, c-format
+#| msgid "_Left index finger"
+msgid "Swipe your left index finger on %s"
+msgstr "_Vasen etusormi"
+
+#: panels/user-accounts/fingerprint-strings.h:30
+#, fuzzy, c-format
+#| msgid "Left middle finger"
+msgid "Place your left middle finger on %s"
+msgstr "Vasen keskisormi"
+
+#: panels/user-accounts/fingerprint-strings.h:30
+#, fuzzy, c-format
+#| msgid "Left middle finger"
+msgid "Swipe your left middle finger on %s"
+msgstr "Vasen keskisormi"
+
+#: panels/user-accounts/fingerprint-strings.h:31
+#, fuzzy, c-format
+#| msgid "Left ring finger"
+msgid "Place your left ring finger on %s"
+msgstr "Vasen nimetÃ¶n"
+
+#: panels/user-accounts/fingerprint-strings.h:31
+#, fuzzy, c-format
+#| msgid "Left ring finger"
+msgid "Swipe your left ring finger on %s"
+msgstr "Vasen nimetÃ¶n"
+
+#: panels/user-accounts/fingerprint-strings.h:32
+#, fuzzy, c-format
+#| msgid "Left little finger"
+msgid "Place your left little finger on %s"
+msgstr "Vasen pikkurilli"
+
+#: panels/user-accounts/fingerprint-strings.h:32
+#, fuzzy, c-format
+#| msgid "Left little finger"
+msgid "Swipe your left little finger on %s"
+msgstr "Vasen pikkurilli"
+
+#: panels/user-accounts/fingerprint-strings.h:33
+#, c-format
+msgid "Place your right thumb on %s"
+msgstr ""
+
+#: panels/user-accounts/fingerprint-strings.h:33
+#, c-format
+msgid "Swipe your right thumb on %s"
+msgstr ""
+
+#: panels/user-accounts/fingerprint-strings.h:34
+#, fuzzy, c-format
+#| msgid "_Right index finger"
+msgid "Place your right index finger on %s"
+msgstr "_Oikea etusormi"
+
+#: panels/user-accounts/fingerprint-strings.h:34
+#, fuzzy, c-format
+#| msgid "_Right index finger"
+msgid "Swipe your right index finger on %s"
+msgstr "_Oikea etusormi"
+
+#: panels/user-accounts/fingerprint-strings.h:35
+#, fuzzy, c-format
+#| msgid "Right middle finger"
+msgid "Place your right middle finger on %s"
+msgstr "Oikea keskisormi"
+
+#: panels/user-accounts/fingerprint-strings.h:35
+#, fuzzy, c-format
+#| msgid "Right middle finger"
+msgid "Swipe your right middle finger on %s"
+msgstr "Oikea keskisormi"
+
+#: panels/user-accounts/fingerprint-strings.h:36
+#, fuzzy, c-format
+#| msgid "Right ring finger"
+msgid "Place your right ring finger on %s"
+msgstr "Oikea nimetÃ¶n"
+
+#: panels/user-accounts/fingerprint-strings.h:36
+#, fuzzy, c-format
+#| msgid "Right ring finger"
+msgid "Swipe your right ring finger on %s"
+msgstr "Oikea nimetÃ¶n"
+
+#: panels/user-accounts/fingerprint-strings.h:37
+#, fuzzy, c-format
+#| msgid "Right little finger"
+msgid "Place your right little finger on %s"
+msgstr "Oikea pikkurilli"
+
+#: panels/user-accounts/fingerprint-strings.h:37
+#, fuzzy, c-format
+#| msgid "Right little finger"
+msgid "Swipe your right little finger on %s"
+msgstr "Oikea pikkurilli"
+
+#: panels/user-accounts/fingerprint-strings.h:72
+#: panels/user-accounts/fingerprint-strings.h:98
+msgid "Place your finger on the reader again"
+msgstr ""
+
+#: panels/user-accounts/fingerprint-strings.h:74
+#: panels/user-accounts/fingerprint-strings.h:100
+msgid "Swipe your finger again"
+msgstr ""
+
+#: panels/user-accounts/fingerprint-strings.h:77
+msgid "Swipe was too short; try again"
+msgstr ""
+
+#: panels/user-accounts/fingerprint-strings.h:79
+msgid "Your finger was not centered; try swiping your finger again"
+msgstr ""
+
+#: panels/user-accounts/fingerprint-strings.h:81
+msgid "Remove your finger and try swiping it again"
+msgstr ""
+
+#: panels/user-accounts/fingerprint-strings.h:103
+msgid "Swipe was too short, try again"
+msgstr ""
+
+#: panels/user-accounts/fingerprint-strings.h:105
+msgid "Your finger was not centered, try swiping your finger again"
+msgstr ""
+
+#: panels/user-accounts/fingerprint-strings.h:107
+msgid "Remove your finger, and try swiping your finger again"
+msgstr ""
+
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:11
 msgid "Manage user accounts"
 msgstr "Hallitse kÃ¤yttÃ¤jÃ¤tilejÃ¤"
 
-#: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:2
+#: panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in:12
 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:81
 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:83
 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:85 panels/user-accounts/pw-utils.c:93
 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:87
 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:89
 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:91
 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:95
 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:97
 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:99
 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:101
 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:103
 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:105
 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:107
 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:109
 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:111
 msgctxt "Password hint"
 msgid ""
 "Try to avoid repeating the same type of character: you need to mix up "
@@ -6537,12 +6722,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:113
 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:115
 msgctxt "Password hint"
 msgid ""
 "Password needs to be longer. Try to add more letters, numbers and "
@@ -6551,95 +6736,95 @@ msgstr ""
 "Salasanan tulee olla nykyistÃ¤ pidempi. LisÃ¤Ã¤ kirjaimia, numeroita ja "
 "erikoismerkkejÃ¤."
 
-#: ../panels/user-accounts/pw-utils.c:117
+#: panels/user-accounts/pw-utils.c:117
 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:119
 msgctxt "Password hint"
 msgid ""
 "Adding more letters, numbers and punctuation will make the password stronger."
 msgstr ""
 "MitÃ¤ enemmÃ¤n kirjaimia, numeroita ja erikoismerkkejÃ¤, sitÃ¤ vahvempi salasana."
 
-#: ../panels/user-accounts/run-passwd.c:422
+#: panels/user-accounts/run-passwd.c:422
 msgid "Authentication failed"
 msgstr "Tunnistautuminen epÃ¤onnistui"
 
-#: ../panels/user-accounts/run-passwd.c:502
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: 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
+#: panels/user-accounts/run-passwd.c:536
 #, c-format
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../panels/user-accounts/um-account-dialog.c:34
+#: 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:229
+#: panels/user-accounts/um-account-dialog.c:229
 msgid "Failed to add account"
 msgstr "Tilin lisÃ¤ys epÃ¤onnistui"
 
-#: ../panels/user-accounts/um-account-dialog.c:462
+#: panels/user-accounts/um-account-dialog.c:462
 msgid "Passwords do not match."
 msgstr "Salasanat eivÃ¤t tÃ¤smÃ¤Ã¤."
 
-#: ../panels/user-accounts/um-account-dialog.c:717
-#: ../panels/user-accounts/um-account-dialog.c:763
-#: ../panels/user-accounts/um-account-dialog.c:784
+#: panels/user-accounts/um-account-dialog.c:717
+#: panels/user-accounts/um-account-dialog.c:763
+#: panels/user-accounts/um-account-dialog.c:784
 msgid "Failed to register account"
 msgstr "Tilin rekisterÃ¶inti epÃ¤onnistui"
 
-#: ../panels/user-accounts/um-account-dialog.c:907
+#: panels/user-accounts/um-account-dialog.c:907
 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:980
+#: panels/user-accounts/um-account-dialog.c:980
 msgid "Failed to join domain"
 msgstr "Toimialueeseen liittyminen epÃ¤onnistui"
 
-#: ../panels/user-accounts/um-account-dialog.c:1041
+#: panels/user-accounts/um-account-dialog.c:1041
 msgid ""
 "That login name didnâ€™t work.\n"
 "Please try again."
@@ -6647,7 +6832,7 @@ msgstr ""
 "KÃ¤yttÃ¤jÃ¤tunnus ei kelvannut.\n"
 "YritÃ¤ uudelleen."
 
-#: ../panels/user-accounts/um-account-dialog.c:1048
+#: panels/user-accounts/um-account-dialog.c:1048
 msgid ""
 "That login password didnâ€™t work.\n"
 "Please try again."
@@ -6655,51 +6840,51 @@ msgstr ""
 "Salasana ei kelvannut.\n"
 "YritÃ¤ uudelleen."
 
-#: ../panels/user-accounts/um-account-dialog.c:1056
+#: panels/user-accounts/um-account-dialog.c:1056
 msgid "Failed to log into domain"
 msgstr "Toimialueeseen kirjautuminen epÃ¤onnistui"
 
-#: ../panels/user-accounts/um-account-dialog.c:1114
+#: panels/user-accounts/um-account-dialog.c:1114
 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
+#: panels/user-accounts/um-account-type.c:34
 msgctxt "Account type"
 msgid "Standard"
 msgstr "Normaali"
 
-#: ../panels/user-accounts/um-account-type.c:36
+#: panels/user-accounts/um-account-type.c:36
 msgctxt "Account type"
 msgid "Administrator"
 msgstr "YllÃ¤pitÃ¤jÃ¤"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:142
+#: panels/user-accounts/um-fingerprint-dialog.c:142
 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:144
+#: panels/user-accounts/um-fingerprint-dialog.c:144
 msgid "The device is already in use."
 msgstr "Laite on jo kÃ¤ytÃ¶ssÃ¤."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:146
+#: panels/user-accounts/um-fingerprint-dialog.c:146
 msgid "An internal error occurred."
 msgstr "Tapahtui sisÃ¤inen virhe."
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:217
+#: panels/user-accounts/um-fingerprint-dialog.c:217
 msgid "Enabled"
 msgstr "KÃ¤ytÃ¶ssÃ¤"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:263
+#: panels/user-accounts/um-fingerprint-dialog.c:263
 msgid "Delete registered fingerprints?"
 msgstr "Poistetaanko rekisterÃ¶idyt sormenjÃ¤ljet?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:267
+#: panels/user-accounts/um-fingerprint-dialog.c:267
 msgid "_Delete Fingerprints"
 msgstr "_Poista sormenjÃ¤ljet"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:273
+#: panels/user-accounts/um-fingerprint-dialog.c:273
 msgid ""
 "Do you want to delete your registered fingerprints so fingerprint login is "
 "disabled?"
@@ -6707,15 +6892,15 @@ msgstr ""
 "Haluatko poistaa rekisterÃ¶idyt sormenjÃ¤lkesi, jolloin sormenjÃ¤ljillÃ¤ "
 "kirjautuminen poistetaan kÃ¤ytÃ¶stÃ¤?"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:443
+#: panels/user-accounts/um-fingerprint-dialog.c:443
 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:504
-#: ../panels/user-accounts/um-fingerprint-dialog.c:546
+#: panels/user-accounts/um-fingerprint-dialog.c:504
+#: panels/user-accounts/um-fingerprint-dialog.c:546
 #, c-format
 msgid "Could not access â€œ%sâ€ device"
 msgstr "Laitetta â€%sâ€ ei voitu kÃ¤sitellÃ¤"
@@ -6723,16 +6908,16 @@ 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:587
+#: panels/user-accounts/um-fingerprint-dialog.c:587
 #, 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:631
+#: panels/user-accounts/um-fingerprint-dialog.c:631
 msgid "Could not access any fingerprint readers"
 msgstr "SormenjÃ¤lkilukijoita ei voitu kÃ¤yttÃ¤Ã¤"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:632
+#: panels/user-accounts/um-fingerprint-dialog.c:632
 msgid "Please contact your system administrator for help."
 msgstr "Kysy apua jÃ¤rjestelmÃ¤si yllÃ¤pitÃ¤jÃ¤ltÃ¤."
 
@@ -6741,7 +6926,7 @@ msgstr "Kysy apua jÃ¤rjestelmÃ¤si yllÃ¤pitÃ¤jÃ¤ltÃ¤."
 #. * "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:714
+#: panels/user-accounts/um-fingerprint-dialog.c:714
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
@@ -6750,19 +6935,19 @@ 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:721
+#: panels/user-accounts/um-fingerprint-dialog.c:721
 msgid "Selecting finger"
 msgstr "Valitaan sormea"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:722
+#: panels/user-accounts/um-fingerprint-dialog.c:722
 msgid "Enrolling fingerprints"
 msgstr "Kirjataan sormenjÃ¤lkiÃ¤"
 
-#: ../panels/user-accounts/um-history-dialog.c:70
+#: panels/user-accounts/um-history-dialog.c:70
 msgid "This Week"
 msgstr "TÃ¤llÃ¤ viikolla"
 
-#: ../panels/user-accounts/um-history-dialog.c:73
+#: panels/user-accounts/um-history-dialog.c:73
 msgid "Last Week"
 msgstr "Viime viikolla"
 
@@ -6770,22 +6955,22 @@ msgstr "Viime viikolla"
 #. 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
+#: 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
+#: 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
+#: panels/user-accounts/um-history-dialog.c:93
 #, c-format
 msgctxt "login history week label"
 msgid "%s â€” %s"
@@ -6793,121 +6978,121 @@ 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:776
+#: panels/user-accounts/um-history-dialog.c:177
+#: panels/user-accounts/um-user-panel.c:776
 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:780
+#: panels/user-accounts/um-history-dialog.c:180
+#: panels/user-accounts/um-user-panel.c:780
 #, c-format
 msgctxt "login date-time"
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../panels/user-accounts/um-history-dialog.c:250
+#: panels/user-accounts/um-history-dialog.c:250
 msgid "Session Ended"
 msgstr "Istunto pÃ¤Ã¤ttyi"
 
-#: ../panels/user-accounts/um-history-dialog.c:256
+#: 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
+#: 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:144
+#: panels/user-accounts/um-password-dialog.c:144
 msgid "Please choose another password."
 msgstr "Valitse jokin toinen salasana."
 
-#: ../panels/user-accounts/um-password-dialog.c:153
+#: panels/user-accounts/um-password-dialog.c:153
 msgid "Please type your current password again."
 msgstr "SyÃ¶tÃ¤ nykyinen salasana uudelleen."
 
-#: ../panels/user-accounts/um-password-dialog.c:159
+#: panels/user-accounts/um-password-dialog.c:159
 msgid "Password could not be changed"
 msgstr "Salasanaa ei voitu vaihtaa"
 
-#: ../panels/user-accounts/um-password-dialog.c:285
+#: panels/user-accounts/um-password-dialog.c:285
 msgid "The passwords do not match."
 msgstr "Salasanat eivÃ¤t tÃ¤smÃ¤Ã¤."
 
-#: ../panels/user-accounts/um-photo-dialog.c:218
+#: panels/user-accounts/um-photo-dialog.c:218
 msgid "Browse for more pictures"
 msgstr "Selaa lisÃ¤Ã¤ kuvia"
 
-#: ../panels/user-accounts/um-photo-dialog.c:452
+#: panels/user-accounts/um-photo-dialog.c:452
 msgid "Disable image"
 msgstr "Poista kuva kÃ¤ytÃ¶stÃ¤"
 
-#: ../panels/user-accounts/um-photo-dialog.c:470
+#: panels/user-accounts/um-photo-dialog.c:470
 msgid "Take a photoâ€¦"
 msgstr "Ota kuvaâ€¦"
 
-#: ../panels/user-accounts/um-photo-dialog.c:488
+#: panels/user-accounts/um-photo-dialog.c:488
 msgid "Browse for more picturesâ€¦"
 msgstr "Selaa lisÃ¤Ã¤ kuviaâ€¦"
 
-#: ../panels/user-accounts/um-photo-dialog.c:714
+#: panels/user-accounts/um-photo-dialog.c:714
 #, c-format
 msgid "Used by %s"
 msgstr "KÃ¤ytÃ¶ssÃ¤ (%s)"
 
-#: ../panels/user-accounts/um-realm-manager.c:350
+#: panels/user-accounts/um-realm-manager.c:350
 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:413
+#: panels/user-accounts/um-realm-manager.c:413
 #, c-format
 msgid "No such domain or realm found"
 msgstr "MÃ¤Ã¤riteltyÃ¤ toimialuetta tai realmia ei lÃ¶ytynyt"
 
-#: ../panels/user-accounts/um-realm-manager.c:815
-#: ../panels/user-accounts/um-realm-manager.c:829
+#: panels/user-accounts/um-realm-manager.c:815
+#: panels/user-accounts/um-realm-manager.c:829
 #, 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:821
+#: panels/user-accounts/um-realm-manager.c:821
 msgid "Invalid password, please try again"
 msgstr "Virheellinen salasana, yritÃ¤ uudelleen"
 
-#: ../panels/user-accounts/um-realm-manager.c:834
+#: panels/user-accounts/um-realm-manager.c:834
 #, 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:195
+#: panels/user-accounts/um-user-panel.c:195
 msgid "Your account"
 msgstr "Tilisi"
 
-#: ../panels/user-accounts/um-user-panel.c:390
+#: panels/user-accounts/um-user-panel.c:390
 msgid "Failed to delete user"
 msgstr "KÃ¤yttÃ¤jÃ¤n poisto epÃ¤onnistui"
 
-#: ../panels/user-accounts/um-user-panel.c:448
-#: ../panels/user-accounts/um-user-panel.c:507
-#: ../panels/user-accounts/um-user-panel.c:559
+#: panels/user-accounts/um-user-panel.c:448
+#: panels/user-accounts/um-user-panel.c:507
+#: panels/user-accounts/um-user-panel.c:559
 msgid "Failed to revoke remotely managed user"
 msgstr "EtÃ¤hallitun kÃ¤yttÃ¤jÃ¤n kumoaminen epÃ¤onnistui"
 
-#: ../panels/user-accounts/um-user-panel.c:613
+#: panels/user-accounts/um-user-panel.c:613
 msgid "You cannot delete your own account."
 msgstr "Et voi poistaa omaa tunnustasi."
 
-#: ../panels/user-accounts/um-user-panel.c:622
+#: panels/user-accounts/um-user-panel.c:622
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s on yhÃ¤ sisÃ¤Ã¤nkirjautuneena"
 
-#: ../panels/user-accounts/um-user-panel.c:626
+#: panels/user-accounts/um-user-panel.c:626
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -6915,12 +7100,12 @@ msgstr ""
 "Jos kÃ¤yttÃ¤jÃ¤ poistetaan hÃ¤nen ollessaan sisÃ¤Ã¤nkirjautuneena, jÃ¤rjestelmÃ¤ssÃ¤ "
 "voi ilmetÃ¤ ongelmia."
 
-#: ../panels/user-accounts/um-user-panel.c:635
+#: panels/user-accounts/um-user-panel.c:635
 #, 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:639
+#: panels/user-accounts/um-user-panel.c:639
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -6928,47 +7113,47 @@ 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:642
+#: panels/user-accounts/um-user-panel.c:642
 msgid "_Delete Files"
 msgstr "P_oista tiedostot"
 
-#: ../panels/user-accounts/um-user-panel.c:643
+#: panels/user-accounts/um-user-panel.c:643
 msgid "_Keep Files"
 msgstr "_SÃ¤ilytÃ¤ tiedostot"
 
-#: ../panels/user-accounts/um-user-panel.c:657
+#: panels/user-accounts/um-user-panel.c:657
 #, 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:661
+#: panels/user-accounts/um-user-panel.c:661
 msgid "_Delete"
 msgstr "_Poista"
 
-#: ../panels/user-accounts/um-user-panel.c:711
+#: panels/user-accounts/um-user-panel.c:711
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "KÃ¤yttÃ¤jÃ¤tili pois kÃ¤ytÃ¶stÃ¤"
 
-#: ../panels/user-accounts/um-user-panel.c:719
+#: panels/user-accounts/um-user-panel.c:719
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "Asetetaan seuraavalla kirjautumiskerralla"
 
-#: ../panels/user-accounts/um-user-panel.c:722
+#: panels/user-accounts/um-user-panel.c:722
 msgctxt "Password mode"
 msgid "None"
 msgstr "Ei mitÃ¤Ã¤n"
 
-#: ../panels/user-accounts/um-user-panel.c:769
+#: panels/user-accounts/um-user-panel.c:769
 msgid "Logged in"
 msgstr "SisÃ¤Ã¤nkirjautuneena"
 
-#: ../panels/user-accounts/um-user-panel.c:1117
+#: panels/user-accounts/um-user-panel.c:1117
 msgid "Failed to contact the accounts service"
 msgstr "Yhteys tilipalveluun (accounts service) epÃ¤onnistui"
 
-#: ../panels/user-accounts/um-user-panel.c:1119
+#: panels/user-accounts/um-user-panel.c:1119
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "Varmista, ettÃ¤ AccountService on asennettu ja kÃ¤ytÃ¶ssÃ¤."
 
@@ -6976,7 +7161,7 @@ msgstr "Varmista, ettÃ¤ AccountService on asennettu ja kÃ¤ytÃ¶ssÃ¤."
 #. * We split the line in 2 here to "make it look good", as there's
 #. * no good way to do this in GTK+ for tooltips. See:
 #. * https://bugzilla.gnome.org/show_bug.cgi?id=657168
-#: ../panels/user-accounts/um-user-panel.c:1155
+#: panels/user-accounts/um-user-panel.c:1155
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -6984,12 +7169,12 @@ msgstr ""
 "Tee muutoksia\n"
 "napsauttamalla ensin *-kuvaketta"
 
-#: ../panels/user-accounts/um-user-panel.c:1195
+#: panels/user-accounts/um-user-panel.c:1195
 msgid "Create a user account"
 msgstr "Luo kÃ¤yttÃ¤jÃ¤tili"
 
-#: ../panels/user-accounts/um-user-panel.c:1206
-#: ../panels/user-accounts/um-user-panel.c:1385
+#: panels/user-accounts/um-user-panel.c:1206
+#: panels/user-accounts/um-user-panel.c:1385
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -6997,12 +7182,12 @@ msgstr ""
 "Luo kÃ¤yttÃ¤jÃ¤tili\n"
 "napsauttamalla ensin *-kuvaketta"
 
-#: ../panels/user-accounts/um-user-panel.c:1216
+#: panels/user-accounts/um-user-panel.c:1216
 msgid "Delete the selected user account"
 msgstr "Poista valittu kÃ¤yttÃ¤jÃ¤tili"
 
-#: ../panels/user-accounts/um-user-panel.c:1228
-#: ../panels/user-accounts/um-user-panel.c:1390
+#: panels/user-accounts/um-user-panel.c:1228
+#: panels/user-accounts/um-user-panel.c:1390
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -7010,22 +7195,22 @@ msgstr ""
 "Poista valittu kÃ¤yttÃ¤jÃ¤\n"
 "napsauttamalla ensin *-kuvaketta"
 
-#: ../panels/user-accounts/um-utils.c:507
+#: panels/user-accounts/um-utils.c:507
 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:510
+#: panels/user-accounts/um-utils.c:510
 #, c-format
 msgid "The username is too long."
 msgstr "KÃ¤yttÃ¤jÃ¤tunnus on liian pitkÃ¤."
 
-#: ../panels/user-accounts/um-utils.c:513
+#: panels/user-accounts/um-utils.c:513
 msgid "The username cannot start with a â€œ-â€."
 msgstr "KÃ¤yttÃ¤jÃ¤tunnus ei voi alkaa merkillÃ¤ â€-â€."
 
-#: ../panels/user-accounts/um-utils.c:516
+#: panels/user-accounts/um-utils.c:516
 msgid ""
 "The username should only consist of upper and lower case letters from a-z, "
 "digits and the following characters: . - _"
@@ -7033,24 +7218,24 @@ 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:520
+#: panels/user-accounts/um-utils.c:520
 msgid "This will be used to name your home folder and canâ€™t be changed."
 msgstr "TÃ¤tÃ¤ kÃ¤ytetÃ¤Ã¤n kotikansiosi nimeÃ¤miseen, eikÃ¤ sitÃ¤ voi vaihtaa."
 
-#: ../panels/wacom/button-mapping.ui.h:1
+#: panels/wacom/button-mapping.ui:9
 msgid "Map Buttons"
 msgstr "MÃ¤Ã¤ritÃ¤ painikkeet"
 
-#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:547
-#: ../panels/wacom/gnome-wacom-properties.ui.h:5
+#: panels/wacom/button-mapping.ui:37 panels/wacom/cc-wacom-page.c:547
+#: panels/wacom/gnome-wacom-properties.ui:60
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../panels/wacom/button-mapping.ui.h:3
+#: panels/wacom/button-mapping.ui:71
 msgid "Map buttons to functions"
 msgstr "MÃ¤Ã¤ritÃ¤ painikkeille toimintoja"
 
-#: ../panels/wacom/button-mapping.ui.h:4
+#: panels/wacom/button-mapping.ui:119
 msgid ""
 "To edit a shortcut, choose the â€œSend Keystrokeâ€ action, press the keyboard "
 "shortcut button and hold down the new keys or press Backspace to clear."
@@ -7060,233 +7245,217 @@ 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-gui.c:83
 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-gui.c:87
 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:266
 #, c-format
 msgid "Button %d"
 msgstr "Painike %d"
 
-#: ../panels/wacom/cc-wacom-button-row.h:53
+#: panels/wacom/cc-wacom-button-row.h:53
 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:54
 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:55
 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:56
 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:260
 msgid "Output:"
 msgstr "Ulostulo:"
 
 #. Keep ratio switch
-#: ../panels/wacom/cc-wacom-mapping-panel.c:272
+#: panels/wacom/cc-wacom-mapping-panel.c:272
 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:283
 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:86
 #, c-format
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: ../panels/wacom/cc-wacom-page.c:544
+#: panels/wacom/cc-wacom-page.c:544
 msgid "Display Mapping"
 msgstr "Kohdistus nÃ¤yttÃ¶Ã¶n"
 
-#: ../panels/wacom/cc-wacom-panel.c:790
-#: ../panels/wacom/wacom-stylus-page.ui.h:9
+#: panels/wacom/cc-wacom-panel.c:790 panels/wacom/wacom-stylus-page.ui:127
 msgid "Stylus"
 msgstr "OsoitinkynÃ¤"
 
-#: ../panels/wacom/cc-wacom-stylus-page.c:347
+#: panels/wacom/cc-wacom-stylus-page.c:362
 msgid "Button"
 msgstr "Painike"
 
-#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. 
See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
-msgid "WaÂcom TabÂlet"
-msgstr "Wacom-piirtopÃ¶ytÃ¤"
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:3
+#: panels/wacom/gnome-wacom-properties.ui:198
+msgid "Wacom Tablet"
+msgstr "Wacom-piirtopÃ¶ydÃ¤t"
 
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:4
 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
 msgstr "Aseta piirtopÃ¶ydÃ¤n painikkeet ja kynÃ¤n herkkyys"
 
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:6
+msgid "input-tablet"
+msgstr "input-tablet"
+
 #. Translators: those are keywords for the wacom tablet control-center panel
-#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5
+#: panels/wacom/gnome-wacom-panel.desktop.in.in:18
 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;"
 msgstr "PiirtopÃ¶ytÃ¤;Wacom;Stylus;Eraser;Hiiri;Tablet;Mouse;"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:1
+#: panels/wacom/gnome-wacom-properties.ui:15
 msgid "Tablet (absolute)"
 msgstr "PiirtopÃ¶ytÃ¤ (yksi yhteen)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:2
+#: panels/wacom/gnome-wacom-properties.ui:19
 msgid "Touchpad (relative)"
 msgstr "Kosketuslevy (suhteellinen)"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:3
+#: panels/wacom/gnome-wacom-properties.ui:27
 msgid "Tablet Preferences"
 msgstr "PiirtopÃ¶ydÃ¤n asetukset"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:4
+#: panels/wacom/gnome-wacom-properties.ui:44
 msgid "_Help"
 msgstr "_Ohje"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:6
+#: panels/wacom/gnome-wacom-properties.ui:123
 msgid "No tablet detected"
 msgstr "PiirtopÃ¶ytÃ¤Ã¤ ei havaittu"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:7
+#: panels/wacom/gnome-wacom-properties.ui:139
 msgid "Please plug in or turn on your Wacom tablet"
 msgstr "LiitÃ¤ tai kÃ¤ynnistÃ¤ Wacom-piirtopÃ¶ytÃ¤"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:8
+#: panels/wacom/gnome-wacom-properties.ui:159
 msgid "Bluetooth Settings"
 msgstr "Bluetooth-asetukset"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Wacom Tablet"
-msgstr "Wacom-piirtopÃ¶ydÃ¤t"
-
-#: ../panels/wacom/gnome-wacom-properties.ui.h:10
+#: panels/wacom/gnome-wacom-properties.ui:231
 msgid "Map to Monitorâ€¦"
 msgstr "Kohdista nÃ¤yttÃ¶Ã¶nâ€¦"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:11
+#: panels/wacom/gnome-wacom-properties.ui:247
 msgid "Map Buttonsâ€¦"
 msgstr "MÃ¤Ã¤ritÃ¤ painikkeetâ€¦"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:12
+#: panels/wacom/gnome-wacom-properties.ui:263
 msgid "Calibrateâ€¦"
 msgstr "Kalibroi..."
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:13
+#: panels/wacom/gnome-wacom-properties.ui:284
 msgid "Adjust display resolution"
 msgstr "SÃ¤Ã¤dÃ¤ nÃ¤ytÃ¶n tarkkuutta"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:14
+#: panels/wacom/gnome-wacom-properties.ui:300
 msgid "Adjust mouse settings"
 msgstr "Muuta hiiren asetuksia"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:15
+#: panels/wacom/gnome-wacom-properties.ui:328
 msgid "Tracking Mode"
 msgstr "Seurantatila"
 
-#: ../panels/wacom/gnome-wacom-properties.ui.h:16
+#: panels/wacom/gnome-wacom-properties.ui:356
 msgid "Left-Handed Orientation"
 msgstr "VasenkÃ¤tinen suunta"
 
-#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263
+#: panels/wacom/gsd-wacom-key-shortcut-button.c:263
 msgid "New shortcutâ€¦"
 msgstr "Uusi pikanÃ¤ppÃ¤inâ€¦"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:2
+#: panels/wacom/wacom-stylus-page.ui:29
 msgid "Middle Mouse Button Click"
 msgstr "Hiiren keskimmÃ¤isen painikkeen napsautus"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:3
+#: panels/wacom/wacom-stylus-page.ui:33
 msgid "Right Mouse Button Click"
 msgstr "Hiiren oikean painikkeen napsautus"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:4
+#: panels/wacom/wacom-stylus-page.ui:37
 msgid "Back"
 msgstr "Takaisin"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:5
+#: panels/wacom/wacom-stylus-page.ui:41
 msgid "Forward"
 msgstr "EteenpÃ¤in"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:6
+#: panels/wacom/wacom-stylus-page.ui:77
 msgid "No stylus found"
 msgstr "OsoitinkynÃ¤Ã¤ ei lÃ¶ytynyt"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:7
+#: panels/wacom/wacom-stylus-page.ui:91
 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.h:10
+#: panels/wacom/wacom-stylus-page.ui:167
 msgid "Eraser Pressure Feel"
 msgstr "Pyyhekumin paineentuntu"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:11
+#: panels/wacom/wacom-stylus-page.ui:188 panels/wacom/wacom-stylus-page.ui:348
 msgid "Soft"
 msgstr "PehmeÃ¤"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:12
+#: panels/wacom/wacom-stylus-page.ui:218 panels/wacom/wacom-stylus-page.ui:378
 msgid "Firm"
 msgstr "Kova"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:13
+#: panels/wacom/wacom-stylus-page.ui:241
 msgid "Top Button"
 msgstr "YlÃ¤painike"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:14
+#: panels/wacom/wacom-stylus-page.ui:270
 msgid "Lower Button"
 msgstr "AlanÃ¤ppÃ¤in"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:15
+#: panels/wacom/wacom-stylus-page.ui:299
+#, fuzzy
+#| msgid "Lower Button"
+msgid "Lowest Button"
+msgstr "AlanÃ¤ppÃ¤in"
+
+#: panels/wacom/wacom-stylus-page.ui:328
 msgid "Tip Pressure Feel"
 msgstr "KynÃ¤n kÃ¤rjen paineentuntu"
 
-#: ../panels/wacom/wacom-stylus-page.ui.h:17
+#: panels/wacom/wacom-stylus-page.ui:440
 msgid "page 3"
 msgstr "sivu 3"
 
-#: ../shell/alt/cc-window.c:53 ../shell/alt/cc-window.c:1484
-#: ../shell/cc-window.c:762
-msgid "All Settings"
-msgstr "Kaikki asetukset"
-
-#. Add categories
-#: ../shell/alt/cc-window.c:875
-msgctxt "category"
-msgid "Personal"
-msgstr "HenkilÃ¶kohtaiset"
-
-#: ../shell/alt/cc-window.c:876
-msgctxt "category"
-msgid "Hardware"
-msgstr "Laitteisto"
-
-#: ../shell/alt/cc-window.c:877
-msgctxt "category"
-msgid "System"
-msgstr "JÃ¤rjestelmÃ¤"
-
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1
+#: shell/appdata/gnome-control-center.appdata.xml.in:7
 msgid "GNOME Control Center"
 msgstr "Gnomen asetuskeskus"
 
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:2
+#: 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"
 
-#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:3
+#: 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."
@@ -7294,90 +7463,184 @@ msgstr ""
 "Asetuskeskus on Gnomen ensisijainen kÃ¤yttÃ¶liittymÃ¤ tyÃ¶pÃ¶ydÃ¤n monien eri "
 "asetusten muokkaamiseen."
 
-#: ../shell/cc-application.c:45
+#: shell/cc-application.c:47
 msgid "Display version number"
 msgstr "NÃ¤ytÃ¤ versionumero"
 
-#: ../shell/cc-application.c:46
+#: shell/cc-application.c:48
 msgid "Enable verbose mode"
 msgstr "Ota kÃ¤yttÃ¶Ã¶n lisÃ¤tietoja tulostava tila"
 
-#: ../shell/cc-application.c:47
+#: shell/cc-application.c:49
 msgid "Show the overview"
 msgstr "NÃ¤ytÃ¤ yleiskuva"
 
-#: ../shell/cc-application.c:48
+#: shell/cc-application.c:50
 msgid "Search for the string"
 msgstr "Etsi merkkijonoa"
 
-#: ../shell/cc-application.c:49
+#: shell/cc-application.c:51
 msgid "List possible panel names and exit"
 msgstr "NÃ¤ytÃ¤ mahdolliset paneelinimet ja lopeta"
 
-#: ../shell/cc-application.c:50
+#: shell/cc-application.c:52
 msgid "Panel to display"
 msgstr "NÃ¤ytettÃ¤vÃ¤ paneeli"
 
-#: ../shell/cc-application.c:50
+#: shell/cc-application.c:52
 msgid "[PANEL] [ARGUMENTâ€¦]"
 msgstr "[PANEELI] [ARGUMENTTIâ€¦]"
 
-#: ../shell/cc-application.c:113
+#: shell/cc-application.c:117
 msgid "Available panels:"
 msgstr "KÃ¤ytettÃ¤vissÃ¤ olevat paneelit:"
 
-#: ../shell/cc-application.c:252
+#: shell/cc-application.c:256
 msgid "Help"
 msgstr "Ohje"
 
-#: ../shell/cc-application.c:253
+#: shell/cc-application.c:257
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:2
+#: shell/gnome-control-center.desktop.in.in:4
+msgid "gnome-control-center"
+msgstr "gnome-control-center"
+
+#: shell/gnome-control-center.desktop.in.in:15
 msgid "Preferences;Settings;"
 msgstr "Ominaisuudet;Asetukset;Preferences;Settings;"
 
-#: ../shell/help-overlay.ui.h:1
+#: shell/help-overlay.ui:15
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Yleiset"
 
-#: ../shell/help-overlay.ui.h:2
+#: shell/help-overlay.ui:20
 msgctxt "shortcut window"
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../shell/help-overlay.ui.h:3
+#: shell/help-overlay.ui:27 shell/help-overlay.ui:48
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Haku"
 
-#: ../shell/help-overlay.ui.h:4
+#: shell/help-overlay.ui:35
 msgctxt "shortcut window"
 msgid "Panels"
 msgstr "Paneelit"
 
-#: ../shell/help-overlay.ui.h:5
+#: shell/help-overlay.ui:40
 msgctxt "shortcut window"
 msgid "Go back to the overview"
 msgstr "NÃ¤ytÃ¤ asetusten pÃ¤Ã¤nÃ¤kymÃ¤"
 
-#: ../shell/help-overlay.ui.h:6
+#: shell/help-overlay.ui:53
 msgctxt "shortcut window"
 msgid "Cancel search"
 msgstr "Peru haku"
 
 #. translators: This is the default hotspot name, need to be less than 32-bytes
-#: ../shell/hostname-helper.c:189
+#: shell/hostname-helper.c:189
 msgctxt "hotspot"
 msgid "Hotspot"
 msgstr "Yhteyspiste"
 
-#: ../shell/panel-list.ui.h:3
+#: shell/panel-list.ui:195
 msgid "No results found"
 msgstr "Tuloksia ei lÃ¶ytynyt"
 
+#: shell/window.ui:141
+msgid "All Settings"
+msgstr "Kaikki asetukset"
+
+#. translators:
+#. * The number of sound outputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1873
+#, c-format
+msgid "%u Output"
+msgid_plural "%u Outputs"
+msgstr[0] "%u ulostulo"
+msgstr[1] "%u ulostuloa"
+
+#. translators:
+#. * The number of sound inputs on a particular device
+#: subprojects/gvc/gvc-mixer-control.c:1883
+#, 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
+msgid "System Sounds"
+msgstr "JÃ¤rjestelmÃ¤n Ã¤Ã¤net"
+
+#~ msgid "BackÂground"
+#~ msgstr "Taustakuva"
+
+#~ msgid "BlueÂtooth"
+#~ msgstr "Bluetooth"
+
+#~ msgid "CoÂlor"
+#~ msgstr "VÃ¤ri"
+
+#~ msgid "Section"
+#~ msgstr "Osio"
+
+#~ msgid "Overview"
+#~ msgstr "Yhteenveto"
+
+#~ msgid "DefaÂult Applications"
+#~ msgstr "Oletussovellukset"
+
+#~ msgid "AbÂout"
+#~ msgstr "JÃ¤rjestelmÃ¤tiedot"
+
+#~ msgid "DeÂtails"
+#~ msgstr "Tiedot"
+
+#~ msgid "RemoÂvable Media"
+#~ msgstr "Erilliset tallennusvÃ¤lineet"
+
+#~ msgctxt "keybinding"
+#~ msgid "Search"
+#~ msgstr "Etsi"
+
+#~ msgid "NetÂwork"
+#~ msgstr "Verkko"
+
+#~ msgid "NoÂtiÂfiÂcaÂtions"
+#~ msgstr "Ilmoitukset"
+
+#~ msgid "PoÂwer"
+#~ msgstr "Virranhallinta"
+
+#~ msgid "PriÂvaÂcy"
+#~ msgstr "Yksityisyys"
+
+#~ msgid "ShaÂring"
+#~ msgstr "Jakaminen"
+
+#~ msgid "UniÂverÂsal Access"
+#~ msgstr "EsteettÃ¶myys"
+
+#~ msgid "WaÂcom TabÂlet"
+#~ msgstr "Wacom-piirtopÃ¶ytÃ¤"
+
+#~ msgctxt "category"
+#~ msgid "Personal"
+#~ msgstr "HenkilÃ¶kohtaiset"
+
+#~ msgctxt "category"
+#~ msgid "Hardware"
+#~ msgstr "Laitteisto"
+
+#~ msgctxt "category"
+#~ msgid "System"
+#~ msgstr "JÃ¤rjestelmÃ¤"
+
 #~ msgid "invalid EAP-TLS password: missing"
 #~ msgstr "virheellinen EAP-TLS-salasana: puuttuu"
 
@@ -7810,9 +8073,6 @@ msgstr "Tuloksia ei lÃ¶ytynyt"
 #~ msgid "_Sign In"
 #~ msgstr "_Kirjaudu sisÃ¤Ã¤n"
 
-#~ msgid "Color"
-#~ msgstr "VÃ¤rit"
-
 #~ msgid "_Name:"
 #~ msgstr "_Nimi:"
 
@@ -7913,12 +8173,6 @@ msgstr "Tuloksia ei lÃ¶ytynyt"
 #~ msgid "Yes"
 #~ msgstr "KyllÃ¤"
 
-#~ msgid "Power"
-#~ msgstr "VirransÃ¤Ã¤stÃ¶"
-
-#~ msgid "Privacy"
-#~ msgstr "Yksityisyys"
-
 #~ msgctxt "Search Location"
 #~ msgid "Other"
 #~ msgstr "Muu"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]