[nautilus] Updated Finnish translation



commit 3f7e0743582d0aeaa0c7df965c06510f370e7d37
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Fri Jun 17 06:48:38 2016 +0000

    Updated Finnish translation

 po/fi.po | 2953 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 1738 insertions(+), 1215 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 18bff35..907df42 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -51,8 +51,8 @@ msgstr ""
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=nautilus&keywords=I18N+L10N&component=Internationalization (i18n)\n"
-"POT-Creation-Date: 2016-01-10 13:53+0000\n"
-"PO-Revision-Date: 2016-01-10 23:42+0200\n"
+"POT-Creation-Date: 2016-06-10 15:37+0000\n"
+"PO-Revision-Date: 2016-06-17 09:47+0300\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <gnome-fi-laatu lists sourceforge net>\n"
 "Language: fi\n"
@@ -66,6 +66,16 @@ msgstr ""
 "X-POT-Import-Date: 2012-02-19 15:25:27+0000\n"
 
 #: ../data/org.gnome.Nautilus.appdata.xml.in.h:1
+#| msgid "Quit Nautilus."
+msgid "Nautilus"
+msgstr "Nautilus"
+
+#: ../data/org.gnome.Nautilus.appdata.xml.in.h:2
+#: ../data/org.gnome.Nautilus.desktop.in.in.h:2
+msgid "Access and organize files"
+msgstr "Käsittele ja järjestä tiedostoja"
+
+#: ../data/org.gnome.Nautilus.appdata.xml.in.h:3
 msgid ""
 "Nautilus, also known as Files, is the default file manager of the GNOME "
 "desktop. It provides a simple and integrated way of managing your files and "
@@ -75,7 +85,7 @@ msgstr ""
 "tiedostonhallinnan oletussovellus. Sen avulla tiedostojen selailu ja "
 "hallinta on vaivatonta."
 
-#: ../data/org.gnome.Nautilus.appdata.xml.in.h:2
+#: ../data/org.gnome.Nautilus.appdata.xml.in.h:4
 msgid ""
 "Nautilus supports all the basic functions of a file manager and more. It can "
 "search and manage your files and folders, both locally and on a network, "
@@ -96,15 +106,11 @@ msgid "Run Software"
 msgstr "Suorita ohjelmisto"
 
 #: ../data/org.gnome.Nautilus.desktop.in.in.h:1
-#: ../src/nautilus-properties-window.c:4197 ../src/nautilus-window.c:2627
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:24
+#: ../src/nautilus-mime-actions.c:97 ../src/nautilus-properties-window.c:4160
+#: ../src/nautilus-window.c:2787
 msgid "Files"
 msgstr "Tiedostot"
 
-#: ../data/org.gnome.Nautilus.desktop.in.in.h:2
-msgid "Access and organize files"
-msgstr "Käsittele ja järjestä tiedostoja"
-
 #: ../data/org.gnome.Nautilus.desktop.in.in.h:3
 msgid "folder;manager;explore;disk;filesystem;"
 msgstr ""
@@ -116,7 +122,9 @@ msgid "New Window"
 msgstr "Uusi ikkuna"
 
 #: ../data/org.gnome.nautilus.gschema.xml.h:1
-msgid "Where to position newly open tabs in browser windows."
+#, fuzzy
+#| msgid "Where to position newly open tabs in browser windows."
+msgid "Where to position newly open tabs in browser windows"
 msgstr "Mihin uudet välilehdet sijoitetaan selainikkunoissa."
 
 #: ../data/org.gnome.nautilus.gschema.xml.h:2
@@ -142,54 +150,70 @@ msgstr ""
 "syötekenttä sijainnin näyttämiseen polkupalkin sijasta."
 
 #: ../data/org.gnome.nautilus.gschema.xml.h:5
-msgid "Whether to enable recursive search or not"
+#, fuzzy
+#| msgid "Whether to enable recursive search or not"
+msgid "Where to perform recursive search"
 msgstr "Käytetäänkö rekursiivista hakua vai ei"
 
 #: ../data/org.gnome.nautilus.gschema.xml.h:6
-msgid "Enables or disables recursive search in Nautilus."
-msgstr "Ottaa käyttöön tai poistaa käytöstä rekursiivisen haun Nautiluksessa."
+msgid ""
+"In which locations Nautilus should search on subfolders. Available values "
+"are 'local-only', 'always', 'never'."
+msgstr ""
 
 #: ../data/org.gnome.nautilus.gschema.xml.h:7
-msgid "Whether to show a context menu item to delete permanently"
+msgid "Filter the search dates using either last used or last modified"
 msgstr ""
 
 #: ../data/org.gnome.nautilus.gschema.xml.h:8
+msgid "Filter the search dates using either last used or last modified."
+msgstr ""
+
+#: ../data/org.gnome.nautilus.gschema.xml.h:9
+msgid "Whether to show a context menu item to delete permanently"
+msgstr ""
+
+#: ../data/org.gnome.nautilus.gschema.xml.h:10
 #, fuzzy
 #| msgid ""
 #| "If set to true, then Nautilus will ask for confirmation when you attempt "
 #| "to delete files, or empty the Trash."
 msgid ""
-"If set to true Nautilus will show a delete permanently context menu item to "
-"bypass the trash."
+"If set to true, then Nautilus will show a delete permanently context menu "
+"item to bypass the Trash."
 msgstr ""
 "Jos tosi, Nautilus kysyy varmistusta kun siirrät tiedostoja roskakoriin tai "
 "tyhjennät roskakorin."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:9
+#: ../data/org.gnome.nautilus.gschema.xml.h:11
 msgid ""
 "Whether to show context menu items to create links from copied or selected "
 "files"
 msgstr ""
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:10
+#: ../data/org.gnome.nautilus.gschema.xml.h:12
 #, fuzzy
 #| msgid ""
 #| "If set to true, then Nautilus will ask for confirmation when you attempt "
 #| "to delete files, or empty the Trash."
 msgid ""
-"If set to true Nautilus will show context menu items to create links from "
-"the copied or selected files"
+"If set to true, then Nautilus will show context menu items to create links "
+"from the copied or selected files."
 msgstr ""
 "Jos tosi, Nautilus kysyy varmistusta kun siirrät tiedostoja roskakoriin tai "
 "tyhjennät roskakorin."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:11
-msgid "Whether to ask for confirmation when deleting files, or emptying Trash"
+#: ../data/org.gnome.nautilus.gschema.xml.h:13
+#, fuzzy
+#| msgid ""
+#| "Whether to ask for confirmation when deleting files, or emptying Trash"
+msgid ""
+"Whether to ask for confirmation when deleting files, or emptying the Trash"
 msgstr ""
 "Kysytäänkö varmistusta, kun tiedostoja siirretään roskakoriin tai roskakoria "
 "tyhjennetään"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:12
+#: ../data/org.gnome.nautilus.gschema.xml.h:14
 msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "delete files, or empty the Trash."
@@ -197,11 +221,11 @@ msgstr ""
 "Jos tosi, Nautilus kysyy varmistusta kun siirrät tiedostoja roskakoriin tai "
 "tyhjennät roskakorin."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:13
+#: ../data/org.gnome.nautilus.gschema.xml.h:15
 msgid "When to show number of items in a folder"
 msgstr "Milloin kansion sisältämien kohteiden määrä näkyy"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:14
+#: ../data/org.gnome.nautilus.gschema.xml.h:16
 msgid ""
 "Speed tradeoff for when to show the number of items in a folder. If set to "
 "\"always\" then always show item counts, even if the folder is on a remote "
@@ -214,11 +238,11 @@ msgstr ""
 "paikallisilla tiedostojärjestelmillä. Jos arvo on ”never”, kohteiden "
 "lukumäärät eivät näy."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:15
+#: ../data/org.gnome.nautilus.gschema.xml.h:17
 msgid "Type of click used to launch/open files"
 msgstr "Tiedostojen käynnistämiseen tai avaamiseen käytettävä napsautustapa"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:16
+#: ../data/org.gnome.nautilus.gschema.xml.h:18
 msgid ""
 "Possible values are \"single\" to launch files on a single click, or \"double"
 "\" to launch them on a double click."
@@ -226,11 +250,11 @@ msgstr ""
 "Mahdollisia arvoja ovat ”single” tiedostojen käynnistämiseen yhdellä "
 "napsautuksella tai ”double” kaksoisnapsautuksella."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:17
+#: ../data/org.gnome.nautilus.gschema.xml.h:19
 msgid "What to do with executable text files when activated"
 msgstr "Mitä tehdä suoritettavilla tekstitiedostoilla kun ne aktivoidaan"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:18
+#: ../data/org.gnome.nautilus.gschema.xml.h:20
 msgid ""
 "What to do with executable text files when they are activated (single or "
 "double clicked). Possible values are \"launch\" to launch them as programs, "
@@ -242,37 +266,51 @@ msgstr ""
 "eli tiedosto käynnistetään kuten ohjelma; ”ask”, eli näytetään valintaikkuna "
 "ja ”display”, eli tiedosto näytetään tekstitiedostona."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:19
-msgid "Show the package installer for unknown mime types"
+#: ../data/org.gnome.nautilus.gschema.xml.h:21
+#, fuzzy
+#| msgid "Show the package installer for unknown mime types"
+msgid "Show the package installer for unknown MIME types"
 msgstr "Näytetäänkö pakettiasentaja tuntemattomille MIME-tyypeille"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:20
+#: ../data/org.gnome.nautilus.gschema.xml.h:22
+#, fuzzy
+#| msgid ""
+#| "Whether to show the user a package installer dialog in case an unknown "
+#| "mime type is opened, in order to search for an application to handle it."
 msgid ""
-"Whether to show the user a package installer dialog in case an unknown mime "
+"Whether to show the user a package installer dialog in case an unknown MIME "
 "type is opened, in order to search for an application to handle it."
 msgstr ""
 "Näytetäänkö käyttäjälle pakettien asennusikkuna yritettäessä avata "
 "tuntemattoman MIME-tyypin mukainen kohde, jotta tälle tyypille voidaan etsiä "
 "käsittelevää sen sovellusta."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:21
-msgid "Show a warning dialog for the change of the shortcut for move to trash"
+#: ../data/org.gnome.nautilus.gschema.xml.h:23
+#, fuzzy
+#| msgid ""
+#| "Show a warning dialog for the change of the shortcut for move to trash"
+msgid ""
+"Show a warning dialog for the change of the shortcut for move to the Trash"
 msgstr ""
 "Näytä varoitusikkuna roskakoriin siirron pikanäppäimen muutokseen liittyen"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:22
+#: ../data/org.gnome.nautilus.gschema.xml.h:24
+#, fuzzy
+#| msgid ""
+#| "Show a warning dialog for the change of the shortcut for move to trash "
+#| "from control + delete to just delete."
 msgid ""
-"Show a warning dialog for the change of the shortcut for move to trash from "
-"control + delete to just delete."
+"Show a warning dialog for the change of the shortcut for move to the Trash "
+"from Control + Delete to just Delete."
 msgstr ""
 "Näytä varoitusikkuna liittyen roskakoriin siirron pikanäppäimen muutoksesta "
 "(Ctrl + Delete -yhdistelmästä pelkkään Delete-nåppäimeen)"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:23
+#: ../data/org.gnome.nautilus.gschema.xml.h:25
 msgid "Use extra mouse button events in Nautilus' browser window"
 msgstr "Käytetäänkö Nautiluksen selainikkunoissa hiiren lisäpainikkeita"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:24
+#: ../data/org.gnome.nautilus.gschema.xml.h:26
 msgid ""
 "For users with mice that have \"Forward\" and \"Back\" buttons, this key "
 "will determine if any action is taken inside of Nautilus when either is "
@@ -281,11 +319,11 @@ msgstr ""
 "Jos käyttäjän hiiressä on ”Eteenpäin”- ja ”Taaksepäin”-napit, tämä avain "
 "määrittää mitä tapahtuu painettaessa näitä nappeja nautiluksessa."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:25
+#: ../data/org.gnome.nautilus.gschema.xml.h:27
 msgid "Mouse button to activate the \"Forward\" command in browser window"
 msgstr "Selainikkunassa ”Eteenpäin”-toiminnon käynnistävä hiiren nappi"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:26
+#: ../data/org.gnome.nautilus.gschema.xml.h:28
 msgid ""
 "For users with mice that have buttons for \"Forward\" and \"Back\", this key "
 "will set which button activates the \"Forward\" command in a browser window. "
@@ -295,11 +333,11 @@ msgstr ""
 "määrittää mikä nappi käynnistää ”Eteenpäin”-komennon selainikkunassa. "
 "Mahdolliset arvot ovat väliltä 6-14."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:27
+#: ../data/org.gnome.nautilus.gschema.xml.h:29
 msgid "Mouse button to activate the \"Back\" command in browser window"
 msgstr "Selainikkunassa ”Takaisin”-toiminnon käynnistävä hiiren nappi"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:28
+#: ../data/org.gnome.nautilus.gschema.xml.h:30
 msgid ""
 "For users with mice that have buttons for \"Forward\" and \"Back\", this key "
 "will set which button activates the \"Back\" command in a browser window. "
@@ -309,14 +347,14 @@ msgstr ""
 "määrittää mikä nappi käynnistää ”Takaisin”-komennon selainikkunassa. "
 "Mahdolliset arvot ovat väliltä 6-14."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:29
+#: ../data/org.gnome.nautilus.gschema.xml.h:31
 msgid "When to show thumbnails of files"
 msgstr "Milloin tiedostojen pienoiskuvat näytetään"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:30
+#: ../data/org.gnome.nautilus.gschema.xml.h:32
 #, fuzzy
 msgid ""
-"Speed tradeoff for when to show a file as a thumbnail. If set to \"always\" "
+"Speed trade-off for when to show a file as a thumbnail. If set to \"always\" "
 "then always thumbnail, even if the folder is on a remote server. If set to "
 "\"local-only\" then only show thumbnails for local file systems. If set to "
 "\"never\" then never bother to thumbnail files, just use a generic icon. "
@@ -328,11 +366,11 @@ msgstr ""
 "tiedostojärjestelmillä. Jos ”never”, pienoiskuvan sijaan näkyy yleinen "
 "kuvake."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:31
+#: ../data/org.gnome.nautilus.gschema.xml.h:33
 msgid "Maximum image size for thumbnailing"
 msgstr "Suurin koko kuville, joista tehdään pienoiskuvia"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:32
+#: ../data/org.gnome.nautilus.gschema.xml.h:34
 msgid ""
 "Images over this size (in bytes) won't be thumbnailed. The purpose of this "
 "setting is to avoid thumbnailing large images that may take a long time to "
@@ -342,11 +380,11 @@ msgstr ""
 "tarkoituksena on estää pienoiskuvien teko suurista kuvista, mikä voi kestää "
 "kauan tai viedä paljon muistia."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:33
+#: ../data/org.gnome.nautilus.gschema.xml.h:35
 msgid "Show folders first in windows"
 msgstr "Näytä kansiot ikkunoissa ensimmäisinä"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:34
+#: ../data/org.gnome.nautilus.gschema.xml.h:36
 msgid ""
 "If set to true, then Nautilus shows folders prior to showing files in the "
 "icon and list views."
@@ -354,11 +392,11 @@ msgstr ""
 "Jos tosi, Nautilus näyttää kansiot kuvakenäkymissä ja luetteloissa "
 "tiedostoja ennen."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:35
+#: ../data/org.gnome.nautilus.gschema.xml.h:37
 msgid "Default sort order"
 msgstr "Oletusarvoinen järjestys"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:36
+#: ../data/org.gnome.nautilus.gschema.xml.h:38
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
 "\", \"size\", \"type\" and \"mtime\"."
@@ -366,15 +404,21 @@ msgstr ""
 "Kuvakenäkymän oletusarvoinen järjestys. Mahdollisia arvoja ovat "
 "”name” (nimi), ”size” (koko), ”type” (tyyppi) ja ”mtime” (muokkausaika)."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:37
+#: ../data/org.gnome.nautilus.gschema.xml.h:39
 msgid "Reverse sort order in new windows"
 msgstr "Käänteinen järjestys uusissa ikkunoissa"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:38
+#: ../data/org.gnome.nautilus.gschema.xml.h:40
+#, fuzzy
+#| msgid ""
+#| "If true, files in new windows will be sorted in reverse order. ie, if "
+#| "sorted by name, then instead of sorting the files from \"a\" to \"z\", "
+#| "they will be sorted from \"z\" to \"a\"; if sorted by size, instead of "
+#| "being incrementally they will be sorted decrementally."
 msgid ""
-"If true, files in new windows will be sorted in reverse order. ie, if sorted "
-"by name, then instead of sorting the files from \"a\" to \"z\", they will be "
-"sorted from \"z\" to \"a\"; if sorted by size, instead of being "
+"If true, files in new windows will be sorted in reverse order. I.e., if "
+"sorted by name, then instead of sorting the files from \"a\" to \"z\", they "
+"will be sorted from \"z\" to \"a\"; if sorted by size, instead of being "
 "incrementally they will be sorted decrementally."
 msgstr ""
 "Jos tosi, tiedostot kaikissa ikkunoissa näkyvät käänteisessä järjestyksessä. "
@@ -382,11 +426,11 @@ msgstr ""
 "eikä A-Ö; jos tiedostot ovat koon mukaisessa järjestyksessä, suurimmat "
 "tulevat ensimmäisinä pienimpien sijaan."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:39
+#: ../data/org.gnome.nautilus.gschema.xml.h:41
 msgid "Default folder viewer"
 msgstr "Oletusarvoinen kansion näkymä"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:40
+#: ../data/org.gnome.nautilus.gschema.xml.h:42
 #, fuzzy
 msgid ""
 "When a folder is visited this viewer is used unless you have selected "
@@ -397,32 +441,30 @@ msgstr ""
 "erikseen valittu kyseiselle kansiolle. Kelvollisia arvoja ovat ”list-view”, "
 "”icon-view” ja ”compact-view”."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:41
+#: ../data/org.gnome.nautilus.gschema.xml.h:43
 msgid "Whether to show hidden files"
 msgstr "Näkyvätkö piilotiedostot"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:42
+#: ../data/org.gnome.nautilus.gschema.xml.h:44
 msgid ""
 "This key is deprecated and ignored. The \"show-hidden\" key from \"org.gtk."
 "Settings.FileChooser\" is now used instead."
 msgstr ""
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:43
-msgid "Whether to switch to the list view on search"
+#: ../data/org.gnome.nautilus.gschema.xml.h:45
+msgid "What viewer should be used when searching"
 msgstr ""
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:44
+#: ../data/org.gnome.nautilus.gschema.xml.h:46
 msgid ""
-"If this is set to true, view mode will be switched to the list view while "
-"searching. However, if the user changes the mode manually, this will be "
-"disabled."
+"When searching Nautilus will switch to the type of view in this setting."
 msgstr ""
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:45
+#: ../data/org.gnome.nautilus.gschema.xml.h:47
 msgid "Bulk rename utility"
 msgstr "Joukoittainen uudelleennimeämistyökalu"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:46
+#: ../data/org.gnome.nautilus.gschema.xml.h:48
 msgid ""
 "If set, Nautilus will append URIs of selected files and treat the result as "
 "a command line for bulk renaming. Bulk rename applications can register "
@@ -437,27 +479,27 @@ msgstr ""
 "ja mahdolliset komentorivivalitsimet. Mikäli ajotiedostona ei ole "
 "täydellinen polku, ajotiedostoa etsitään hakupolusta."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:47
+#: ../data/org.gnome.nautilus.gschema.xml.h:49
 msgid ""
 "Whether to open the hovered folder after a timeout when drag and drop "
 "operation"
 msgstr ""
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:48
+#: ../data/org.gnome.nautilus.gschema.xml.h:50
 #, fuzzy
 #| msgid ""
 #| "If this is set to true, an icon linking to the home folder will be put on "
 #| "the desktop."
 msgid ""
 "If this is set to true, when performing a drag and drop operation the "
-"hovered folder will open automatically after a timeout"
+"hovered folder will open automatically after a timeout."
 msgstr "Jos tosi, kotikansion kuvake näkyy työpöydällä."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:49
+#: ../data/org.gnome.nautilus.gschema.xml.h:51
 msgid "List of possible captions on icons"
 msgstr "Luettelo mahdollisista kuvakkeiden teksteistä"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:50
+#: ../data/org.gnome.nautilus.gschema.xml.h:52
 #, fuzzy
 msgid ""
 "A list of captions below an icon in the icon view and the desktop. The "
@@ -473,31 +515,31 @@ msgstr ""
 "”permissions” (oikeudet), ”octal_permissions” (oikeudet oktaalilukuna) ja "
 "”mime_type” (MIME-tyyppi)."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:51
+#: ../data/org.gnome.nautilus.gschema.xml.h:53
 msgid "Default icon zoom level"
 msgstr "Oletusarvoinen kuvakkeiden mittakaava"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:52
+#: ../data/org.gnome.nautilus.gschema.xml.h:54
 msgid "Default zoom level used by the icon view."
 msgstr "Kuvakenäkymän oletusarvoinen mittakaava."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:53
+#: ../data/org.gnome.nautilus.gschema.xml.h:55
 msgid "Default Thumbnail Icon Size"
 msgstr "Pienoiskuvien oletuskoko"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:54
+#: ../data/org.gnome.nautilus.gschema.xml.h:56
 #, fuzzy
 #| msgid "The default size of an icon for a thumbnail in the icon view."
 msgid ""
 "The default size of an icon for a thumbnail in the icon view when using "
-"NAUTILUS_ICON_SIZE_SMALL size."
+"NAUTILUS_ICON_SIZE_STANDARD size."
 msgstr "Kuvakenäkymän pienoiskuvien oletuskoko."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:55
+#: ../data/org.gnome.nautilus.gschema.xml.h:57
 msgid "Text Ellipsis Limit"
 msgstr "Tekstin typistysraja"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:56
+#: ../data/org.gnome.nautilus.gschema.xml.h:58
 #, fuzzy
 #| msgid ""
 #| "A string specifying how parts of overlong file names should be replaced "
@@ -527,7 +569,7 @@ msgid ""
 "shorten file names if they exceed five lines for zoom level \"smallest\". "
 "Shorten file names if they exceed four lines for zoom level \"smaller\". Do "
 "not shorten file names for other zoom levels. Available zoom levels: small, "
-"standard, large"
+"standard, large."
 msgstr ""
 "Merkkijono, jolla määritetään kuinka liian pitkien tiedostonimien osat "
 "korvataan, riippuen suurennuksen tasosta. Kukin listan kohdista on muodossa "
@@ -544,87 +586,92 @@ msgstr ""
 "(50%), small (66%), standard (100%), large (150%), larger (200%), largest "
 "(400%)"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:57
+#: ../data/org.gnome.nautilus.gschema.xml.h:59
 msgid "Default list zoom level"
 msgstr "Oletusarvoinen luettelon mittakaava"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:58
+#: ../data/org.gnome.nautilus.gschema.xml.h:60
 msgid "Default zoom level used by the list view."
 msgstr "Luettelonäkymän oletusarvoinen mittakaava."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:59
+#: ../data/org.gnome.nautilus.gschema.xml.h:61
 msgid "Default list of columns visible in the list view"
 msgstr "Oletusarvoinen luettelo luettelonäkymässä näkyvistä sarakkeista"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:60
+#: ../data/org.gnome.nautilus.gschema.xml.h:62
 msgid "Default list of columns visible in the list view."
 msgstr "Oletusarvoinen luettelo luettelonäkymässä näkyvistä sarakkeista."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:61
+#: ../data/org.gnome.nautilus.gschema.xml.h:63
 msgid "Default column order in the list view"
 msgstr "Luettelonäkymän oletusarvoinen sarakejärjestys"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:62
+#: ../data/org.gnome.nautilus.gschema.xml.h:64
 msgid "Default column order in the list view."
 msgstr "Luettelonäkymän oletusarvoinen sarakejärjestys."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:63
+#: ../data/org.gnome.nautilus.gschema.xml.h:65
 msgid "Use tree view"
 msgstr "Käytä puunäkymää"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:64
+#: ../data/org.gnome.nautilus.gschema.xml.h:66
 msgid ""
-"Whether a tree should be used for list view navigation instead of a flat list"
+"Whether a tree should be used for list view navigation instead of a flat "
+"list."
 msgstr ""
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:65
+#: ../data/org.gnome.nautilus.gschema.xml.h:67
 msgctxt "desktop-font"
 msgid "''"
 msgstr ""
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:66
+#: ../data/org.gnome.nautilus.gschema.xml.h:68
 msgid "Desktop font"
 msgstr "Työpöydän fontti"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:67
+#: ../data/org.gnome.nautilus.gschema.xml.h:69
 msgid "The font description used for the icons on the desktop."
 msgstr "Työpöydän kuvakkeiden fontin fonttikuvaus."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:68
+#: ../data/org.gnome.nautilus.gschema.xml.h:70
 msgid "Home icon visible on desktop"
 msgstr "Koti-kuvake näkyy työpöydällä"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:69
+#: ../data/org.gnome.nautilus.gschema.xml.h:71
 msgid ""
 "If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 msgstr "Jos tosi, kotikansion kuvake näkyy työpöydällä."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:70
+#: ../data/org.gnome.nautilus.gschema.xml.h:72
 msgid "Trash icon visible on desktop"
 msgstr "Roskakori näkyy työpöydällä"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:71
+#: ../data/org.gnome.nautilus.gschema.xml.h:73
+#, fuzzy
+#| msgid ""
+#| "If this is set to true, an icon linking to the trash will be put on the "
+#| "desktop."
 msgid ""
-"If this is set to true, an icon linking to the trash will be put on the "
+"If this is set to true, an icon linking to the Trash will be put on the "
 "desktop."
 msgstr "Jos tosi, roskakorin kuvake näkyy työpöydällä."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:72
+#: ../data/org.gnome.nautilus.gschema.xml.h:74
 msgid "Show mounted volumes on the desktop"
 msgstr "Näytä liitetyt asemat työpöydällä"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:73
+#: ../data/org.gnome.nautilus.gschema.xml.h:75
 msgid ""
 "If this is set to true, icons linking to mounted volumes will be put on the "
 "desktop."
 msgstr "Jos tosi, liitettyjen asemien kuvakkeet näkyvät työpöydällä."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:74
+#: ../data/org.gnome.nautilus.gschema.xml.h:76
 msgid "Network Servers icon visible on the desktop"
 msgstr "Näytä Verkkopalvelimien kuvake työpöydällä"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:75
+#: ../data/org.gnome.nautilus.gschema.xml.h:77
 msgid ""
 "If this is set to true, an icon linking to the Network Servers view will be "
 "put on the desktop."
@@ -632,18 +679,18 @@ msgstr ""
 "Jos tosi, näytetään työpöydällä kuvake, joka avattaessa näyttää "
 "verkkopalvelimet-näkymän."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:76
+#: ../data/org.gnome.nautilus.gschema.xml.h:78
 #, fuzzy
 #| msgid "Home"
 msgctxt "home-icon-name"
 msgid "'Home'"
 msgstr "Koti"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:77
+#: ../data/org.gnome.nautilus.gschema.xml.h:79
 msgid "Desktop home icon name"
 msgstr "Koti-työpöytäkuvakkeen nimi"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:78
+#: ../data/org.gnome.nautilus.gschema.xml.h:80
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
@@ -651,37 +698,43 @@ msgstr ""
 "Tämän nimen voi asettaa, jos haluaa vaihtaa työpöydän koti-kuvakkeen nimeksi "
 "jotakin muuta."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:79
+#: ../data/org.gnome.nautilus.gschema.xml.h:81
 #, fuzzy
 #| msgid "Trash"
 msgctxt "trash-icon-name"
 msgid "'Trash'"
 msgstr "Roskakori"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:80
-msgid "Desktop trash icon name"
+#: ../data/org.gnome.nautilus.gschema.xml.h:82
+#, fuzzy
+#| msgid "Desktop trash icon name"
+msgid "Desktop Trash icon name"
 msgstr "Roskakori-työpöytäkuvakkeen nimi"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:81
+#: ../data/org.gnome.nautilus.gschema.xml.h:83
+#, fuzzy
+#| msgid ""
+#| "This name can be set if you want a custom name for the trash icon on the "
+#| "desktop."
 msgid ""
-"This name can be set if you want a custom name for the trash icon on the "
+"This name can be set if you want a custom name for the Trash icon on the "
 "desktop."
 msgstr ""
 "Tämän nimen voi asettaa, jos haluaa vaihtaa työpöydän roskakori-kuvakkeen "
 "nimeksi jotakin muuta."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:82
+#: ../data/org.gnome.nautilus.gschema.xml.h:84
 #, fuzzy
 #| msgid "Network servers icon name"
 msgctxt "network-icon-name"
 msgid "'Network Servers'"
 msgstr "Verkkopalvelimien kuvakkeen nimi"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:83
+#: ../data/org.gnome.nautilus.gschema.xml.h:85
 msgid "Network servers icon name"
 msgstr "Verkkopalvelimien kuvakkeen nimi"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:84
+#: ../data/org.gnome.nautilus.gschema.xml.h:86
 msgid ""
 "This name can be set if you want a custom name for the network servers icon "
 "on the desktop."
@@ -689,7 +742,7 @@ msgstr ""
 "Tämän nimen voi asettaa, jos haluat vaihtaa työpöydän verkkopalvelimien "
 "kuvakkeen nimeksi jotakin muuta."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:85
+#: ../data/org.gnome.nautilus.gschema.xml.h:87
 msgid ""
 "An integer specifying how parts of overlong file names should be replaced by "
 "ellipses on the desktop. If the number is larger than 0, the file name will "
@@ -701,362 +754,349 @@ msgstr ""
 "esitetä useammalla kuin arvon määrällä rivejä. Jos arvo on 0 tai pienempi, "
 "ei tiedostonimen rivimäärä ole rajoitettu."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:86
+#: ../data/org.gnome.nautilus.gschema.xml.h:88
 msgid "Fade the background on change"
 msgstr "Häivytä taustakuva vaihdettaessa"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:87
+#: ../data/org.gnome.nautilus.gschema.xml.h:89
 msgid ""
 "If set to true, then Nautilus will use a fade effect to change the desktop "
 "background."
 msgstr "Jos tosi, Nautilus vaihtaa työpöydän taustan häivytysefektillä."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:88
-msgid "The geometry string for a navigation window."
+#: ../data/org.gnome.nautilus.gschema.xml.h:90
+#, fuzzy
+#| msgid "The geometry string for a navigation window."
+msgid "The geometry string for a navigation window"
 msgstr "Selausikkunan geometriamerkkijono."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:89
+#: ../data/org.gnome.nautilus.gschema.xml.h:91
 msgid ""
 "A string containing the saved geometry and coordinates string for navigation "
 "windows."
 msgstr ""
 "Selausikkunoiden tallennetun geometrian ja koordinaatit sisältä merkkijono."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:90
-msgid "Whether the navigation window should be maximized."
+#: ../data/org.gnome.nautilus.gschema.xml.h:92
+#, fuzzy
+#| msgid "Whether the navigation window should be maximized."
+msgid "Whether the navigation window should be maximized"
 msgstr "Suurennetaanko selausikkuna."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:91
+#: ../data/org.gnome.nautilus.gschema.xml.h:93
 msgid "Whether the navigation window should be maximized by default."
 msgstr "Suurennetaanko selausikkuna oletusarvoisesti."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:92
+#: ../data/org.gnome.nautilus.gschema.xml.h:94
 msgid "Width of the side pane"
 msgstr "Sivupaneelin leveys"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:93
+#: ../data/org.gnome.nautilus.gschema.xml.h:95
 msgid "The default width of the side pane in new windows."
 msgstr "Uusien ikkunoiden sivupaneelin oletusarvoinen leveys."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:94
+#: ../data/org.gnome.nautilus.gschema.xml.h:96
 msgid "Show location bar in new windows"
 msgstr "Näytä sijaintipalkki uusissa ikkunoissa"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:95
+#: ../data/org.gnome.nautilus.gschema.xml.h:97
 msgid ""
 "If set to true, newly opened windows will have the location bar visible."
 msgstr "Jos tosi, sijaintipalkki näkyy uusissa ikkunoissa."
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:96
+#: ../data/org.gnome.nautilus.gschema.xml.h:98
 msgid "Show side pane in new windows"
 msgstr "Näytä sivupaneeli uusissa ikkunoissa"
 
-#: ../data/org.gnome.nautilus.gschema.xml.h:97
+#: ../data/org.gnome.nautilus.gschema.xml.h:99
 msgid "If set to true, newly opened windows will have the side pane visible."
 msgstr "Jos tosi, sivupaneeli näkyy uusissa ikkunoissa."
 
-#: ../eel/eel-canvas.c:1254 ../eel/eel-canvas.c:1255
+#: ../eel/eel-canvas.c:1258 ../eel/eel-canvas.c:1259
 msgid "X"
 msgstr "X"
 
-#: ../eel/eel-canvas.c:1261 ../eel/eel-canvas.c:1262
+#: ../eel/eel-canvas.c:1265 ../eel/eel-canvas.c:1266
 msgid "Y"
 msgstr "Y"
 
-#: ../eel/eel-gtk-extensions.c:326
+#: ../eel/eel-gtk-extensions.c:325
 msgid "Show more _details"
 msgstr "Näytä _lisätietoja"
 
 #. Put up the timed wait window.
-#: ../eel/eel-stock-dialogs.c:195
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:542
-#: ../libnautilus-private/nautilus-file-operations.c:183
-#: ../src/nautilus-files-view.c:1095 ../src/nautilus-files-view.c:1569
-#: ../src/nautilus-files-view.c:5267 ../src/nautilus-location-entry.c:270
-#: ../src/nautilus-mime-actions.c:415 ../src/nautilus-mime-actions.c:419
-#: ../src/nautilus-mime-actions.c:490 ../src/nautilus-mime-actions.c:833
-#: ../src/nautilus-mime-actions.c:1343 ../src/nautilus-mime-actions.c:1572
-#: ../src/nautilus-properties-window.c:4188
-#: ../src/nautilus-properties-window.c:5170 ../src/nautilus-query-editor.c:494
+#: ../eel/eel-stock-dialogs.c:194 ../src/nautilus-file-conflict-dialog.c:553
+#: ../src/nautilus-file-operations.c:179 ../src/nautilus-files-view.c:1014
+#: ../src/nautilus-files-view.c:1489 ../src/nautilus-files-view.c:5322
+#: ../src/nautilus-location-entry.c:269 ../src/nautilus-mime-actions.c:559
+#: ../src/nautilus-mime-actions.c:563 ../src/nautilus-mime-actions.c:634
+#: ../src/nautilus-mime-actions.c:970 ../src/nautilus-mime-actions.c:1477
+#: ../src/nautilus-mime-actions.c:1707 ../src/nautilus-properties-window.c:4151
+#: ../src/nautilus-properties-window.c:5145
+#: ../src/nautilus-search-popover.c:539
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../eel/eel-stock-dialogs.c:204
+#: ../eel/eel-stock-dialogs.c:203
 msgid "You can stop this operation by clicking cancel."
 msgstr "Voit pysäyttää tämän toiminnon napsauttamalla peru."
 
-#: ../eel/eel-vfs-extensions.c:98
+#: ../eel/eel-vfs-extensions.c:97
 msgid " (invalid Unicode)"
 msgstr " (virheellistä Unicodea)"
 
-#: ../libnautilus-private/nautilus-bookmark.c:107
-#: ../libnautilus-private/nautilus-file-utilities.c:273
-#: ../src/nautilus-pathbar.c:408
+#: ../src/nautilus-bookmark.c:106 ../src/nautilus-file-utilities.c:282
+#: ../src/nautilus-pathbar.c:412
 msgid "Other Locations"
 msgstr "Muut sijainnit"
 
-#: ../libnautilus-private/nautilus-bookmark.c:109
-#: ../libnautilus-private/nautilus-desktop-link.c:129
-#: ../libnautilus-private/nautilus-file-utilities.c:265
-#: ../src/nautilus-list-view.c:1490 ../src/nautilus-pathbar.c:406
-#: ../src/nautilus-query-editor.c:1072
+#: ../src/nautilus-bookmark.c:108 ../src/nautilus-file-utilities.c:266
+#: ../nautilus-desktop/nautilus-desktop-link.c:132
+#: ../src/nautilus-list-view.c:1489 ../src/nautilus-pathbar.c:410
 #: ../src/nautilus-shell-search-provider.c:292
 msgid "Home"
 msgstr "Koti"
 
-#: ../libnautilus-private/nautilus-canvas-container.c:2460
+#: ../src/nautilus-canvas-container.c:2487
 msgid "The selection rectangle"
 msgstr "Valittu suorakulmio"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:416
+#: ../src/nautilus-column-chooser.c:415
 msgid "Reset to De_fault"
 msgstr "Palauta _oletukset"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:418
+#: ../src/nautilus-column-chooser.c:417
 msgid "Replace the current List Columns settings with the default settings"
 msgstr "Korvaa nykyiset luettelon sarakeasetukset oletusasetuksilla"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:57
-#: ../src/nautilus-list-view.c:1713
+#: ../src/nautilus-column-utilities.c:56 ../src/nautilus-list-view.c:1714
 #: ../src/resources/ui/nautilus-rename-file-popover.ui.h:1
 msgid "Name"
 msgstr "Nimi"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:58
+#: ../src/nautilus-column-utilities.c:57
 msgid "The name and icon of the file."
 msgstr "Tiedoston nimi ja kuvake."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:64
+#: ../src/nautilus-column-utilities.c:63
 msgid "Size"
 msgstr "Koko"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:65
+#: ../src/nautilus-column-utilities.c:64
 msgid "The size of the file."
 msgstr "Tiedoston koko."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:71
+#: ../src/nautilus-column-utilities.c:70
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:72
+#: ../src/nautilus-column-utilities.c:71
 msgid "The type of the file."
 msgstr "Tiedoston tyyppi."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:78
+#: ../src/nautilus-column-utilities.c:77
 msgid "Modified"
 msgstr "Muokattu"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:79
-#: ../libnautilus-private/nautilus-column-utilities.c:137
+#: ../src/nautilus-column-utilities.c:78 ../src/nautilus-column-utilities.c:136
 msgid "The date the file was modified."
 msgstr "Hetki, jolloin tiedostoa viimeksi muokattiin."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:87
+#: ../src/nautilus-column-utilities.c:86
 msgid "Accessed"
 msgstr "Käytetty"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:88
+#: ../src/nautilus-column-utilities.c:87
 msgid "The date the file was accessed."
 msgstr "Hetki, jona tiedostoa viimeksi käytettiin."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:97
+#: ../src/nautilus-column-utilities.c:96
 msgid "Owner"
 msgstr "Omistaja"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:98
+#: ../src/nautilus-column-utilities.c:97
 msgid "The owner of the file."
 msgstr "Tiedoston omistaja."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:105
+#: ../src/nautilus-column-utilities.c:104
 msgid "Group"
 msgstr "Ryhmä"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:106
+#: ../src/nautilus-column-utilities.c:105
 msgid "The group of the file."
 msgstr "Tiedoston ryhmä."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:113
-#: ../src/nautilus-properties-window.c:4257
+#: ../src/nautilus-column-utilities.c:112
+#: ../src/nautilus-properties-window.c:4220
 msgid "Permissions"
 msgstr "Oikeudet"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:114
+#: ../src/nautilus-column-utilities.c:113
 msgid "The permissions of the file."
 msgstr "Tiedoston oikeudet."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:121
+#: ../src/nautilus-column-utilities.c:120
 msgid "MIME Type"
 msgstr "MIME-tyyppi"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:122
-msgid "The mime type of the file."
-msgstr "Tiedoston MIME-tyyppi."
+#: ../src/nautilus-column-utilities.c:121
+#, fuzzy
+#| msgid "The type of the file."
+msgid "The MIME type of the file."
+msgstr "Tiedoston tyyppi."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:129
-#: ../src/nautilus-image-properties-page.c:415
+#: ../src/nautilus-column-utilities.c:128
+#: ../src/nautilus-image-properties-page.c:414
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:130
+#: ../src/nautilus-column-utilities.c:129
 msgid "The location of the file."
 msgstr "Tiedoston sijainti."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:136
+#: ../src/nautilus-column-utilities.c:135
 msgid "Modified - Time"
 msgstr "Muokattu - Aika"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:179
+#: ../src/nautilus-column-utilities.c:178
 msgid "Trashed On"
 msgstr "Siirretty roskakoriin"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:180
+#: ../src/nautilus-column-utilities.c:179
 msgid "Date when file was moved to the Trash"
 msgstr "Päiväys, jolloin tiedosto siirrettiin roskakoriin"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:187
+#: ../src/nautilus-column-utilities.c:186
 msgid "Original Location"
 msgstr "Alkuperäinen sijainti"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:188
+#: ../src/nautilus-column-utilities.c:187
 msgid "Original location of file before moved to the Trash"
 msgstr ""
 "Alkuperäinen sijainti, jossa tiedosto oli ennen roskakoriin siirtämistä"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:205
+#: ../src/nautilus-column-utilities.c:204
 msgid "Relevance"
 msgstr "Relevanssi"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:206
+#: ../src/nautilus-column-utilities.c:205
 msgid "Relevance rank for search"
 msgstr "Relevanssiasema hauissa"
 
-#: ../libnautilus-private/nautilus-desktop-directory-file.c:433
-#: ../libnautilus-private/nautilus-desktop-icon-file.c:149
-msgid "on the desktop"
-msgstr "työpöydällä"
-
 #. Translators: this is of the format "hostname (uri-scheme)"
-#: ../libnautilus-private/nautilus-directory.c:517
+#: ../src/nautilus-directory.c:524
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libnautilus-private/nautilus-dnd.c:747
+#: ../src/nautilus-dnd.c:767
 msgid "_Move Here"
 msgstr "_Siirrä tähän"
 
-#: ../libnautilus-private/nautilus-dnd.c:752
+#: ../src/nautilus-dnd.c:772
 msgid "_Copy Here"
 msgstr "_Kopioi tähän"
 
-#: ../libnautilus-private/nautilus-dnd.c:757
+#: ../src/nautilus-dnd.c:777
 msgid "_Link Here"
 msgstr "_Linkitä tähän"
 
-#: ../libnautilus-private/nautilus-dnd.c:764
+#: ../src/nautilus-dnd.c:784
 #: ../src/resources/ui/nautilus-create-folder-dialog.ui.h:1
 msgid "Cancel"
 msgstr "Peru"
 
-#: ../libnautilus-private/nautilus-file.c:1235
-#: ../libnautilus-private/nautilus-vfs-file.c:369
+#: ../src/nautilus-file.c:1210 ../src/nautilus-vfs-file.c:368
 msgid "This file cannot be mounted"
 msgstr "Tätä tiedostoa ei voi liittää tiedostojärjestelmään"
 
-#: ../libnautilus-private/nautilus-file.c:1280
+#: ../src/nautilus-file.c:1255
 msgid "This file cannot be unmounted"
 msgstr "Tätä tiedostoa ei voi irrottaa tiedostojärjestelmästä"
 
-#: ../libnautilus-private/nautilus-file.c:1314
+#: ../src/nautilus-file.c:1289
 msgid "This file cannot be ejected"
 msgstr "Tätä tiedostoa ei voi poistaa asemasta"
 
-#: ../libnautilus-private/nautilus-file.c:1347
-#: ../libnautilus-private/nautilus-vfs-file.c:547
+#: ../src/nautilus-file.c:1322 ../src/nautilus-vfs-file.c:546
 msgid "This file cannot be started"
 msgstr "Tätä tiedostoa ei voi käynnistää"
 
-#: ../libnautilus-private/nautilus-file.c:1399
-#: ../libnautilus-private/nautilus-file.c:1430
+#: ../src/nautilus-file.c:1374 ../src/nautilus-file.c:1405
 msgid "This file cannot be stopped"
 msgstr "Tätä tiedostoa ei voi pysäyttää"
 
-#: ../libnautilus-private/nautilus-file.c:1846
-#, c-format
-msgid "Slashes are not allowed in filenames"
-msgstr "Kauttaviivat eivät ole sallittu tiedostonimissä"
-
-#: ../libnautilus-private/nautilus-file.c:1864
+#: ../src/nautilus-file.c:1829
 #, c-format
 msgid "File not found"
 msgstr "Tiedostoa ei löydy"
 
-#: ../libnautilus-private/nautilus-file.c:1892
+#: ../src/nautilus-file.c:1864
 #, c-format
-msgid "Toplevel files cannot be renamed"
-msgstr "Päätason tiedostoja ei voi nimetä uudestaan"
+msgid "Slashes are not allowed in filenames"
+msgstr "Kauttaviivat eivät ole sallittu tiedostonimissä"
 
-#: ../libnautilus-private/nautilus-file.c:1915
+#: ../src/nautilus-file.c:1898
 #, c-format
-msgid "Unable to rename desktop icon"
-msgstr "Työpöytäkuvaketta ei voi nimetä uudestaan"
+msgid "Toplevel files cannot be renamed"
+msgstr "Päätason tiedostoja ei voi nimetä uudestaan"
 
-#: ../libnautilus-private/nautilus-file.c:1944
+#: ../src/nautilus-file.c:1924
 #, c-format
-msgid "Unable to rename desktop file"
-msgstr "Työpöytätiedostoa ei voi nimetä uudestaan"
+msgid "Probably the content of the file is an invalid desktop file format"
+msgstr ""
 
 #. Translators: Time in 24h format
-#: ../libnautilus-private/nautilus-file.c:4753
+#: ../src/nautilus-file.c:4748
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. Translators: Time in 12h format
-#: ../libnautilus-private/nautilus-file.c:4756
+#: ../src/nautilus-file.c:4751
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#: ../libnautilus-private/nautilus-file.c:4763
+#: ../src/nautilus-file.c:4758
 #, no-c-format
 msgid "Yesterday"
 msgstr "Eilen"
 
 #. Translators: this is the word Yesterday followed by
 #. * a time in 24h format. i.e. "Yesterday 23:04"
-#: ../libnautilus-private/nautilus-file.c:4769
+#: ../src/nautilus-file.c:4764
 #, no-c-format
 msgid "Yesterday %H:%M"
 msgstr "Eilen %H:%M"
 
 #. Translators: this is the word Yesterday followed by
 #. * a time in 12h format. i.e. "Yesterday 9:04 PM"
-#: ../libnautilus-private/nautilus-file.c:4774
+#: ../src/nautilus-file.c:4769
 #, no-c-format
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: ../libnautilus-private/nautilus-file.c:4782
+#: ../src/nautilus-file.c:4777
 #, no-c-format
 msgid "%a"
 msgstr "%a"
 
 #. Translators: this is the name of the week day followed by
 #. * a time in 24h format. i.e. "Monday 23:04"
-#: ../libnautilus-private/nautilus-file.c:4788
+#: ../src/nautilus-file.c:4783
 #, no-c-format
 msgid "%a %H:%M"
 msgstr "%a %H:%M"
 
 #. Translators: this is the week day name followed by
 #. * a time in 12h format. i.e. "Monday 9:04 PM"
-#: ../libnautilus-private/nautilus-file.c:4793
+#: ../src/nautilus-file.c:4788
 #, no-c-format
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 #. Translators: this is the day of the month followed
 #. * by the abbreviated month name i.e. "3 Feb"
-#: ../libnautilus-private/nautilus-file.c:4801
+#: ../src/nautilus-file.c:4796
 #, no-c-format
 msgid "%-e %b"
 msgstr "%-e. %b"
@@ -1064,7 +1104,7 @@ msgstr "%-e. %b"
 #. Translators: this is the day of the month followed
 #. * by the abbreviated month name followed by a time in
 #. * 24h format i.e. "3 Feb 23:04"
-#: ../libnautilus-private/nautilus-file.c:4808
+#: ../src/nautilus-file.c:4803
 #, no-c-format
 msgid "%-e %b %H:%M"
 msgstr "%-e. %b %H:%M"
@@ -1072,14 +1112,14 @@ msgstr "%-e. %b %H:%M"
 #. Translators: this is the day of the month followed
 #. * by the abbreviated month name followed by a time in
 #. * 12h format i.e. "3 Feb 9:04"
-#: ../libnautilus-private/nautilus-file.c:4814
+#: ../src/nautilus-file.c:4809
 #, no-c-format
 msgid "%-e %b %l:%M %p"
 msgstr "%-e %b %l:%M %p"
 
 #. Translators: this is the day of the month followed by the abbreviated
 #. * month name followed by the year i.e. "3 Feb 2015"
-#: ../libnautilus-private/nautilus-file.c:4822
+#: ../src/nautilus-file.c:4817
 #, no-c-format
 msgid "%-e %b %Y"
 msgstr "%-e. %Bta %Y"
@@ -1087,7 +1127,7 @@ msgstr "%-e. %Bta %Y"
 #. Translators: this is the day number followed
 #. * by the abbreviated month name followed by the year followed
 #. * by a time in 24h format i.e. "3 Feb 2015 23:04"
-#: ../libnautilus-private/nautilus-file.c:4829
+#: ../src/nautilus-file.c:4824
 #, no-c-format
 msgid "%-e %b %Y %H:%M"
 msgstr "%-e. %b %Y %H:%M"
@@ -1095,61 +1135,61 @@ msgstr "%-e. %b %Y %H:%M"
 #. Translators: this is the day number followed
 #. * by the abbreviated month name followed by the year followed
 #. * by a time in 12h format i.e. "3 Feb 2015 9:04 PM"
-#: ../libnautilus-private/nautilus-file.c:4835
+#: ../src/nautilus-file.c:4830
 #, no-c-format
 msgid "%-e %b %Y %l:%M %p"
 msgstr "%-e %b %Y %l:%M %p"
 
-#: ../libnautilus-private/nautilus-file.c:4844
+#: ../src/nautilus-file.c:4839
 #, no-c-format
 msgid "%c"
 msgstr "%c"
 
-#: ../libnautilus-private/nautilus-file.c:5237
+#: ../src/nautilus-file.c:5238
 #, c-format
 msgid "Not allowed to set permissions"
 msgstr "Et saa asettaa oikeuksia"
 
-#: ../libnautilus-private/nautilus-file.c:5532
+#: ../src/nautilus-file.c:5533
 #, c-format
 msgid "Not allowed to set owner"
 msgstr "Et saa asettaa omistajaa"
 
-#: ../libnautilus-private/nautilus-file.c:5550
+#: ../src/nautilus-file.c:5551
 #, c-format
 msgid "Specified owner '%s' doesn't exist"
 msgstr "Annettua omistajaa ”%s” ei ole olemassa"
 
-#: ../libnautilus-private/nautilus-file.c:5814
+#: ../src/nautilus-file.c:5815
 #, c-format
 msgid "Not allowed to set group"
 msgstr "Et saa asettaa ryhmää"
 
-#: ../libnautilus-private/nautilus-file.c:5832
+#: ../src/nautilus-file.c:5833
 #, c-format
 msgid "Specified group '%s' doesn't exist"
 msgstr "Annettua ryhmää ”%s” ei ole olemassa"
 
 #. Translators: "Me" is used to indicate the file is owned by me (the current user)
-#: ../libnautilus-private/nautilus-file.c:5967
+#: ../src/nautilus-file.c:5968
 msgid "Me"
 msgstr "Minä"
 
-#: ../libnautilus-private/nautilus-file.c:5991
+#: ../src/nautilus-file.c:5992
 #, c-format
 msgid "%'u item"
 msgid_plural "%'u items"
 msgstr[0] "%'u kohde"
 msgstr[1] "%'u kohdetta"
 
-#: ../libnautilus-private/nautilus-file.c:5992
+#: ../src/nautilus-file.c:5993
 #, c-format
 msgid "%'u folder"
 msgid_plural "%'u folders"
 msgstr[0] "%'u kansio"
 msgstr[1] "%'u kansiota"
 
-#: ../libnautilus-private/nautilus-file.c:5993
+#: ../src/nautilus-file.c:5994
 #, c-format
 msgid "%'u file"
 msgid_plural "%'u files"
@@ -1157,97 +1197,88 @@ msgstr[0] "%'u tiedosto"
 msgstr[1] "%'u tiedostoa"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:6394
-#: ../libnautilus-private/nautilus-file.c:6410
+#: ../src/nautilus-file.c:6395 ../src/nautilus-file.c:6411
 msgid "? items"
 msgstr "? kohdetta"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:6400
+#: ../src/nautilus-file.c:6401
 msgid "? bytes"
 msgstr "? tavua"
 
-#: ../libnautilus-private/nautilus-file.c:6417
-#: ../libnautilus-private/nautilus-file.c:6498
+#: ../src/nautilus-file.c:6418 ../src/nautilus-file.c:6499
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: ../libnautilus-private/nautilus-file.c:6431
-#: ../src/nautilus-properties-window.c:1185
+#: ../src/nautilus-file.c:6432 ../src/nautilus-properties-window.c:1159
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../libnautilus-private/nautilus-file.c:6462
-#: ../libnautilus-private/nautilus-file.c:6470
-#: ../libnautilus-private/nautilus-file.c:6521
+#: ../src/nautilus-file.c:6463 ../src/nautilus-file.c:6471
+#: ../src/nautilus-file.c:6522
 msgid "Program"
 msgstr "Ohjelma"
 
-#: ../libnautilus-private/nautilus-file.c:6463
+#: ../src/nautilus-file.c:6464
 msgid "Audio"
 msgstr "Ääni"
 
-#: ../libnautilus-private/nautilus-file.c:6464
+#: ../src/nautilus-file.c:6465
 msgid "Font"
 msgstr "Fontti"
 
-#: ../libnautilus-private/nautilus-file.c:6465
-#: ../src/nautilus-image-properties-page.c:769
+#: ../src/nautilus-file.c:6466 ../src/nautilus-image-properties-page.c:768
 msgid "Image"
 msgstr "Kuva"
 
-#: ../libnautilus-private/nautilus-file.c:6466
+#: ../src/nautilus-file.c:6467
 msgid "Archive"
 msgstr "Arkisto"
 
-#: ../libnautilus-private/nautilus-file.c:6467
+#: ../src/nautilus-file.c:6468
 msgid "Markup"
 msgstr "Merkkaus"
 
-#: ../libnautilus-private/nautilus-file.c:6468
-#: ../libnautilus-private/nautilus-file.c:6469
+#: ../src/nautilus-file.c:6469 ../src/nautilus-file.c:6470
 msgid "Text"
 msgstr "Teksti"
 
-#: ../libnautilus-private/nautilus-file.c:6471
-#: ../src/nautilus-query-editor.c:329
+#: ../src/nautilus-file.c:6472 ../src/nautilus-mime-actions.c:214
 msgid "Video"
 msgstr "Video"
 
-#: ../libnautilus-private/nautilus-file.c:6472
+#: ../src/nautilus-file.c:6473
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: ../libnautilus-private/nautilus-file.c:6473
+#: ../src/nautilus-file.c:6474
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: ../libnautilus-private/nautilus-file.c:6474
+#: ../src/nautilus-file.c:6475
 msgid "Document"
 msgstr "Asiakirja"
 
-#: ../libnautilus-private/nautilus-file.c:6475
-#: ../src/nautilus-query-editor.c:395
+#: ../src/nautilus-file.c:6476 ../src/nautilus-mime-actions.c:184
 msgid "Presentation"
 msgstr "Esitys"
 
-#: ../libnautilus-private/nautilus-file.c:6476
-#: ../src/nautilus-query-editor.c:379
+#: ../src/nautilus-file.c:6477 ../src/nautilus-mime-actions.c:193
 msgid "Spreadsheet"
 msgstr "Laskentataulukko"
 
-#: ../libnautilus-private/nautilus-file.c:6523
+#: ../src/nautilus-file.c:6524
 msgid "Binary"
 msgstr "Binääri"
 
-#: ../libnautilus-private/nautilus-file.c:6527
+#: ../src/nautilus-file.c:6528
 msgid "Folder"
 msgstr "Kansio"
 
-#: ../libnautilus-private/nautilus-file.c:6558
+#: ../src/nautilus-file.c:6559
 msgid "Link"
 msgstr "Linkki"
 
@@ -1256,24 +1287,22 @@ msgstr "Linkki"
 #. * to that kind of file (e.g. "link to folder").
 #.
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file.c:6564
-#: ../libnautilus-private/nautilus-file-operations.c:377
-#: ../src/nautilus-files-view-dnd.c:125
+#: ../src/nautilus-file.c:6565 ../src/nautilus-file-operations.c:378
+#: ../src/nautilus-files-view-dnd.c:124
 #, c-format
 msgid "Link to %s"
 msgstr "Linkki kohteeseen %s"
 
-#: ../libnautilus-private/nautilus-file.c:6580
-#: ../libnautilus-private/nautilus-file.c:6594
+#: ../src/nautilus-file.c:6581 ../src/nautilus-file.c:6595
 msgid "Link (broken)"
 msgstr "Linkki (rikki)"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:141
+#: ../src/nautilus-file-conflict-dialog.c:140
 #, c-format
 msgid "Merge folder “%s”?"
 msgstr "Yhdistetäänkö kansio ”%s”?"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:145
+#: ../src/nautilus-file-conflict-dialog.c:144
 msgid ""
 "Merging will ask for confirmation before replacing any files in the folder "
 "that conflict with the files being copied."
@@ -1281,179 +1310,213 @@ msgstr ""
 "Yhdistäessä kysytään varmistusta, ennen kuin mitään kyseisen kansion "
 "tiedostoja korvataan kopioitavilla tiedostoilla."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:150
+#: ../src/nautilus-file-conflict-dialog.c:149
 #, c-format
 msgid "An older folder with the same name already exists in “%s”."
 msgstr "Vanhempi kansio samalla nimellä on jo olemassa kohteessa ”%s”."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:154
+#: ../src/nautilus-file-conflict-dialog.c:153
 #, c-format
 msgid "A newer folder with the same name already exists in “%s”."
 msgstr "Uudempi kansio samalla nimellä on jo olemassa kohteessa ”%s”."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:158
+#: ../src/nautilus-file-conflict-dialog.c:157
 #, c-format
 msgid "Another folder with the same name already exists in “%s”."
 msgstr "Toinen kansio samalla nimellä on jo olemassa kohteessa ”%s”."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:163
+#: ../src/nautilus-file-conflict-dialog.c:162
 msgid "Replacing it will remove all files in the folder."
 msgstr "Sen korvaaminen poistaa kaikki kansiossa olevat tiedostot."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:165
+#: ../src/nautilus-file-conflict-dialog.c:164
 #, c-format
 msgid "Replace folder “%s”?"
 msgstr "Korvataanko kansio ”%s”?"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:167
+#: ../src/nautilus-file-conflict-dialog.c:166
 #, c-format
 msgid "A folder with the same name already exists in “%s”."
 msgstr "Kansio samalla nimellä on jo olemassa kohteessa ”%s”."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:172
+#: ../src/nautilus-file-conflict-dialog.c:171
 #, c-format
 msgid "Replace file “%s”?"
 msgstr "Korvataanko tiedosto ”%s”?"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:174
+#: ../src/nautilus-file-conflict-dialog.c:173
 msgid "Replacing it will overwrite its content."
 msgstr "Sen korvaaminen ylikirjoittaa sisällön."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:178
+#: ../src/nautilus-file-conflict-dialog.c:177
 #, c-format
 msgid "An older file with the same name already exists in “%s”."
 msgstr "Vanhempi tiedosto samalla nimellä on jo olemassa kohteessa ”%s”."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:182
+#: ../src/nautilus-file-conflict-dialog.c:181
 #, c-format
 msgid "A newer file with the same name already exists in “%s”."
 msgstr "Uudempi tiedosto samalla nimellä on jo olemassa kohteessa ”%s”."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:186
+#: ../src/nautilus-file-conflict-dialog.c:185
 #, c-format
 msgid "Another file with the same name already exists in “%s”."
 msgstr "Toinen tiedosto samalla nimellä on jo olemassa kohteessa ”%s”."
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:254
+#: ../src/nautilus-file-conflict-dialog.c:254
+#, fuzzy
+#| msgid "Original file"
+msgid "Original folder"
+msgstr "Alkuperäinen tiedosto"
+
+#: ../src/nautilus-file-conflict-dialog.c:255
+#: ../src/nautilus-file-conflict-dialog.c:292
+#, fuzzy
+#| msgid "? items"
+msgid "Items:"
+msgstr "? kohdetta"
+
+#: ../src/nautilus-file-conflict-dialog.c:258
 msgid "Original file"
 msgstr "Alkuperäinen tiedosto"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:255
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:286
-#: ../src/nautilus-properties-window.c:2996
+#: ../src/nautilus-file-conflict-dialog.c:259
+#: ../src/nautilus-file-conflict-dialog.c:296
+#: ../src/nautilus-properties-window.c:2959
 msgid "Size:"
 msgstr "Koko:"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:258
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:289
-#: ../src/nautilus-properties-window.c:2978
+#: ../src/nautilus-file-conflict-dialog.c:263
+#: ../src/nautilus-file-conflict-dialog.c:300
+#: ../src/nautilus-properties-window.c:2941
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:261
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:292
+#: ../src/nautilus-file-conflict-dialog.c:266
+#: ../src/nautilus-file-conflict-dialog.c:303
 msgid "Last modified:"
 msgstr "Viimeksi muokattu:"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:285
+#: ../src/nautilus-file-conflict-dialog.c:291
+#, fuzzy
+#| msgid "Merge"
+msgid "Merge with"
+msgstr "Yhdistä"
+
+#: ../src/nautilus-file-conflict-dialog.c:291
+#: ../src/nautilus-file-conflict-dialog.c:295
 msgid "Replace with"
 msgstr "Alkuperäisen korvaava tiedosto"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:314
+#: ../src/nautilus-file-conflict-dialog.c:325
 msgid "Merge"
 msgstr "Yhdistä"
 
 #. Setup the expander for the rename action
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:507
+#: ../src/nautilus-file-conflict-dialog.c:517
 msgid "_Select a new name for the destination"
 msgstr "_Valitse uusi nimi"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:521
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:317
+#: ../src/nautilus-file-conflict-dialog.c:531
+#: ../src/nautilus-mime-application-chooser.c:316
 msgid "Reset"
 msgstr "Nollaa"
 
 #. Setup the checkbox to apply the action to all files
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:533
-msgid "Apply this action to all files"
+#: ../src/nautilus-file-conflict-dialog.c:543
+#, fuzzy
+#| msgid "Apply this action to all files"
+msgid "Apply this action to all files and folders"
 msgstr "Käytä samaa toimintoa kaikille tiedostoille"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:544
-#: ../libnautilus-private/nautilus-file-operations.c:184
+#: ../src/nautilus-file-conflict-dialog.c:555
+#: ../src/nautilus-file-operations.c:180
 msgid "_Skip"
 msgstr "_Ohita"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:549
+#: ../src/nautilus-file-conflict-dialog.c:560
 msgid "Re_name"
 msgstr "_Nimeä uudelleen"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:555
+#: ../src/nautilus-file-conflict-dialog.c:566
 msgid "Replace"
 msgstr "Korvaa"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:629
+#: ../src/nautilus-file-conflict-dialog.c:649
+#, fuzzy
+#| msgid "New Folder"
+msgid "Merge Folder"
+msgstr "Uusi kansio"
+
+#: ../src/nautilus-file-conflict-dialog.c:649
+#: ../src/nautilus-file-conflict-dialog.c:655
+#, fuzzy
+#| msgid "File conflict"
+msgid "File and Folder conflict"
+msgstr "Tiedostoristiriita"
+
+#: ../src/nautilus-file-conflict-dialog.c:655
 msgid "File conflict"
 msgstr "Tiedostoristiriita"
 
-#: ../libnautilus-private/nautilus-file-operations.c:185
+#: ../src/nautilus-file-operations.c:181
 msgid "S_kip All"
 msgstr "_Ohita kaikki"
 
-#: ../libnautilus-private/nautilus-file-operations.c:186
+#: ../src/nautilus-file-operations.c:182
 msgid "_Retry"
 msgstr "_Yritä uudelleen"
 
-#: ../libnautilus-private/nautilus-file-operations.c:187
+#: ../src/nautilus-file-operations.c:183
 msgid "_Delete"
 msgstr "P_oista"
 
-#: ../libnautilus-private/nautilus-file-operations.c:188
+#: ../src/nautilus-file-operations.c:184
 msgid "Delete _All"
 msgstr "Poista k_aikki"
 
-#: ../libnautilus-private/nautilus-file-operations.c:189
+#: ../src/nautilus-file-operations.c:185
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: ../libnautilus-private/nautilus-file-operations.c:190
+#: ../src/nautilus-file-operations.c:186
 msgid "Replace _All"
 msgstr "Korvaa k_aikki"
 
-#: ../libnautilus-private/nautilus-file-operations.c:191
+#: ../src/nautilus-file-operations.c:187
 msgid "_Merge"
 msgstr "_Yhdistä"
 
-#: ../libnautilus-private/nautilus-file-operations.c:192
+#: ../src/nautilus-file-operations.c:188
 msgid "Merge _All"
 msgstr "Yhdistä k_aikki"
 
-#: ../libnautilus-private/nautilus-file-operations.c:193
+#: ../src/nautilus-file-operations.c:189
 msgid "Copy _Anyway"
 msgstr "Kopioi kaikesta _huolimatta"
 
-#: ../libnautilus-private/nautilus-file-operations.c:278
+#: ../src/nautilus-file-operations.c:279
 #, c-format
 msgid "%'d second"
 msgid_plural "%'d seconds"
 msgstr[0] "%'d sekunti"
 msgstr[1] "%'d sekuntia"
 
-#: ../libnautilus-private/nautilus-file-operations.c:283
-#: ../libnautilus-private/nautilus-file-operations.c:294
+#: ../src/nautilus-file-operations.c:284 ../src/nautilus-file-operations.c:295
 #, c-format
 msgid "%'d minute"
 msgid_plural "%'d minutes"
 msgstr[0] "%'d minuutti"
 msgstr[1] "%'d minuuttia"
 
-#: ../libnautilus-private/nautilus-file-operations.c:293
+#: ../src/nautilus-file-operations.c:294
 #, c-format
 msgid "%'d hour"
 msgid_plural "%'d hours"
 msgstr[0] "%'d tunti"
 msgstr[1] "%'d tuntia"
 
-#: ../libnautilus-private/nautilus-file-operations.c:301
+#: ../src/nautilus-file-operations.c:302
 #, c-format
 msgid "approximately %'d hour"
 msgid_plural "approximately %'d hours"
@@ -1461,7 +1524,7 @@ msgstr[0] "arvoilta %'d tunti"
 msgstr[1] "arviolta %'d tuntia"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:381
+#: ../src/nautilus-file-operations.c:382
 #, c-format
 msgid "Another link to %s"
 msgstr "Toinen linkki kohteeseen %s"
@@ -1470,25 +1533,25 @@ msgstr "Toinen linkki kohteeseen %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:397
+#: ../src/nautilus-file-operations.c:398
 #, c-format
 msgid "%'dst link to %s"
 msgstr "%d'd. linkki kohteeseen %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:401
+#: ../src/nautilus-file-operations.c:402
 #, c-format
 msgid "%'dnd link to %s"
 msgstr "%'d. linkki kohteeseen %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:405
+#: ../src/nautilus-file-operations.c:406
 #, c-format
 msgid "%'drd link to %s"
 msgstr "%'d. linkki kohteeseen %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:409
+#: ../src/nautilus-file-operations.c:410
 #, c-format
 msgid "%'dth link to %s"
 msgstr "%'d. linkki kohteeseen %s"
@@ -1498,12 +1561,12 @@ msgstr "%'d. linkki kohteeseen %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:448
+#: ../src/nautilus-file-operations.c:449
 msgid " (copy)"
 msgstr " (kopio)"
 
 #. localizers: tag used to detect the second copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:450
+#: ../src/nautilus-file-operations.c:451
 msgid " (another copy)"
 msgstr " (toinen kopio)"
 
@@ -1511,36 +1574,34 @@ msgstr " (toinen kopio)"
 #. localizers: tag used to detect the x12th copy of a file
 #. localizers: tag used to detect the x13th copy of a file
 #. localizers: tag used to detect the xxth copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:453
-#: ../libnautilus-private/nautilus-file-operations.c:455
-#: ../libnautilus-private/nautilus-file-operations.c:457
-#: ../libnautilus-private/nautilus-file-operations.c:467
+#: ../src/nautilus-file-operations.c:454 ../src/nautilus-file-operations.c:456
+#: ../src/nautilus-file-operations.c:458 ../src/nautilus-file-operations.c:468
 msgid "th copy)"
 msgstr ". kopio)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:460
+#: ../src/nautilus-file-operations.c:461
 msgid "st copy)"
 msgstr ". kopio)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:462
+#: ../src/nautilus-file-operations.c:463
 msgid "nd copy)"
 msgstr ". kopio)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:464
+#: ../src/nautilus-file-operations.c:465
 msgid "rd copy)"
 msgstr ". kopio)"
 
 #. localizers: appended to first file copy
-#: ../libnautilus-private/nautilus-file-operations.c:481
+#: ../src/nautilus-file-operations.c:482
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopio)%s"
 
 #. localizers: appended to second file copy
-#: ../libnautilus-private/nautilus-file-operations.c:483
+#: ../src/nautilus-file-operations.c:484
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (toinen kopio) %s"
@@ -1549,10 +1610,8 @@ msgstr "%s (toinen kopio) %s"
 #. localizers: appended to x12th file copy
 #. localizers: appended to x13th file copy
 #. localizers: appended to xxth file copy
-#: ../libnautilus-private/nautilus-file-operations.c:486
-#: ../libnautilus-private/nautilus-file-operations.c:488
-#: ../libnautilus-private/nautilus-file-operations.c:490
-#: ../libnautilus-private/nautilus-file-operations.c:504
+#: ../src/nautilus-file-operations.c:487 ../src/nautilus-file-operations.c:489
+#: ../src/nautilus-file-operations.c:491 ../src/nautilus-file-operations.c:505
 #, c-format
 msgid "%s (%'dth copy)%s"
 msgstr "%s (%'d. kopio)%s"
@@ -1562,39 +1621,39 @@ msgstr "%s (%'d. kopio)%s"
 #. * strings look like "%s (copy %'d)%s".
 #.
 #. localizers: appended to x1st file copy
-#: ../libnautilus-private/nautilus-file-operations.c:498
+#: ../src/nautilus-file-operations.c:499
 #, c-format
 msgid "%s (%'dst copy)%s"
 msgstr "%s (%'d. kopio)%s"
 
 #. localizers: appended to x2nd file copy
-#: ../libnautilus-private/nautilus-file-operations.c:500
+#: ../src/nautilus-file-operations.c:501
 #, c-format
 msgid "%s (%'dnd copy)%s"
 msgstr "%s (%'d. kopio)%s"
 
 #. localizers: appended to x3rd file copy
-#: ../libnautilus-private/nautilus-file-operations.c:502
+#: ../src/nautilus-file-operations.c:503
 #, c-format
 msgid "%s (%'drd copy)%s"
 msgstr "%s (%'d. kopio)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: ../libnautilus-private/nautilus-file-operations.c:603
+#: ../src/nautilus-file-operations.c:604
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: ../libnautilus-private/nautilus-file-operations.c:611
+#: ../src/nautilus-file-operations.c:612
 #, c-format
 msgid " (%'d"
 msgstr " (%'d."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1359
+#: ../src/nautilus-file-operations.c:1385
 msgid "Are you sure you want to permanently delete “%B” from the trash?"
 msgstr "Haluatko varmasti poistaa kohteen ”%B” pysyvästi?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1362
+#: ../src/nautilus-file-operations.c:1388
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %'d selected item from the "
@@ -1607,30 +1666,29 @@ msgstr[0] ""
 msgstr[1] ""
 "Haluatko varmasti poistaa pysyvästi %'d valittua kohdetta roskakorista?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1372
-#: ../libnautilus-private/nautilus-file-operations.c:1438
+#: ../src/nautilus-file-operations.c:1398
+#: ../src/nautilus-file-operations.c:1464
 msgid "If you delete an item, it will be permanently lost."
 msgstr "Jos poistat kohteen, se häviää pysyvästi."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1392
+#: ../src/nautilus-file-operations.c:1418
 msgid "Empty all items from Trash?"
 msgstr "Tyhjennetäänkö roskakori?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1396
+#: ../src/nautilus-file-operations.c:1422
 msgid "All items in the Trash will be permanently deleted."
 msgstr "Kaikki roskakorin kohteet poistetaan pysyvästi."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1399
-#: ../libnautilus-private/nautilus-file-operations.c:2482
-#: ../src/nautilus-window.c:1208
+#: ../src/nautilus-file-operations.c:1425
+#: ../src/nautilus-file-operations.c:2502 ../src/nautilus-window.c:1359
 msgid "Empty _Trash"
 msgstr "Tyhjennä _roskakori"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1426
+#: ../src/nautilus-file-operations.c:1452
 msgid "Are you sure you want to permanently delete “%B”?"
 msgstr "Haluatko varmasti poistaa kohteen ”%B”?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1429
+#: ../src/nautilus-file-operations.c:1455
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
 msgid_plural ""
@@ -1638,22 +1696,22 @@ msgid_plural ""
 msgstr[0] "Haluatko varmasti poistaa %'d valitun kohteen?"
 msgstr[1] "Haluatko varmasti poistaa %'d valittua kohdetta?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1482
+#: ../src/nautilus-file-operations.c:1508
 msgid "Deleted “%B”"
 msgstr "Poistettu “%B”"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1484
+#: ../src/nautilus-file-operations.c:1510
 msgid "Deleting “%B”"
 msgstr "Poistetaan “%B”"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1492
+#: ../src/nautilus-file-operations.c:1518
 #, c-format
 msgid "Deleted %'d file"
 msgid_plural "Deleted %'d files"
 msgstr[0] "Poistettiin %'d tiedosto"
 msgstr[1] "Poistettiin %'d tiedostoa"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1496
+#: ../src/nautilus-file-operations.c:1522
 #, c-format
 msgid "Deleting %'d file"
 msgid_plural "Deleting %'d files"
@@ -1662,15 +1720,15 @@ msgstr[1] "Poistetaan %'d tiedostoa"
 
 #. To translators: %'d is the number of files completed for the operation,
 #. * so it will be something like 2/14.
-#: ../libnautilus-private/nautilus-file-operations.c:1518
-#: ../libnautilus-private/nautilus-file-operations.c:1524
-#: ../libnautilus-private/nautilus-file-operations.c:1556
-#: ../libnautilus-private/nautilus-file-operations.c:1914
-#: ../libnautilus-private/nautilus-file-operations.c:1920
-#: ../libnautilus-private/nautilus-file-operations.c:1952
-#: ../libnautilus-private/nautilus-file-operations.c:3306
-#: ../libnautilus-private/nautilus-file-operations.c:3312
-#: ../libnautilus-private/nautilus-file-operations.c:3353
+#: ../src/nautilus-file-operations.c:1544
+#: ../src/nautilus-file-operations.c:1550
+#: ../src/nautilus-file-operations.c:1583
+#: ../src/nautilus-file-operations.c:1941
+#: ../src/nautilus-file-operations.c:1947
+#: ../src/nautilus-file-operations.c:1979
+#: ../src/nautilus-file-operations.c:3327
+#: ../src/nautilus-file-operations.c:3333
+#: ../src/nautilus-file-operations.c:3374
 #, c-format
 msgid "%'d / %'d"
 msgstr "%'d / %'d"
@@ -1680,30 +1738,30 @@ msgstr "%'d / %'d"
 #. *
 #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument).
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:1539
-#: ../libnautilus-private/nautilus-file-operations.c:1935
+#: ../src/nautilus-file-operations.c:1565
+#: ../src/nautilus-file-operations.c:1962
 msgid "%'d / %'d — %T left"
 msgid_plural "%'d / %'d — %T left"
 msgstr[0] "%'d / %'d — %T jäljellä"
 msgstr[1] "%'d / %'d — %T jäljellä"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1542
-#: ../libnautilus-private/nautilus-file-operations.c:1938
+#: ../src/nautilus-file-operations.c:1569
+#: ../src/nautilus-file-operations.c:1965
 #, c-format
 msgid "(%d file/sec)"
 msgid_plural "(%d files/sec)"
 msgstr[0] "(%d tiedosto/s)"
 msgstr[1] "(%d tiedostoa/s)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1624
-#: ../libnautilus-private/nautilus-file-operations.c:1658
-#: ../libnautilus-private/nautilus-file-operations.c:1697
-#: ../libnautilus-private/nautilus-file-operations.c:1773
-#: ../libnautilus-private/nautilus-file-operations.c:2742
+#: ../src/nautilus-file-operations.c:1651
+#: ../src/nautilus-file-operations.c:1685
+#: ../src/nautilus-file-operations.c:1724
+#: ../src/nautilus-file-operations.c:1800
+#: ../src/nautilus-file-operations.c:2763
 msgid "Error while deleting."
 msgstr "Virhe poistaessa."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1628
+#: ../src/nautilus-file-operations.c:1655
 msgid ""
 "Files in the folder “%B” cannot be deleted because you do not have "
 "permissions to see them."
@@ -1711,55 +1769,55 @@ msgstr ""
 "Tiedostoja kansiossa ”%B” ei voi poistaa, koska sinulla ei ole oikeutta "
 "niiden käyttöön."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1631
-#: ../libnautilus-private/nautilus-file-operations.c:2801
-#: ../libnautilus-private/nautilus-file-operations.c:3993
+#: ../src/nautilus-file-operations.c:1658
+#: ../src/nautilus-file-operations.c:2822
+#: ../src/nautilus-file-operations.c:4014
 msgid ""
 "There was an error getting information about the files in the folder “%B”."
 msgstr "Virhe haettaessa tietoja tiedostoista kansiossa ”%B”."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1640
-#: ../libnautilus-private/nautilus-file-operations.c:4002
+#: ../src/nautilus-file-operations.c:1667
+#: ../src/nautilus-file-operations.c:4023
 msgid "_Skip files"
 msgstr "_Ohita tiedostot"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1661
+#: ../src/nautilus-file-operations.c:1688
 msgid ""
 "The folder “%B” cannot be deleted because you do not have permissions to "
 "read it."
 msgstr ""
 "Kansiota ”%B” ei voi poistaa, koska sinulla ei ole oikeutta sen lukemiseen."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1664
-#: ../libnautilus-private/nautilus-file-operations.c:2840
-#: ../libnautilus-private/nautilus-file-operations.c:4038
+#: ../src/nautilus-file-operations.c:1691
+#: ../src/nautilus-file-operations.c:2861
+#: ../src/nautilus-file-operations.c:4059
 msgid "There was an error reading the folder “%B”."
 msgstr "Virhe luettaessa kansiota ”%B”."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1698
+#: ../src/nautilus-file-operations.c:1725
 msgid "Could not remove the folder %B."
 msgstr "Kansion %B poistaminen epäonnistui."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1774
+#: ../src/nautilus-file-operations.c:1801
 msgid "There was an error deleting %B."
 msgstr "Tiedoston %B poistaminen epäonnistui."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1877
+#: ../src/nautilus-file-operations.c:1904
 msgid "Trashing “%B”"
 msgstr "Viedään roskakoriin “%B”"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1879
+#: ../src/nautilus-file-operations.c:1906
 msgid "Trashed “%B”"
 msgstr "Vietiin roskakoriin “%B”"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1887
+#: ../src/nautilus-file-operations.c:1914
 #, c-format
 msgid "Trashing %'d file"
 msgid_plural "Trashing %'d files"
 msgstr[0] "Viedään roskakoriin %'d tiedosto"
 msgstr[1] "Viedään roskakoriin %'d tiedostoa"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1891
+#: ../src/nautilus-file-operations.c:1918
 #, c-format
 msgid "Trashed %'d file"
 msgid_plural "Trashed %'d files"
@@ -1767,35 +1825,35 @@ msgstr[0] "Vietiin roskakoriin %'d tiedosto"
 msgstr[1] "Vietiin roskakoriin %'d tiedostoa"
 
 #. Translators: %B is a file name
-#: ../libnautilus-private/nautilus-file-operations.c:2014
+#: ../src/nautilus-file-operations.c:2041
 msgid "“%B” can't be put in the trash. Do you want to delete it immediately?"
 msgstr "Kohdetta \"%B\" ei voi siirtää roskakoriin. Haluatko poistaa sen heti?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2020
+#: ../src/nautilus-file-operations.c:2047
 msgid "This remote location does not support sending items to the trash."
 msgstr "Tämä etäsijainti ei tue kohteiden siirtoa roskakoriin."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2229
+#: ../src/nautilus-file-operations.c:2250
 msgid "Trashing Files"
 msgstr "Siirretään tiedostoja roskakoriin"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2231
+#: ../src/nautilus-file-operations.c:2252
 msgid "Deleting Files"
 msgstr "Poistetaan tiedostoja"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2313
+#: ../src/nautilus-file-operations.c:2333
 msgid "Unable to eject %V"
 msgstr "Asemaa %V ei voi avata"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2315
+#: ../src/nautilus-file-operations.c:2335
 msgid "Unable to unmount %V"
 msgstr "Osiota %V ei voi irrottaa"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2472
+#: ../src/nautilus-file-operations.c:2492
 msgid "Do you want to empty the trash before you unmount?"
 msgstr "Haluatko tyhjentää roskakorin ennen irrottamista?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2474
+#: ../src/nautilus-file-operations.c:2494
 msgid ""
 "In order to regain the free space on this volume the trash must be emptied. "
 "All trashed items on the volume will be permanently lost."
@@ -1803,63 +1861,62 @@ msgstr ""
 "Jotta vapaa tila laitteella oikeasti vapautuisi, täytyy sen roskakori "
 "tyhjentää. Kaikki aseman roskakorissa olevat tiedostot hukataan pysyvästi."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2480
+#: ../src/nautilus-file-operations.c:2500
 msgid "Do _not Empty Trash"
 msgstr "Älä tyhje_nnä roskakoria"
 
 #. Translators: %s is a file name formatted for display
-#: ../libnautilus-private/nautilus-file-operations.c:2613
-#: ../src/nautilus-files-view.c:5688
+#: ../src/nautilus-file-operations.c:2634 ../src/nautilus-files-view.c:5748
 #, c-format
 msgid "Unable to access “%s”"
 msgstr "Kohteen \"%s\" käsittely ei onnistu"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2689
+#: ../src/nautilus-file-operations.c:2710
 #, c-format
 msgid "Preparing to copy %'d file (%S)"
 msgid_plural "Preparing to copy %'d files (%S)"
 msgstr[0] "Valmistellaan %'d tiedoston kopiointia (%S)"
 msgstr[1] "Valmistellaan %'d tiedoston kopiointia (%S)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2695
+#: ../src/nautilus-file-operations.c:2716
 #, c-format
 msgid "Preparing to move %'d file (%S)"
 msgid_plural "Preparing to move %'d files (%S)"
 msgstr[0] "Valmistellaan %'d tiedoston kopiointia (%S)"
 msgstr[1] "Valmistellaan %'d tiedoston kopiointia (%S)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2701
+#: ../src/nautilus-file-operations.c:2722
 #, c-format
 msgid "Preparing to delete %'d file (%S)"
 msgid_plural "Preparing to delete %'d files (%S)"
 msgstr[0] "Valmistellaan %'d tiedoston poistamista (%S)"
 msgstr[1] "Valmistellaan %'d tiedoston poistamista (%S)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2707
+#: ../src/nautilus-file-operations.c:2728
 #, c-format
 msgid "Preparing to trash %'d file"
 msgid_plural "Preparing to trash %'d files"
 msgstr[0] "Valmistellaan %'d tiedoston siirtämistä roskakoriin"
 msgstr[1] "Valmistellaan %'d tiedoston siirtämistä roskakoriin"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2738
-#: ../libnautilus-private/nautilus-file-operations.c:3853
-#: ../libnautilus-private/nautilus-file-operations.c:3985
-#: ../libnautilus-private/nautilus-file-operations.c:4030
+#: ../src/nautilus-file-operations.c:2759
+#: ../src/nautilus-file-operations.c:3874
+#: ../src/nautilus-file-operations.c:4006
+#: ../src/nautilus-file-operations.c:4051
 msgid "Error while copying."
 msgstr "Kopiointi epäonnistui."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2740
-#: ../libnautilus-private/nautilus-file-operations.c:3983
-#: ../libnautilus-private/nautilus-file-operations.c:4028
+#: ../src/nautilus-file-operations.c:2761
+#: ../src/nautilus-file-operations.c:4004
+#: ../src/nautilus-file-operations.c:4049
 msgid "Error while moving."
 msgstr "Siirto epäonnistui."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2744
+#: ../src/nautilus-file-operations.c:2765
 msgid "Error while moving files to trash."
 msgstr "Siirto roskakoriin epäonnistui."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2798
+#: ../src/nautilus-file-operations.c:2819
 msgid ""
 "Files in the folder “%B” cannot be handled because you do not have "
 "permissions to see them."
@@ -1867,44 +1924,44 @@ msgstr ""
 "Tiedostoja kansiossa ”%B” ei voi käsitellä, koska sinulla ei ole oikeutta "
 "nähdä niitä."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2837
+#: ../src/nautilus-file-operations.c:2858
 msgid ""
 "The folder “%B” cannot be handled because you do not have permissions to "
 "read it."
 msgstr ""
 "Kansiota ”%B” ei voi käsitellä, koska sinulla ei ole oikeutta lukea sitä."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2914
+#: ../src/nautilus-file-operations.c:2935
 msgid ""
 "The file “%B” cannot be handled because you do not have permissions to read "
 "it."
 msgstr ""
 "Tiedostoa ”%B” ei voi käsitellä, koska sinulla ei ole oikeutta lukea sitä."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2917
+#: ../src/nautilus-file-operations.c:2938
 msgid "There was an error getting information about “%B”."
 msgstr "Virhe haettaessa tietoja kohteesta ”%B”."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3019
-#: ../libnautilus-private/nautilus-file-operations.c:3067
-#: ../libnautilus-private/nautilus-file-operations.c:3106
-#: ../libnautilus-private/nautilus-file-operations.c:3136
+#: ../src/nautilus-file-operations.c:3040
+#: ../src/nautilus-file-operations.c:3088
+#: ../src/nautilus-file-operations.c:3127
+#: ../src/nautilus-file-operations.c:3157
 msgid "Error while copying to “%B”."
 msgstr "Virhe kohteeseen ”%B” kopioitaessa."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3023
+#: ../src/nautilus-file-operations.c:3044
 msgid "You do not have permissions to access the destination folder."
 msgstr "Sinulla ei ole oikeuksia avata kohdekansiota."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3025
+#: ../src/nautilus-file-operations.c:3046
 msgid "There was an error getting information about the destination."
 msgstr "Virhe haettaessa tietoja kohteesta."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3068
+#: ../src/nautilus-file-operations.c:3089
 msgid "The destination is not a folder."
 msgstr "Kohde ei ole kansio."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3107
+#: ../src/nautilus-file-operations.c:3128
 msgid ""
 "There is not enough space on the destination. Try to remove files to make "
 "space."
@@ -1912,70 +1969,70 @@ msgstr ""
 "Kohteessa ei ole tarpeeksi levytilaa jäljellä. Yritä tehdä tilaa poistamalla "
 "tiedostoja."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3109
+#: ../src/nautilus-file-operations.c:3130
 #, c-format
 msgid "%S more space is required to copy to the destination."
 msgstr "Kohteeseen kopioimiseksi vaaditaan %S lisätilaa."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3137
+#: ../src/nautilus-file-operations.c:3158
 msgid "The destination is read-only."
 msgstr "Kohdetta voi vain lukea."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3202
+#: ../src/nautilus-file-operations.c:3223
 msgid "Moving “%B” to “%B”"
 msgstr "Siirretään ”%B” kohteeseen ”%B”."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3204
+#: ../src/nautilus-file-operations.c:3225
 msgid "Moved “%B” to “%B”"
 msgstr "Siirrettiin ”%B” kohteeseen ”%B”."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3208
+#: ../src/nautilus-file-operations.c:3229
 msgid "Copying “%B” to “%B”"
 msgstr "Kopioidaan ”%B” kohteeseen ”%B”."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3210
+#: ../src/nautilus-file-operations.c:3231
 msgid "Copied “%B” to “%B”"
 msgstr "Kopioitiin ”%B” kohteeseen ”%B”."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3221
+#: ../src/nautilus-file-operations.c:3242
 msgid "Duplicating “%B”"
 msgstr "Kahdennetaan ”%B”"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3223
+#: ../src/nautilus-file-operations.c:3244
 msgid "Duplicated “%B”"
 msgstr "Kahdennettiin ”%B”"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3233
+#: ../src/nautilus-file-operations.c:3254
 msgid "Moving %'d file to “%B”"
 msgid_plural "Moving %'d files to “%B”"
 msgstr[0] "Siirretään %'d tiedosto kohteeseen “%B”"
 msgstr[1] "Siirretään %'d tiedostoa kohteeseen “%B”"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3237
+#: ../src/nautilus-file-operations.c:3258
 msgid "Copying %'d file to “%B”"
 msgid_plural "Copying %'d files to “%B”"
 msgstr[0] "Kopioidaan %'d tiedosto kohteeseen “%B”"
 msgstr[1] "Kopioidaan %'d tiedostoa kohteeseen “%B”"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3247
+#: ../src/nautilus-file-operations.c:3268
 msgid "Moved %'d file to “%B”"
 msgid_plural "Moved %'d files to “%B”"
 msgstr[0] "Siirrettiin %'d tiedosto kohteeseen “%B”"
 msgstr[1] "Siirrettiin %'d tiedostoa kohteeseen “%B”"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3251
+#: ../src/nautilus-file-operations.c:3272
 msgid "Copied %'d file to “%B”"
 msgid_plural "Copied %'d files to “%B”"
 msgstr[0] "Kopioitiin %'d tiedosto kohteeseen “%B”"
 msgstr[1] "Kopioitiin %'d tiedostoa kohteeseen “%B”"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3265
+#: ../src/nautilus-file-operations.c:3286
 msgid "Duplicating %'d file in “%B”"
 msgid_plural "Duplicating %'d files in “%B”"
 msgstr[0] "Kahdennetaan %'d tiedosto sijainnissa “%B”"
 msgstr[1] "Kahdennetaan %'d tiedostoa sijainnissa “%B”"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3273
+#: ../src/nautilus-file-operations.c:3294
 msgid "Duplicated %'d file in “%B”"
 msgid_plural "Duplicated %'d files in “%B”"
 msgstr[0] "Kahdennettiin %'d tiedosto sijainnissa “%B”"
@@ -1983,8 +2040,8 @@ msgstr[1] "Kahdennettiin %'d tiedostoa sijainnissa “%B”"
 
 #. To translators: %S will expand to a size like "2 bytes" or "3 MB", so something like "4 kb / 4 MB"
 #. To translators: %S will expand to a size like "2 bytes" or "3 MB".
-#: ../libnautilus-private/nautilus-file-operations.c:3301
-#: ../libnautilus-private/nautilus-file-operations.c:3333
+#: ../src/nautilus-file-operations.c:3322
+#: ../src/nautilus-file-operations.c:3354
 #, c-format
 msgid "%S / %S"
 msgstr "%S / %S"
@@ -1994,7 +2051,7 @@ msgstr "%S / %S"
 #. *
 #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument).
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:3325
+#: ../src/nautilus-file-operations.c:3346
 msgid "%S / %S — %T left (%S/sec)"
 msgid_plural "%S / %S — %T left (%S/sec)"
 msgstr[0] "%S / %S — %T jäljellä (%S/s)"
@@ -2005,13 +2062,13 @@ msgstr[1] "%S / %S - %T jäljellä (%S/s)"
 #. *
 #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument).
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:3344
+#: ../src/nautilus-file-operations.c:3365
 msgid "%'d / %'d — %T left (%S/sec)"
 msgid_plural "%'d / %'d — %T left (%S/sec)"
 msgstr[0] "%'d / %'d — %T jäljellä (%S/s)"
 msgstr[1] "%'d / %'d — %T jäljellä (%S/s)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3857
+#: ../src/nautilus-file-operations.c:3878
 msgid ""
 "The folder “%B” cannot be copied because you do not have permissions to "
 "create it in the destination."
@@ -2019,11 +2076,11 @@ msgstr ""
 "Kansiota ”%B” ei voida kopioida, koska sinulla ei ole oikeutta luoda sitä "
 "kohteeseen."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3860
+#: ../src/nautilus-file-operations.c:3881
 msgid "There was an error creating the folder “%B”."
 msgstr "Virhe luotaessa kansiota ”%B”."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3990
+#: ../src/nautilus-file-operations.c:4011
 msgid ""
 "Files in the folder “%B” cannot be copied because you do not have "
 "permissions to see them."
@@ -2031,631 +2088,677 @@ msgstr ""
 "Tiedostoja kansiossa ”%B” ei voi kopioida, koska sinulla ei ole oikeutta "
 "nähdä niitä."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4035
+#: ../src/nautilus-file-operations.c:4056
 msgid ""
 "The folder “%B” cannot be copied because you do not have permissions to read "
 "it."
 msgstr ""
 "Kansiota ”%B” ei voi kopioida, koska sinulla ei ole oikeutta sen lukemiseen."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4080
-#: ../libnautilus-private/nautilus-file-operations.c:4782
-#: ../libnautilus-private/nautilus-file-operations.c:5402
+#: ../src/nautilus-file-operations.c:4101
+#: ../src/nautilus-file-operations.c:4830
+#: ../src/nautilus-file-operations.c:5444
 msgid "Error while moving “%B”."
 msgstr "Virhe siirrettäessä kohdetta ”%B”."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4081
+#: ../src/nautilus-file-operations.c:4102
 msgid "Could not remove the source folder."
 msgstr "Lähdekansion poistaminen epäonnistui."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4165
-#: ../libnautilus-private/nautilus-file-operations.c:4206
-#: ../libnautilus-private/nautilus-file-operations.c:4784
-#: ../libnautilus-private/nautilus-file-operations.c:4855
+#: ../src/nautilus-file-operations.c:4186
+#: ../src/nautilus-file-operations.c:4227
+#: ../src/nautilus-file-operations.c:4832
+#: ../src/nautilus-file-operations.c:4903
 msgid "Error while copying “%B”."
 msgstr "Virhe kopioitaessa kohdetta ”%B”."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4166
+#: ../src/nautilus-file-operations.c:4187
 #, c-format
 msgid "Could not remove files from the already existing folder %F."
 msgstr "Tiedostoja ei voitu poistaa jo olemassa olevasta kansiosta %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4207
+#: ../src/nautilus-file-operations.c:4228
 #, c-format
 msgid "Could not remove the already existing file %F."
 msgstr "Ei voitu poistaa jo olemassa olevaa tiedostoa %F."
 
 #. the run_warning() frees all strings passed in automatically
-#: ../libnautilus-private/nautilus-file-operations.c:4527
-#: ../libnautilus-private/nautilus-file-operations.c:5245
+#: ../src/nautilus-file-operations.c:4575
+#: ../src/nautilus-file-operations.c:5287
 msgid "You cannot move a folder into itself."
 msgstr "Et voi siirtää kansiota itseensä."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4528
-#: ../libnautilus-private/nautilus-file-operations.c:5246
+#: ../src/nautilus-file-operations.c:4576
+#: ../src/nautilus-file-operations.c:5288
 msgid "You cannot copy a folder into itself."
 msgstr "Et voi kopioida kansiota itseensä."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4529
-#: ../libnautilus-private/nautilus-file-operations.c:5247
+#: ../src/nautilus-file-operations.c:4577
+#: ../src/nautilus-file-operations.c:5289
 msgid "The destination folder is inside the source folder."
 msgstr "Kohdekansio on lähdekansion sisällä."
 
 #. the run_warning() frees all strings passed in automatically
-#: ../libnautilus-private/nautilus-file-operations.c:4559
+#: ../src/nautilus-file-operations.c:4607
 msgid "You cannot move a file over itself."
 msgstr "Et voi siirtää tiedostoa itseensä."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4560
+#: ../src/nautilus-file-operations.c:4608
 msgid "You cannot copy a file over itself."
 msgstr "Et voi kopioida tiedostoa itseensä."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4561
+#: ../src/nautilus-file-operations.c:4609
 msgid "The source file would be overwritten by the destination."
 msgstr "Kohde kirjoittaisi lähdetiedoston päälle."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4786
+#: ../src/nautilus-file-operations.c:4834
 #, c-format
 msgid "Could not remove the already existing file with the same name in %F."
 msgstr ""
 "kohteessa %F jo olemassa olevan samannimisen tiedoston poistaminen "
 "epäonnistui."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4856
+#: ../src/nautilus-file-operations.c:4904
 #, c-format
 msgid "There was an error copying the file into %F."
 msgstr "Virhe kopioitaessa tiedostoja kohteeseen %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5090
-#: ../libnautilus-private/nautilus-file-operations.c:5127
+#: ../src/nautilus-file-operations.c:5133
+#: ../src/nautilus-file-operations.c:5170
 msgid "Copying Files"
 msgstr "Kopioidaan tiedostoja"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5155
+#: ../src/nautilus-file-operations.c:5197
 msgid "Preparing to move to “%B”"
 msgstr "Valmistellaan siirtoa kohteeseen ”%B”"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5159
+#: ../src/nautilus-file-operations.c:5201
 #, c-format
 msgid "Preparing to move %'d file"
 msgid_plural "Preparing to move %'d files"
 msgstr[0] "Valmistellaan %'d tiedoston siirtoa"
 msgstr[1] "Valmistellaan %'d tiedoston siirtoa"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5403
+#: ../src/nautilus-file-operations.c:5445
 #, c-format
 msgid "There was an error moving the file into %F."
 msgstr "Tapahtui virhe siirrettäessä tiedostoa kohteeseen %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5668
+#: ../src/nautilus-file-operations.c:5705
 msgid "Moving Files"
 msgstr "Siirretään tiedostoja"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5703
+#: ../src/nautilus-file-operations.c:5739
 msgid "Creating links in “%B”"
 msgstr "Luodaan linkkejä kohteeseen ”%B”"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5707
+#: ../src/nautilus-file-operations.c:5743
 #, c-format
 msgid "Making link to %'d file"
 msgid_plural "Making links to %'d files"
 msgstr[0] "Luodaan linkki %'d tiedostoon"
 msgstr[1] "Luodaan linkki %'d tiedostoon"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5842
+#: ../src/nautilus-file-operations.c:5878
 msgid "Error while creating link to %B."
 msgstr "Virhe luotaessa linkkiä kohteeseen %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5844
+#: ../src/nautilus-file-operations.c:5880
 msgid "Symbolic links only supported for local files"
 msgstr "Paikallisia linkkejä voi käyttää vain paikallisten tiedostojen kanssa."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5847
+#: ../src/nautilus-file-operations.c:5883
 msgid "The target doesn't support symbolic links."
 msgstr "Kohde ei tue symbolisia linkkejä."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5850
+#: ../src/nautilus-file-operations.c:5886
 #, c-format
 msgid "There was an error creating the symlink in %F."
 msgstr "Virhe luotaessa symbolista linkkiä kohteeseen %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:6181
+#: ../src/nautilus-file-operations.c:6212
 msgid "Setting permissions"
 msgstr "Asetetaan oikeuksia"
 
 #. localizers: the initial name of a new folder
-#: ../libnautilus-private/nautilus-file-operations.c:6446
+#: ../src/nautilus-file-operations.c:6471
 msgid "Untitled Folder"
 msgstr "Nimetön kansio"
 
-#. localizers: the initial name of a new template document
-#: ../libnautilus-private/nautilus-file-operations.c:6452
-#, c-format
-msgid "Untitled %s"
-msgstr "Nimetön %s"
-
 #. localizers: the initial name of a new empty document
-#: ../libnautilus-private/nautilus-file-operations.c:6458
+#: ../src/nautilus-file-operations.c:6483
 msgid "Untitled Document"
 msgstr "Nimetön asiakirja"
 
-#: ../libnautilus-private/nautilus-file-operations.c:6674
+#: ../src/nautilus-file-operations.c:6699
 msgid "Error while creating directory %B."
 msgstr "Virhe luotaessa kansiota %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:6676
+#: ../src/nautilus-file-operations.c:6701
 msgid "Error while creating file %B."
 msgstr "Virhe luotaessa tiedostoa %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:6678
+#: ../src/nautilus-file-operations.c:6703
 #, c-format
 msgid "There was an error creating the directory in %F."
 msgstr "Virhe luotaessa kansiota kohteeseen %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:6949
+#: ../src/nautilus-file-operations.c:6963
 msgid "Emptying Trash"
 msgstr "Tyhjennetään roskakoria"
 
-#: ../libnautilus-private/nautilus-file-operations.c:6997
-#: ../libnautilus-private/nautilus-file-operations.c:7038
-#: ../libnautilus-private/nautilus-file-operations.c:7073
-#: ../libnautilus-private/nautilus-file-operations.c:7108
+#: ../src/nautilus-file-operations.c:7011
+#: ../src/nautilus-file-operations.c:7052
+#: ../src/nautilus-file-operations.c:7087
+#: ../src/nautilus-file-operations.c:7122
 msgid "Unable to mark launcher trusted (executable)"
 msgstr "Suoritettavaa käynnistintä ei voi merkitä luotetuksi"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:133
-#: ../src/nautilus-window.c:461 ../src/resources/gtk/help-overlay.ui.h:52
+#: ../src/nautilus-file-undo-operations.c:141 ../src/nautilus-window.c:463
 #: ../src/resources/ui/nautilus-window.ui.h:2
 msgid "Undo"
 msgstr "Kumoa"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:136
+#: ../src/nautilus-file-undo-operations.c:144
 msgid "Undo last action"
 msgstr "Kumoa viimeisin toiminto"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:140
-#: ../src/nautilus-window.c:462 ../src/resources/gtk/help-overlay.ui.h:53
+#: ../src/nautilus-file-undo-operations.c:148 ../src/nautilus-window.c:464
 msgid "Redo"
 msgstr "Tee uudelleen"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:143
+#: ../src/nautilus-file-undo-operations.c:151
 msgid "Redo last undone action"
 msgstr "Tee uudelleen viimeisin kumottu toiminto"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:365
+#: ../src/nautilus-file-undo-operations.c:374
 #, c-format
 msgid "Move %d item back to '%s'"
 msgid_plural "Move %d items back to '%s'"
 msgstr[0] "Siirrä %d kohde takaisin sijaintiin '%s'"
 msgstr[1] "Siirrä %d kohdetta takaisin sijaintiin '%s'"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:368
+#: ../src/nautilus-file-undo-operations.c:377
 #, c-format
 msgid "Move %d item to '%s'"
 msgid_plural "Move %d items to '%s'"
 msgstr[0] "Siirrä %d kohde sijaintiin '%s'"
 msgstr[1] "Siirrä %d kohdetta sijaintiin '%s'"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:372
+#: ../src/nautilus-file-undo-operations.c:381
 #, c-format
 msgid "_Undo Move %d item"
 msgid_plural "_Undo Move %d items"
 msgstr[0] "_Kumoa %d kohteen siirto"
 msgstr[1] "_Kumoa %d kohteen siirto"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:375
+#: ../src/nautilus-file-undo-operations.c:384
 #, c-format
 msgid "_Redo Move %d item"
 msgid_plural "_Redo Move %d items"
 msgstr[0] "_Tee uudelleen %d kohteen siirto"
 msgstr[1] "_Tee uudelleen %d kohteen siirto"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:379
+#: ../src/nautilus-file-undo-operations.c:388
 #, c-format
 msgid "Move '%s' back to '%s'"
 msgstr "Siirrä \"%s\" takaisin sijaintiin \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:380
+#: ../src/nautilus-file-undo-operations.c:389
 #, c-format
 msgid "Move '%s' to '%s'"
 msgstr "Siirrä \"%s\" sijaintiin \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:382
+#: ../src/nautilus-file-undo-operations.c:391
 msgid "_Undo Move"
 msgstr "_Kumoa siirto"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:383
+#: ../src/nautilus-file-undo-operations.c:392
 msgid "_Redo Move"
 msgstr "_Tee uudelleen siirto"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:386
+#: ../src/nautilus-file-undo-operations.c:395
 msgid "_Undo Restore from Trash"
 msgstr "_Kumoa roskakorista palautus"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:387
+#: ../src/nautilus-file-undo-operations.c:396
 msgid "_Redo Restore from Trash"
 msgstr "_Tee uudelleen roskakorista palautus"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:390
+#: ../src/nautilus-file-undo-operations.c:399
 #, c-format
 msgid "Move %d item back to trash"
 msgid_plural "Move %d items back to trash"
 msgstr[0] "Siirrä %d kohde takaisin roskakoriin"
 msgstr[1] "Siirrä %d kohdetta takaisin roskakoriin"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:393
-#: ../libnautilus-private/nautilus-file-undo-operations.c:989
+#: ../src/nautilus-file-undo-operations.c:402
+#: ../src/nautilus-file-undo-operations.c:998
 #, c-format
 msgid "Restore %d item from trash"
 msgid_plural "Restore %d items from trash"
 msgstr[0] "Palauta %d kohde roskakorista"
 msgstr[1] "Palauta %d kohdetta roskakorista"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:397
+#: ../src/nautilus-file-undo-operations.c:406
 #, c-format
 msgid "Move '%s' back to trash"
 msgstr "Siirrä \"%s\" takaisin roskakoriin"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:398
+#: ../src/nautilus-file-undo-operations.c:407
 #, c-format
 msgid "Restore '%s' from trash"
 msgstr "Palauta \"%s\" roskakorista"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:402
+#: ../src/nautilus-file-undo-operations.c:411
 #, c-format
 msgid "Delete %d copied item"
 msgid_plural "Delete %d copied items"
 msgstr[0] "Poista %d kopioitu kohde"
 msgstr[1] "Poista %d kopioitua kohdetta"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:405
+#: ../src/nautilus-file-undo-operations.c:414
 #, c-format
 msgid "Copy %d item to '%s'"
 msgid_plural "Copy %d items to '%s'"
 msgstr[0] "Kopioi %d kohde sijaintiin ”%s”"
 msgstr[1] "Kopioi %d kohdetta sijaintiin ”%s”"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:409
+#: ../src/nautilus-file-undo-operations.c:418
 #, c-format
 msgid "_Undo Copy %d item"
 msgid_plural "_Undo Copy %d items"
 msgstr[0] "_Kumoa %d kohteen kopiointi"
 msgstr[1] "_Kumoa %d kohteen kopiointi"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:412
+#: ../src/nautilus-file-undo-operations.c:421
 #, c-format
 msgid "_Redo Copy %d item"
 msgid_plural "_Redo Copy %d items"
 msgstr[0] "_Tee uudelleen %d kohteen kopiointi"
 msgstr[1] "_Tee uudelleen %d kohteen kopiointi"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:416
-#: ../libnautilus-private/nautilus-file-undo-operations.c:438
-#: ../libnautilus-private/nautilus-file-undo-operations.c:671
+#: ../src/nautilus-file-undo-operations.c:425
+#: ../src/nautilus-file-undo-operations.c:447
+#: ../src/nautilus-file-undo-operations.c:680
 #, c-format
 msgid "Delete '%s'"
 msgstr "Poista \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:417
+#: ../src/nautilus-file-undo-operations.c:426
 #, c-format
 msgid "Copy '%s' to '%s'"
 msgstr "Kopioi \"%s\" sijaintiin \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:419
+#: ../src/nautilus-file-undo-operations.c:428
 msgid "_Undo Copy"
 msgstr "_Kumoa kopiointi"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:420
+#: ../src/nautilus-file-undo-operations.c:429
 msgid "_Redo Copy"
 msgstr "_Tee uudelleen kopiointi"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:424
+#: ../src/nautilus-file-undo-operations.c:433
 #, c-format
 msgid "Delete %d duplicated item"
 msgid_plural "Delete %d duplicated items"
 msgstr[0] "Poista %d kahdennettu kohde"
 msgstr[1] "Poista %d kahdennettua kohdetta"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:427
+#: ../src/nautilus-file-undo-operations.c:436
 #, c-format
 msgid "Duplicate %d item in '%s'"
 msgid_plural "Duplicate %d items in '%s'"
 msgstr[0] "Kahdennea %d kohde sijainnissa \"%s\""
 msgstr[1] "Kahdenna %d kohdetta sijainnissa \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:431
+#: ../src/nautilus-file-undo-operations.c:440
 #, c-format
 msgid "_Undo Duplicate %d item"
 msgid_plural "_Undo Duplicate %d items"
 msgstr[0] "_Kumoa %d kohteen kahdennus"
 msgstr[1] "_Kumoa %d kohteen kahdennus"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:434
+#: ../src/nautilus-file-undo-operations.c:443
 #, c-format
 msgid "_Redo Duplicate %d item"
 msgid_plural "_Redo Duplicate %d items"
 msgstr[0] "_Tee uudelleen%d kohteen kahdennus"
 msgstr[1] "_Tee uudelleen%d kohteen kahdennus"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:439
+#: ../src/nautilus-file-undo-operations.c:448
 #, c-format
 msgid "Duplicate '%s' in '%s'"
 msgstr "Kahdenna \"%s\" kohteessa \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:442
+#: ../src/nautilus-file-undo-operations.c:451
 msgid "_Undo Duplicate"
 msgstr "_Kumoa kahdennus"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:443
+#: ../src/nautilus-file-undo-operations.c:452
 msgid "_Redo Duplicate"
 msgstr "_Tee uudelleen kahdennus"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:447
+#: ../src/nautilus-file-undo-operations.c:456
 #, c-format
 msgid "Delete links to %d item"
 msgid_plural "Delete links to %d items"
 msgstr[0] "Poista linkit %d kohteeseen"
 msgstr[1] "Poista linkit %d kohteeseen"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:450
+#: ../src/nautilus-file-undo-operations.c:459
 #, c-format
 msgid "Create links to %d item"
 msgid_plural "Create links to %d items"
 msgstr[0] "Luo linkit %d kohteeseen"
 msgstr[1] "Luo linkit %d kohteeseen"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:454
+#: ../src/nautilus-file-undo-operations.c:463
 #, c-format
 msgid "Delete link to '%s'"
 msgstr "Poista linkki kohteeseen \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:455
+#: ../src/nautilus-file-undo-operations.c:464
 #, c-format
 msgid "Create link to '%s'"
 msgstr "Luo linkki kohteeseen \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:457
+#: ../src/nautilus-file-undo-operations.c:466
 msgid "_Undo Create Link"
 msgstr "_Kumoa linkin luonti"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:458
+#: ../src/nautilus-file-undo-operations.c:467
 msgid "_Redo Create Link"
 msgstr "_Tee uudelleen linkin luonti"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:674
+#: ../src/nautilus-file-undo-operations.c:683
 #, c-format
 msgid "Create an empty file '%s'"
 msgstr "Luo tyhjä tiedosto \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:676
+#: ../src/nautilus-file-undo-operations.c:685
 msgid "_Undo Create Empty File"
 msgstr "_Kumoa tyhjän tiedoston luonti"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:677
+#: ../src/nautilus-file-undo-operations.c:686
 msgid "_Redo Create Empty File"
 msgstr "_Tee uudelleen tyhjän tiedoston luonti"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:679
+#: ../src/nautilus-file-undo-operations.c:688
 #, c-format
 msgid "Create a new folder '%s'"
 msgstr "Luo uusi kansio \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:681
+#: ../src/nautilus-file-undo-operations.c:690
 msgid "_Undo Create Folder"
 msgstr "_Kumoa uuden kansion luonti"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:682
+#: ../src/nautilus-file-undo-operations.c:691
 msgid "_Redo Create Folder"
 msgstr "_Tee uudelleen uuden kansion luonti"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:684
+#: ../src/nautilus-file-undo-operations.c:693
 #, c-format
 msgid "Create new file '%s' from template "
 msgstr "Luo uusi tiedosto ”%s” asiakirjamallista "
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:686
+#: ../src/nautilus-file-undo-operations.c:695
 msgid "_Undo Create from Template"
 msgstr "_Kumoa mallista luonti"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:687
+#: ../src/nautilus-file-undo-operations.c:696
 msgid "_Redo Create from Template"
 msgstr "_Tee uudelleen mallista luonti"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:872
-#: ../libnautilus-private/nautilus-file-undo-operations.c:873
+#: ../src/nautilus-file-undo-operations.c:881
+#: ../src/nautilus-file-undo-operations.c:882
 #, c-format
 msgid "Rename '%s' as '%s'"
 msgstr "Nimeä \"%s\" muotoon \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:875
+#: ../src/nautilus-file-undo-operations.c:884
 msgid "_Undo Rename"
 msgstr "_Kumoa nimenmuutos"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:876
+#: ../src/nautilus-file-undo-operations.c:885
 msgid "_Redo Rename"
 msgstr "_Tee uudelleen nimenmuutos"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:992
+#: ../src/nautilus-file-undo-operations.c:1001
 #, c-format
 msgid "Move %d item to trash"
 msgid_plural "Move %d items to trash"
 msgstr[0] "Siirrä %d kohde roskakoriin"
 msgstr[1] "Siirrä %d kohdetta roskakoriin"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1004
+#: ../src/nautilus-file-undo-operations.c:1013
 #, c-format
 msgid "Restore '%s' to '%s'"
 msgstr "Palauta \"%s\" sijaintiin \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1011
+#: ../src/nautilus-file-undo-operations.c:1020
 #, c-format
 msgid "Move '%s' to trash"
 msgstr "Siirrä \"%s\" roskakoriin"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1016
+#: ../src/nautilus-file-undo-operations.c:1025
 msgid "_Undo Trash"
 msgstr "_Kumoa roskakoriin siirto"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1017
+#: ../src/nautilus-file-undo-operations.c:1026
 msgid "_Redo Trash"
 msgstr "_Siirrä uudelleen roskakoriin"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1313
+#: ../src/nautilus-file-undo-operations.c:1305
 #, c-format
 msgid "Restore original permissions of items enclosed in '%s'"
 msgstr ""
 "Palauta kohteen \"%s\" sisällä olevien tiedostojen alkuperäiset oikeudet"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1314
+#: ../src/nautilus-file-undo-operations.c:1306
 #, c-format
 msgid "Set permissions of items enclosed in '%s'"
 msgstr "Aseta kohteen \"%s\" sisällä olevien tiedostojen oikeudet"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1316
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1471
+#: ../src/nautilus-file-undo-operations.c:1308
+#: ../src/nautilus-file-undo-operations.c:1459
 msgid "_Undo Change Permissions"
 msgstr "_Kumoa oikeuksien muutos"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1317
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1472
+#: ../src/nautilus-file-undo-operations.c:1309
+#: ../src/nautilus-file-undo-operations.c:1460
 msgid "_Redo Change Permissions"
 msgstr "_Tee uudelleen oikeuksien muutos"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1468
+#: ../src/nautilus-file-undo-operations.c:1456
 #, c-format
 msgid "Restore original permissions of '%s'"
 msgstr "Palauta kohteen \"%s\" alkuperäiset käyttöoikeudet"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1469
+#: ../src/nautilus-file-undo-operations.c:1457
 #, c-format
 msgid "Set permissions of '%s'"
 msgstr "Aseta kohteen \"%s\" oikeudet"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1579
+#: ../src/nautilus-file-undo-operations.c:1567
 #, c-format
 msgid "Restore group of '%s' to '%s'"
 msgstr "Palauta kohteen \"%s\" ryhmäksi \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1581
+#: ../src/nautilus-file-undo-operations.c:1569
 #, c-format
 msgid "Set group of '%s' to '%s'"
 msgstr "Aseta kohteen \"%s\" ryhmäksi \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1584
+#: ../src/nautilus-file-undo-operations.c:1572
 msgid "_Undo Change Group"
 msgstr "_Kumoa ryhmän muutos"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1585
+#: ../src/nautilus-file-undo-operations.c:1573
 msgid "_Redo Change Group"
 msgstr "_Tee uudelleen ryhmän muutos"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1587
+#: ../src/nautilus-file-undo-operations.c:1575
 #, c-format
 msgid "Restore owner of '%s' to '%s'"
 msgstr "Palauta kohteen \"%s\" omistajaksi \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1589
+#: ../src/nautilus-file-undo-operations.c:1577
 #, c-format
 msgid "Set owner of '%s' to '%s'"
 msgstr "Aseta kohteen \"%s\" omistajaksi \"%s\""
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1592
+#: ../src/nautilus-file-undo-operations.c:1580
 msgid "_Undo Change Owner"
 msgstr "_Kumoa omistajan muutos"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1593
+#: ../src/nautilus-file-undo-operations.c:1581
 msgid "_Redo Change Owner"
 msgstr "_Tee uudelleen omistajan muutos"
 
-#: ../libnautilus-private/nautilus-file-utilities.c:896
+#: ../src/nautilus-file-utilities.c:914
 #, c-format
 msgid "Could not determine original location of “%s” "
 msgstr "Kohteen ”%s” alkuperäistä sijaintia ei voitu selvittää. "
 
-#: ../libnautilus-private/nautilus-file-utilities.c:900
+#: ../src/nautilus-file-utilities.c:918
 msgid "The item cannot be restored from trash"
 msgstr "Kohdetta ei voi palauttaa roskakorista."
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:80
+#: ../src/nautilus-file-utilities.c:1022
+msgid "Audio CD"
+msgstr "Ääni-CD"
+
+#: ../src/nautilus-file-utilities.c:1024
+msgid "Audio DVD"
+msgstr "Ääni-DVD"
+
+#: ../src/nautilus-file-utilities.c:1026
+msgid "Video DVD"
+msgstr "Video-DVD"
+
+#: ../src/nautilus-file-utilities.c:1028
+msgid "Video CD"
+msgstr "Video-CD"
+
+#: ../src/nautilus-file-utilities.c:1030
+msgid "Super Video CD"
+msgstr "Super Video CD"
+
+#: ../src/nautilus-file-utilities.c:1032
+msgid "Photo CD"
+msgstr "Kuva-CD"
+
+#: ../src/nautilus-file-utilities.c:1034
+msgid "Picture CD"
+msgstr "Kuva-CD"
+
+#: ../src/nautilus-file-utilities.c:1036 ../src/nautilus-file-utilities.c:1069
+msgid "Contains digital photos"
+msgstr "Sisältää digitaalisia valokuvia."
+
+#: ../src/nautilus-file-utilities.c:1038
+msgid "Contains music"
+msgstr "Sisältää musiikkia"
+
+#: ../src/nautilus-file-utilities.c:1040
+msgid "Contains software"
+msgstr "Sisältää ohjelmistoja"
+
+#. fallback to generic greeting
+#: ../src/nautilus-file-utilities.c:1043
+#, c-format
+msgid "Detected as “%s”"
+msgstr "Tunnistettu - \"%s\""
+
+#: ../src/nautilus-file-utilities.c:1065
+msgid "Contains music and photos"
+msgstr "Sisältää musiikkia ja kuvia"
+
+#: ../src/nautilus-file-utilities.c:1067
+msgid "Contains photos and music"
+msgstr "Sisältää kuvia ja musiikkia"
+
+#: ../src/nautilus-mime-application-chooser.c:79
 #, c-format
 msgid "Error while adding “%s”: %s"
 msgstr "Virhe lisättäessä kohdetta ”%s”: %s"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:82
+#: ../src/nautilus-mime-application-chooser.c:81
 msgid "Could not add application"
 msgstr "Sovellusta ei voitu lisätä"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:110
+#: ../src/nautilus-mime-application-chooser.c:109
 msgid "Could not forget association"
 msgstr "Liitosta ei voitu unohtaa"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:134
+#: ../src/nautilus-mime-application-chooser.c:133
 msgid "Forget association"
 msgstr "Unohda liitos"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:172
+#: ../src/nautilus-mime-application-chooser.c:171
 #, c-format
 msgid "Error while setting “%s” as default application: %s"
 msgstr "Virhe asetettaessa sovellusta ”%s” oletussovellukseksi: %s"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:174
+#: ../src/nautilus-mime-application-chooser.c:173
 msgid "Could not set as default"
 msgstr "Ei voitu asettaa oletusohjelmaksi"
 
 #. Translators: the %s here is a file extension
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:252
+#: ../src/nautilus-mime-application-chooser.c:251
 #, c-format
 msgid "%s document"
 msgstr "%s-asiakirja"
 
 #. Translators; %s here is a mime-type description
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:259
+#: ../src/nautilus-mime-application-chooser.c:258
 #, c-format
 msgid "Open all files of type “%s” with"
 msgstr "Avaa kaikki ”%s”-tyyppiset tiedostot sovelluksella"
 
 #. Translators: first %s is filename, second %s is mime-type description
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:266
+#: ../src/nautilus-mime-application-chooser.c:265
 #, c-format
 msgid "Select an application to open “%s” and other files of type “%s”"
 msgstr ""
 "Valitse sovellus, jolla %s ja muut tiedostomuotoa ”%s” olevat tiedostot "
 "avataan"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:325
+#: ../src/nautilus-mime-application-chooser.c:324
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:333
+#: ../src/nautilus-mime-application-chooser.c:332
 msgid "Set as default"
 msgstr "Aseta oletukseksi"
 
-#: ../libnautilus-private/nautilus-program-choosing.c:312
+#: ../src/nautilus-program-choosing.c:310
 msgid "Sorry, but you cannot execute commands from a remote site."
 msgstr "Turvallisuussyistä komentoja ei voi suorittaa etäpalvelimelta."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:314
+#: ../src/nautilus-program-choosing.c:312
 msgid "This is disabled due to security considerations."
 msgstr "Tämä on estetty turvallisuussyistä."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:325
-#: ../libnautilus-private/nautilus-program-choosing.c:393
+#: ../src/nautilus-program-choosing.c:323
+#: ../src/nautilus-program-choosing.c:391
 msgid "There was an error launching the application."
 msgstr "Sovelluksen käynnistäminen epäonnistui."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:350
-#: ../libnautilus-private/nautilus-program-choosing.c:361
+#: ../src/nautilus-program-choosing.c:348
+#: ../src/nautilus-program-choosing.c:359
 msgid "This drop target only supports local files."
 msgstr "Tähän kohtaan voi pudottaa vain paikallisia tiedostoja."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:351
+#: ../src/nautilus-program-choosing.c:349
 msgid ""
 "To open non-local files copy them to a local folder and then drop them again."
 msgstr ""
 "Avataksesi etätiedostot kopioi ne ensin paikalliseen kansioon, ja pudota ne "
 "sieltä tähän."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:362
+#: ../src/nautilus-program-choosing.c:360
 msgid ""
 "To open non-local files copy them to a local folder and then drop them "
 "again. The local files you dropped have already been opened."
@@ -2663,37 +2766,89 @@ msgstr ""
 "Avataksesi etätiedostot kopioi ne ensin paikalliseen kansioon ja pudota ne "
 "sieltä tähän. Pudottamasi paikalliset tiedostot ovat jo avautuneet."
 
-#: ../libnautilus-private/nautilus-program-choosing.c:391
+#: ../src/nautilus-program-choosing.c:389
 msgid "Details: "
 msgstr "Lisätiedot: "
 
-#: ../libnautilus-private/nautilus-progress-info.c:297
+#: ../src/nautilus-progress-info.c:296
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: ../libnautilus-private/nautilus-progress-info.c:360
-#: ../libnautilus-private/nautilus-progress-info.c:378
+#: ../src/nautilus-progress-info.c:359 ../src/nautilus-progress-info.c:377
 msgid "Preparing"
 msgstr "Valmistellaan"
 
-#: ../libnautilus-private/nautilus-query.c:207
-#: ../libnautilus-private/nautilus-search-directory-file.c:159
-#: ../libnautilus-private/nautilus-search-directory-file.c:211
-#: ../libnautilus-private/nautilus-search-directory-file.c:256
-#: ../src/resources/gtk/help-overlay.ui.h:4
+#: ../src/nautilus-query.c:469 ../src/nautilus-search-directory-file.c:158
+#: ../src/nautilus-search-directory-file.c:210
+#: ../src/nautilus-search-directory-file.c:255
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:51
+#: ../src/resources/ui/nautilus-search-popover.ui.h:12
 #: ../src/resources/ui/nautilus-toolbar.ui.h:5
 msgid "Search"
 msgstr "Etsi"
 
-#: ../libnautilus-private/nautilus-query.c:210
+#: ../src/nautilus-query.c:472
 #, c-format
 msgid "Search for “%s”"
 msgstr "Haun ”%s” tulokset"
 
-#: ../libnautilus-private/nautilus-search-engine.c:189
+#: ../src/nautilus-search-engine.c:200
 msgid "Unable to complete the requested search"
 msgstr "Pyydetyn haun toteutus epäonnistui"
 
+#. days
+#: ../src/nautilus-ui-utilities.c:364
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#. weeks
+#: ../src/nautilus-ui-utilities.c:369
+#, fuzzy, c-format
+#| msgid "Last _Opened"
+msgid "Last week"
+msgid_plural "%d weeks ago"
+msgstr[0] "Viim_eksi avattu"
+msgstr[1] "Viim_eksi avattu"
+
+#. months
+#: ../src/nautilus-ui-utilities.c:374
+#, c-format
+msgid "Last month"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#. years
+#: ../src/nautilus-ui-utilities.c:379
+#, c-format
+msgid "Last year"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../nautilus-desktop/nautilus-desktop-application.c:256
+msgid "Always manage the desktop (ignore the GSettings preference)."
+msgstr "Hallitse aina työpöytää (ohita GSettings-suositus)."
+
+#: ../nautilus-desktop/nautilus-desktop-directory-file.c:434
+#: ../nautilus-desktop/nautilus-desktop-icon-file.c:151
+msgid "on the desktop"
+msgstr "työpöydällä"
+
+#: ../nautilus-desktop/nautilus-desktop-icon-file.c:409
+#, c-format
+msgid "Unable to rename desktop icon"
+msgstr "Työpöytäkuvaketta ei voi nimetä uudestaan"
+
+#. hardcode "Desktop"
+#: ../nautilus-desktop/nautilus-desktop-window.c:201
+#: ../nautilus-desktop/nautilus-desktop-window.c:373
+msgid "Desktop"
+msgstr "Työpöytä"
+
 #: ../nautilus-sendto-extension/nautilus-nste.c:96
 #: ../nautilus-sendto-extension/nautilus-nste.c:101
 msgid "Send to…"
@@ -2708,7 +2863,7 @@ msgid "Send files by mail…"
 msgstr "Lähetä tiedostoja sähköpostitse…"
 
 #. Some sort of failure occurred. How 'bout we tell the user?
-#: ../src/nautilus-application.c:158 ../src/nautilus-window-slot.c:1158
+#: ../src/nautilus-application.c:158 ../src/nautilus-window-slot.c:1188
 msgid "Oops! Something went wrong."
 msgstr "Hups, jokin meni pieleen."
 
@@ -2734,25 +2889,20 @@ msgstr ""
 "oikeudet siten, että kansiot on mahdollista luoda:\n"
 "%s"
 
-#: ../src/nautilus-application.c:599
+#: ../src/nautilus-application.c:559
 msgid "--check cannot be used with other options."
 msgstr "valitsinta --check ei voi käyttää muiden valitsinten kanssa."
 
-#: ../src/nautilus-application.c:606
+#: ../src/nautilus-application.c:566
 msgid "--quit cannot be used with URIs."
 msgstr "valitsinta --quit ei voi käyttää URI:en kanssa."
 
-#: ../src/nautilus-application.c:614
+#: ../src/nautilus-application.c:574
 #, fuzzy
 msgid "--select must be used with at least an URI."
 msgstr "valitsinta --geometry ei voi käyttää yhtä useamman URI:n kanssa."
 
-#: ../src/nautilus-application.c:621
-msgid "--no-desktop and --force-desktop cannot be used together."
-msgstr ""
-"valitsimia --no-desktop ja --force-desktop ei voi käyttää samanaikaisesti."
-
-#: ../src/nautilus-application.c:734
+#: ../src/nautilus-application.c:687
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -2761,54 +2911,46 @@ msgstr ""
 "Virhe ohjetta näyttäessä: \n"
 "%s"
 
-#: ../src/nautilus-application.c:873
+#: ../src/nautilus-application.c:802
 msgid "Perform a quick set of self-check tests."
 msgstr "Suorita nopeita itsetarkistuksia."
 
-#: ../src/nautilus-application.c:880
+#: ../src/nautilus-application.c:809
 msgid "Create the initial window with the given geometry."
 msgstr "Aseta luotavan ikkunan mitat annetuiksi."
 
-#: ../src/nautilus-application.c:880
+#: ../src/nautilus-application.c:809
 msgid "GEOMETRY"
 msgstr "MITAT"
 
-#: ../src/nautilus-application.c:882
+#: ../src/nautilus-application.c:811
 msgid "Show the version of the program."
 msgstr "Näytä ohjelman versio."
 
-#: ../src/nautilus-application.c:884
+#: ../src/nautilus-application.c:813
 #, fuzzy
 msgid "Always open a new window for browsing specified URIs"
 msgstr "Luo Nautilus-ikkunoita vain erikseen annetuille URI:lle."
 
-#: ../src/nautilus-application.c:886
+#: ../src/nautilus-application.c:815
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Luo Nautilus-ikkunoita vain erikseen annetuille URI:lle."
 
-#: ../src/nautilus-application.c:888
-msgid "Never manage the desktop (ignore the GSettings preference)."
-msgstr "Älä koskaan hallitse työpöytää (ohita GSettings-suositus)."
-
-#: ../src/nautilus-application.c:890
-msgid "Always manage the desktop (ignore the GSettings preference)."
-msgstr "Hallitse aina työpöytää (ohita GSettings-suositus)."
-
-#: ../src/nautilus-application.c:892
+#: ../src/nautilus-application.c:817
 msgid "Quit Nautilus."
 msgstr "Lopeta Nautilus."
 
-#: ../src/nautilus-application.c:894
+#: ../src/nautilus-application.c:819
 #, fuzzy
 msgid "Select specified URI in parent folder."
 msgstr "Valitse tässä kansiossa näkyvät sarakkeet"
 
-#: ../src/nautilus-application.c:895
+#: ../src/nautilus-application.c:820
 msgid "[URI...]"
 msgstr "[URI…]"
 
-#: ../src/nautilus-autorun-software.c:142
-#: ../src/nautilus-autorun-software.c:145
+#: ../src/nautilus-autorun-software.c:141
+#: ../src/nautilus-autorun-software.c:144
 #, c-format
 msgid ""
 "Unable to start the program:\n"
@@ -2817,40 +2959,40 @@ msgstr ""
 "Ohjelmaa ei voi käynnistää:\n"
 "%s"
 
-#: ../src/nautilus-autorun-software.c:148
+#: ../src/nautilus-autorun-software.c:147
 #, c-format
 msgid "Unable to locate the program"
 msgstr "Ohjelmaa ei löytynyt"
 
-#: ../src/nautilus-autorun-software.c:170
+#: ../src/nautilus-autorun-software.c:169
 msgid "Oops! There was a problem running this software."
 msgstr "Hups, ohjelmaa suorittaessa tapahtui virhe."
 
-#: ../src/nautilus-autorun-software.c:201
+#: ../src/nautilus-autorun-software.c:199
 #, c-format
 msgid ""
 "“%s” contains software intended to be automatically started. Would you like "
 "to run it?"
 msgstr ""
 "\"%s\" sisältää ohjelmiston, joka on tarkoitettu automaattisesti "
-"käynnistyväksi. Haluatko suorittaa sen?</b></big>"
+"käynnistyväksi. Haluatko suorittaa sen?"
 
-#: ../src/nautilus-autorun-software.c:205
+#: ../src/nautilus-autorun-software.c:203
 msgid "If you don't trust this location or aren't sure, press Cancel."
 msgstr "Jos et luota tähän sijaintiin tai olet muuten epävarma, paina Peru."
 
-#: ../src/nautilus-autorun-software.c:240 ../src/nautilus-mime-actions.c:491
+#: ../src/nautilus-autorun-software.c:234 ../src/nautilus-mime-actions.c:635
 msgid "_Run"
 msgstr "_Suorita"
 
-#: ../src/nautilus-canvas-view-container.c:443
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:30
+#: ../src/nautilus-canvas-view-container.c:349
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:7
 msgid "Icon View"
 msgstr "Kuvakenäkymä"
 
 #: ../src/nautilus-desktop-item-properties.c:404
 #: ../src/nautilus-desktop-item-properties.c:414
-#: ../src/nautilus-image-properties-page.c:370
+#: ../src/nautilus-image-properties-page.c:369
 msgid "Comment"
 msgstr "Kommentti"
 
@@ -2860,8 +3002,8 @@ msgstr "URL"
 
 #: ../src/nautilus-desktop-item-properties.c:410
 #: ../src/nautilus-desktop-item-properties.c:420
-#: ../src/nautilus-image-properties-page.c:361
-#: ../src/nautilus-image-properties-page.c:416
+#: ../src/nautilus-image-properties-page.c:360
+#: ../src/nautilus-image-properties-page.c:415
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -2869,71 +3011,66 @@ msgstr "Kuvaus"
 msgid "Command"
 msgstr "Komento"
 
-#. hardcode "Desktop"
-#: ../src/nautilus-desktop-window.c:196 ../src/nautilus-desktop-window.c:366
-msgid "Desktop"
-msgstr "Työpöytä"
-
-#: ../src/nautilus-error-reporting.c:67
+#: ../src/nautilus-error-reporting.c:66
 #, c-format
 msgid "You do not have the permissions necessary to view the contents of “%s”."
 msgstr ""
 "Sinulla ei ole tarvittavia oikeuksia kohteen ”%s” sisällön katselemiseen."
 
-#: ../src/nautilus-error-reporting.c:71
+#: ../src/nautilus-error-reporting.c:70
 #, c-format
 msgid "“%s” could not be found. Perhaps it has recently been deleted."
 msgstr "Kohdetta ”%s” ei löydy. Se on ehkä poistettu äskettäin."
 
-#: ../src/nautilus-error-reporting.c:75
+#: ../src/nautilus-error-reporting.c:74
 #, c-format
 msgid "Sorry, could not display all the contents of “%s”: %s"
 msgstr "Kaikkea kohteen ”%s” sisältöä ei voitu näyttää: %s"
 
-#: ../src/nautilus-error-reporting.c:82
+#: ../src/nautilus-error-reporting.c:81
 msgid "This location could not be displayed."
 msgstr "Kansion sisällön näyttäminen ei onnistu."
 
-#: ../src/nautilus-error-reporting.c:106
+#: ../src/nautilus-error-reporting.c:105
 #, c-format
 msgid "You do not have the permissions necessary to change the group of “%s”."
 msgstr "Sinulla ei ole kohteen ”%s” nimen muuttamiseen tarvittavia oikeuksia."
 
 #. fall through
-#: ../src/nautilus-error-reporting.c:119
+#: ../src/nautilus-error-reporting.c:118
 #, c-format
 msgid "Sorry, could not change the group of “%s”: %s"
 msgstr "Kohteen ”%s” ryhmää ei voitu muuttaa: %s"
 
-#: ../src/nautilus-error-reporting.c:124
+#: ../src/nautilus-error-reporting.c:123
 msgid "The group could not be changed."
 msgstr "Ryhmän muuttaminen ei onnistunut."
 
-#: ../src/nautilus-error-reporting.c:144
+#: ../src/nautilus-error-reporting.c:143
 #, c-format
 msgid "Sorry, could not change the owner of “%s”: %s"
 msgstr "Kohteen ”%s” omistajaa ei voitu muuttaa: %s"
 
-#: ../src/nautilus-error-reporting.c:146
+#: ../src/nautilus-error-reporting.c:145
 msgid "The owner could not be changed."
 msgstr "Omistajan muuttaminen ei onnistunut."
 
-#: ../src/nautilus-error-reporting.c:166
+#: ../src/nautilus-error-reporting.c:165
 #, c-format
 msgid "Sorry, could not change the permissions of “%s”: %s"
 msgstr "Kohteen ”%s” oikeuksia ei voitu muuttaa: %s"
 
-#: ../src/nautilus-error-reporting.c:168
+#: ../src/nautilus-error-reporting.c:167
 msgid "The permissions could not be changed."
 msgstr "Oikeuksien muuttaminen ei onnistunut."
 
-#: ../src/nautilus-error-reporting.c:203
+#: ../src/nautilus-error-reporting.c:202
 #, c-format
 msgid ""
 "The name “%s” is already used in this location. Please use a different name."
 msgstr "Nimi ”%s” on jo käytössä tässä kansiossa. Käytä toista nimeä."
 
-#: ../src/nautilus-error-reporting.c:208
+#: ../src/nautilus-error-reporting.c:207
 #, c-format
 msgid ""
 "There is no “%s” in this location. Perhaps it was just moved or deleted?"
@@ -2941,12 +3078,12 @@ msgstr ""
 "Kohdetta ”%s” ei ole tässä kansiossa. Kenties se siirrettiin tai poistettiin "
 "juuri."
 
-#: ../src/nautilus-error-reporting.c:213
+#: ../src/nautilus-error-reporting.c:212
 #, c-format
 msgid "You do not have the permissions necessary to rename “%s”."
 msgstr "Sinulla ei ole kohteen ”%s” nimen muuttamiseen tarvittavia oikeuksia."
 
-#: ../src/nautilus-error-reporting.c:218
+#: ../src/nautilus-error-reporting.c:217
 #, c-format
 msgid ""
 "The name “%s” is not valid because it contains the character “/”. Please use "
@@ -2954,131 +3091,130 @@ msgid ""
 msgstr ""
 "Nimi ”%s” on virheellinen, koska siinä on merkki ”/”. Käytä toista nimeä."
 
-#: ../src/nautilus-error-reporting.c:222
+#: ../src/nautilus-error-reporting.c:221
 #, c-format
 msgid "The name “%s” is not valid. Please use a different name."
 msgstr "Nimi ”%s” on virheellinen.  Käytä toista nimeä."
 
-#: ../src/nautilus-error-reporting.c:228
+#: ../src/nautilus-error-reporting.c:227
 #, c-format
 msgid "The name “%s” is too long. Please use a different name."
 msgstr "Nimi ”%s” on liian pitkä.  Käytä toista nimeä."
 
 #. fall through
-#: ../src/nautilus-error-reporting.c:242
+#: ../src/nautilus-error-reporting.c:241
 #, c-format
 msgid "Sorry, could not rename “%s” to “%s”: %s"
 msgstr "Kohdetta ”%s” ei voitu nimetä muotoon ”%s”: %s"
 
-#: ../src/nautilus-error-reporting.c:250
+#: ../src/nautilus-error-reporting.c:249
 msgid "The item could not be renamed."
 msgstr "Kohteen uudelleennimeäminen ei onnistunut."
 
-#: ../src/nautilus-error-reporting.c:347
+#: ../src/nautilus-error-reporting.c:346
 #, c-format
 msgid "Renaming “%s” to “%s”."
 msgstr "Nimetään kohde ”%s” kohteeksi ”%s”."
 
-#: ../src/nautilus-files-view.c:400
+#: ../src/nautilus-files-view.c:376
 msgid "Searching…"
 msgstr "Etsitään…"
 
-#: ../src/nautilus-files-view.c:400
-#: ../src/nautilus-image-properties-page.c:708
-#: ../src/nautilus-list-model.c:371 ../src/nautilus-window-slot.c:648
+#: ../src/nautilus-files-view.c:376 ../src/nautilus-image-properties-page.c:707
+#: ../src/nautilus-list-model.c:374 ../src/nautilus-window-slot.c:696
 msgid "Loading…"
 msgstr "Ladataan…"
 
-#: ../src/nautilus-files-view.c:1086 ../src/nautilus-mime-actions.c:824
-#: ../src/nautilus-mime-actions.c:1568
+#: ../src/nautilus-files-view.c:1005 ../src/nautilus-mime-actions.c:961
+#: ../src/nautilus-mime-actions.c:1703
 msgid "Are you sure you want to open all files?"
 msgstr "Haluatko varmasti avata kaikki tiedostot?"
 
-#: ../src/nautilus-files-view.c:1088
+#: ../src/nautilus-files-view.c:1007
 #, c-format
 msgid "This will open %'d separate tab."
 msgid_plural "This will open %'d separate tabs."
 msgstr[0] "Tämä avaa %'d erillisen välilehden."
 msgstr[1] "Tämä avaa  %'d erillistä välilehteä."
 
-#: ../src/nautilus-files-view.c:1091
+#: ../src/nautilus-files-view.c:1010
 #, c-format
 msgid "This will open %'d separate window."
 msgid_plural "This will open %'d separate windows."
 msgstr[0] "Tämä avaa %'d erillisen ikkunan."
 msgstr[1] "Tämä avaa  %d erillistä ikkunaa."
 
-#: ../src/nautilus-files-view.c:1095 ../src/nautilus-location-entry.c:270
-#: ../src/nautilus-mime-actions.c:833 ../src/nautilus-mime-actions.c:1010
-#: ../src/nautilus-mime-actions.c:1572
+#: ../src/nautilus-files-view.c:1014 ../src/nautilus-location-entry.c:269
+#: ../src/nautilus-mime-actions.c:970 ../src/nautilus-mime-actions.c:1144
+#: ../src/nautilus-mime-actions.c:1707
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/nautilus-files-view.c:1566
+#: ../src/nautilus-files-view.c:1486
 msgid "Select Items Matching"
 msgstr "Valitse täsmäävät kohteet"
 
-#: ../src/nautilus-files-view.c:1571 ../src/nautilus-files-view.c:5268
+#: ../src/nautilus-files-view.c:1491 ../src/nautilus-files-view.c:5323
 msgid "_Select"
 msgstr "_Valitse"
 
-#: ../src/nautilus-files-view.c:1579
+#: ../src/nautilus-files-view.c:1499
 msgid "_Pattern:"
 msgstr "_Lauseke:"
 
-#: ../src/nautilus-files-view.c:1585
+#: ../src/nautilus-files-view.c:1505
 msgid "Examples: "
 msgstr "Esimerkkejä: "
 
-#: ../src/nautilus-files-view.c:1824
+#: ../src/nautilus-files-view.c:1720
 msgid "A folder with that name already exists."
 msgstr "Kansio samalla nimellä on jo olemassa."
 
-#: ../src/nautilus-files-view.c:1826
+#: ../src/nautilus-files-view.c:1722
 msgid "A file with that name already exists."
 msgstr "Tiedosto samalla nimellä on jo olemassa."
 
-#: ../src/nautilus-files-view.c:1841
+#: ../src/nautilus-files-view.c:1737
 msgid "Folder names cannot contain “/”."
 msgstr "Kansion nimi ei voi sisältää merkkiä \"/\"."
 
-#: ../src/nautilus-files-view.c:1843
+#: ../src/nautilus-files-view.c:1739
 msgid "Files names cannot contain “/”."
 msgstr "Tiedostojen nimi ei voi sisältää merkkiä \"/\"."
 
-#: ../src/nautilus-files-view.c:1846
+#: ../src/nautilus-files-view.c:1742
 msgid "A folder can not be called “.”."
 msgstr "Kansion nimi ei voi olla \".\"."
 
-#: ../src/nautilus-files-view.c:1848
+#: ../src/nautilus-files-view.c:1744
 msgid "A file can not be called “.”."
 msgstr "Tiedoston nimi ei voi olla \".\"."
 
-#: ../src/nautilus-files-view.c:1851
+#: ../src/nautilus-files-view.c:1747
 msgid "A folder can not be called “..”."
 msgstr "Kansion nimi ei voi olla \"..\"."
 
-#: ../src/nautilus-files-view.c:1853
+#: ../src/nautilus-files-view.c:1749
 msgid "A file can not be called “..”."
 msgstr "Tiedoston nimi ei voi olla \".\"."
 
-#: ../src/nautilus-files-view.c:2084 ../src/nautilus-files-view.c:2152
+#: ../src/nautilus-files-view.c:2066 ../src/nautilus-files-view.c:2134
 msgid "Folder name"
 msgstr "Kansion nimi"
 
-#: ../src/nautilus-files-view.c:2086
+#: ../src/nautilus-files-view.c:2068
 msgid "File name"
 msgstr "Tiedoston nimi"
 
-#: ../src/nautilus-files-view.c:2151
+#: ../src/nautilus-files-view.c:2133
 msgid "Create"
 msgstr "Luo"
 
-#: ../src/nautilus-files-view.c:2153
+#: ../src/nautilus-files-view.c:2135
 msgid "New Folder"
 msgstr "Uusi kansio"
 
-#: ../src/nautilus-files-view.c:2600
+#: ../src/nautilus-files-view.c:2576
 msgid ""
 "Nautilus 3.6 deprecated this directory and tried migrating this "
 "configuration to ~/.local/share/nautilus"
@@ -3086,19 +3222,19 @@ msgstr ""
 "Nautilus 3.6 hylkäksi tämän hakemiston ja yritti siirtää asetuksia "
 "hakemistoon ~/.local/share/nautilus"
 
-#: ../src/nautilus-files-view.c:3028 ../src/nautilus-files-view.c:3063
+#: ../src/nautilus-files-view.c:3004 ../src/nautilus-files-view.c:3039
 #, c-format
 msgid "“%s” selected"
 msgstr "”%s” valittu"
 
-#: ../src/nautilus-files-view.c:3030
+#: ../src/nautilus-files-view.c:3006
 #, c-format
 msgid "%'d folder selected"
 msgid_plural "%'d folders selected"
 msgstr[0] "%'d kansio valittu"
 msgstr[1] "%'d kansiota valittu"
 
-#: ../src/nautilus-files-view.c:3040
+#: ../src/nautilus-files-view.c:3016
 #, c-format
 msgid "(containing %'d item)"
 msgid_plural "(containing %'d items)"
@@ -3106,14 +3242,14 @@ msgstr[0] "(sisältää %'d kohteen)"
 msgstr[1] "(sisältää %'d kohdetta)"
 
 #. translators: this is preceded with a string of form 'N folders' (N more than 1)
-#: ../src/nautilus-files-view.c:3051
+#: ../src/nautilus-files-view.c:3027
 #, c-format
 msgid "(containing a total of %'d item)"
 msgid_plural "(containing a total of %'d items)"
 msgstr[0] "(sisältää yhteensä %'d kohteen)"
 msgstr[1] "(sisältää yhteensä %'d kohdetta)"
 
-#: ../src/nautilus-files-view.c:3066
+#: ../src/nautilus-files-view.c:3042
 #, c-format
 msgid "%'d item selected"
 msgid_plural "%'d items selected"
@@ -3121,7 +3257,7 @@ msgstr[0] "%'d kohde valittu"
 msgstr[1] "%'d kohdetta valittu"
 
 #. Folders selected also, use "other" terminology
-#: ../src/nautilus-files-view.c:3073
+#: ../src/nautilus-files-view.c:3049
 #, c-format
 msgid "%'d other item selected"
 msgid_plural "%'d other items selected"
@@ -3132,7 +3268,7 @@ msgstr[1] "%'d muuta kohdetta valittu"
 #. * needs to use something other than parentheses. The
 #. * the message in parentheses is the size of the selected items.
 #.
-#: ../src/nautilus-files-view.c:3087
+#: ../src/nautilus-files-view.c:3063
 #, c-format
 msgid "(%s)"
 msgstr "(%s)"
@@ -3144,371 +3280,406 @@ msgstr "(%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: ../src/nautilus-files-view.c:3111
+#: ../src/nautilus-files-view.c:3087
 #, c-format
 msgid "%s %s, %s %s"
 msgstr "%s %s, %s %s"
 
-#: ../src/nautilus-files-view.c:5257
+#: ../src/nautilus-files-view.c:5312
 msgid "Select Move Destination"
 msgstr "Valitse siirron sijainti"
 
-#: ../src/nautilus-files-view.c:5259
+#: ../src/nautilus-files-view.c:5314
 msgid "Select Copy Destination"
 msgstr "Valitse kopioinnin sijainti"
 
 #. Translators: %s is a file name formatted for display
-#: ../src/nautilus-files-view.c:5715
+#: ../src/nautilus-files-view.c:5775
 #, c-format
 msgid "Unable to remove “%s”"
 msgstr "Tiedoston \"%s\" poistaminen epäonnistui"
 
 #. Translators: %s is a file name formatted for display
-#: ../src/nautilus-files-view.c:5742
+#: ../src/nautilus-files-view.c:5802
 #, c-format
 msgid "Unable to eject “%s”"
 msgstr "Aseman %s poistaminen epäonnistui"
 
-#: ../src/nautilus-files-view.c:5764
+#: ../src/nautilus-files-view.c:5824
 msgid "Unable to stop drive"
 msgstr "Asemaa ei voi pysäyttää"
 
 #. Translators: %s is a file name formatted for display
-#: ../src/nautilus-files-view.c:5869
+#: ../src/nautilus-files-view.c:5929
 #, c-format
 msgid "Unable to start “%s”"
 msgstr "Kohdetta \"%s\" ei voi käynnistää"
 
-#: ../src/nautilus-files-view.c:6626
+#: ../src/nautilus-files-view.c:6670
 #, c-format
 msgid "New Folder with Selection (%'d Item)"
 msgid_plural "New Folder with Selection (%'d Items)"
 msgstr[0] "Uusi kansio valinnalla (%'d kohde)"
 msgstr[1] "Uusi kansio valinnalla (%'d kohdetta)"
 
-#: ../src/nautilus-files-view.c:6674
+#: ../src/nautilus-files-view.c:6718
 #, c-format
 msgid "Open With %s"
 msgstr "Avaa sovelluksella %s"
 
-#: ../src/nautilus-files-view.c:6683
+#: ../src/nautilus-files-view.c:6727
 msgid "Run"
 msgstr "Suorita"
 
-#: ../src/nautilus-files-view.c:6685 ../src/resources/gtk/help-overlay.ui.h:10
+#: ../src/nautilus-files-view.c:6729
 msgid "Open"
 msgstr "Avaa"
 
-#: ../src/nautilus-files-view.c:6736
+#: ../src/nautilus-files-view.c:6780
 #: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:19
 msgid "_Start"
 msgstr "_Käynnistä"
 
-#: ../src/nautilus-files-view.c:6739 ../src/gtk/gtkplacesview.c:1657
+#: ../src/nautilus-files-view.c:6783 ../src/gtk/nautilusgtkplacesview.c:1632
 msgid "_Connect"
 msgstr "_Yhdistä"
 
-#: ../src/nautilus-files-view.c:6742
+#: ../src/nautilus-files-view.c:6786
 msgid "_Start Multi-disk Drive"
 msgstr "_Käynnistä usean levyn asema"
 
-#: ../src/nautilus-files-view.c:6745
+#: ../src/nautilus-files-view.c:6789
 msgid "U_nlock Drive"
 msgstr "Avaa _aseman lukitus"
 
-#: ../src/nautilus-files-view.c:6761
+#: ../src/nautilus-files-view.c:6805
 msgid "Stop Drive"
 msgstr "Pysäytä asema"
 
-#: ../src/nautilus-files-view.c:6764
+#: ../src/nautilus-files-view.c:6808
 msgid "_Safely Remove Drive"
 msgstr "_Sammuta asema turvallisesti"
 
-#: ../src/nautilus-files-view.c:6767 ../src/gtk/gtkplacesview.c:1647
+#: ../src/nautilus-files-view.c:6811 ../src/gtk/nautilusgtkplacesview.c:1622
 msgid "_Disconnect"
 msgstr "_Katkaise yhteys"
 
-#: ../src/nautilus-files-view.c:6770
+#: ../src/nautilus-files-view.c:6814
 msgid "_Stop Multi-disk Drive"
 msgstr "_Pysäytä usean levyn asema"
 
-#: ../src/nautilus-files-view.c:6773
+#: ../src/nautilus-files-view.c:6817
 msgid "_Lock Drive"
 msgstr "_Lukitse asema"
 
-#: ../src/nautilus-files-view.c:8241
+#: ../src/nautilus-files-view.c:8294
 msgid "Content View"
 msgstr "Sisältönäkymä"
 
-#: ../src/nautilus-files-view.c:8242
+#: ../src/nautilus-files-view.c:8295
 msgid "View of the current folder"
 msgstr "Nykyisen kansion näkymä"
 
-#: ../src/nautilus-files-view-dnd.c:172 ../src/nautilus-files-view-dnd.c:206
-#: ../src/nautilus-files-view-dnd.c:297
+#: ../src/nautilus-files-view-dnd.c:171 ../src/nautilus-files-view-dnd.c:205
+#: ../src/nautilus-files-view-dnd.c:296
 msgid "Drag and drop is not supported."
 msgstr "Veto ja pudotus ei toimi."
 
-#: ../src/nautilus-files-view-dnd.c:173
+#: ../src/nautilus-files-view-dnd.c:172
 msgid "Drag and drop is only supported on local file systems."
 msgstr "Veto ja pudotus toimii vain paikallisissa tiedostojärjestelmissä."
 
-#: ../src/nautilus-files-view-dnd.c:207 ../src/nautilus-files-view-dnd.c:298
+#: ../src/nautilus-files-view-dnd.c:206 ../src/nautilus-files-view-dnd.c:297
 msgid "An invalid drag type was used."
 msgstr "Vetotyyppi oli väärä."
 
 #. Translator: This is the filename used for when you dnd text to a directory
-#: ../src/nautilus-files-view-dnd.c:385
+#: ../src/nautilus-files-view-dnd.c:384
 msgid "Dropped Text.txt"
 msgstr "Raahattu teksti.txt"
 
 #. Translator: This is the filename used for when you dnd raw
 #. * data to a directory, if the source didn't supply a name.
 #.
-#: ../src/nautilus-files-view-dnd.c:483
+#: ../src/nautilus-files-view-dnd.c:482
 msgid "dropped data"
 msgstr "raahattu data"
 
-#: ../src/nautilus-image-properties-page.c:331
+#: ../src/nautilus-image-properties-page.c:330
 msgid "Image Type"
 msgstr "Kuvan tyyppi"
 
-#: ../src/nautilus-image-properties-page.c:333
-#: ../src/nautilus-image-properties-page.c:339
+#: ../src/nautilus-image-properties-page.c:332
+#: ../src/nautilus-image-properties-page.c:338
 #, c-format
 msgid "%d pixel"
 msgid_plural "%d pixels"
 msgstr[0] "%d pikseli"
 msgstr[1] "%d pikseliä"
 
-#: ../src/nautilus-image-properties-page.c:337
+#: ../src/nautilus-image-properties-page.c:336
 msgid "Width"
 msgstr "Leveys"
 
-#: ../src/nautilus-image-properties-page.c:343
+#: ../src/nautilus-image-properties-page.c:342
 msgid "Height"
 msgstr "Korkeus"
 
+#: ../src/nautilus-image-properties-page.c:355
 #: ../src/nautilus-image-properties-page.c:356
-#: ../src/nautilus-image-properties-page.c:357
 msgid "Title"
 msgstr "Nimi"
 
+#: ../src/nautilus-image-properties-page.c:357
 #: ../src/nautilus-image-properties-page.c:358
-#: ../src/nautilus-image-properties-page.c:359
 msgid "Author"
 msgstr "Tekijä"
 
-#: ../src/nautilus-image-properties-page.c:362
-#: ../src/nautilus-image-properties-page.c:419
+#: ../src/nautilus-image-properties-page.c:361
+#: ../src/nautilus-image-properties-page.c:418
 msgid "Copyright"
 msgstr "Tekijänoikeudet"
 
-#: ../src/nautilus-image-properties-page.c:363
+#: ../src/nautilus-image-properties-page.c:362
 msgid "Created On"
 msgstr "Luotu"
 
-#: ../src/nautilus-image-properties-page.c:364
+#: ../src/nautilus-image-properties-page.c:363
 msgid "Created By"
 msgstr "Luonut"
 
 #. Translators: this refers to a legal disclaimer string embedded in
 #. * the metadata of an image
-#: ../src/nautilus-image-properties-page.c:367
+#: ../src/nautilus-image-properties-page.c:366
 msgid "Disclaimer"
 msgstr "Vastuuvapautuslauseke"
 
-#: ../src/nautilus-image-properties-page.c:368
+#: ../src/nautilus-image-properties-page.c:367
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../src/nautilus-image-properties-page.c:369
+#: ../src/nautilus-image-properties-page.c:368
 msgid "Source"
 msgstr "Lähde"
 
-#: ../src/nautilus-image-properties-page.c:384
+#: ../src/nautilus-image-properties-page.c:383
 msgid "Camera Brand"
 msgstr "Kameran merkki"
 
-#: ../src/nautilus-image-properties-page.c:385
+#: ../src/nautilus-image-properties-page.c:384
 msgid "Camera Model"
 msgstr "Kameran malli"
 
 #. Choose which date to show in order of relevance
-#: ../src/nautilus-image-properties-page.c:388
+#: ../src/nautilus-image-properties-page.c:387
 msgid "Date Taken"
 msgstr "Ottopäivä"
 
-#: ../src/nautilus-image-properties-page.c:389
+#: ../src/nautilus-image-properties-page.c:388
 msgid "Date Digitized"
 msgstr "Digitoitu tieto"
 
-#: ../src/nautilus-image-properties-page.c:390
+#: ../src/nautilus-image-properties-page.c:389
 msgid "Date Modified"
 msgstr "Muokattu"
 
-#: ../src/nautilus-image-properties-page.c:394
+#: ../src/nautilus-image-properties-page.c:393
 msgid "Exposure Time"
 msgstr "Valotusaika"
 
-#: ../src/nautilus-image-properties-page.c:395
+#: ../src/nautilus-image-properties-page.c:394
 msgid "Aperture Value"
 msgstr "Aukon arvo"
 
-#: ../src/nautilus-image-properties-page.c:396
+#: ../src/nautilus-image-properties-page.c:395
 msgid "ISO Speed Rating"
 msgstr "ISO-nopeusluokka"
 
-#: ../src/nautilus-image-properties-page.c:397
+#: ../src/nautilus-image-properties-page.c:396
 msgid "Flash Fired"
 msgstr "Salama"
 
-#: ../src/nautilus-image-properties-page.c:398
+#: ../src/nautilus-image-properties-page.c:397
 msgid "Metering Mode"
 msgstr "Mittaustila"
 
-#: ../src/nautilus-image-properties-page.c:399
+#: ../src/nautilus-image-properties-page.c:398
 msgid "Exposure Program"
 msgstr "Valotusohjelma"
 
-#: ../src/nautilus-image-properties-page.c:400
+#: ../src/nautilus-image-properties-page.c:399
 msgid "Focal Length"
 msgstr "Polttoväli"
 
-#: ../src/nautilus-image-properties-page.c:401
+#: ../src/nautilus-image-properties-page.c:400
 msgid "Software"
 msgstr "Ohjelmisto"
 
-#: ../src/nautilus-image-properties-page.c:417
+#: ../src/nautilus-image-properties-page.c:416
 msgid "Keywords"
 msgstr "Avainsanat"
 
-#: ../src/nautilus-image-properties-page.c:418
+#: ../src/nautilus-image-properties-page.c:417
 msgid "Creator"
 msgstr "Tekijä"
 
-#: ../src/nautilus-image-properties-page.c:420
+#: ../src/nautilus-image-properties-page.c:419
 msgid "Rating"
 msgstr "Arvostelu"
 
-#: ../src/nautilus-image-properties-page.c:443
+#: ../src/nautilus-image-properties-page.c:442
 msgid "Failed to load image information"
 msgstr "Kuvatietojen lataaminen epäonnistui"
 
-#: ../src/nautilus-list-model.c:369
+#: ../src/nautilus-list-model.c:372
 msgid "(Empty)"
 msgstr "(Tyhjä)"
 
-#: ../src/nautilus-list-view.c:1267
+#: ../src/nautilus-list-view.c:1266
 msgid "Use Default"
 msgstr "Käytä oletusarvoja"
 
-#: ../src/nautilus-list-view.c:1818
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:19
+#: ../src/nautilus-list-view.c:1819
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:8
 msgid "List View"
 msgstr "Luettelonäkymä"
 
-#: ../src/nautilus-list-view.c:2638
+#: ../src/nautilus-list-view.c:2639
 #, c-format
 msgid "%s Visible Columns"
 msgstr "%s: näkyvät sarakkeet"
 
-#: ../src/nautilus-list-view.c:2658
+#: ../src/nautilus-list-view.c:2659
 msgid "Choose the order of information to appear in this folder:"
 msgstr ""
 "Valitse tässä kansiossa näytettävien tietojen tietojen esitysjärjestys:"
 
-#: ../src/nautilus-location-entry.c:255
+#: ../src/nautilus-location-entry.c:254
 #, c-format
 msgid "Do you want to view %d location?"
 msgid_plural "Do you want to view %d locations?"
 msgstr[0] "Haluatko katsella yhtä sijaintia?"
 msgstr[1] "Haluatko katsella useita (%d) sijainteja?"
 
-#: ../src/nautilus-location-entry.c:259 ../src/nautilus-mime-actions.c:829
+#: ../src/nautilus-location-entry.c:258 ../src/nautilus-mime-actions.c:966
 #, c-format
 msgid "This will open %d separate window."
 msgid_plural "This will open %d separate windows."
 msgstr[0] "Tämä avaisi %d erillisen ikkunan."
 msgstr[1] "Tämä avaisi %d erillistä ikkunaa."
 
-#: ../src/nautilus-mime-actions.c:399
+#: ../src/nautilus-mime-actions.c:93
+#: ../src/resources/ui/nautilus-search-popover.ui.h:11
+#, fuzzy
+#| msgid "nothing"
+msgid "Anything"
+msgstr "ei mitään"
+
+#: ../src/nautilus-mime-actions.c:104 ../src/nautilus-properties-window.c:4162
+msgid "Folders"
+msgstr "Kansiot"
+
+#: ../src/nautilus-mime-actions.c:109
+msgid "Documents"
+msgstr "Asiakirjat"
+
+#: ../src/nautilus-mime-actions.c:127
+msgid "Illustration"
+msgstr "Piirros"
+
+#: ../src/nautilus-mime-actions.c:141
+msgid "Music"
+msgstr "Musiikki"
+
+#: ../src/nautilus-mime-actions.c:156
+msgid "PDF / PostScript"
+msgstr "PDF / PostScript"
+
+#: ../src/nautilus-mime-actions.c:164
+msgid "Picture"
+msgstr "Kuva"
+
+#: ../src/nautilus-mime-actions.c:209
+msgid "Text File"
+msgstr "Tekstitiedosto"
+
+#: ../src/nautilus-mime-actions.c:543
 #, c-format
 msgid "The link “%s” is broken. Move it to Trash?"
 msgstr "Linkki ”%s” on rikki. Haluatko siirtää sen roskakoriin?"
 
-#: ../src/nautilus-mime-actions.c:401
+#: ../src/nautilus-mime-actions.c:545
 #, c-format
 msgid "The link “%s” is broken."
 msgstr "Linkki ”%s” on rikki."
 
-#: ../src/nautilus-mime-actions.c:407
+#: ../src/nautilus-mime-actions.c:551
 msgid "This link cannot be used because it has no target."
 msgstr "Tätä linkkiä ei voi käyttää, koska sillä ei ole kohdetta."
 
-#: ../src/nautilus-mime-actions.c:409
+#: ../src/nautilus-mime-actions.c:553
 #, c-format
 msgid "This link cannot be used because its target “%s” doesn't exist."
 msgstr "Tätä linkkiä ei voi käyttää, koska kohdetta ”%s” ei ole olemassa."
 
-#: ../src/nautilus-mime-actions.c:419
+#: ../src/nautilus-mime-actions.c:563
 #: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:27
 msgid "Mo_ve to Trash"
 msgstr "Siirrä _roskakoriin"
 
-#: ../src/nautilus-mime-actions.c:479
+#: ../src/nautilus-mime-actions.c:623
 #, c-format
 msgid "Do you want to run “%s”, or display its contents?"
 msgstr "Haluatko suorittaa tiedoston ”%s” vai nähdä sen sisällön?"
 
-#: ../src/nautilus-mime-actions.c:481
+#: ../src/nautilus-mime-actions.c:625
 #, c-format
 msgid "“%s” is an executable text file."
 msgstr "”%s” on suoritettava tekstitiedosto."
 
-#: ../src/nautilus-mime-actions.c:487
+#: ../src/nautilus-mime-actions.c:631
 msgid "Run in _Terminal"
 msgstr "Suorita _päätteessä"
 
-#: ../src/nautilus-mime-actions.c:488
+#: ../src/nautilus-mime-actions.c:632
 msgid "_Display"
 msgstr "_Näytä"
 
-#: ../src/nautilus-mime-actions.c:826
+#: ../src/nautilus-mime-actions.c:963
 #, c-format
 msgid "This will open %d separate tab."
 msgid_plural "This will open %d separate tabs."
 msgstr[0] "Tämä avaa %d erillisen välilehteä."
 msgstr[1] "Tämä avaa %d erillistä välilehteä."
 
-#: ../src/nautilus-mime-actions.c:891
+#: ../src/nautilus-mime-actions.c:1028
 #, c-format
 msgid "Could not display “%s”."
 msgstr "Kohdetta ”%s” ei voi näyttää."
 
-#: ../src/nautilus-mime-actions.c:989
+#: ../src/nautilus-mime-actions.c:1126
 msgid "The file is of an unknown type"
 msgstr "Tiedoston tyyppi on tuntematon"
 
-#: ../src/nautilus-mime-actions.c:993
+#: ../src/nautilus-mime-actions.c:1129
 #, c-format
 msgid "There is no application installed for “%s” files"
 msgstr ""
 "Tyyppiä \"%s\" oleville tiedostoille ei ole asennettu sopivaa sovellusta"
 
-#: ../src/nautilus-mime-actions.c:1008
+#: ../src/nautilus-mime-actions.c:1142
 msgid "_Select Application"
 msgstr "_Valitse sovellus"
 
-#: ../src/nautilus-mime-actions.c:1044
+#: ../src/nautilus-mime-actions.c:1178
 msgid "There was an internal error trying to search for applications:"
 msgstr "Tapahtui sisäinen virhe etsittäessä sovelluksia:"
 
-#: ../src/nautilus-mime-actions.c:1046
+#: ../src/nautilus-mime-actions.c:1180
 msgid "Unable to search for application"
 msgstr "Sovellusta ei voitu etsiä"
 
-#: ../src/nautilus-mime-actions.c:1169
+#: ../src/nautilus-mime-actions.c:1303
 #, c-format
 msgid ""
 "There is no application installed for “%s” files.\n"
@@ -3517,11 +3688,11 @@ msgstr ""
 "Tyyppiä \"%s\" oleville tiedostoille ei ole asennettu sopivaa sovellusta.\n"
 "Haluatko etsiä sovellusta, jolla avata tämän tiedoston?"
 
-#: ../src/nautilus-mime-actions.c:1319
+#: ../src/nautilus-mime-actions.c:1453
 msgid "Untrusted application launcher"
 msgstr "Sovelluksen käynnistin ei ole luotettu"
 
-#: ../src/nautilus-mime-actions.c:1322
+#: ../src/nautilus-mime-actions.c:1456
 #, c-format
 msgid ""
 "The application launcher “%s” has not been marked as trusted. If you do not "
@@ -3530,15 +3701,15 @@ msgstr ""
 "Sovelluksen käynnistintä ”%s” ei ole merkitty luotetuksi. Jos et tiedä mistä "
 "tämä käynnistin on peräisin, sen käynnistys voi olla turvatonta."
 
-#: ../src/nautilus-mime-actions.c:1337
+#: ../src/nautilus-mime-actions.c:1471
 msgid "_Launch Anyway"
 msgstr "_Käynnistä silti"
 
-#: ../src/nautilus-mime-actions.c:1340
+#: ../src/nautilus-mime-actions.c:1474
 msgid "Mark as _Trusted"
 msgstr "Merkitse luo_tetuksi"
 
-#: ../src/nautilus-mime-actions.c:1569
+#: ../src/nautilus-mime-actions.c:1704
 #, c-format
 msgid "This will open %d separate application."
 msgid_plural "This will open %d separate applications."
@@ -3546,136 +3717,135 @@ msgstr[0] "Tämä avaa %d erillisen sovelluksen."
 msgstr[1] "Tämä avaa %d erillistä ohjelmaa."
 
 #. if it wasn't cancelled show a dialog
-#: ../src/nautilus-mime-actions.c:1646 ../src/nautilus-mime-actions.c:1910
-#: ../src/gtk/gtkplacesview.c:1165 ../src/gtk/gtkplacesview.c:1209
-#: ../src/gtk/gtkplacesview.c:1260
+#: ../src/nautilus-mime-actions.c:1781 ../src/nautilus-mime-actions.c:2045
+#: ../src/gtk/nautilusgtkplacesview.c:1162
+#: ../src/gtk/nautilusgtkplacesview.c:1235
 msgid "Unable to access location"
 msgstr "Sijaintiin ei ole pääsyä"
 
-#: ../src/nautilus-mime-actions.c:1989
+#: ../src/nautilus-mime-actions.c:2124
 msgid "Unable to start location"
 msgstr "Sijaintia ei voi käynnistää"
 
-#: ../src/nautilus-mime-actions.c:2073
+#: ../src/nautilus-mime-actions.c:2208
 #, c-format
 msgid "Opening “%s”."
 msgstr "”%s” avautuu."
 
-#: ../src/nautilus-mime-actions.c:2076
+#: ../src/nautilus-mime-actions.c:2211
 #, c-format
 msgid "Opening %d item."
 msgid_plural "Opening %d items."
 msgstr[0] "Avataan %d kohde."
 msgstr[1] "Avataan %d kohdetta."
 
-#: ../src/nautilus-notebook.c:322
+#: ../src/nautilus-notebook.c:320
 msgid "Close tab"
 msgstr "Sulje välilehti"
 
 #. Translators: this is referred to captions under icons.
-#: ../src/nautilus-preferences-dialog.c:145
-#: ../src/nautilus-properties-window.c:3772
-#: ../src/nautilus-properties-window.c:3799
+#: ../src/nautilus-preferences-window.c:131
+#: ../src/nautilus-properties-window.c:3735
+#: ../src/nautilus-properties-window.c:3762
 msgid "None"
 msgstr "Ei mikään"
 
-#: ../src/nautilus-progress-persistence-handler.c:130
-#: ../src/nautilus-progress-persistence-handler.c:201
+#: ../src/nautilus-progress-persistence-handler.c:101
+#: ../src/nautilus-progress-persistence-handler.c:140
 msgid "File Operations"
 msgstr "Tiedostotoiminnot"
 
-#: ../src/nautilus-progress-persistence-handler.c:132
+#: ../src/nautilus-progress-persistence-handler.c:103
 msgid "Show Details"
 msgstr "Näytä lisätietoja"
 
-#: ../src/nautilus-progress-persistence-handler.c:135
-#: ../src/nautilus-progress-persistence-handler.c:155
+#: ../src/nautilus-progress-persistence-handler.c:106
 #, c-format
 msgid "%'d file operation active"
 msgid_plural "%'d file operations active"
 msgstr[0] "%'d tiedostotoiminto käynnissä"
 msgstr[1] "%'d tiedostotoimintoa käynnissä"
 
-#: ../src/nautilus-progress-persistence-handler.c:203
+#: ../src/nautilus-progress-persistence-handler.c:142
 msgid "All file operations have been successfully completed"
 msgstr "Kaikki tiedostotoiminnot onnistuivat"
 
-#: ../src/nautilus-properties-window.c:491
+#: ../src/nautilus-properties-window.c:465
 msgid "You cannot assign more than one custom icon at a time!"
 msgstr "Voit asettaa vain yhden oman kuvakkeen kerrallaan!"
 
-#: ../src/nautilus-properties-window.c:492
+#: ../src/nautilus-properties-window.c:466
 msgid "Please drop just one image to set a custom icon."
 msgstr "Pudota vain yksi kuva asettaaksesi sen omavalintaiseksi kuvakkeeksi."
 
-#: ../src/nautilus-properties-window.c:503
+#: ../src/nautilus-properties-window.c:477
 msgid "The file that you dropped is not local."
 msgstr "Pudottamasi tiedosto ei ole paikallinen."
 
-#: ../src/nautilus-properties-window.c:504
-#: ../src/nautilus-properties-window.c:510
+#: ../src/nautilus-properties-window.c:478
+#: ../src/nautilus-properties-window.c:484
 msgid "You can only use local images as custom icons."
 msgstr "Vain paikallisia tiedostoja voi käyttää omina kuvakkeina."
 
-#: ../src/nautilus-properties-window.c:509
+#: ../src/nautilus-properties-window.c:483
 msgid "The file that you dropped is not an image."
 msgstr "Pudottamasi tiedosto ei ole kuva."
 
-#: ../src/nautilus-properties-window.c:624
+#: ../src/nautilus-properties-window.c:598
 msgid "_Name:"
 msgid_plural "_Names:"
 msgstr[0] "_Nimi:"
 msgstr[1] "_Nimet:"
 
-#: ../src/nautilus-properties-window.c:819
+#: ../src/nautilus-properties-window.c:793
 #, c-format
 msgid "Properties"
 msgstr "Ominaisuudet"
 
 #. To translators: %s is the name of the folder.
-#: ../src/nautilus-properties-window.c:829
+#: ../src/nautilus-properties-window.c:803
 #, c-format
 msgctxt "folder"
 msgid "%s Properties"
 msgstr "Ominaisuudet: %s"
 
 #. To translators: %s is the name of the file.
-#: ../src/nautilus-properties-window.c:832
+#: ../src/nautilus-properties-window.c:806
 #, c-format
 msgctxt "file"
 msgid "%s Properties"
 msgstr "Ominaisuudet: %s"
 
-#: ../src/nautilus-properties-window.c:1226
+#: ../src/nautilus-properties-window.c:1200
 #, c-format
 msgctxt "MIME type description (MIME type)"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/nautilus-properties-window.c:1428
+#: ../src/nautilus-properties-window.c:1402
 msgid "Cancel Group Change?"
 msgstr "Haluatko perua ryhmän vaihdon?"
 
-#: ../src/nautilus-properties-window.c:1825
+#: ../src/nautilus-properties-window.c:1792
 msgid "Cancel Owner Change?"
 msgstr "Haluatko perua omistajan vaihdon?"
 
-#: ../src/nautilus-properties-window.c:2124
+#: ../src/nautilus-properties-window.c:2091
 msgid "nothing"
 msgstr "ei mitään"
 
-#: ../src/nautilus-properties-window.c:2126
+#: ../src/nautilus-properties-window.c:2093
 msgid "unreadable"
 msgstr "ei luettavissa"
 
-#: ../src/nautilus-properties-window.c:2134
+#: ../src/nautilus-properties-window.c:2101
 #, c-format
 msgid "%'d item, with size %s"
 msgid_plural "%'d items, totalling %s"
 msgstr[0] "%'d kohde, kooltaan %s"
 msgstr[1] "%'d kohdetta, yhteensä %s"
 
-#: ../src/nautilus-properties-window.c:2143
+#: ../src/nautilus-properties-window.c:2110
 msgid "(some contents unreadable)"
 msgstr "(sisältö ei kokonaan luettavissa)"
 
@@ -3685,344 +3855,349 @@ msgstr "(sisältö ei kokonaan luettavissa)"
 #. * 2-line value. Maybe there's a better way to do this, but I
 #. * couldn't think of one.
 #.
-#: ../src/nautilus-properties-window.c:2160
+#: ../src/nautilus-properties-window.c:2127
 msgid "Contents:"
 msgstr "Sisältö:"
 
 #. Translators: "used" refers to the capacity of the filesystem
-#: ../src/nautilus-properties-window.c:2770
+#: ../src/nautilus-properties-window.c:2737
 msgid "used"
 msgstr "käytössä"
 
 #. Translators: "free" refers to the capacity of the filesystem
-#: ../src/nautilus-properties-window.c:2780
+#: ../src/nautilus-properties-window.c:2747
 msgid "free"
 msgstr "vapaana"
 
-#: ../src/nautilus-properties-window.c:2782
+#: ../src/nautilus-properties-window.c:2749
 msgid "Total capacity:"
 msgstr "Kokonaistila:"
 
-#: ../src/nautilus-properties-window.c:2785
+#: ../src/nautilus-properties-window.c:2752
 msgid "Filesystem type:"
 msgstr "Tiedostojärjestelmän tyyppi:"
 
-#: ../src/nautilus-properties-window.c:2921
+#: ../src/nautilus-properties-window.c:2887
 msgid "Basic"
 msgstr "Perustiedot"
 
-#: ../src/nautilus-properties-window.c:2986
+#: ../src/nautilus-properties-window.c:2949
 msgid "Link target:"
 msgstr "Linkin kohde:"
 
-#: ../src/nautilus-properties-window.c:3005
+#: ../src/nautilus-properties-window.c:2968
 msgid "Parent Folder:"
 msgstr "Ylätason kansio:"
 
-#: ../src/nautilus-properties-window.c:3013
+#: ../src/nautilus-properties-window.c:2976
 msgid "Volume:"
 msgstr "Asema:"
 
-#: ../src/nautilus-properties-window.c:3022
+#: ../src/nautilus-properties-window.c:2985
 msgid "Accessed:"
 msgstr "Käytetty:"
 
-#: ../src/nautilus-properties-window.c:3026
+#: ../src/nautilus-properties-window.c:2989
 msgid "Modified:"
 msgstr "Muokattu:"
 
-#: ../src/nautilus-properties-window.c:3036
+#: ../src/nautilus-properties-window.c:2999
 msgid "Free space:"
 msgstr "Tilaa vapaana:"
 
 #. translators: this gets concatenated to "no read",
 #. * "no access", etc. (see following strings)
 #.
-#: ../src/nautilus-properties-window.c:3689
-#: ../src/nautilus-properties-window.c:3700
-#: ../src/nautilus-properties-window.c:3712
+#: ../src/nautilus-properties-window.c:3652
+#: ../src/nautilus-properties-window.c:3663
+#: ../src/nautilus-properties-window.c:3675
 msgid "no "
 msgstr "ei "
 
-#: ../src/nautilus-properties-window.c:3692
+#: ../src/nautilus-properties-window.c:3655
 msgid "list"
 msgstr "listaa"
 
-#: ../src/nautilus-properties-window.c:3694
+#: ../src/nautilus-properties-window.c:3657
 msgid "read"
 msgstr "luku"
 
-#: ../src/nautilus-properties-window.c:3703
+#: ../src/nautilus-properties-window.c:3666
 msgid "create/delete"
 msgstr "luo/poista"
 
-#: ../src/nautilus-properties-window.c:3705
+#: ../src/nautilus-properties-window.c:3668
 msgid "write"
 msgstr "kirjoitus"
 
-#: ../src/nautilus-properties-window.c:3714
+#: ../src/nautilus-properties-window.c:3677
 msgid "access"
 msgstr "pääsy"
 
-#: ../src/nautilus-properties-window.c:3779
+#: ../src/nautilus-properties-window.c:3742
 msgid "List files only"
 msgstr "Vain tiedostolista"
 
-#: ../src/nautilus-properties-window.c:3785
+#: ../src/nautilus-properties-window.c:3748
 msgid "Access files"
 msgstr "Tiedostojen avaus"
 
-#: ../src/nautilus-properties-window.c:3791
+#: ../src/nautilus-properties-window.c:3754
 msgid "Create and delete files"
 msgstr "Tiedostojen luonti ja poisto"
 
-#: ../src/nautilus-properties-window.c:3806
+#: ../src/nautilus-properties-window.c:3769
 msgid "Read-only"
 msgstr "Vain luku"
 
-#: ../src/nautilus-properties-window.c:3812
+#: ../src/nautilus-properties-window.c:3775
 msgid "Read and write"
 msgstr "Luku ja kirjoitus"
 
-#: ../src/nautilus-properties-window.c:3839
+#: ../src/nautilus-properties-window.c:3802
 msgid "Access:"
 msgstr "Oikeudet:"
 
-#: ../src/nautilus-properties-window.c:3841
+#: ../src/nautilus-properties-window.c:3804
 msgid "Folder access:"
 msgstr "Kansion oikeudet:"
 
-#: ../src/nautilus-properties-window.c:3843
+#: ../src/nautilus-properties-window.c:3806
 msgid "File access:"
 msgstr "Tiedoston oikeudet:"
 
-#: ../src/nautilus-properties-window.c:3932
+#: ../src/nautilus-properties-window.c:3895
 msgid "_Owner:"
 msgstr "_Omistaja:"
 
-#: ../src/nautilus-properties-window.c:3940
-#: ../src/nautilus-properties-window.c:4202
+#: ../src/nautilus-properties-window.c:3903
+#: ../src/nautilus-properties-window.c:4165
 msgid "Owner:"
 msgstr "Omistaja:"
 
-#: ../src/nautilus-properties-window.c:3962
+#: ../src/nautilus-properties-window.c:3925
 msgid "_Group:"
 msgstr "_Ryhmä:"
 
-#: ../src/nautilus-properties-window.c:3970
-#: ../src/nautilus-properties-window.c:4216
+#: ../src/nautilus-properties-window.c:3933
+#: ../src/nautilus-properties-window.c:4179
 msgid "Group:"
 msgstr "Ryhmä:"
 
-#: ../src/nautilus-properties-window.c:3991
+#: ../src/nautilus-properties-window.c:3954
 msgid "Others"
 msgstr "Muut"
 
-#: ../src/nautilus-properties-window.c:4006
+#: ../src/nautilus-properties-window.c:3969
 msgid "Execute:"
 msgstr "Suorita:"
 
-#: ../src/nautilus-properties-window.c:4009
+#: ../src/nautilus-properties-window.c:3972
 msgid "Allow _executing file as program"
 msgstr "Salli tiedoston suoritus ohjelmana"
 
-#: ../src/nautilus-properties-window.c:4185
+#: ../src/nautilus-properties-window.c:4148
 msgid "Change Permissions for Enclosed Files"
 msgstr "Muuta sisällä olevien tiedostojen oikeuksia"
 
-#: ../src/nautilus-properties-window.c:4189
+#: ../src/nautilus-properties-window.c:4152
 msgid "Change"
 msgstr "Muuta"
 
-#: ../src/nautilus-properties-window.c:4199
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:27
-msgid "Folders"
-msgstr "Kansiot"
-
-#: ../src/nautilus-properties-window.c:4230
+#: ../src/nautilus-properties-window.c:4193
 msgid "Others:"
 msgstr "Muut:"
 
-#: ../src/nautilus-properties-window.c:4271
+#: ../src/nautilus-properties-window.c:4234
 msgid "You are not the owner, so you cannot change these permissions."
 msgstr "Et ole kohteen omistaja, joten et voi muuttaa sen oikeuksia."
 
-#: ../src/nautilus-properties-window.c:4286
+#: ../src/nautilus-properties-window.c:4249
 msgid "Security context:"
 msgstr "Turvakonteksti:"
 
-#: ../src/nautilus-properties-window.c:4301
+#: ../src/nautilus-properties-window.c:4264
 msgid "Change Permissions for Enclosed Files…"
 msgstr "Muuta sisällä olevien tiedostojen oikeuksia…"
 
-#: ../src/nautilus-properties-window.c:4311
+#: ../src/nautilus-properties-window.c:4274
 #, c-format
 msgid "The permissions of “%s” could not be determined."
 msgstr "Kohteen ”%s” oikeuksia ei saatu selville."
 
-#: ../src/nautilus-properties-window.c:4314
+#: ../src/nautilus-properties-window.c:4277
 msgid "The permissions of the selected file could not be determined."
 msgstr "Valitun tiedoston oikeudet eivät selvinneet."
 
-#: ../src/nautilus-properties-window.c:4562
+#: ../src/nautilus-properties-window.c:4529
 msgid "Open With"
 msgstr "Avaa sovelluksella"
 
-#: ../src/nautilus-properties-window.c:4883
+#: ../src/nautilus-properties-window.c:4858
 msgid "Creating Properties window."
 msgstr "Ominaisuusikkuna avautuu."
 
-#: ../src/nautilus-properties-window.c:5167
+#: ../src/nautilus-properties-window.c:5142
 msgid "Select Custom Icon"
 msgstr "Valitse oma kuvake"
 
-#: ../src/nautilus-properties-window.c:5169
+#: ../src/nautilus-properties-window.c:5144
 msgid "_Revert"
 msgstr "_Palauta"
 
 #. Open item is always present
-#: ../src/nautilus-properties-window.c:5171 ../src/gtk/gtkplacesview.c:1602
+#: ../src/nautilus-properties-window.c:5146
+#: ../src/gtk/nautilusgtkplacesview.c:1577
 msgid "_Open"
 msgstr "_Avaa"
 
-#: ../src/nautilus-query-editor.c:100
-msgid "File Type"
-msgstr "Tiedoston tyyppi"
-
-#: ../src/nautilus-query-editor.c:296
-msgid "Documents"
-msgstr "Asiakirjat"
-
-#: ../src/nautilus-query-editor.c:314
-msgid "Music"
-msgstr "Musiikki"
+#: ../src/nautilus-query-editor.c:121
+#, fuzzy
+#| msgid "Searching for network locations"
+msgid "Searching locations only"
+msgstr "Etsitään verkkosijainteja"
 
-#: ../src/nautilus-query-editor.c:345
-msgid "Picture"
-msgstr "Kuva"
+#: ../src/nautilus-query-editor.c:123
+msgid "Searching devices only"
+msgstr ""
 
-#: ../src/nautilus-query-editor.c:365
-msgid "Illustration"
-msgstr "Piirros"
+#: ../src/nautilus-query-editor.c:125
+#, fuzzy
+#| msgid "Searching for network locations"
+msgid "Searching network locations only"
+msgstr "Etsitään verkkosijainteja"
 
-#: ../src/nautilus-query-editor.c:404
-msgid "PDF / PostScript"
-msgstr "PDF / PostScript"
+#: ../src/nautilus-query-editor.c:128
+#, fuzzy
+#| msgid "Remote location — only searching the current folder"
+msgid "Remote location - only searching the current folder"
+msgstr "Etäsijainti — etsitään vain nykyisestä kansiosta"
 
-#: ../src/nautilus-query-editor.c:412
-msgid "Text File"
-msgstr "Tekstitiedosto"
+#: ../src/nautilus-query-editor.c:130
+#, fuzzy
+#| msgid "Remote location — only searching the current folder"
+msgid "Only searching the current folder"
+msgstr "Etäsijainti — etsitään vain nykyisestä kansiosta"
 
-#: ../src/nautilus-query-editor.c:491
-msgid "Select type"
-msgstr "Valitse tyyppi"
+#: ../src/nautilus-search-popover.c:284
+msgid "Show a list to select the date"
+msgstr ""
 
-#: ../src/nautilus-query-editor.c:495
-msgid "Select"
-msgstr "Valitse"
+#: ../src/nautilus-search-popover.c:290
+#: ../src/resources/ui/nautilus-search-popover.ui.h:5
+msgid "Show a calendar to select the date"
+msgstr ""
 
-#: ../src/nautilus-query-editor.c:575
-msgid "Any"
-msgstr "Mikä tahansa"
+#. Add the no date filter element first
+#: ../src/nautilus-search-popover.c:387
+msgid "Any time"
+msgstr ""
 
-#: ../src/nautilus-query-editor.c:590
+#. Other types
+#: ../src/nautilus-search-popover.c:476
 msgid "Other Type…"
 msgstr "Muu tyyppi…"
 
-#: ../src/nautilus-query-editor.c:861
-msgid "Remove this criterion from the search"
-msgstr "Poista tämä ehto hausta"
-
-#. create the Current/All Files selector
-#: ../src/nautilus-query-editor.c:946
-msgid "Current"
-msgstr "Nykyinen"
+#: ../src/nautilus-search-popover.c:536
+msgid "Select type"
+msgstr "Valitse tyyppi"
 
-#: ../src/nautilus-query-editor.c:949
-msgid "All Files"
-msgstr "Kaikki tiedostot"
+#: ../src/nautilus-search-popover.c:540
+msgid "Select"
+msgstr "Valitse"
 
-#: ../src/nautilus-query-editor.c:971
-msgid "Add a new criterion to this search"
-msgstr "Lisää uusi ehto tähän hakuun"
+#: ../src/nautilus-search-popover.c:625
+#: ../src/resources/ui/nautilus-search-popover.ui.h:3
+#, fuzzy
+#| msgid "Select type"
+msgid "Select Dates…"
+msgstr "Valitse tyyppi"
 
 #. trash
-#: ../src/nautilus-shell-search-provider.c:297 ../src/nautilus-trash-bar.c:198
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:15
+#: ../src/nautilus-shell-search-provider.c:297 ../src/nautilus-trash-bar.c:197
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:45
 msgid "Trash"
 msgstr "Roskakori"
 
-#: ../src/nautilus-special-location-bar.c:51
-msgid "Files in this folder will appear in the New Document menu."
+#: ../src/nautilus-special-location-bar.c:53
+#, fuzzy
+#| msgid "Files in this folder will appear in the New Document menu."
+msgid "Put files in this folder to use them as templates for new documents."
 msgstr "Tässä kansiossa olevat tiedostot näkyvät Uusi asiakirja -valikossa."
 
 #: ../src/nautilus-special-location-bar.c:54
+msgid ""
+"<a href=\"help:gnome-help/files-templates\" title=\"GNOME help for templates"
+"\">Learn more…</a>"
+msgstr ""
+
+#: ../src/nautilus-special-location-bar.c:57
 msgid "Executable files in this folder will appear in the Scripts menu."
 msgstr ""
 "Tässä kansiossa olevat suoritettavat tiedostot näkyvät skriptivalikossa."
 
-#: ../src/nautilus-trash-bar.c:206
+#: ../src/nautilus-trash-bar.c:205
 msgid "_Restore"
 msgstr "_Palauta"
 
-#: ../src/nautilus-trash-bar.c:209
+#: ../src/nautilus-trash-bar.c:208
 msgid "Restore selected items to their original position"
 msgstr "Palauta valitut kohteet niiden alkuperäisiin sijainteihin"
 
 #. Translators: "Empty" is an action (for the trash) , not a state
-#: ../src/nautilus-trash-bar.c:213
+#: ../src/nautilus-trash-bar.c:212
 msgid "_Empty"
 msgstr "_Tyhjennä"
 
-#: ../src/nautilus-trash-bar.c:216
+#: ../src/nautilus-trash-bar.c:215
 msgid "Delete all items in the Trash"
 msgstr "Poista kaikki roskakorin sisältö"
 
-#: ../src/nautilus-window.c:1226
+#: ../src/nautilus-window.c:1377
 msgid "_Properties"
 msgstr "_Ominaisuudet"
 
-#: ../src/nautilus-window.c:1236
+#: ../src/nautilus-window.c:1387
 msgid "_Format…"
 msgstr "_Alusta…"
 
 #. Translators: only one item has been deleted and %s is its name.
-#: ../src/nautilus-window.c:1490
+#: ../src/nautilus-window.c:1643
 #, c-format
 msgid "“%s” deleted"
 msgstr "”%s” poistettu"
 
 #. Translators: one or more items might have been deleted, and %d
 #. * is the count.
-#: ../src/nautilus-window.c:1495
+#: ../src/nautilus-window.c:1648
 #, c-format
 msgid "%d file deleted"
 msgid_plural "%d files deleted"
 msgstr[0] "%d tiedosto poistettu"
 msgstr[1] "%d tiedostoa poistettu"
 
-#: ../src/nautilus-window.c:1595
+#: ../src/nautilus-window.c:1750
 #, c-format
 msgid "Open %s"
 msgstr "Avaa %s"
 
-#: ../src/nautilus-window.c:1683
+#: ../src/nautilus-window.c:1838
 msgid "_New Tab"
 msgstr "Uusi _välilehti"
 
-#: ../src/nautilus-window.c:1693
+#: ../src/nautilus-window.c:1848
 msgid "Move Tab _Left"
 msgstr "Siirrä välilehteä _vasemmalle"
 
-#: ../src/nautilus-window.c:1701
+#: ../src/nautilus-window.c:1856
 msgid "Move Tab _Right"
 msgstr "Siirrä välilehteä _oikealle"
 
-#: ../src/nautilus-window.c:1712
+#: ../src/nautilus-window.c:1867
 msgid "_Close Tab"
 msgstr "_Sulje välilehti"
 
-#: ../src/nautilus-window.c:2629
+#: ../src/nautilus-window.c:2789
 msgid "Access and organize your files."
 msgstr "Käsittele ja järjestä tiedostoja"
 
@@ -4030,7 +4205,7 @@ msgstr "Käsittele ja järjestä tiedostoja"
 #. * which will be displayed at the bottom of the about
 #. * box to give credit to the translator(s).
 #.
-#: ../src/nautilus-window.c:2638
+#: ../src/nautilus-window.c:2798
 msgid "translator-credits"
 msgstr ""
 "Ilkka Tuohela, 2005-2009\n"
@@ -4051,35 +4226,35 @@ msgstr ""
 "  Tomi Juntunen https://launchpad.net/~tojuntu\n";
 "  Tommi Saira https://launchpad.net/~tommisaira";
 
-#: ../src/nautilus-window-slot.c:1162
+#: ../src/nautilus-window-slot.c:1192
 msgid "Unable to display the contents of this folder."
 msgstr "Kansion sisällön näyttäminen epäonnistui."
 
-#: ../src/nautilus-window-slot.c:1164
+#: ../src/nautilus-window-slot.c:1194
 msgid "This location doesn't appear to be a folder."
 msgstr "Tämä sijainti ei vaikuta olevan kansio."
 
-#: ../src/nautilus-window-slot.c:1169
+#: ../src/nautilus-window-slot.c:1199
 msgid ""
 "Unable to find the requested file. Please check the spelling and try again."
 msgstr ""
 "Määritellyn tiedoston paikannus epäonnistui. Tarkista oikeinkirjoitus ja "
 "yritä uudelleen."
 
-#: ../src/nautilus-window-slot.c:1174
+#: ../src/nautilus-window-slot.c:1204
 #, c-format
 msgid "“%s” locations are not supported."
 msgstr "\"%s\"-sijainnit eivät ole tuettuja."
 
-#: ../src/nautilus-window-slot.c:1177
+#: ../src/nautilus-window-slot.c:1207
 msgid "Unable to handle this kind of location."
 msgstr "Tämän tyyppisiä sijainteja ei voi käsitellä."
 
-#: ../src/nautilus-window-slot.c:1182
+#: ../src/nautilus-window-slot.c:1212
 msgid "Unable to access the requested location."
 msgstr "Ei pääsyä sijaintiin"
 
-#: ../src/nautilus-window-slot.c:1185
+#: ../src/nautilus-window-slot.c:1215
 msgid "Don't have permission to access the requested location."
 msgstr "Käyttöoikeutesi eivät riitä pyydetyn sijainnin esittämiseen."
 
@@ -4088,7 +4263,7 @@ msgstr "Käyttöoikeutesi eivät riitä pyydetyn sijainnin esittämiseen."
 #. * But this case is also hit for legitimate web addresses when
 #. * the proxy is set up wrong.
 #.
-#: ../src/nautilus-window-slot.c:1193
+#: ../src/nautilus-window-slot.c:1223
 msgid ""
 "Unable to find the requested location. Please check the spelling or the "
 "network settings."
@@ -4096,279 +4271,395 @@ msgstr ""
 "Määritellyn sijainnin paikannus epäonnistui. Tarkista annettu osoita tai "
 "verkkoasetukset."
 
-#: ../src/nautilus-window-slot.c:1204
+#: ../src/nautilus-window-slot.c:1234
 #, c-format
 msgid "Unhandled error message: %s"
 msgstr "Käsittelemätön virheviesti: %s"
 
-#: ../src/nautilus-window-slot.c:1352
+#: ../src/nautilus-window-slot.c:1388
 #, c-format
 msgid "Unable to load location"
 msgstr "Sijainnin lataus epäonnistui"
 
-#: ../src/nautilus-x-content-bar.c:92
-msgid "Audio CD"
-msgstr "Ääni-CD"
-
-#: ../src/nautilus-x-content-bar.c:94
-msgid "Audio DVD"
-msgstr "Ääni-DVD"
-
-#: ../src/nautilus-x-content-bar.c:96
-msgid "Video DVD"
-msgstr "Video-DVD"
-
-#: ../src/nautilus-x-content-bar.c:98
-msgid "Video CD"
-msgstr "Video-CD"
-
-#: ../src/nautilus-x-content-bar.c:100
-msgid "Super Video CD"
-msgstr "Super Video CD"
-
-#: ../src/nautilus-x-content-bar.c:102
-msgid "Photo CD"
-msgstr "Kuva-CD"
-
-#: ../src/nautilus-x-content-bar.c:104
-msgid "Picture CD"
-msgstr "Kuva-CD"
-
-#: ../src/nautilus-x-content-bar.c:106 ../src/nautilus-x-content-bar.c:139
-msgid "Contains digital photos"
-msgstr "Sisältää digitaalisia valokuvia."
-
-#: ../src/nautilus-x-content-bar.c:108
-msgid "Contains music"
-msgstr "Sisältää musiikkia"
-
-#: ../src/nautilus-x-content-bar.c:110
-msgid "Contains software"
-msgstr "Sisältää ohjelmistoja"
-
-#. fallback to generic greeting
-#: ../src/nautilus-x-content-bar.c:113
-#, c-format
-msgid "Detected as “%s”"
-msgstr "Tunnistettu - \"%s\""
-
-#: ../src/nautilus-x-content-bar.c:135
-msgid "Contains music and photos"
-msgstr "Sisältää musiikkia ja kuvia"
-
-#: ../src/nautilus-x-content-bar.c:137
-msgid "Contains photos and music"
-msgstr "Sisältää kuvia ja musiikkia"
-
-#: ../src/nautilus-x-content-bar.c:201
+#: ../src/nautilus-x-content-bar.c:123
 msgid "Open with:"
 msgstr "Avaa sovelluksella:"
 
 #: ../src/resources/gtk/help-overlay.ui.h:1
+#, fuzzy
+#| msgid "General"
+msgctxt "shortcut window"
 msgid "General"
 msgstr "Yleiset"
 
 #: ../src/resources/gtk/help-overlay.ui.h:2
+#, fuzzy
+#| msgid "New window"
+msgctxt "shortcut window"
 msgid "New window"
 msgstr "Uusi ikkuna"
 
 #: ../src/resources/gtk/help-overlay.ui.h:3
+#, fuzzy
+#| msgid "Close window or tab"
+msgctxt "shortcut window"
 msgid "Close window or tab"
 msgstr "Sulje ikkuna tai välilehti"
 
+#: ../src/resources/gtk/help-overlay.ui.h:4
+#, fuzzy
+#| msgid "Search"
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "Etsi"
+
 #: ../src/resources/gtk/help-overlay.ui.h:5
+#, fuzzy
+#| msgid "Bookmarks"
+msgctxt "shortcut window"
 msgid "Bookmarks"
 msgstr "Kirjanmerkit"
 
 #: ../src/resources/gtk/help-overlay.ui.h:6
+#, fuzzy
+#| msgid "Bookmark current location"
+msgctxt "shortcut window"
 msgid "Bookmark current location"
 msgstr "Lisää nykyinen sijainti kirjanmerkkeihin"
 
 #: ../src/resources/gtk/help-overlay.ui.h:7
+#, fuzzy
+#| msgid "Show help"
+msgctxt "shortcut window"
 msgid "Show help"
 msgstr "Näytä ohje"
 
 #: ../src/resources/gtk/help-overlay.ui.h:8
+#, fuzzy
+#| msgid "Shortcuts"
+msgctxt "shortcut window"
 msgid "Shortcuts"
 msgstr "Pikanäppäimet"
 
 #: ../src/resources/gtk/help-overlay.ui.h:9
+#, fuzzy
+#| msgid "Opening"
+msgctxt "shortcut window"
 msgid "Opening"
 msgstr "Avaaminen"
 
+#: ../src/resources/gtk/help-overlay.ui.h:10
+#, fuzzy
+#| msgid "Open"
+msgctxt "shortcut window"
+msgid "Open"
+msgstr "Avaa"
+
 #: ../src/resources/gtk/help-overlay.ui.h:11
+#, fuzzy
+#| msgid "Open in new tab"
+msgctxt "shortcut window"
 msgid "Open in new tab"
 msgstr "Avaa uudessa välilehdessä"
 
 #: ../src/resources/gtk/help-overlay.ui.h:12
+#, fuzzy
+#| msgid "Open in new window"
+msgctxt "shortcut window"
 msgid "Open in new window"
 msgstr "Avaa uudessa ikkunassa"
 
 #: ../src/resources/gtk/help-overlay.ui.h:13
-#| msgid "Remote location — only searching the current folder"
+#, fuzzy
+#| msgid "Open item location (search and recent only)"
+msgctxt "shortcut window"
 msgid "Open item location (search and recent only)"
 msgstr "Avaa kohteen sijainti (vain haku ja viimeisimmät)"
 
 #: ../src/resources/gtk/help-overlay.ui.h:14
+#, fuzzy
+#| msgid "Open file and close window"
+msgctxt "shortcut window"
 msgid "Open file and close window"
 msgstr "Avaa tiedosto ja sulje ikkuna"
 
 #: ../src/resources/gtk/help-overlay.ui.h:15
+#, fuzzy
+#| msgid "Open with default application"
+msgctxt "shortcut window"
 msgid "Open with default application"
 msgstr "Avaa oletussovelluksella"
 
 #: ../src/resources/gtk/help-overlay.ui.h:16
+#, fuzzy
+#| msgid "Tabs"
+msgctxt "shortcut window"
 msgid "Tabs"
 msgstr "Välilehdet"
 
 #: ../src/resources/gtk/help-overlay.ui.h:17
+#, fuzzy
+#| msgid "New tab"
+msgctxt "shortcut window"
 msgid "New tab"
 msgstr "Uusi välilehti"
 
 #: ../src/resources/gtk/help-overlay.ui.h:18
+#, fuzzy
+#| msgid "Go to previous tab"
+msgctxt "shortcut window"
 msgid "Go to previous tab"
 msgstr "Siirry edelliseen välilehteen"
 
 #: ../src/resources/gtk/help-overlay.ui.h:19
+#, fuzzy
+#| msgid "Go to next tab"
+msgctxt "shortcut window"
 msgid "Go to next tab"
 msgstr "Siirry seuraavaan välilehteen"
 
 #: ../src/resources/gtk/help-overlay.ui.h:20
+#, fuzzy
+#| msgid "Open tab"
+msgctxt "shortcut window"
 msgid "Open tab"
 msgstr "Avaa välilehti"
 
 #: ../src/resources/gtk/help-overlay.ui.h:21
+#, fuzzy
+#| msgid "Move tab left"
+msgctxt "shortcut window"
 msgid "Move tab left"
 msgstr "Siirrä välilehteä vasemmalle"
 
 #: ../src/resources/gtk/help-overlay.ui.h:22
+#, fuzzy
+#| msgid "Move tab right"
+msgctxt "shortcut window"
 msgid "Move tab right"
 msgstr "Siirrä välilehteä oikealle"
 
 #: ../src/resources/gtk/help-overlay.ui.h:23
+#, fuzzy
+#| msgid "Navigation"
+msgctxt "shortcut window"
 msgid "Navigation"
 msgstr "Liikkuminen"
 
 #: ../src/resources/gtk/help-overlay.ui.h:24
+#, fuzzy
+#| msgid "Go back"
+msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Siirry takas"
 
 #: ../src/resources/gtk/help-overlay.ui.h:25
-#| msgid "_Forward"
+#, fuzzy
+#| msgid "Go forward"
+msgctxt "shortcut window"
 msgid "Go forward"
 msgstr "Siirry eteen"
 
 #: ../src/resources/gtk/help-overlay.ui.h:26
+#, fuzzy
+#| msgid "Go up"
+msgctxt "shortcut window"
 msgid "Go up"
 msgstr "Siirry ylös"
 
 #: ../src/resources/gtk/help-overlay.ui.h:27
+#, fuzzy
+#| msgid "Go down"
+msgctxt "shortcut window"
 msgid "Go down"
 msgstr "Siirry alas"
 
 #: ../src/resources/gtk/help-overlay.ui.h:28
+#, fuzzy
+#| msgid "Go to home folder"
+msgctxt "shortcut window"
 msgid "Go to home folder"
 msgstr "Siirry kotikansioon"
 
 #: ../src/resources/gtk/help-overlay.ui.h:29
+#, fuzzy
+#| msgid "Enter location"
+msgctxt "shortcut window"
 msgid "Enter location"
 msgstr "Kirjoita sijainti"
 
 #: ../src/resources/gtk/help-overlay.ui.h:30
+#, fuzzy
+#| msgid "Location bar with root location"
+msgctxt "shortcut window"
 msgid "Location bar with root location"
 msgstr "Sijaintipalkki juurisijainnilla"
 
 #: ../src/resources/gtk/help-overlay.ui.h:31
-#| msgid "Other Locations"
+#, fuzzy
+#| msgid "Location bar with home location"
+msgctxt "shortcut window"
 msgid "Location bar with home location"
 msgstr "Sijaintipalkki kotisijainnilla"
 
 #: ../src/resources/gtk/help-overlay.ui.h:32
-#| msgid "Views"
+#, fuzzy
+#| msgid "View"
+msgctxt "shortcut window"
 msgid "View"
 msgstr "Näkymä"
 
 #: ../src/resources/gtk/help-overlay.ui.h:33
+#, fuzzy
+#| msgid "Zoom in"
+msgctxt "shortcut window"
 msgid "Zoom in"
 msgstr "Lähennä"
 
 #: ../src/resources/gtk/help-overlay.ui.h:34
+#, fuzzy
+#| msgid "Zoom out"
+msgctxt "shortcut window"
 msgid "Zoom out"
 msgstr "Loitonna"
 
 #: ../src/resources/gtk/help-overlay.ui.h:35
-#| msgid "Reset"
+#, fuzzy
+#| msgid "Reset zoom"
+msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Palauta mittakaava"
 
 #: ../src/resources/gtk/help-overlay.ui.h:36
+#, fuzzy
+#| msgid "Refresh view"
+msgctxt "shortcut window"
 msgid "Refresh view"
 msgstr "Päivitä näkymä"
 
 #: ../src/resources/gtk/help-overlay.ui.h:37
+#, fuzzy
+#| msgid "Show/hide hidden files"
+msgctxt "shortcut window"
 msgid "Show/hide hidden files"
 msgstr "Näytä/piilota piilotiedostot"
 
 #: ../src/resources/gtk/help-overlay.ui.h:38
+#, fuzzy
+#| msgid "Show/hide sidebar"
+msgctxt "shortcut window"
 msgid "Show/hide sidebar"
 msgstr "Näytä/piilota sivupalkki"
 
 #: ../src/resources/gtk/help-overlay.ui.h:39
+#, fuzzy
+#| msgid "Show/hide action menu"
+msgctxt "shortcut window"
 msgid "Show/hide action menu"
 msgstr "Näytä/piilota toimintovalikko"
 
 #: ../src/resources/gtk/help-overlay.ui.h:40
+#, fuzzy
+#| msgid "List view"
+msgctxt "shortcut window"
 msgid "List view"
 msgstr "Luettelonäkymä"
 
 #: ../src/resources/gtk/help-overlay.ui.h:41
+#, fuzzy
+#| msgid "Grid view"
+msgctxt "shortcut window"
 msgid "Grid view"
 msgstr "Ruudukkonäkymä"
 
 #: ../src/resources/gtk/help-overlay.ui.h:42
-#| msgid "Rating"
+#, fuzzy
+#| msgid "Editing"
+msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Muokkaaminen"
 
 #: ../src/resources/gtk/help-overlay.ui.h:43
+#, fuzzy
+#| msgid "Create folder"
+msgctxt "shortcut window"
 msgid "Create folder"
 msgstr "Luo kansio"
 
 #: ../src/resources/gtk/help-overlay.ui.h:44
+#, fuzzy
+#| msgid "Rename"
+msgctxt "shortcut window"
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
 #: ../src/resources/gtk/help-overlay.ui.h:45
+#, fuzzy
+#| msgid "Move to trash"
+msgctxt "shortcut window"
 msgid "Move to trash"
 msgstr "Siirrä roskakoriin"
 
 #: ../src/resources/gtk/help-overlay.ui.h:46
+#, fuzzy
+#| msgid "Delete permanently"
+msgctxt "shortcut window"
 msgid "Delete permanently"
 msgstr "Poista pysyvästi"
 
 #: ../src/resources/gtk/help-overlay.ui.h:47
+#, fuzzy
+#| msgid "Copy"
+msgctxt "shortcut window"
 msgid "Copy"
 msgstr "Kopioi"
 
 #: ../src/resources/gtk/help-overlay.ui.h:48
+#, fuzzy
+#| msgid "Paste"
+msgctxt "shortcut window"
 msgid "Paste"
 msgstr "Liitä"
 
 #: ../src/resources/gtk/help-overlay.ui.h:49
+#, fuzzy
+#| msgid "Select all"
+msgctxt "shortcut window"
 msgid "Select all"
 msgstr "Valitse kaikki"
 
 #: ../src/resources/gtk/help-overlay.ui.h:50
-#| msgid "_Invert Selection"
+#, fuzzy
+#| msgid "Invert selection"
+msgctxt "shortcut window"
 msgid "Invert selection"
 msgstr "Käänteinen valinta"
 
 #: ../src/resources/gtk/help-overlay.ui.h:51
-#| msgid "Select Items Matching"
+#, fuzzy
+#| msgid "Select items matching"
+msgctxt "shortcut window"
 msgid "Select items matching"
 msgstr "Valitse täsmäävät kohteet"
 
+#: ../src/resources/gtk/help-overlay.ui.h:52
+#, fuzzy
+#| msgid "Undo"
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "Kumoa"
+
+#: ../src/resources/gtk/help-overlay.ui.h:53
+#, fuzzy
+#| msgid "Redo"
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "Tee uudelleen"
+
 #: ../src/resources/gtk/help-overlay.ui.h:54
+#, fuzzy
+#| msgid "Show item properties"
+msgctxt "shortcut window"
 msgid "Show item properties"
 msgstr "Näytä kohteen ominaisuudet"
 
@@ -4466,12 +4757,12 @@ msgid "Open With Other _Application"
 msgstr "Avaa _muussa sovelluksessa"
 
 #: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:16
-#: ../src/gtk/gtkplacesview.c:1657
+#: ../src/gtk/nautilusgtkplacesview.c:1632
 msgid "_Mount"
 msgstr "_Liitä"
 
 #: ../src/resources/ui/nautilus-files-view-context-menus.ui.h:17
-#: ../src/gtk/gtkplacesview.c:1647
+#: ../src/gtk/nautilusgtkplacesview.c:1622
 msgid "_Unmount"
 msgstr "_Irrota"
 
@@ -4568,210 +4859,386 @@ msgid "No Results Found"
 msgstr "Tuloksia ei löytynyt"
 
 #: ../src/resources/ui/nautilus-no-search-results.ui.h:2
-#: ../src/gtk/gtkplacesview.ui.h:5
+#: ../src/gtk/nautilusgtkplacesview.ui.h:5
 msgid "Try a different search"
 msgstr "Yritä hakea eri hakuehdoilla"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:1
-msgid "Files Preferences"
-msgstr "Tiedostonhallinnan asetukset"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:1
+msgid "Always"
+msgstr "Aina"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:2
+msgid "Local Files Only"
+msgstr "Vain paikalliset tiedostot"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:3
+msgid "Never"
+msgstr "Ei koskaan"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:4
+msgid "Small"
+msgstr "Pieni"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:5
+msgid "Standard"
+msgstr "Tavallinen"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:6
+msgid "Large"
+msgstr "Suuri"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:9
+msgid "By Name"
+msgstr "Nimen mukaan"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:10
+msgid "By Size"
+msgstr "Koon mukaan"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:2
-msgid "Default View"
-msgstr "Oletusnäkymä"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:11
+msgid "By Type"
+msgstr "Tyypin mukaan"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:3
-msgid "_Arrange items:"
-msgstr "_Järjestä:"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:12
+msgid "By Modification Date"
+msgstr "Muokkauspäivämäärän mukaan"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:13
+msgid "By Access Date"
+msgstr "Käyttöpäivämäärän mukaan"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:4
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:14
+msgid "By Trashed Date"
+msgstr "Roskakoriin siirron päivämäärän mukaan"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:15
+msgid "100 KB"
+msgstr "100 kt"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:16
+msgid "500 KB"
+msgstr "500 kt"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:17
+msgid "1 MB"
+msgstr "1 Mt"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:18
+msgid "3 MB"
+msgstr "3 Mt"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:19
+msgid "5 MB"
+msgstr "5 Mt"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:20
+msgid "10 MB"
+msgstr "10 Mt"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:21
+msgid "100 MB"
+msgstr "100 Mt"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:22
+msgid "1 GB"
+msgstr "1 Gt"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:23
+msgid "2 GB"
+msgstr "2 Gt"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:24
+msgid "4 GB"
+msgstr "4 Gt"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:25
+#, fuzzy
+#| msgid "Prefere_nces"
+msgid "Preferences"
+msgstr "A_setukset"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:26
+#: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:1
+msgid "Sort"
+msgstr "Järjestys"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:27
 msgid "Sort _folders before files"
 msgstr "_Kansiot ennen tiedostoja"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:5
-#| msgid "Delete all selected items permanently"
-msgid "Show context menu item to delete files permanently"
-msgstr "Näytä valikossa viite poistaa tiedostoja pysyvästi"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:28
+msgid "Allow folders to be _expanded"
+msgstr ""
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:6
-msgid "Show context menu item to create links from copied files"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:29
+#, fuzzy
+#| msgid "Icon Captions"
+msgid "Icon View Captions"
+msgstr "Kuvakkeiden tekstit"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:30
+#, fuzzy
+#| msgid ""
+#| "Choose the order of information to appear beneath icon names. More "
+#| "information will appear when zooming in closer."
+msgid ""
+"Add information to be displayed beneath file and folder names.\n"
+"More information will appear when zooming closer."
+msgstr ""
+"Valitse tietojen ilmestymisjärjestys. Niitä ilmestyy kuvakkeiden alle, kun "
+"kasvatat mittakaavaa."
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:32
+#, fuzzy
+#| msgid "%'d second"
+#| msgid_plural "%'d seconds"
+msgctxt "the n-th position of an icon caption"
+msgid "Second"
+msgstr "%'d sekunti"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:33
+msgctxt "the n-th position of an icon caption"
+msgid "Third"
 msgstr ""
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:7
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:34
+msgctxt "the n-th position of an icon caption"
+msgid "First"
+msgstr ""
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:35
 msgid "Views"
 msgstr "Näkymät"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:8
-msgid "Behavior"
-msgstr "Toiminta"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:36
+#, fuzzy
+#| msgid "Open action menu"
+msgid "Open Action"
+msgstr "Avaa toimintovalikko"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:9
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:37
 msgid "_Single click to open items"
 msgstr "_Avaa kohteet yhdellä napsautuksella"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:10
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:38
 msgid "_Double click to open items"
 msgstr "Avaa kohteet _kaksoisnapsautuksella"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:11
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:39
+#, fuzzy
+#| msgid "Link target:"
+msgid "Link Creation"
+msgstr "Linkin kohde:"
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:40
+#, fuzzy
+#| msgid "The target doesn't support symbolic links."
+msgid "Show action to create symbolic _links"
+msgstr "Kohde ei tue symbolisia linkkejä."
+
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:41
 msgid "Executable Text Files"
 msgstr "Suoritettavat tekstitiedostot"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:12
-msgid "_Run executable text files when they are opened"
-msgstr "Suorita _suoritettavat tekstitiedostot avattaessa"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:42
+#, fuzzy
+#| msgid "_Display"
+msgid "_Display them"
+msgstr "_Näytä"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:13
-msgid "_View executable text files when they are opened"
-msgstr "_Näytä suoritettavat tekstitiedostot avattaessa"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:43
+#, fuzzy
+#| msgid "_Run"
+msgid "_Run them"
+msgstr "_Suorita"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:14
-msgid "_Ask each time"
-msgstr "Kysy _joka kerta"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:44
+msgid "_Ask what to do"
+msgstr ""
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:16
-msgid "Ask before _emptying the Trash or deleting files"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:46
+#, fuzzy
+#| msgid "Ask before _emptying the Trash or deleting files"
+msgid "Ask before _emptying the Trash"
 msgstr "Kysy ennen roskakorin _tyhjennystä tai tiedostojen poistoa"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:17
-msgid "Icon Captions"
-msgstr "Kuvakkeiden tekstit"
-
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:18
-msgid ""
-"Choose the order of information to appear beneath icon names. More "
-"information will appear when zooming in closer."
-msgstr ""
-"Valitse tietojen ilmestymisjärjestys. Niitä ilmestyy kuvakkeiden alle, kun "
-"kasvatat mittakaavaa."
-
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:20
-msgid "Navigate folders in a tree"
-msgstr "Liiku kansioissa puunäkymässä"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:47
+#, fuzzy
+#| msgid "Show context menu item to delete files permanently"
+msgid "Show action to _permanently delete files and folders"
+msgstr "Näytä valikossa viite poistaa tiedostoja pysyvästi"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:21
-msgid "Display"
-msgstr "Näytä"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:48
+msgid "Behavior"
+msgstr "Toiminta"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:22
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:49
 msgid "Choose the order of information to appear in the list view."
 msgstr "Valitse tietojen ilmestymisjärjestys luettelonäkymässä."
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:23
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:50
 msgid "List Columns"
 msgstr "Luettelon sarakkeet"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:25
-msgid "Show _thumbnails:"
-msgstr "Näytä _pienoiskuvat:"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:52
+#, fuzzy
+#| msgid "Search files"
+msgid "Search in subfolders:"
+msgstr "Etsi tiedostoja"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:26
-msgid "_Only for files smaller than:"
-msgstr "_Vain kun tiedosto on pienempi kuin:"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:53
+#, fuzzy
+#| msgid "On This Computer"
+msgid "_On this computer only"
+msgstr "Tämä tietokone"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:28
-msgid "Count _number of items:"
-msgstr "_Laske kohteiden lukumäärät:"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:54
+#, fuzzy
+#| msgid "_Location"
+msgid "_All locations"
+msgstr "_Sijainti"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:29
-msgid "Preview"
-msgstr "Esikatselu"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:55
+#, fuzzy
+#| msgid "Never"
+msgid "_Never"
+msgstr "Ei koskaan"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:31
-msgid "Always"
-msgstr "Aina"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:56
+#, fuzzy
+#| msgid "Show _thumbnails:"
+msgid "Thumbnails"
+msgstr "Näytä _pienoiskuvat:"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:32
-msgid "Local Files Only"
-msgstr "Vain paikalliset tiedostot"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:57
+#, fuzzy
+#| msgid "Show _thumbnails:"
+msgid "Show thumbnails:"
+msgstr "Näytä _pienoiskuvat:"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:33
-msgid "Never"
-msgstr "Ei koskaan"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:58
+msgid "_Files on this computer only"
+msgstr ""
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:34
-msgid "By Name"
-msgstr "Nimen mukaan"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:59
+#, fuzzy
+#| msgid "All Files"
+msgid "A_ll files"
+msgstr "Kaikki tiedostot"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:35
-msgid "By Size"
-msgstr "Koon mukaan"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:60
+#, fuzzy
+#| msgid "Never"
+msgid "N_ever"
+msgstr "Ei koskaan"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:36
-msgid "By Type"
-msgstr "Tyypin mukaan"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:61
+#, fuzzy
+#| msgid "_Only for files smaller than:"
+msgid "Onl_y for files smaller than:"
+msgstr "_Vain kun tiedosto on pienempi kuin:"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:37
-msgid "By Modification Date"
-msgstr "Muokkauspäivämäärän mukaan"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:62
+#, fuzzy
+#| msgid "File conflict"
+msgid "File count"
+msgstr "Tiedostoristiriita"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:38
-msgid "By Access Date"
-msgstr "Käyttöpäivämäärän mukaan"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:63
+#, fuzzy
+#| msgid "Count _number of items:"
+msgid "Count number of files in folders:"
+msgstr "_Laske kohteiden lukumäärät:"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:39
-msgid "By Trashed Date"
-msgstr "Roskakoriin siirron päivämäärän mukaan"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:64
+#, fuzzy
+#| msgid "Folder is Empty"
+msgid "F_olders in this computer only"
+msgstr "Kansio on tyhjä"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:40
-msgid "Small"
-msgstr "Pieni"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:65
+#, fuzzy
+#| msgid "All Files"
+msgid "All folder_s"
+msgstr "Kaikki tiedostot"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:41
-msgid "Standard"
-msgstr "Tavallinen"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:66
+msgid "Ne_ver"
+msgstr ""
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:42
-msgid "Large"
-msgstr "Suuri"
+#: ../src/resources/ui/nautilus-preferences-window.ui.h:67
+#, fuzzy
+#| msgid "Search files"
+msgid "Search & Preview"
+msgstr "Etsi tiedostoja"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:43
-msgid "100 KB"
-msgstr "100 kt"
+#: ../src/resources/ui/nautilus-rename-file-popover.ui.h:2
+msgid "_Rename"
+msgstr "_Nimeä uudelleen"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:44
-msgid "500 KB"
-msgstr "500 kt"
+#: ../src/resources/ui/nautilus-search-popover.ui.h:1
+msgid "When"
+msgstr ""
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:45
-msgid "1 MB"
-msgstr "1 Mt"
+#: ../src/resources/ui/nautilus-search-popover.ui.h:2
+#, fuzzy
+#| msgid "Select type"
+msgid "Select a date"
+msgstr "Valitse tyyppi"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:46
-msgid "3 MB"
-msgstr "3 Mt"
+#: ../src/resources/ui/nautilus-search-popover.ui.h:4
+#, fuzzy
+#| msgid "Reload the current location"
+msgid "Clear the currently selected date"
+msgstr "Lataa nykyinen sijainti uudestaan"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:47
-msgid "5 MB"
-msgstr "5 Mt"
+#: ../src/resources/ui/nautilus-search-popover.ui.h:6
+msgid "Since…"
+msgstr ""
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:48
-msgid "10 MB"
-msgstr "10 Mt"
+#: ../src/resources/ui/nautilus-search-popover.ui.h:7
+#, fuzzy
+#| msgid "Last modified:"
+msgid "Last _modified"
+msgstr "Viimeksi muokattu:"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:49
-msgid "100 MB"
-msgstr "100 Mt"
+#: ../src/resources/ui/nautilus-search-popover.ui.h:8
+#, fuzzy
+#| msgid "Last _Trashed"
+msgid "Last _used"
+msgstr "R_oskakoriin siirtoaika"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:50
-msgid "1 GB"
-msgstr "1 Gt"
+#: ../src/resources/ui/nautilus-search-popover.ui.h:9
+msgid "What"
+msgstr ""
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:51
-msgid "2 GB"
-msgstr "2 Gt"
+#: ../src/resources/ui/nautilus-search-popover.ui.h:10
+#, fuzzy
+#| msgid "This file cannot be started"
+msgid "Which file types will be searched"
+msgstr "Tätä tiedostoa ei voi käynnistää"
 
-#: ../src/resources/ui/nautilus-preferences-dialog.ui.h:52
-msgid "4 GB"
-msgstr "4 Gt"
+#: ../src/resources/ui/nautilus-search-popover.ui.h:13
+#, fuzzy
+#| msgid "Text"
+msgid "Full Text"
+msgstr "Teksti"
 
-#: ../src/resources/ui/nautilus-remote-warning-bar.ui.h:1
-msgid "Remote location — only searching the current folder"
-msgstr "Etäsijainti — etsitään vain nykyisestä kansiosta"
+#: ../src/resources/ui/nautilus-search-popover.ui.h:14
+msgid "Search on the file content and name"
+msgstr ""
 
-#: ../src/resources/ui/nautilus-rename-file-popover.ui.h:2
-msgid "_Rename"
-msgstr "_Nimeä uudelleen"
+#: ../src/resources/ui/nautilus-search-popover.ui.h:15
+#, fuzzy
+#| msgid "File name"
+msgid "File Name"
+msgstr "Tiedoston nimi"
+
+#: ../src/resources/ui/nautilus-search-popover.ui.h:16
+#, fuzzy
+#| msgid "Search documents and folders by name"
+msgid "Search only on the file name"
+msgstr "Etsi asiakirjoja tai kansioita nimen perusteella"
 
 #: ../src/resources/ui/nautilus-toolbar-action-menu.ui.h:2
 msgid "New _Tab"
@@ -4813,10 +5280,6 @@ msgstr "Toiminto meneillään"
 msgid "Open operations in progress"
 msgstr "Avaa meneillään olevat toiminnot"
 
-#: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:1
-msgid "Sort"
-msgstr "Järjestys"
-
 #. This is used to sort by name in the toolbar view menu
 #: ../src/resources/ui/nautilus-toolbar-view-menu.ui.h:3
 msgctxt "Sort Criterion"
@@ -4867,88 +5330,160 @@ msgstr "P_ysäytä"
 msgid "_Files"
 msgstr "_Tiedostot"
 
-#: ../src/gtk/gtkplacesview.c:883
+#: ../src/gtk/nautilusgtkplacesview.c:880
 msgid "Searching for network locations"
 msgstr "Etsitään verkkosijainteja"
 
-#: ../src/gtk/gtkplacesview.c:890
+#: ../src/gtk/nautilusgtkplacesview.c:887
 msgid "No network locations found"
 msgstr "Verkkosijainteja ei löytynyt"
 
-#: ../src/gtk/gtkplacesview.c:1055
+#: ../src/gtk/nautilusgtkplacesview.c:1052
 msgid "Computer"
 msgstr "Tietokone"
 
 #. Restore from Cancel to Connect
-#: ../src/gtk/gtkplacesview.c:1182 ../src/gtk/gtkplacesview.ui.h:7
+#: ../src/gtk/nautilusgtkplacesview.c:1179
+#: ../src/gtk/nautilusgtkplacesview.ui.h:7
 msgid "Con_nect"
 msgstr "_Yhdistä"
 
 #. if it wasn't cancelled show a dialog
-#: ../src/gtk/gtkplacesview.c:1323
+#: ../src/gtk/nautilusgtkplacesview.c:1298
 msgid "Unable to unmount volume"
 msgstr "Taltion irrottaminen epäonnistui"
 
 #. Allow to cancel the operation
-#: ../src/gtk/gtkplacesview.c:1405
+#: ../src/gtk/nautilusgtkplacesview.c:1380
 msgid "Cance_l"
 msgstr "_Peru"
 
-#: ../src/gtk/gtkplacesview.c:1612
+#: ../src/gtk/nautilusgtkplacesview.c:1587
 msgid "Open in New _Tab"
 msgstr "Avaa uudessa _välilehdessä"
 
-#: ../src/gtk/gtkplacesview.c:1623
+#: ../src/gtk/nautilusgtkplacesview.c:1598
 msgid "Open in New _Window"
 msgstr "Avaa uudessa _ikkunassa"
 
-#: ../src/gtk/gtkplacesview.c:1822
+#: ../src/gtk/nautilusgtkplacesview.c:1797
 msgid "Unable to get remote server location"
 msgstr "Etäpalvelimen sijaintia ei voitu saavuttaa"
 
-#: ../src/gtk/gtkplacesview.c:1959 ../src/gtk/gtkplacesview.c:1968
+#: ../src/gtk/nautilusgtkplacesview.c:1934
+#: ../src/gtk/nautilusgtkplacesview.c:1943
 msgid "Networks"
 msgstr "Verkot"
 
-#: ../src/gtk/gtkplacesview.c:1959 ../src/gtk/gtkplacesview.c:1968
+#: ../src/gtk/nautilusgtkplacesview.c:1934
+#: ../src/gtk/nautilusgtkplacesview.c:1943
 msgid "On This Computer"
 msgstr "Tämä tietokone"
 
-#. Translators: respectively, free and total space of the drive
-#: ../src/gtk/gtkplacesviewrow.c:110
-#, c-format
+#. Translators: respectively, free and total space of the drive. The plural form
+#. * should be based on the free space available.
+#. * i.e. 1 GB / 24 GB available.
+#.
+#: ../src/gtk/nautilusgtkplacesviewrow.c:134
+#, fuzzy, c-format
+#| msgid "%s / %s available"
 msgid "%s / %s available"
-msgstr "%s / %s käytettävissä"
+msgid_plural "%s / %s available"
+msgstr[0] "%s / %s käytettävissä"
+msgstr[1] "%s / %s käytettävissä"
 
-#: ../src/gtk/gtkplacesviewrow.c:449
+#: ../src/gtk/nautilusgtkplacesviewrow.c:472
 msgid "Disconnect"
 msgstr "Katkaise yhteys"
 
-#: ../src/gtk/gtkplacesviewrow.c:449 ../src/gtk/gtkplacesviewrow.ui.h:1
+#: ../src/gtk/nautilusgtkplacesviewrow.c:472
+#: ../src/gtk/nautilusgtkplacesviewrow.ui.h:1
 msgid "Unmount"
 msgstr "Irrota"
 
 #. Translators: Server as any successfully connected network address
-#: ../src/gtk/gtkplacesview.ui.h:2
+#: ../src/gtk/nautilusgtkplacesview.ui.h:2
 msgid "No recent servers found"
 msgstr "Viimeisimpiä palvelimia ei löytynyt"
 
-#: ../src/gtk/gtkplacesview.ui.h:3
+#: ../src/gtk/nautilusgtkplacesview.ui.h:3
 msgid "Recent Servers"
 msgstr "Viimeisimmät palvelimet"
 
-#: ../src/gtk/gtkplacesview.ui.h:4
+#: ../src/gtk/nautilusgtkplacesview.ui.h:4
 msgid "No results found"
 msgstr "Tuloksia ei löytynyt"
 
-#: ../src/gtk/gtkplacesview.ui.h:6
+#: ../src/gtk/nautilusgtkplacesview.ui.h:6
 msgid "Connect to _Server"
 msgstr "Yhdistä _palvelimeen"
 
-#: ../src/gtk/gtkplacesview.ui.h:8
+#: ../src/gtk/nautilusgtkplacesview.ui.h:8
 msgid "Enter server address…"
 msgstr "Anna palvelimen _osoite…"
 
+#~ msgid "Enables or disables recursive search in Nautilus."
+#~ msgstr ""
+#~ "Ottaa käyttöön tai poistaa käytöstä rekursiivisen haun Nautiluksessa."
+
+#~ msgid "The mime type of the file."
+#~ msgstr "Tiedoston MIME-tyyppi."
+
+#~ msgid "Unable to rename desktop file"
+#~ msgstr "Työpöytätiedostoa ei voi nimetä uudestaan"
+
+#~ msgid "Untitled %s"
+#~ msgstr "Nimetön %s"
+
+#~ msgid "--no-desktop and --force-desktop cannot be used together."
+#~ msgstr ""
+#~ "valitsimia --no-desktop ja --force-desktop ei voi käyttää samanaikaisesti."
+
+#~ msgid "Never manage the desktop (ignore the GSettings preference)."
+#~ msgstr "Älä koskaan hallitse työpöytää (ohita GSettings-suositus)."
+
+#~ msgid "File Type"
+#~ msgstr "Tiedoston tyyppi"
+
+#~ msgid "Any"
+#~ msgstr "Mikä tahansa"
+
+#~ msgid "Remove this criterion from the search"
+#~ msgstr "Poista tämä ehto hausta"
+
+#~ msgid "Current"
+#~ msgstr "Nykyinen"
+
+#~ msgid "Add a new criterion to this search"
+#~ msgstr "Lisää uusi ehto tähän hakuun"
+
+#~ msgid "Files Preferences"
+#~ msgstr "Tiedostonhallinnan asetukset"
+
+#~ msgid "Default View"
+#~ msgstr "Oletusnäkymä"
+
+#~ msgid "_Arrange items:"
+#~ msgstr "_Järjestä:"
+
+#~ msgid "_Run executable text files when they are opened"
+#~ msgstr "Suorita _suoritettavat tekstitiedostot avattaessa"
+
+#~ msgid "_View executable text files when they are opened"
+#~ msgstr "_Näytä suoritettavat tekstitiedostot avattaessa"
+
+#~ msgid "_Ask each time"
+#~ msgstr "Kysy _joka kerta"
+
+#~ msgid "Navigate folders in a tree"
+#~ msgstr "Liiku kansioissa puunäkymässä"
+
+#~ msgid "Display"
+#~ msgstr "Näytä"
+
+#~ msgid "Preview"
+#~ msgstr "Esikatselu"
+
 #~ msgid ""
 #~ "Nautilus 3.0 deprecated this directory and tried migrating this "
 #~ "configuration to ~/.config/nautilus"
@@ -4985,9 +5520,6 @@ msgstr "Anna palvelimen _osoite…"
 #~ msgid "_Name"
 #~ msgstr "_Nimi"
 
-#~ msgid "_Location"
-#~ msgstr "_Sijainti"
-
 #~ msgid "The text of the label."
 #~ msgstr "Nimiön teksti."
 
@@ -5127,9 +5659,6 @@ msgstr "Anna palvelimen _osoite…"
 #~ msgid "D_efault zoom level:"
 #~ msgstr "_Oletusmittakaava:"
 
-#~ msgid "Last _Opened"
-#~ msgstr "Viim_eksi avattu"
-
 #~ msgid "%s deleted"
 #~ msgid_plural "%s deleted"
 #~ msgstr[0] "%s poistettu"
@@ -5668,9 +6197,6 @@ msgstr "Anna palvelimen _osoite…"
 #~ msgid "Stop loading the current location"
 #~ msgstr "Keskeytä nykyisen sijainnin lataus"
 
-#~ msgid "Reload the current location"
-#~ msgstr "Lataa nykyinen sijainti uudestaan"
-
 #~ msgid "_All Topics"
 #~ msgstr "_Kaikki aiheet"
 
@@ -5779,9 +6305,6 @@ msgstr "Anna palvelimen _osoite…"
 #~ msgid "_Search for Files…"
 #~ msgstr "Et_si tiedostoja…"
 
-#~ msgid "Search documents and folders by name"
-#~ msgstr "Etsi asiakirjoja tai kansioita nimen perusteella"
-
 #~ msgid "List"
 #~ msgstr "Luettelo"
 


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