[gnome-control-center] Updated Finnish translation



commit 445cde0433b1ce297644b0591ac1b29c50865651
Author: Ville-Pekka Vainio <vpvainio iki fi>
Date:   Sat Mar 23 23:23:09 2013 +0200

    Updated Finnish translation

 po/fi.po | 5489 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 3824 insertions(+), 1665 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 52d7057..3080be1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,31 +7,34 @@
 # mouse key = hiirinäppäin
 # toggle key = piippaava näppäin
 #
-# Gnome 2012-03 Finnish translation sprint participants:
+# Gnome 2012-13 Finnish translation sprint participants:
 # Jiri Grönroos
 # Niklas Laxström
 # Timo Jyrinki
+#
 # Pauli Virtanen <pauli virtanen hut fi>, 2000-2004.
 # Ilkka Tuohela <hile iki fi>, 2005-2009.
 # Tommi Vainikainen <thv iki fi>, 2009-2010.
 # Timo Jyrinki <timo jyrinki iki fi>, 2008-2011.
-# Jiri Grönroos <jiri gronroos iki fi>, 2012.
+# Jiri Grönroos <jiri gronroos iki fi>, 2012, 2013.
+# Ville-Pekka Vainio <vpvainio iki fi>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "control-center&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-21 14:06+0000\n"
-"PO-Revision-Date: 2012-09-23 14:50+0300\n"
-"Last-Translator: Jiri Grönroos <jiri gronroos iki fi>\n"
-"Language-Team: Finnish <kde-i18n-doc kde org>\n"
+"POT-Creation-Date: 2013-03-23 17:31+0000\n"
+"PO-Revision-Date: 2013-03-23 23:14+0200\n"
+"Last-Translator: Ville-Pekka Vainio <vpvainio iki fi>\n"
+"Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-POT-Import-Date: 2012-03-07 10:37:43+0000\n"
+"X-Project-Style: gnome\n"
 
 #. This refers to a slideshow background
 #: ../panels/background/background.ui.h:2
@@ -96,22 +99,22 @@ msgstr "Flickr"
 msgid "Select"
 msgstr "Valitse"
 
-#: ../panels/background/cc-background-item.c:148
+#: ../panels/background/cc-background-item.c:150
 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:152
+#: ../panels/background/cc-background-item.c:154
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
 
-#: ../panels/background/cc-background-item.c:281
+#: ../panels/background/cc-background-item.c:283
 msgid "No Desktop Background"
 msgstr "Ei työpöydän taustaa"
 
-#: ../panels/background/cc-background-panel.c:387
+#: ../panels/background/cc-background-panel.c:453
 msgid "Current background"
 msgstr "Nykyinen taustakuva"
 
@@ -120,24 +123,14 @@ msgid "Background"
 msgstr "Taustakuva"
 
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:2
-msgid "Change the background"
-msgstr "Vaihda taustakuvaa"
+msgid "Change your background image to a wallpaper or photo"
+msgstr "Vaihda taustakuva"
 
 #. Translators: those are keywords for the background control-center panel
 #: ../panels/background/gnome-background-panel.desktop.in.in.h:4
 msgid "Wallpaper;Screen;Desktop;"
 msgstr "Taustakuva;Näyttö;Työpöytä;Wallpaper;Screen;Desktop;"
 
-#. TRANSLATORS: device type
-#: ../panels/bluetooth/bluetooth-properties.desktop.in.in.h:1
-#: ../panels/network/panel-common.c:102
-msgid "Bluetooth"
-msgstr "Bluetooth"
-
-#: ../panels/bluetooth/bluetooth-properties.desktop.in.in.h:2
-msgid "Configure Bluetooth settings"
-msgstr "Määritä Bluetooth-asetukset"
-
 #: ../panels/bluetooth/bluetooth.ui.h:1
 msgid "Set Up New Device"
 msgstr "Asenna uusi laite..."
@@ -151,479 +144,839 @@ msgid "Connection"
 msgstr "Yhteys"
 
 #: ../panels/bluetooth/bluetooth.ui.h:4
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:2
+#: ../panels/network/connection-editor/security-page.ui.h:2
+#: ../panels/printers/printers.ui.h:14
+msgid "page 1"
+msgstr "sivu 1"
+
+#: ../panels/bluetooth/bluetooth.ui.h:5
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:5
+#: ../panels/network/connection-editor/security-page.ui.h:5
+#: ../panels/printers/printers.ui.h:16
+msgid "page 2"
+msgstr "sivu 2"
+
+#: ../panels/bluetooth/bluetooth.ui.h:6
 msgid "Paired"
 msgstr "Paritettu"
 
-#: ../panels/bluetooth/bluetooth.ui.h:5 ../panels/wacom/cc-wacom-page.c:756
+#: ../panels/bluetooth/bluetooth.ui.h:7 ../panels/wacom/cc-wacom-page.c:789
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../panels/bluetooth/bluetooth.ui.h:6
+#: ../panels/bluetooth/bluetooth.ui.h:8
+#: ../panels/network/connection-editor/ce-page-ip4.c:189
+#: ../panels/network/connection-editor/ce-page-ip4.c:441
+#: ../panels/network/connection-editor/ce-page-ip6.c:191
+#: ../panels/network/connection-editor/ce-page-ip6.c:445
 msgid "Address"
 msgstr "Osoite"
 
-#: ../panels/bluetooth/bluetooth.ui.h:7
-msgid "Mouse and Touchpad Settings"
-msgstr "Hiiri ja kosketuslevy"
+#: ../panels/bluetooth/bluetooth.ui.h:9
+msgid "Mouse & Touchpad Settings"
+msgstr "Hiiren ja kosketuslevyn asetukset"
 
-#: ../panels/bluetooth/bluetooth.ui.h:8 ../panels/universal-access/uap.ui.h:38
+#: ../panels/bluetooth/bluetooth.ui.h:10
+#: ../panels/universal-access/uap.ui.h:38
 msgid "Sound Settings"
 msgstr "Ääniasetukset"
 
-#: ../panels/bluetooth/bluetooth.ui.h:9
+#: ../panels/bluetooth/bluetooth.ui.h:11
 msgid "Keyboard Settings"
 msgstr "Näppäimistö"
 
-#: ../panels/bluetooth/bluetooth.ui.h:10
-msgid "Send Files..."
-msgstr "Lähetä tiedostoja..."
-
-#: ../panels/bluetooth/bluetooth.ui.h:11
-msgid "Browse Files..."
-msgstr "Selaa tiedostoja..."
-
-#. Translator: This string appears next to a toggle switch which controls enabling/disabling Bluetooth 
radio's on the device.
-#: ../panels/bluetooth/bluetooth.ui.h:13
-msgctxt "Power"
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../panels/bluetooth/bluetooth.ui.h:12
+msgid "Send Files…"
+msgstr "Lähetä tiedostoja…"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:290
+#: ../panels/bluetooth/cc-bluetooth-panel.c:355
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:290
+#: ../panels/bluetooth/cc-bluetooth-panel.c:355
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2
 msgid "No"
 msgstr "Ei"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:405
+#: ../panels/bluetooth/cc-bluetooth-panel.c:469
 msgid "Bluetooth is disabled"
 msgstr "Bluetooth on pois käytöstä"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:410
+#: ../panels/bluetooth/cc-bluetooth-panel.c:474
 msgid "Bluetooth is disabled by hardware switch"
 msgstr "Bluetooth on pois käytöstä laitekytkimen asennon vuoksi"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:414
+#: ../panels/bluetooth/cc-bluetooth-panel.c:478
 msgid "No Bluetooth adapters found"
 msgstr "Bluetooth-sovittimia ei löytynyt"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:547
+#: ../panels/bluetooth/cc-bluetooth-panel.c:577
 msgid "Visibility"
 msgstr "Näkyvyys"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:551
+#: ../panels/bluetooth/cc-bluetooth-panel.c:581
 #, c-format
 msgid "Visibility of “%s”"
 msgstr "Näkyvyys (%s)"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:595
+#: ../panels/bluetooth/cc-bluetooth-panel.c:625
 #, c-format
 msgid "Remove '%s' from the list of devices?"
 msgstr "Poistetaanko ”%s” tunnettujen laitteiden luettelosta?"
 
-#: ../panels/bluetooth/cc-bluetooth-panel.c:597
+#: ../panels/bluetooth/cc-bluetooth-panel.c:627
 msgid ""
 "If you remove the device, you will have to set it up again before next use."
 msgstr ""
 "Jos laite poistetaan, sen asetukset tulee tehdä uudelleen ennen seuraavaa "
 "käyttökertaa."
 
-#. TRANSLATORS: this is where the user can click and import a profile
-#: ../panels/color/cc-color-panel.c:106
-msgid "Other profile…"
-msgstr "Muu profiili..."
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1
+msgid "Bluetooth"
+msgstr "Bluetooth"
+
+#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2
+msgid "Turn Bluetooth on and off and connect your devices"
+msgstr "Kytke Bluetooth päälle tai pois ja yhdistä laitteita"
+
+#. TRANSLATORS: The user has to attach the sensor to the screen
+#: ../panels/color/cc-color-calibrate.c:360
+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:366
+msgid ""
+"Move your calibration device to the calibrate position and press 'Continue'"
+msgstr "Vaihda kalibrointilaite kalibrointitilaan 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:372
+msgid ""
+"Move your calibration device to the surface position and press 'Continue'"
+msgstr ""
+
+#. 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:378
+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:409
+#| msgid "An internal error occurred."
+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:414
+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:420
+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:426
+msgid "The target whitepoint was not obtainable."
+msgstr ""
+
+#. TRANSLATORS: the display calibration process is finished
+#: ../panels/color/cc-color-calibrate.c:466
+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:474
+msgid "Calibration failed!"
+msgstr "Kalibrointi epäonnistui!"
+
+#. TRANSLATORS: The user can now remove the sensor from the screen
+#: ../panels/color/cc-color-calibrate.c:481
+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:552
+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
+msgid "Laptop Screen"
+msgstr "Kannettavan näyttö"
+
+#. TRANSLATORS: This refers to the embedded webcam on a laptop
+#: ../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
+#, 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
+#, c-format
+msgid "%s Scanner"
+msgstr "Kuvanlukija - %s"
+
+#. TRANSLATORS: a camera device, e.g. 'Nikon D60 Camera'
+#: ../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
+#, c-format
+msgid "%s Printer"
+msgstr "Tulostin - %s"
+
+#. TRANSLATORS: a webcam device, e.g. 'Philips HiDef Camera'
+#: ../panels/color/cc-color-common.c:81
+#, c-format
+msgid "%s Webcam"
+msgstr "Web-kamera - %s"
+
+#: ../panels/color/cc-color-device.c:89
+#, c-format
+#| msgid "Learn more about color management"
+msgid "Enable color management for %s"
+msgstr "Käytä värinhallintaa laitteelle %s"
+
+#: ../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:322
+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:119
+#: ../panels/color/cc-color-panel.c:133
 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:126
+#: ../panels/color/cc-color-panel.c:141
 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:132
+#: ../panels/color/cc-color-panel.c:148
 msgid "Test profile: "
 msgstr "Testiprofiili:"
 
-#. TRANSLATORS: this is when the profile should be set for all users
-#: ../panels/color/cc-color-panel.c:185 ../panels/color/color.ui.h:11
-msgid "Set for all users"
-msgstr "Aseta kaikille käyttäjille"
-
-#. TRANSLATORS: this is when the profile should be set for all users
-#: ../panels/color/cc-color-panel.c:192
-msgid "Create virtual device"
-msgstr "Luo virtuaalilaite"
-
 #. TRANSLATORS: an ICC profile is a file containing colorspace data
-#: ../panels/color/cc-color-panel.c:227
+#: ../panels/color/cc-color-panel.c:216
 msgid "Select ICC Profile File"
 msgstr "Valitse ICC-profiilitiedosto"
 
-#: ../panels/color/cc-color-panel.c:230
+#: ../panels/color/cc-color-panel.c:219
 msgid "_Import"
 msgstr "_Tuo"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:241
+#: ../panels/color/cc-color-panel.c:230
 msgid "Supported ICC profiles"
 msgstr "Tuetut ICC-profiilit"
 
 #. TRANSLATORS: filter name on the file->open dialog
-#: ../panels/color/cc-color-panel.c:248
+#: ../panels/color/cc-color-panel.c:237
+#: ../panels/network/wireless-security/eap-method-fast.c:410
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:522
-msgid "Available Profiles for Displays"
-msgstr "Näytöille käytettävissä olevat profiilit"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:526
-msgid "Available Profiles for Scanners"
-msgstr "Kuvanlukijoille käytettävissä olevat profiilit"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:530
-msgid "Available Profiles for Printers"
-msgstr "Tulostimille käytettävissä olevat profiilit"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:534
-msgid "Available Profiles for Cameras"
-msgstr "Kameroille käytettävissä olevat profiilit"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#: ../panels/color/cc-color-panel.c:538
-msgid "Available Profiles for Webcams"
-msgstr "Web-kameroille käytettävissä olevat profiilit"
-
-#. TRANSLATORS: this is the dialog title in the 'Add profile' UI
-#. * where the device type is not recognised
-#. Profiles that can be added to the device
-#: ../panels/color/cc-color-panel.c:543 ../panels/color/color.ui.h:2
-msgid "Available Profiles"
-msgstr "Käytettävissä olevat profiilit"
-
-#. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:824
-#: ../panels/sound/gvc-mixer-dialog.c:1525
-msgid "Device"
-msgstr "Laite"
+#: ../panels/color/cc-color-panel.c:581
+#| msgctxt "Distance"
+#| msgid "¼ Screen"
+msgid "Screen"
+msgstr "Näyttö"
 
-#. TRANSLATORS: column for device list
-#: ../panels/color/cc-color-panel.c:859
-msgid "Calibration"
-msgstr "Kalibrointi"
+#. TRANSLATORS: this is the dialog to save the ICC profile
+#: ../panels/color/cc-color-panel.c:853
+msgid "Save Profile"
+msgstr "Tallenna profiili"
 
 #. TRANSLATORS: this is when the button is sensitive
-#: ../panels/color/cc-color-panel.c:891
+#: ../panels/color/cc-color-panel.c:1214
 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:905 ../panels/color/cc-color-panel.c:929
+#: ../panels/color/cc-color-panel.c:1229 ../panels/color/cc-color-panel.c:1253
 msgid ""
 "The measuring instrument is not detected. Please check it is turned on and "
 "correctly connected."
 msgstr ""
+"Mittalaitetta ei tunnistettu. Tarkista että se on oikein liitetty ja että "
+"siinä on virta päällä."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:938
+#: ../panels/color/cc-color-panel.c:1263
 msgid "The measuring instrument does not support printer profiling."
-msgstr ""
+msgstr "Mittalaite ei tue tulostimien profilointia."
 
 #. TRANSLATORS: this is when the button is insensitive
-#: ../panels/color/cc-color-panel.c:949
+#: ../panels/color/cc-color-panel.c:1274
 msgid "The device type is not currently supported."
 msgstr "Laitetyyppi ei ole tällä hetkellä tuettu."
 
-#. TRANSLATORS: this is when an auto-added profile cannot be removed
-#: ../panels/color/cc-color-panel.c:1022
-msgid "Cannot remove automatically added profile"
-msgstr "Automaattisesti lisättyä profiilia ei voi poistaa"
-
-#. TRANSLATORS: this is when there is no profile for the device
-#: ../panels/color/cc-color-panel.c:1359
-msgid "No profile"
-msgstr "Ei profiilia"
-
-#: ../panels/color/cc-color-panel.c:1390
-#, c-format
-msgid "%i year"
-msgid_plural "%i years"
-msgstr[0] "%i vuosi"
-msgstr[1] "%i vuotta"
-
-#: ../panels/color/cc-color-panel.c:1401
-#, c-format
-msgid "%i month"
-msgid_plural "%i months"
-msgstr[0] "%i kuukausi"
-msgstr[1] "%i kuukautta"
-
-#: ../panels/color/cc-color-panel.c:1412
-#, c-format
-msgid "%i week"
-msgid_plural "%i weeks"
-msgstr[0] "%i tunti"
-msgstr[1] "%i tuntia"
-
-#. fallback
-#: ../panels/color/cc-color-panel.c:1419
-#, c-format
-msgid "Less than 1 week"
-msgstr "Alle yksi viikko"
+#. TRANSLATORS: standard spaces are well known colorspaces like
+#. * sRGB, AdobeRGB and ProPhotoRGB
+#: ../panels/color/cc-color-profile.c:101
+#| msgctxt "Experience"
+#| msgid "Standard"
+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:107
+msgid "Test Profile"
+msgstr "Testiprofiili"
+
+#. TRANSLATORS: automatic profiles are generated automatically
+#. * by the color management system based on manufacturing data,
+#. * for instance the default monitor profile is created from the
+#. * primaries specified in the monitor EDID
+#: ../panels/color/cc-color-profile.c:115
+msgctxt "Automatically generated profile"
+msgid "Automatic"
+msgstr "Automaattinen"
 
-#: ../panels/color/cc-color-panel.c:1481
+#. 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:125
+msgctxt "Profile quality"
+msgid "Low Quality"
+msgstr "Matala laatu"
+
+#. TRANSLATORS: the profile quality
+#: ../panels/color/cc-color-profile.c:130
+#| msgctxt "Printer Option Group"
+#| msgid "Image Quality"
+msgctxt "Profile quality"
+msgid "Medium Quality"
+msgstr "Keskimääräinen laatu"
+
+#. TRANSLATORS: the profile quality - high quality profiles take
+#. * a *long* time, and have the best calibration and
+#. * characterisation data.
+#: ../panels/color/cc-color-profile.c:137
+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:154
 msgctxt "Colorspace fallback"
 msgid "Default RGB"
 msgstr "Oletus-RGB"
 
-#: ../panels/color/cc-color-panel.c:1486
+#. 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:161
 msgctxt "Colorspace fallback"
 msgid "Default CMYK"
 msgstr "Oletus-CMYK"
 
-#: ../panels/color/cc-color-panel.c:1491
+#. 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:168
 msgctxt "Colorspace fallback"
 msgid "Default Gray"
 msgstr "Oletusharmaasävy"
 
-#: ../panels/color/cc-color-panel.c:1609 ../panels/color/cc-color-panel.c:1650
-#: ../panels/color/cc-color-panel.c:1661 ../panels/color/cc-color-panel.c:1672
-msgid "Uncalibrated"
-msgstr "Kalibroimaton"
+#: ../panels/color/cc-color-profile.c:192
+msgid "Vendor supplied factory calibration data"
+msgstr "Valmistajan toimittaja tehdaskalibrointidata"
 
-#: ../panels/color/cc-color-panel.c:1612
-msgid "This device is not color managed."
-msgstr "Tämä laite ei tue värihallintaa."
+#: ../panels/color/cc-color-profile.c:201
+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-panel.c:1653
-msgid "This device is using manufacturing calibrated data."
-msgstr ""
+#: ../panels/color/cc-color-profile.c:223
+msgid "This profile may no longer be accurate"
+msgstr "Tämä profiili ei välttämättä ole enää tarkka"
 
-#: ../panels/color/cc-color-panel.c:1664
-msgid ""
-"This device does not have a profile suitable for whole-screen color "
-"correction."
-msgstr ""
-"Tällä laitteella ei ole koko näytön värinkorjaukseen soveltuvaa profiilia."
-
-#: ../panels/color/cc-color-panel.c:1697
-msgid "This device has an old profile that may no longer be accurate."
-msgstr "Laitteella on vanha profiili, joka ei enää välttämättä ole tarkka."
-
-#. TRANSLATORS: this is when the calibration profile age is not
-#. * specified as it has been autogenerated from the hardware
-#: ../panels/color/cc-color-panel.c:1725
-msgid "Not specified"
-msgstr "Ei määritelty"
-
-#. add the 'No devices detected' entry
-#: ../panels/color/cc-color-panel.c:1910
-msgid "No devices supporting color management detected"
-msgstr "Värihallintaa tukevia laitteita ei havaittu"
-
-#: ../panels/color/cc-color-panel.c:2139
-msgctxt "Device kind"
-msgid "Display"
-msgstr "Näyttö"
+#: ../panels/color/color-calibrate.ui.h:1
+#| msgid "Calibration"
+msgid "Display Calibration"
+msgstr "Näytön kalibrointi"
 
-#: ../panels/color/cc-color-panel.c:2141
-msgctxt "Device kind"
-msgid "Scanner"
-msgstr "Kuvanlukija"
+#: ../panels/color/color-calibrate.ui.h:2
+#: ../panels/printers/authentication-dialog.ui.h:2
+#: ../panels/printers/ppd-selection-dialog.ui.h:2
+#: ../panels/user-accounts/data/photo-dialog.ui.h:8
+#: ../panels/user-accounts/um-account-dialog.c:1067
+msgid "Cancel"
+msgstr "Peru"
 
-#: ../panels/color/cc-color-panel.c:2143
-msgctxt "Device kind"
-msgid "Printer"
-msgstr "Tulostin"
+#. This starts the calibration process
+#: ../panels/color/color-calibrate.ui.h:4
+msgid "Start"
+msgstr "Käynnistä"
 
-#: ../panels/color/cc-color-panel.c:2145
-msgctxt "Device kind"
-msgid "Camera"
-msgstr "Kamera"
+#. This resumes the calibration process
+#: ../panels/color/color-calibrate.ui.h:6
+msgid "Resume"
+msgstr "Jatka"
 
-#: ../panels/color/cc-color-panel.c:2147
-msgctxt "Device kind"
-msgid "Webcam"
-msgstr "Web-kamera"
+#. This button returns the user back to the color control panel
+#: ../panels/color/color-calibrate.ui.h:8
+msgid "Done"
+msgstr "Valmis"
 
-#: ../panels/color/color.ui.h:3
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
-msgid "Color"
-msgstr "Värit"
+#. Text printed on screen
+#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/gui_gtk.c:78
+msgid "Screen Calibration"
+msgstr "Näytön kalibrointi"
 
-#: ../panels/color/color.ui.h:4
-msgid "Each device needs an up to date color profile to be color managed."
+#: ../panels/color/color.ui.h:2
+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 "
+"color profile."
 msgstr ""
-"Laitteet vaativat ajan tasalla olevan väriprofiilin, jotta niiden värejä on "
-"mahdollista hallita."
+"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:5
-msgid "Learn more"
-msgstr "Lue lisää"
+#: ../panels/color/color.ui.h:3
+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."
 
-#: ../panels/color/color.ui.h:6
-msgid "Learn more about color management"
-msgstr "Lue lisää värienhallinnasta"
+#. This is the approximate time it takes to calibrate the display.
+#: ../panels/color/color.ui.h:5
+msgid "Quality"
+msgstr "Laatu"
 
+#. This is the approximate time it takes to calibrate the display.
 #: ../panels/color/color.ui.h:7
-msgid "Add device"
-msgstr "Lisää laite"
+msgid "Approximate Time"
+msgstr "Arvioitu aika"
 
 #: ../panels/color/color.ui.h:8
-msgid "Add a virtual device"
-msgstr "Lisää virtuaalilaite"
+msgid "Calibration Quality"
+msgstr "Kalibrointilaatu"
 
 #: ../panels/color/color.ui.h:9
-msgid "Delete device"
-msgstr "Poista laite"
+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
-msgid "Remove a device"
-msgstr "Poista laite"
+msgid "Calibration Device"
+msgstr "Kalibrointilaite"
+
+#: ../panels/color/color.ui.h:11
+msgid "Select the type of display that is connected."
+msgstr "Valitse yhdistetyn näytön tyyppi."
 
 #: ../panels/color/color.ui.h:12
-msgid "Set this profile for all users on this computer"
-msgstr "Aseta tämä profiili kaikille tietokoneen käyttäjille"
+msgid "Display Type"
+msgstr "Näytön tyyppi"
 
 #: ../panels/color/color.ui.h:13
-msgid "Add profile"
-msgstr "Lisää profiili"
+msgid ""
+"Select a display target white point. Most displays should be calibrated to a "
+"D65 illuminant."
+msgstr ""
 
 #: ../panels/color/color.ui.h:14
-msgid "Calibrate…"
-msgstr "Kalibroi..."
+msgid "Profile Whitepoint"
+msgstr ""
 
 #: ../panels/color/color.ui.h:15
-msgid "Calibrate the device"
-msgstr "Kalibroi laite"
+msgid ""
+"Please set the display to a brightness that is typical for you. Color "
+"management will be most accurate at this brightness level."
+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
-msgid "Remove profile"
-msgstr "Poista profiili"
+msgid ""
+"Alternatively, you can use the brightness level used with one of the other "
+"profiles for this device."
+msgstr ""
+"Voit myös käyttää samaa kirkkaustasoa kuin muut tätä laitetta varten tehdyt "
+"profiilit."
 
 #: ../panels/color/color.ui.h:17
-msgid "View details"
-msgstr "Näytä yksityiskohdat"
+msgid "Display Brightness"
+msgstr "Näytön kirkkaus"
 
 #: ../panels/color/color.ui.h:18
+msgid ""
+"You can use a color profile on different computers, or even create profiles "
+"for different lighting conditions."
+msgstr ""
+"Voit käyttää väriprofiilia eri tietokoneilla, tai vaikkapa luoda profiileja "
+"eri valaistuksia varten."
+
+#: ../panels/color/color.ui.h:19
+msgid "Profile Name:"
+msgstr "Profiilin nimi:"
+
+#: ../panels/color/color.ui.h:20
+msgid "Profile Name"
+msgstr "Profiilin nimi"
+
+#: ../panels/color/color.ui.h:21
+msgid "Profile successfully created!"
+msgstr "Profiili luotiin onnistuneesti!"
+
+#: ../panels/color/color.ui.h:22
+msgid "Export"
+msgstr "Vie"
+
+#: ../panels/color/color.ui.h:23
+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"
+"\">Microsoft Windows</a> systems useful."
+msgstr ""
+"Näistä ohjeista profiilin käyttöön <a href=\"linux\">GNU/Linuxilla</a>, <a "
+"href=\"osx\">Apple OS X:llä</a> ja <a href=\"windows\">Windowsilla</a> saattaa "
+"olla hyötyä."
+
+#: ../panels/color/color.ui.h:24
+#: ../panels/user-accounts/um-fingerprint-dialog.c:743
+msgid "Summary"
+msgstr "Yhteenveto"
+
+#: ../panels/color/color.ui.h:25
+msgid "Import File…"
+msgstr "Tuo tiedosto…"
+
+#: ../panels/color/color.ui.h:26
+msgid ""
+"Problems detected. The profile may not work correctly. <a href=\"\">Show "
+"details.</a>"
+msgstr ""
+"Ongelmia havaittu. Profiili ei välttämättä toimi kunnolla. <a href="
+"\"\">Näytä tiedot.</a>"
+
+#: ../panels/color/color.ui.h:27
 msgid "Device type:"
 msgstr "Laitetyyppi:"
 
-#: ../panels/color/color.ui.h:19
+#: ../panels/color/color.ui.h:28
 msgid "Manufacturer:"
 msgstr "Valmistaja:"
 
-#: ../panels/color/color.ui.h:20
+#: ../panels/color/color.ui.h:29
 msgid "Model:"
 msgstr "Malli:"
 
-#: ../panels/color/color.ui.h:21
+#: ../panels/color/color.ui.h:30
 msgid ""
 "Image files can be dragged on this window to auto-complete the above fields."
 msgstr ""
 "Kuvatiedostoja voidaan raahata tähän ikkunaan yllä olevien kenttien "
 "automaattiseksi täyttämiseksi."
 
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
-msgid "Color management settings"
-msgstr "Värien hallinta"
+#: ../panels/color/color.ui.h:31
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:1
+msgid "Color"
+msgstr "Värit"
 
-#. Translators: those are keywords for the color control-center panel
-#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
-msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
-msgstr "väri;ICC;color;profiili;kalibrointi;Calibrate;Tulostin;Printer;Näyttö;"
+#: ../panels/color/color.ui.h:32
+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."
 
-#. Add some common languages first
-#: ../panels/common/cc-common-language.c:523
-msgid "English"
-msgstr "Englanti"
+#: ../panels/color/color.ui.h:33
+msgid "Learn more"
+msgstr "Lue lisää"
+
+#: ../panels/color/color.ui.h:34
+msgid "Learn more about color management"
+msgstr "Lue lisää värienhallinnasta"
 
-#: ../panels/common/cc-common-language.c:525
-msgid "British English"
-msgstr "Brittienglanti"
+#: ../panels/color/color.ui.h:35
+msgid "Set for all users"
+msgstr "Aseta kaikille käyttäjille"
 
-#: ../panels/common/cc-common-language.c:528
-msgid "German"
-msgstr "Saksa"
+#: ../panels/color/color.ui.h:36
+msgid "Set this profile for all users on this computer"
+msgstr "Aseta tämä profiili kaikille tietokoneen käyttäjille"
 
-#: ../panels/common/cc-common-language.c:531
-msgid "French"
-msgstr "Ranska"
+#: ../panels/color/color.ui.h:37
+#| msgid "Enabled"
+msgid "Enable"
+msgstr "Ota käyttöön"
 
-#: ../panels/common/cc-common-language.c:534
-msgid "Spanish"
-msgstr "Espanja"
+#: ../panels/color/color.ui.h:38
+msgid "Add profile"
+msgstr "Lisää profiili"
+
+#: ../panels/color/color.ui.h:39
+#: ../panels/wacom/gnome-wacom-properties.ui.h:10
+msgid "Calibrate…"
+msgstr "Kalibroi..."
+
+#: ../panels/color/color.ui.h:40
+msgid "Calibrate the device"
+msgstr "Kalibroi laite"
+
+#: ../panels/color/color.ui.h:41
+msgid "Remove profile"
+msgstr "Poista profiili"
+
+#: ../panels/color/color.ui.h:42
+msgid "View details"
+msgstr "Näytä yksityiskohdat"
+
+#: ../panels/color/color.ui.h:43
+msgid "Unable to detect any devices that can be color managed"
+msgstr "Värihallinnan piiriin sopivia laitteita ei havaittu"
 
-#: ../panels/common/cc-common-language.c:536
-msgid "Chinese (simplified)"
-msgstr "Kiina (yksinkertaistettu)"
+#: ../panels/color/color.ui.h:44
+msgid "LCD"
+msgstr "LCD"
 
-#: ../panels/common/cc-common-language.c:539
-msgid "Russian"
-msgstr "Venäjä"
+#: ../panels/color/color.ui.h:45
+msgid "LED"
+msgstr "LED"
 
-#: ../panels/common/cc-common-language.c:542
-msgid "Arabic"
-msgstr "Arabia"
+#: ../panels/color/color.ui.h:46
+msgid "CRT"
+msgstr "CRT"
+
+#: ../panels/color/color.ui.h:47
+#| msgid "Co_nnector:"
+msgid "Projector"
+msgstr "Projektori"
+
+#: ../panels/color/color.ui.h:48
+msgid "Plasma"
+msgstr "Plasma"
+
+#: ../panels/color/color.ui.h:49
+msgctxt "Calibration quality"
+msgid "High"
+msgstr "Korkea"
+
+#: ../panels/color/color.ui.h:50
+msgid "40 minutes"
+msgstr "40 minuuttia"
+
+#: ../panels/color/color.ui.h:51
+msgctxt "Calibration quality"
+msgid "Medium"
+msgstr "Keskitaso"
+
+#: ../panels/color/color.ui.h:52 ../panels/power/power.ui.h:4
+#: ../panels/privacy/privacy.ui.h:7
+msgid "30 minutes"
+msgstr "30 minuuttia"
+
+#: ../panels/color/color.ui.h:53
+msgctxt "Calibration quality"
+msgid "Low"
+msgstr "Matala"
+
+#: ../panels/color/color.ui.h:54 ../panels/power/power.ui.h:3
+msgid "15 minutes"
+msgstr "15 minuuttia"
+
+#: ../panels/color/color.ui.h:55
+#, fuzzy
+#| msgid "Panel to display"
+msgid "Native to display"
+msgstr "Näytettävä paneeli"
+
+#: ../panels/color/color.ui.h:56
+msgid "D50 (Printing and publishing)"
+msgstr "D50 (Tulostus ja julkaisu)"
+
+#: ../panels/color/color.ui.h:57
+msgid "D55"
+msgstr "D55"
+
+#: ../panels/color/color.ui.h:58
+msgid "D65 (Photography and graphics)"
+msgstr "D65 (Valokuvaus ja grafiikka)"
+
+#: ../panels/color/color.ui.h:59
+msgid "D75"
+msgstr "D75"
+
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:2
+msgid ""
+"Calibrate the color of your devices, such as displays, cameras or printers"
+msgstr "Kalibroi laitteidesi, kuten näytön, kameran ja tulostimen värejä"
+
+#. Translators: those are keywords for the color control-center panel
+#: ../panels/color/gnome-color-panel.desktop.in.in.h:4
+msgid "Color;ICC;Profile;Calibrate;Printer;Display;"
+msgstr "väri;ICC;color;profiili;kalibrointi;Calibrate;Tulostin;Printer;Näyttö;"
 
 #. Add some common regions
-#: ../panels/common/cc-common-language.c:571
+#: ../panels/common/cc-common-language.c:677
 msgid "United States"
 msgstr "Yhdysvallat"
 
-#: ../panels/common/cc-common-language.c:572
+#: ../panels/common/cc-common-language.c:678
 msgid "Germany"
 msgstr "Saksa"
 
-#: ../panels/common/cc-common-language.c:573
+#: ../panels/common/cc-common-language.c:679
 msgid "France"
 msgstr "Ranska"
 
-#: ../panels/common/cc-common-language.c:574
+#: ../panels/common/cc-common-language.c:680
 msgid "Spain"
 msgstr "Espanja"
 
-#: ../panels/common/cc-common-language.c:575
+#: ../panels/common/cc-common-language.c:681
 msgid "China"
 msgstr "Kiina"
 
-#: ../panels/common/cc-language-chooser.c:122
-msgid "Other..."
+#: ../panels/common/cc-common-language.c:747
+msgid "Other…"
 msgstr "Muu…"
 
-#: ../panels/common/cc-language-chooser.c:296
-msgid "Select a region"
-msgstr "Valitse alue"
+#: ../panels/common/cc-language-chooser.c:176
+#: ../panels/region/cc-format-chooser.c:266
+#: ../panels/region/cc-input-chooser.c:172
+msgid "More…"
+msgstr "Lisää…"
+
+#: ../panels/common/cc-language-chooser.c:193
+msgid "No languages found"
+msgstr "Kieli ei löytynyt"
+
+#. translators:
+#. * The device has been disabled
+#: ../panels/common/cc-util.c:28 ../panels/keyboard/cc-keyboard-option.c:276
+#: ../panels/keyboard/cc-keyboard-option.c:408
+#: ../panels/keyboard/keyboard-shortcuts.c:1160
+#: ../panels/network/network-wifi.ui.h:30
+#: ../panels/sound/gvc/gvc-mixer-control.c:1830
+#: ../panels/user-accounts/um-fingerprint-dialog.c:215
+#: ../panels/user-accounts/um-fingerprint-dialog.c:216
+msgid "Disabled"
+msgstr "Ei käytössä"
+
+#: ../panels/common/cc-util.c:29
+msgid "Left Shift"
+msgstr "Vasen Shift"
 
-#: ../panels/common/gdm-languages.c:781
-msgid "Unspecified"
-msgstr "Ei määritetty"
+#: ../panels/common/cc-util.c:30
+msgid "Left Alt"
+msgstr "Vasen Alt"
 
-#: ../panels/common/language-chooser.ui.h:1
-msgid "Select a language"
-msgstr "Valitse kieli"
+#: ../panels/common/cc-util.c:31
+msgid "Left Ctrl"
+msgstr "Vasen Ctrl"
 
-#: ../panels/common/language-chooser.ui.h:2
-#: ../panels/printers/new-printer-dialog.ui.h:1
-#: ../panels/user-accounts/um-user-panel.c:462
-msgid "_Cancel"
-msgstr "_Peru"
+#: ../panels/common/cc-util.c:32
+msgid "Right Shift"
+msgstr "Oikea Shift"
+
+#: ../panels/common/cc-util.c:33
+msgid "Right Alt"
+msgstr "Oikea Alt"
+
+#: ../panels/common/cc-util.c:34
+msgid "Right Ctrl"
+msgstr "Oikea Ctrl"
+
+#: ../panels/common/cc-util.c:35
+msgid "Left Alt+Shift"
+msgstr "Vasen Alt+Shift"
+
+#: ../panels/common/cc-util.c:36
+msgid "Right Alt+Shift"
+msgstr "Oikea Alt+Shift"
+
+#: ../panels/common/cc-util.c:37
+msgid "Left Ctrl+Shift"
+msgstr "Vasen Ctrl+Shift"
 
-#: ../panels/common/language-chooser.ui.h:3
-msgid "_Select"
-msgstr "_Valittu"
+#: ../panels/common/cc-util.c:38
+msgid "Right Ctrl+Shift"
+msgstr "Oikea Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:39
+msgid "Left+Right Shift"
+msgstr "Vasen+Oikea Shift"
+
+#: ../panels/common/cc-util.c:40 ../panels/region/input-options.ui.h:11
+msgid "Left+Right Alt"
+msgstr "Vasen+Oikea Alt"
+
+#: ../panels/common/cc-util.c:41
+msgid "Left+Right Ctrl"
+msgstr "Vasen+Oikea Ctrl"
+
+#: ../panels/common/cc-util.c:42
+msgid "Alt+Shift"
+msgstr "Alt+Shift"
+
+#: ../panels/common/cc-util.c:43
+msgid "Ctrl+Shift"
+msgstr "Ctrl+Shift"
+
+#: ../panels/common/cc-util.c:44
+msgid "Alt+Ctrl"
+msgstr "Alt+Ctrl"
+
+#: ../panels/common/cc-util.c:45
+msgid "Caps"
+msgstr "Caps"
+
+#: ../panels/common/cc-util.c:46
+msgid "Shift+Caps"
+msgstr "Shift+Caps"
+
+#: ../panels/common/cc-util.c:47
+msgid "Alt+Caps"
+msgstr "Alt+Caps"
+
+#: ../panels/common/cc-util.c:48
+msgid "Ctrl+Caps"
+msgstr "Ctrl+Caps"
+
+#: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1
+msgid "Language"
+msgstr "Kieli"
+
+#: ../panels/common/language-chooser.ui.h:2
+#: ../panels/region/format-chooser.ui.h:2
+msgid "_Done"
+msgstr "_Valmis"
 
 #: ../panels/datetime/datetime.ui.h:1
 msgid "_Region:"
@@ -735,8 +1088,8 @@ msgid "Date & Time"
 msgstr "Päivä ja aika"
 
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2
-msgid "Date and Time preferences panel"
-msgstr "Ajan ja päiväyksen asetuspaneeli"
+msgid "Change the date and time, including time zone"
+msgstr "Vaihda aikaa, päivää tai aikavyöhykettä"
 
 #. Translators: those are keywords for the date and time control-center panel
 #: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4
@@ -751,22 +1104,22 @@ msgstr "Muuta järjestelmän aika-asetuksia"
 msgid "To change time or date settings, you need to authenticate."
 msgstr "Muuttaaksesi ajan tai päivän asetuksia sinun tulee tunnistautua."
 
-#: ../panels/display/cc-display-panel.c:481
+#: ../panels/display/cc-display-panel.c:483
 msgctxt "display panel, rotation"
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: ../panels/display/cc-display-panel.c:482
+#: ../panels/display/cc-display-panel.c:484
 msgctxt "display panel, rotation"
 msgid "Counterclockwise"
 msgstr "Vastapäivään"
 
-#: ../panels/display/cc-display-panel.c:483
+#: ../panels/display/cc-display-panel.c:485
 msgctxt "display panel, rotation"
 msgid "Clockwise"
 msgstr "Myötäpäivään"
 
-#: ../panels/display/cc-display-panel.c:484
+#: ../panels/display/cc-display-panel.c:486
 msgctxt "display panel, rotation"
 msgid "180 Degrees"
 msgstr "180 astetta"
@@ -777,30 +1130,27 @@ msgstr "180 astetta"
 #. * used as an adjective.  For example, the Spanish translation could be
 #. * "Pantallas en Espejo".
 #.
-#: ../panels/display/cc-display-panel.c:623
+#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
+#. Translators:  this is the feature where what you see on your
+#. * laptop's screen is the same as your external projector.
+#. * Here, "Mirrored" is being used as an adjective.  For example,
+#. * the Spanish translation could be "Pantallas en Espejo".
+#.
+#: ../panels/display/cc-display-panel.c:625
+#: ../panels/display/cc-rr-labeler.c:418
 msgid "Mirrored Displays"
 msgstr "Peilatut näytöt"
 
-#: ../panels/display/cc-display-panel.c:647
+#: ../panels/display/cc-display-panel.c:649
 #: ../panels/display/display-capplet.ui.h:1
 msgid "Monitor"
 msgstr "Näyttö"
 
-#: ../panels/display/cc-display-panel.c:748
-#, c-format
-msgid "%d x %d (%s)"
-msgstr "%d x %d (%s)"
-
-#: ../panels/display/cc-display-panel.c:750
-#, c-format
-msgid "%d x %d"
-msgstr "%d × %d"
-
-#: ../panels/display/cc-display-panel.c:1659
+#: ../panels/display/cc-display-panel.c:1669
 msgid "Drag to change primary display."
 msgstr "Raahaa muuttaaksesi ensisijaista näyttöä."
 
-#: ../panels/display/cc-display-panel.c:1717
+#: ../panels/display/cc-display-panel.c:1727
 msgid ""
 "Select a monitor to change its properties; drag it to rearrange its "
 "placement."
@@ -808,29 +1158,29 @@ msgstr ""
 "Valitse näyttö sen ominaisuuksien muuttamiseksi; raahaa sitä hiirellä "
 "muuttaksesi sen sijaintia."
 
-#: ../panels/display/cc-display-panel.c:2105
+#: ../panels/display/cc-display-panel.c:2115
 msgid "%a %R"
 msgstr "%a %R"
 
-#: ../panels/display/cc-display-panel.c:2107
+#: ../panels/display/cc-display-panel.c:2117
 msgid "%a %l:%M %p"
 msgstr "%a %l.%M %p"
 
-#: ../panels/display/cc-display-panel.c:2269
-#: ../panels/display/cc-display-panel.c:2321
+#: ../panels/display/cc-display-panel.c:2279
+#: ../panels/display/cc-display-panel.c:2331
 #, c-format
 msgid "Failed to apply configuration: %s"
 msgstr "Asetusten käyttöönotto epäonnistui: %s"
 
-#: ../panels/display/cc-display-panel.c:2349
+#: ../panels/display/cc-display-panel.c:2359
 msgid "Could not save the monitor configuration"
 msgstr "Näyttöasetuksia ei voitu tallentaa"
 
-#: ../panels/display/cc-display-panel.c:2409
+#: ../panels/display/cc-display-panel.c:2419
 msgid "Could not detect displays"
 msgstr "Näyttöjä ei havaittu"
 
-#: ../panels/display/cc-display-panel.c:2603
+#: ../panels/display/cc-display-panel.c:2614
 msgid "Could not get screen information"
 msgstr "Näytön tietoja ei saatu"
 
@@ -860,97 +1210,62 @@ msgid "Displays"
 msgstr "Näytöt"
 
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:2
-msgid "Change resolution and position of monitors and projectors"
-msgstr "Vaihda näyttöjen ja projektorien tarkkuutta ja sijaintia"
+msgid "Choose how to use connected monitors and projectors"
+msgstr "Valitse kuinka näyttöjä ja projektoreja käsitellään"
 
 #. Translators: those are keywords for the display control-center panel
 #: ../panels/display/gnome-display-panel.desktop.in.in.h:4
 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;"
 msgstr "Paneeli;Projektori;xrandr;Näyttö;Tarkkuus;Virkistystaajuus;"
 
-#. Translators: VESA is an techncial acronym, don't translate it.
-#: ../panels/info/cc-info-panel.c:413
-#, c-format
-msgid "VESA: %s"
-msgstr "VESA: %s"
-
-#. TRANSLATORS: device type
 #. TRANSLATORS: AP type
-#: ../panels/info/cc-info-panel.c:437 ../panels/network/panel-common.c:82
-#: ../panels/network/panel-common.c:162
+#: ../panels/info/cc-info-panel.c:440 ../panels/network/panel-common.c:127
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#. translators: This is the type of architecture, for example:
-#. * "64-bit" or "32-bit"
-#: ../panels/info/cc-info-panel.c:593
+#: ../panels/info/cc-info-panel.c:541
+#, c-format
+msgid "%s %d-bit"
+msgstr "%s %d-bit"
+
+#: ../panels/info/cc-info-panel.c:543
 #, c-format
 msgid "%d-bit"
 msgstr "%d-bit"
 
-#: ../panels/info/cc-info-panel.c:752
-msgid "Unknown model"
-msgstr "Tuntematon malli"
-
-#: ../panels/info/cc-info-panel.c:835
-msgid "The next login will attempt to use the standard experience."
-msgstr "Seuraavalla kirjautumiskerralla yritetään käyttää tavallista ulkoasua."
-
-#: ../panels/info/cc-info-panel.c:837
-msgid ""
-"The next login will use the fallback mode intended for unsupported graphics "
-"hardware."
-msgstr ""
-"Seuraavalla kirjautumiskerralla käytetään varatilaa, joka on tarkoitettu "
-"tukemattomille grafiikkalaitteistoille."
-
-#. translators: The hardware is not able to run GNOME 3's
-#. * shell, so we use the GNOME "Fallback" session
-#: ../panels/info/cc-info-panel.c:879
-msgctxt "Experience"
-msgid "Fallback"
-msgstr "Varatila"
-
-#. translators: The hardware is able to run GNOME 3's
-#. * shell, also called "Standard" experience
-#: ../panels/info/cc-info-panel.c:885
-msgctxt "Experience"
-msgid "Standard"
-msgstr "Vakio"
-
-#: ../panels/info/cc-info-panel.c:1227
+#: ../panels/info/cc-info-panel.c:1218
 msgid "Ask what to do"
 msgstr "Kysy mitä tehdään"
 
-#: ../panels/info/cc-info-panel.c:1231
+#: ../panels/info/cc-info-panel.c:1222
 msgid "Do nothing"
 msgstr "Älä tee mitään"
 
-#: ../panels/info/cc-info-panel.c:1235
+#: ../panels/info/cc-info-panel.c:1226
 msgid "Open folder"
 msgstr "Avaa kansio"
 
-#: ../panels/info/cc-info-panel.c:1326
+#: ../panels/info/cc-info-panel.c:1317
 msgid "Other Media"
 msgstr "Muu media"
 
-#: ../panels/info/cc-info-panel.c:1357
+#: ../panels/info/cc-info-panel.c:1348
 msgid "Select an application for audio CDs"
 msgstr "Valitse sovellus ääni-CD-levyille"
 
-#: ../panels/info/cc-info-panel.c:1358
+#: ../panels/info/cc-info-panel.c:1349
 msgid "Select an application for video DVDs"
 msgstr "Valitse sovellus video-DVD-levyille"
 
-#: ../panels/info/cc-info-panel.c:1359
+#: ../panels/info/cc-info-panel.c:1350
 msgid "Select an application to run when a music player is connected"
 msgstr "Valitse sovellus ajettavaksi kun musiikkisoitin kytketään"
 
-#: ../panels/info/cc-info-panel.c:1360
+#: ../panels/info/cc-info-panel.c:1351
 msgid "Select an application to run when a camera is connected"
 msgstr "Valitse sovellus ajettavaksi kun kamera kytketään"
 
-#: ../panels/info/cc-info-panel.c:1361
+#: ../panels/info/cc-info-panel.c:1352
 msgid "Select an application for software CDs"
 msgstr "Valitse sovellus ohjelmisto-CD-levyille"
 
@@ -959,112 +1274,112 @@ msgstr "Valitse sovellus ohjelmisto-CD-levyille"
 #. * If the shared-mime-info translation works for your language,
 #. * simply leave these untranslated.
 #.
-#: ../panels/info/cc-info-panel.c:1373
+#: ../panels/info/cc-info-panel.c:1364
 msgid "audio DVD"
 msgstr "ääni-DVD"
 
-#: ../panels/info/cc-info-panel.c:1374
+#: ../panels/info/cc-info-panel.c:1365
 msgid "blank Blu-ray disc"
 msgstr "tyhjä Blu-ray-levy"
 
-#: ../panels/info/cc-info-panel.c:1375
+#: ../panels/info/cc-info-panel.c:1366
 msgid "blank CD disc"
 msgstr "tyhjä CD-levy"
 
-#: ../panels/info/cc-info-panel.c:1376
+#: ../panels/info/cc-info-panel.c:1367
 msgid "blank DVD disc"
 msgstr "tyhjä DVD-levy"
 
-#: ../panels/info/cc-info-panel.c:1377
+#: ../panels/info/cc-info-panel.c:1368
 msgid "blank HD DVD disc"
 msgstr "tyhjä HD DVD -levy"
 
-#: ../panels/info/cc-info-panel.c:1378
+#: ../panels/info/cc-info-panel.c:1369
 msgid "Blu-ray video disc"
 msgstr "Blu-ray-videolevy"
 
-#: ../panels/info/cc-info-panel.c:1379
+#: ../panels/info/cc-info-panel.c:1370
 msgid "e-book reader"
 msgstr "e-kirjalukija"
 
-#: ../panels/info/cc-info-panel.c:1380
+#: ../panels/info/cc-info-panel.c:1371
 msgid "HD DVD video disc"
 msgstr "HD DVD -videolevy"
 
-#: ../panels/info/cc-info-panel.c:1381
+#: ../panels/info/cc-info-panel.c:1372
 msgid "Picture CD"
 msgstr "Kuva-CD"
 
-#: ../panels/info/cc-info-panel.c:1382
+#: ../panels/info/cc-info-panel.c:1373
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: ../panels/info/cc-info-panel.c:1383
+#: ../panels/info/cc-info-panel.c:1374
 msgid "Video CD"
 msgstr "Video-CD"
 
-#: ../panels/info/cc-info-panel.c:1384
+#: ../panels/info/cc-info-panel.c:1375
 msgid "Windows software"
 msgstr "Windows-ohjelmisto"
 
-#: ../panels/info/cc-info-panel.c:1385
+#: ../panels/info/cc-info-panel.c:1376
 msgid "Software"
 msgstr "Ohjelmisto"
 
-#: ../panels/info/cc-info-panel.c:1508
-#: ../panels/keyboard/keyboard-shortcuts.c:1667
+#: ../panels/info/cc-info-panel.c:1499
+#: ../panels/keyboard/keyboard-shortcuts.c:1697
 msgid "Section"
 msgstr "Osio"
 
-#: ../panels/info/cc-info-panel.c:1517 ../panels/info/info.ui.h:11
+#: ../panels/info/cc-info-panel.c:1508 ../panels/info/info.ui.h:13
 msgid "Overview"
 msgstr "Yhteenveto"
 
-#: ../panels/info/cc-info-panel.c:1523 ../panels/info/info.ui.h:18
+#: ../panels/info/cc-info-panel.c:1514 ../panels/info/info.ui.h:20
 msgid "Default Applications"
 msgstr "Oletussovellukset"
 
-#: ../panels/info/cc-info-panel.c:1528 ../panels/info/info.ui.h:26
+#: ../panels/info/cc-info-panel.c:1519 ../panels/info/info.ui.h:28
 msgid "Removable Media"
 msgstr "Erilliset tallennusvälineet"
 
-#: ../panels/info/cc-info-panel.c:1533 ../panels/info/info.ui.h:10
-msgid "Graphics"
-msgstr "Grafiikka"
-
-#: ../panels/info/cc-info-panel.c:1735
+#: ../panels/info/cc-info-panel.c:1544
 #, c-format
 msgid "Version %s"
 msgstr "Versio %s"
 
-#: ../panels/info/cc-info-panel.c:1785
+#: ../panels/info/cc-info-panel.c:1594
 msgid "Install Updates"
 msgstr "Asenna päivitykset"
 
-#: ../panels/info/cc-info-panel.c:1789
+#: ../panels/info/cc-info-panel.c:1598
 msgid "System Up-To-Date"
 msgstr "Järjestelmä ajan tasalla"
 
-#: ../panels/info/cc-info-panel.c:1793
+#: ../panels/info/cc-info-panel.c:1602
 msgid "Checking for Updates"
 msgstr "Tarkistetaan päivityksiä"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:1
+#: ../panels/network/connection-editor/ce-page-details.c:240
+#: ../panels/network/network-wifi.ui.h:58
 msgid "Details"
 msgstr "Tiedot"
 
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:2
-msgid "System Information"
-msgstr "Järjestelmätiedot"
+msgid "View information about your system"
+msgstr "Katsele järjestelmän tietoja"
 
 #. sure that you use the same "translation" for those keywords
 #: ../panels/info/gnome-info-panel.desktop.in.in.h:4
 msgid ""
 "device;system;information;memory;processor;version;default;application;"
-"fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
+"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;"
 msgstr ""
-"laite;järjestelmä;tiedot;muisti;suoritin;versio;oletukset;sovellus;varatila;"
-"suositellut;automaattikäynnistys;"
+"device;system;information;memory;processor;version;default;application;"
+"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;laite;"
+"järjestelmä;tiedot;muisti;suoritin;prosessori;versio;oletukset;sovellus;"
+"suositellut;automaattikäynnistys;ääni;irrotettava;ulkoinen;"
 
 #: ../panels/info/info.ui.h:1
 msgid "Select how other media should be handled"
@@ -1090,83 +1405,79 @@ msgstr "Muisti"
 msgid "Processor"
 msgstr "Suoritin"
 
-#: ../panels/info/info.ui.h:7
-msgid "OS type"
-msgstr "Käyttöjärjestelmän tyyppi"
-
+#. To translators: this field contains the distro name, version and type
 #: ../panels/info/info.ui.h:8
+msgid "Base system"
+msgstr "Järjestelmä"
+
+#: ../panels/info/info.ui.h:9
 msgid "Disk"
 msgstr "Levy"
 
-#: ../panels/info/info.ui.h:9
-msgid "Calculating..."
+#: ../panels/info/info.ui.h:10
+msgid "Calculating…"
 msgstr "Lasketaan…"
 
+#: ../panels/info/info.ui.h:11
+msgid "Graphics"
+msgstr "Grafiikka"
+
 #: ../panels/info/info.ui.h:12
+msgid "Virtualization"
+msgstr "Virtualisointi"
+
+#: ../panels/info/info.ui.h:14
 msgid "_Web"
 msgstr "_Verkko"
 
-#: ../panels/info/info.ui.h:13
+#: ../panels/info/info.ui.h:15
 msgid "_Mail"
 msgstr "_Sähköposti"
 
-#: ../panels/info/info.ui.h:14
+#: ../panels/info/info.ui.h:16
 msgid "_Calendar"
 msgstr "_Kalenteri"
 
-#: ../panels/info/info.ui.h:15
+#: ../panels/info/info.ui.h:17
 msgid "M_usic"
 msgstr "M_usiikki"
 
-#: ../panels/info/info.ui.h:16
+#: ../panels/info/info.ui.h:18
 msgid "_Video"
 msgstr "_Video"
 
-#: ../panels/info/info.ui.h:17
+#: ../panels/info/info.ui.h:19
 msgid "_Photos"
 msgstr "_Kuvat"
 
-#: ../panels/info/info.ui.h:19
+#: ../panels/info/info.ui.h:21
 msgid "Select how media should be handled"
 msgstr "Valitse kuinka mediaa käsitellään"
 
-#: ../panels/info/info.ui.h:20
+#: ../panels/info/info.ui.h:22
 msgid "CD _audio"
 msgstr "_Ääni-CD"
 
-#: ../panels/info/info.ui.h:21
+#: ../panels/info/info.ui.h:23
 msgid "_DVD video"
 msgstr "_DVD-video"
 
-#: ../panels/info/info.ui.h:22
+#: ../panels/info/info.ui.h:24
 msgid "_Music player"
 msgstr "_Musiikkisoitin"
 
-#: ../panels/info/info.ui.h:23
+#: ../panels/info/info.ui.h:25
 msgid "_Software"
 msgstr "_Ohjelmisto"
 
-#: ../panels/info/info.ui.h:24
-msgid "_Other Media..."
-msgstr "_Muut mediat..."
+#: ../panels/info/info.ui.h:26
+msgid "_Other Media…"
+msgstr "_Muu media…"
 
-#: ../panels/info/info.ui.h:25
+#: ../panels/info/info.ui.h:27
 msgid "_Never prompt or start programs on media insertion"
 msgstr "_Älä koskaan kysy tai käynnistä ohjelmia liitettäessä media"
 
-#: ../panels/info/info.ui.h:27
-msgid "Driver"
-msgstr "Ajuri"
-
-#: ../panels/info/info.ui.h:28
-msgid "Experience"
-msgstr "Kokemus"
-
-#. Hardware is not able to run GNOME 3's shell, so we might want to force running the 'Fallback' experience.
-#: ../panels/info/info.ui.h:30
-msgid "Forced _Fallback Mode"
-msgstr "Pakotettu grafiikan _varatila"
-
 #: ../panels/keyboard/00-multimedia.xml.in.h:1
 msgid "Sound and Media"
 msgstr "Ääni ja media"
@@ -1213,18 +1524,18 @@ msgstr "Irrota"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:19
-#: ../panels/universal-access/uap.ui.h:68
+#: ../panels/universal-access/uap.ui.h:66
 msgid "Typing"
 msgstr "Kirjoittaminen"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:2
-#: ../panels/region/gnome-region-panel.ui.h:26
-msgid "Switch to next source"
+#| msgid "Switch to next source"
+msgid "Switch to next input source"
 msgstr "Vaihda seuraavaan lähteeseen"
 
 #: ../panels/keyboard/01-input-sources.xml.in.h:3
-#: ../panels/region/gnome-region-panel.ui.h:24
-msgid "Switch to previous source"
+#| msgid "Switch to previous source"
+msgid "Switch to previous input source"
 msgstr "Vaihda edelliseen lähteeseen"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:1
@@ -1252,6 +1563,8 @@ msgid "Home folder"
 msgstr "Kotikansio"
 
 #: ../panels/keyboard/01-launchers.xml.in.h:7
+#| msgid "Search"
+msgctxt "keybinding"
 msgid "Search"
 msgstr "Etsi"
 
@@ -1259,20 +1572,21 @@ msgstr "Etsi"
 msgid "Screenshots"
 msgstr "Kuvakaappaukset"
 
-#. translators: Pictures is the name of the XDG Pictures directory
+#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
 #: ../panels/keyboard/01-screenshot.xml.in.h:3
-msgid "Save a screenshot to Pictures"
-msgstr "Tallenna kuvakaappaus Kuvat-kansioon"
+msgid "Save a screenshot to $PICTURES"
+msgstr "Tallenna kuvakaappaus kohteeseen $PICTURES"
 
-#. translators: Pictures is the name of the XDG Pictures directory
+#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
 #: ../panels/keyboard/01-screenshot.xml.in.h:5
-msgid "Save a screenshot of a window to Pictures"
-msgstr "Tallenna kuvakaappaus ikkunasta Kuvat-kansioon"
+msgid "Save a screenshot of a window to $PICTURES"
+msgstr "Tallenna kuvakaappaus ikkunasta kohteeseen $PICTURES"
 
-#. translators: Pictures is the name of the XDG Pictures directory
+#. translators: $PICTURES will be replaced by the name of the XDG Pictures directory
 #: ../panels/keyboard/01-screenshot.xml.in.h:7
-msgid "Save a screenshot of an area to Pictures"
-msgstr "Tallenna kuvakaappaus alueesta Kuvat-kansioon"
+#| msgid "Save a screenshot of an area to Pictures"
+msgid "Save a screenshot of an area to $PICTURES"
+msgstr "Tallenna kuvakaappaus alueesta $PICTURES-kansioon"
 
 #: ../panels/keyboard/01-screenshot.xml.in.h:8
 msgid "Copy a screenshot to clipboard"
@@ -1287,7 +1601,6 @@ msgid "Copy a screenshot of an area to clipboard"
 msgstr "Kopioi kuvakaappaus alueesta leikepöydälle"
 
 #: ../panels/keyboard/01-system.xml.in.h:1
-#: ../panels/region/gnome-region-panel.ui.h:39
 msgid "System"
 msgstr "Järjestelmä"
 
@@ -1336,33 +1649,29 @@ msgstr "Pienennä tekstin kokoa"
 msgid "High contrast on or off"
 msgstr "Korkea kontrasti päälle/pois"
 
-#. translators:
-#. * The device has been disabled
-#: ../panels/keyboard/cc-keyboard-option.c:241
-#: ../panels/keyboard/cc-keyboard-option.c:347
-#: ../panels/keyboard/keyboard-shortcuts.c:1132
-#: ../panels/sound/gvc-mixer-control.c:1834
-#: ../panels/user-accounts/um-fingerprint-dialog.c:215
-#: ../panels/user-accounts/um-fingerprint-dialog.c:216
-msgid "Disabled"
-msgstr "Ei käytössä"
-
-#: ../panels/keyboard/cc-keyboard-option.c:315
+#: ../panels/keyboard/cc-keyboard-option.c:362
 msgid "Alternative Characters Key"
 msgstr "Vaihtoehtoinen merkistönäppäin"
 
-#: ../panels/keyboard/cc-keyboard-option.c:320
+#: ../panels/keyboard/cc-keyboard-option.c:367
 msgid "Compose Key"
 msgstr "Compose-näppäin"
 
+#: ../panels/keyboard/cc-keyboard-option.c:371
+#, fuzzy
+#| msgid "Switch to next source"
+msgid "Modifiers-only switch to next source"
+msgstr "Vaihda seuraavaan lähteeseen"
+
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:4
 msgid "Keyboard"
 msgstr "Näppäimistö"
 
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2
-msgid "Change keyboard settings"
-msgstr "Muuta näppäimistön asetuksia"
+msgid "View and change keyboard shortcuts and set your typing preferences"
+msgstr ""
+"Katsele ja muuta näppäimistön pikanäppäimiä ja aseta kirjoitusasetuksesi"
 
 #. Translators: those are keywords for the keyboard control-center panel
 #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4
@@ -1397,15 +1706,13 @@ msgstr "_Viive:"
 msgid "_Speed:"
 msgstr "_Nopeus:"
 
-#. short delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:9
-#: ../panels/universal-access/uap.ui.h:49
+msgctxt "keyboard, delay"
 msgid "Short"
 msgstr "Lyhyt"
 
-#. slow acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:10
-#: ../panels/mouse/gnome-mouse-properties.ui.h:4
+msgctxt "keyboard, speed"
 msgid "Slow"
 msgstr "Hidas"
 
@@ -1413,15 +1720,13 @@ msgstr "Hidas"
 msgid "Repeat keys speed"
 msgstr "Näppäinten toiston nopeus"
 
-#. long delay
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:12
-#: ../panels/universal-access/uap.ui.h:52
+msgctxt "keyboard, delay"
 msgid "Long"
 msgstr "Pitkä"
 
-#. fast acceleration
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:13
-#: ../panels/mouse/gnome-mouse-properties.ui.h:7
+msgctxt "keyboard, speed"
 msgid "Fast"
 msgstr "Nopea"
 
@@ -1442,8 +1747,9 @@ msgid "Cursor blink speed"
 msgstr "Kohdistimen vilkkumisnopeus"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:18
-msgid "Layout Settings"
-msgstr "Asettelun asetukset"
+#: ../panels/region/region.ui.h:5
+msgid "Input Sources"
+msgstr "Syötelähteet"
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:20
 msgid "Add Shortcut"
@@ -1464,20 +1770,19 @@ msgstr ""
 "askelpalautinta."
 
 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:23
-#: ../panels/region/gnome-region-panel.ui.h:29
 msgid "Shortcuts"
 msgstr "Pikanäppäimet"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:557
-#: ../panels/keyboard/keyboard-shortcuts.c:565
+#: ../panels/keyboard/keyboard-shortcuts.c:585
+#: ../panels/keyboard/keyboard-shortcuts.c:593
 msgid "Custom Shortcuts"
 msgstr "Omat pikanäppäimet"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:776
+#: ../panels/keyboard/keyboard-shortcuts.c:804
 msgid "<Unknown Action>"
 msgstr "<Tuntematon toiminto>"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1273
+#: ../panels/keyboard/keyboard-shortcuts.c:1301
 #, c-format
 msgid ""
 "The shortcut \"%s\" cannot be used because it will become impossible to type "
@@ -1488,7 +1793,7 @@ msgstr ""
 "voi käyttää kirjoittamiseen.\n"
 "Kokeile yhdistämällä näppäin esimerkiksi Control-, Alt- tai vaihtonäppäimeen."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1305
+#: ../panels/keyboard/keyboard-shortcuts.c:1333
 #, c-format
 msgid ""
 "The shortcut \"%s\" is already used for\n"
@@ -1497,7 +1802,7 @@ msgstr ""
 "Pikanäppäin ”%s” on jo kytketty toimintoon\n"
 "”%s”"
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1310
+#: ../panels/keyboard/keyboard-shortcuts.c:1338
 #, c-format
 msgid ""
 "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
@@ -1505,12 +1810,12 @@ msgstr ""
 "Jos siirrät pikanäppäimen toimintoon \"%s\", poistetaan pikanäppäin \"%s\" "
 "käytöstä."
 
-#: ../panels/keyboard/keyboard-shortcuts.c:1316
+#: ../panels/keyboard/keyboard-shortcuts.c:1344
 msgid "_Reassign"
 msgstr "_Siirrä"
 
-#: ../panels/mouse/cc-mouse-panel.c:152
-msgid "_Test Your Settings"
+#: ../panels/mouse/cc-mouse-panel.c:123
+msgid "Test Your _Settings"
 msgstr "_Testaa asetukset"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1
@@ -1518,8 +1823,10 @@ msgid "Mouse & Touchpad"
 msgstr "Hiiri ja kosketuslevy"
 
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2
-msgid "Set your mouse and touchpad preferences"
-msgstr "Muuta hiiren ja kosketuslevyn asetuksia"
+msgid ""
+"Change your mouse or touchpad sensitivity and select right or left-handed"
+msgstr ""
+"Muuta hiiren tai kosketuslevyn herkkyyttä ja valitse kumpaa kättä käytät"
 
 #. Translators: those are keywords for the mouse and touchpad control-center panel
 #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4
@@ -1536,51 +1843,63 @@ msgstr "Hiiriasetukset"
 msgid "General"
 msgstr "Yleiset"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+#: ../panels/mouse/gnome-mouse-properties.ui.h:3
+msgctxt "mouse, speed"
+msgid "Slow"
+msgstr "Hidas"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:4
 msgid "Double-click timeout"
 msgstr "Kaksoisnapsautuksen aikaraja"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+#: ../panels/mouse/gnome-mouse-properties.ui.h:5
+msgctxt "mouse, speed"
+msgid "Fast"
+msgstr "Nopea"
+
+#: ../panels/mouse/gnome-mouse-properties.ui.h:6
 msgid "_Double-click"
 msgstr "_Kaksoisnapsautus"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+#: ../panels/mouse/gnome-mouse-properties.ui.h:7
 msgid "Primary _button"
 msgstr "_Ensisijainen painike"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:10
+#: ../panels/mouse/gnome-mouse-properties.ui.h:8
+msgctxt "mouse, left button as primary"
 msgid "_Left"
 msgstr "_Vasen"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:11
+#: ../panels/mouse/gnome-mouse-properties.ui.h:9
+msgctxt "mouse, right button as primary"
 msgid "_Right"
 msgstr "_Oikea"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:12
+#: ../panels/mouse/gnome-mouse-properties.ui.h:10
 msgid "Mouse"
 msgstr "Hiiri"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:13
+#: ../panels/mouse/gnome-mouse-properties.ui.h:11
 msgid "_Pointer speed"
 msgstr "O_soittimen nopeus"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:14
+#: ../panels/mouse/gnome-mouse-properties.ui.h:12
 msgid "Touchpad"
 msgstr "Kosketuslevy"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:15
+#: ../panels/mouse/gnome-mouse-properties.ui.h:13
 msgid "Disable while _typing"
 msgstr "_Poista kosketuslevy käytöstä kirjoitettaessa"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:16
+#: ../panels/mouse/gnome-mouse-properties.ui.h:14
 msgid "Tap to _click"
 msgstr "Na_psauta napauttamalla"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:17
+#: ../panels/mouse/gnome-mouse-properties.ui.h:15
 msgid "Two _finger scroll"
 msgstr "Kahden _sormen vieritys"
 
-#: ../panels/mouse/gnome-mouse-properties.ui.h:18
+#: ../panels/mouse/gnome-mouse-properties.ui.h:16
 msgid "C_ontent sticks to fingers"
 msgstr "Sisält_ö pysyy sormissa"
 
@@ -1617,254 +1936,781 @@ msgstr "Kaksoisnapsautus, toissijainen painike"
 msgid "Single click, secondary button"
 msgstr "Yksi napsautus, toissijainen painike"
 
-#: ../panels/network/cc-network-panel.c:615
+#. TRANSLATORS: this is to disable the radio hardware in the
+#. * network panel
+#: ../panels/network/cc-network-panel.c:347
+msgid "Air_plane Mode"
+msgstr "Le_ntokonetila"
+
+#: ../panels/network/cc-network-panel.c:912
 msgid "Network proxy"
 msgstr "Verkon välityspalvelin"
 
-#: ../panels/network/cc-network-panel.c:799 ../panels/network/net-vpn.c:278
+#: ../panels/network/cc-network-panel.c:1091 ../panels/network/net-vpn.c:280
 #, c-format
 msgid "%s VPN"
 msgstr "%s - VPN"
 
 #. TRANSLATORS: the user is running a NM that is not API compatible
-#: ../panels/network/cc-network-panel.c:866
+#: ../panels/network/cc-network-panel.c:1225
 msgid "The system network services are not compatible with this version."
 msgstr ""
 "Järjestelmän verkkopalvelut eivät ole yhteensopivia tämän version kanssa."
 
-#. TRANSLATORS: this is to disable the radio hardware in the
-#. * network panel
-#: ../panels/network/cc-network-panel.c:1001
-msgid "Air_plane Mode"
-msgstr "Le_ntokonetila"
-
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
-#: ../panels/network/network-mobile.ui.h:7
-msgid "Network"
-msgstr "Verkko"
-
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
-msgid "Network settings"
-msgstr "Verkon asetukset"
-
-#. Translators: those are keywords for the network control-center panel
-#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
-msgid "Network;Wireless;IP;LAN;Proxy;"
-msgstr "Verkko;Langaton;IP;LAN;lähiverkko;välityspalvelin;proxy;"
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:1
+#| msgid "Security"
+msgid "802.1x _Security"
+msgstr "802.1x-suojaus"
+
+#: ../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:1
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:5
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:2
+msgid "Anony_mous identity"
+msgstr ""
 
-#: ../panels/network/net-device-mobile.c:222
-msgid "Add new connection"
-msgstr "Lisää uusi yhteys"
+#: ../panels/network/connection-editor/8021x-security-page.ui.h:4
+#: ../panels/network/connection-editor/security-page.ui.h:4
+#, fuzzy
+#| msgid "Authentication failed"
+msgid "Inner _authentication"
+msgstr "Tunnistautuminen epäonnistui"
 
-#. Translators: network device speed
-#: ../panels/network/net-device-mobile.c:261
-#: ../panels/network/net-device-wifi.c:770
-#: ../panels/network/net-device-wired.c:126
-#, c-format
-msgid "%d Mb/s"
-msgstr "%d Mb/s"
+#: ../panels/network/connection-editor/ce-page-8021x-security.c:108
+#: ../panels/network/connection-editor/ce-page-security.c:455
+#: ../panels/network/connection-editor/details-page.ui.h:3
+#: ../panels/network/network-wifi.ui.h:4
+msgid "Security"
+msgstr "Tietoturva"
 
-#. TRANSLATORS: this is when the access point is not shown
-#. * in the list and the user has to enter the SSID manually
-#.
-#: ../panels/network/net-device-wifi.c:203
-msgid "Connect to a Hidden Network"
-msgstr "Yhdistä piilotettuun verkkoon"
+#: ../panels/network/connection-editor/ce-page.c:502
+msgid "automatic"
+msgstr "automaattinen"
 
 #. TRANSLATORS: this WEP WiFi security
-#: ../panels/network/net-device-wifi.c:302
-#: ../panels/network/net-device-wifi.c:481
+#: ../panels/network/connection-editor/ce-page-details.c:52
+#: ../panels/network/net-device-wifi.c:224
+#: ../panels/network/net-device-wifi.c:385
 msgid "WEP"
 msgstr "WEP"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/net-device-wifi.c:306
-#: ../panels/network/net-device-wifi.c:485
+#: ../panels/network/connection-editor/ce-page-details.c:56
+#: ../panels/network/net-device-wifi.c:228
+#: ../panels/network/net-device-wifi.c:390
+#: ../panels/network/network-wifi.ui.h:17
 msgid "WPA"
 msgstr "WPA"
 
 #. TRANSLATORS: this WPA WiFi security
-#: ../panels/network/net-device-wifi.c:310
+#: ../panels/network/connection-editor/ce-page-details.c:60
+#: ../panels/network/net-device-wifi.c:232
 msgid "WPA2"
 msgstr "WPA2"
 
 #. TRANSLATORS: this Enterprise WiFi security
-#: ../panels/network/net-device-wifi.c:315
+#: ../panels/network/connection-editor/ce-page-details.c:65
+#: ../panels/network/net-device-wifi.c:237
 msgid "Enterprise"
 msgstr "Yritys"
 
-#: ../panels/network/net-device-wifi.c:320
-#: ../panels/network/net-device-wifi.c:476
+#: ../panels/network/connection-editor/ce-page-details.c:70
+#: ../panels/network/net-device-wifi.c:242
+#: ../panels/network/net-device-wifi.c:375
 msgctxt "Wifi security"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../panels/network/net-device-wifi.c:697
-msgid "never"
-msgstr "ei koskaan"
+#: ../panels/network/connection-editor/ce-page-details.c:91
+#: ../panels/power/power.ui.h:19
+msgid "Never"
+msgstr "Ei koskaan"
 
-#: ../panels/network/net-device-wifi.c:707
-msgid "today"
-msgstr "tänään"
+#: ../panels/network/connection-editor/ce-page-details.c:102
+#: ../panels/user-accounts/um-utils.c:770
+msgid "Today"
+msgstr "Tänään"
 
-#: ../panels/network/net-device-wifi.c:709
-msgid "yesterday"
-msgstr "eilen"
+#: ../panels/network/connection-editor/ce-page-details.c:104
+#: ../panels/user-accounts/um-utils.c:773
+msgid "Yesterday"
+msgstr "Eilen"
 
-#: ../panels/network/net-device-wifi.c:711
+#: ../panels/network/connection-editor/ce-page-details.c:106
+#: ../panels/network/net-device-ethernet.c:126
+#: ../panels/network/net-device-wifi.c:479
 #, c-format
 msgid "%i day ago"
 msgid_plural "%i days ago"
 msgstr[0] "%i päivä sitten"
 msgstr[1] "%i päivää sitten"
 
-#. TRANSLATORS: VPN status
-#: ../panels/network/net-device-wifi.c:780
-#: ../panels/network/panel-common.c:277
-msgid "Not connected"
-msgstr "Ei yhteyttä"
-
-#: ../panels/network/net-device-wifi.c:782
-#: ../panels/network/net-device-wifi.c:2086
-msgid "Out of range"
-msgstr "Kantoalueen ulkopuolella"
+#. Translators: network device speed
+#: ../panels/network/connection-editor/ce-page-details.c:155
+#: ../panels/network/net-device-ethernet.c:54
+#: ../panels/network/net-device-wifi.c:537
+#, c-format
+msgid "%d Mb/s"
+msgstr "%d Mb/s"
 
-#: ../panels/network/net-device-wifi.c:813
+#: ../panels/network/connection-editor/ce-page-details.c:181
+#: ../panels/network/net-device-wifi.c:566
 msgctxt "Signal strength"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../panels/network/net-device-wifi.c:815
+#: ../panels/network/connection-editor/ce-page-details.c:183
+#: ../panels/network/net-device-wifi.c:568
 msgctxt "Signal strength"
 msgid "Weak"
 msgstr "Heikko"
 
-#: ../panels/network/net-device-wifi.c:817
+#: ../panels/network/connection-editor/ce-page-details.c:185
+#: ../panels/network/net-device-wifi.c:570
 msgctxt "Signal strength"
 msgid "Ok"
 msgstr "OK"
 
-#: ../panels/network/net-device-wifi.c:819
+#: ../panels/network/connection-editor/ce-page-details.c:187
+#: ../panels/network/net-device-wifi.c:572
 msgctxt "Signal strength"
 msgid "Good"
 msgstr "Hyvä"
 
-#: ../panels/network/net-device-wifi.c:821
+#: ../panels/network/connection-editor/ce-page-details.c:189
+#: ../panels/network/net-device-wifi.c:574
 msgctxt "Signal strength"
 msgid "Excellent"
 msgstr "Erinomainen"
 
-#: ../panels/network/net-device-wifi.c:1005
-#, c-format
-msgid ""
-"Network details for %s including password and any custom configuration will "
-"be lost."
+#: ../panels/network/connection-editor/ce-page-ethernet.c:200
+#: ../panels/network/connection-editor/ce-page-vpn.c:172
+#: ../panels/network/connection-editor/ce-page-wifi.c:243
+#: ../panels/network/network-wifi.ui.h:59
+msgid "Identity"
 msgstr ""
-"Verkon %s tiedot hävitetään mukaan lukien salasana ja mukautetut asetukset."
 
-#: ../panels/network/net-device-wifi.c:1016
-msgid "Forget"
-msgstr "Unohda"
+#: ../panels/network/connection-editor/ce-page-ip4.c:202
+#: ../panels/network/connection-editor/ce-page-ip4.c:454
+msgid "Netmask"
+msgstr "Aliverkon peite"
 
-#: ../panels/network/net-device-wifi.c:1552
-msgid ""
-"If you have a connection to the Internet other than wireless, you can use it "
-"to share your internet connection with others."
-msgstr ""
-"Jos käytössäsi on muu kuin langaton internetyhteys, voit käyttää sitä "
-"kyseisen yhteyden jakamiseen muiden käyttäjien kanssa."
+#: ../panels/network/connection-editor/ce-page-ip4.c:216
+#: ../panels/network/connection-editor/ce-page-ip4.c:467
+#: ../panels/network/connection-editor/ce-page-ip6.c:217
+#: ../panels/network/connection-editor/ce-page-ip6.c:475
+#: ../panels/network/network-vpn.ui.h:3
+msgid "Gateway"
+msgstr "Yhdyskäytävä"
 
-#: ../panels/network/net-device-wifi.c:1556
-#, 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/connection-editor/ce-page-ip4.c:233
+#: ../panels/network/connection-editor/ce-page-ip6.c:234
+msgid "Delete Address"
+msgstr "Poista osoite"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:285
+#: ../panels/network/connection-editor/ce-page-ip6.c:286
+msgid "Add"
+msgstr "Lisää"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:350
+#: ../panels/network/connection-editor/ce-page-ip6.c:354
+msgid "Server"
+msgstr "Palvelin"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:367
+#: ../panels/network/connection-editor/ce-page-ip6.c:371
+msgid "Delete DNS Server"
+msgstr "Poista DNS-palvelin"
+
+#. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking)
+#: ../panels/network/connection-editor/ce-page-ip4.c:481
+#: ../panels/network/connection-editor/ce-page-ip6.c:489
+#| msgid "Metric"
+msgctxt "network parameters"
+msgid "Metric"
+msgstr "Mitta"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:502
+#: ../panels/network/connection-editor/ce-page-ip6.c:510
+msgid "Delete Route"
+msgstr "Poista reitti"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:616
+#: ../panels/network/network-wifi.ui.h:26
+msgid "Automatic (DHCP)"
+msgstr "Automaattinen (DHCP)"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:620
+#: ../panels/network/connection-editor/ce-page-ip6.c:622
+#: ../panels/network/network-wifi.ui.h:25
+#| msgctxt "proxy method"
+#| msgid "Manual"
+msgid "Manual"
+msgstr "Manuaalinen"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:624
+#: ../panels/network/connection-editor/ce-page-ip6.c:626
+msgid "Link-Local Only"
+msgstr "Vain linkkiyhteys"
+
+#: ../panels/network/connection-editor/ce-page-ip4.c:925
+#: ../panels/network/network-wifi.ui.h:60
+msgid "IPv4"
+msgstr "IPv4"
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:204
+#: ../panels/network/connection-editor/ce-page-ip6.c:458
+msgid "Prefix"
+msgstr "Etuliite"
+
+#: ../panels/network/connection-editor/ce-page-ip6.c:614
+#: ../panels/network/connection-editor/ethernet-page.ui.h:1
+#: ../panels/network/connection-editor/ip4-page.ui.h:4
+#: ../panels/network/connection-editor/ip6-page.ui.h:4
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:2
+msgid "Automatic"
+msgstr "Automaattinen"
 
-#: ../panels/network/net-device-wifi.c:1560
-msgid ""
-"It is not possible to access the internet through your wireless while the "
-"hotspot is active."
-msgstr ""
-"Yhteyspisteen ollessa käytössä langattoman internetyhteyden käyttö ei ole "
-"mahdollista."
+#: ../panels/network/connection-editor/ce-page-ip6.c:618
+msgid "Automatic, DHCP only"
+msgstr "Automaattinen, vain DHCP"
 
-#: ../panels/network/net-device-wifi.c:1626
-msgid "Stop hotspot and disconnect any users?"
-msgstr "Suljetaanko yhteyspiste ja katkaistaanko kaikkien käyttäjien yhteydet?"
+#: ../panels/network/connection-editor/ce-page-ip6.c:886
+#: ../panels/network/network-wifi.ui.h:61
+msgid "IPv6"
+msgstr "IPv6"
 
-#: ../panels/network/net-device-wifi.c:1629
-msgid "_Stop Hotspot"
-msgstr "_Sulje yhteyspiste"
+#: ../panels/network/connection-editor/ce-page-reset.c:91
+#: ../panels/network/network-wifi.ui.h:63
+#, fuzzy
+msgid "Reset"
+msgstr "Palauta"
 
-#. TRANSLATORS: this is when the use leaves the PAC textbox blank
-#: ../panels/network/net-proxy.c:67
-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."
+#: ../panels/network/connection-editor/ce-page-security.c:250
+msgctxt "Wi-Fi/Ethernet security"
+msgid "None"
+msgstr "Ei mitään"
 
-#. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
-#. * 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:75
-msgid "This is not recommended for untrusted public networks."
-msgstr "Tämä ei ole suositeltavaa julkisissa verkoissa."
+#: ../panels/network/connection-editor/ce-page-security.c:273
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr "WEP 40/128-bittinen avain (Hex tai ASCII)"
 
-#: ../panels/network/net-proxy.c:367
-msgid "Proxy"
-msgstr "Välityspalvelin"
+#: ../panels/network/connection-editor/ce-page-security.c:283
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-bittinen salalause"
 
-#: ../panels/network/network-mobile.ui.h:1
-msgid "IMEI"
-msgstr "IMEI"
+#: ../panels/network/connection-editor/ce-page-security.c:296
+#: ../panels/network/wireless-security/wireless-security.c:409
+msgid "LEAP"
+msgstr "LEAP"
 
-#: ../panels/network/network-mobile.ui.h:2
-msgid "Provider"
-msgstr "Tarjoaja"
+#: ../panels/network/connection-editor/ce-page-security.c:309
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynaaminen WEP (802.1x)"
 
-#: ../panels/network/network-mobile.ui.h:3
-#: ../panels/network/panel-common.c:686 ../panels/network/panel-common.c:688
-#: ../panels/printers/printers.ui.h:13
-msgid "IP Address"
-msgstr "IP-osoite"
+#: ../panels/network/connection-editor/ce-page-security.c:323
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 Personal"
+
+#: ../panels/network/connection-editor/ce-page-security.c:337
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA & WPA2 Enterprise"
+
+#: ../panels/network/connection-editor/connection-editor.ui.h:1
+#| msgid "Supply"
+msgid "_Apply"
+msgstr "_Toteuta"
+
+#: ../panels/network/connection-editor/details-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:2
+msgid "Signal Strength"
+msgstr "Signaalin vahvuus"
+
+#: ../panels/network/connection-editor/details-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:3
+msgid "Link speed"
+msgstr "Yhteysnopeus"
+
+#: ../panels/network/connection-editor/details-page.ui.h:4
+#: ../panels/network/net-device-ethernet.c:159
+#: ../panels/network/network-simple.ui.h:2
+#: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693
+msgid "IPv4 Address"
+msgstr "IPv4-osoite"
 
+#: ../panels/network/connection-editor/details-page.ui.h:5
+#: ../panels/network/net-device-ethernet.c:160
+#: ../panels/network/net-device-ethernet.c:164
 #: ../panels/network/network-mobile.ui.h:4
-#: ../panels/network/network-wifi.ui.h:13
-#: ../panels/network/network-wired.ui.h:3 ../panels/network/panel-common.c:684
+#: ../panels/network/network-simple.ui.h:3
+#: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694
 msgid "IPv6 Address"
 msgstr "IPv6-osoite"
 
+#: ../panels/network/connection-editor/details-page.ui.h:6
+#: ../panels/network/net-device-ethernet.c:167
+#: ../panels/network/network-simple.ui.h:1
+#: ../panels/network/network-wifi.ui.h:7
+msgid "Hardware Address"
+msgstr "Laiteosoite"
+
+#: ../panels/network/connection-editor/details-page.ui.h:7
+#: ../panels/network/net-device-ethernet.c:171
 #: ../panels/network/network-mobile.ui.h:5
-#: ../panels/network/network-wifi.ui.h:14
-#: ../panels/network/network-wired.ui.h:4
+#: ../panels/network/network-simple.ui.h:4
+#: ../panels/network/network-wifi.ui.h:8
 msgid "Default Route"
 msgstr "Oletusreitti"
 
+#: ../panels/network/connection-editor/details-page.ui.h:8
+#: ../panels/network/connection-editor/ip4-page.ui.h:3
+#: ../panels/network/connection-editor/ip6-page.ui.h:3
+#: ../panels/network/net-device-ethernet.c:173
 #: ../panels/network/network-mobile.ui.h:6
-#: ../panels/network/network-wifi.ui.h:15
-#: ../panels/network/network-wired.ui.h:5
+#: ../panels/network/network-simple.ui.h:5
+#: ../panels/network/network-wifi.ui.h:9
 msgid "DNS"
 msgstr "DNS"
 
-#: ../panels/network/network-mobile.ui.h:8
-#: ../panels/network/network-wired.ui.h:6
-msgid "_Options..."
-msgstr "_Valinnat..."
+#: ../panels/network/connection-editor/details-page.ui.h:9
+msgid "Last Used"
+msgstr "Viimeksi käytetty"
 
-#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
-msgctxt "proxy method"
-msgid "None"
-msgstr "Ei mitään"
+#: ../panels/network/connection-editor/ethernet-page.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "Parikaapeli (TP)"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Attachment Unit Interface (AUI)"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "Media Independent Interface (MII)"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:9
+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
+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:49
+msgid "_MAC Address"
+msgstr "_MAC-osoite"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:12
+msgid "M_TU"
+msgstr "M_TU"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:13
+#: ../panels/network/connection-editor/wifi-page.ui.h:5
+msgid "_Cloned Address"
+msgstr "_Kloonattu osoite"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:14
+#: ../panels/network/connection-editor/wifi-page.ui.h:6
+msgid "Connect _automatically"
+msgstr "_Yhdistä automaattisesti"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:15
+msgid "Make available to other _users"
+msgstr "Aseta kaikkien _käyttäjien käytettäväksi"
+
+#: ../panels/network/connection-editor/ethernet-page.ui.h:16
+msgid "bytes"
+msgstr "tavua"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:23
+msgid "IPv_4"
+msgstr "IPv_4"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:2
+#: ../panels/network/connection-editor/ip6-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:24
+msgid "_Addresses"
+msgstr "_Osoitteet"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:5
+#: ../panels/network/connection-editor/ip6-page.ui.h:5
+msgid "Automatic DNS"
+msgstr "Automaattinen DNS"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:6
+#: ../panels/network/connection-editor/ip6-page.ui.h:6
+#: ../panels/network/network-wifi.ui.h:39
+msgid "Routes"
+msgstr "Reitit"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:7
+#: ../panels/network/connection-editor/ip6-page.ui.h:7
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "Automatic Routes"
+msgstr "Automaattiset reitit"
+
+#: ../panels/network/connection-editor/ip4-page.ui.h:8
+#: ../panels/network/connection-editor/ip6-page.ui.h:8
+#: ../panels/network/network-wifi.ui.h:45
+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/network-wifi.ui.h:47
+msgid "IPv_6"
+msgstr "IPv_6"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:267
+#| msgid "Bluetooth connection failed"
+msgid "Unable to open connection editor"
+msgstr "Yhteyseditorin avaaminen epäonnistui"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:282
+msgid "New Profile"
+msgstr "Uusi profiili"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:504
+#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/user-accounts/um-account-dialog.c:1068
+msgid "_Add"
+msgstr "_Lisää"
 
-#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
-msgctxt "proxy method"
-msgid "Manual"
-msgstr "Käsin"
+#: ../panels/network/connection-editor/net-connection-editor.c:586
+#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
+msgid "VPN"
+msgstr "VPN"
 
-#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
-msgctxt "proxy method"
-msgid "Automatic"
+#: ../panels/network/connection-editor/net-connection-editor.c:587
+msgid "Bond"
+msgstr "Liitos"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:588
+msgid "Bridge"
+msgstr "Silta"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:589
+msgid "VLAN"
+msgstr "VLAN"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:739
+msgid "Could not load VPN plugins"
+msgstr "VPN-liittänäisten lataus epäonnistui"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:803
+msgid "Import from file…"
+msgstr "Tuo tiedostosta…"
+
+#: ../panels/network/connection-editor/net-connection-editor.c:870
+msgid "Add Network Connection"
+msgstr "Lisää verkkoyhteys"
+
+#: ../panels/network/connection-editor/reset-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:53
+msgid "_Reset"
+msgstr "_Tyhjennä"
+
+#: ../panels/network/connection-editor/reset-page.ui.h:2
+#: ../panels/network/net-device-wifi.c:1411
+#: ../panels/network/network-wifi.ui.h:54
+msgid "_Forget"
+msgstr "_Unohda"
+
+#: ../panels/network/connection-editor/reset-page.ui.h:3
+#, fuzzy
+msgid ""
+"Reset the settings for this network, including passwords, but remember it as "
+"a preferred network"
+msgstr ""
+"Tyhjennä tämän verkon asetukset, myös salasanat, mutta muista tämä verkko"
+
+#: ../panels/network/connection-editor/reset-page.ui.h:4
+msgid ""
+"Remove all details relating to this network and do not try to automatically "
+"connect"
+msgstr ""
+"Poista kaikki tähän verkkoon liittyvä tieto äläkä yritä yhdistää "
+"automaattisesti"
+
+#: ../panels/network/connection-editor/security-page.ui.h:1
+#: ../panels/network/network-wifi.ui.h:14
+#| msgid "Security"
+msgid "S_ecurity"
+msgstr "_Tietoturva"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:205
+msgid "Cannot import VPN connection"
+msgstr "VPN-yhteyden tuonti epäonnistui"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:207
+#, c-format
+msgid ""
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
+"\n"
+"Error: %s."
+msgstr ""
+"Tiedoston '%s' luku epäonnistui tai se ei sisällä tunnistettavaa VPN-"
+"yhteyden tietoa\n"
+"\n"
+"Virhe: %s."
+
+#: ../panels/network/connection-editor/vpn-helpers.c:242
+msgid "Select file to import"
+msgstr "Valitse tuotava tiedosto"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:294
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr "Tiedosto nimeltä \"%s\" on jo olemassa."
+
+#: ../panels/network/connection-editor/vpn-helpers.c:296
+msgid "_Replace"
+msgstr "_Korvaa"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:298
+#, 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:334
+msgid "Cannot export VPN connection"
+msgstr "VPN-yhteyden vienti epäonnistui"
+
+#: ../panels/network/connection-editor/vpn-helpers.c:336
+#, c-format
+msgid ""
+"The VPN connection '%s' could not be exported to %s.\n"
+"\n"
+"Error: %s."
+msgstr ""
+"VPN-yhteyttä ”%s” ei voitu viedä tiedostoon %s.\n"
+"\n"
+"Virhe: %s."
+
+#: ../panels/network/connection-editor/vpn-helpers.c:371
+msgid "Export VPN connection..."
+msgstr "Vie VPN-yhteys..."
+
+#: ../panels/network/connection-editor/vpn-page.ui.h:2
+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:12
+msgid "_SSID"
+msgstr "_SSID"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:2
+#: ../panels/network/network-wifi.ui.h:13
+msgid "_BSSID"
+msgstr "_BSSID"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:3
+#: ../panels/network/network-wifi.ui.h:16
+#| msgid "_Forget Network"
+msgid "My Home Network"
+msgstr "Kotiverkko"
+
+#: ../panels/network/connection-editor/wifi-page.ui.h:7
+msgid "Make available to _other users"
+msgstr "Aseta _kaikkien käyttäjien käytettäväksi"
+
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:1
+#: ../panels/network/network-mobile.ui.h:7
+msgid "Network"
+msgstr "Verkko"
+
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:2
+msgid "Control how you connect to the Internet"
+msgstr "Hallitse internetyhteyden asetuksia"
+
+#. Translators: those are keywords for the network control-center panel
+#: ../panels/network/gnome-network-panel.desktop.in.in.h:4
+msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+msgstr ""
+"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;"
+"verkko;langaton;lähiverkko;välityspalvelin;laajakaista;modeemi;"
+
+#: ../panels/network/net-device-bond.c:77
+msgid "Bond slaves"
+msgstr ""
+
+#: ../panels/network/net-device-bridge.c:77
+msgid "Bridge slaves"
+msgstr ""
+
+#: ../panels/network/net-device-ethernet.c:112
+#: ../panels/network/net-device-wifi.c:465
+msgid "never"
+msgstr "ei koskaan"
+
+#: ../panels/network/net-device-ethernet.c:122
+#: ../panels/network/net-device-wifi.c:475
+msgid "today"
+msgstr "tänään"
+
+#: ../panels/network/net-device-ethernet.c:124
+#: ../panels/network/net-device-wifi.c:477
+msgid "yesterday"
+msgstr "eilen"
+
+#: ../panels/network/net-device-ethernet.c:162
+#: ../panels/network/network-mobile.ui.h:3
+#: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698
+#: ../panels/printers/printers.ui.h:13
+msgid "IP Address"
+msgstr "IP-osoite"
+
+#: ../panels/network/net-device-ethernet.c:178
+#: ../panels/network/network-wifi.ui.h:10
+msgid "Last used"
+msgstr "Viimeksi käytetty"
+
+#: ../panels/network/net-device-ethernet.c:337
+#: ../panels/network/net-device-wifi.c:1549
+#: ../panels/network/network-ethernet.ui.h:2
+#: ../panels/network/network-vpn.ui.h:8 ../panels/universal-access/uap.ui.h:23
+msgid "Options…"
+msgstr "Valinnat…"
+
+#: ../panels/network/net-device-ethernet.c:472
+#, c-format
+msgid "Profile %d"
+msgstr "Profiili %d"
+
+#: ../panels/network/net-device-mobile.c:241
+msgid "Add new connection"
+msgstr "Lisää uusi yhteys"
+
+#: ../panels/network/net-device-wifi.c:1120
+msgid ""
+"If you have a connection to the Internet other than wireless, you can set up "
+"a wireless hotspot to share the connection with others."
+msgstr ""
+"Jos käytössäsi myös muu kuin langaton internetyhteys, voit käyttää sitä "
+"kyseisen yhteyden jakamiseen muiden käyttäjien kanssa."
+
+#: ../panels/network/net-device-wifi.c:1124
+#, 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:1128
+msgid ""
+"It is not possible to access the Internet through your wireless while the "
+"hotspot is active."
+msgstr ""
+"Yhteyspisteen ollessa käytössä langattoman internetyhteyden käyttö ei ole "
+"mahdollista."
+
+#: ../panels/network/net-device-wifi.c:1202
+msgid "Stop hotspot and disconnect any users?"
+msgstr "Suljetaanko yhteyspiste ja katkaistaanko kaikkien käyttäjien yhteydet?"
+
+#: ../panels/network/net-device-wifi.c:1205
+msgid "_Stop Hotspot"
+msgstr "_Sulje yhteyspiste"
+
+#: ../panels/network/net-device-wifi.c:1277
+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:1280
+msgid "Wireless device does not support Hotspot mode"
+msgstr "Langaton verkkolaite ei tue yhteyspisteeksi asettamista"
+
+#: ../panels/network/net-device-wifi.c:1407
+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:1714
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14
+msgid "History"
+msgstr "Historia"
+
+#. translators: This is the label for the "Forget wireless network" functionality
+#: ../panels/network/net-device-wifi.c:1726
+msgctxt "Wi-Fi Network"
+msgid "_Forget"
+msgstr "_Unohda"
+
+#. TRANSLATORS: this is when the use leaves the PAC textbox blank
+#: ../panels/network/net-proxy.c:67
+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."
+
+#. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
+#. * 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:75
+msgid "This is not recommended for untrusted public networks."
+msgstr "Tämä ei ole suositeltavaa julkisissa verkoissa."
+
+#: ../panels/network/net-proxy.c:408
+msgid "Proxy"
+msgstr "Välityspalvelin"
+
+#: ../panels/network/network-ethernet.ui.h:1
+msgid "_Add Profile…"
+msgstr "_Lisää profiili…"
+
+#: ../panels/network/network-mobile.ui.h:1
+msgid "IMEI"
+msgstr "IMEI"
+
+#: ../panels/network/network-mobile.ui.h:2
+msgid "Provider"
+msgstr "Tarjoaja"
+
+#: ../panels/network/network-mobile.ui.h:8
+#: ../panels/network/network-simple.ui.h:7
+msgid "_Options…"
+msgstr "_Valinnat…"
+
+#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5
+msgctxt "proxy method"
+msgid "None"
+msgstr "Ei mitään"
+
+#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6
+msgctxt "proxy method"
+msgid "Manual"
+msgstr "Käsin"
+
+#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7
+msgctxt "proxy method"
+msgid "Automatic"
 msgstr "Automaattinen"
 
 #: ../panels/network/network-proxy.ui.h:4
@@ -1891,22 +2737,43 @@ msgstr "_FTP-välityspalvelin"
 msgid "_Socks Host"
 msgstr "_Socks-palvelin"
 
+#: ../panels/network/network-proxy.ui.h:10
+msgid "_Ignore Hosts"
+msgstr "_Ohita koneet"
+
+#: ../panels/network/network-proxy.ui.h:11
+msgid "HTTP proxy port"
+msgstr "HTTP-välityspalvelimen portti"
+
+#: ../panels/network/network-proxy.ui.h:12
+msgid "HTTPS proxy port"
+msgstr "HTTPS-välityspalvelimen portti"
+
+#: ../panels/network/network-proxy.ui.h:13
+msgid "FTP proxy port"
+msgstr "FTP-välityspalvelimen portti"
+
+#: ../panels/network/network-proxy.ui.h:14
+msgid "Socks proxy port"
+msgstr "Socks-välityspalvelimen portti"
+
+#: ../panels/network/network-simple.ui.h:6
+#| msgid "Device Off"
+msgid "Turn device off"
+msgstr "Käännä laite pois päältä"
+
 #: ../panels/network/network.ui.h:1
 msgid "Select the interface to use for the new service"
 msgstr "Valitse uuden palvelun kanssa käytettävä liitäntä"
 
 #: ../panels/network/network.ui.h:2
-msgid "C_reate..."
-msgstr "_Luo..."
+msgid "C_reate…"
+msgstr "L_uo…"
 
 #: ../panels/network/network.ui.h:3
 msgid "_Interface"
 msgstr "L_iitäntä"
 
-#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1
-msgid "VPN"
-msgstr "VPN"
-
 #: ../panels/network/network.ui.h:8
 msgid "Add Device"
 msgstr "Lisää laite"
@@ -1915,10 +2782,6 @@ msgstr "Lisää laite"
 msgid "VPN Type"
 msgstr "VPN-tyyppi"
 
-#: ../panels/network/network-vpn.ui.h:3
-msgid "Gateway"
-msgstr "Yhdyskäytävä"
-
 #: ../panels/network/network-vpn.ui.h:4
 msgid "Group Name"
 msgstr "Ryhmän nimi"
@@ -1928,433 +2791,871 @@ msgid "Group Password"
 msgstr "Ryhmäsalasana"
 
 #: ../panels/network/network-vpn.ui.h:6
+#: ../panels/printers/authentication-dialog.ui.h:4
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
 #: ../panels/network/network-vpn.ui.h:7
-msgid "_Configure..."
-msgstr "_Asetukset..."
+msgid "Turn VPN connection off"
+msgstr "Katkaise VPN-yhteys"
 
 #: ../panels/network/network-wifi.ui.h:1
-msgid "Wireless Hotspot"
-msgstr "Langaton tukiasema"
+#| msgid "A_utomatic Login"
+msgid "Automatic _Connect"
+msgstr "Automaattinen _yhdistäminen"
 
-#: ../panels/network/network-wifi.ui.h:2
-msgid "_Turn On"
-msgstr "_Ota käyttöön"
+#: ../panels/network/network-wifi.ui.h:11
+#| msgid "Details"
+msgid "details"
+msgstr "tiedot"
 
-#. TRANSLATORS: device type
-#: ../panels/network/network-wifi.ui.h:3 ../panels/network/panel-common.c:90
-msgid "Wireless"
-msgstr "Langaton"
+#: ../panels/network/network-wifi.ui.h:15
+#: ../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/user-accounts/data/account-dialog.ui.h:11
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
+msgid "_Password"
+msgstr "_Salasana"
 
-#: ../panels/network/network-wifi.ui.h:4
-msgid "_Use as Hotspot..."
-msgstr "_Käytä yhteyspisteenä..."
+#: ../panels/network/network-wifi.ui.h:18
+#: ../panels/universal-access/uap.ui.h:8
+msgid "None"
+msgstr "Ei mikään"
 
-#: ../panels/network/network-wifi.ui.h:5
-#| msgid "Disconnected"
-msgid "_Disconnect"
-msgstr "_Katkaise yhteys"
+#: ../panels/network/network-wifi.ui.h:19
+msgid "blablabla"
+msgstr "blablabla"
 
-#: ../panels/network/network-wifi.ui.h:6
-msgid "_Connect"
-msgstr "_Yhdistä"
+#: ../panels/network/network-wifi.ui.h:20
+msgid "Show P_assword"
+msgstr "_Näytä salasana"
 
-#: ../panels/network/network-wifi.ui.h:7
-msgid "Last used"
-msgstr "Viimeksi käytetty"
+#: ../panels/network/network-wifi.ui.h:21
+msgid "Make available to other users"
+msgstr "Aseta kaikkien käyttäjien käytettäväksi"
 
-#: ../panels/network/network-wifi.ui.h:8
-#: ../panels/network/network-wired.ui.h:1
-msgid "Hardware Address"
-msgstr "Laiteosoite"
+#: ../panels/network/network-wifi.ui.h:22
+msgid "identity"
+msgstr ""
 
-#: ../panels/network/network-wifi.ui.h:9
-msgid "Security"
-msgstr "Tietoturva"
+#: ../panels/network/network-wifi.ui.h:27
+msgid "Automatic (DHCP) addresses only"
+msgstr "Vain automaattiset (DHCP-) osoitteet"
 
-#: ../panels/network/network-wifi.ui.h:10
-msgid "Strength"
-msgstr "Vahvuus"
+#: ../panels/network/network-wifi.ui.h:28
+msgid "Link-local only"
+msgstr "Vain linkkiyhteys"
 
-#: ../panels/network/network-wifi.ui.h:11
-msgid "Link speed"
-msgstr "Yhteysnopeus"
+#: ../panels/network/network-wifi.ui.h:29
+msgid "Shared with other computers"
+msgstr "Jaettu muille tietokoneille"
 
-#: ../panels/network/network-wifi.ui.h:12
-#: ../panels/network/network-wired.ui.h:2 ../panels/network/panel-common.c:683
-msgid "IPv4 Address"
-msgstr "IPv4-osoite"
+#: ../panels/network/network-wifi.ui.h:31
+msgid ""
+"Address\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
+"Osoite-\n"
+"osuus\n"
+"tulee\n"
+"tänne"
 
-#: ../panels/network/network-wifi.ui.h:16
-msgid "_Forget Network"
-msgstr "_Unohda verkko"
+#: ../panels/network/network-wifi.ui.h:35
+msgid ""
+"DNS\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
+"DNS-\n"
+"osuus\n"
+"tulee\n"
+"tänne"
 
-#: ../panels/network/network-wifi.ui.h:17
-msgid "_Settings..."
-msgstr "_Asetukset..."
+#: ../panels/network/network-wifi.ui.h:40
+msgid ""
+"Routes\n"
+"section\n"
+"goes\n"
+"here"
+msgstr ""
+"Reitti-\n"
+"osuus\n"
+"tulee\n"
+"tänne"
 
-#: ../panels/network/network-wifi.ui.h:18
-msgid "Switch off to connect to a wireless network"
+#: ../panels/network/network-wifi.ui.h:44
+msgid "_Ignore automatically obtained routes"
+msgstr "_Älä huomioi automaattisesti saatuja reittejä"
+
+#: ../panels/network/network-wifi.ui.h:46
+msgid "ipv4"
+msgstr "ipv4"
+
+#: ../panels/network/network-wifi.ui.h:48
+msgid "ipv6"
+msgstr "ipv6"
+
+#: ../panels/network/network-wifi.ui.h:50
+msgid "_Cloned MAC Address"
+msgstr "_Kloonattu MAC-osoite"
+
+#: ../panels/network/network-wifi.ui.h:51
+msgid "00:24:16:31:8G:7A"
+msgstr "00:24:16:31:8G:7A"
+
+#: ../panels/network/network-wifi.ui.h:52
+#| msgid "Hardware"
+msgid "hardware"
+msgstr "laitteisto"
+
+#: ../panels/network/network-wifi.ui.h:55
+msgid ""
+"Reset the settings for this connection to their defaults, but remember as a "
+"preferred connection."
+msgstr ""
+
+#: ../panels/network/network-wifi.ui.h:56
+msgid ""
+"Remove all details relating to this network and do not try to automatically "
+"connect to it."
+msgstr ""
+"Poista kaikki tähän verkkoon liittyvä tieto äläkä yritä yhdistää "
+"automaattisesti."
+
+#: ../panels/network/network-wifi.ui.h:57
+msgid "reset"
+msgstr "tyhjennä"
+
+#: ../panels/network/network-wifi.ui.h:62
+msgid "Hardware"
+msgstr "Laitteisto"
+
+#: ../panels/network/network-wifi.ui.h:64
+msgid "Wi-Fi Hotspot"
+msgstr "Wifi-yhteyspiste"
+
+#: ../panels/network/network-wifi.ui.h:65
+msgid "_Turn On"
+msgstr "_Ota käyttöön"
+
+#: ../panels/network/network-wifi.ui.h:66
+msgid "Wi-Fi"
+msgstr "Wifi"
+
+#: ../panels/network/network-wifi.ui.h:67
+msgid "Turn Wi-Fi off"
+msgstr "Kytke wifi pois päältä"
+
+#: ../panels/network/network-wifi.ui.h:68
+msgid "_Use as Hotspot…"
+msgstr "_Käytä yhteyspisteenä…"
+
+#: ../panels/network/network-wifi.ui.h:69
+msgid "_Connect to Hidden Network…"
+msgstr "Y_hdistä piilotettuun verkkoon…"
+
+#: ../panels/network/network-wifi.ui.h:70
+msgid "_History"
+msgstr "_Historia"
+
+#: ../panels/network/network-wifi.ui.h:71
+msgid "Switch off to connect to a Wi-Fi network"
 msgstr "Katkaise yhdistääksesi langattomaan verkkoon"
 
-#: ../panels/network/network-wifi.ui.h:19
+#: ../panels/network/network-wifi.ui.h:72
 msgid "Network Name"
 msgstr "Verkon nimi"
 
-#: ../panels/network/network-wifi.ui.h:20
+#: ../panels/network/network-wifi.ui.h:73
 msgid "Connected Devices"
 msgstr "Yhdistetyt laitteet"
 
-#: ../panels/network/network-wifi.ui.h:21
+#: ../panels/network/network-wifi.ui.h:74
 msgid "Security type"
 msgstr "Salauksen tyyppi"
 
-#: ../panels/network/network-wifi.ui.h:22
+#: ../panels/network/network-wifi.ui.h:75
 msgid "Security key"
 msgstr "Salausavain"
 
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:86
-msgid "Wired"
-msgstr "Kiinteä"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:97
-msgid "Mobile broadband"
-msgstr "Mobiililaajakaista"
-
-#. TRANSLATORS: device type
-#: ../panels/network/panel-common.c:106
-msgid "Mesh"
-msgstr "Mesh-verkko"
-
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:166
+#: ../panels/network/panel-common.c:131
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 #. TRANSLATORS: AP type
-#: ../panels/network/panel-common.c:170
+#: ../panels/network/panel-common.c:135
 msgid "Infrastructure"
 msgstr "Infrastruktuuri"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:194 ../panels/network/panel-common.c:255
+#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205
 msgid "Status unknown"
 msgstr "Tuntematon tila"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:198
+#: ../panels/network/panel-common.c:155
 msgid "Unmanaged"
 msgstr "Hallitsematon"
 
-#: ../panels/network/panel-common.c:203
-msgid "Firmware missing"
-msgstr "Laiteohjelmisto puuttuu"
-
-#: ../panels/network/panel-common.c:206
-msgid "Cable unplugged"
-msgstr "Johto on irti"
-
-#: ../panels/network/panel-common.c:208
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:159
 msgid "Unavailable"
 msgstr "Ei saatavilla"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:212
-msgid "Disconnected"
-msgstr "Yhteys katkaistu"
-
-#. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:219 ../panels/network/panel-common.c:261
+#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211
 msgid "Connecting"
 msgstr "Yhdistetään"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:223 ../panels/network/panel-common.c:265
+#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215
 msgid "Authentication required"
 msgstr "Tunnistautuminen vaaditaan"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:227 ../panels/network/panel-common.c:269
+#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219
 msgid "Connected"
 msgstr "Yhdistetty"
 
 #. TRANSLATORS: device status
-#: ../panels/network/panel-common.c:231
+#: ../panels/network/panel-common.c:181
 msgid "Disconnecting"
 msgstr "Katkaistaan yhteyttä"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:235 ../panels/network/panel-common.c:273
+#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223
 msgid "Connection failed"
 msgstr "Yhteys epäonnistui"
 
 #. TRANSLATORS: device status
 #. TRANSLATORS: VPN status
-#: ../panels/network/panel-common.c:239 ../panels/network/panel-common.c:281
+#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231
 msgid "Status unknown (missing)"
 msgstr "Tila tuntematon (puuttuu)"
 
+#. TRANSLATORS: VPN status
+#: ../panels/network/panel-common.c:227
+msgid "Not connected"
+msgstr "Ei yhteyttä"
+
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:301
+#: ../panels/network/panel-common.c:252
 msgid "Configuration failed"
 msgstr "Kokoonpanon käyttö epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:305
+#: ../panels/network/panel-common.c:256
 msgid "IP configuration failed"
 msgstr "IP-asetukset epäonnistuivat"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:309
+#: ../panels/network/panel-common.c:260
 msgid "IP configuration expired"
 msgstr "IP-asetukset vanhenivat"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:313
+#: ../panels/network/panel-common.c:264
 msgid "Secrets were required, but not provided"
-msgstr ""
+msgstr "Salaisuuksia ei annettu, vaikka niitä pyydettiin"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:317
+#: ../panels/network/panel-common.c:268
 msgid "802.1x supplicant disconnected"
 msgstr ""
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:321
+#: ../panels/network/panel-common.c:272
 msgid "802.1x supplicant configuration failed"
 msgstr ""
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:325
+#: ../panels/network/panel-common.c:276
 msgid "802.1x supplicant failed"
 msgstr ""
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:329
+#: ../panels/network/panel-common.c:280
 msgid "802.1x supplicant took too long to authenticate"
 msgstr ""
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:333
+#: ../panels/network/panel-common.c:284
 msgid "PPP service failed to start"
 msgstr "PPP-palvelun käynnistys epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:337
+#: ../panels/network/panel-common.c:288
 msgid "PPP service disconnected"
 msgstr "PPP-palvelun yhteys katkaistu"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:341
+#: ../panels/network/panel-common.c:292
 msgid "PPP failed"
 msgstr "PPP epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:345
+#: ../panels/network/panel-common.c:296
 msgid "DHCP client failed to start"
 msgstr "DHCP-asiakkaan käynnistys epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:349
+#: ../panels/network/panel-common.c:300
 msgid "DHCP client error"
 msgstr "DHCP-asiakkaan virhe"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:353
+#: ../panels/network/panel-common.c:304
 msgid "DHCP client failed"
 msgstr "DHCP-asiakas epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:357
+#: ../panels/network/panel-common.c:308
 msgid "Shared connection service failed to start"
 msgstr "Jaetun yhteyden palvelun käynnistys epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:361
+#: ../panels/network/panel-common.c:312
 msgid "Shared connection service failed"
 msgstr "Jaetun yhteyden palvelu epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:365
+#: ../panels/network/panel-common.c:316
 msgid "AutoIP service failed to start"
 msgstr "AutoIP-palvelun käynnistys epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:369
+#: ../panels/network/panel-common.c:320
 msgid "AutoIP service error"
 msgstr "AutoIP-palvelun virhe"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:373
+#: ../panels/network/panel-common.c:324
 msgid "AutoIP service failed"
 msgstr "AutoIP-palvelu epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:377
+#: ../panels/network/panel-common.c:328
 msgid "Line busy"
 msgstr "Linja on varattu"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:381
+#: ../panels/network/panel-common.c:332
 msgid "No dial tone"
 msgstr "Ei valintaääntä"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:385
+#: ../panels/network/panel-common.c:336
 msgid "No carrier could be established"
 msgstr ""
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:389
+#: ../panels/network/panel-common.c:340
 msgid "Dialing request timed out"
 msgstr "Soittopyyntö aikatkaistiin"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:393
+#: ../panels/network/panel-common.c:344
 msgid "Dialing attempt failed"
 msgstr "Soittoyritys epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:397
+#: ../panels/network/panel-common.c:348
 msgid "Modem initialization failed"
 msgstr "Modeemin alustus epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:401
-#, fuzzy
+#: ../panels/network/panel-common.c:352
 #| msgid "Failed to delete user"
 msgid "Failed to select the specified APN"
-msgstr "Käyttäjän poisto epäonnistui"
+msgstr "Halutun APN:n valinta epäonnistui"
 
 #. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:405
+#: ../panels/network/panel-common.c:356
 msgid "Not searching for networks"
 msgstr "Verkkoja ei etsitä"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:409
-msgid "Network registration denied"
-msgstr "Verkkoon rekisteröinti estettiin"
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:360
+msgid "Network registration denied"
+msgstr "Verkkoon rekisteröinti estettiin"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:364
+msgid "Network registration timed out"
+msgstr "Rekisteröinti verkkoon aikakatkaistiin"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:368
+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:372
+msgid "PIN check failed"
+msgstr "PIN-tarkistus epäonnistui"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:376
+msgid "Firmware for the device may be missing"
+msgstr "Laitteen laiteohjelmisto saattaa puuttua"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:380
+msgid "Connection disappeared"
+msgstr "Yhteys katosi"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:384
+msgid "Existing connection was assumed"
+msgstr "Oletettiin olemassa oleva yhteys"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:388
+msgid "Modem not found"
+msgstr "Modeemia ei löytynyt"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:392
+msgid "Bluetooth connection failed"
+msgstr "Bluetooth-yhteys epäonnistui"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:396
+msgid "SIM Card not inserted"
+msgstr "SIM-korttia ei ole liitetty"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:400
+msgid "SIM Pin required"
+msgstr "SIM-kortin PIN vaaditaan"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:404
+msgid "SIM Puk required"
+msgstr "SIM-kortin PUK vaaditaan"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:408
+msgid "SIM wrong"
+msgstr "SIM väärin"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:412
+msgid "InfiniBand device does not support connected mode"
+msgstr "InfiniBand-laite ei tue yhdistettyä tilaa"
+
+#. TRANSLATORS: device status reason
+#: ../panels/network/panel-common.c:416
+msgid "Connection dependency failed"
+msgstr "Yhteysriippuvuus epäonnistui"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:440
+msgid "Firmware missing"
+msgstr "Laiteohjelmisto puuttuu"
+
+#. TRANSLATORS: device status
+#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447
+msgid "Cable unplugged"
+msgstr "Johto on irti"
+
+#: ../panels/network/wireless-security/eap-method.c:275
+msgid "No Certificate Authority certificate chosen"
+msgstr "Varmentajavarmennetta ei valittu"
+
+#: ../panels/network/wireless-security/eap-method.c:276
+msgid ""
+"Not using a Certificate Authority (CA) certificate can result in connections "
+"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
+"Authority certificate?"
+msgstr ""
+"Varmentajan (CA) käyttämättä jättäminen voi johtaa yhteyksien ottamiseen "
+"turvattomiin, epäluotettaviin langattomiin verkkoihin. Haluatko valita "
+"varmentajan varmenteen?"
+
+#: ../panels/network/wireless-security/eap-method.c:281
+msgid "Ignore"
+msgstr "Ohita"
+
+#: ../panels/network/wireless-security/eap-method.c:285
+msgid "Choose CA Certificate"
+msgstr "Valitse CA-varmenne"
+
+#: ../panels/network/wireless-security/eap-method.c:645
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+msgstr "DER-, PEM- tai PKCS#12-yksityisavaimet (*.der, *.pem, *.p12)"
+
+#: ../panels/network/wireless-security/eap-method.c:648
+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:261
+#: ../panels/network/wireless-security/eap-method-peap.c:280
+msgid "GTC"
+msgstr "GTC"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:277
+#: ../panels/network/wireless-security/eap-method-peap.c:246
+#: ../panels/network/wireless-security/eap-method-ttls.c:263
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: ../panels/network/wireless-security/eap-method-fast.c:399
+msgid "Choose a PAC file..."
+msgstr "Valitse PAC-tiedosto..."
+
+#: ../panels/network/wireless-security/eap-method-fast.c:406
+msgid "PAC files (*.pac)"
+msgstr "PAC-tiedostot (*.pac)"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:2
+msgid "PAC _file"
+msgstr "PA_C-tiedosto"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:3
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:7
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4
+#, fuzzy
+#| msgid "Authentication failed"
+msgid "_Inner authentication"
+msgstr "Tunnistautuminen epäonnistui"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:4
+msgid "PAC pro_visioning"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:5
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:1
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1
+#: ../panels/printers/authentication-dialog.ui.h:1
+msgid " "
+msgstr " "
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:6
+msgid "Anonymous"
+msgstr "Anonyymi"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:7
+#| msgid "Authentication failed"
+msgid "Authenticated"
+msgstr "Todennettu"
+
+#: ../panels/network/wireless-security/eap-method-fast.ui.h:8
+msgid "Both"
+msgstr "Molemmat"
+
+#: ../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:6
+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:4
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:6
+#: ../panels/network/wireless-security/ws-leap.ui.h:3
+#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3
+msgid "Sho_w password"
+msgstr "N_äytä salasana"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:263
+#: ../panels/network/wireless-security/wireless-security.c:385
+msgid "MD5"
+msgstr "MD5"
+
+#: ../panels/network/wireless-security/eap-method-peap.c:350
+#: ../panels/network/wireless-security/eap-method-tls.c:434
+#: ../panels/network/wireless-security/eap-method-ttls.c:350
+msgid "Choose a Certificate Authority certificate..."
+msgstr "Valitse varmentajavarmenne…"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr "Versio 0"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:4
+msgid "Version 1"
+msgstr "Versio 1"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:6
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:3
+#: ../panels/network/wireless-security/eap-method-ttls.ui.h:3
+msgid "C_A certificate"
+msgstr "_Varmentajavarmenne (CA-varmenne)"
+
+#: ../panels/network/wireless-security/eap-method-peap.ui.h:8
+msgid "PEAP _version"
+msgstr "PEAP-_versio"
+
+#: ../panels/network/wireless-security/eap-method-simple.ui.h:3
+msgid "As_k for this password every time"
+msgstr "K_ysy tätä salasanaa joka kerta"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:260
+msgid "Unencrypted private keys are insecure"
+msgstr "Salaamattomat yksityiset avaimet ovat epäluotettavia"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:263
+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 password-protected private key.\n"
+"\n"
+"(You can password-protect your private key with openssl)"
+msgstr ""
+"Valittua yksityistä avainta ei ole suojattu salasanalla. Tämä mahdollistaa "
+"turvallisuustietojen vaarantumisen. Valitse salasanalla suojattu yksityinen "
+"avain.\n"
+"\n"
+"(Voit suojata yksityisen avaimesi openssl:llä)"
+
+#: ../panels/network/wireless-security/eap-method-tls.c:428
+msgid "Choose your personal certificate..."
+msgstr "Valitse henkilökohtainen varmenteesi..."
+
+#: ../panels/network/wireless-security/eap-method-tls.c:440
+msgid "Choose your private key..."
+msgstr "Valitse yksityinen avaimesi..."
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:1
+msgid "I_dentity"
+msgstr ""
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate"
+msgstr "_Käyttäjävarmenne"
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:4
+msgid "Private _key"
+msgstr "_Yksityinen avain"
+
+#: ../panels/network/wireless-security/eap-method-tls.ui.h:5
+#| msgid "_Generate a password"
+msgid "_Private key password"
+msgstr "Yksityisen avaimen _salasana"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:230
+msgid "PAP"
+msgstr "PAP"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:247
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#: ../panels/network/wireless-security/eap-method-ttls.c:280
+msgid "CHAP"
+msgstr "CHAP"
+
+#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1
+msgid "Don't _warn me again"
+msgstr "_Älä varoita uudelleen"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:413
-msgid "Network registration timed out"
-msgstr "Rekisteröinti verkkoon aikakatkaistiin"
+#: ../panels/network/wireless-security/wireless-security.c:397
+msgid "TLS"
+msgstr "TLS"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:417
-msgid "Failed to register with the requested network"
-msgstr "Määritettyyn verkkoon rekisteröinti epäonnistui"
+#: ../panels/network/wireless-security/wireless-security.c:421
+msgid "FAST"
+msgstr "FAST"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:421
-msgid "PIN check failed"
-msgstr "PIN-tarkistus epäonnistui"
+#: ../panels/network/wireless-security/wireless-security.c:432
+msgid "Tunneled TLS"
+msgstr "Tunneloitu TLS"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:425
-msgid "Firmware for the device may be missing"
-msgstr "Laitteen laiteohjelmisto saattaa puuttua"
+#: ../panels/network/wireless-security/wireless-security.c:443
+msgid "Protected EAP (PEAP)"
+msgstr "Suojattu EAP (PEAP)"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:429
-msgid "Connection disappeared"
-msgstr "Yhteys katosi"
+#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:9
+#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:2
+#| msgid "Authentication failed"
+msgid "Au_thentication"
+msgstr "_Tunnistautuminen"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:433
-msgid "Carrier/link changed"
-msgstr ""
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:1
+msgid "1 (Default)"
+msgstr "1 (Oletus)"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:437
-msgid "Existing connection was assumed"
-msgstr ""
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:441
-msgid "Modem not found"
-msgstr "Modeemia ei löytynyt"
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:445
-msgid "Bluetooth connection failed"
-msgstr "Bluetooth-yhteys epäonnistui"
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:449
-msgid "SIM Card not inserted"
-msgstr "SIM-korttia ei ole liitetty"
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:5
+#, fuzzy
+#| msgid "System"
+msgid "Open System"
+msgstr "Avoin järjestelmä"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr "Jaettu avain"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key"
+msgstr "_Avain"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:8
+msgid "Sho_w key"
+msgstr "N_äytä avain"
+
+#: ../panels/network/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x"
+msgstr "WEP-inde_ksi"
+
+#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type"
+msgstr "_Tyyppi"
+
+#. TRANSLATORS: this is the per application switch for message tray usage.
+#: ../panels/notifications/cc-edit-dialog.c:39
+msgctxt "notifications"
+msgid "Notifications"
+msgstr "Ilmoitukset"
+
+#. TRANSLATORS: this is the setting to configure sounds associated with notifications
+#: ../panels/notifications/cc-edit-dialog.c:41
+#| msgid "Sound Effects"
+msgctxt "notifications"
+msgid "Sound Alerts"
+msgstr "Ääni-ilmoitukset"
+
+#: ../panels/notifications/cc-edit-dialog.c:42
+msgctxt "notifications"
+msgid "Show Popup Banners"
+msgstr ""
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:453
-msgid "SIM Pin required"
-msgstr "SIM-kortin PIN vaaditaan"
+#. TRANSLATORS: banners here refers to message tray notifications in the middle of the screen
+#: ../panels/notifications/cc-edit-dialog.c:44
+msgctxt "notifications"
+msgid "Show Details in Banners"
+msgstr ""
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:457
-msgid "SIM Puk required"
-msgstr "SIM-kortin PUK vaaditaan"
+#: ../panels/notifications/cc-edit-dialog.c:45
+#| msgid "Lock screen"
+msgctxt "notifications"
+msgid "View in Lock Screen"
+msgstr "Näytä lukitusnäytössä"
+
+#: ../panels/notifications/cc-edit-dialog.c:46
+msgctxt "notifications"
+msgid "Show Details in Lock Screen"
+msgstr "Näytä tiedot lukitusnäytössä"
+
+#: ../panels/notifications/cc-notifications-panel.c:203
+#: ../panels/power/cc-power-panel.c:1637 ../panels/power/cc-power-panel.c:1644
+#: ../panels/privacy/cc-privacy-panel.c:78
+#: ../panels/privacy/cc-privacy-panel.c:145
+msgid "On"
+msgstr "Päällä"
+
+#: ../panels/notifications/cc-notifications-panel.c:203
+#: ../panels/power/cc-power-panel.c:1631 ../panels/power/cc-power-panel.c:1642
+#: ../panels/privacy/cc-privacy-panel.c:78
+#: ../panels/privacy/cc-privacy-panel.c:145
+msgid "Off"
+msgstr "Poissa"
+
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1
+msgid "Notifications"
+msgstr "Ilmoitukset"
+
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2
+msgid "Control which notifications are displayed and what they show"
+msgstr "Hallitse näytettäviä ilmoituksia ja niiden sisältämää tietoa"
+
+#. Translators: those are keywords for the notifications control-center panel
+#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4
+msgid "Notifications;Banner;Message;Tray;Popup;"
+msgstr ""
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:461
-msgid "SIM wrong"
-msgstr "SIM väärin"
+#: ../panels/notifications/notifications.ui.h:1
+msgid "Show Pop Up Banners"
+msgstr ""
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:465
-msgid "InfiniBand device does not support connected mode"
-msgstr "InfiniBand-laite ei tue yhdistettyä tilaa"
+#: ../panels/notifications/notifications.ui.h:2
+msgid "Show in Lock Screen"
+msgstr "Näytä lukitusnäytössä"
 
-#. TRANSLATORS: device status reason
-#: ../panels/network/panel-common.c:469
-msgid "Connection dependency failed"
-msgstr "Yhteysriippuvuus epäonnistui"
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:190
+#: ../panels/region/cc-input-chooser.c:1073
+#: ../panels/search/cc-search-locations-dialog.c:480
+msgid "Other"
+msgstr "Muu"
 
 #. translators: This is the title of the "Add Account" dialog.
-#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:249
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291
 #: ../panels/online-accounts/online-accounts.ui.h:2
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:383
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:330
+msgid "Mail"
+msgstr "Sähköposti"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:336
+msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:342
+msgid "Resources"
+msgstr "Resurssit"
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:358
 msgid "Error logging into the account"
 msgstr "Virhe kirjauduttaessa käyttäjätilille"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:437
-msgid "Expired credentials. Please log in again."
-msgstr "Tunnistauminen vanhentunut. Kirjaudu sisään uudelleen."
+#: ../panels/online-accounts/cc-online-accounts-panel.c:430
+msgid "Credentials have expired."
+msgstr "Tunnukset ovat vanhentuneet."
+
+#: ../panels/online-accounts/cc-online-accounts-panel.c:434
+msgid "Sign in to enable this account."
+msgstr "Kirjaudu sisään ottaaksesi tämän tilin käyttöön."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:440
-msgid "_Log In"
-msgstr "_Kirjaudu"
+#: ../panels/online-accounts/cc-online-accounts-panel.c:439
+msgid "_Sign In"
+msgstr "_Kirjaudu sisään"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:676
+#: ../panels/online-accounts/cc-online-accounts-panel.c:684
 msgid "Error creating account"
 msgstr "Virhe tiliä luotaessa"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:718
+#: ../panels/online-accounts/cc-online-accounts-panel.c:726
 msgid "Error removing account"
 msgstr "Virhe tiliä poistaessa"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:754
+#: ../panels/online-accounts/cc-online-accounts-panel.c:762
 msgid "Are you sure you want to remove the account?"
 msgstr "Haluatko varmasti poistaa tilin?"
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:756
+#: ../panels/online-accounts/cc-online-accounts-panel.c:764
 msgid "This will not remove the account on the server."
 msgstr "Tämä ei poista käyttäjää palvelimelta."
 
-#: ../panels/online-accounts/cc-online-accounts-panel.c:757
+#: ../panels/online-accounts/cc-online-accounts-panel.c:765
 msgid "_Remove"
 msgstr "_Poista"
 
@@ -2363,8 +3664,8 @@ msgid "Online Accounts"
 msgstr "Verkkotilit"
 
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2
-msgid "Manage online accounts"
-msgstr "Hallitse verkkotilejä"
+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"
 
 #. Translators: those are keywords for the online-accounts control-center panel
 #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4
@@ -2393,18 +3694,18 @@ msgstr ""
 "Lisäämällä tilin voit käyttää sitä asiakirjoja, sähköpostia, yhteystietoja, "
 "kalenteria, pikaviestintää ja muuta varten."
 
-#: ../panels/power/cc-power-panel.c:157
+#: ../panels/power/cc-power-panel.c:184
 msgid "Unknown time"
 msgstr "Tuntematon aika"
 
-#: ../panels/power/cc-power-panel.c:163
+#: ../panels/power/cc-power-panel.c:190
 #, c-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuutti"
 msgstr[1] "%i minuuttia"
 
-#: ../panels/power/cc-power-panel.c:175
+#: ../panels/power/cc-power-panel.c:202
 #, c-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -2413,192 +3714,247 @@ 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:183
+#: ../panels/power/cc-power-panel.c:210
 #, c-format
 msgid "%i %s %i %s"
 msgstr "%i %s %i %s"
 
-#: ../panels/power/cc-power-panel.c:184
+#: ../panels/power/cc-power-panel.c:211
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: ../panels/power/cc-power-panel.c:185
+#: ../panels/power/cc-power-panel.c:212
 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:228
+#: ../panels/power/cc-power-panel.c:231
 #, c-format
-msgid "Charging - %s until fully charged"
-msgstr "Latautuu - %s täyteen lataukseen"
+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:236
+#: ../panels/power/cc-power-panel.c:238
 #, c-format
-msgid "Caution low battery, %s remaining"
-msgstr "Varoitus: akku vähissä, %s jäljellä"
+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:244
+#: ../panels/power/cc-power-panel.c:243
 #, c-format
-msgid "Using battery power - %s remaining"
-msgstr "Käytetään akkua - %s jäljellä"
+msgid "%s remaining"
+msgstr "%s jäljellä"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:261
-msgid "Charging"
-msgstr "Latautuu"
+#: ../panels/power/cc-power-panel.c:248 ../panels/power/cc-power-panel.c:276
+msgid "Fully charged"
+msgstr "Ladattu täyteen"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:266
-msgid "Using battery power"
-msgstr "Käytetään akkua"
+#: ../panels/power/cc-power-panel.c:252 ../panels/power/cc-power-panel.c:280
+msgid "Empty"
+msgstr "Tyhjä"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:270
-msgid "Charging - fully charged"
-msgstr "Ladataan - ladattu täyteen"
+#: ../panels/power/cc-power-panel.c:267
+msgid "Charging"
+msgstr "Latautuu"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:274
-msgid "Empty"
-msgstr "Tyhjä"
-
-#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:342
-#, c-format
-msgid "Caution low UPS, %s remaining"
-msgstr "Varoitus - UPS-varavirta vähissä - %s jäljellä"
+#: ../panels/power/cc-power-panel.c:272
+#| msgid "Charging"
+msgid "Discharging"
+msgstr "Purkautuu"
 
-#. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes"
-#: ../panels/power/cc-power-panel.c:348
+#: ../panels/power/cc-power-panel.c:324
 #, c-format
-msgid "Using UPS power - %s remaining"
-msgstr "Käytetään UPS-varavirtaa - %s jäljellä"
-
-#. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:366
-msgid "Caution low UPS"
-msgstr "Varoitus - UPS-varavirta vähissä"
-
-#. TRANSLATORS: UPS battery
-#: ../panels/power/cc-power-panel.c:371
-msgid "Using UPS power"
-msgstr "Käytetään UPS-varavirtaa"
+msgid "Estimated battery capacity: %s"
+msgstr "Arvioitu akun kapasiteetti: %s"
 
-#. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:423
-msgid "Your secondary battery is fully charged"
-msgstr "Vara-akku on ladattu täyteen"
+#: ../panels/power/cc-power-panel.c:404
+msgctxt "Battery name"
+msgid "Main"
+msgstr "Pääakku"
 
-#. TRANSLATORS: secondary battery is normally in the media bay
-#: ../panels/power/cc-power-panel.c:427
-msgid "Your secondary battery is empty"
-msgstr "Vara-akku on tyhjä"
+#: ../panels/power/cc-power-panel.c:406
+msgctxt "Battery name"
+msgid "Extra"
+msgstr "Lisäakku"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:510
+#: ../panels/power/cc-power-panel.c:493
 msgid "Wireless mouse"
 msgstr "Langaton hiiri"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:514
+#: ../panels/power/cc-power-panel.c:497
 msgid "Wireless keyboard"
 msgstr "Langaton näppäimistö"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:518
+#: ../panels/power/cc-power-panel.c:501
 msgid "Uninterruptible power supply"
 msgstr "Keskeytymätön virransyöttö"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:522
+#: ../panels/power/cc-power-panel.c:506
 msgid "Personal digital assistant"
 msgstr "Henkilökohtainen digitaalinen avustaja (PDA)"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:526
+#: ../panels/power/cc-power-panel.c:510
 msgid "Cellphone"
 msgstr "Matkapuhelin"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:530
+#: ../panels/power/cc-power-panel.c:514
 msgid "Media player"
 msgstr "Mediasoitin"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:534
+#: ../panels/power/cc-power-panel.c:518
 msgid "Tablet"
 msgstr "Piirtopöytä"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:538
+#: ../panels/power/cc-power-panel.c:522
 msgid "Computer"
 msgstr "Tietokone"
 
 #. TRANSLATORS: secondary battery, misc
-#: ../panels/power/cc-power-panel.c:542
+#: ../panels/power/cc-power-panel.c:526 ../panels/power/cc-power-panel.c:734
+#: ../panels/power/cc-power-panel.c:1938
 msgid "Battery"
 msgstr "Akku"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:553
+#: ../panels/power/cc-power-panel.c:535
 msgctxt "Battery power"
 msgid "Charging"
 msgstr "Latautuu"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:560
+#: ../panels/power/cc-power-panel.c:542
 msgctxt "Battery power"
 msgid "Caution"
 msgstr "Varoitus"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:565
+#: ../panels/power/cc-power-panel.c:547
 msgctxt "Battery power"
 msgid "Low"
 msgstr "Matala"
 
 #. TRANSLATORS: secondary battery
-#: ../panels/power/cc-power-panel.c:570
+#: ../panels/power/cc-power-panel.c:552
 msgctxt "Battery power"
 msgid "Good"
 msgstr "Hyvä"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:575
+#: ../panels/power/cc-power-panel.c:557
 msgctxt "Battery power"
-msgid "Charging - fully charged"
-msgstr "Ladataan - ladattu täyteen"
+msgid "Fully charged"
+msgstr "Täyteen ladattu"
 
 #. TRANSLATORS: primary battery
-#: ../panels/power/cc-power-panel.c:579
+#: ../panels/power/cc-power-panel.c:561
 msgctxt "Battery power"
 msgid "Empty"
 msgstr "Tyhjä"
 
-#: ../panels/power/cc-power-panel.c:1075
-msgid ""
-"Tip: <a href=\"screen\">screen brightness</a> affects how much power is used"
-msgstr ""
-"Vihje: <a href=\"screen\">näytön kirkkaus</a> vaikuttaa virrankulutukseen"
+#: ../panels/power/cc-power-panel.c:732
+#| msgid "Battery"
+msgid "Batteries"
+msgstr "Akut"
+
+#: ../panels/power/cc-power-panel.c:1074
+msgid "When _idle"
+msgstr "Kun _käyttämättä"
+
+#: ../panels/power/cc-power-panel.c:1401
+msgid "Power Saving"
+msgstr "Virransäästö"
+
+#: ../panels/power/cc-power-panel.c:1430
+#| msgid "Brightness"
+msgid "_Screen Brightness"
+msgstr "_Näytön kirkkaus"
+
+#: ../panels/power/cc-power-panel.c:1458
+#| msgid "_Turn screen off when inactive for:"
+msgid "_Dim Screen when Inactive"
+msgstr "_Himmennä näyttö koneen ollessa käyttämättä"
+
+#: ../panels/power/cc-power-panel.c:1481
+msgid "_Blank Screen"
+msgstr "Ty_hjä näyttö"
+
+#: ../panels/power/cc-power-panel.c:1516
+msgid "_Wi-Fi"
+msgstr "_Wifi"
+
+#: ../panels/power/cc-power-panel.c:1544
+msgid "_Mobile Broadband"
+msgstr "_Mobiililaajakaista"
+
+#: ../panels/power/cc-power-panel.c:1582
+msgid "_Bluetooth"
+msgstr "_Bluetooth"
+
+#: ../panels/power/cc-power-panel.c:1633
+#| msgid "On battery power"
+msgid "When on battery power"
+msgstr "Käytettäessä akkua"
+
+#: ../panels/power/cc-power-panel.c:1635
+msgid "When plugged in"
+msgstr "Käytettäessä verkkovirtaa"
+
+#: ../panels/power/cc-power-panel.c:1762
+msgid "Suspend & Power Off"
+msgstr "Valmiustila ja virran katkaisu"
+
+#: ../panels/power/cc-power-panel.c:1793
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "_Automatic Suspend"
+msgstr "_Automaattinen valmiustila"
+
+#: ../panels/power/cc-power-panel.c:1815
+#| msgid "When power is _critically low"
+msgid "When Battery Power is _Critical"
+msgstr "Kun virtaa on e_rittäin vähän"
+
+#: ../panels/power/cc-power-panel.c:1848
+#| msgid "Power off"
+msgid "Power Off"
+msgstr "Virta pois päältä"
+
+#: ../panels/power/cc-power-panel.c:1990
+msgid "Devices"
+msgstr "Laitteet"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:1
 msgid "Power"
 msgstr "Virransäästö"
 
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:2
-msgid "Power management settings"
-msgstr "Virransäästön asetukset"
+msgid "View your battery status and change power saving settings"
+msgstr "Tarkkaile akkusi tilaa ja muuta virransäästöasetuksia"
 
 #. Translators: those are keywords for the power control-center panel
 #: ../panels/power/gnome-power-panel.desktop.in.in.h:4
-msgid "Power;Sleep;Suspend;Hibernate;Battery;"
-msgstr "virta;uni;valmiustila;lepotila;akku;"
+msgid ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+msgstr ""
+"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;"
+"virta;uni;valmiustila;lepotila;akku;kirkkaus;himmennys;tyhjä;näyttö;jouten;"
+"virransäästö;"
 
 #: ../panels/power/power.ui.h:1
 msgid "Hibernate"
@@ -2608,178 +3964,238 @@ msgstr "Lepotila"
 msgid "Power off"
 msgstr "Virta pois päältä"
 
-#: ../panels/power/power.ui.h:3 ../panels/screen/screen.ui.h:6
-msgid "5 minutes"
-msgstr "5 minuuttia"
-
-#: ../panels/power/power.ui.h:4 ../panels/screen/screen.ui.h:7
-msgid "10 minutes"
-msgstr "10 minuuttia"
-
-#: ../panels/power/power.ui.h:5 ../panels/screen/screen.ui.h:8
-msgid "30 minutes"
-msgstr "30 minuuttia"
+#: ../panels/power/power.ui.h:5
+msgid "45 minutes"
+msgstr "45 minuuttia"
 
-#: ../panels/power/power.ui.h:6 ../panels/screen/screen.ui.h:9
+#: ../panels/power/power.ui.h:6 ../panels/privacy/privacy.ui.h:8
 msgid "1 hour"
 msgstr "1 tunti"
 
 #: ../panels/power/power.ui.h:7
-msgid "Don't suspend"
-msgstr "Älä siirry valmiustilaan"
+msgid "80 minutes"
+msgstr "80 minuuttia"
 
 #: ../panels/power/power.ui.h:8
-msgid "On battery power"
-msgstr "Käytettäessä akkua"
+msgid "90 minutes"
+msgstr "90 minuuttia"
 
 #: ../panels/power/power.ui.h:9
-msgid "When plugged in"
-msgstr "Käytettäessä verkkovirtaa"
+msgid "100 minutes"
+msgstr "100 minuuttia"
 
 #: ../panels/power/power.ui.h:10
-msgid "Suspend when inactive for"
-msgstr "Siirry valmiustilaan jos kone on käyttämättä"
+msgid "2 hours"
+msgstr "2 tuntia"
 
-#: ../panels/power/power.ui.h:11
-msgid "When power is _critically low"
-msgstr "Kun virtaa on e_rittäin vähän"
+#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:3
+msgid "1 minute"
+msgstr "1 minuutti"
+
+#: ../panels/power/power.ui.h:12 ../panels/privacy/privacy.ui.h:4
+msgid "2 minutes"
+msgstr "2 minuuttia"
+
+#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:5
+msgid "3 minutes"
+msgstr "3 minuuttia"
+
+#: ../panels/power/power.ui.h:14
+msgid "4 minutes"
+msgstr "4 minuuttia"
+
+#: ../panels/power/power.ui.h:15 ../panels/privacy/privacy.ui.h:6
+msgid "5 minutes"
+msgstr "5 minuuttia"
+
+#: ../panels/power/power.ui.h:16
+msgid "8 minutes"
+msgstr "8 minuuttia"
+
+#: ../panels/power/power.ui.h:17
+msgid "10 minutes"
+msgstr "10 minuuttia"
+
+#: ../panels/power/power.ui.h:18
+msgid "12 minutes"
+msgstr "12 minuuttia"
+
+#: ../panels/power/power.ui.h:20
+#| msgctxt "proxy method"
+#| msgid "Automatic"
+msgid "Automatic Suspend"
+msgstr "Automaattinen valmiustila"
+
+#: ../panels/power/power.ui.h:21 ../panels/privacy/privacy.ui.h:10
+msgid "_Close"
+msgstr "_Sulje"
+
+#: ../panels/power/power.ui.h:22
+#| msgid "When plugged in"
+msgid "_Plugged In"
+msgstr "Käytettäessä _verkkovirtaa"
+
+#: ../panels/power/power.ui.h:23
+#| msgid "On battery power"
+msgid "On _Battery Power"
+msgstr "Käytettäessä _akkua"
+
+#: ../panels/power/power.ui.h:24
+msgid "Delay"
+msgstr "Viive"
+
+#: ../panels/printers/authentication-dialog.ui.h:3
+#| msgid "Authentication failed"
+msgid "Authenticate"
+msgstr "Tunnistaudu"
+
+#: ../panels/printers/authentication-dialog.ui.h:5
+#: ../panels/sharing/sharing.ui.h:21
+msgid "Password"
+msgstr "Salasana"
+
+#: ../panels/printers/authentication-dialog.ui.h:6
+msgid "Authentication Required"
+msgstr "Tunnistautuminen vaaditaan"
 
 #. Translators: The printer is low on toner
-#: ../panels/printers/cc-printers-panel.c:589
+#: ../panels/printers/cc-printers-panel.c:591
 msgid "Low on toner"
 msgstr "Muste on vähissä"
 
 #. Translators: The printer has no toner left
-#: ../panels/printers/cc-printers-panel.c:591
+#: ../panels/printers/cc-printers-panel.c:593
 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/cc-printers-panel.c:594
+#: ../panels/printers/cc-printers-panel.c:596
 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/cc-printers-panel.c:597
+#: ../panels/printers/cc-printers-panel.c:599
 msgid "Out of developer"
 msgstr "Kehite on loppu"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:599
+#: ../panels/printers/cc-printers-panel.c:601
 msgid "Low on a marker supply"
-msgstr ""
+msgstr "Väriaine vähissä"
 
 #. Translators: "marker" is one color bin of the printer
-#: ../panels/printers/cc-printers-panel.c:601
+#: ../panels/printers/cc-printers-panel.c:603
 msgid "Out of a marker supply"
-msgstr ""
+msgstr "Väriaine loppu"
 
 #. Translators: One or more covers on the printer are open
-#: ../panels/printers/cc-printers-panel.c:603
+#: ../panels/printers/cc-printers-panel.c:605
 msgid "Open cover"
 msgstr "Avaa kansi"
 
 #. Translators: One or more doors on the printer are open
-#: ../panels/printers/cc-printers-panel.c:605
+#: ../panels/printers/cc-printers-panel.c:607
 msgid "Open door"
 msgstr "Avaa ovi"
 
 #. Translators: At least one input tray is low on media
-#: ../panels/printers/cc-printers-panel.c:607
+#: ../panels/printers/cc-printers-panel.c:609
 msgid "Low on paper"
 msgstr "Paperi vähissä"
 
 #. Translators: At least one input tray is empty
-#: ../panels/printers/cc-printers-panel.c:609
+#: ../panels/printers/cc-printers-panel.c:611
 msgid "Out of paper"
 msgstr "Paperi on loppu"
 
 #. Translators: The printer is offline
-#: ../panels/printers/cc-printers-panel.c:611
+#: ../panels/printers/cc-printers-panel.c:613
 msgctxt "printer state"
 msgid "Offline"
 msgstr "Poissa verkosta"
 
-#. Translators: Someone has paused the Printer
-#: ../panels/printers/cc-printers-panel.c:613
+#. Translators: Someone has stopped the Printer
+#. Translators: Printer's state (no jobs can be processed)
+#: ../panels/printers/cc-printers-panel.c:615
+#: ../panels/printers/cc-printers-panel.c:806
 msgctxt "printer state"
-msgid "Paused"
-msgstr "Keskeytetty"
+msgid "Stopped"
+msgstr "Pysäytetty"
 
 #. Translators: The printer marker supply waste receptacle is almost full
-#: ../panels/printers/cc-printers-panel.c:615
+#: ../panels/printers/cc-printers-panel.c:617
 msgid "Waste receptacle almost full"
-msgstr ""
+msgstr "Jätesäiliö melkein täynnä"
 
 #. Translators: The printer marker supply waste receptacle is full
-#: ../panels/printers/cc-printers-panel.c:617
+#: ../panels/printers/cc-printers-panel.c:619
 msgid "Waste receptacle full"
-msgstr ""
+msgstr "Jätesäiliö täynnä"
 
 #. Translators: Optical photo conductors are used in laser printers
-#: ../panels/printers/cc-printers-panel.c:619
+#: ../panels/printers/cc-printers-panel.c:621
 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/cc-printers-panel.c:621
+#: ../panels/printers/cc-printers-panel.c:623
 msgid "The optical photo conductor is no longer functioning"
 msgstr "Valojohdeyksikkö on rikki"
 
 #. Translators: Printer's state (printer is being configured right now)
-#: ../panels/printers/cc-printers-panel.c:724
+#: ../panels/printers/cc-printers-panel.c:733
 msgctxt "printer state"
 msgid "Configuring"
 msgstr "Määritetään asetuksia"
 
 #. Translators: Printer's state (can start new job without waiting)
-#: ../panels/printers/cc-printers-panel.c:781
+#: ../panels/printers/cc-printers-panel.c:792
 msgctxt "printer state"
 msgid "Ready"
 msgstr "Valmiina"
 
+#. Translators: Printer's state (printer is ready but doesn't accept new jobs)
+#: ../panels/printers/cc-printers-panel.c:797
+msgctxt "printer state"
+msgid "Does not accept jobs"
+msgstr "Ei hyväksy töitä"
+
 #. Translators: Printer's state (jobs are processing)
-#: ../panels/printers/cc-printers-panel.c:785
+#: ../panels/printers/cc-printers-panel.c:802
 msgctxt "printer state"
 msgid "Processing"
 msgstr "Käsitellään"
 
-#. Translators: Printer's state (no jobs can be processed)
-#: ../panels/printers/cc-printers-panel.c:789
-msgctxt "printer state"
-msgid "Stopped"
-msgstr "Pysäytetty"
-
 #. Translators: Toner supply
-#: ../panels/printers/cc-printers-panel.c:906
+#: ../panels/printers/cc-printers-panel.c:923
 msgid "Toner Level"
 msgstr "Värikasetin taso"
 
 #. Translators: Ink supply
-#: ../panels/printers/cc-printers-panel.c:909
+#: ../panels/printers/cc-printers-panel.c:926
 msgid "Ink Level"
 msgstr "Musteen taso"
 
 #. Translators: By supply we mean ink, toner, staples, water, ...
-#: ../panels/printers/cc-printers-panel.c:912
+#: ../panels/printers/cc-printers-panel.c:929
 msgid "Supply Level"
 msgstr "Täyttöaste"
 
 #. Translators: Printer's state (printer is being installed right now)
-#: ../panels/printers/cc-printers-panel.c:930
+#: ../panels/printers/cc-printers-panel.c:947
 msgctxt "printer state"
 msgid "Installing"
 msgstr "Asennetaan"
 
 #. Translators: There are no printers available (none is configured or CUPS is not running)
-#: ../panels/printers/cc-printers-panel.c:1107
+#: ../panels/printers/cc-printers-panel.c:1124
 msgid "No printers available"
 msgstr "Tulostimia ei saatavilla"
 
 #. Translators: there is n active print jobs on this printer
-#: ../panels/printers/cc-printers-panel.c:1411
+#: ../panels/printers/cc-printers-panel.c:1429
 #, c-format
 msgid "%u active"
 msgid_plural "%u active"
@@ -2787,15 +4203,15 @@ msgstr[0] "%u aktiivinen"
 msgstr[1] "%u aktiivista"
 
 #. Translators: Addition of the new printer failed.
-#: ../panels/printers/cc-printers-panel.c:1731
+#: ../panels/printers/cc-printers-panel.c:1773
 msgid "Failed to add new printer."
 msgstr "Uuden tulostimen lisäys epäonnistui."
 
-#: ../panels/printers/cc-printers-panel.c:1896
+#: ../panels/printers/cc-printers-panel.c:1940
 msgid "Select PPD File"
 msgstr "Valitse PPD-tiedosto"
 
-#: ../panels/printers/cc-printers-panel.c:1905
+#: ../panels/printers/cc-printers-panel.c:1949
 msgid ""
 "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *."
 "PPD.GZ)"
@@ -2803,30 +4219,30 @@ msgstr ""
 "PostScript Printer Description -tiedostot (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, "
 "*.PPD.GZ)"
 
-#: ../panels/printers/cc-printers-panel.c:2210
+#: ../panels/printers/cc-printers-panel.c:2254
 msgid "No suitable driver found"
 msgstr "Soveltuvaa ajuria ei löytynyt"
 
-#: ../panels/printers/cc-printers-panel.c:2279
-msgid "Searching for preferred drivers..."
-msgstr "Etsitään ensisijaisia ajureita..."
+#: ../panels/printers/cc-printers-panel.c:2323
+msgid "Searching for preferred drivers…"
+msgstr "Etsitään ensisijaisia ajureita…"
 
-#: ../panels/printers/cc-printers-panel.c:2294
-msgid "Select from database..."
-msgstr "Valitse tietokannasta..."
+#: ../panels/printers/cc-printers-panel.c:2338
+msgid "Select from database…"
+msgstr "Valitse tietokannasta…"
 
-#: ../panels/printers/cc-printers-panel.c:2303
-msgid "Provide PPD File..."
-msgstr "Määritä PPD-tiedosto..."
+#: ../panels/printers/cc-printers-panel.c:2347
+msgid "Provide PPD File…"
+msgstr "Määritä PPD-tiedosto…"
 
 #. Translators: Name of job which makes printer to print test page
-#: ../panels/printers/cc-printers-panel.c:2454
-#: ../panels/printers/cc-printers-panel.c:2477
+#: ../panels/printers/cc-printers-panel.c:2498
+#: ../panels/printers/cc-printers-panel.c:2521
 msgid "Test page"
 msgstr "Testisivu"
 
 #. Translators: The XML file containing user interface can not be loaded
-#: ../panels/printers/cc-printers-panel.c:2880
+#: ../panels/printers/cc-printers-panel.c:2929
 #, c-format
 msgid "Could not load ui: %s"
 msgstr "Käyttöliittymätiedoston lataus epäonnistui: %s"
@@ -2836,8 +4252,8 @@ msgid "Printers"
 msgstr "Tulostimet"
 
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2
-msgid "Change printer settings"
-msgstr "Muuta tulostimen asetuksia"
+msgid "Add printers, view printer jobs and decide how you want to print"
+msgstr "Lisää tulostimia, seuraa tulostustöitä ja määritä tulostusasetukset"
 
 #. Translators: those are keywords for the printing control-center panel
 #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4
@@ -2846,104 +4262,89 @@ msgstr ""
 "tulostin;jono;tulosta;paperi;muste;värikasetti;Printer;Queue;Print;Paper;Ink;"
 "Toner;"
 
-#: ../panels/printers/jobs-dialog.ui.h:1
-#: ../panels/printers/options-dialog.ui.h:1
-#: ../panels/printers/ppd-selection-dialog.ui.h:1
-msgid " "
-msgstr " "
-
+#. Translators: This dialog contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:2
-#: ../panels/printers/options-dialog.ui.h:4
+msgid "Active Jobs"
+msgstr "Aktiiviset työt"
+
+#: ../panels/printers/jobs-dialog.ui.h:3
+#: ../panels/printers/options-dialog.ui.h:2
+#: ../panels/user-accounts/data/history-dialog.ui.h:2
 msgid "Close"
 msgstr "Sulje"
 
-#. Translators: This tab contains list of active print jobs of the selected printer
 #: ../panels/printers/jobs-dialog.ui.h:4
-msgid "Active Jobs"
-msgstr "Aktiiviset työt"
-
-#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Resume Printing"
 msgstr "Jatka tulostusta"
 
-#: ../panels/printers/jobs-dialog.ui.h:6
+#: ../panels/printers/jobs-dialog.ui.h:5
 msgid "Pause Printing"
 msgstr "Keskeytä tulostus"
 
-#: ../panels/printers/jobs-dialog.ui.h:7
+#: ../panels/printers/jobs-dialog.ui.h:6
 msgid "Cancel Print Job"
 msgstr "Peru tulostustyö"
 
-#: ../panels/printers/new-printer-dialog.ui.h:2
-#: ../panels/user-accounts/um-account-dialog.c:1044
-msgid "_Add"
-msgstr "_Lisää"
-
-#: ../panels/printers/new-printer-dialog.ui.h:3
+#: ../panels/printers/new-printer-dialog.ui.h:1
 msgid "Add a New Printer"
 msgstr "Lisää uusi tulostin"
 
+#: ../panels/printers/new-printer-dialog.ui.h:2
+#: ../panels/user-accounts/um-user-panel.c:467
+msgid "_Cancel"
+msgstr "_Peru"
+
 #: ../panels/printers/new-printer-dialog.ui.h:4
 msgid "Search for network printers or filter result"
 msgstr "Etsi verkkotulostimia tai suodata hakutuloksia"
 
-#: ../panels/printers/options-dialog.ui.h:2
-msgid "Options"
-msgstr "Valinnat"
-
-#: ../panels/printers/options-dialog.ui.h:3
-msgid "Loading options..."
-msgstr "Ladataan valintoja..."
+#: ../panels/printers/options-dialog.ui.h:1
+msgid "Loading options…"
+msgstr "Ladataan valintoja…"
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:2
-#: ../panels/user-accounts/data/photo-dialog.ui.h:8
-#: ../panels/user-accounts/um-account-dialog.c:1043
-msgid "Cancel"
-msgstr "Peru"
+#: ../panels/printers/ppd-selection-dialog.ui.h:1
+msgid "Select Printer Driver"
+msgstr "Valitse tulostinajuri"
 
 #: ../panels/printers/ppd-selection-dialog.ui.h:4
 msgid "Loading drivers database..."
 msgstr "Ladataan ajuritietokantaa..."
 
-#: ../panels/printers/ppd-selection-dialog.ui.h:5
-msgid "Select Printer Driver"
-msgstr "Valitse tulostinajuri"
-
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:65
-#: ../panels/printers/pp-ppd-option-widget.c:69
+#: ../panels/printers/pp-ipp-option-widget.c:67
+#: ../panels/printers/pp-ppd-option-widget.c:71
 msgid "One Sided"
 msgstr "Yksipuoleinen"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:67
-#: ../panels/printers/pp-ppd-option-widget.c:71
+#: ../panels/printers/pp-ipp-option-widget.c:69
+#: ../panels/printers/pp-ppd-option-widget.c:73
 msgid "Long Edge (Standard)"
 msgstr "PItkä reuna"
 
 #. Translators: this is an option of "Two Sided"
-#: ../panels/printers/pp-ipp-option-widget.c:69
-#: ../panels/printers/pp-ppd-option-widget.c:73
+#: ../panels/printers/pp-ipp-option-widget.c:71
+#: ../panels/printers/pp-ppd-option-widget.c:75
 msgid "Short Edge (Flip)"
 msgstr "Lyhyt reuna"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:71
+#: ../panels/printers/pp-ipp-option-widget.c:73
 msgid "Portrait"
 msgstr "Pysty"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:73
+#: ../panels/printers/pp-ipp-option-widget.c:75
 msgid "Landscape"
 msgstr "Vaaka"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:75
+#: ../panels/printers/pp-ipp-option-widget.c:77
 msgid "Reverse landscape"
 msgstr "Käänteinen vaaka"
 
 #. Translators: this is an option of "Orientation"
-#: ../panels/printers/pp-ipp-option-widget.c:77
+#: ../panels/printers/pp-ipp-option-widget.c:79
 msgid "Reverse portrait"
 msgstr "Käänteinen pysty"
 
@@ -3004,13 +4405,13 @@ msgstr "Työn tila"
 msgid "Time"
 msgstr "Aika"
 
-#: ../panels/printers/pp-jobs-dialog.c:484
+#: ../panels/printers/pp-jobs-dialog.c:496
 #, c-format
 msgid "%s Active Jobs"
 msgstr "%s aktiivista työtä"
 
 #. Translators: No printers were found
-#: ../panels/printers/pp-new-printer-dialog.c:1291
+#: ../panels/printers/pp-new-printer-dialog.c:1465
 msgid "No printers detected."
 msgstr "Tulostimia ei havaittu."
 
@@ -3101,57 +4502,59 @@ msgctxt "Printer Option Group"
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#. Translators: Options of given printer (e.g. "MyPrinter Options")
-#: ../panels/printers/pp-options-dialog.c:936
-#, c-format
-msgid "%s Options"
-msgstr "%s - asetukset"
-
 #. Translators: this is an option of "Paper Source"
-#: ../panels/printers/pp-ppd-option-widget.c:75
 #: ../panels/printers/pp-ppd-option-widget.c:77
-#: ../panels/printers/pp-ppd-option-widget.c:85
+#: ../panels/printers/pp-ppd-option-widget.c:79
+#: ../panels/printers/pp-ppd-option-widget.c:87
 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:79
 #: ../panels/printers/pp-ppd-option-widget.c:81
 #: ../panels/printers/pp-ppd-option-widget.c:83
-#: ../panels/printers/pp-ppd-option-widget.c:87
+#: ../panels/printers/pp-ppd-option-widget.c:85
+#: ../panels/printers/pp-ppd-option-widget.c:89
 msgid "Printer Default"
 msgstr "Tulostimen oletus"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:89
+#: ../panels/printers/pp-ppd-option-widget.c:91
 msgid "Embed GhostScript fonts only"
 msgstr "Upota vain GhostScript-kirjasimet"
 
 #. Translators: this is an option of "GhostScript"
-#: ../panels/printers/pp-ppd-option-widget.c:91
+#: ../panels/printers/pp-ppd-option-widget.c:93
 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:93
+#: ../panels/printers/pp-ppd-option-widget.c:95
 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:95
+#: ../panels/printers/pp-ppd-option-widget.c:97
 msgid "No pre-filtering"
 msgstr "Ei esisuodatusta"
 
 #. Translators: Name of column showing printer manufacturers
-#: ../panels/printers/pp-ppd-selection-dialog.c:230
-msgid "Manufacturers"
-msgstr "Valmistajat"
+#: ../panels/printers/pp-ppd-selection-dialog.c:233
+msgid "Manufacturer"
+msgstr "Valmistaja"
+
+#. Translators: Name of column showing printer drivers
+#: ../panels/printers/pp-ppd-selection-dialog.c:250
+msgid "Driver"
+msgstr "Ajuri"
 
-#. Translators: Name of column showing printer drivers
-#: ../panels/printers/pp-ppd-selection-dialog.c:242
-msgid "Drivers"
-msgstr "Ajurit"
+#. Translators: Samba server needs authentication of the user to show list of its printers.
+#: ../panels/printers/pp-samba.c:247
+#, c-format
+msgid "Enter your username and password to view printers available on %s."
+msgstr ""
+"Syötä käyttäjätunnus ja salasana palvelimella %s olevien tulostimien "
+"katselemiseksi."
 
 #: ../panels/printers/printers.ui.h:1
 msgid "Add Printer"
@@ -3180,30 +4583,22 @@ msgstr "_Oletus"
 msgid "Jobs"
 msgstr "Työt"
 
-#. Tanslators: Opens a dialog containing printer's jobs
+#. Translators: Opens a dialog containing printer's jobs
 #: ../panels/printers/printers.ui.h:11
-msgid "_Show"
-msgstr "_Näytä"
+msgid "Show _Jobs"
+msgstr "N_äytä työt"
 
 #: ../panels/printers/printers.ui.h:12
 msgid "Model"
 msgstr "Malli"
 
-#: ../panels/printers/printers.ui.h:14
-msgid "page 1"
-msgstr "sivu 1"
-
 #: ../panels/printers/printers.ui.h:15
 msgid "label"
 msgstr "nimike"
 
-#: ../panels/printers/printers.ui.h:16
-msgid "page 2"
-msgstr "sivu 2"
-
 #: ../panels/printers/printers.ui.h:17
-msgid "Setting new driver..."
-msgstr "Asetetaan uutta ajuria..."
+msgid "Setting new driver…"
+msgstr "Asetetaan uutta ajuria…"
 
 #: ../panels/printers/printers.ui.h:18
 msgid "page 3"
@@ -3233,286 +4628,583 @@ msgstr ""
 "Valitettavasti tulostuspalvelu\n"
 "ei vaikuta olevan käytettävissä."
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
-msgid "Region & Language"
-msgstr "Alue ja kielet"
+#: ../panels/privacy/cc-privacy-panel.c:105
+msgid "Hidden"
+msgstr "Piilotettu"
 
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
-msgid "Change your region and language settings"
-msgstr "Muuta alue- ja kieliasetuksia"
+#: ../panels/privacy/cc-privacy-panel.c:105
+msgid "Visible"
+msgstr "Näkyvissä"
 
-#. Translators: those are keywords for the region control-center panel
-#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
-msgid "Language;Layout;Keyboard;"
-msgstr "Kieli;Asettelu;Näppäimistö;"
+#: ../panels/privacy/cc-privacy-panel.c:271 ../panels/privacy/privacy.ui.h:31
+#| msgid "Screenshots"
+msgid "Screen Lock"
+msgstr "Näytön lukitus"
 
-#: ../panels/region/gnome-region-panel-formats.c:142
-msgid "Imperial"
-msgstr "Imperiaalinen"
+#: ../panels/privacy/cc-privacy-panel.c:338 ../panels/privacy/privacy.ui.h:9
+msgid "Name & Visibility"
+msgstr "Nimi ja näkyvyys"
 
-#: ../panels/region/gnome-region-panel-formats.c:144
-msgid "Metric"
-msgstr "Metrinen"
+#: ../panels/privacy/cc-privacy-panel.c:446 ../panels/privacy/privacy.ui.h:26
+msgid "Usage & History"
+msgstr "Käyttö ja historia"
+
+#: ../panels/privacy/cc-privacy-panel.c:576 ../panels/privacy/privacy.ui.h:36
+msgid "Purge Trash & Temporary Files"
+msgstr "Tuhoa väliaikaiset ja roskakorin tiedostot"
 
-#: ../panels/region/gnome-region-panel-input-chooser.ui.h:1
-msgid "Choose an input source"
-msgstr "Valitse syötelähde"
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1
+msgid "Privacy"
+msgstr "Yksityisyys"
 
-#: ../panels/region/gnome-region-panel-input-chooser.ui.h:2
-msgid "Select an input source to add"
-msgstr "Valitse lisättävä syötelähde"
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2
+msgid "Protect your personal information and control what others might see"
+msgstr ""
+"Suojaa henkilökohtaisia tietojasi ja hallitse, mitä tietoja muut voivat nähdä"
 
-#: ../panels/region/gnome-region-panel-system.c:470
+#. Translators: those are keywords for the privacy control-center panel
+#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4
 msgid ""
-"The login screen, system accounts and new user accounts use the system-wide "
-"Region and Language settings."
+"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;"
+"network;identity;"
 msgstr ""
-"Kirjautumisruutu, järjestelmätilit ja uudet käyttäjätilit käyttävät "
-"järjestelmän alue- ja kieliasetuksia."
 
-#: ../panels/region/gnome-region-panel-system.c:475
-#: ../panels/region/gnome-region-panel.ui.h:31
+#: ../panels/privacy/privacy.ui.h:1
+#| msgid "Screen turns off"
+msgid "Screen Turns Off"
+msgstr "Näyttö sammuu"
+
+#: ../panels/privacy/privacy.ui.h:2
+msgid "30 seconds"
+msgstr "30 sekuntia"
+
+#: ../panels/privacy/privacy.ui.h:11
+msgid "Control how you appear on the screen and the network."
+msgstr "Hallitse sitä kuinka tietosi näkyvät näytöllä ja verkossa"
+
+#: ../panels/privacy/privacy.ui.h:12
+msgid "Display _full name in top bar"
+msgstr "Näyt_ä koko nimi yläpalkissa"
+
+#: ../panels/privacy/privacy.ui.h:13
+msgid "Display full name in _lock screen"
+msgstr "Nä_ytä koko nimi lukitusnäytössä"
+
+#: ../panels/privacy/privacy.ui.h:14
+#| msgid "Switch Modes"
+msgid "_Stealth Mode"
+msgstr "_Piilotila"
+
+#: ../panels/privacy/privacy.ui.h:15
+msgid "Immediately"
+msgstr "Välittömästi"
+
+#: ../panels/privacy/privacy.ui.h:16
+msgid "1 day"
+msgstr "1 päivä"
+
+#: ../panels/privacy/privacy.ui.h:17
+msgid "2 days"
+msgstr "2 päivää"
+
+#: ../panels/privacy/privacy.ui.h:18
+msgid "3 days"
+msgstr "3 päivää"
+
+#: ../panels/privacy/privacy.ui.h:19
+msgid "4 days"
+msgstr "4 päivää"
+
+#: ../panels/privacy/privacy.ui.h:20
+msgid "5 days"
+msgstr "5 päivää"
+
+#: ../panels/privacy/privacy.ui.h:21
+msgid "6 days"
+msgstr "6 päivää"
+
+#: ../panels/privacy/privacy.ui.h:22
+msgid "7 days"
+msgstr "7 päivää"
+
+#: ../panels/privacy/privacy.ui.h:23
+msgid "14 days"
+msgstr "14 päivää"
+
+#: ../panels/privacy/privacy.ui.h:24
+msgid "30 days"
+msgstr "30 päivää"
+
+#: ../panels/privacy/privacy.ui.h:25
+#| msgid "never"
+msgid "Forever"
+msgstr "Aina"
+
+#: ../panels/privacy/privacy.ui.h:27
 msgid ""
-"The login screen, system accounts and new user accounts use the system-wide "
-"Region and Language settings. You may change the system settings to match "
-"yours."
+"Remembering your history makes things easier to find again. These items are "
+"never shared over the network."
 msgstr ""
-"Kirjautumisruutu, järjestelmätilit ja uudet käyttäjätilit käyttävät "
-"järjestelmän alue- ja kieliasetuksia. Voit muuttaa järjestelmän asetukset "
-"vastaamaan omiasi."
+"Historian muistaminen helpottaa asioiden löytämistä uudelleen. Näitä tietoja "
+"ei koskaan jaeta verkossa."
 
-#: ../panels/region/gnome-region-panel-system.c:478
-msgid "Copy Settings"
-msgstr "Kopioi asetukset"
+#: ../panels/privacy/privacy.ui.h:28
+msgid "Cl_ear Recent History"
+msgstr "Poista historiatietoja"
 
-#: ../panels/region/gnome-region-panel-system.c:481
-#: ../panels/region/gnome-region-panel.ui.h:38
-msgid "Copy Settings..."
-msgstr "Kopioi asetukset..."
+#: ../panels/privacy/privacy.ui.h:29
+msgid "_Recently Used"
+msgstr "_Äskettäin käytetyt"
 
-#: ../panels/region/gnome-region-panel.ui.h:1
-msgid "Region and Language"
-msgstr "Alue ja kielet"
+#: ../panels/privacy/privacy.ui.h:30
+msgid "Retain _History"
+msgstr "_Säilytä historia"
+
+#: ../panels/privacy/privacy.ui.h:32
+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:33
+#| msgid "A_utomatic Login"
+msgid "Automatic Screen _Lock"
+msgstr "_Automaattinen näytön lukitus"
+
+#: ../panels/privacy/privacy.ui.h:34
+#| msgid "_Lock screen after:"
+msgid "Lock Screen _After Blank For"
+msgstr "Lukitse näyttö kun se on ollut _tyhjänä"
+
+#: ../panels/privacy/privacy.ui.h:35
+msgid "Show _Notifications"
+msgstr "_Näytä ilmoitukset"
+
+#: ../panels/privacy/privacy.ui.h:37
+msgid "_Empty Trash"
+msgstr "_Tyhjennä roskakori"
 
-#: ../panels/region/gnome-region-panel.ui.h:2
-msgid "Select a display language (change will be applied next time you log in)"
+#: ../panels/privacy/privacy.ui.h:38
+msgid "_Purge Temporary Files"
+msgstr "Tu_hoa väliaikaistiedostot"
+
+#: ../panels/privacy/privacy.ui.h:39
+msgid ""
+"Automatically purge the Trash and temporary files to help keep your computer "
+"free of unnecessary sensitive information."
 msgstr ""
-"Valitse näytettävä kieli (muuttuu seuraavan sisäänkirjautumisen yhteydessä)"
+"Tyhjennä roskakori ja tuhoa väliaikaistiedostot automaattisesti, jotta "
+"koneelle ei jää turhaa yksityistä tietoa."
 
-#: ../panels/region/gnome-region-panel.ui.h:3
-msgid "Add Language"
-msgstr "Lisää kieli"
+#: ../panels/privacy/privacy.ui.h:40
+msgid "Automatically Empty _Trash"
+msgstr "Tyh_jennä roskakori automaattisesti"
 
-#: ../panels/region/gnome-region-panel.ui.h:4
-msgid "Remove Language"
-msgstr "Poista kieli"
+#: ../panels/privacy/privacy.ui.h:41
+msgid "Automatically Purge Temporary _Files"
+msgstr "Tuhoa _väliaikaistiedostot automaattisesti"
 
-#: ../panels/region/gnome-region-panel.ui.h:5
-msgid "Install languages..."
-msgstr "Asenna kieliä..."
+#: ../panels/privacy/privacy.ui.h:42
+msgid "Purge _After"
+msgstr "Tyhjennä annetun ajan _kuluttua"
 
-#: ../panels/region/gnome-region-panel.ui.h:6
-msgid "Language"
-msgstr "Kieli"
+#: ../panels/region/cc-format-chooser.c:122
+#| msgid "Imperial"
+msgctxt "measurement format"
+msgid "Imperial"
+msgstr "Imperiaalinen"
+
+#: ../panels/region/cc-format-chooser.c:124
+#| msgid "Metric"
+msgctxt "measurement format"
+msgid "Metric"
+msgstr "Metrinen"
+
+#: ../panels/region/cc-format-chooser.c:283
+msgid "No regions found"
+msgstr "Alueita ei löytynyt"
+
+#: ../panels/region/cc-input-chooser.c:186
+#| msgid "Move Input Source Down"
+msgid "No input sources found"
+msgstr "Syötelähteitä ei löytynyt"
+
+#: ../panels/region/cc-region-panel.c:239
+msgid "Your session needs to be restarted for changes to take effect"
+msgstr "Istunto täytyy käynnistää uudelleen, jotta muutokset tulevat voimaan."
+
+#: ../panels/region/cc-region-panel.c:240
+msgid "Restart Now"
+msgstr "Käynnistä uudelleen nyt"
+
+#: ../panels/region/cc-region-panel.c:550
+#| msgid "None"
+msgctxt "Language"
+msgid "None"
+msgstr "Ei mikään"
 
-#: ../panels/region/gnome-region-panel.ui.h:7
-msgid "Select a region (change will be applied the next time you log in)"
-msgstr "Valitse alue (muuttuu seuraavan sisäänkirjautumisen yhteydessä)"
+#: ../panels/region/cc-region-panel.c:1040
+msgid "Sorry"
+msgstr "Virhe"
 
-#: ../panels/region/gnome-region-panel.ui.h:8
-msgid "Add Region"
-msgstr "Lisää alue"
+#: ../panels/region/cc-region-panel.c:1042
+msgid "Input methods can't be used on the login screen"
+msgstr "Syötemenetelmiä ei voi käyttää kirjautumisruudussa"
 
-#: ../panels/region/gnome-region-panel.ui.h:9
-msgid "Remove Region"
-msgstr "Poista alue"
+#: ../panels/region/cc-region-panel.c:1491
+#| msgid "Move Input Source Down"
+msgid "No input source selected"
+msgstr "Syötelähdettä ei valittu"
 
-#: ../panels/region/gnome-region-panel.ui.h:10
+#: ../panels/region/cc-region-panel.c:1652
+msgid "Login Screen"
+msgstr "Kirjautumisnäyttö"
+
+#: ../panels/region/format-chooser.ui.h:1 ../panels/region/region.ui.h:3
+msgid "Formats"
+msgstr "Muotoilut"
+
+#: ../panels/region/format-chooser.ui.h:3
+msgid "Preview"
+msgstr "Esikatselu"
+
+#: ../panels/region/format-chooser.ui.h:4
 msgid "Dates"
 msgstr "Päivämäärät"
 
-#: ../panels/region/gnome-region-panel.ui.h:11
+#: ../panels/region/format-chooser.ui.h:5
 msgid "Times"
 msgstr "Aika"
 
-#: ../panels/region/gnome-region-panel.ui.h:12
+#: ../panels/region/format-chooser.ui.h:6
 msgid "Numbers"
 msgstr "Numerot"
 
-#: ../panels/region/gnome-region-panel.ui.h:13
-msgid "Currency"
-msgstr "Valuutta"
-
-#: ../panels/region/gnome-region-panel.ui.h:14
+#: ../panels/region/format-chooser.ui.h:7
 msgid "Measurement"
 msgstr "Mitat"
 
-#: ../panels/region/gnome-region-panel.ui.h:15
-msgid "Examples"
-msgstr "Esimerkkejä"
+#: ../panels/region/format-chooser.ui.h:8
+msgid "Paper"
+msgstr "Paperi"
 
-#: ../panels/region/gnome-region-panel.ui.h:16
-msgid "Formats"
-msgstr "Muotoilut"
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:1
+msgid "Region & Language"
+msgstr "Alue ja kielet"
+
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:2
+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.ui.h:17
-msgid "Select keyboards or other input sources"
-msgstr "Valitse näppäimistöt tai muut syötelähteet"
+#. Translators: those are keywords for the region control-center panel
+#: ../panels/region/gnome-region-panel.desktop.in.in.h:4
+#| msgid "Language;Layout;Keyboard;"
+msgid "Language;Layout;Keyboard;Input;"
+msgstr "Kieli;Asettelu;Näppäimistö;Syöte"
 
-#: ../panels/region/gnome-region-panel.ui.h:18
-msgid "Add Input Source"
+#: ../panels/region/input-chooser.ui.h:1
+#| msgid "Add Input Source"
+msgid "Add an Input Source"
 msgstr "Lisää syötelähde"
 
-#: ../panels/region/gnome-region-panel.ui.h:19
-msgid "Remove Input Source"
-msgstr "Poista syötelähde"
+#: ../panels/region/input-options.ui.h:1
+#| msgid "Input Source Settings"
+msgid "Input Source Options"
+msgstr "Syötelähteen asetukset"
 
-#: ../panels/region/gnome-region-panel.ui.h:20
-msgid "Move Input Source Up"
-msgstr "Siirrä syötelähdettä ylemmäksi"
+#: ../panels/region/input-options.ui.h:2
+#| msgid "Use the same layout for all windows"
+msgid "Use the _same source for all windows"
+msgstr "Käytä _samaa lähdettä kaikille ikkunoille"
 
-#: ../panels/region/gnome-region-panel.ui.h:21
-msgid "Move Input Source Down"
-msgstr "Siirrä syötelähdettä alemmaksi"
+#: ../panels/region/input-options.ui.h:3
+#| msgid "Allow different layouts for individual windows"
+msgid "Allow _different sources for each window"
+msgstr "Salli _eri lähteet yksittäisille ikkunoille"
 
-#: ../panels/region/gnome-region-panel.ui.h:22
-msgid "Input Source Settings"
-msgstr "Syötelähteen asetukset"
+#: ../panels/region/input-options.ui.h:4
+#| msgid "Keyboard Settings"
+msgid "Keyboard Shortcuts"
+msgstr "Pikanäppäimet"
 
-#: ../panels/region/gnome-region-panel.ui.h:23
-msgid "Show Keyboard Layout"
-msgstr "Näytä näppäimistön asettelu"
+#: ../panels/region/input-options.ui.h:5
+msgid "Switch to previous source"
+msgstr "Vaihda edelliseen lähteeseen"
 
-#: ../panels/region/gnome-region-panel.ui.h:25
-msgid "Ctrl+Alt+Space"
-msgstr "Ctrl+Alt+Välilyönti"
+#: ../panels/region/input-options.ui.h:6
+msgid "Super+Shift+Space"
+msgstr "Super+Shift+Välilyönti"
 
-#: ../panels/region/gnome-region-panel.ui.h:27
-msgid "Ctrl+Alt+Shift+Space"
-msgstr "Ctrl+Alt+Shift+Välilyönti"
+#: ../panels/region/input-options.ui.h:7
+msgid "Switch to next source"
+msgstr "Vaihda seuraavaan lähteeseen"
 
-#: ../panels/region/gnome-region-panel.ui.h:28
-msgid "Shortcut Settings"
-msgstr "Pikanäppäimen asetukset"
+#: ../panels/region/input-options.ui.h:8
+msgid "Super+Space"
+msgstr "Super+Välilyönti"
 
-#: ../panels/region/gnome-region-panel.ui.h:30
-msgid "Input Sources"
-msgstr "Syötelähteet"
+#: ../panels/region/input-options.ui.h:9
+msgid "You can change these shortcuts in the keyboard settings"
+msgstr "Näitä pikanäppäimiä voi vaihtaa näppäimistöasetuksissa"
 
-#. 'display' means 'output' here, as in 'translated messages that are displayed to the user'
-#: ../panels/region/gnome-region-panel.ui.h:33
-msgid "Display language:"
-msgstr "Näyttökieli:"
+#: ../panels/region/input-options.ui.h:10
+#, fuzzy
+#| msgid "Switch to next source"
+msgid "Alternative switch to next source"
+msgstr "Vaihtoehtoinen seuraavaan lähteeseen vaihtava näppäin"
 
-#: ../panels/region/gnome-region-panel.ui.h:34
-msgid "Input source:"
-msgstr "Syötelähde:"
+#: ../panels/region/region.ui.h:2
+msgid "English (United Kingdom)"
+msgstr "Englanti (Yhdistynyt kuningaskunta)"
 
-#: ../panels/region/gnome-region-panel.ui.h:35
-msgid "Format:"
-msgstr "Muotoilu:"
+#: ../panels/region/region.ui.h:4
+msgid "United Kingdom"
+msgstr "Yhdistynyt kuningaskunta"
 
-#: ../panels/region/gnome-region-panel.ui.h:36
-msgid "Your settings"
-msgstr "Sinun asetuksesi"
+#: ../panels/region/region.ui.h:6
+msgid "Options"
+msgstr "Valinnat"
 
-#: ../panels/region/gnome-region-panel.ui.h:37
-msgid "System settings"
-msgstr "Järjestelmän asetukset"
+#: ../panels/region/region.ui.h:7
+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/screen/gnome-screen-panel.desktop.in.in.h:1
-msgid "Brightness & Lock"
-msgstr "Näytön kirkkaus ja lukitus"
+#: ../panels/search/cc-search-locations-dialog.c:276
+msgid "Home"
+msgstr "Koti"
 
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:2
-msgid "Screen brightness and lock settings"
-msgstr "Näytön kirkkaus- ja lukitusasetukset"
+#: ../panels/search/cc-search-locations-dialog.c:476
+msgid "Places"
+msgstr "Sijainnit"
 
-#. Translators: those are keywords for the brightness and lock control-center panel
-#: ../panels/screen/gnome-screen-panel.desktop.in.in.h:4
-msgid "Brightness;Lock;Dim;Blank;Monitor;"
-msgstr "kirkkaus;lukitseminen;himmentäminen;pimennys;näyttö;"
+#: ../panels/search/cc-search-locations-dialog.c:478
+msgid "Bookmarks"
+msgstr "Kirjanmerkit"
 
-#: ../panels/screen/screen.ui.h:1
-msgid "Screen turns off"
-msgstr "Sammuta näyttö"
+#: ../panels/search/cc-search-locations-dialog.c:676
+msgid "Select Location"
+msgstr "Valitse sijainti"
 
-#: ../panels/screen/screen.ui.h:2
-msgid "30 seconds"
-msgstr "30 sekuntia"
+#: ../panels/search/cc-search-panel.c:193
+msgid "No applications found"
+msgstr "Sovelluksia ei löytynyt"
 
-#: ../panels/screen/screen.ui.h:3
-msgid "1 minute"
-msgstr "1 minuutti"
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:1
+msgid "Search"
+msgstr "Etsi"
 
-#: ../panels/screen/screen.ui.h:4
-msgid "2 minutes"
-msgstr "2 minuuttia"
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:2
+msgid ""
+"Control which applications show search results in the Activities Overview"
+msgstr "Mitkä ohjelmat näyttävät hakutuloksia Toiminnot-näkymässä"
 
-#: ../panels/screen/screen.ui.h:5
-msgid "3 minutes"
-msgstr "3 minuuttia"
+#. Translators: those are keywords for the search control-center panel
+#: ../panels/search/gnome-search-panel.desktop.in.in.h:4
+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
+#| msgid "Location"
+msgid "Search Locations"
+msgstr "Hakukohteet"
+
+#: ../panels/search/search.ui.h:1
+msgid "Move Up"
+msgstr "Siirrä _ylös"
+
+#: ../panels/search/search.ui.h:2
+msgid "Move Down"
+msgstr "Siirrä _alas"
+
+#: ../panels/search/search.ui.h:3
+msgid "Preferences"
+msgstr "Asetukset"
+
+#: ../panels/sharing/cc-sharing-panel.c:259
+msgctxt "service is enabled"
+msgid "On"
+msgstr "Päällä"
+
+#: ../panels/sharing/cc-sharing-panel.c:261
+msgctxt "service is disabled"
+msgid "Off"
+msgstr "Poissa"
+
+#: ../panels/sharing/cc-sharing-panel.c:407
+msgid "Choose a Folder"
+msgstr "Valitse kansio"
+
+#: ../panels/sharing/cc-sharing-panel.c:585
+msgid "Copy"
+msgstr "Kopioi"
+
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1
+msgid "Sharing"
+msgstr "Jakaminen"
+
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2
+msgid "Control what you want to share with others"
+msgstr "Valitse mitä haluat jakaa muiden kanssa"
+
+#. Translators: those are keywords for the sharing control-center panel
+#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4
+msgid ""
+"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;"
+"pictures;photos;movies;server;renderer;"
+msgstr ""
+
+#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
+#| msgid "Enable h_orizontal scrolling"
+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
+#| msgid "Authentication is required to change user data"
+msgid "Authentication is required to enable or disable remote login"
+msgstr "Etäkirjautumisen hallinta vaatii tunnistautuminen"
+
+#: ../panels/sharing/sharing.ui.h:1
+#| msgid "Bluetooth Settings"
+msgid "Bluetooth Sharing"
+msgstr "Bluetooth-jakaminen"
+
+#: ../panels/sharing/sharing.ui.h:2
+msgid ""
+"Bluetooth Sharing allows you to share files with other Bluetooth enabled "
+"devices"
+msgstr ""
+"Bluetoothin avulla voit jakaa tiedostoja toisten Bluetooth-laitteiden kanssa"
+
+#: ../panels/sharing/sharing.ui.h:3
+msgid "Share Public Folder"
+msgstr "Jaa julkinen kansio"
+
+#: ../panels/sharing/sharing.ui.h:4
+msgid "Only Receive From Trusted Devices"
+msgstr "Vastaanota vain luotetuilta laitteilta"
+
+#: ../panels/sharing/sharing.ui.h:5
+msgid "Save Received Files to Downloads Folder"
+msgstr "Tallenna vastaanotetut tiedostot Lataukset-kansioon"
+
+#: ../panels/sharing/sharing.ui.h:6
+msgid "Only share with Trusted Devices"
+msgstr "Jaa vain luotettujen laitteiden kesken"
+
+#: ../panels/sharing/sharing.ui.h:7
+msgid "Computer Name"
+msgstr "Tietokoneen nimi"
+
+#: ../panels/sharing/sharing.ui.h:8
+msgid "Some services are disabled because of no network access."
+msgstr "Jotkut palvelut ovat poissa käytöstä, koska verkkoyhteyttä ei ole."
 
-#: ../panels/screen/screen.ui.h:10
-msgid "_Dim screen to save power"
-msgstr "_Himmennä näyttöä virran säästämiseksi"
+#: ../panels/sharing/sharing.ui.h:9
+#| msgid "Media player"
+msgid "Media Sharing"
+msgstr "Mediajako"
 
-#: ../panels/screen/screen.ui.h:11
-msgid "Brightness"
-msgstr "Kirkkaus"
+#: ../panels/sharing/sharing.ui.h:10
+msgid "Share Music, Photos and Videos with others on the current network."
+msgstr ""
+"Jaa musiikkia, valokuvia ja videoita muiden samassa verkossa olevien kanssa."
+
+#: ../panels/sharing/sharing.ui.h:11
+msgid "Share Media On This Network"
+msgstr "Jaa mediaa tässä verkossa"
+
+#: ../panels/sharing/sharing.ui.h:12
+msgid "Shared Folders"
+msgstr "Jaetut kansiot"
+
+#: ../panels/sharing/sharing.ui.h:13
+msgid "column"
+msgstr "sarake"
 
-#: ../panels/screen/screen.ui.h:12
-msgid "_Turn screen off when inactive for:"
-msgstr "_Sammuta näyttö koneen ollessa käyttämättä:"
+#: ../panels/sharing/sharing.ui.h:14
+msgid "Add Folder"
+msgstr "Lisää kansio"
+
+#: ../panels/sharing/sharing.ui.h:15
+msgid "Remove Folder"
+msgstr "Poista kansio"
+
+#: ../panels/sharing/sharing.ui.h:16
+#| msgid "Personal digital assistant"
+msgid "Personal File Sharing"
+msgstr "Henkilökohtainen tiedostonjako"
+
+#: ../panels/sharing/sharing.ui.h:18
+#, no-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>"
+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>"
 
-#: ../panels/screen/screen.ui.h:13
-msgid "_Lock screen after:"
-msgstr "Näytön _lukituksen viive:"
+#: ../panels/sharing/sharing.ui.h:19
+msgid "Share Public Folder On This Network"
+msgstr "Jaa julkinen kansio tässä verkossa"
 
-#. To translators: This asks whether you want to lock the screen (through the screensaver) when you're 
detected to be physically in your home (your house, etc.)
-#: ../panels/screen/screen.ui.h:15
-msgid "Don't lock when at home"
-msgstr "Älä lukitse oltaessa kotona"
+#: ../panels/sharing/sharing.ui.h:20
+msgid "Require Password"
+msgstr "Vaadi salasana"
 
-#: ../panels/screen/screen.ui.h:16
-msgid "Locations..."
-msgstr "Sijainnit..."
+#: ../panels/sharing/sharing.ui.h:22
+msgid "Remote Login"
+msgstr "Etäkirjautuminen"
 
-#: ../panels/screen/screen.ui.h:17
-msgid "Show _notifications when locked"
-msgstr "_Näytä ilmoitukset lukituksen ollessa käytössä"
+#: ../panels/sharing/sharing.ui.h:24
+#, no-c-format
+msgid ""
+"Allow remote users to connect using the Secure Shell command:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
+msgstr ""
+"Salli etäkäyttäjien yhdistää käyttäen Secure Shell -komentoa:\n"
+"<a href=\"ssh %s\">ssh %s</a>"
 
-#: ../panels/screen/screen.ui.h:18
-msgid "Lock"
-msgstr "Automaattinen lukitus"
+#: ../panels/sharing/sharing.ui.h:26
+msgid "Screen Sharing"
+msgstr "Näytön jakaminen"
 
-#: ../panels/sound/applet-main.c:49
-msgid "Enable debugging code"
-msgstr "Ota vianetsintäkoodi käyttöön"
+#: ../panels/sharing/sharing.ui.h:28
+#, no-c-format
+msgid ""
+"Allow remote users to view or control your screen by connecting to: <a href="
+"\"vnc://%s\">vnc://%s</a>"
+msgstr ""
+"Salli etäkäyttäjien seurata ja hallita näyttöäsi yhdistämällä kohteeseen: <a "
+"href=\"vnc://%s\">vnc://%s</a>"
 
-#: ../panels/sound/applet-main.c:50
-msgid "Version of this application"
-msgstr "Tämän sovelluksen versio"
+#: ../panels/sharing/sharing.ui.h:29
+#| msgid "Remove Device"
+msgid "Remote View"
+msgstr "Etänäkymä"
 
-#: ../panels/sound/applet-main.c:62
-msgid " — GNOME Volume Control Applet"
-msgstr " — Gnomen äänenhallintasovelma"
+#: ../panels/sharing/sharing.ui.h:30
+#| msgid "Volume Control"
+msgid "Remote Control"
+msgstr "Etäkäyttö"
 
-#: ../panels/sound/data/gnome-sound-applet.desktop.in.h:1
-msgid "Volume Control"
-msgstr "Äänenvoimakkuuden hallinta"
+#: ../panels/sharing/sharing.ui.h:31
+msgid "Approve All Connections"
+msgstr "Hyväksy kaikki yhteydet"
 
-#: ../panels/sound/data/gnome-sound-applet.desktop.in.h:2
-msgid "Show desktop volume control"
-msgstr "Näytä työpöydän äänenvoimakkuuden hallinta"
+#: ../panels/sharing/sharing.ui.h:32
+msgid "Show Password"
+msgstr "Näytä salasana"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1
 msgid "Sound"
 msgstr "Ääni"
 
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2
-msgid "Change sound volume and sound events"
-msgstr "Muuta äänenvoimakkuutta ja äänitapahtumia"
+msgid "Change sound levels, inputs, outputs, and alert sounds"
+msgstr "Muuta äänenvoimakkuutta, sisään- ja ulostuloja sekä äänitapahtumia"
 
 #. Translators: those are keywords for the sound control-center panel
 #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4
@@ -3545,61 +5237,45 @@ msgstr "Lasi"
 msgid "Sonar"
 msgstr "Kaikuluotain"
 
-#: ../panels/sound/gvc-applet.c:270 ../panels/sound/gvc-mixer-dialog.c:1656
-msgid "Output"
-msgstr "Ulostulo"
-
-#: ../panels/sound/gvc-applet.c:272
-msgid "Sound Output Volume"
-msgstr "Äänen toistovoimakkuus"
-
-#: ../panels/sound/gvc-applet.c:276 ../panels/sound/gvc-mixer-dialog.c:1697
-msgid "Input"
-msgstr "Sisääntulo"
-
-#: ../panels/sound/gvc-applet.c:278
-msgid "Microphone Volume"
-msgstr "Mikrofonin äänenvoimakkuus"
-
-#: ../panels/sound/gvc-balance-bar.c:111
+#: ../panels/sound/gvc-balance-bar.c:106
 msgctxt "balance"
 msgid "Left"
 msgstr "Vasen"
 
-#: ../panels/sound/gvc-balance-bar.c:112
+#: ../panels/sound/gvc-balance-bar.c:107
 msgctxt "balance"
 msgid "Right"
 msgstr "Oikea"
 
-#: ../panels/sound/gvc-balance-bar.c:115
+#: ../panels/sound/gvc-balance-bar.c:110
 msgctxt "balance"
 msgid "Rear"
 msgstr "Taka"
 
-#: ../panels/sound/gvc-balance-bar.c:116
+#: ../panels/sound/gvc-balance-bar.c:111
 msgctxt "balance"
 msgid "Front"
 msgstr "Etu"
 
-#: ../panels/sound/gvc-balance-bar.c:119
+#: ../panels/sound/gvc-balance-bar.c:114
 msgctxt "balance"
 msgid "Minimum"
 msgstr "Minimi"
 
-#: ../panels/sound/gvc-balance-bar.c:120
+#: ../panels/sound/gvc-balance-bar.c:115
 msgctxt "balance"
 msgid "Maximum"
 msgstr "Maksimi"
 
-#: ../panels/sound/gvc-balance-bar.c:295
+#: ../panels/sound/gvc-balance-bar.c:290
 msgid "_Balance:"
 msgstr "_Tasapaino:"
 
-#: ../panels/sound/gvc-balance-bar.c:298
+#: ../panels/sound/gvc-balance-bar.c:293
 msgid "_Fade:"
 msgstr "_Häivytys:"
 
-#: ../panels/sound/gvc-balance-bar.c:301
+#: ../panels/sound/gvc-balance-bar.c:296
 msgid "_Subwoofer:"
 msgstr "_Subwoofer:"
 
@@ -3614,13 +5290,13 @@ msgid "Unamplified"
 msgstr "Vahvistamaton"
 
 #: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:260
-#: ../panels/sound/gvc-mixer-dialog.c:521
+#: ../panels/sound/gvc-mixer-dialog.c:526
 msgid "_Profile:"
 msgstr "_Profiili:"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1841
+#: ../panels/sound/gvc/gvc-mixer-control.c:1837
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -3629,14 +5305,14 @@ msgstr[1] "%u ulostuloa"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../panels/sound/gvc-mixer-control.c:1851
+#: ../panels/sound/gvc/gvc-mixer-control.c:1847
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "%u sisääntulo"
 msgstr[1] "%u sisääntuloa"
 
-#: ../panels/sound/gvc-mixer-control.c:2375
+#: ../panels/sound/gvc/gvc-mixer-control.c:2373
 msgid "System Sounds"
 msgstr "Järjestelmän äänet"
 
@@ -3644,57 +5320,69 @@ msgstr "Järjestelmän äänet"
 msgid "_Test Speakers"
 msgstr "_Testaa kaiuttimia"
 
-#: ../panels/sound/gvc-mixer-dialog.c:426
+#: ../panels/sound/gvc-mixer-dialog.c:431
 msgid "Peak detect"
 msgstr "Havaitse piikit"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1506
+#: ../panels/sound/gvc-mixer-dialog.c:1508
 #: ../panels/sound/gvc-sound-theme-chooser.c:595
 msgid "Name"
 msgstr "Nimi"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1588
+#: ../panels/sound/gvc-mixer-dialog.c:1527
+msgid "Device"
+msgstr "Laite"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1590
 #, c-format
 msgid "Speaker Testing for %s"
 msgstr "Kaiutintesti: %s"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1642
+#: ../panels/sound/gvc-mixer-dialog.c:1644
 msgid "_Output volume:"
 msgstr "_Toistovoimakkuus:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1661
+#: ../panels/sound/gvc-mixer-dialog.c:1658
+msgid "Output"
+msgstr "Ulostulo"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1663
 msgid "C_hoose a device for sound output:"
 msgstr "_Valitse laite äänen toistamiseksi:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1686
+#: ../panels/sound/gvc-mixer-dialog.c:1688
 msgid "Settings for the selected device:"
 msgstr "Valitun laitteen asetukset:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1704
+#: ../panels/sound/gvc-mixer-dialog.c:1699
+msgid "Input"
+msgstr "Sisääntulo"
+
+#: ../panels/sound/gvc-mixer-dialog.c:1706
 msgid "_Input volume:"
 msgstr "_Äänitysvoimakkuus:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1727
+#: ../panels/sound/gvc-mixer-dialog.c:1729
 msgid "Input level:"
 msgstr "Äänitystaso:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1755
+#: ../panels/sound/gvc-mixer-dialog.c:1757
 msgid "C_hoose a device for sound input:"
 msgstr "_Valitse laite äänen tallentamiseksi:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1782
+#: ../panels/sound/gvc-mixer-dialog.c:1784
 msgid "Sound Effects"
 msgstr "Äänitehosteet"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1789
+#: ../panels/sound/gvc-mixer-dialog.c:1791
 msgid "_Alert volume:"
 msgstr "_Hälytysten voimakkuus:"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1802
+#: ../panels/sound/gvc-mixer-dialog.c:1804
 msgid "Applications"
 msgstr "Sovellukset"
 
-#: ../panels/sound/gvc-mixer-dialog.c:1806
+#: ../panels/sound/gvc-mixer-dialog.c:1808
 msgid "No application is currently playing or recording audio."
 msgstr "Mikään sovellus ei nyt soita tai tallenna ääntä."
 
@@ -3739,35 +5427,18 @@ msgstr "Testaa"
 msgid "Subwoofer"
 msgstr "Subwoofer"
 
-#: ../panels/sound/gvc-stream-status-icon.c:236
-#, c-format
-msgid "Failed to start Sound Preferences: %s"
-msgstr "Ääniasetuksia ei voitu käynnistää: %s"
-
-#: ../panels/sound/gvc-stream-status-icon.c:262
-msgid "_Mute"
-msgstr "_Vaimenna ääni"
-
-#: ../panels/sound/gvc-stream-status-icon.c:271
-msgid "_Sound Preferences"
-msgstr "Ää_niasetukset"
-
-#: ../panels/sound/gvc-stream-status-icon.c:416
-msgid "Muted"
-msgstr "Vaimennettu"
-
 #: ../panels/sound/sound-theme-file-utils.c:292
 msgid "Custom"
 msgstr "Oma"
 
-#: ../panels/universal-access/cc-ua-panel.c:286
-#: ../panels/universal-access/cc-ua-panel.c:292
+#: ../panels/universal-access/cc-ua-panel.c:281
+#: ../panels/universal-access/cc-ua-panel.c:287
 msgid "No shortcut set"
 msgstr "Pikanäppäintä ei asetettu"
 
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2
-msgid "Universal Access Preferences"
-msgstr "Esteettömyysasetukset"
+msgid "Make it easier to see, hear, type, point and click"
+msgstr "Helpota näkemistä, kuulemista, kirjoittamista ja hiiren käyttöä"
 
 #. Translators: those are keywords for the universal access control-center panel
 #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4
@@ -3780,6 +5451,7 @@ msgstr ""
 "näppäimet;Hitaat näppäimet;Kimmonäppäimet;Hiiren painikkeet;"
 
 #: ../panels/universal-access/uap.ui.h:1
+#: ../panels/universal-access/zoom-options.ui.h:35
 msgctxt "universal access, contrast"
 msgid "Low"
 msgstr "Matala"
@@ -3790,6 +5462,7 @@ msgid "Normal"
 msgstr "Tavallinen"
 
 #: ../panels/universal-access/uap.ui.h:3
+#: ../panels/universal-access/zoom-options.ui.h:36
 msgctxt "universal access, contrast"
 msgid "High"
 msgstr "Korkea"
@@ -3811,10 +5484,6 @@ msgstr "GOK"
 msgid "OnBoard"
 msgstr "OnBoard"
 
-#: ../panels/universal-access/uap.ui.h:8
-msgid "None"
-msgstr "Ei mikään"
-
 #: ../panels/universal-access/uap.ui.h:10
 #, no-c-format
 msgid "75%"
@@ -3863,10 +5532,6 @@ msgstr "Suuri kontrasti"
 msgid "Beep on Caps and Num Lock"
 msgstr "Soita äänimerkki, kun Caps ja Num Lock ovat päällä"
 
-#: ../panels/universal-access/uap.ui.h:23
-msgid "Options..."
-msgstr "Valinnat..."
-
 #: ../panels/universal-access/uap.ui.h:24
 msgid "Screen Reader"
 msgstr "Näytönlukija"
@@ -3960,118 +5625,128 @@ msgstr "Aseta viive hyväksyttyjen näppäinpainallusten välille"
 msgid "A_cceptance delay:"
 msgstr "V_iiveen kesto:"
 
-#: ../panels/universal-access/uap.ui.h:50
+#: ../panels/universal-access/uap.ui.h:48
+msgctxt "universal access, delay"
+msgid "Short"
+msgstr "Lyhyt"
+
+#: ../panels/universal-access/uap.ui.h:49
 msgid "Slow keys typing delay"
 msgstr "Hitaiden näppäinten kirjoitusviive"
 
+#: ../panels/universal-access/uap.ui.h:50
+msgctxt "universal access, delay"
+msgid "Long"
+msgstr "Pitkä"
+
 #. This string is part of a line of checkboxes: Beep when a key is [ ] pressed  [ ] accepted  [ ] rejected
-#: ../panels/universal-access/uap.ui.h:54
+#: ../panels/universal-access/uap.ui.h:52
 msgid "Beep when a key is"
 msgstr "Soita äänimerkki, kun näppäin(tä) on"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:56
+#: ../panels/universal-access/uap.ui.h:54
 msgid "pressed"
 msgstr "painettu"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:58
+#: ../panels/universal-access/uap.ui.h:56
 msgid "accepted"
 msgstr "hyväksytty"
 
 #. This completes the sentence "Beep when a key is"
-#: ../panels/universal-access/uap.ui.h:60
+#: ../panels/universal-access/uap.ui.h:58
 msgid "rejected"
 msgstr "hylätty"
 
-#: ../panels/universal-access/uap.ui.h:61
+#: ../panels/universal-access/uap.ui.h:59
 msgid "Bounce Keys"
 msgstr "Kimmonäppäimet"
 
-#: ../panels/universal-access/uap.ui.h:62
+#: ../panels/universal-access/uap.ui.h:60
 msgid "Ignores fast duplicate keypresses"
 msgstr "Älä huomioi nopeita kahden näppäimen painalluksia"
 
-#: ../panels/universal-access/uap.ui.h:63
+#: ../panels/universal-access/uap.ui.h:61
 msgid "Acc_eptance delay:"
 msgstr "Vi_iveen kesto:"
 
-#: ../panels/universal-access/uap.ui.h:64
+#: ../panels/universal-access/uap.ui.h:62
 msgid "Bounce keys typing delay"
 msgstr "Kimmonäppäinten kirjoitusviive"
 
-#: ../panels/universal-access/uap.ui.h:65
+#: ../panels/universal-access/uap.ui.h:63
 msgid "Beep when a key is _rejected"
 msgstr "Soita äänimerkki, kun näppäinpainallusta ei _hyväksytty"
 
-#: ../panels/universal-access/uap.ui.h:66
+#: ../panels/universal-access/uap.ui.h:64
 msgid "Enable by Keyboard"
 msgstr "Ota käyttöön näppäimistöä käyttäen"
 
-#: ../panels/universal-access/uap.ui.h:67
+#: ../panels/universal-access/uap.ui.h:65
 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:69
+#: ../panels/universal-access/uap.ui.h:67
 msgid "Mouse Keys"
 msgstr "Hiirinäppäimet"
 
-#: ../panels/universal-access/uap.ui.h:70
+#: ../panels/universal-access/uap.ui.h:68
 msgid "Control the pointer using the keypad"
 msgstr "Ohjata osoitinta näppäimistön avulla"
 
-#: ../panels/universal-access/uap.ui.h:71
+#: ../panels/universal-access/uap.ui.h:69
 msgid "Video Mouse"
 msgstr "Videohiiri"
 
-#: ../panels/universal-access/uap.ui.h:72
+#: ../panels/universal-access/uap.ui.h:70
 msgid "Control the pointer using the video camera."
 msgstr "Ohjaa osoitinta videokameran avulla"
 
-#: ../panels/universal-access/uap.ui.h:73
+#: ../panels/universal-access/uap.ui.h:71
 msgid "Simulated Secondary Click"
 msgstr "Kakkospainikkeen simuloitu napsautus"
 
-#: ../panels/universal-access/uap.ui.h:74
+#: ../panels/universal-access/uap.ui.h:72
 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:75
+#: ../panels/universal-access/uap.ui.h:73
 msgid "Secondary click delay"
 msgstr "Kakkosnäppäimen viive"
 
-#: ../panels/universal-access/uap.ui.h:76
+#: ../panels/universal-access/uap.ui.h:74
 msgid "Hover Click"
 msgstr "Napsautus kohdistamalla"
 
-#: ../panels/universal-access/uap.ui.h:77
+#: ../panels/universal-access/uap.ui.h:75
 msgid "Trigger a click when the pointer hovers"
 msgstr "Toteuta painallus, kun hiiren kohdistin kohdistetaan"
 
-#: ../panels/universal-access/uap.ui.h:78
+#: ../panels/universal-access/uap.ui.h:76
 msgid "D_elay:"
 msgstr "Viiv_e:"
 
-#: ../panels/universal-access/uap.ui.h:79
+#: ../panels/universal-access/uap.ui.h:77
 msgid "Motion _threshold:"
 msgstr "Liikkeen _kynnysarvo:"
 
-#. small threshold
-#: ../panels/universal-access/uap.ui.h:81
+#: ../panels/universal-access/uap.ui.h:78
+msgctxt "universal access, threshold"
 msgid "Small"
 msgstr "Pieni"
 
-#. large threshold
-#: ../panels/universal-access/uap.ui.h:83
+#: ../panels/universal-access/uap.ui.h:79
+msgctxt "universal access, threshold"
 msgid "Large"
 msgstr "Suuri"
 
-#: ../panels/universal-access/uap.ui.h:84
+#: ../panels/universal-access/uap.ui.h:80
 msgid "Mouse Settings"
 msgstr "Hiiriasetukset"
 
-#: ../panels/universal-access/uap.ui.h:85
+#: ../panels/universal-access/uap.ui.h:81
 msgid "Pointing and Clicking"
 msgstr "Kohdistaminen ja napsauttaminen"
 
@@ -4168,70 +5843,72 @@ msgstr "Suurennuslasi"
 msgid "Thickness:"
 msgstr "Paksuus:"
 
-#. short delay
-#: ../panels/universal-access/zoom-options.ui.h:19
+#: ../panels/universal-access/zoom-options.ui.h:18
+msgctxt "universal access, thickness"
 msgid "Thin"
 msgstr "Ohut"
 
-#. long delay
-#: ../panels/universal-access/zoom-options.ui.h:21
+#: ../panels/universal-access/zoom-options.ui.h:19
+msgctxt "universal access, thickness"
 msgid "Thick"
 msgstr "Paksu"
 
-#: ../panels/universal-access/zoom-options.ui.h:22
+#: ../panels/universal-access/zoom-options.ui.h:20
 msgid "Length:"
 msgstr "Pituus:"
 
-#: ../panels/universal-access/zoom-options.ui.h:23
+#. The color of the accessibility crosshair
+#: ../panels/universal-access/zoom-options.ui.h:22
 msgid "Color:"
 msgstr "Väri:"
 
-#: ../panels/universal-access/zoom-options.ui.h:24
+#: ../panels/universal-access/zoom-options.ui.h:23
 msgid "Crosshairs:"
 msgstr "Tähtäin:"
 
-#: ../panels/universal-access/zoom-options.ui.h:25
+#: ../panels/universal-access/zoom-options.ui.h:24
 msgid "Overlaps mouse cursor"
 msgstr "Hiiren osoittimen päällä"
 
-#: ../panels/universal-access/zoom-options.ui.h:26
+#: ../panels/universal-access/zoom-options.ui.h:25
 msgid "Crosshairs"
 msgstr "Tähtäimet"
 
-#: ../panels/universal-access/zoom-options.ui.h:27
+#: ../panels/universal-access/zoom-options.ui.h:26
 msgid "White on black:"
 msgstr "Valkoista mustalla:"
 
-#: ../panels/universal-access/zoom-options.ui.h:28
+#: ../panels/universal-access/zoom-options.ui.h:27
 msgid "Brightness:"
 msgstr "Kirkkaus:"
 
-#: ../panels/universal-access/zoom-options.ui.h:29
+#: ../panels/universal-access/zoom-options.ui.h:28
 msgid "Contrast:"
 msgstr "Kontrasti:"
 
+#. The contrast scale goes from Color to None (grayscale)
 #: ../panels/universal-access/zoom-options.ui.h:30
-msgctxt "Zoom Grayscale"
+msgctxt "universal access, contrast"
 msgid "Color"
 msgstr "Väri"
 
 #: ../panels/universal-access/zoom-options.ui.h:31
-msgctxt "Zoom Grayscale"
+msgctxt "universal access, color"
 msgid "None"
 msgstr "Ei mitään"
 
 #: ../panels/universal-access/zoom-options.ui.h:32
-msgctxt "Zoom Grayscale"
+msgctxt "universal access, color"
 msgid "Full"
 msgstr "Täysi"
 
-#. short delay
-#: ../panels/universal-access/zoom-options.ui.h:34
+#: ../panels/universal-access/zoom-options.ui.h:33
+msgctxt "universal access, brightness"
 msgid "Low"
 msgstr "Matala"
 
-#. long delay
-#: ../panels/universal-access/zoom-options.ui.h:36
+#: ../panels/universal-access/zoom-options.ui.h:34
+msgctxt "universal access, brightness"
 msgid "High"
 msgstr "Korkea"
 
@@ -4269,10 +5946,6 @@ msgstr "_Paikallinen tili"
 msgid "_Enterprise Login"
 msgstr "_Yrityskirjautumisen vaativa tili"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:6
-msgid "_Username"
-msgstr "_Käyttäjätunnus"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:7
 msgid "_Full name"
 msgstr "_Koko nimi"
@@ -4290,11 +5963,6 @@ msgstr "T_oimialue"
 msgid "_Login Name"
 msgstr "K_irjautumistunnus"
 
-#: ../panels/user-accounts/data/account-dialog.ui.h:11
-#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8
-msgid "_Password"
-msgstr "_Salasana"
-
 #: ../panels/user-accounts/data/account-dialog.ui.h:12
 msgid "Tip: Enterprise domain or realm name"
 msgstr "Vihje: yrityksen toimialue tai alueen nimi"
@@ -4358,7 +6026,7 @@ msgid "Right little finger"
 msgstr "Oikea pikkurilli"
 
 #: ../panels/user-accounts/data/account-fingerprint.ui.h:9
-#: ../panels/user-accounts/um-fingerprint-dialog.c:706
+#: ../panels/user-accounts/um-fingerprint-dialog.c:700
 msgid "Enable Fingerprint Login"
 msgstr "Ota sormenjäljellä kirjautuminen käyttöön"
 
@@ -4383,17 +6051,35 @@ msgstr ""
 "kirjautumaan sisään sormenjäljen avulla."
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1
-msgid "User Accounts"
-msgstr "Käyttäjätilit"
+msgid "Users"
+msgstr "Käyttäjät"
 
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2
-msgid "Add or remove users"
-msgstr "Lisää tai poista käyttäjiä"
+msgid "Add or remove users and change your password"
+msgstr "Lisää tai poista käyttäjiä, vaihda salasanasi"
 
 #. Translators: those are keywords for the user accounts control-center panel
 #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4
 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;"
-msgstr "kirjautuminen;nimi;sormenjälki;avatar;logo;kasvokuva;salasana;"
+msgstr ""
+"Login;Name;Fingerprint;Avatar;Logo;Face;Password;kirjautuminen;nimi;"
+"sormenjälki;avatar;kasvokuva;salasana;"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:1
+msgid "Login History"
+msgstr "Kirjautumishistoria"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:3
+msgid "Previous Week"
+msgstr "Edellinen viikko"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:4
+msgid "Next Week"
+msgstr "Seuraava viikko"
+
+#: ../panels/user-accounts/data/history-dialog.ui.h:5
+msgid "Next week"
+msgstr "Seuraava viikko"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:1
 msgid "Set a password now"
@@ -4416,54 +6102,38 @@ msgid "Enable this account"
 msgstr "Ota tämä tili käyttöön"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:6
-msgid "_Hint"
-msgstr "_Vihje"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:7
-msgid ""
-"This hint may be displayed at the login screen.  It will be visible to all "
-"users of this system.  Do <b>not</b> include the password here."
-msgstr ""
-"Tämä vihje saatetaan näyttää kirjautumisruudussa. Se on näkyvissä kaikille "
-"käyttäjille. <b>Älä</b> sisällytä salasanaasi tähän!"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "C_onfirm password"
 msgstr "Va_hvista salasana"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:9
+#: ../panels/user-accounts/data/password-dialog.ui.h:7
 msgid "_New password"
 msgstr "_Uusi salasana"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:10
+#: ../panels/user-accounts/data/password-dialog.ui.h:8
 msgid "Generate a password"
 msgstr "Luo salasana"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:11
-msgid "Fair"
-msgstr "Kohtalainen"
-
-#: ../panels/user-accounts/data/password-dialog.ui.h:12
+#: ../panels/user-accounts/data/password-dialog.ui.h:9
 msgid "Current _password"
 msgstr "Nykyinen sa_lasana"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:13
+#: ../panels/user-accounts/data/password-dialog.ui.h:10
 msgid "_Action"
 msgstr "_Toiminto"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:14
+#: ../panels/user-accounts/data/password-dialog.ui.h:11
 msgid "Changing password for"
 msgstr "Vaihdetaan salasanaa käyttäjälle"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:15
+#: ../panels/user-accounts/data/password-dialog.ui.h:12
 msgid "_Show password"
 msgstr "_Näytä salasana"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:16
+#: ../panels/user-accounts/data/password-dialog.ui.h:13
 msgid "How to choose a strong password"
 msgstr "Kuinka valita vahva salasana"
 
-#: ../panels/user-accounts/data/password-dialog.ui.h:17
+#: ../panels/user-accounts/data/password-dialog.ui.h:14
 msgid "Ch_ange"
 msgstr "_Vaihda"
 
@@ -4530,6 +6200,10 @@ msgstr "Käyttäjän kuvake"
 msgid "_Language"
 msgstr "_Kieli"
 
+#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13
+msgid "Last Login"
+msgstr "Viimeisin kirjautuminen"
+
 #: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1
 msgid "Manage user accounts"
 msgstr "Hallitse käyttäjätilejä"
@@ -4539,7 +6213,7 @@ msgid "Authentication is required to change user data"
 msgstr "Käyttäjätietojen muuttaminen vaatii tunnistautuminen"
 
 #: ../panels/user-accounts/pw-utils.c:94
-#: ../panels/user-accounts/um-password-dialog.c:569
+#: ../panels/user-accounts/um-password-dialog.c:597
 msgctxt "Password strength"
 msgid "Too short"
 msgstr "Liian lyhyt"
@@ -4550,25 +6224,25 @@ msgid "Not good enough"
 msgstr "Ei riittävän hyvä"
 
 #: ../panels/user-accounts/pw-utils.c:108
-#: ../panels/user-accounts/um-password-dialog.c:570
+#: ../panels/user-accounts/um-password-dialog.c:598
 msgctxt "Password strength"
 msgid "Weak"
 msgstr "Heikko"
 
 #: ../panels/user-accounts/pw-utils.c:111
-#: ../panels/user-accounts/um-password-dialog.c:571
+#: ../panels/user-accounts/um-password-dialog.c:599
 msgctxt "Password strength"
 msgid "Fair"
 msgstr "Kohtalainen"
 
 #: ../panels/user-accounts/pw-utils.c:114
-#: ../panels/user-accounts/um-password-dialog.c:572
+#: ../panels/user-accounts/um-password-dialog.c:600
 msgctxt "Password strength"
 msgid "Good"
 msgstr "Hyvä"
 
 #: ../panels/user-accounts/pw-utils.c:117
-#: ../panels/user-accounts/um-password-dialog.c:573
+#: ../panels/user-accounts/um-password-dialog.c:601
 msgctxt "Password strength"
 msgid "Strong"
 msgstr "Vahva"
@@ -4578,7 +6252,6 @@ msgid "Authentication failed"
 msgstr "Tunnistautuminen epäonnistui"
 
 #: ../panels/user-accounts/run-passwd.c:504
-#: ../panels/user-accounts/um-password-dialog.c:239
 #, c-format
 msgid "The new password is too short"
 msgstr "Uusi salasana on liian lyhyt"
@@ -4623,25 +6296,25 @@ msgstr "Uusi salasana ei sisällä riittävästi eri merkkejä"
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../panels/user-accounts/um-account-dialog.c:180
+#: ../panels/user-accounts/um-account-dialog.c:182
 msgid "Failed to add account"
 msgstr "Tilin lisäys epäonnistui"
 
-#: ../panels/user-accounts/um-account-dialog.c:378
-#: ../panels/user-accounts/um-account-dialog.c:419
+#: ../panels/user-accounts/um-account-dialog.c:403
+#: ../panels/user-accounts/um-account-dialog.c:444
 msgid "Failed to register account"
 msgstr "Tilin rekisteröinti epäonnistui"
 
-#: ../panels/user-accounts/um-account-dialog.c:551
+#: ../panels/user-accounts/um-account-dialog.c:577
 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:605
+#: ../panels/user-accounts/um-account-dialog.c:631
 msgid "Failed to join domain"
 msgstr "Toimialueeseen liittyminen epäonnistui"
 
-#: ../panels/user-accounts/um-account-dialog.c:662
+#: ../panels/user-accounts/um-account-dialog.c:688
 msgid "Failed to log into domain"
 msgstr "Toimialueeseen kirjautuminen epäonnistui"
 
@@ -4696,16 +6369,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:603
+#: ../panels/user-accounts/um-fingerprint-dialog.c:599
 #, c-format
 msgid "Could not start finger capture on '%s' device"
 msgstr "Sormenjäljen tunnistusta ei voitu aloitta laitteella ”%s”"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:655
+#: ../panels/user-accounts/um-fingerprint-dialog.c:650
 msgid "Could not access any fingerprint readers"
 msgstr "Sormenjälkilukijoita ei voitu käyttää"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:656
+#: ../panels/user-accounts/um-fingerprint-dialog.c:651
 msgid "Please contact your system administrator for help."
 msgstr "Kysy apua järjestelmäsi ylläpitäjältä."
 
@@ -4714,7 +6387,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:740
+#: ../panels/user-accounts/um-fingerprint-dialog.c:734
 #, c-format
 msgid ""
 "To enable fingerprint login, you need to save one of your fingerprints, "
@@ -4723,59 +6396,67 @@ 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:747
+#: ../panels/user-accounts/um-fingerprint-dialog.c:741
 msgid "Selecting finger"
 msgstr "Valitaan sormea"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:748
+#: ../panels/user-accounts/um-fingerprint-dialog.c:742
 msgid "Enrolling fingerprints"
 msgstr "Kirjataan sormenjälkiä"
 
-#: ../panels/user-accounts/um-fingerprint-dialog.c:749
-msgid "Summary"
-msgstr "Yhteenveto"
+#: ../panels/user-accounts/um-history-dialog.c:88
+msgid "This Week"
+msgstr "Tällä viikolla"
 
-#: ../panels/user-accounts/um-password-dialog.c:96
+#: ../panels/user-accounts/um-history-dialog.c:91
+msgid "Last Week"
+msgstr "Viime viikolla"
+
+#: ../panels/user-accounts/um-password-dialog.c:128
 msgid "_Generate a password"
 msgstr "_Luo salasana"
 
-#: ../panels/user-accounts/um-password-dialog.c:150
+#: ../panels/user-accounts/um-password-dialog.c:181
 msgid "Please choose another password."
 msgstr "Valitse jokin toinen salasana."
 
-#: ../panels/user-accounts/um-password-dialog.c:159
+#: ../panels/user-accounts/um-password-dialog.c:190
 msgid "Please type your current password again."
 msgstr "Syötä nykyinen salasana uudelleen."
 
-#: ../panels/user-accounts/um-password-dialog.c:165
+#: ../panels/user-accounts/um-password-dialog.c:196
 msgid "Password could not be changed"
 msgstr "Salasanaa ei voitu vaihtaa"
 
-#: ../panels/user-accounts/um-password-dialog.c:236
+#: ../panels/user-accounts/um-password-dialog.c:301
 msgid "You need to enter a new password"
 msgstr "Syötä salasana"
 
-#: ../panels/user-accounts/um-password-dialog.c:245
+#: ../panels/user-accounts/um-password-dialog.c:304
+msgid "The new password is not strong enough"
+msgstr "Uusi salasana ei ole riittävän vahva"
+
+#: ../panels/user-accounts/um-password-dialog.c:310
 msgid "You need to confirm the password"
 msgstr "Vahvista salasana"
 
-#: ../panels/user-accounts/um-password-dialog.c:248
+#: ../panels/user-accounts/um-password-dialog.c:313
 msgid "The passwords do not match"
 msgstr "Salasanat eivät täsmää"
 
-#: ../panels/user-accounts/um-password-dialog.c:254
+#: ../panels/user-accounts/um-password-dialog.c:319
 msgid "You need to enter your current password"
 msgstr "Syötä nykyinen salasana"
 
-#: ../panels/user-accounts/um-password-dialog.c:257
+#: ../panels/user-accounts/um-password-dialog.c:322
 msgid "The current password is not correct"
 msgstr "Nykyinen salasana ei ole oikea"
 
-#: ../panels/user-accounts/um-password-dialog.c:347
+#: ../panels/user-accounts/um-password-dialog.c:385
 msgid "Passwords do not match"
 msgstr "Salasanat eivät täsmää"
 
-#: ../panels/user-accounts/um-password-dialog.c:409
+#: ../panels/user-accounts/um-password-dialog.c:439
 msgid "Wrong password"
 msgstr "Väärä salasana"
 
@@ -4784,65 +6465,55 @@ msgid "Disable image"
 msgstr "Poista kuva käytöstä"
 
 #: ../panels/user-accounts/um-photo-dialog.c:461
-msgid "Take a photo..."
-msgstr "Ota kuva..."
+msgid "Take a photo…"
+msgstr "Ota kuva…"
 
 #: ../panels/user-accounts/um-photo-dialog.c:479
-msgid "Browse for more pictures..."
-msgstr "Selaa lisää kuvia..."
+msgid "Browse for more pictures…"
+msgstr "Selaa lisää kuvia…"
 
-#: ../panels/user-accounts/um-photo-dialog.c:704
+#: ../panels/user-accounts/um-photo-dialog.c:703
 #, c-format
 msgid "Used by %s"
 msgstr "Käytössä (%s)"
 
-#: ../panels/user-accounts/um-realm-manager.c:379
+#: ../panels/user-accounts/um-realm-manager.c:351
+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:414
 #, c-format
 msgid "No such domain or realm found"
 msgstr "Määriteltyä toimialuetta tai aluetta ei löytynyt"
 
-#: ../panels/user-accounts/um-realm-manager.c:780
+#: ../panels/user-accounts/um-realm-manager.c:815
 #, 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:785
+#: ../panels/user-accounts/um-realm-manager.c:820
 msgid "Invalid password, please try again"
 msgstr "Virheellinen salasana, yritä uudelleen"
 
-#: ../panels/user-accounts/um-realm-manager.c:789
+#: ../panels/user-accounts/um-realm-manager.c:824
 #, c-format
 msgid "Couldn't connect to the %s domain: %s"
 msgstr "Toimialueeseen %s yhdistäminen epäonnistui: %s"
 
-#: ../panels/user-accounts/um-user-manager.c:466
-#, c-format
-msgid "A user with name '%s' already exists."
-msgstr "Käyttäjä nimellä '%s' on jo olemassa."
-
-#: ../panels/user-accounts/um-user-manager.c:473
-#, c-format
-msgid "No user with the name '%s' exists."
-msgstr "Käyttäjää nimellä \"%s\" ei ole olemassa."
-
-#: ../panels/user-accounts/um-user-manager.c:631
-msgid "This user does not exist."
-msgstr "Tätä käyttäjää ei löydy"
-
-#: ../panels/user-accounts/um-user-panel.c:371
+#: ../panels/user-accounts/um-user-panel.c:376
 msgid "Failed to delete user"
 msgstr "Käyttäjän poisto epäonnistui"
 
-#: ../panels/user-accounts/um-user-panel.c:431
+#: ../panels/user-accounts/um-user-panel.c:436
 msgid "You cannot delete your own account."
 msgstr "Et voi poistaa omaa tunnustasi."
 
-#: ../panels/user-accounts/um-user-panel.c:440
+#: ../panels/user-accounts/um-user-panel.c:445
 #, c-format
 msgid "%s is still logged in"
 msgstr "%s on yhä sisäänkirjautuneena"
 
-#: ../panels/user-accounts/um-user-panel.c:444
+#: ../panels/user-accounts/um-user-panel.c:449
 msgid ""
 "Deleting a user while they are logged in can leave the system in an "
 "inconsistent state."
@@ -4850,12 +6521,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:453
+#: ../panels/user-accounts/um-user-panel.c:458
 #, 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:457
+#: ../panels/user-accounts/um-user-panel.c:462
 msgid ""
 "It is possible to keep the home directory, mail spool and temporary files "
 "around when deleting a user account."
@@ -4863,38 +6534,42 @@ 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:460
+#: ../panels/user-accounts/um-user-panel.c:465
 msgid "_Delete Files"
 msgstr "P_oista tiedostot"
 
-#: ../panels/user-accounts/um-user-panel.c:461
+#: ../panels/user-accounts/um-user-panel.c:466
 msgid "_Keep Files"
 msgstr "_Säilytä tiedostot"
 
-#: ../panels/user-accounts/um-user-panel.c:513
+#: ../panels/user-accounts/um-user-panel.c:518
 msgctxt "Password mode"
 msgid "Account disabled"
 msgstr "Käyttäjätili pois käytöstä"
 
-#: ../panels/user-accounts/um-user-panel.c:521
+#: ../panels/user-accounts/um-user-panel.c:526
 msgctxt "Password mode"
 msgid "To be set at next login"
 msgstr "Asetetaan seuraavalla kirjautumiskerralla"
 
-#: ../panels/user-accounts/um-user-panel.c:524
+#: ../panels/user-accounts/um-user-panel.c:529
 msgctxt "Password mode"
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../panels/user-accounts/um-user-panel.c:871
+#: ../panels/user-accounts/um-user-panel.c:578
+msgid "Logged in"
+msgstr "Sisäänkirjautuneena"
+
+#: ../panels/user-accounts/um-user-panel.c:942
 msgid "Failed to contact the accounts service"
 msgstr "Yhteys tilipalveluun (accounts service) epäonnistui"
 
-#: ../panels/user-accounts/um-user-panel.c:873
+#: ../panels/user-accounts/um-user-panel.c:944
 msgid "Please make sure that the AccountService is installed and enabled."
 msgstr "Varmista, että AccountService on asennettu ja käytössä."
 
-#: ../panels/user-accounts/um-user-panel.c:913
+#: ../panels/user-accounts/um-user-panel.c:985
 msgid ""
 "To make changes,\n"
 "click the * icon first"
@@ -4902,12 +6577,12 @@ msgstr ""
 "Tee muutoksia\n"
 "napsauttamalla ensin *-kuvaketta"
 
-#: ../panels/user-accounts/um-user-panel.c:951
+#: ../panels/user-accounts/um-user-panel.c:1023
 msgid "Create a user account"
 msgstr "Luo käyttäjätili"
 
-#: ../panels/user-accounts/um-user-panel.c:962
-#: ../panels/user-accounts/um-user-panel.c:1273
+#: ../panels/user-accounts/um-user-panel.c:1034
+#: ../panels/user-accounts/um-user-panel.c:1320
 msgid ""
 "To create a user account,\n"
 "click the * icon first"
@@ -4915,12 +6590,12 @@ msgstr ""
 "Luo käyttäjätili\n"
 "napsauttamalla ensin *-kuvaketta"
 
-#: ../panels/user-accounts/um-user-panel.c:971
+#: ../panels/user-accounts/um-user-panel.c:1043
 msgid "Delete the selected user account"
 msgstr "Poista valittu käyttäjätili"
 
-#: ../panels/user-accounts/um-user-panel.c:983
-#: ../panels/user-accounts/um-user-panel.c:1278
+#: ../panels/user-accounts/um-user-panel.c:1055
+#: ../panels/user-accounts/um-user-panel.c:1325
 msgid ""
 "To delete the selected user account,\n"
 "click the * icon first"
@@ -4928,29 +6603,29 @@ msgstr ""
 "Poista valittu käyttäjä\n"
 "napsauttamalla ensin *-kuvaketta"
 
-#: ../panels/user-accounts/um-user-panel.c:1176
+#: ../panels/user-accounts/um-user-panel.c:1229
 msgid "My Account"
 msgstr "Oma tili"
 
-#: ../panels/user-accounts/um-user-panel.c:1186
+#: ../panels/user-accounts/um-user-panel.c:1238
 msgid "Other Accounts"
 msgstr "Muut tilit"
 
-#: ../panels/user-accounts/um-utils.c:512
+#: ../panels/user-accounts/um-utils.c:516
 #, c-format
 msgid "A user with the username '%s' already exists"
 msgstr "Käyttäjätunnus '%s' on jo olemassa"
 
-#: ../panels/user-accounts/um-utils.c:516
+#: ../panels/user-accounts/um-utils.c:520
 #, c-format
 msgid "The username is too long"
 msgstr "Käyttäjätunnus on liian pitkä"
 
-#: ../panels/user-accounts/um-utils.c:519
+#: ../panels/user-accounts/um-utils.c:523
 msgid "The username cannot start with a '-'"
 msgstr "Käyttäjätunnus ei voi alkaa merkillä '-'"
 
-#: ../panels/user-accounts/um-utils.c:522
+#: ../panels/user-accounts/um-utils.c:526
 msgid ""
 "The username must only consist of:\n"
 " ➣ letters from the English alphabet\n"
@@ -4970,26 +6645,19 @@ msgstr "Määritä painikkeet"
 msgid "Map buttons to functions"
 msgstr "Määritä painikkeille toimintoja"
 
-#. Text printed on screen
-#: ../panels/wacom/calibrator/gui_gtk.c:78
-msgid "Screen Calibration"
-msgstr "Näytön kalibrointi"
-
 #: ../panels/wacom/calibrator/gui_gtk.c:79
 msgid ""
 "Please tap the target markers as they appear on screen to calibrate the "
 "tablet."
-msgstr ""
+msgstr "Kosketa näytöllä näkyviä kohdemerkkejä tabletin kalibroimiseksi."
 
 #: ../panels/wacom/calibrator/gui_gtk.c:368
 msgid "Mis-click detected, restarting..."
-msgstr ""
+msgstr "Tunnistettiin ohi mennyt kosketus, aloitetaan alusta…"
 
 #: ../panels/wacom/cc-wacom-mapping-panel.c:275
-#, fuzzy
-#| msgid "Output"
 msgid "Output:"
-msgstr "Ulostulo"
+msgstr "Ulostulo:"
 
 #. Keep ratio switch
 #: ../panels/wacom/cc-wacom-mapping-panel.c:287
@@ -5006,7 +6674,7 @@ msgstr "Määritä näyttöön"
 msgid "%d of %d"
 msgstr "%d / %d"
 
-#: ../panels/wacom/cc-wacom-page.c:118 ../panels/wacom/cc-wacom-page.c:371
+#: ../panels/wacom/cc-wacom-page.c:118 ../panels/wacom/cc-wacom-page.c:384
 msgctxt "Wacom action-type"
 msgid "None"
 msgstr "Ei mitään"
@@ -5014,35 +6682,42 @@ msgstr "Ei mitään"
 #: ../panels/wacom/cc-wacom-page.c:119
 msgctxt "Wacom action-type"
 msgid "Send Keystroke"
-msgstr ""
+msgstr "Lähetä näppäinpainallus"
 
 #: ../panels/wacom/cc-wacom-page.c:120
 msgctxt "Wacom action-type"
 msgid "Switch Monitor"
 msgstr "Vaihda näyttöä"
 
-#: ../panels/wacom/cc-wacom-page.c:601
+#: ../panels/wacom/cc-wacom-page.c:121
+msgctxt "Wacom action-type"
+msgid "Show On-Screen Help"
+msgstr "Näytä ohjeet näytöllä"
+
+#: ../panels/wacom/cc-wacom-page.c:621
+msgctxt "Wacom tablet button"
 msgid "Up"
 msgstr "Ylös"
 
-#: ../panels/wacom/cc-wacom-page.c:601
+#: ../panels/wacom/cc-wacom-page.c:621
+msgctxt "Wacom tablet button"
 msgid "Down"
 msgstr "Alas"
 
-#: ../panels/wacom/cc-wacom-page.c:638
+#: ../panels/wacom/cc-wacom-page.c:662
 msgid "Switch Modes"
 msgstr "Vaihda tiloja"
 
-#: ../panels/wacom/cc-wacom-page.c:724
-#: ../panels/wacom/cc-wacom-stylus-page.c:376
+#: ../panels/wacom/cc-wacom-page.c:752
+#: ../panels/wacom/cc-wacom-stylus-page.c:373
 msgid "Button"
 msgstr "Painike"
 
-#: ../panels/wacom/cc-wacom-page.c:777
+#: ../panels/wacom/cc-wacom-page.c:810
 msgid "Action"
 msgstr "Toiminto"
 
-#: ../panels/wacom/cc-wacom-page.c:886
+#: ../panels/wacom/cc-wacom-page.c:920
 msgid "Display Mapping"
 msgstr "Näyttöjen asettelu"
 
@@ -5052,8 +6727,8 @@ msgid "Wacom Tablet"
 msgstr "Wacom-piirtopöydät"
 
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2
-msgid "Set your Wacom tablet preferences"
-msgstr "Muuta Wacom-piirtopöydän asetuksia"
+msgid "Set button mappings and adjust stylus sensitivity for graphics tablets"
+msgstr "Aseta piirtopöydän painikkeet ja kynän herkkyys"
 
 #. Translators: those are keywords for the wacom tablet control-center panel
 #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4
@@ -5085,16 +6760,12 @@ msgid "Bluetooth Settings"
 msgstr "Bluetooth-asetukset"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:8
-msgid "Map to Monitor..."
-msgstr "Määritä näyttöön..."
+msgid "Map to Monitor…"
+msgstr "Määritä näyttöön…"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:9
-msgid "Map Buttons..."
-msgstr "Määritä painikkeet..."
-
-#: ../panels/wacom/gnome-wacom-properties.ui.h:10
-msgid "Calibrate..."
-msgstr "Kalibroi..."
+msgid "Map Buttons…"
+msgstr "Määritä painikkeet…"
 
 #: ../panels/wacom/gnome-wacom-properties.ui.h:11
 msgid "Adjust display resolution"
@@ -5108,67 +6779,90 @@ msgstr "Seurantatila"
 msgid "Left-Handed Orientation"
 msgstr "Vasenkätinen suuntaus:"
 
-#: ../panels/wacom/gsd-wacom-device.c:1010
+#. If no mode is available, we use "left-ring-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1076
+#, fuzzy
+#| msgid "Left ring finger"
+msgid "Left Ring"
+msgstr "Vasen nimetön"
+
+#: ../panels/wacom/gsd-wacom-device.c:1086
 #, c-format
 msgid "Left Ring Mode #%d"
 msgstr ""
 
-#: ../panels/wacom/gsd-wacom-device.c:1019
+#. If no mode is available, we use "right-ring-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1105
+#, fuzzy
+msgid "Right Ring"
+msgstr "Oikea nimetön"
+
+#: ../panels/wacom/gsd-wacom-device.c:1115
 #, fuzzy, c-format
 msgid "Right Ring Mode #%d"
 msgstr "Oikea nimetön"
 
-#: ../panels/wacom/gsd-wacom-device.c:1049
+#. If no mode is available, we use "left-strip-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1156
+msgid "Left Touchstrip"
+msgstr ""
+
+#: ../panels/wacom/gsd-wacom-device.c:1166
 #, c-format
 msgid "Left Touchstrip Mode #%d"
 msgstr ""
 
-#: ../panels/wacom/gsd-wacom-device.c:1058
+#. If no mode is available, we use "right-strip-mode-1" for backward compat
+#: ../panels/wacom/gsd-wacom-device.c:1185
+msgid "Right Touchstrip"
+msgstr ""
+
+#: ../panels/wacom/gsd-wacom-device.c:1195
 #, c-format
 msgid "Right Touchstrip Mode #%d"
 msgstr ""
 
-#: ../panels/wacom/gsd-wacom-device.c:1075
+#: ../panels/wacom/gsd-wacom-device.c:1220
 #, c-format
 msgid "Left Touchring Mode Switch"
 msgstr ""
 
-#: ../panels/wacom/gsd-wacom-device.c:1077
+#: ../panels/wacom/gsd-wacom-device.c:1222
 #, c-format
 msgid "Right Touchring Mode Switch"
 msgstr ""
 
-#: ../panels/wacom/gsd-wacom-device.c:1080
+#: ../panels/wacom/gsd-wacom-device.c:1225
 #, c-format
 msgid "Left Touchstrip Mode Switch"
 msgstr ""
 
-#: ../panels/wacom/gsd-wacom-device.c:1082
+#: ../panels/wacom/gsd-wacom-device.c:1227
 #, c-format
 msgid "Right Touchstrip Mode Switch"
 msgstr ""
 
-#: ../panels/wacom/gsd-wacom-device.c:1087
+#: ../panels/wacom/gsd-wacom-device.c:1232
 #, c-format
 msgid "Mode Switch #%d"
 msgstr ""
 
-#: ../panels/wacom/gsd-wacom-device.c:1159
+#: ../panels/wacom/gsd-wacom-device.c:1336
 #, c-format
 msgid "Left Button #%d"
 msgstr "Vasen painike #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1162
+#: ../panels/wacom/gsd-wacom-device.c:1339
 #, c-format
 msgid "Right Button #%d"
 msgstr "Oikea painike #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1165
+#: ../panels/wacom/gsd-wacom-device.c:1342
 #, c-format
 msgid "Top Button #%d"
 msgstr "Yläpainike #%d"
 
-#: ../panels/wacom/gsd-wacom-device.c:1168
+#: ../panels/wacom/gsd-wacom-device.c:1345
 #, c-format
 msgid "Bottom Button #%d"
 msgstr "Alapainike #%d"
@@ -5241,28 +6935,40 @@ msgstr "Alanäppäin"
 msgid "Tip Pressure Feel"
 msgstr ""
 
-#: ../shell/control-center.c:58
+#: ../shell/cc-application.c:67
 msgid "Enable verbose mode"
-msgstr ""
+msgstr "Ota käyttöön lisätietoja tulostava tila"
 
-#: ../shell/control-center.c:59
+#: ../shell/cc-application.c:68
 msgid "Show the overview"
 msgstr "Näytä yleiskuva"
 
-#: ../shell/control-center.c:60 ../shell/control-center.c:61
-#: ../shell/control-center.c:62
+#: ../shell/cc-application.c:69
+msgid "Search for the string"
+msgstr "Etsi merkkijonoa"
+
+#: ../shell/cc-application.c:70
+msgid "List possible panel names and exit"
+msgstr "Näytä mahdolliset paneelinimet ja lopeta"
+
+#: ../shell/cc-application.c:71 ../shell/cc-application.c:72
+#: ../shell/cc-application.c:73
 msgid "Show help options"
 msgstr "Näytä ohjevalitsimet"
 
-#: ../shell/control-center.c:63
+#: ../shell/cc-application.c:74
 msgid "Panel to display"
 msgstr "Näytettävä paneeli"
 
-#: ../shell/control-center.c:85
-msgid "- System Settings"
-msgstr "- Järjestelmäasetukset"
+#: ../shell/cc-application.c:74
+msgid "[PANEL] [ARGUMENT…]"
+msgstr "[PANEELI] [ARGUMENTTI…]"
+
+#: ../shell/cc-application.c:116
+msgid "- Settings"
+msgstr "- Asetukset"
 
-#: ../shell/control-center.c:93
+#: ../shell/cc-application.c:124
 #, c-format
 msgid ""
 "%s\n"
@@ -5271,29 +6977,530 @@ msgstr ""
 "%s\n"
 "Suorita ”%s --help” nähdäksesi täyden luettelon komentorivivalitsimista.\n"
 
-#: ../shell/control-center.c:211
+#: ../shell/cc-application.c:154
+msgid "Available panels:"
+msgstr "Käytettävissä olevat paneelit:"
+
+#: ../shell/cc-application.c:273
 msgid "Help"
 msgstr "Ohje"
 
-#: ../shell/control-center.c:212
+#: ../shell/cc-application.c:274
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../shell/gnomecc.directory.in.h:1
-msgid "Control Center"
-msgstr "Järjestelmän asetukset"
+#: ../shell/cc-window.c:62 ../shell/gnome-control-center.desktop.in.in.h:1
+msgid "Settings"
+msgstr "Asetukset"
+
+#. Add categories
+#: ../shell/cc-window.c:858
+msgctxt "category"
+msgid "Personal"
+msgstr "Henkilökohtaiset"
+
+#: ../shell/cc-window.c:859
+msgctxt "category"
+msgid "Hardware"
+msgstr "Laitteisto"
+
+#: ../shell/cc-window.c:860
+msgctxt "category"
+msgid "System"
+msgstr "Järjestelmä"
 
-#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/shell.ui.h:1
-msgid "System Settings"
-msgstr "Järjestelmäasetukset"
+#: ../shell/cc-window.c:1411
+msgid "All Settings"
+msgstr "Kaikki asetukset"
 
 #: ../shell/gnome-control-center.desktop.in.in.h:2
 msgid "Preferences;Settings;"
 msgstr "Ominaisuudet;Asetukset;Preferences;Settings;"
 
-#: ../shell/shell.ui.h:2
-msgid "All Settings"
-msgstr "Kaikki asetukset"
+#, fuzzy
+#~| msgid "None"
+#~ msgctxt "Input source"
+#~ msgid "None"
+#~ msgstr "Ei mikään"
+
+#~ msgid "Change the background"
+#~ msgstr "Vaihda taustakuvaa"
+
+#~ msgid "Configure Bluetooth settings"
+#~ msgstr "Määritä Bluetooth-asetukset"
+
+#~ msgid "Browse Files..."
+#~ msgstr "Selaa tiedostoja..."
+
+#~ msgctxt "Power"
+#~ msgid "Bluetooth"
+#~ msgstr "Bluetooth"
+
+#~ msgid "Create virtual device"
+#~ msgstr "Luo virtuaalilaite"
+
+#~ msgid "Available Profiles for Displays"
+#~ msgstr "Näytöille käytettävissä olevat profiilit"
+
+#~ msgid "Available Profiles for Scanners"
+#~ msgstr "Kuvanlukijoille käytettävissä olevat profiilit"
+
+#~ msgid "Available Profiles for Printers"
+#~ msgstr "Tulostimille käytettävissä olevat profiilit"
+
+#~ msgid "Available Profiles for Cameras"
+#~ msgstr "Kameroille käytettävissä olevat profiilit"
+
+#~ msgid "Available Profiles for Webcams"
+#~ msgstr "Web-kameroille käytettävissä olevat profiilit"
+
+#~ msgid "%i year"
+#~ msgid_plural "%i years"
+#~ msgstr[0] "%i vuosi"
+#~ msgstr[1] "%i vuotta"
+
+#~ msgid "%i month"
+#~ msgid_plural "%i months"
+#~ msgstr[0] "%i kuukausi"
+#~ msgstr[1] "%i kuukautta"
+
+#~ msgid "%i week"
+#~ msgid_plural "%i weeks"
+#~ msgstr[0] "%i tunti"
+#~ msgstr[1] "%i tuntia"
+
+#~ msgid "Less than 1 week"
+#~ msgstr "Alle yksi viikko"
+
+#~ msgid "This device is not color managed."
+#~ msgstr "Tämä laite ei tue värihallintaa."
+
+#~ msgid ""
+#~ "This device does not have a profile suitable for whole-screen color "
+#~ "correction."
+#~ msgstr ""
+#~ "Tällä laitteella ei ole koko näytön värinkorjaukseen soveltuvaa profiilia."
+
+#~ msgid "Not specified"
+#~ msgstr "Ei määritelty"
+
+#~ msgid "No devices supporting color management detected"
+#~ msgstr "Värihallintaa tukevia laitteita ei havaittu"
+
+#~ msgid "Add device"
+#~ msgstr "Lisää laite"
+
+#~ msgid "Add a virtual device"
+#~ msgstr "Lisää virtuaalilaite"
+
+#~ msgid "Remove a device"
+#~ msgstr "Poista laite"
+
+#~ msgid "Color management settings"
+#~ msgstr "Värien hallinta"
+
+#~ msgid "English"
+#~ msgstr "Englanti"
+
+#~ msgid "British English"
+#~ msgstr "Brittienglanti"
+
+#~ msgid "German"
+#~ msgstr "Saksa"
+
+#~ msgid "French"
+#~ msgstr "Ranska"
+
+#~ msgid "Spanish"
+#~ msgstr "Espanja"
+
+#~ msgid "Chinese (simplified)"
+#~ msgstr "Kiina (yksinkertaistettu)"
+
+#~ msgid "Russian"
+#~ msgstr "Venäjä"
+
+#~ msgid "Arabic"
+#~ msgstr "Arabia"
+
+#~ msgid "Unspecified"
+#~ msgstr "Ei määritetty"
+
+#~ msgid "Select a language"
+#~ msgstr "Valitse kieli"
+
+#~ msgid "_Select"
+#~ msgstr "_Valittu"
+
+#~ msgid "Date and Time preferences panel"
+#~ msgstr "Ajan ja päiväyksen asetuspaneeli"
+
+#~ msgid "%d x %d (%s)"
+#~ msgstr "%d x %d (%s)"
+
+#~ msgid "%d x %d"
+#~ msgstr "%d × %d"
+
+#~ msgid "VESA: %s"
+#~ msgstr "VESA: %s"
+
+#~ msgid "Unknown model"
+#~ msgstr "Tuntematon malli"
+
+#~ msgid "The next login will attempt to use the standard experience."
+#~ msgstr ""
+#~ "Seuraavalla kirjautumiskerralla yritetään käyttää tavallista ulkoasua."
+
+#~ msgid ""
+#~ "The next login will use the fallback mode intended for unsupported "
+#~ "graphics hardware."
+#~ msgstr ""
+#~ "Seuraavalla kirjautumiskerralla käytetään varatilaa, joka on tarkoitettu "
+#~ "tukemattomille grafiikkalaitteistoille."
+
+#~ msgctxt "Experience"
+#~ msgid "Fallback"
+#~ msgstr "Varatila"
+
+#~ msgid "System Information"
+#~ msgstr "Järjestelmätiedot"
+
+#~ msgid "OS type"
+#~ msgstr "Käyttöjärjestelmän tyyppi"
+
+#~ msgid "_Other Media..."
+#~ msgstr "_Muut mediat..."
+
+#~ msgid "Experience"
+#~ msgstr "Kokemus"
+
+#~ msgid "Forced _Fallback Mode"
+#~ msgstr "Pakotettu grafiikan _varatila"
+
+#~ msgid "Change keyboard settings"
+#~ msgstr "Muuta näppäimistön asetuksia"
+
+#~ msgid "Layout Settings"
+#~ msgstr "Asettelun asetukset"
+
+#~ msgid "Set your mouse and touchpad preferences"
+#~ msgstr "Muuta hiiren ja kosketuslevyn asetuksia"
+
+#~ msgid "Network settings"
+#~ msgstr "Verkon asetukset"
+
+#~ msgid "Network;Wireless;IP;LAN;Proxy;"
+#~ msgstr "Verkko;Langaton;IP;LAN;lähiverkko;välityspalvelin;proxy;"
+
+#~ msgid "Out of range"
+#~ msgstr "Kantoalueen ulkopuolella"
+
+#~ msgid "_Options..."
+#~ msgstr "_Valinnat..."
+
+#~ msgid "C_reate..."
+#~ msgstr "_Luo..."
+
+#~ msgid "_Configure..."
+#~ msgstr "_Asetukset..."
+
+#~ msgid "Wireless Hotspot"
+#~ msgstr "Langaton tukiasema"
+
+#~ msgid "Wireless"
+#~ msgstr "Langaton"
+
+#~| msgid "Disconnected"
+#~ msgid "_Disconnect"
+#~ msgstr "_Katkaise yhteys"
+
+#~ msgid "_Connect"
+#~ msgstr "_Yhdistä"
+
+#~ msgid "Wired"
+#~ msgstr "Kiinteä"
+
+#~ msgid "Mesh"
+#~ msgstr "Mesh-verkko"
+
+#~ msgid "Disconnected"
+#~ msgstr "Yhteys katkaistu"
+
+#~ msgid "Expired credentials. Please log in again."
+#~ msgstr "Tunnistauminen vanhentunut. Kirjaudu sisään uudelleen."
+
+#~ msgid "_Log In"
+#~ msgstr "_Kirjaudu"
+
+#~ msgid "Manage online accounts"
+#~ msgstr "Hallitse verkkotilejä"
+
+#~ msgid "Caution low battery, %s remaining"
+#~ msgstr "Varoitus: akku vähissä, %s jäljellä"
+
+#~ msgid "Using battery power - %s remaining"
+#~ msgstr "Käytetään akkua - %s jäljellä"
+
+#~ msgid "Using battery power"
+#~ msgstr "Käytetään akkua"
+
+#~ msgid "Charging - fully charged"
+#~ msgstr "Ladataan - ladattu täyteen"
+
+#~ msgid "Using UPS power - %s remaining"
+#~ msgstr "Käytetään UPS-varavirtaa - %s jäljellä"
+
+#~ msgid "Caution low UPS"
+#~ msgstr "Varoitus - UPS-varavirta vähissä"
+
+#~ msgid "Using UPS power"
+#~ msgstr "Käytetään UPS-varavirtaa"
+
+#~ msgid "Your secondary battery is fully charged"
+#~ msgstr "Vara-akku on ladattu täyteen"
+
+#~ msgid "Your secondary battery is empty"
+#~ msgstr "Vara-akku on tyhjä"
+
+#~ msgctxt "Battery power"
+#~ msgid "Charging - fully charged"
+#~ msgstr "Ladataan - ladattu täyteen"
+
+#~ msgid ""
+#~ "Tip: <a href=\"screen\">screen brightness</a> affects how much power is "
+#~ "used"
+#~ msgstr ""
+#~ "Vihje: <a href=\"screen\">näytön kirkkaus</a> vaikuttaa virrankulutukseen"
+
+#~ msgid "Power management settings"
+#~ msgstr "Virransäästön asetukset"
+
+#~ msgid "Don't suspend"
+#~ msgstr "Älä siirry valmiustilaan"
+
+#~ msgid "Suspend when inactive for"
+#~ msgstr "Siirry valmiustilaan jos kone on käyttämättä"
+
+#~ msgctxt "printer state"
+#~ msgid "Paused"
+#~ msgstr "Keskeytetty"
+
+#~ msgid "Change printer settings"
+#~ msgstr "Muuta tulostimen asetuksia"
+
+#~ msgid "%s Options"
+#~ msgstr "%s - asetukset"
+
+#~ msgid "Manufacturers"
+#~ msgstr "Valmistajat"
+
+#~ msgid "Drivers"
+#~ msgstr "Ajurit"
+
+#~ msgid "_Show"
+#~ msgstr "_Näytä"
+
+#~ msgid "Change your region and language settings"
+#~ msgstr "Muuta alue- ja kieliasetuksia"
+
+#~ msgid "Choose an input source"
+#~ msgstr "Valitse syötelähde"
+
+#~ msgid "Select an input source to add"
+#~ msgstr "Valitse lisättävä syötelähde"
+
+#~ msgid ""
+#~ "The login screen, system accounts and new user accounts use the system-"
+#~ "wide Region and Language settings."
+#~ msgstr ""
+#~ "Kirjautumisruutu, järjestelmätilit ja uudet käyttäjätilit käyttävät "
+#~ "järjestelmän alue- ja kieliasetuksia."
+
+#~ msgid ""
+#~ "The login screen, system accounts and new user accounts use the system-"
+#~ "wide Region and Language settings. You may change the system settings to "
+#~ "match yours."
+#~ msgstr ""
+#~ "Kirjautumisruutu, järjestelmätilit ja uudet käyttäjätilit käyttävät "
+#~ "järjestelmän alue- ja kieliasetuksia. Voit muuttaa järjestelmän asetukset "
+#~ "vastaamaan omiasi."
+
+#~ msgid "Copy Settings"
+#~ msgstr "Kopioi asetukset"
+
+#~ msgid "Copy Settings..."
+#~ msgstr "Kopioi asetukset..."
+
+#~ msgid "Region and Language"
+#~ msgstr "Alue ja kielet"
+
+#~ msgid ""
+#~ "Select a display language (change will be applied next time you log in)"
+#~ msgstr ""
+#~ "Valitse näytettävä kieli (muuttuu seuraavan sisäänkirjautumisen "
+#~ "yhteydessä)"
+
+#~ msgid "Add Language"
+#~ msgstr "Lisää kieli"
+
+#~ msgid "Remove Language"
+#~ msgstr "Poista kieli"
+
+#~ msgid "Install languages..."
+#~ msgstr "Asenna kieliä..."
+
+#~ msgid "Select a region (change will be applied the next time you log in)"
+#~ msgstr "Valitse alue (muuttuu seuraavan sisäänkirjautumisen yhteydessä)"
+
+#~ msgid "Add Region"
+#~ msgstr "Lisää alue"
+
+#~ msgid "Currency"
+#~ msgstr "Valuutta"
+
+#~ msgid "Examples"
+#~ msgstr "Esimerkkejä"
+
+#~ msgid "Select keyboards or other input sources"
+#~ msgstr "Valitse näppäimistöt tai muut syötelähteet"
+
+#~ msgid "Remove Input Source"
+#~ msgstr "Poista syötelähde"
+
+#~ msgid "Move Input Source Up"
+#~ msgstr "Siirrä syötelähdettä ylemmäksi"
+
+#~ msgid "Show Keyboard Layout"
+#~ msgstr "Näytä näppäimistön asettelu"
+
+#~ msgid "Ctrl+Alt+Space"
+#~ msgstr "Ctrl+Alt+Välilyönti"
+
+#~ msgid "Shortcut Settings"
+#~ msgstr "Pikanäppäimen asetukset"
+
+#~ msgid "Display language:"
+#~ msgstr "Näyttökieli:"
+
+#~ msgid "Input source:"
+#~ msgstr "Syötelähde:"
+
+#~ msgid "Format:"
+#~ msgstr "Muotoilu:"
+
+#~ msgid "Your settings"
+#~ msgstr "Sinun asetuksesi"
+
+#~ msgid "System settings"
+#~ msgstr "Järjestelmän asetukset"
+
+#~ msgid "Brightness & Lock"
+#~ msgstr "Näytön kirkkaus ja lukitus"
+
+#~ msgid "Screen brightness and lock settings"
+#~ msgstr "Näytön kirkkaus- ja lukitusasetukset"
+
+#~ msgid "Brightness;Lock;Dim;Blank;Monitor;"
+#~ msgstr "kirkkaus;lukitseminen;himmentäminen;pimennys;näyttö;"
+
+#~ msgid "_Dim screen to save power"
+#~ msgstr "_Himmennä näyttöä virran säästämiseksi"
+
+#~ msgid "Don't lock when at home"
+#~ msgstr "Älä lukitse oltaessa kotona"
+
+#~ msgid "Locations..."
+#~ msgstr "Sijainnit..."
+
+#~ msgid "Lock"
+#~ msgstr "Automaattinen lukitus"
+
+#~ msgid "Enable debugging code"
+#~ msgstr "Ota vianetsintäkoodi käyttöön"
+
+#~ msgid "Version of this application"
+#~ msgstr "Tämän sovelluksen versio"
+
+#~ msgid " — GNOME Volume Control Applet"
+#~ msgstr " — Gnomen äänenhallintasovelma"
+
+#~ msgid "Show desktop volume control"
+#~ msgstr "Näytä työpöydän äänenvoimakkuuden hallinta"
+
+#~ msgid "Sound Output Volume"
+#~ msgstr "Äänen toistovoimakkuus"
+
+#~ msgid "Microphone Volume"
+#~ msgstr "Mikrofonin äänenvoimakkuus"
+
+#~ msgid "Failed to start Sound Preferences: %s"
+#~ msgstr "Ääniasetuksia ei voitu käynnistää: %s"
+
+#~ msgid "_Mute"
+#~ msgstr "_Vaimenna ääni"
+
+#~ msgid "_Sound Preferences"
+#~ msgstr "Ää_niasetukset"
+
+#~ msgid "Muted"
+#~ msgstr "Vaimennettu"
+
+#~ msgid "Universal Access Preferences"
+#~ msgstr "Esteettömyysasetukset"
+
+#~ msgid "Options..."
+#~ msgstr "Valinnat..."
+
+#~ msgctxt "Zoom Grayscale"
+#~ msgid "Color"
+#~ msgstr "Väri"
+
+#~ msgctxt "Zoom Grayscale"
+#~ msgid "None"
+#~ msgstr "Ei mitään"
+
+#~ msgid "User Accounts"
+#~ msgstr "Käyttäjätilit"
+
+#~ msgid "_Hint"
+#~ msgstr "_Vihje"
+
+#~ msgid ""
+#~ "This hint may be displayed at the login screen.  It will be visible to "
+#~ "all users of this system.  Do <b>not</b> include the password here."
+#~ msgstr ""
+#~ "Tämä vihje saatetaan näyttää kirjautumisruudussa. Se on näkyvissä "
+#~ "kaikille käyttäjille. <b>Älä</b> sisällytä salasanaasi tähän!"
+
+#~ msgid "Fair"
+#~ msgstr "Kohtalainen"
+
+#~ msgid "Browse for more pictures..."
+#~ msgstr "Selaa lisää kuvia..."
+
+#~ msgid "No user with the name '%s' exists."
+#~ msgstr "Käyttäjää nimellä \"%s\" ei ole olemassa."
+
+#~ msgid "This user does not exist."
+#~ msgstr "Tätä käyttäjää ei löydy"
+
+#~ msgid "Set your Wacom tablet preferences"
+#~ msgstr "Muuta Wacom-piirtopöydän asetuksia"
+
+#~ msgid "Map Buttons..."
+#~ msgstr "Määritä painikkeet..."
+
+#~ msgid "Calibrate..."
+#~ msgstr "Kalibroi..."
+
+#~ msgid "- System Settings"
+#~ msgstr "- Järjestelmäasetukset"
+
+#~ msgid "Control Center"
+#~ msgstr "Järjestelmän asetukset"
+
+#~ msgid "System Settings"
+#~ msgstr "Järjestelmäasetukset"
 
 #~ msgid "Security Key"
 #~ msgstr "Salausavain"
@@ -5322,9 +7529,6 @@ msgstr "Kaikki asetukset"
 #~ msgid "Solid Color"
 #~ msgstr "Tasainen väri"
 
-#~ msgid "Pictures Folder"
-#~ msgstr "Kuvat-kansio"
-
 #~ msgid "Colors & Gradients"
 #~ msgstr "Värit ja liukuvärit"
 
@@ -5382,19 +7586,10 @@ msgstr "Kaikki asetukset"
 #~ msgid "_Edge scrolling"
 #~ msgstr "_Reunavieritys"
 
-#~ msgid "Enable h_orizontal scrolling"
-#~ msgstr "Käytä _vaakasuuntainta vieritystä"
-
 #~ msgctxt "Wireless access point"
 #~ msgid "Other..."
 #~ msgstr "Muu…"
 
-#~ msgid "Hotspot"
-#~ msgstr "Yhteyspiste"
-
-#~ msgid "Not connected to the internet."
-#~ msgstr "Ei yhdistettynä Internetiin."
-
 #~ msgid "Create the hotspot anyway?"
 #~ msgstr "Luodaanko langaton yhteyspiste silti?"
 
@@ -5407,9 +7602,6 @@ msgstr "Kaikki asetukset"
 #~ msgid "Create _Hotspot"
 #~ msgstr "Luo _yhteyspiste"
 
-#~ msgid "Device Off"
-#~ msgstr "Laite pois päältä"
-
 #~ msgid "_Network Name"
 #~ msgstr "_Verkon nimi"
 
@@ -5428,9 +7620,6 @@ msgstr "Kaikki asetukset"
 #~ msgid "FTP Port"
 #~ msgstr "FTP-portti"
 
-#~ msgid "Socks Port"
-#~ msgstr "Socks-portti"
-
 #~ msgid "To add a new account, first select the account type"
 #~ msgstr "Lisää uusi käyttäjä valitsemalla ensimmäiseksi käyttäjätyyppi"
 
@@ -5460,9 +7649,6 @@ msgstr "Kaikki asetukset"
 #~ "palvelujen mdns, ipp, ipp-client ja samba-client olevan sallittu "
 #~ "palomuurissa."
 
-#~ msgid "Devices"
-#~ msgstr "Laitteet"
-
 #~ msgctxt "printer type"
 #~ msgid "Local"
 #~ msgstr "Paikallinen"
@@ -5492,39 +7678,18 @@ msgstr "Kaikki asetukset"
 #~ msgid "Add User"
 #~ msgstr "Lisää käyttäjä"
 
-#~ msgid "Remove User"
-#~ msgstr "Poista käyttäjä"
-
 #~ msgid "Allowed users"
 #~ msgstr "Sallitut käyttäjät"
 
-#~ msgid "Choose a Layout"
-#~ msgstr "Valitse näppäimistön asettelu"
-
-#~ msgid "Preview"
-#~ msgstr "Esikatselu"
-
 #~ msgid "Add Layout"
 #~ msgstr "Lisää asettelu"
 
 #~ msgid "Remove Layout"
 #~ msgstr "Poista asettelu"
 
-#~ msgid "Move Up"
-#~ msgstr "Siirrä _ylös"
-
-#~ msgid "Move Down"
-#~ msgstr "Siirrä _alas"
-
 #~ msgid "Preview Layout"
 #~ msgstr "Esikatsele asettelu"
 
-#~ msgid "Use the same layout for all windows"
-#~ msgstr "Käytä samaa asettelua kaikille ikkunoille"
-
-#~ msgid "Allow different layouts for individual windows"
-#~ msgstr "Salli eri asettelut yksittäisille ikkunoille"
-
 #~ msgid "New windows use the default layout"
 #~ msgstr "Uudet ikkunat käyttävät oletusasettelua"
 
@@ -5550,12 +7715,6 @@ msgstr "Kaikki asetukset"
 #~ msgid "Layout"
 #~ msgstr "Asettelu"
 
-#~ msgid "Co_nnector:"
-#~ msgstr "_Liitin:"
-
-#~ msgid "Hardware"
-#~ msgstr "Laitteisto"
-
 #~ msgid "C_hoose a device to configure:"
 #~ msgstr "_Valitse määriteltävä laite:"
 


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