[nautilus] Updated Finnish translation



commit 2b982f72187ec611957f714b476ad4f87250582c
Author: Jiri Grönroos <jiri gronroos iki fi>
Date:   Fri Aug 26 10:42:28 2016 +0000

    Updated Finnish translation

 po/fi.po | 1627 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 900 insertions(+), 727 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 38ee20b..78f18e0 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-08-19 17:49+0000\n"
-"PO-Revision-Date: 2016-08-20 20:09+0300\n"
+"POT-Creation-Date: 2016-08-25 19:18+0000\n"
+"PO-Revision-Date: 2016-08-25 23:37+0300\n"
 "Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
 "Language-Team: suomi <lokalisointi-lista googlegroups com>\n"
 "Language: fi\n"
@@ -109,7 +109,7 @@ msgstr ""
 "Sovelluksen toimintaa on mahdollista laajentaa liitännäisillä ja "
 "komentosarjoilla."
 
-#: data/org.gnome.Nautilus.desktop.in:3 src/nautilus-mime-actions.c:97
+#: data/org.gnome.Nautilus.desktop.in:3 src/nautilus-mime-actions.c:98
 #: src/nautilus-properties-window.c:4160 src/nautilus-window.c:2745
 msgid "Files"
 msgstr "Tiedostot"
@@ -123,7 +123,6 @@ msgstr ""
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Nautilus.desktop.in:9
-#| msgid "Nautilus"
 msgid "org.gnome.Nautilus"
 msgstr "org.gnome.Nautilus"
 
@@ -131,13 +130,13 @@ msgstr "org.gnome.Nautilus"
 msgid "New Window"
 msgstr "Uusi ikkuna"
 
-#: data/org.gnome.nautilus.gschema.xml:73
+#: data/org.gnome.nautilus.gschema.xml:80
 #, 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:74
+#: data/org.gnome.nautilus.gschema.xml:81
 msgid ""
 "If set to \"after-current-tab\", then new tabs are inserted after the "
 "current tab. If set to \"end\", then new tabs are appended to the end of the "
@@ -147,11 +146,11 @@ msgstr ""
 "jälkeen.  Jos arvo on ”end”, lisätään uudet välilehdet välilehtiluettelon "
 "loppuun."
 
-#: data/org.gnome.nautilus.gschema.xml:78
+#: data/org.gnome.nautilus.gschema.xml:85
 msgid "Always use the location entry, instead of the pathbar"
 msgstr "Käytä aina sijaintia polkupalkin sijasta"
 
-#: data/org.gnome.nautilus.gschema.xml:79
+#: data/org.gnome.nautilus.gschema.xml:86
 msgid ""
 "If set to true, then Nautilus browser windows will always use a textual "
 "input entry for the location toolbar, instead of the pathbar."
@@ -159,31 +158,31 @@ msgstr ""
 "Jos tosi, Nautiluksen selausikkunat käyttävät aina tekstimuotoista "
 "syötekenttä sijainnin näyttämiseen polkupalkin sijasta."
 
-#: data/org.gnome.nautilus.gschema.xml:83
+#: data/org.gnome.nautilus.gschema.xml:90
 #, 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:84
+#: data/org.gnome.nautilus.gschema.xml:91
 msgid ""
 "In which locations Nautilus should search on subfolders. Available values "
 "are 'local-only', 'always', 'never'."
 msgstr ""
 
-#: data/org.gnome.nautilus.gschema.xml:88
+#: data/org.gnome.nautilus.gschema.xml:95
 msgid "Filter the search dates using either last used or last modified"
 msgstr ""
 
-#: data/org.gnome.nautilus.gschema.xml:89
+#: data/org.gnome.nautilus.gschema.xml:96
 msgid "Filter the search dates using either last used or last modified."
 msgstr ""
 
-#: data/org.gnome.nautilus.gschema.xml:93
+#: data/org.gnome.nautilus.gschema.xml:100
 msgid "Whether to show a context menu item to delete permanently"
 msgstr ""
 
-#: data/org.gnome.nautilus.gschema.xml:94
+#: data/org.gnome.nautilus.gschema.xml:101
 #, fuzzy
 #| msgid ""
 #| "If set to true, then Nautilus will ask for confirmation when you attempt "
@@ -195,13 +194,13 @@ msgstr ""
 "Jos tosi, Nautilus kysyy varmistusta kun siirrät tiedostoja roskakoriin tai "
 "tyhjennät roskakorin."
 
-#: data/org.gnome.nautilus.gschema.xml:98
+#: data/org.gnome.nautilus.gschema.xml:105
 msgid ""
 "Whether to show context menu items to create links from copied or selected "
 "files"
 msgstr ""
 
-#: data/org.gnome.nautilus.gschema.xml:99
+#: data/org.gnome.nautilus.gschema.xml:106
 #, fuzzy
 #| msgid ""
 #| "If set to true, then Nautilus will ask for confirmation when you attempt "
@@ -213,7 +212,7 @@ msgstr ""
 "Jos tosi, Nautilus kysyy varmistusta kun siirrät tiedostoja roskakoriin tai "
 "tyhjennät roskakorin."
 
-#: data/org.gnome.nautilus.gschema.xml:103
+#: data/org.gnome.nautilus.gschema.xml:110
 #, fuzzy
 #| msgid ""
 #| "Whether to ask for confirmation when deleting files, or emptying Trash"
@@ -223,7 +222,7 @@ msgstr ""
 "Kysytäänkö varmistusta, kun tiedostoja siirretään roskakoriin tai roskakoria "
 "tyhjennetään"
 
-#: data/org.gnome.nautilus.gschema.xml:104
+#: data/org.gnome.nautilus.gschema.xml:111
 msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "delete files, or empty the Trash."
@@ -231,11 +230,23 @@ msgstr ""
 "Jos tosi, Nautilus kysyy varmistusta kun siirrät tiedostoja roskakoriin tai "
 "tyhjennät roskakorin."
 
-#: data/org.gnome.nautilus.gschema.xml:109
+#: data/org.gnome.nautilus.gschema.xml:115
+msgid ""
+"Whether to extract compressed files instead of opening them in another "
+"application"
+msgstr ""
+
+#: data/org.gnome.nautilus.gschema.xml:116
+msgid ""
+"If set to true, then Nautilus will automatically extract compressed files "
+"instead of opening them in another application"
+msgstr ""
+
+#: data/org.gnome.nautilus.gschema.xml:121
 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:110
+#: data/org.gnome.nautilus.gschema.xml:122
 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 "
@@ -248,11 +259,11 @@ msgstr ""
 "paikallisilla tiedostojärjestelmillä. Jos arvo on ”never”, kohteiden "
 "lukumäärät eivät näy."
 
-#: data/org.gnome.nautilus.gschema.xml:114
+#: data/org.gnome.nautilus.gschema.xml:126
 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:115
+#: data/org.gnome.nautilus.gschema.xml:127
 msgid ""
 "Possible values are \"single\" to launch files on a single click, or \"double"
 "\" to launch them on a double click."
@@ -260,11 +271,11 @@ msgstr ""
 "Mahdollisia arvoja ovat ”single” tiedostojen käynnistämiseen yhdellä "
 "napsautuksella tai ”double” kaksoisnapsautuksella."
 
-#: data/org.gnome.nautilus.gschema.xml:119
+#: data/org.gnome.nautilus.gschema.xml:131
 msgid "What to do with executable text files when activated"
 msgstr "Mitä tehdä suoritettavilla tekstitiedostoilla kun ne aktivoidaan"
 
-#: data/org.gnome.nautilus.gschema.xml:120
+#: data/org.gnome.nautilus.gschema.xml:132
 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, "
@@ -276,13 +287,13 @@ 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:124
+#: data/org.gnome.nautilus.gschema.xml:136
 #, 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:125
+#: data/org.gnome.nautilus.gschema.xml:137
 #, fuzzy
 #| msgid ""
 #| "Whether to show the user a package installer dialog in case an unknown "
@@ -295,7 +306,7 @@ msgstr ""
 "tuntemattoman MIME-tyypin mukainen kohde, jotta tälle tyypille voidaan etsiä "
 "käsittelevää sen sovellusta."
 
-#: data/org.gnome.nautilus.gschema.xml:129
+#: data/org.gnome.nautilus.gschema.xml:141
 #, fuzzy
 #| msgid ""
 #| "Show a warning dialog for the change of the shortcut for move to trash"
@@ -304,7 +315,7 @@ msgid ""
 msgstr ""
 "Näytä varoitusikkuna roskakoriin siirron pikanäppäimen muutokseen liittyen"
 
-#: data/org.gnome.nautilus.gschema.xml:130
+#: data/org.gnome.nautilus.gschema.xml:142
 #, fuzzy
 #| msgid ""
 #| "Show a warning dialog for the change of the shortcut for move to trash "
@@ -316,11 +327,11 @@ 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:134
+#: data/org.gnome.nautilus.gschema.xml:146
 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:135
+#: data/org.gnome.nautilus.gschema.xml:147
 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 "
@@ -329,11 +340,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:139
+#: data/org.gnome.nautilus.gschema.xml:151
 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:140
+#: data/org.gnome.nautilus.gschema.xml:152
 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. "
@@ -343,11 +354,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:144
+#: data/org.gnome.nautilus.gschema.xml:156
 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:145
+#: data/org.gnome.nautilus.gschema.xml:157
 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. "
@@ -357,11 +368,11 @@ msgstr ""
 "määrittää mikä nappi käynnistää ”Takaisin”-komennon selainikkunassa. "
 "Mahdolliset arvot ovat väliltä 6-14."
 
-#: data/org.gnome.nautilus.gschema.xml:150
+#: data/org.gnome.nautilus.gschema.xml:162
 msgid "When to show thumbnails of files"
 msgstr "Milloin tiedostojen pienoiskuvat näytetään"
 
-#: data/org.gnome.nautilus.gschema.xml:151
+#: data/org.gnome.nautilus.gschema.xml:163
 #, fuzzy
 msgid ""
 "Speed trade-off for when to show a file as a thumbnail. If set to \"always\" "
@@ -376,11 +387,11 @@ msgstr ""
 "tiedostojärjestelmillä. Jos ”never”, pienoiskuvan sijaan näkyy yleinen "
 "kuvake."
 
-#: data/org.gnome.nautilus.gschema.xml:155
+#: data/org.gnome.nautilus.gschema.xml:167
 msgid "Maximum image size for thumbnailing"
 msgstr "Suurin koko kuville, joista tehdään pienoiskuvia"
 
-#: data/org.gnome.nautilus.gschema.xml:156
+#: data/org.gnome.nautilus.gschema.xml:168
 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 "
@@ -390,11 +401,11 @@ msgstr ""
 "tarkoituksena on estää pienoiskuvien teko suurista kuvista, mikä voi kestää "
 "kauan tai viedä paljon muistia."
 
-#: data/org.gnome.nautilus.gschema.xml:160
+#: data/org.gnome.nautilus.gschema.xml:172
 msgid "Show folders first in windows"
 msgstr "Näytä kansiot ikkunoissa ensimmäisinä"
 
-#: data/org.gnome.nautilus.gschema.xml:161
+#: data/org.gnome.nautilus.gschema.xml:173
 msgid ""
 "If set to true, then Nautilus shows folders prior to showing files in the "
 "icon and list views."
@@ -402,11 +413,11 @@ msgstr ""
 "Jos tosi, Nautilus näyttää kansiot kuvakenäkymissä ja luetteloissa "
 "tiedostoja ennen."
 
-#: data/org.gnome.nautilus.gschema.xml:168
+#: data/org.gnome.nautilus.gschema.xml:180
 msgid "Default sort order"
 msgstr "Oletusarvoinen järjestys"
 
-#: data/org.gnome.nautilus.gschema.xml:169
+#: data/org.gnome.nautilus.gschema.xml:181
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
 "\", \"size\", \"type\" and \"mtime\"."
@@ -414,11 +425,11 @@ 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:173
+#: data/org.gnome.nautilus.gschema.xml:185
 msgid "Reverse sort order in new windows"
 msgstr "Käänteinen järjestys uusissa ikkunoissa"
 
-#: data/org.gnome.nautilus.gschema.xml:174
+#: data/org.gnome.nautilus.gschema.xml:186
 #, fuzzy
 #| msgid ""
 #| "If true, files in new windows will be sorted in reverse order. ie, if "
@@ -436,11 +447,11 @@ msgstr ""
 "eikä A-Ö; jos tiedostot ovat koon mukaisessa järjestyksessä, suurimmat "
 "tulevat ensimmäisinä pienimpien sijaan."
 
-#: data/org.gnome.nautilus.gschema.xml:184
+#: data/org.gnome.nautilus.gschema.xml:196
 msgid "Default folder viewer"
 msgstr "Oletusarvoinen kansion näkymä"
 
-#: data/org.gnome.nautilus.gschema.xml:185
+#: data/org.gnome.nautilus.gschema.xml:197
 #, fuzzy
 msgid ""
 "When a folder is visited this viewer is used unless you have selected "
@@ -451,30 +462,30 @@ msgstr ""
 "erikseen valittu kyseiselle kansiolle. Kelvollisia arvoja ovat ”list-view”, "
 "”icon-view” ja ”compact-view”."
 
-#: data/org.gnome.nautilus.gschema.xml:189
+#: data/org.gnome.nautilus.gschema.xml:201
 msgid "Whether to show hidden files"
 msgstr "Näkyvätkö piilotiedostot"
 
-#: data/org.gnome.nautilus.gschema.xml:190
+#: data/org.gnome.nautilus.gschema.xml:202
 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:194
+#: data/org.gnome.nautilus.gschema.xml:206
 msgid "What viewer should be used when searching"
 msgstr ""
 
-#: data/org.gnome.nautilus.gschema.xml:195
+#: data/org.gnome.nautilus.gschema.xml:207
 msgid ""
 "When searching Nautilus will switch to the type of view in this setting."
 msgstr ""
 
-#: data/org.gnome.nautilus.gschema.xml:199
+#: data/org.gnome.nautilus.gschema.xml:211
 msgid "Bulk rename utility"
 msgstr "Joukoittainen uudelleennimeämistyökalu"
 
-#: data/org.gnome.nautilus.gschema.xml:200
+#: data/org.gnome.nautilus.gschema.xml:212
 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 "
@@ -489,13 +500,13 @@ msgstr ""
 "ja mahdolliset komentorivivalitsimet. Mikäli ajotiedostona ei ole "
 "täydellinen polku, ajotiedostoa etsitään hakupolusta."
 
-#: data/org.gnome.nautilus.gschema.xml:204
+#: data/org.gnome.nautilus.gschema.xml:216
 msgid ""
 "Whether to open the hovered folder after a timeout when drag and drop "
 "operation"
 msgstr ""
 
-#: data/org.gnome.nautilus.gschema.xml:205
+#: data/org.gnome.nautilus.gschema.xml:217
 #, fuzzy
 #| msgid ""
 #| "If this is set to true, an icon linking to the home folder will be put on "
@@ -505,11 +516,19 @@ msgid ""
 "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:212
+#: data/org.gnome.nautilus.gschema.xml:224
+msgid "Default format for compressing files"
+msgstr ""
+
+#: data/org.gnome.nautilus.gschema.xml:225
+msgid "The format that will be selected when compressing files."
+msgstr ""
+
+#: data/org.gnome.nautilus.gschema.xml:232
 msgid "List of possible captions on icons"
 msgstr "Luettelo mahdollisista kuvakkeiden teksteistä"
 
-#: data/org.gnome.nautilus.gschema.xml:213
+#: data/org.gnome.nautilus.gschema.xml:233
 #, fuzzy
 msgid ""
 "A list of captions below an icon in the icon view and the desktop. The "
@@ -525,19 +544,19 @@ msgstr ""
 "”permissions” (oikeudet), ”octal_permissions” (oikeudet oktaalilukuna) ja "
 "”mime_type” (MIME-tyyppi)."
 
-#: data/org.gnome.nautilus.gschema.xml:217
+#: data/org.gnome.nautilus.gschema.xml:237
 msgid "Default icon zoom level"
 msgstr "Oletusarvoinen kuvakkeiden mittakaava"
 
-#: data/org.gnome.nautilus.gschema.xml:218
+#: data/org.gnome.nautilus.gschema.xml:238
 msgid "Default zoom level used by the icon view."
 msgstr "Kuvakenäkymän oletusarvoinen mittakaava."
 
-#: data/org.gnome.nautilus.gschema.xml:222
+#: data/org.gnome.nautilus.gschema.xml:242
 msgid "Default Thumbnail Icon Size"
 msgstr "Pienoiskuvien oletuskoko"
 
-#: data/org.gnome.nautilus.gschema.xml:223
+#: data/org.gnome.nautilus.gschema.xml:243
 #, fuzzy
 #| msgid "The default size of an icon for a thumbnail in the icon view."
 msgid ""
@@ -545,12 +564,12 @@ msgid ""
 "NAUTILUS_ICON_SIZE_STANDARD size."
 msgstr "Kuvakenäkymän pienoiskuvien oletuskoko."
 
-#: data/org.gnome.nautilus.gschema.xml:227
-#: data/org.gnome.nautilus.gschema.xml:298
+#: data/org.gnome.nautilus.gschema.xml:247
+#: data/org.gnome.nautilus.gschema.xml:318
 msgid "Text Ellipsis Limit"
 msgstr "Tekstin typistysraja"
 
-#: data/org.gnome.nautilus.gschema.xml:228
+#: data/org.gnome.nautilus.gschema.xml:248
 #, fuzzy
 #| msgid ""
 #| "A string specifying how parts of overlong file names should be replaced "
@@ -597,68 +616,68 @@ msgstr ""
 "(50%), small (66%), standard (100%), large (150%), larger (200%), largest "
 "(400%)"
 
-#: data/org.gnome.nautilus.gschema.xml:235
+#: data/org.gnome.nautilus.gschema.xml:255
 msgid "Default list zoom level"
 msgstr "Oletusarvoinen luettelon mittakaava"
 
-#: data/org.gnome.nautilus.gschema.xml:236
+#: data/org.gnome.nautilus.gschema.xml:256
 msgid "Default zoom level used by the list view."
 msgstr "Luettelonäkymän oletusarvoinen mittakaava."
 
-#: data/org.gnome.nautilus.gschema.xml:240
+#: data/org.gnome.nautilus.gschema.xml:260
 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:241
+#: data/org.gnome.nautilus.gschema.xml:261
 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:245
+#: data/org.gnome.nautilus.gschema.xml:265
 msgid "Default column order in the list view"
 msgstr "Luettelonäkymän oletusarvoinen sarakejärjestys"
 
-#: data/org.gnome.nautilus.gschema.xml:246
+#: data/org.gnome.nautilus.gschema.xml:266
 msgid "Default column order in the list view."
 msgstr "Luettelonäkymän oletusarvoinen sarakejärjestys."
 
-#: data/org.gnome.nautilus.gschema.xml:250
+#: data/org.gnome.nautilus.gschema.xml:270
 msgid "Use tree view"
 msgstr "Käytä puunäkymää"
 
-#: data/org.gnome.nautilus.gschema.xml:251
+#: data/org.gnome.nautilus.gschema.xml:271
 msgid ""
 "Whether a tree should be used for list view navigation instead of a flat "
 "list."
 msgstr ""
 
-#: data/org.gnome.nautilus.gschema.xml:257
+#: data/org.gnome.nautilus.gschema.xml:277
 msgctxt "desktop-font"
 msgid "''"
-msgstr ""
+msgstr "''"
 
-#: data/org.gnome.nautilus.gschema.xml:258
+#: data/org.gnome.nautilus.gschema.xml:278
 msgid "Desktop font"
 msgstr "Työpöydän fontti"
 
-#: data/org.gnome.nautilus.gschema.xml:259
+#: data/org.gnome.nautilus.gschema.xml:279
 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:263
+#: data/org.gnome.nautilus.gschema.xml:283
 msgid "Home icon visible on desktop"
 msgstr "Koti-kuvake näkyy työpöydällä"
 
-#: data/org.gnome.nautilus.gschema.xml:264
+#: data/org.gnome.nautilus.gschema.xml:284
 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:268
+#: data/org.gnome.nautilus.gschema.xml:288
 msgid "Trash icon visible on desktop"
 msgstr "Roskakori näkyy työpöydällä"
 
-#: data/org.gnome.nautilus.gschema.xml:269
+#: data/org.gnome.nautilus.gschema.xml:289
 #, fuzzy
 #| msgid ""
 #| "If this is set to true, an icon linking to the trash will be put on the "
@@ -668,21 +687,21 @@ msgid ""
 "desktop."
 msgstr "Jos tosi, roskakorin kuvake näkyy työpöydällä."
 
-#: data/org.gnome.nautilus.gschema.xml:273
+#: data/org.gnome.nautilus.gschema.xml:293
 msgid "Show mounted volumes on the desktop"
 msgstr "Näytä liitetyt asemat työpöydällä"
 
-#: data/org.gnome.nautilus.gschema.xml:274
+#: data/org.gnome.nautilus.gschema.xml:294
 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:278
+#: data/org.gnome.nautilus.gschema.xml:298
 msgid "Network Servers icon visible on the desktop"
 msgstr "Näytä Verkkopalvelimien kuvake työpöydällä"
 
-#: data/org.gnome.nautilus.gschema.xml:279
+#: data/org.gnome.nautilus.gschema.xml:299
 msgid ""
 "If this is set to true, an icon linking to the Network Servers view will be "
 "put on the desktop."
@@ -690,18 +709,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:282
+#: data/org.gnome.nautilus.gschema.xml:302
 #, fuzzy
 #| msgid "Home"
 msgctxt "home-icon-name"
 msgid "'Home'"
 msgstr "Koti"
 
-#: data/org.gnome.nautilus.gschema.xml:283
+#: data/org.gnome.nautilus.gschema.xml:303
 msgid "Desktop home icon name"
 msgstr "Koti-työpöytäkuvakkeen nimi"
 
-#: data/org.gnome.nautilus.gschema.xml:284
+#: data/org.gnome.nautilus.gschema.xml:304
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
@@ -709,20 +728,20 @@ 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:287
+#: data/org.gnome.nautilus.gschema.xml:307
 #, fuzzy
 #| msgid "Trash"
 msgctxt "trash-icon-name"
 msgid "'Trash'"
 msgstr "Roskakori"
 
-#: data/org.gnome.nautilus.gschema.xml:288
+#: data/org.gnome.nautilus.gschema.xml:308
 #, fuzzy
 #| msgid "Desktop trash icon name"
 msgid "Desktop Trash icon name"
 msgstr "Roskakori-työpöytäkuvakkeen nimi"
 
-#: data/org.gnome.nautilus.gschema.xml:289
+#: data/org.gnome.nautilus.gschema.xml:309
 #, fuzzy
 #| msgid ""
 #| "This name can be set if you want a custom name for the trash icon on the "
@@ -734,18 +753,18 @@ 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:292
+#: data/org.gnome.nautilus.gschema.xml:312
 #, fuzzy
 #| msgid "Network servers icon name"
 msgctxt "network-icon-name"
 msgid "'Network Servers'"
 msgstr "Verkkopalvelimien kuvakkeen nimi"
 
-#: data/org.gnome.nautilus.gschema.xml:293
+#: data/org.gnome.nautilus.gschema.xml:313
 msgid "Network servers icon name"
 msgstr "Verkkopalvelimien kuvakkeen nimi"
 
-#: data/org.gnome.nautilus.gschema.xml:294
+#: data/org.gnome.nautilus.gschema.xml:314
 msgid ""
 "This name can be set if you want a custom name for the network servers icon "
 "on the desktop."
@@ -753,7 +772,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:299
+#: data/org.gnome.nautilus.gschema.xml:319
 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 "
@@ -765,61 +784,61 @@ 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:303
+#: data/org.gnome.nautilus.gschema.xml:323
 msgid "Fade the background on change"
 msgstr "Häivytä taustakuva vaihdettaessa"
 
-#: data/org.gnome.nautilus.gschema.xml:304
+#: data/org.gnome.nautilus.gschema.xml:324
 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:312
+#: data/org.gnome.nautilus.gschema.xml:332
 #, 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:313
+#: data/org.gnome.nautilus.gschema.xml:333
 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:317
+#: data/org.gnome.nautilus.gschema.xml:337
 #, 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:318
+#: data/org.gnome.nautilus.gschema.xml:338
 msgid "Whether the navigation window should be maximized by default."
 msgstr "Suurennetaanko selausikkuna oletusarvoisesti."
 
-#: data/org.gnome.nautilus.gschema.xml:322
+#: data/org.gnome.nautilus.gschema.xml:342
 msgid "Width of the side pane"
 msgstr "Sivupaneelin leveys"
 
-#: data/org.gnome.nautilus.gschema.xml:323
+#: data/org.gnome.nautilus.gschema.xml:343
 msgid "The default width of the side pane in new windows."
 msgstr "Uusien ikkunoiden sivupaneelin oletusarvoinen leveys."
 
-#: data/org.gnome.nautilus.gschema.xml:327
+#: data/org.gnome.nautilus.gschema.xml:347
 msgid "Show location bar in new windows"
 msgstr "Näytä sijaintipalkki uusissa ikkunoissa"
 
-#: data/org.gnome.nautilus.gschema.xml:328
+#: data/org.gnome.nautilus.gschema.xml:348
 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:332
+#: data/org.gnome.nautilus.gschema.xml:352
 msgid "Show side pane in new windows"
 msgstr "Näytä sivupaneeli uusissa ikkunoissa"
 
-#: data/org.gnome.nautilus.gschema.xml:333
+#: data/org.gnome.nautilus.gschema.xml:353
 msgid "If set to true, newly opened windows will have the side pane visible."
 msgstr "Jos tosi, sivupaneeli näkyy uusissa ikkunoissa."
 
@@ -836,14 +855,15 @@ msgid "Show more _details"
 msgstr "Näytä _lisätietoja"
 
 #. Put up the timed wait window.
-#: eel/eel-stock-dialogs.c:194 src/nautilus-file-conflict-dialog.c:553
-#: src/nautilus-file-operations.c:179 src/nautilus-files-view.c:1018
-#: src/nautilus-files-view.c:1493 src/nautilus-files-view.c:5037
-#: 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:538
+#: eel/eel-stock-dialogs.c:194 src/nautilus-file-conflict-dialog.c:368
+#: src/nautilus-file-operations.c:214 src/nautilus-files-view.c:1037
+#: src/nautilus-files-view.c:1545 src/nautilus-files-view.c:5306
+#: src/nautilus-files-view.c:5770 src/nautilus-location-entry.c:269
+#: src/nautilus-mime-actions.c:560 src/nautilus-mime-actions.c:564
+#: src/nautilus-mime-actions.c:635 src/nautilus-mime-actions.c:984
+#: src/nautilus-mime-actions.c:1491 src/nautilus-mime-actions.c:1725
+#: src/nautilus-properties-window.c:4151 src/nautilus-properties-window.c:5145
+#: src/nautilus-search-popover.c:538
 msgid "_Cancel"
 msgstr "_Peru"
 
@@ -876,7 +896,7 @@ msgstr "Koti"
 
 #. hardcode "Desktop"
 #: nautilus-desktop/nautilus-desktop-window.c:297
-#: nautilus-desktop/nautilus-desktop-window.c:474
+#: nautilus-desktop/nautilus-desktop-window.c:473
 msgid "Desktop"
 msgstr "Työpöytä"
 
@@ -1010,7 +1030,7 @@ msgstr ""
 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:234 src/nautilus-mime-actions.c:635
+#: src/nautilus-autorun-software.c:234 src/nautilus-mime-actions.c:636
 msgid "_Run"
 msgstr "_Suorita"
 
@@ -1106,7 +1126,6 @@ msgid "MIME Type"
 msgstr "MIME-tyyppi"
 
 #: src/nautilus-column-utilities.c:121
-#| msgid "The type of the file."
 msgid "The MIME type of the file."
 msgstr "Tiedoston MIME-tyyppi."
 
@@ -1147,6 +1166,33 @@ msgstr "Relevanssi"
 msgid "Relevance rank for search"
 msgstr "Relevanssiasema hauissa"
 
+#: src/nautilus-compress-dialog-controller.c:10
+msgid "Compatible with all operating systems."
+msgstr "Yhteensopiva kaikkien käyttöjärjestelmien kanssa."
+
+#: src/nautilus-compress-dialog-controller.c:11
+msgid "Smaller archives but Linux and Mac only."
+msgstr "Pienemmät arkistot, mutta tuki vain Linuxilla ja Macilla."
+
+#: src/nautilus-compress-dialog-controller.c:12
+msgid "Smaller archives but must be installed on Windows and Mac."
+msgstr "Pienemmät arkistot, mutta tulee asentaa Windowsilel ja Macille."
+
+#: src/nautilus-compress-dialog-controller.c:41
+#| msgid "File names cannot contain “/”."
+msgid "Archive names cannot contain “/”."
+msgstr "Arkiston nimi ei voi sisältää merkkiä “/”."
+
+#: src/nautilus-compress-dialog-controller.c:43
+#| msgid "A file cannot be called “.”."
+msgid "An archive cannot be called “.”."
+msgstr "Arkiston nimi ei voi olla “.”."
+
+#: src/nautilus-compress-dialog-controller.c:45
+#| msgid "A file cannot be called “..”."
+msgid "An archive cannot be called “..”."
+msgstr "Arkiston nimi ei voi olla “..”."
+
 #: src/nautilus-desktop-item-properties.c:404
 #: src/nautilus-desktop-item-properties.c:414
 #: src/nautilus-image-properties-page.c:369
@@ -1186,7 +1232,8 @@ msgstr "_Kopioi tähän"
 msgid "_Link Here"
 msgstr "_Linkitä tähän"
 
-#: src/nautilus-dnd.c:784 src/resources/ui/nautilus-create-folder-dialog.ui:60
+#: src/nautilus-dnd.c:784 src/resources/ui/nautilus-compress-dialog.ui:129
+#: src/resources/ui/nautilus-create-folder-dialog.ui:63
 msgid "Cancel"
 msgstr "Peru"
 
@@ -1295,94 +1342,94 @@ msgstr "Kohteen uudelleennimeäminen ei onnistunut."
 msgid "Renaming “%s” to “%s”."
 msgstr "Nimetään kohde ”%s” kohteeksi ”%s”."
 
-#: src/nautilus-file.c:1210 src/nautilus-vfs-file.c:368
+#: src/nautilus-file.c:1211 src/nautilus-vfs-file.c:368
 msgid "This file cannot be mounted"
 msgstr "Tätä tiedostoa ei voi liittää tiedostojärjestelmään"
 
-#: src/nautilus-file.c:1255
+#: src/nautilus-file.c:1256
 msgid "This file cannot be unmounted"
 msgstr "Tätä tiedostoa ei voi irrottaa tiedostojärjestelmästä"
 
-#: src/nautilus-file.c:1289
+#: src/nautilus-file.c:1290
 msgid "This file cannot be ejected"
 msgstr "Tätä tiedostoa ei voi poistaa asemasta"
 
-#: src/nautilus-file.c:1322 src/nautilus-vfs-file.c:546
+#: src/nautilus-file.c:1323 src/nautilus-vfs-file.c:546
 msgid "This file cannot be started"
 msgstr "Tätä tiedostoa ei voi käynnistää"
 
-#: src/nautilus-file.c:1374 src/nautilus-file.c:1405
+#: src/nautilus-file.c:1375 src/nautilus-file.c:1406
 msgid "This file cannot be stopped"
 msgstr "Tätä tiedostoa ei voi pysäyttää"
 
-#: src/nautilus-file.c:1829
+#: src/nautilus-file.c:1830
 msgid "File not found"
 msgstr "Tiedostoa ei löydy"
 
-#: src/nautilus-file.c:1864
+#: src/nautilus-file.c:1865
 msgid "Slashes are not allowed in filenames"
 msgstr "Kauttaviivat eivät ole sallittu tiedostonimissä"
 
-#: src/nautilus-file.c:1898
+#: src/nautilus-file.c:1899
 msgid "Toplevel files cannot be renamed"
 msgstr "Päätason tiedostoja ei voi nimetä uudestaan"
 
-#: src/nautilus-file.c:1924
+#: src/nautilus-file.c:1925
 msgid "Probably the content of the file is an invalid desktop file format"
 msgstr ""
 "Tiedoston sisältö on luultavasti virheellisessä desktop-tiedostomuodossa"
 
 #. Translators: Time in 24h format
-#: src/nautilus-file.c:4753
+#: src/nautilus-file.c:4754
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. Translators: Time in 12h format
-#: src/nautilus-file.c:4756
+#: src/nautilus-file.c:4757
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#: src/nautilus-file.c:4763
+#: src/nautilus-file.c:4764
 #, 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"
-#: src/nautilus-file.c:4769
+#: src/nautilus-file.c:4770
 #, 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"
-#: src/nautilus-file.c:4774
+#: src/nautilus-file.c:4775
 #, no-c-format
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: src/nautilus-file.c:4782
+#: src/nautilus-file.c:4783
 #, 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"
-#: src/nautilus-file.c:4788
+#: src/nautilus-file.c:4789
 #, 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"
-#: src/nautilus-file.c:4793
+#: src/nautilus-file.c:4794
 #, 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"
-#: src/nautilus-file.c:4801
+#: src/nautilus-file.c:4802
 #, no-c-format
 msgid "%-e %b"
 msgstr "%-e. %b"
@@ -1390,7 +1437,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"
-#: src/nautilus-file.c:4808
+#: src/nautilus-file.c:4809
 #, no-c-format
 msgid "%-e %b %H:%M"
 msgstr "%-e. %b %H:%M"
@@ -1398,14 +1445,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"
-#: src/nautilus-file.c:4814
+#: src/nautilus-file.c:4815
 #, 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"
-#: src/nautilus-file.c:4822
+#: src/nautilus-file.c:4823
 #, no-c-format
 msgid "%-e %b %Y"
 msgstr "%-e. %Bta %Y"
@@ -1413,7 +1460,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"
-#: src/nautilus-file.c:4829
+#: src/nautilus-file.c:4830
 #, no-c-format
 msgid "%-e %b %Y %H:%M"
 msgstr "%-e. %b %Y %H:%M"
@@ -1421,58 +1468,58 @@ 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"
-#: src/nautilus-file.c:4835
+#: src/nautilus-file.c:4836
 #, no-c-format
 msgid "%-e %b %Y %l:%M %p"
 msgstr "%-e %b %Y %l:%M %p"
 
-#: src/nautilus-file.c:4845
+#: src/nautilus-file.c:4846
 #, no-c-format
 msgid "%c"
 msgstr "%c"
 
-#: src/nautilus-file.c:5244
+#: src/nautilus-file.c:5245
 msgid "Not allowed to set permissions"
 msgstr "Et saa asettaa oikeuksia"
 
-#: src/nautilus-file.c:5539
+#: src/nautilus-file.c:5540
 msgid "Not allowed to set owner"
 msgstr "Et saa asettaa omistajaa"
 
-#: src/nautilus-file.c:5557
+#: src/nautilus-file.c:5558
 #, c-format
 msgid "Specified owner '%s' doesn't exist"
 msgstr "Annettua omistajaa ”%s” ei ole olemassa"
 
-#: src/nautilus-file.c:5821
+#: src/nautilus-file.c:5822
 msgid "Not allowed to set group"
 msgstr "Et saa asettaa ryhmää"
 
-#: src/nautilus-file.c:5839
+#: src/nautilus-file.c:5840
 #, 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)
-#: src/nautilus-file.c:5974
+#: src/nautilus-file.c:5975
 msgid "Me"
 msgstr "Minä"
 
-#: src/nautilus-file.c:5998
+#: src/nautilus-file.c:5999
 #, c-format
 msgid "%'u item"
 msgid_plural "%'u items"
 msgstr[0] "%'u kohde"
 msgstr[1] "%'u kohdetta"
 
-#: src/nautilus-file.c:5999
+#: src/nautilus-file.c:6000
 #, c-format
 msgid "%'u folder"
 msgid_plural "%'u folders"
 msgstr[0] "%'u kansio"
 msgstr[1] "%'u kansiota"
 
-#: src/nautilus-file.c:6000
+#: src/nautilus-file.c:6001
 #, c-format
 msgid "%'u file"
 msgid_plural "%'u files"
@@ -1480,87 +1527,87 @@ msgstr[0] "%'u tiedosto"
 msgstr[1] "%'u tiedostoa"
 
 #. This means no contents at all were readable
-#: src/nautilus-file.c:6401 src/nautilus-file.c:6417
+#: src/nautilus-file.c:6402 src/nautilus-file.c:6418
 msgid "? items"
 msgstr "? kohdetta"
 
 #. This means no contents at all were readable
-#: src/nautilus-file.c:6407
+#: src/nautilus-file.c:6408
 msgid "? bytes"
 msgstr "? tavua"
 
-#: src/nautilus-file.c:6424 src/nautilus-file.c:6505
+#: src/nautilus-file.c:6425 src/nautilus-file.c:6506
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: src/nautilus-file.c:6438 src/nautilus-properties-window.c:1159
+#: src/nautilus-file.c:6439 src/nautilus-properties-window.c:1159
 msgid "unknown"
 msgstr "tuntematon"
 
-#: src/nautilus-file.c:6469 src/nautilus-file.c:6477 src/nautilus-file.c:6528
+#: src/nautilus-file.c:6470 src/nautilus-file.c:6478 src/nautilus-file.c:6529
 msgid "Program"
 msgstr "Ohjelma"
 
-#: src/nautilus-file.c:6470
+#: src/nautilus-file.c:6471
 msgid "Audio"
 msgstr "Ääni"
 
-#: src/nautilus-file.c:6471
+#: src/nautilus-file.c:6472
 msgid "Font"
 msgstr "Fontti"
 
-#: src/nautilus-file.c:6472 src/nautilus-image-properties-page.c:768
+#: src/nautilus-file.c:6473 src/nautilus-image-properties-page.c:768
 msgid "Image"
 msgstr "Kuva"
 
-#: src/nautilus-file.c:6473
+#: src/nautilus-file.c:6474
 msgid "Archive"
 msgstr "Arkisto"
 
-#: src/nautilus-file.c:6474
+#: src/nautilus-file.c:6475
 msgid "Markup"
 msgstr "Merkkaus"
 
-#: src/nautilus-file.c:6475 src/nautilus-file.c:6476
+#: src/nautilus-file.c:6476 src/nautilus-file.c:6477
 msgid "Text"
 msgstr "Teksti"
 
-#: src/nautilus-file.c:6478 src/nautilus-mime-actions.c:214
+#: src/nautilus-file.c:6479 src/nautilus-mime-actions.c:215
 msgid "Video"
 msgstr "Video"
 
-#: src/nautilus-file.c:6479
+#: src/nautilus-file.c:6480
 msgid "Contacts"
 msgstr "Yhteystiedot"
 
-#: src/nautilus-file.c:6480
+#: src/nautilus-file.c:6481
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: src/nautilus-file.c:6481
+#: src/nautilus-file.c:6482
 msgid "Document"
 msgstr "Asiakirja"
 
-#: src/nautilus-file.c:6482 src/nautilus-mime-actions.c:184
+#: src/nautilus-file.c:6483 src/nautilus-mime-actions.c:185
 msgid "Presentation"
 msgstr "Esitys"
 
-#: src/nautilus-file.c:6483 src/nautilus-mime-actions.c:193
+#: src/nautilus-file.c:6484 src/nautilus-mime-actions.c:194
 msgid "Spreadsheet"
 msgstr "Laskentataulukko"
 
-#: src/nautilus-file.c:6530
+#: src/nautilus-file.c:6531
 msgid "Binary"
 msgstr "Binääri"
 
-#: src/nautilus-file.c:6534
+#: src/nautilus-file.c:6535
 msgid "Folder"
 msgstr "Kansio"
 
-#: src/nautilus-file.c:6565
+#: src/nautilus-file.c:6566
 msgid "Link"
 msgstr "Linkki"
 
@@ -1569,255 +1616,124 @@ msgstr "Linkki"
 #. * to that kind of file (e.g. "link to folder").
 #.
 #. appended to new link file
-#: src/nautilus-file.c:6571 src/nautilus-file-operations.c:378
+#: src/nautilus-file.c:6572 src/nautilus-file-operations.c:413
 #: src/nautilus-files-view-dnd.c:124
 #, c-format
 msgid "Link to %s"
 msgstr "Linkki kohteeseen %s"
 
-#: src/nautilus-file.c:6587 src/nautilus-file.c:6601
+#: src/nautilus-file.c:6588 src/nautilus-file.c:6602
 msgid "Link (broken)"
 msgstr "Linkki (rikki)"
 
-#: src/nautilus-file-conflict-dialog.c:140
-#, c-format
-msgid "Merge folder “%s”?"
-msgstr "Yhdistetäänkö kansio ”%s”?"
-
-#: 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."
-msgstr ""
-"Yhdistäessä kysytään varmistusta, ennen kuin mitään kyseisen kansion "
-"tiedostoja korvataan kopioitavilla tiedostoilla."
-
-#: 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”."
-
-#: 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”."
-
-#: 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”."
-
-#: 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."
-
-#: src/nautilus-file-conflict-dialog.c:164
-#, c-format
-msgid "Replace folder “%s”?"
-msgstr "Korvataanko kansio ”%s”?"
-
-#: 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”."
-
-#: src/nautilus-file-conflict-dialog.c:171
-#, c-format
-msgid "Replace file “%s”?"
-msgstr "Korvataanko tiedosto ”%s”?"
-
-#: src/nautilus-file-conflict-dialog.c:173
-msgid "Replacing it will overwrite its content."
-msgstr "Sen korvaaminen ylikirjoittaa sisällön."
-
-#: 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”."
-
-#: 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”."
-
-#: 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”."
-
-#: src/nautilus-file-conflict-dialog.c:254
-#| msgid "Original file"
-msgid "Original folder"
-msgstr "Alkuperäinen kansio"
-
-#: src/nautilus-file-conflict-dialog.c:255
-#: src/nautilus-file-conflict-dialog.c:292
-#| msgid "? items"
-msgid "Items:"
-msgstr "Kohteet:"
-
-#: src/nautilus-file-conflict-dialog.c:258
-msgid "Original file"
-msgstr "Alkuperäinen tiedosto"
-
-#: src/nautilus-file-conflict-dialog.c:259
-#: src/nautilus-file-conflict-dialog.c:296
-#: src/nautilus-properties-window.c:2959
-msgid "Size:"
-msgstr "Koko:"
-
-#: src/nautilus-file-conflict-dialog.c:263
-#: src/nautilus-file-conflict-dialog.c:300
-#: src/nautilus-properties-window.c:2941
-msgid "Type:"
-msgstr "Tyyppi:"
-
-#: src/nautilus-file-conflict-dialog.c:266
-#: src/nautilus-file-conflict-dialog.c:303
-msgid "Last modified:"
-msgstr "Viimeksi muokattu:"
-
-#: src/nautilus-file-conflict-dialog.c:291
-#| msgid "Merge"
-msgid "Merge with"
-msgstr "Yhdistä kohteen kanssa"
-
-#: src/nautilus-file-conflict-dialog.c:291
-#: src/nautilus-file-conflict-dialog.c:295
-msgid "Replace with"
-msgstr "Alkuperäisen korvaava tiedosto"
-
-#: src/nautilus-file-conflict-dialog.c:325
-msgid "Merge"
-msgstr "Yhdistä"
-
 #. Setup the expander for the rename action
-#: src/nautilus-file-conflict-dialog.c:517
+#: src/nautilus-file-conflict-dialog.c:332
 msgid "_Select a new name for the destination"
 msgstr "_Valitse uusi nimi"
 
-#: src/nautilus-file-conflict-dialog.c:531
+#: src/nautilus-file-conflict-dialog.c:346
 #: src/nautilus-mime-application-chooser.c:316
 msgid "Reset"
 msgstr "Nollaa"
 
 #. Setup the checkbox to apply the action to all files
-#: src/nautilus-file-conflict-dialog.c:543
-#| msgid "Apply this action to all files"
+#: src/nautilus-file-conflict-dialog.c:358
 msgid "Apply this action to all files and folders"
 msgstr "Käytä samaa toimintoa kaikille tiedostoille ja kansioille"
 
-#: src/nautilus-file-conflict-dialog.c:555 src/nautilus-file-operations.c:180
+#: src/nautilus-file-conflict-dialog.c:373 src/nautilus-file-operations.c:215
 msgid "_Skip"
 msgstr "_Ohita"
 
-#: src/nautilus-file-conflict-dialog.c:560
+#: src/nautilus-file-conflict-dialog.c:378
 msgid "Re_name"
 msgstr "_Nimeä uudelleen"
 
-#: src/nautilus-file-conflict-dialog.c:566
+#: src/nautilus-file-conflict-dialog.c:384
 msgid "Replace"
 msgstr "Korvaa"
 
-#: src/nautilus-file-conflict-dialog.c:649
-#| msgid "New Folder"
-msgid "Merge Folder"
-msgstr "Yhdistä kansio"
-
-#: src/nautilus-file-conflict-dialog.c:649
-#: src/nautilus-file-conflict-dialog.c:655
-#| msgid "File conflict"
-msgid "File and Folder conflict"
-msgstr "Tiedoston ja kansion ristiriita"
-
-#: src/nautilus-file-conflict-dialog.c:655
-msgid "File conflict"
-msgstr "Tiedostoristiriita"
-
-#: src/nautilus-file-name-widget-controller.c:80
+#: src/nautilus-file-name-widget-controller.c:82
 #: src/nautilus-rename-file-popover-controller.c:61
-#| msgid "Files names cannot contain “/”."
 msgid "File names cannot contain “/”."
 msgstr "Tiedostojen nimi ei voi sisältää merkkiä “/”."
 
-#: src/nautilus-file-name-widget-controller.c:82
+#: src/nautilus-file-name-widget-controller.c:84
 #: src/nautilus-rename-file-popover-controller.c:68
-#| msgid "A file can not be called “.”."
 msgid "A file cannot be called “.”."
 msgstr "Tiedoston nimi ei voi olla “.”."
 
-#: src/nautilus-file-name-widget-controller.c:84
+#: src/nautilus-file-name-widget-controller.c:86
 #: src/nautilus-rename-file-popover-controller.c:75
-#| msgid "A file can not be called “..”."
 msgid "A file cannot be called “..”."
 msgstr "Tiedoston nimi ei voi olla “..”."
 
-#: src/nautilus-file-name-widget-controller.c:105
+#: src/nautilus-file-name-widget-controller.c:107
 msgid "A folder with that name already exists."
 msgstr "Kansio samalla nimellä on jo olemassa."
 
-#: src/nautilus-file-name-widget-controller.c:108
+#: src/nautilus-file-name-widget-controller.c:110
 msgid "A file with that name already exists."
 msgstr "Tiedosto samalla nimellä on jo olemassa."
 
-#: src/nautilus-file-operations.c:181
+#: src/nautilus-file-operations.c:216
 msgid "S_kip All"
 msgstr "_Ohita kaikki"
 
-#: src/nautilus-file-operations.c:182
+#: src/nautilus-file-operations.c:217
 msgid "_Retry"
 msgstr "_Yritä uudelleen"
 
-#: src/nautilus-file-operations.c:183
+#: src/nautilus-file-operations.c:218
 msgid "_Delete"
 msgstr "P_oista"
 
-#: src/nautilus-file-operations.c:184
+#: src/nautilus-file-operations.c:219
 msgid "Delete _All"
 msgstr "Poista k_aikki"
 
-#: src/nautilus-file-operations.c:185
+#: src/nautilus-file-operations.c:220
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: src/nautilus-file-operations.c:186
+#: src/nautilus-file-operations.c:221
 msgid "Replace _All"
 msgstr "Korvaa k_aikki"
 
-#: src/nautilus-file-operations.c:187
+#: src/nautilus-file-operations.c:222
 msgid "_Merge"
 msgstr "_Yhdistä"
 
-#: src/nautilus-file-operations.c:188
+#: src/nautilus-file-operations.c:223
 msgid "Merge _All"
 msgstr "Yhdistä k_aikki"
 
-#: src/nautilus-file-operations.c:189
+#: src/nautilus-file-operations.c:224
 msgid "Copy _Anyway"
 msgstr "Kopioi kaikesta _huolimatta"
 
-#: src/nautilus-file-operations.c:279
+#: src/nautilus-file-operations.c:314
 #, c-format
 msgid "%'d second"
 msgid_plural "%'d seconds"
 msgstr[0] "%'d sekunti"
 msgstr[1] "%'d sekuntia"
 
-#: src/nautilus-file-operations.c:284 src/nautilus-file-operations.c:295
+#: src/nautilus-file-operations.c:319 src/nautilus-file-operations.c:330
 #, c-format
 msgid "%'d minute"
 msgid_plural "%'d minutes"
 msgstr[0] "%'d minuutti"
 msgstr[1] "%'d minuuttia"
 
-#: src/nautilus-file-operations.c:294
+#: src/nautilus-file-operations.c:329
 #, c-format
 msgid "%'d hour"
 msgid_plural "%'d hours"
 msgstr[0] "%'d tunti"
 msgstr[1] "%'d tuntia"
 
-#: src/nautilus-file-operations.c:302
+#: src/nautilus-file-operations.c:337
 #, c-format
 msgid "approximately %'d hour"
 msgid_plural "approximately %'d hours"
@@ -1825,7 +1741,7 @@ msgstr[0] "arvoilta %'d tunti"
 msgstr[1] "arviolta %'d tuntia"
 
 #. appended to new link file
-#: src/nautilus-file-operations.c:382
+#: src/nautilus-file-operations.c:417
 #, c-format
 msgid "Another link to %s"
 msgstr "Toinen linkki kohteeseen %s"
@@ -1834,25 +1750,25 @@ msgstr "Toinen linkki kohteeseen %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: src/nautilus-file-operations.c:398
+#: src/nautilus-file-operations.c:433
 #, c-format
 msgid "%'dst link to %s"
 msgstr "%d'd. linkki kohteeseen %s"
 
 #. appended to new link file
-#: src/nautilus-file-operations.c:402
+#: src/nautilus-file-operations.c:437
 #, c-format
 msgid "%'dnd link to %s"
 msgstr "%'d. linkki kohteeseen %s"
 
 #. appended to new link file
-#: src/nautilus-file-operations.c:406
+#: src/nautilus-file-operations.c:441
 #, c-format
 msgid "%'drd link to %s"
 msgstr "%'d. linkki kohteeseen %s"
 
 #. appended to new link file
-#: src/nautilus-file-operations.c:410
+#: src/nautilus-file-operations.c:445
 #, c-format
 msgid "%'dth link to %s"
 msgstr "%'d. linkki kohteeseen %s"
@@ -1862,12 +1778,12 @@ msgstr "%'d. linkki kohteeseen %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: src/nautilus-file-operations.c:451
+#: src/nautilus-file-operations.c:486
 msgid " (copy)"
 msgstr " (kopio)"
 
 #. localizers: tag used to detect the second copy of a file
-#: src/nautilus-file-operations.c:453
+#: src/nautilus-file-operations.c:488
 msgid " (another copy)"
 msgstr " (toinen kopio)"
 
@@ -1875,34 +1791,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
-#: src/nautilus-file-operations.c:456 src/nautilus-file-operations.c:458
-#: src/nautilus-file-operations.c:460 src/nautilus-file-operations.c:470
+#: src/nautilus-file-operations.c:491 src/nautilus-file-operations.c:493
+#: src/nautilus-file-operations.c:495 src/nautilus-file-operations.c:505
 msgid "th copy)"
 msgstr ". kopio)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: src/nautilus-file-operations.c:463
+#: src/nautilus-file-operations.c:498
 msgid "st copy)"
 msgstr ". kopio)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: src/nautilus-file-operations.c:465
+#: src/nautilus-file-operations.c:500
 msgid "nd copy)"
 msgstr ". kopio)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: src/nautilus-file-operations.c:467
+#: src/nautilus-file-operations.c:502
 msgid "rd copy)"
 msgstr ". kopio)"
 
 #. localizers: appended to first file copy
-#: src/nautilus-file-operations.c:484
+#: src/nautilus-file-operations.c:519
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (kopio)%s"
 
 #. localizers: appended to second file copy
-#: src/nautilus-file-operations.c:486
+#: src/nautilus-file-operations.c:521
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (toinen kopio) %s"
@@ -1911,8 +1827,8 @@ msgstr "%s (toinen kopio) %s"
 #. localizers: appended to x12th file copy
 #. localizers: appended to x13th file copy
 #. localizers: appended to xxth file copy
-#: src/nautilus-file-operations.c:489 src/nautilus-file-operations.c:491
-#: src/nautilus-file-operations.c:493 src/nautilus-file-operations.c:507
+#: src/nautilus-file-operations.c:524 src/nautilus-file-operations.c:526
+#: src/nautilus-file-operations.c:528 src/nautilus-file-operations.c:542
 #, c-format
 msgid "%s (%'dth copy)%s"
 msgstr "%s (%'d. kopio)%s"
@@ -1922,39 +1838,39 @@ msgstr "%s (%'d. kopio)%s"
 #. * strings look like "%s (copy %'d)%s".
 #.
 #. localizers: appended to x1st file copy
-#: src/nautilus-file-operations.c:501
+#: src/nautilus-file-operations.c:536
 #, c-format
 msgid "%s (%'dst copy)%s"
 msgstr "%s (%'d. kopio)%s"
 
 #. localizers: appended to x2nd file copy
-#: src/nautilus-file-operations.c:503
+#: src/nautilus-file-operations.c:538
 #, c-format
 msgid "%s (%'dnd copy)%s"
 msgstr "%s (%'d. kopio)%s"
 
 #. localizers: appended to x3rd file copy
-#: src/nautilus-file-operations.c:505
+#: src/nautilus-file-operations.c:540
 #, c-format
 msgid "%s (%'drd copy)%s"
 msgstr "%s (%'d. kopio)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: src/nautilus-file-operations.c:606
+#: src/nautilus-file-operations.c:641
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: src/nautilus-file-operations.c:614
+#: src/nautilus-file-operations.c:649
 #, c-format
 msgid " (%'d"
 msgstr " (%'d."
 
-#: src/nautilus-file-operations.c:1390
+#: src/nautilus-file-operations.c:1425
 msgid "Are you sure you want to permanently delete “%B” from the trash?"
 msgstr "Haluatko varmasti poistaa kohteen ”%B” pysyvästi?"
 
-#: src/nautilus-file-operations.c:1393
+#: src/nautilus-file-operations.c:1428
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %'d selected item from the "
@@ -1967,28 +1883,28 @@ msgstr[0] ""
 msgstr[1] ""
 "Haluatko varmasti poistaa pysyvästi %'d valittua kohdetta roskakorista?"
 
-#: src/nautilus-file-operations.c:1403 src/nautilus-file-operations.c:1469
+#: src/nautilus-file-operations.c:1438 src/nautilus-file-operations.c:1504
 msgid "If you delete an item, it will be permanently lost."
 msgstr "Jos poistat kohteen, se häviää pysyvästi."
 
-#: src/nautilus-file-operations.c:1423
+#: src/nautilus-file-operations.c:1458
 msgid "Empty all items from Trash?"
 msgstr "Tyhjennetäänkö roskakori?"
 
-#: src/nautilus-file-operations.c:1427
+#: src/nautilus-file-operations.c:1462
 msgid "All items in the Trash will be permanently deleted."
 msgstr "Kaikki roskakorin kohteet poistetaan pysyvästi."
 
-#: src/nautilus-file-operations.c:1430 src/nautilus-file-operations.c:2507
+#: src/nautilus-file-operations.c:1465 src/nautilus-file-operations.c:2499
 #: src/nautilus-window.c:1319
 msgid "Empty _Trash"
 msgstr "Tyhjennä _roskakori"
 
-#: src/nautilus-file-operations.c:1457
+#: src/nautilus-file-operations.c:1492
 msgid "Are you sure you want to permanently delete “%B”?"
 msgstr "Haluatko varmasti poistaa kohteen ”%B”?"
 
-#: src/nautilus-file-operations.c:1460
+#: src/nautilus-file-operations.c:1495
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
 msgid_plural ""
@@ -1996,22 +1912,22 @@ msgid_plural ""
 msgstr[0] "Haluatko varmasti poistaa %'d valitun kohteen?"
 msgstr[1] "Haluatko varmasti poistaa %'d valittua kohdetta?"
 
-#: src/nautilus-file-operations.c:1513
+#: src/nautilus-file-operations.c:1548
 msgid "Deleted “%B”"
 msgstr "Poistettu “%B”"
 
-#: src/nautilus-file-operations.c:1515
+#: src/nautilus-file-operations.c:1550
 msgid "Deleting “%B”"
 msgstr "Poistetaan “%B”"
 
-#: src/nautilus-file-operations.c:1523
+#: src/nautilus-file-operations.c:1558
 #, c-format
 msgid "Deleted %'d file"
 msgid_plural "Deleted %'d files"
 msgstr[0] "Poistettiin %'d tiedosto"
 msgstr[1] "Poistettiin %'d tiedostoa"
 
-#: src/nautilus-file-operations.c:1527
+#: src/nautilus-file-operations.c:1562
 #, c-format
 msgid "Deleting %'d file"
 msgid_plural "Deleting %'d files"
@@ -2020,11 +1936,12 @@ 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.
-#: src/nautilus-file-operations.c:1549 src/nautilus-file-operations.c:1555
-#: src/nautilus-file-operations.c:1588 src/nautilus-file-operations.c:1946
-#: src/nautilus-file-operations.c:1952 src/nautilus-file-operations.c:1984
-#: src/nautilus-file-operations.c:3332 src/nautilus-file-operations.c:3338
-#: src/nautilus-file-operations.c:3379
+#: src/nautilus-file-operations.c:1584 src/nautilus-file-operations.c:1590
+#: src/nautilus-file-operations.c:1623 src/nautilus-file-operations.c:1912
+#: src/nautilus-file-operations.c:1918 src/nautilus-file-operations.c:1950
+#: src/nautilus-file-operations.c:3331 src/nautilus-file-operations.c:3337
+#: src/nautilus-file-operations.c:3378 src/nautilus-file-operations.c:7504
+#: src/nautilus-file-operations.c:7544
 #, c-format
 msgid "%'d / %'d"
 msgstr "%'d / %'d"
@@ -2034,79 +1951,61 @@ msgstr "%'d / %'d"
 #. *
 #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument).
 #.
-#: src/nautilus-file-operations.c:1570 src/nautilus-file-operations.c:1967
+#: src/nautilus-file-operations.c:1605 src/nautilus-file-operations.c:1933
 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ä"
 
-#: src/nautilus-file-operations.c:1574 src/nautilus-file-operations.c:1970
+#: src/nautilus-file-operations.c:1609 src/nautilus-file-operations.c:1936
 #, c-format
 msgid "(%d file/sec)"
 msgid_plural "(%d files/sec)"
 msgstr[0] "(%d tiedosto/s)"
 msgstr[1] "(%d tiedostoa/s)"
 
-#: src/nautilus-file-operations.c:1656 src/nautilus-file-operations.c:1690
-#: src/nautilus-file-operations.c:1729 src/nautilus-file-operations.c:1805
-#: src/nautilus-file-operations.c:2768
+#: src/nautilus-file-operations.c:1751 src/nautilus-file-operations.c:2765
 msgid "Error while deleting."
 msgstr "Virhe poistaessa."
 
-#: src/nautilus-file-operations.c:1660
-msgid ""
-"Files in the folder “%B” cannot be deleted because you do not have "
-"permissions to see them."
-msgstr ""
-"Tiedostoja kansiossa ”%B” ei voi poistaa, koska sinulla ei ole oikeutta "
-"niiden käyttöön."
-
-#: src/nautilus-file-operations.c:1663 src/nautilus-file-operations.c:2827
-#: src/nautilus-file-operations.c:4019
-msgid ""
-"There was an error getting information about the files in the folder “%B”."
-msgstr "Virhe haettaessa tietoja tiedostoista kansiossa ”%B”."
+#: src/nautilus-file-operations.c:1759
+#| msgid "There was an error creating the folder “%B”."
+msgid "There was an error deleting the folder “%B”."
+msgstr "Virhe kansiota “%B” poistaessa."
 
-#: src/nautilus-file-operations.c:1672 src/nautilus-file-operations.c:4028
-msgid "_Skip files"
-msgstr "_Ohita tiedostot"
-
-#: src/nautilus-file-operations.c:1693
-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."
-
-#: src/nautilus-file-operations.c:1696 src/nautilus-file-operations.c:2866
-#: src/nautilus-file-operations.c:4064
-msgid "There was an error reading the folder “%B”."
-msgstr "Virhe luettaessa kansiota ”%B”."
+#: src/nautilus-file-operations.c:1761
+#| msgid ""
+#| "You do not have the permissions necessary to view the contents of “%s”."
+msgid "You do not have sufficient permissions to delete the folder “%B”."
+msgstr "Käyttöoikeutesi eivät riitä kansion “%B” poistamiseen."
 
-#: src/nautilus-file-operations.c:1730
-msgid "Could not remove the folder %B."
-msgstr "Kansion %B poistaminen epäonnistui."
+#: src/nautilus-file-operations.c:1765
+#| msgid "There was an error creating the folder “%B”."
+msgid "There was an error deleting the file “%B”."
+msgstr "Virhe tiedostoa “%B” poistaessa."
 
-#: src/nautilus-file-operations.c:1806
-msgid "There was an error deleting %B."
-msgstr "Tiedoston %B poistaminen epäonnistui."
+#: src/nautilus-file-operations.c:1767
+#| msgid ""
+#| "You do not have the permissions necessary to view the contents of “%s”."
+msgid "You do not have sufficient permissions to delete the file “%B”."
+msgstr "Käyttöoikeutesi eivät riitä kansion “%B” poistamiseen."
 
-#: src/nautilus-file-operations.c:1909
+#: src/nautilus-file-operations.c:1875
 msgid "Trashing “%B”"
 msgstr "Viedään roskakoriin “%B”"
 
-#: src/nautilus-file-operations.c:1911
+#: src/nautilus-file-operations.c:1877
 msgid "Trashed “%B”"
 msgstr "Vietiin roskakoriin “%B”"
 
-#: src/nautilus-file-operations.c:1919
+#: src/nautilus-file-operations.c:1885
 #, 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"
 
-#: src/nautilus-file-operations.c:1923
+#: src/nautilus-file-operations.c:1889
 #, c-format
 msgid "Trashed %'d file"
 msgid_plural "Trashed %'d files"
@@ -2114,35 +2013,35 @@ msgstr[0] "Vietiin roskakoriin %'d tiedosto"
 msgstr[1] "Vietiin roskakoriin %'d tiedostoa"
 
 #. Translators: %B is a file name
-#: src/nautilus-file-operations.c:2046
+#: src/nautilus-file-operations.c:2012
 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?"
 
-#: src/nautilus-file-operations.c:2052
+#: src/nautilus-file-operations.c:2018
 msgid "This remote location does not support sending items to the trash."
 msgstr "Tämä etäsijainti ei tue kohteiden siirtoa roskakoriin."
 
-#: src/nautilus-file-operations.c:2255
+#: src/nautilus-file-operations.c:2247
 msgid "Trashing Files"
 msgstr "Siirretään tiedostoja roskakoriin"
 
-#: src/nautilus-file-operations.c:2257
+#: src/nautilus-file-operations.c:2249
 msgid "Deleting Files"
 msgstr "Poistetaan tiedostoja"
 
-#: src/nautilus-file-operations.c:2338
+#: src/nautilus-file-operations.c:2330
 msgid "Unable to eject %V"
 msgstr "Asemaa %V ei voi avata"
 
-#: src/nautilus-file-operations.c:2340
+#: src/nautilus-file-operations.c:2332
 msgid "Unable to unmount %V"
 msgstr "Osiota %V ei voi irrottaa"
 
-#: src/nautilus-file-operations.c:2497
+#: src/nautilus-file-operations.c:2489
 msgid "Do you want to empty the trash before you unmount?"
 msgstr "Haluatko tyhjentää roskakorin ennen irrottamista?"
 
-#: src/nautilus-file-operations.c:2499
+#: src/nautilus-file-operations.c:2491
 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."
@@ -2150,59 +2049,73 @@ msgstr ""
 "Jotta vapaa tila laitteella oikeasti vapautuisi, täytyy sen roskakori "
 "tyhjentää. Kaikki aseman roskakorissa olevat tiedostot hukataan pysyvästi."
 
-#: src/nautilus-file-operations.c:2505
+#: src/nautilus-file-operations.c:2497
 msgid "Do _not Empty Trash"
 msgstr "Älä tyhje_nnä roskakoria"
 
 #. Translators: %s is a file name formatted for display
-#: src/nautilus-file-operations.c:2639 src/nautilus-files-view.c:5458
+#: src/nautilus-file-operations.c:2631 src/nautilus-files-view.c:5969
 #, c-format
 msgid "Unable to access “%s”"
 msgstr "Kohteen \"%s\" käsittely ei onnistu"
 
-#: src/nautilus-file-operations.c:2715
+#: src/nautilus-file-operations.c:2707
 #, 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)"
 
-#: src/nautilus-file-operations.c:2721
+#: src/nautilus-file-operations.c:2713
 #, 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)"
 
-#: src/nautilus-file-operations.c:2727
+#: src/nautilus-file-operations.c:2719
 #, 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)"
 
-#: src/nautilus-file-operations.c:2733
+#: src/nautilus-file-operations.c:2725
 #, 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"
 
-#: src/nautilus-file-operations.c:2764 src/nautilus-file-operations.c:3879
-#: src/nautilus-file-operations.c:4011 src/nautilus-file-operations.c:4056
+#: src/nautilus-file-operations.c:2731
+#, c-format
+#| msgid "Preparing to move %'d file"
+#| msgid_plural "Preparing to move %'d files"
+msgid "Preparing to compress %'d file"
+msgid_plural "Preparing to compress %'d files"
+msgstr[0] "Valmistaudutaan pakkamaan %'d tiedosto"
+msgstr[1] "Valmistaudutaan pakkamaan %'d tiedostoa"
+
+#: src/nautilus-file-operations.c:2761 src/nautilus-file-operations.c:3878
+#: src/nautilus-file-operations.c:4016 src/nautilus-file-operations.c:4061
 msgid "Error while copying."
 msgstr "Kopiointi epäonnistui."
 
-#: src/nautilus-file-operations.c:2766 src/nautilus-file-operations.c:4009
-#: src/nautilus-file-operations.c:4054
+#: src/nautilus-file-operations.c:2763 src/nautilus-file-operations.c:4014
+#: src/nautilus-file-operations.c:4059
 msgid "Error while moving."
 msgstr "Siirto epäonnistui."
 
-#: src/nautilus-file-operations.c:2770
+#: src/nautilus-file-operations.c:2767
 msgid "Error while moving files to trash."
 msgstr "Siirto roskakoriin epäonnistui."
 
-#: src/nautilus-file-operations.c:2824
+#: src/nautilus-file-operations.c:2769
+#| msgid "Error while creating file %B."
+msgid "Error while compressing files."
+msgstr "Virhe tiedostoja pakatessa."
+
+#: src/nautilus-file-operations.c:2823
 msgid ""
 "Files in the folder “%B” cannot be handled because you do not have "
 "permissions to see them."
@@ -2210,42 +2123,51 @@ msgstr ""
 "Tiedostoja kansiossa ”%B” ei voi käsitellä, koska sinulla ei ole oikeutta "
 "nähdä niitä."
 
-#: src/nautilus-file-operations.c:2863
+#: src/nautilus-file-operations.c:2826 src/nautilus-file-operations.c:4024
+msgid ""
+"There was an error getting information about the files in the folder “%B”."
+msgstr "Virhe haettaessa tietoja tiedostoista kansiossa ”%B”."
+
+#: src/nautilus-file-operations.c:2862
 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ä."
 
-#: src/nautilus-file-operations.c:2940
+#: src/nautilus-file-operations.c:2865 src/nautilus-file-operations.c:4069
+msgid "There was an error reading the folder “%B”."
+msgstr "Virhe luettaessa kansiota ”%B”."
+
+#: src/nautilus-file-operations.c:2939
 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ä."
 
-#: src/nautilus-file-operations.c:2943
+#: src/nautilus-file-operations.c:2942
 msgid "There was an error getting information about “%B”."
 msgstr "Virhe haettaessa tietoja kohteesta ”%B”."
 
-#: src/nautilus-file-operations.c:3045 src/nautilus-file-operations.c:3093
-#: src/nautilus-file-operations.c:3132 src/nautilus-file-operations.c:3162
+#: src/nautilus-file-operations.c:3044 src/nautilus-file-operations.c:3092
+#: src/nautilus-file-operations.c:3131 src/nautilus-file-operations.c:3161
 msgid "Error while copying to “%B”."
 msgstr "Virhe kohteeseen ”%B” kopioitaessa."
 
-#: src/nautilus-file-operations.c:3049
+#: src/nautilus-file-operations.c:3048
 msgid "You do not have permissions to access the destination folder."
 msgstr "Sinulla ei ole oikeuksia avata kohdekansiota."
 
-#: src/nautilus-file-operations.c:3051
+#: src/nautilus-file-operations.c:3050
 msgid "There was an error getting information about the destination."
 msgstr "Virhe haettaessa tietoja kohteesta."
 
-#: src/nautilus-file-operations.c:3094
+#: src/nautilus-file-operations.c:3093
 msgid "The destination is not a folder."
 msgstr "Kohde ei ole kansio."
 
-#: src/nautilus-file-operations.c:3133
+#: src/nautilus-file-operations.c:3132
 msgid ""
 "There is not enough space on the destination. Try to remove files to make "
 "space."
@@ -2253,70 +2175,70 @@ msgstr ""
 "Kohteessa ei ole tarpeeksi levytilaa jäljellä. Yritä tehdä tilaa poistamalla "
 "tiedostoja."
 
-#: src/nautilus-file-operations.c:3135
+#: src/nautilus-file-operations.c:3134
 #, c-format
 msgid "%S more space is required to copy to the destination."
 msgstr "Kohteeseen kopioimiseksi vaaditaan %S lisätilaa."
 
-#: src/nautilus-file-operations.c:3163
+#: src/nautilus-file-operations.c:3162
 msgid "The destination is read-only."
 msgstr "Kohdetta voi vain lukea."
 
-#: src/nautilus-file-operations.c:3228
+#: src/nautilus-file-operations.c:3227
 msgid "Moving “%B” to “%B”"
 msgstr "Siirretään ”%B” kohteeseen ”%B”."
 
-#: src/nautilus-file-operations.c:3230
+#: src/nautilus-file-operations.c:3229
 msgid "Moved “%B” to “%B”"
 msgstr "Siirrettiin ”%B” kohteeseen ”%B”."
 
-#: src/nautilus-file-operations.c:3234
+#: src/nautilus-file-operations.c:3233
 msgid "Copying “%B” to “%B”"
 msgstr "Kopioidaan ”%B” kohteeseen ”%B”."
 
-#: src/nautilus-file-operations.c:3236
+#: src/nautilus-file-operations.c:3235
 msgid "Copied “%B” to “%B”"
 msgstr "Kopioitiin ”%B” kohteeseen ”%B”."
 
-#: src/nautilus-file-operations.c:3247
+#: src/nautilus-file-operations.c:3246
 msgid "Duplicating “%B”"
 msgstr "Kahdennetaan ”%B”"
 
-#: src/nautilus-file-operations.c:3249
+#: src/nautilus-file-operations.c:3248
 msgid "Duplicated “%B”"
 msgstr "Kahdennettiin ”%B”"
 
-#: src/nautilus-file-operations.c:3259
+#: src/nautilus-file-operations.c:3258
 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”"
 
-#: src/nautilus-file-operations.c:3263
+#: src/nautilus-file-operations.c:3262
 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”"
 
-#: src/nautilus-file-operations.c:3273
+#: src/nautilus-file-operations.c:3272
 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”"
 
-#: src/nautilus-file-operations.c:3277
+#: src/nautilus-file-operations.c:3276
 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”"
 
-#: src/nautilus-file-operations.c:3291
+#: src/nautilus-file-operations.c:3290
 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”"
 
-#: src/nautilus-file-operations.c:3299
+#: src/nautilus-file-operations.c:3298
 msgid "Duplicated %'d file in “%B”"
 msgid_plural "Duplicated %'d files in “%B”"
 msgstr[0] "Kahdennettiin %'d tiedosto sijainnissa “%B”"
@@ -2324,7 +2246,14 @@ 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".
-#: src/nautilus-file-operations.c:3327 src/nautilus-file-operations.c:3359
+#. 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", so something like "4 kb / 4 MB"
+#. To translators: %S will expand to a size like "2 bytes" or "3 MB".
+#: src/nautilus-file-operations.c:3326 src/nautilus-file-operations.c:3358
+#: src/nautilus-file-operations.c:7178 src/nautilus-file-operations.c:7278
+#: src/nautilus-file-operations.c:7502 src/nautilus-file-operations.c:7524
 #, c-format
 msgid "%S / %S"
 msgstr "%S / %S"
@@ -2334,7 +2263,21 @@ msgstr "%S / %S"
 #. *
 #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument).
 #.
-#: src/nautilus-file-operations.c:3351
+#. To translators: %S will expand to a size like "2 bytes" or
+#. * "3 MB", %T to a time duration like "2 minutes". So the whole
+#. * thing will be something like
+#. * "2 kb / 4 MB -- 2 hours left (4kb/sec)"
+#. *
+#. * The singular/plural form will be used depending on the
+#. * remaining time (i.e. the %T argument).
+#.
+#. To translators: %S will expand to a size like "2 bytes" or "3 MB", %T to a time duration like
+#. * "2 minutes". So the whole thing will be something like "2 kb / 4 MB -- 2 hours left (4kb/sec)"
+#. *
+#. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument).
+#.
+#: src/nautilus-file-operations.c:3350 src/nautilus-file-operations.c:7188
+#: src/nautilus-file-operations.c:7516
 msgid "%S / %S — %T left (%S/sec)"
 msgid_plural "%S / %S — %T left (%S/sec)"
 msgstr[0] "%S / %S — %T jäljellä (%S/s)"
@@ -2345,13 +2288,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).
 #.
-#: src/nautilus-file-operations.c:3370
+#: src/nautilus-file-operations.c:3369 src/nautilus-file-operations.c:7535
 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)"
 
-#: src/nautilus-file-operations.c:3883
+#: src/nautilus-file-operations.c:3882
 msgid ""
 "The folder “%B” cannot be copied because you do not have permissions to "
 "create it in the destination."
@@ -2359,11 +2302,11 @@ msgstr ""
 "Kansiota ”%B” ei voida kopioida, koska sinulla ei ole oikeutta luoda sitä "
 "kohteeseen."
 
-#: src/nautilus-file-operations.c:3886
+#: src/nautilus-file-operations.c:3885
 msgid "There was an error creating the folder “%B”."
 msgstr "Virhe luotaessa kansiota ”%B”."
 
-#: src/nautilus-file-operations.c:4016
+#: src/nautilus-file-operations.c:4021
 msgid ""
 "Files in the folder “%B” cannot be copied because you do not have "
 "permissions to see them."
@@ -2371,214 +2314,312 @@ msgstr ""
 "Tiedostoja kansiossa ”%B” ei voi kopioida, koska sinulla ei ole oikeutta "
 "nähdä niitä."
 
-#: src/nautilus-file-operations.c:4061
+#: src/nautilus-file-operations.c:4033
+msgid "_Skip files"
+msgstr "_Ohita tiedostot"
+
+#: src/nautilus-file-operations.c:4066
 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."
 
-#: src/nautilus-file-operations.c:4106 src/nautilus-file-operations.c:4835
-#: src/nautilus-file-operations.c:5449
+#: src/nautilus-file-operations.c:4111 src/nautilus-file-operations.c:4701
+#: src/nautilus-file-operations.c:5320
 msgid "Error while moving “%B”."
 msgstr "Virhe siirrettäessä kohdetta ”%B”."
 
-#: src/nautilus-file-operations.c:4107
+#: src/nautilus-file-operations.c:4112
 msgid "Could not remove the source folder."
 msgstr "Lähdekansion poistaminen epäonnistui."
 
-#: src/nautilus-file-operations.c:4191 src/nautilus-file-operations.c:4232
-#: src/nautilus-file-operations.c:4837 src/nautilus-file-operations.c:4908
+#: src/nautilus-file-operations.c:4179 src/nautilus-file-operations.c:4703
+#: src/nautilus-file-operations.c:4774
 msgid "Error while copying “%B”."
 msgstr "Virhe kopioitaessa kohdetta ”%B”."
 
-#: src/nautilus-file-operations.c:4192
+#: src/nautilus-file-operations.c:4186
 #, c-format
-msgid "Could not remove files from the already existing folder %F."
-msgstr "Tiedostoja ei voitu poistaa jo olemassa olevasta kansiosta %F."
+#| msgid "Could not remove the already existing file %F."
+msgid "Could not remove the already existing folder %F."
+msgstr "Ei voitu poistaa jo olemassa olevaa kansiota %F."
 
-#: src/nautilus-file-operations.c:4233
+#: src/nautilus-file-operations.c:4189
 #, 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
-#: src/nautilus-file-operations.c:4580 src/nautilus-file-operations.c:5292
+#: src/nautilus-file-operations.c:4435 src/nautilus-file-operations.c:5163
 msgid "You cannot move a folder into itself."
 msgstr "Et voi siirtää kansiota itseensä."
 
-#: src/nautilus-file-operations.c:4581 src/nautilus-file-operations.c:5293
+#: src/nautilus-file-operations.c:4436 src/nautilus-file-operations.c:5164
 msgid "You cannot copy a folder into itself."
 msgstr "Et voi kopioida kansiota itseensä."
 
-#: src/nautilus-file-operations.c:4582 src/nautilus-file-operations.c:5294
+#: src/nautilus-file-operations.c:4437 src/nautilus-file-operations.c:5165
 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
-#: src/nautilus-file-operations.c:4612
+#: src/nautilus-file-operations.c:4467
 msgid "You cannot move a file over itself."
 msgstr "Et voi siirtää tiedostoa itseensä."
 
-#: src/nautilus-file-operations.c:4613
+#: src/nautilus-file-operations.c:4468
 msgid "You cannot copy a file over itself."
 msgstr "Et voi kopioida tiedostoa itseensä."
 
-#: src/nautilus-file-operations.c:4614
+#: src/nautilus-file-operations.c:4469
 msgid "The source file would be overwritten by the destination."
 msgstr "Kohde kirjoittaisi lähdetiedoston päälle."
 
-#: src/nautilus-file-operations.c:4839
+#: src/nautilus-file-operations.c:4705
 #, 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."
 
-#: src/nautilus-file-operations.c:4909
+#: src/nautilus-file-operations.c:4775
 #, c-format
 msgid "There was an error copying the file into %F."
 msgstr "Virhe kopioitaessa tiedostoja kohteeseen %F."
 
-#: src/nautilus-file-operations.c:5138 src/nautilus-file-operations.c:5175
+#: src/nautilus-file-operations.c:5009 src/nautilus-file-operations.c:5046
 msgid "Copying Files"
 msgstr "Kopioidaan tiedostoja"
 
-#: src/nautilus-file-operations.c:5202
+#: src/nautilus-file-operations.c:5073
 msgid "Preparing to move to “%B”"
 msgstr "Valmistellaan siirtoa kohteeseen ”%B”"
 
-#: src/nautilus-file-operations.c:5206
+#: src/nautilus-file-operations.c:5077
 #, 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"
 
-#: src/nautilus-file-operations.c:5450
+#: src/nautilus-file-operations.c:5321
 #, c-format
 msgid "There was an error moving the file into %F."
 msgstr "Tapahtui virhe siirrettäessä tiedostoa kohteeseen %F."
 
-#: src/nautilus-file-operations.c:5710
+#: src/nautilus-file-operations.c:5586
 msgid "Moving Files"
 msgstr "Siirretään tiedostoja"
 
-#: src/nautilus-file-operations.c:5744
+#: src/nautilus-file-operations.c:5620
 msgid "Creating links in “%B”"
 msgstr "Luodaan linkkejä kohteeseen ”%B”"
 
-#: src/nautilus-file-operations.c:5748
+#: src/nautilus-file-operations.c:5624
 #, 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"
 
-#: src/nautilus-file-operations.c:5883
+#: src/nautilus-file-operations.c:5759
 msgid "Error while creating link to %B."
 msgstr "Virhe luotaessa linkkiä kohteeseen %B."
 
-#: src/nautilus-file-operations.c:5885
+#: src/nautilus-file-operations.c:5761
 msgid "Symbolic links only supported for local files"
 msgstr "Paikallisia linkkejä voi käyttää vain paikallisten tiedostojen kanssa."
 
-#: src/nautilus-file-operations.c:5888
+#: src/nautilus-file-operations.c:5764
 msgid "The target doesn't support symbolic links."
 msgstr "Kohde ei tue symbolisia linkkejä."
 
-#: src/nautilus-file-operations.c:5891
+#: src/nautilus-file-operations.c:5767
 #, c-format
 msgid "There was an error creating the symlink in %F."
 msgstr "Virhe luotaessa symbolista linkkiä kohteeseen %F."
 
-#: src/nautilus-file-operations.c:6217
+#: src/nautilus-file-operations.c:6093
 msgid "Setting permissions"
 msgstr "Asetetaan oikeuksia"
 
 #. localizers: the initial name of a new folder
-#: src/nautilus-file-operations.c:6476
+#: src/nautilus-file-operations.c:6352
 msgid "Untitled Folder"
 msgstr "Nimetön kansio"
 
 #. localizers: the initial name of a new empty document
-#: src/nautilus-file-operations.c:6488
+#: src/nautilus-file-operations.c:6364
 msgid "Untitled Document"
 msgstr "Nimetön asiakirja"
 
-#: src/nautilus-file-operations.c:6704
+#: src/nautilus-file-operations.c:6580
 msgid "Error while creating directory %B."
 msgstr "Virhe luotaessa kansiota %B."
 
-#: src/nautilus-file-operations.c:6706
+#: src/nautilus-file-operations.c:6582
 msgid "Error while creating file %B."
 msgstr "Virhe luotaessa tiedostoa %B."
 
-#: src/nautilus-file-operations.c:6708
+#: src/nautilus-file-operations.c:6584
 #, c-format
 msgid "There was an error creating the directory in %F."
 msgstr "Virhe luotaessa kansiota kohteeseen %F."
 
-#: src/nautilus-file-operations.c:6968
+#: src/nautilus-file-operations.c:6844
 msgid "Emptying Trash"
 msgstr "Tyhjennetään roskakoria"
 
-#: src/nautilus-file-operations.c:7016 src/nautilus-file-operations.c:7057
-#: src/nautilus-file-operations.c:7092 src/nautilus-file-operations.c:7127
+#: src/nautilus-file-operations.c:6892 src/nautilus-file-operations.c:6933
+#: src/nautilus-file-operations.c:6968 src/nautilus-file-operations.c:7003
 msgid "Unable to mark launcher trusted (executable)"
 msgstr "Suoritettavaa käynnistintä ei voi merkitä luotetuksi"
 
-#: src/nautilus-files-view.c:374
+#: src/nautilus-file-operations.c:7104
+msgid "Verifying destination"
+msgstr "Vahvistetaan kohde"
+
+#: src/nautilus-file-operations.c:7143
+#| msgid "Trashing “%B”"
+msgid "Extracting “%B”"
+msgstr "Puretaan “%B”"
+
+#: src/nautilus-file-operations.c:7220
+#| msgid "Error while copying “%B”."
+msgid "Error extracting “%B”"
+msgstr "Virhe purettaessa “%B”"
+
+#: src/nautilus-file-operations.c:7224
+#| msgid "There was an error deleting %B."
+msgid "There was an error while extracting “%B”."
+msgstr "Virhe purettaessa “%B”."
+
+#: src/nautilus-file-operations.c:7263
+#| msgid "Moved “%B” to “%B”"
+msgid "Extracted “%B” to “%B”"
+msgstr "Purettu “%B” kohteeseen “%B”"
+
+#: src/nautilus-file-operations.c:7267
+#| msgid "Moved %'d file to “%B”"
+#| msgid_plural "Moved %'d files to “%B”"
+msgid "Extracted %'d file to “%B”"
+msgid_plural "Extracted %'d files to “%B”"
+msgstr[0] "Purettiin %'d tiedosto kohteeseen “%B”"
+msgstr[1] "Purettiin %'d tiedostoa kohteeseen “%B”"
+
+#: src/nautilus-file-operations.c:7301
+#| msgid "Preparing to trash %'d file"
+#| msgid_plural "Preparing to trash %'d files"
+msgid "Preparing to extract"
+msgstr "Valmistellaan purkamista"
+
+#: src/nautilus-file-operations.c:7417
+#| msgid "Trashing Files"
+msgid "Extracting Files"
+msgstr "Puretaan tiedostoja"
+
+#: src/nautilus-file-operations.c:7469
+#| msgid "Copying “%B” to “%B”"
+msgid "Compressing “%B” into “%B”"
+msgstr "Pakataan “%B” kohteeseen “%B”"
+
+#: src/nautilus-file-operations.c:7473
+#| msgid "Copying %'d file to “%B”"
+#| msgid_plural "Copying %'d files to “%B”"
+msgid "Compressing %'d file into “%B”"
+msgid_plural "Compressing %'d files into “%B”"
+msgstr[0] "Pakataan %'d tiedosto kohteeseen “%B”"
+msgstr[1] "Pakataan %'d tiedostoa kohteeseen “%B”"
+
+#: src/nautilus-file-operations.c:7574
+#| msgid "Copying “%B” to “%B”"
+msgid "Error compressing “%B” into “%B”"
+msgstr "Virhe pakattaessa tiedostoa “%B” kohteeseen “%B”"
+
+#: src/nautilus-file-operations.c:7578
+#| msgid "Copying %'d file to “%B”"
+#| msgid_plural "Copying %'d files to “%B”"
+msgid "Error compressing %'d file into “%B”"
+msgid_plural "Error compressing %'d files into “%B”"
+msgstr[0] "Virhe pakattaessa %'d tiedosto kohteeseen “%B”"
+msgstr[1] "Virhe pakattaessa %'d tiedostoa kohteeseen “%B”"
+
+#: src/nautilus-file-operations.c:7589
+#| msgid "There was an error copying the file into %F."
+msgid "There was an error while compressing files."
+msgstr "Virhe tiedostoja pakattaessa."
+
+#: src/nautilus-file-operations.c:7608
+#| msgid "Copied “%B” to “%B”"
+msgid "Compressed “%B” into “%B”"
+msgstr "Pakattiin ”%B” kohteeseen ”%B”."
+
+#: src/nautilus-file-operations.c:7612
+#| msgid "Copied %'d file to “%B”"
+#| msgid_plural "Copied %'d files to “%B”"
+msgid "Compressed %'d file into “%B”"
+msgid_plural "Compressed %'d files into “%B”"
+msgstr[0] "Pakattiin %'d tiedosto kohteeseen “%B”"
+msgstr[1] "Pakattiin %'d tiedostoa kohteeseen “%B”"
+
+#: src/nautilus-file-operations.c:7702
+#| msgid "Copying Files"
+msgid "Compressing Files"
+msgstr "Pakataan tiedostoja"
+
+#: src/nautilus-files-view.c:383
 msgid "Searching…"
 msgstr "Etsitään…"
 
-#: src/nautilus-files-view.c:374 src/nautilus-image-properties-page.c:707
+#: src/nautilus-files-view.c:383 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:1009 src/nautilus-mime-actions.c:961
-#: src/nautilus-mime-actions.c:1703
+#: src/nautilus-files-view.c:1028 src/nautilus-mime-actions.c:975
+#: src/nautilus-mime-actions.c:1721
 msgid "Are you sure you want to open all files?"
 msgstr "Haluatko varmasti avata kaikki tiedostot?"
 
-#: src/nautilus-files-view.c:1011
+#: src/nautilus-files-view.c:1030
 #, 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:1014
+#: src/nautilus-files-view.c:1033
 #, 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:1018 src/nautilus-location-entry.c:269
-#: src/nautilus-mime-actions.c:970 src/nautilus-mime-actions.c:1144
-#: src/nautilus-mime-actions.c:1707
+#: src/nautilus-files-view.c:1037 src/nautilus-location-entry.c:269
+#: src/nautilus-mime-actions.c:984 src/nautilus-mime-actions.c:1158
+#: src/nautilus-mime-actions.c:1725
 msgid "_OK"
 msgstr "_OK"
 
-#: src/nautilus-files-view.c:1490
+#: src/nautilus-files-view.c:1542
 msgid "Select Items Matching"
 msgstr "Valitse täsmäävät kohteet"
 
-#: src/nautilus-files-view.c:1495 src/nautilus-files-view.c:5038
+#: src/nautilus-files-view.c:1547 src/nautilus-files-view.c:5307
+#: src/nautilus-files-view.c:5771
 msgid "_Select"
 msgstr "_Valitse"
 
-#: src/nautilus-files-view.c:1503
+#: src/nautilus-files-view.c:1555
 msgid "_Pattern:"
 msgstr "_Lauseke:"
 
-#: src/nautilus-files-view.c:1509
+#: src/nautilus-files-view.c:1561
 msgid "Examples: "
 msgstr "Esimerkkejä: "
 
-#: src/nautilus-files-view.c:2288
+#: src/nautilus-files-view.c:2533
 msgid ""
 "Nautilus 3.6 deprecated this directory and tried migrating this "
 "configuration to ~/.local/share/nautilus"
@@ -2586,19 +2627,19 @@ msgstr ""
 "Nautilus 3.6 hylkäksi tämän hakemiston ja yritti siirtää asetuksia "
 "hakemistoon ~/.local/share/nautilus"
 
-#: src/nautilus-files-view.c:2715 src/nautilus-files-view.c:2750
+#: src/nautilus-files-view.c:2978 src/nautilus-files-view.c:3013
 #, c-format
 msgid "“%s” selected"
 msgstr "”%s” valittu"
 
-#: src/nautilus-files-view.c:2717
+#: src/nautilus-files-view.c:2980
 #, 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:2727
+#: src/nautilus-files-view.c:2990
 #, c-format
 msgid "(containing %'d item)"
 msgid_plural "(containing %'d items)"
@@ -2606,14 +2647,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:2738
+#: src/nautilus-files-view.c:3001
 #, 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:2753
+#: src/nautilus-files-view.c:3016
 #, c-format
 msgid "%'d item selected"
 msgid_plural "%'d items selected"
@@ -2621,7 +2662,7 @@ msgstr[0] "%'d kohde valittu"
 msgstr[1] "%'d kohdetta valittu"
 
 #. Folders selected also, use "other" terminology
-#: src/nautilus-files-view.c:2760
+#: src/nautilus-files-view.c:3023
 #, c-format
 msgid "%'d other item selected"
 msgid_plural "%'d other items selected"
@@ -2632,7 +2673,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:2774
+#: src/nautilus-files-view.c:3037
 #, c-format
 msgid "(%s)"
 msgstr "(%s)"
@@ -2644,103 +2685,116 @@ msgstr "(%s)"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: src/nautilus-files-view.c:2798
+#: src/nautilus-files-view.c:3061
 #, c-format
 msgid "%s %s, %s %s"
 msgstr "%s %s, %s %s"
 
-#: src/nautilus-files-view.c:5027
+#: src/nautilus-files-view.c:5296
 msgid "Select Move Destination"
 msgstr "Valitse siirron sijainti"
 
-#: src/nautilus-files-view.c:5029
+#: src/nautilus-files-view.c:5298
 msgid "Select Copy Destination"
 msgstr "Valitse kopioinnin sijainti"
 
+#: src/nautilus-files-view.c:5767
+#| msgid "Select Move Destination"
+msgid "Select Extract Destination"
+msgstr "Valitse kohde purkamiseen"
+
 #. Translators: %s is a file name formatted for display
-#: src/nautilus-files-view.c:5485
+#: src/nautilus-files-view.c:5996
 #, 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:5512
+#: src/nautilus-files-view.c:6023
 #, c-format
 msgid "Unable to eject “%s”"
 msgstr "Aseman %s poistaminen epäonnistui"
 
-#: src/nautilus-files-view.c:5534
+#: src/nautilus-files-view.c:6045
 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:5639
+#: src/nautilus-files-view.c:6150
 #, c-format
 msgid "Unable to start “%s”"
 msgstr "Kohdetta \"%s\" ei voi käynnistää"
 
-#: src/nautilus-files-view.c:6380
+#: src/nautilus-files-view.c:6936
 #, 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:6428
+#: src/nautilus-files-view.c:6988
 #, c-format
 msgid "Open With %s"
 msgstr "Avaa sovelluksella %s"
 
-#: src/nautilus-files-view.c:6437
+#: src/nautilus-files-view.c:6997
 msgid "Run"
 msgstr "Suorita"
 
-#: src/nautilus-files-view.c:6439
+#: src/nautilus-files-view.c:7000
+msgid "Extract Here"
+msgstr "Pura tänne"
+
+#: src/nautilus-files-view.c:7001
+msgid "Extract to…"
+msgstr "Pura…"
+
+#: src/nautilus-files-view.c:7003
 msgid "Open"
 msgstr "Avaa"
 
-#: src/nautilus-files-view.c:6490
+#: src/nautilus-files-view.c:7054
 #: src/resources/ui/nautilus-files-view-context-menus.ui:125
 msgid "_Start"
 msgstr "_Käynnistä"
 
-#: src/nautilus-files-view.c:6493 src/gtk/nautilusgtkplacesview.c:1651
+#: src/nautilus-files-view.c:7057 src/gtk/nautilusgtkplacesview.c:1651
 msgid "_Connect"
 msgstr "_Yhdistä"
 
-#: src/nautilus-files-view.c:6496
+#: src/nautilus-files-view.c:7060
 msgid "_Start Multi-disk Drive"
 msgstr "_Käynnistä usean levyn asema"
 
-#: src/nautilus-files-view.c:6499
+#: src/nautilus-files-view.c:7063
 msgid "U_nlock Drive"
 msgstr "Avaa _aseman lukitus"
 
-#: src/nautilus-files-view.c:6515
+#: src/nautilus-files-view.c:7079
 msgid "Stop Drive"
 msgstr "Pysäytä asema"
 
-#: src/nautilus-files-view.c:6518
+#: src/nautilus-files-view.c:7082
 msgid "_Safely Remove Drive"
 msgstr "_Sammuta asema turvallisesti"
 
-#: src/nautilus-files-view.c:6521 src/gtk/nautilusgtkplacesview.c:1641
+#: src/nautilus-files-view.c:7085 src/gtk/nautilusgtkplacesview.c:1641
 msgid "_Disconnect"
 msgstr "_Katkaise yhteys"
 
-#: src/nautilus-files-view.c:6524
+#: src/nautilus-files-view.c:7088
 msgid "_Stop Multi-disk Drive"
 msgstr "_Pysäytä usean levyn asema"
 
-#: src/nautilus-files-view.c:6527
+#: src/nautilus-files-view.c:7091
 msgid "_Lock Drive"
 msgstr "_Lukitse asema"
 
-#: src/nautilus-files-view.c:7998
+#: src/nautilus-files-view.c:8564
 msgid "Content View"
 msgstr "Sisältönäkymä"
 
-#: src/nautilus-files-view.c:7999
+#: src/nautilus-files-view.c:8565
 msgid "View of the current folder"
 msgstr "Nykyisen kansion näkymä"
 
@@ -2896,6 +2950,8 @@ msgstr[1] "_Tee uudelleen %d kohteen kopiointi"
 #: src/nautilus-file-undo-operations.c:425
 #: src/nautilus-file-undo-operations.c:447
 #: src/nautilus-file-undo-operations.c:697
+#: src/nautilus-file-undo-operations.c:1743
+#: src/nautilus-file-undo-operations.c:1896
 #, c-format
 msgid "Delete '%s'"
 msgstr "Poista \"%s\""
@@ -3131,66 +3187,124 @@ msgstr "_Kumoa omistajan muutos"
 msgid "_Redo Change Owner"
 msgstr "_Tee uudelleen omistajan muutos"
 
-#: src/nautilus-file-utilities.c:914
+#: src/nautilus-file-undo-operations.c:1730
+#| msgid "_Undo Trash"
+msgid "_Undo Extract"
+msgstr "_Kumoa purkaminen"
+
+#: src/nautilus-file-undo-operations.c:1731
+#| msgid "_Redo Trash"
+msgid "_Redo Extract"
+msgstr "_Tee uudelleen purkaminen"
+
+#: src/nautilus-file-undo-operations.c:1745
+#, c-format
+#| msgid "Delete %d copied item"
+#| msgid_plural "Delete %d copied items"
+msgid "Delete %d extracted file"
+msgid_plural "Delete %d extracted files"
+msgstr[0] "Poista %d purettu tiedosto"
+msgstr[1] "Poista %d purettua tiedostoa"
+
+#: src/nautilus-file-undo-operations.c:1758
+#, c-format
+msgid "Extract '%s'"
+msgstr "Pura '%s'"
+
+#: src/nautilus-file-undo-operations.c:1760
+#, c-format
+#| msgid "Trashed %'d file"
+#| msgid_plural "Trashed %'d files"
+msgid "Extract %d file"
+msgid_plural "Extract %d files"
+msgstr[0] "Pura %d tiedosto"
+msgstr[1] "Pura %d tiedostoa"
+
+#: src/nautilus-file-undo-operations.c:1906
+#, c-format
+#| msgid "Copy '%s' to '%s'"
+msgid "Compress '%s'"
+msgstr "Pakkaa '%s'"
+
+#: src/nautilus-file-undo-operations.c:1908
+#, c-format
+#| msgid "Trashed %'d file"
+#| msgid_plural "Trashed %'d files"
+msgid "Compress %d file"
+msgid_plural "Compress %d files"
+msgstr[0] "Pakkaa %d tiedosto"
+msgstr[1] "Pakkaa %d tiedostoa"
+
+#: src/nautilus-file-undo-operations.c:1914
+#| msgid "_Undo Copy"
+msgid "_Undo Compress"
+msgstr "_Kumoa pakkaaminen"
+
+#: src/nautilus-file-undo-operations.c:1915
+#| msgid "_Redo Copy"
+msgid "_Redo Compress"
+msgstr "_Tee uudelleen pakkaaminen"
+
+#: src/nautilus-file-utilities.c:902
 #, c-format
 msgid "Could not determine original location of “%s” "
 msgstr "Kohteen ”%s” alkuperäistä sijaintia ei voitu selvittää. "
 
-#: src/nautilus-file-utilities.c:918
+#: src/nautilus-file-utilities.c:906
 msgid "The item cannot be restored from trash"
 msgstr "Kohdetta ei voi palauttaa roskakorista."
 
-#: src/nautilus-file-utilities.c:1022
+#: src/nautilus-file-utilities.c:1010
 msgid "Audio CD"
 msgstr "Ääni-CD"
 
-#: src/nautilus-file-utilities.c:1024
+#: src/nautilus-file-utilities.c:1012
 msgid "Audio DVD"
 msgstr "Ääni-DVD"
 
-#: src/nautilus-file-utilities.c:1026
+#: src/nautilus-file-utilities.c:1014
 msgid "Video DVD"
 msgstr "Video-DVD"
 
-#: src/nautilus-file-utilities.c:1028
+#: src/nautilus-file-utilities.c:1016
 msgid "Video CD"
 msgstr "Video-CD"
 
-#: src/nautilus-file-utilities.c:1030
+#: src/nautilus-file-utilities.c:1018
 msgid "Super Video CD"
 msgstr "Super Video CD"
 
-#: src/nautilus-file-utilities.c:1032
+#: src/nautilus-file-utilities.c:1020
 msgid "Photo CD"
 msgstr "Kuva-CD"
 
-#: src/nautilus-file-utilities.c:1034
+#: src/nautilus-file-utilities.c:1022
 msgid "Picture CD"
 msgstr "Kuva-CD"
 
-#: src/nautilus-file-utilities.c:1036 src/nautilus-file-utilities.c:1069
+#: src/nautilus-file-utilities.c:1024 src/nautilus-file-utilities.c:1057
 msgid "Contains digital photos"
 msgstr "Sisältää digitaalisia valokuvia."
 
-#: src/nautilus-file-utilities.c:1038
+#: src/nautilus-file-utilities.c:1026
 msgid "Contains music"
 msgstr "Sisältää musiikkia"
 
-#: src/nautilus-file-utilities.c:1040
+#: src/nautilus-file-utilities.c:1028
 msgid "Contains software"
 msgstr "Sisältää ohjelmistoja"
 
 #. fallback to generic greeting
-#: src/nautilus-file-utilities.c:1043
+#: src/nautilus-file-utilities.c:1031
 #, c-format
 msgid "Detected as “%s”"
 msgstr "Tunnistettu - \"%s\""
 
-#: src/nautilus-file-utilities.c:1065
+#: src/nautilus-file-utilities.c:1053
 msgid "Contains music and photos"
 msgstr "Sisältää musiikkia ja kuvia"
 
-#: src/nautilus-file-utilities.c:1067
+#: src/nautilus-file-utilities.c:1055
 msgid "Contains photos and music"
 msgstr "Sisältää kuvia ja musiikkia"
 
@@ -3351,124 +3465,123 @@ 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:258 src/nautilus-mime-actions.c:966
+#: src/nautilus-location-entry.c:258 src/nautilus-mime-actions.c:980
 #, 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:93
+#: src/nautilus-mime-actions.c:94
 #: src/resources/ui/nautilus-search-popover.ui:275
-#| msgid "nothing"
 msgid "Anything"
 msgstr "Mitä tahansa"
 
-#: src/nautilus-mime-actions.c:104 src/nautilus-properties-window.c:4162
+#: src/nautilus-mime-actions.c:105 src/nautilus-properties-window.c:4162
 msgid "Folders"
 msgstr "Kansiot"
 
-#: src/nautilus-mime-actions.c:109
+#: src/nautilus-mime-actions.c:110
 msgid "Documents"
 msgstr "Asiakirjat"
 
-#: src/nautilus-mime-actions.c:127
+#: src/nautilus-mime-actions.c:128
 msgid "Illustration"
 msgstr "Piirros"
 
-#: src/nautilus-mime-actions.c:141
+#: src/nautilus-mime-actions.c:142
 msgid "Music"
 msgstr "Musiikki"
 
-#: src/nautilus-mime-actions.c:156
+#: src/nautilus-mime-actions.c:157
 msgid "PDF / PostScript"
 msgstr "PDF / PostScript"
 
-#: src/nautilus-mime-actions.c:164
+#: src/nautilus-mime-actions.c:165
 msgid "Picture"
 msgstr "Kuva"
 
-#: src/nautilus-mime-actions.c:209
+#: src/nautilus-mime-actions.c:210
 msgid "Text File"
 msgstr "Tekstitiedosto"
 
-#: src/nautilus-mime-actions.c:543
+#: src/nautilus-mime-actions.c:544
 #, 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:545
+#: src/nautilus-mime-actions.c:546
 #, c-format
 msgid "The link “%s” is broken."
 msgstr "Linkki ”%s” on rikki."
 
-#: src/nautilus-mime-actions.c:551
+#: src/nautilus-mime-actions.c:552
 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:553
+#: src/nautilus-mime-actions.c:554
 #, 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:563
+#: src/nautilus-mime-actions.c:564
 #: src/resources/ui/nautilus-files-view-context-menus.ui:174
 msgid "Mo_ve to Trash"
 msgstr "Siirrä _roskakoriin"
 
-#: src/nautilus-mime-actions.c:623
+#: src/nautilus-mime-actions.c:624
 #, 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:625
+#: src/nautilus-mime-actions.c:626
 #, c-format
 msgid "“%s” is an executable text file."
 msgstr "”%s” on suoritettava tekstitiedosto."
 
-#: src/nautilus-mime-actions.c:631
+#: src/nautilus-mime-actions.c:632
 msgid "Run in _Terminal"
 msgstr "Suorita _päätteessä"
 
-#: src/nautilus-mime-actions.c:632
+#: src/nautilus-mime-actions.c:633
 msgid "_Display"
 msgstr "_Näytä"
 
-#: src/nautilus-mime-actions.c:963
+#: src/nautilus-mime-actions.c:977
 #, 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:1028
+#: src/nautilus-mime-actions.c:1042
 #, c-format
 msgid "Could not display “%s”."
 msgstr "Kohdetta ”%s” ei voi näyttää."
 
-#: src/nautilus-mime-actions.c:1126
+#: src/nautilus-mime-actions.c:1140
 msgid "The file is of an unknown type"
 msgstr "Tiedoston tyyppi on tuntematon"
 
-#: src/nautilus-mime-actions.c:1129
+#: src/nautilus-mime-actions.c:1143
 #, 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:1142
+#: src/nautilus-mime-actions.c:1156
 msgid "_Select Application"
 msgstr "_Valitse sovellus"
 
-#: src/nautilus-mime-actions.c:1178
+#: src/nautilus-mime-actions.c:1192
 msgid "There was an internal error trying to search for applications:"
 msgstr "Tapahtui sisäinen virhe etsittäessä sovelluksia:"
 
-#: src/nautilus-mime-actions.c:1180
+#: src/nautilus-mime-actions.c:1194
 msgid "Unable to search for application"
 msgstr "Sovellusta ei voitu etsiä"
 
-#: src/nautilus-mime-actions.c:1303
+#: src/nautilus-mime-actions.c:1317
 #, c-format
 msgid ""
 "There is no application installed for “%s” files.\n"
@@ -3477,11 +3590,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:1453
+#: src/nautilus-mime-actions.c:1467
 msgid "Untrusted application launcher"
 msgstr "Sovelluksen käynnistin ei ole luotettu"
 
-#: src/nautilus-mime-actions.c:1456
+#: src/nautilus-mime-actions.c:1470
 #, c-format
 msgid ""
 "The application launcher “%s” has not been marked as trusted. If you do not "
@@ -3490,15 +3603,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:1471
+#: src/nautilus-mime-actions.c:1485
 msgid "_Launch Anyway"
 msgstr "_Käynnistä silti"
 
-#: src/nautilus-mime-actions.c:1474
+#: src/nautilus-mime-actions.c:1488
 msgid "Mark as _Trusted"
 msgstr "Merkitse luo_tetuksi"
 
-#: src/nautilus-mime-actions.c:1704
+#: src/nautilus-mime-actions.c:1722
 #, c-format
 msgid "This will open %d separate application."
 msgid_plural "This will open %d separate applications."
@@ -3506,21 +3619,21 @@ 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:1781 src/nautilus-mime-actions.c:2045
+#: src/nautilus-mime-actions.c:1799 src/nautilus-mime-actions.c:2063
 #: src/gtk/nautilusgtkplacesview.c:1172 src/gtk/nautilusgtkplacesview.c:1245
 msgid "Unable to access location"
 msgstr "Sijaintiin ei ole pääsyä"
 
-#: src/nautilus-mime-actions.c:2124
+#: src/nautilus-mime-actions.c:2142
 msgid "Unable to start location"
 msgstr "Sijaintia ei voi käynnistää"
 
-#: src/nautilus-mime-actions.c:2208
+#: src/nautilus-mime-actions.c:2226
 #, c-format
 msgid "Opening “%s”."
 msgstr "”%s” avautuu."
 
-#: src/nautilus-mime-actions.c:2211
+#: src/nautilus-mime-actions.c:2229
 #, c-format
 msgid "Opening %d item."
 msgid_plural "Opening %d items."
@@ -3588,26 +3701,25 @@ msgstr "Kansion nimi ei voi sisältää merkkiä \"/\"."
 
 #: src/nautilus-new-folder-dialog-controller.c:32
 #: src/nautilus-rename-file-popover-controller.c:65
-#| msgid "A folder can not be called “.”."
 msgid "A folder cannot be called “.”."
 msgstr "Kansion nimi ei voi olla “.”."
 
 #: src/nautilus-new-folder-dialog-controller.c:34
 #: src/nautilus-rename-file-popover-controller.c:72
-#| msgid "A folder can not be called “..”."
 msgid "A folder cannot be called “..”."
 msgstr "Kansion nimi ei voi olla “..”."
 
-#: src/nautilus-new-folder-dialog-controller.c:97
+#: src/nautilus-new-folder-dialog-controller.c:100
+#: src/resources/ui/nautilus-compress-dialog.ui:137
 msgid "Create"
 msgstr "Luo"
 
-#: src/nautilus-new-folder-dialog-controller.c:98
-#: src/nautilus-rename-file-popover-controller.c:152
+#: src/nautilus-new-folder-dialog-controller.c:101
+#: src/nautilus-rename-file-popover-controller.c:155
 msgid "Folder name"
 msgstr "Kansion nimi"
 
-#: src/nautilus-new-folder-dialog-controller.c:99
+#: src/nautilus-new-folder-dialog-controller.c:102
 msgid "New Folder"
 msgstr "Uusi kansio"
 
@@ -3615,8 +3727,130 @@ msgstr "Uusi kansio"
 msgid "Close tab"
 msgstr "Sulje välilehti"
 
+#: src/nautilus-operations-ui-manager.c:132
+#, c-format
+msgid "Merge folder “%s”?"
+msgstr "Yhdistetäänkö kansio ”%s”?"
+
+#: src/nautilus-operations-ui-manager.c:135
+msgid ""
+"Merging will ask for confirmation before replacing any files in the folder "
+"that conflict with the files being copied."
+msgstr ""
+"Yhdistäessä kysytään varmistusta, ennen kuin mitään kyseisen kansion "
+"tiedostoja korvataan kopioitavilla tiedostoilla."
+
+#: src/nautilus-operations-ui-manager.c:139
+#, c-format
+msgid "An older folder with the same name already exists in “%s”."
+msgstr "Vanhempi kansio samalla nimellä on jo olemassa kohteessa ”%s”."
+
+#: src/nautilus-operations-ui-manager.c:142
+#, c-format
+msgid "A newer folder with the same name already exists in “%s”."
+msgstr "Uudempi kansio samalla nimellä on jo olemassa kohteessa ”%s”."
+
+#: src/nautilus-operations-ui-manager.c:145
+#, c-format
+msgid "Another folder with the same name already exists in “%s”."
+msgstr "Toinen kansio samalla nimellä on jo olemassa kohteessa ”%s”."
+
+#: src/nautilus-operations-ui-manager.c:149
+#, c-format
+msgid "Replace folder “%s”?"
+msgstr "Korvataanko kansio ”%s”?"
+
+#: src/nautilus-operations-ui-manager.c:151
+msgid "Replacing it will remove all files in the folder."
+msgstr "Sen korvaaminen poistaa kaikki kansiossa olevat tiedostot."
+
+#: src/nautilus-operations-ui-manager.c:152
+#, c-format
+msgid "A folder with the same name already exists in “%s”."
+msgstr "Kansio samalla nimellä on jo olemassa kohteessa ”%s”."
+
+#: src/nautilus-operations-ui-manager.c:156
+#, c-format
+msgid "Replace file “%s”?"
+msgstr "Korvataanko tiedosto ”%s”?"
+
+#: src/nautilus-operations-ui-manager.c:159
+msgid "Replacing it will overwrite its content."
+msgstr "Sen korvaaminen ylikirjoittaa sisällön."
+
+#: src/nautilus-operations-ui-manager.c:162
+#, c-format
+msgid "An older file with the same name already exists in “%s”."
+msgstr "Vanhempi tiedosto samalla nimellä on jo olemassa kohteessa ”%s”."
+
+#: src/nautilus-operations-ui-manager.c:165
+#, c-format
+msgid "A newer file with the same name already exists in “%s”."
+msgstr "Uudempi tiedosto samalla nimellä on jo olemassa kohteessa ”%s”."
+
+#: src/nautilus-operations-ui-manager.c:168
+#, c-format
+msgid "Another file with the same name already exists in “%s”."
+msgstr "Toinen tiedosto samalla nimellä on jo olemassa kohteessa ”%s”."
+
+#: src/nautilus-operations-ui-manager.c:241
+msgid "Original folder"
+msgstr "Alkuperäinen kansio"
+
+#: src/nautilus-operations-ui-manager.c:242
+#: src/nautilus-operations-ui-manager.c:270
+msgid "Items:"
+msgstr "Kohteet:"
+
+#: src/nautilus-operations-ui-manager.c:245
+msgid "Original file"
+msgstr "Alkuperäinen tiedosto"
+
+#: src/nautilus-operations-ui-manager.c:246
+#: src/nautilus-operations-ui-manager.c:274
+#: src/nautilus-properties-window.c:2959
+msgid "Size:"
+msgstr "Koko:"
+
+#: src/nautilus-operations-ui-manager.c:250
+#: src/nautilus-operations-ui-manager.c:278
+#: src/nautilus-properties-window.c:2941
+msgid "Type:"
+msgstr "Tyyppi:"
+
+#: src/nautilus-operations-ui-manager.c:253
+#: src/nautilus-operations-ui-manager.c:281
+msgid "Last modified:"
+msgstr "Viimeksi muokattu:"
+
+#: src/nautilus-operations-ui-manager.c:269
+msgid "Merge with"
+msgstr "Yhdistä kohteen kanssa"
+
+#: src/nautilus-operations-ui-manager.c:269
+#: src/nautilus-operations-ui-manager.c:273
+msgid "Replace with"
+msgstr "Alkuperäisen korvaava tiedosto"
+
+#: src/nautilus-operations-ui-manager.c:312
+msgid "Merge"
+msgstr "Yhdistä"
+
+#: src/nautilus-operations-ui-manager.c:334
+msgid "Merge Folder"
+msgstr "Yhdistä kansio"
+
+#: src/nautilus-operations-ui-manager.c:335
+#: src/nautilus-operations-ui-manager.c:338
+msgid "File and Folder conflict"
+msgstr "Tiedoston ja kansion ristiriita"
+
+#: src/nautilus-operations-ui-manager.c:339
+msgid "File conflict"
+msgstr "Tiedostoristiriita"
+
 #. Translators: this is referred to captions under icons.
-#: src/nautilus-preferences-window.c:131 src/nautilus-properties-window.c:3735
+#: src/nautilus-preferences-window.c:133 src/nautilus-properties-window.c:3735
 #: src/nautilus-properties-window.c:3762
 msgid "None"
 msgstr "Ei mikään"
@@ -3657,7 +3891,6 @@ msgid "Details: "
 msgstr "Lisätiedot: "
 
 #: src/nautilus-progress-info.c:296
-#| msgid "Cancelled"
 msgid "Canceled"
 msgstr "Peruttu"
 
@@ -3943,7 +4176,7 @@ msgstr "_Avaa"
 #: 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:861
+#: src/resources/ui/nautilus-preferences-window.ui:907
 #: src/resources/ui/nautilus-search-popover.ui:341
 #: src/resources/ui/nautilus-toolbar.ui:143
 msgid "Search"
@@ -3955,7 +4188,6 @@ msgid "Search for “%s”"
 msgstr "Haun ”%s” tulokset"
 
 #: src/nautilus-query-editor.c:121
-#| msgid "Searching for network locations"
 msgid "Searching locations only"
 msgstr "Etsitään vain sijainneista"
 
@@ -3964,21 +4196,18 @@ msgid "Searching devices only"
 msgstr "Etsitään vain laitteilta"
 
 #: src/nautilus-query-editor.c:125
-#| msgid "Searching for network locations"
 msgid "Searching network locations only"
 msgstr "Etsitään vain verkkosijanneista"
 
 #: src/nautilus-query-editor.c:128
-#| 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:130
-#| msgid "Remote location — only searching the current folder"
 msgid "Only searching the current folder"
 msgstr "Etsitään vain nykyisestä kansiosta"
 
-#: src/nautilus-rename-file-popover-controller.c:153
+#: src/nautilus-rename-file-popover-controller.c:156
 msgid "File name"
 msgstr "Tiedoston nimi"
 
@@ -4015,7 +4244,6 @@ msgstr "Valitse"
 
 #: src/nautilus-search-popover.c:624
 #: src/resources/ui/nautilus-search-popover.ui:51
-#| msgid "Select type"
 msgid "Select Dates…"
 msgstr "Valitse päivät…"
 
@@ -4026,7 +4254,6 @@ msgid "Trash"
 msgstr "Roskakori"
 
 #: src/nautilus-special-location-bar.c:53
-#| 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 ""
 "Aseta tiedostoja tähän kansioon käyttääksesi niitä malleina uusille "
@@ -4083,7 +4310,6 @@ msgstr[1] "%d päivää sitten"
 #. weeks
 #: src/nautilus-ui-utilities.c:346
 #, c-format
-#| msgid "Last _Opened"
 msgid "Last week"
 msgid_plural "%d weeks ago"
 msgstr[0] "Viikko sitten"
@@ -4237,331 +4463,276 @@ msgid "Open with:"
 msgstr "Avaa sovelluksella:"
 
 #: src/resources/gtk/help-overlay.ui:13
-#| msgid "General"
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Yleiset"
 
 #: src/resources/gtk/help-overlay.ui:17
-#| msgid "New window"
 msgctxt "shortcut window"
 msgid "New window"
 msgstr "Uusi ikkuna"
 
 #: src/resources/gtk/help-overlay.ui:24
-#| 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:31
-#| msgid "Search"
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Haku"
 
 #: src/resources/gtk/help-overlay.ui:38
-#| msgid "Bookmarks"
 msgctxt "shortcut window"
 msgid "Bookmarks"
 msgstr "Kirjanmerkit"
 
 #: src/resources/gtk/help-overlay.ui:45
-#| msgid "Bookmark current location"
 msgctxt "shortcut window"
 msgid "Bookmark current location"
 msgstr "Lisää nykyinen sijainti kirjanmerkkeihin"
 
 #: src/resources/gtk/help-overlay.ui:52
-#| msgid "Show help"
 msgctxt "shortcut window"
 msgid "Show help"
 msgstr "Näytä ohje"
 
 #: src/resources/gtk/help-overlay.ui:59
-#| msgid "Shortcuts"
 msgctxt "shortcut window"
 msgid "Shortcuts"
 msgstr "Pikanäppäimet"
 
 #: src/resources/gtk/help-overlay.ui:68
-#| msgid "Opening"
 msgctxt "shortcut window"
 msgid "Opening"
 msgstr "Avaaminen"
 
 #: src/resources/gtk/help-overlay.ui:72
-#| msgid "Open"
 msgctxt "shortcut window"
 msgid "Open"
 msgstr "Avaa"
 
 #: src/resources/gtk/help-overlay.ui:79
-#| msgid "Open in new tab"
 msgctxt "shortcut window"
 msgid "Open in new tab"
 msgstr "Avaa uudessa välilehdessä"
 
 #: src/resources/gtk/help-overlay.ui:86
-#| msgid "Open in new window"
 msgctxt "shortcut window"
 msgid "Open in new window"
 msgstr "Avaa uudessa ikkunassa"
 
 #: src/resources/gtk/help-overlay.ui:93
-#| 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:100
-#| 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:107
-#| msgid "Open with default application"
 msgctxt "shortcut window"
 msgid "Open with default application"
 msgstr "Avaa oletussovelluksella"
 
 #: src/resources/gtk/help-overlay.ui:116
-#| msgid "Tabs"
 msgctxt "shortcut window"
 msgid "Tabs"
 msgstr "Välilehdet"
 
 #: src/resources/gtk/help-overlay.ui:120
-#| msgid "New tab"
 msgctxt "shortcut window"
 msgid "New tab"
 msgstr "Uusi välilehti"
 
 #: src/resources/gtk/help-overlay.ui:127
-#| msgid "Go to previous tab"
 msgctxt "shortcut window"
 msgid "Go to previous tab"
 msgstr "Siirry edelliseen välilehteen"
 
 #: src/resources/gtk/help-overlay.ui:134
-#| msgid "Go to next tab"
 msgctxt "shortcut window"
 msgid "Go to next tab"
 msgstr "Siirry seuraavaan välilehteen"
 
 #: src/resources/gtk/help-overlay.ui:141
-#| msgid "Open tab"
 msgctxt "shortcut window"
 msgid "Open tab"
 msgstr "Avaa välilehti"
 
 #: src/resources/gtk/help-overlay.ui:148
-#| msgid "Move tab left"
 msgctxt "shortcut window"
 msgid "Move tab left"
 msgstr "Siirrä välilehteä vasemmalle"
 
 #: src/resources/gtk/help-overlay.ui:155
-#| msgid "Move tab right"
 msgctxt "shortcut window"
 msgid "Move tab right"
 msgstr "Siirrä välilehteä oikealle"
 
 #: src/resources/gtk/help-overlay.ui:164
-#| msgid "Navigation"
 msgctxt "shortcut window"
 msgid "Navigation"
 msgstr "Liikkuminen"
 
 #: src/resources/gtk/help-overlay.ui:168
-#| msgid "Go back"
 msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Siirry taaksepäin"
 
 #: src/resources/gtk/help-overlay.ui:175
-#| msgid "Go forward"
 msgctxt "shortcut window"
 msgid "Go forward"
 msgstr "Siirry eteenpäin"
 
 #: src/resources/gtk/help-overlay.ui:182
-#| msgid "Go up"
 msgctxt "shortcut window"
 msgid "Go up"
 msgstr "Siirry ylös"
 
 #: src/resources/gtk/help-overlay.ui:189
-#| msgid "Go down"
 msgctxt "shortcut window"
 msgid "Go down"
 msgstr "Siirry alas"
 
 #: src/resources/gtk/help-overlay.ui:196
-#| msgid "Go to home folder"
 msgctxt "shortcut window"
 msgid "Go to home folder"
 msgstr "Siirry kotikansioon"
 
 #: src/resources/gtk/help-overlay.ui:203
-#| msgid "Enter location"
 msgctxt "shortcut window"
 msgid "Enter location"
 msgstr "Kirjoita sijainti"
 
 #: src/resources/gtk/help-overlay.ui:210
-#| msgid "Location bar with root location"
 msgctxt "shortcut window"
 msgid "Location bar with root location"
 msgstr "Sijaintipalkki juurisijainnilla"
 
 #: src/resources/gtk/help-overlay.ui:217
-#| msgid "Location bar with home location"
 msgctxt "shortcut window"
 msgid "Location bar with home location"
 msgstr "Sijaintipalkki kotisijainnilla"
 
 #: src/resources/gtk/help-overlay.ui:226
-#| msgid "View"
 msgctxt "shortcut window"
 msgid "View"
 msgstr "Näkymä"
 
 #: src/resources/gtk/help-overlay.ui:230
-#| msgid "Zoom in"
 msgctxt "shortcut window"
 msgid "Zoom in"
 msgstr "Lähennä"
 
 #: src/resources/gtk/help-overlay.ui:237
-#| msgid "Zoom out"
 msgctxt "shortcut window"
 msgid "Zoom out"
 msgstr "Loitonna"
 
 #: src/resources/gtk/help-overlay.ui:244
-#| msgid "Reset zoom"
 msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Palauta mittakaava"
 
 #: src/resources/gtk/help-overlay.ui:251
-#| msgid "Refresh view"
 msgctxt "shortcut window"
 msgid "Refresh view"
 msgstr "Päivitä näkymä"
 
 #: src/resources/gtk/help-overlay.ui:258
-#| msgid "Show/hide hidden files"
 msgctxt "shortcut window"
 msgid "Show/hide hidden files"
 msgstr "Näytä/piilota piilotiedostot"
 
 #: src/resources/gtk/help-overlay.ui:265
-#| msgid "Show/hide sidebar"
 msgctxt "shortcut window"
 msgid "Show/hide sidebar"
 msgstr "Näytä/piilota sivupalkki"
 
 #: src/resources/gtk/help-overlay.ui:272
-#| msgid "Show/hide action menu"
 msgctxt "shortcut window"
 msgid "Show/hide action menu"
 msgstr "Näytä/piilota toimintovalikko"
 
 #: src/resources/gtk/help-overlay.ui:279
-#| msgid "List view"
 msgctxt "shortcut window"
 msgid "List view"
 msgstr "Luettelonäkymä"
 
 #: src/resources/gtk/help-overlay.ui:286
-#| msgid "Grid view"
 msgctxt "shortcut window"
 msgid "Grid view"
 msgstr "Ruudukkonäkymä"
 
 #: src/resources/gtk/help-overlay.ui:295
-#| msgid "Editing"
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Muokkaaminen"
 
 #: src/resources/gtk/help-overlay.ui:299
-#| msgid "Create folder"
 msgctxt "shortcut window"
 msgid "Create folder"
 msgstr "Luo kansio"
 
 #: src/resources/gtk/help-overlay.ui:306
-#| msgid "Rename"
 msgctxt "shortcut window"
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
 #: src/resources/gtk/help-overlay.ui:313
-#| msgid "Move to trash"
 msgctxt "shortcut window"
 msgid "Move to trash"
 msgstr "Siirrä roskakoriin"
 
 #: src/resources/gtk/help-overlay.ui:320
-#| msgid "Delete permanently"
 msgctxt "shortcut window"
 msgid "Delete permanently"
 msgstr "Poista pysyvästi"
 
 #: src/resources/gtk/help-overlay.ui:327
-#| msgid "Cu_t"
 msgctxt "shortcut window"
 msgid "Cut"
 msgstr "Leikkaa"
 
 #: src/resources/gtk/help-overlay.ui:334
-#| msgid "Copy"
 msgctxt "shortcut window"
 msgid "Copy"
 msgstr "Kopioi"
 
 #: src/resources/gtk/help-overlay.ui:341
-#| msgid "Paste"
 msgctxt "shortcut window"
 msgid "Paste"
 msgstr "Liitä"
 
 #: src/resources/gtk/help-overlay.ui:348
-#| msgid "Select all"
 msgctxt "shortcut window"
 msgid "Select all"
 msgstr "Valitse kaikki"
 
 #: src/resources/gtk/help-overlay.ui:355
-#| msgid "Invert selection"
 msgctxt "shortcut window"
 msgid "Invert selection"
 msgstr "Käänteinen valinta"
 
 #: src/resources/gtk/help-overlay.ui:362
-#| msgid "Select items matching"
 msgctxt "shortcut window"
 msgid "Select items matching"
 msgstr "Valitse täsmäävät kohteet"
 
 #: src/resources/gtk/help-overlay.ui:369
-#| msgid "Undo"
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "Kumoa"
 
 #: src/resources/gtk/help-overlay.ui:376
-#| msgid "Redo"
 msgctxt "shortcut window"
 msgid "Redo"
 msgstr "Tee uudelleen"
 
 #: src/resources/gtk/help-overlay.ui:383
-#| msgid "Show item properties"
 msgctxt "shortcut window"
 msgid "Show item properties"
 msgstr "Näytä kohteen ominaisuudet"
@@ -4594,6 +4765,11 @@ msgstr "_Tietoja"
 msgid "_Quit"
 msgstr "_Lopeta"
 
+#: src/resources/ui/nautilus-compress-dialog.ui:23
+#| msgid "Archive"
+msgid "Archive name"
+msgstr "Arkiston nimi"
+
 #: src/resources/ui/nautilus-files-view-context-menus.ui:5
 msgid "New _Folder"
 msgstr "Uusi _kansio"
@@ -4616,7 +4792,7 @@ msgid "Select _All"
 msgstr "Valitse _kaikki"
 
 #: src/resources/ui/nautilus-files-view-context-menus.ui:35
-#: src/resources/ui/nautilus-files-view-context-menus.ui:241
+#: src/resources/ui/nautilus-files-view-context-menus.ui:256
 #: src/resources/ui/nautilus-pathbar-context-menu.ui:18
 msgid "P_roperties"
 msgstr "_Ominaisuudet"
@@ -4738,6 +4914,18 @@ msgstr "Aseta taustakuvaksi"
 msgid "_Remove from Recent"
 msgstr "P_oista viimeisimmistä"
 
+#: src/resources/ui/nautilus-files-view-context-menus.ui:239
+msgid "_Extract Here"
+msgstr "_Pura tänne"
+
+#: src/resources/ui/nautilus-files-view-context-menus.ui:244
+msgid "E_xtract to…"
+msgstr "P_ura…"
+
+#: src/resources/ui/nautilus-files-view-context-menus.ui:249
+msgid "C_ompress…"
+msgstr "Pa_kkaa…"
+
 #: src/resources/ui/nautilus-folder-is-empty.ui:30
 msgid "Folder is Empty"
 msgstr "Kansio on tyhjä"
@@ -4865,7 +5053,6 @@ msgid "4 GB"
 msgstr "4 Gt"
 
 #: src/resources/ui/nautilus-preferences-window.ui:170
-#| msgid "Prefere_nces"
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -4889,9 +5076,6 @@ msgid "Icon View Captions"
 msgstr "Kuvakkeiden tekstit"
 
 #: src/resources/ui/nautilus-preferences-window.ui:306
-#| 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."
@@ -4901,8 +5085,6 @@ msgstr ""
 
 #. Translators: This is an ordinal number
 #: src/resources/ui/nautilus-preferences-window.ui:425
-#| msgid "%'d second"
-#| msgid_plural "%'d seconds"
 msgctxt "the n-th position of an icon caption"
 msgid "Second"
 msgstr "Toinen"
@@ -4924,7 +5106,6 @@ msgid "Views"
 msgstr "Näkymät"
 
 #: src/resources/ui/nautilus-preferences-window.ui:512
-#| msgid "Open action menu"
 msgid "Open Action"
 msgstr "Avaamisen toiminto"
 
@@ -4937,12 +5118,10 @@ msgid "_Double click to open items"
 msgstr "Avaa kohteet _kaksoisnapsautuksella"
 
 #: src/resources/ui/nautilus-preferences-window.ui:577
-#| msgid "Link target:"
 msgid "Link Creation"
 msgstr "Linkin luominen"
 
 #: src/resources/ui/nautilus-preferences-window.ui:591
-#| msgid "The target doesn't support symbolic links."
 msgid "Show action to create symbolic _links"
 msgstr "Näytä toiminto, jolla luodaan sym_bolisia linkkejä"
 
@@ -4951,12 +5130,10 @@ msgid "Executable Text Files"
 msgstr "Suoritettavat tekstitiedostot"
 
 #: src/resources/ui/nautilus-preferences-window.ui:637
-#| msgid "_Display"
 msgid "_Display them"
 msgstr "_Näytä ne"
 
 #: src/resources/ui/nautilus-preferences-window.ui:655
-#| msgid "_Run"
 msgid "_Run them"
 msgstr "_Suorita ne"
 
@@ -4965,102 +5142,95 @@ msgid "_Ask what to do"
 msgstr "_Kysy mitä tehdään"
 
 #: src/resources/ui/nautilus-preferences-window.ui:720
-#| msgid "Ask before _emptying the Trash or deleting files"
 msgid "Ask before _emptying the Trash"
 msgstr "Kysy ennen roskakorin _tyhjennystä"
 
 #: src/resources/ui/nautilus-preferences-window.ui:737
-#| msgid "Show context menu item to delete files permanently"
 msgid "Show action to _permanently delete files and folders"
 msgstr "Näytä toiminto, jolla poistetaan tiedostoja ja kansioita pysyvästi"
 
 #: src/resources/ui/nautilus-preferences-window.ui:769
+#| msgid "Copying Files"
+msgid "Compressed Files"
+msgstr "Pakatut tiedostot"
+
+#: src/resources/ui/nautilus-preferences-window.ui:783
+msgid "E_xtract the files on open"
+msgstr "Pu_ra tiedostot avattaessa"
+
+#: src/resources/ui/nautilus-preferences-window.ui:815
 msgid "Behavior"
 msgstr "Toiminta"
 
-#: src/resources/ui/nautilus-preferences-window.ui:799
+#: src/resources/ui/nautilus-preferences-window.ui:845
 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-window.ui:837
+#: src/resources/ui/nautilus-preferences-window.ui:883
 msgid "List Columns"
 msgstr "Luettelon sarakkeet"
 
-#: src/resources/ui/nautilus-preferences-window.ui:877
-#| msgid "Search files"
+#: src/resources/ui/nautilus-preferences-window.ui:923
 msgid "Search in subfolders:"
 msgstr "Etsi alikansioista:"
 
-#: src/resources/ui/nautilus-preferences-window.ui:888
-#| msgid "On This Computer"
+#: src/resources/ui/nautilus-preferences-window.ui:934
 msgid "_On this computer only"
 msgstr "_Vain tältä tietokoneelta"
 
-#: src/resources/ui/nautilus-preferences-window.ui:905
-#| msgid "_Location"
+#: src/resources/ui/nautilus-preferences-window.ui:951
 msgid "_All locations"
 msgstr "_Kaikista sijainneista"
 
-#: src/resources/ui/nautilus-preferences-window.ui:922
-#| msgid "Never"
+#: src/resources/ui/nautilus-preferences-window.ui:968
 msgid "_Never"
 msgstr "_Ei koskaan"
 
-#: src/resources/ui/nautilus-preferences-window.ui:954
-#| msgid "Show _thumbnails:"
+#: src/resources/ui/nautilus-preferences-window.ui:1000
 msgid "Thumbnails"
 msgstr "Pienoiskuvat"
 
-#: src/resources/ui/nautilus-preferences-window.ui:970
-#| msgid "Show _thumbnails:"
+#: src/resources/ui/nautilus-preferences-window.ui:1016
 msgid "Show thumbnails:"
 msgstr "Näytä pienoiskuvat:"
 
-#: src/resources/ui/nautilus-preferences-window.ui:981
+#: src/resources/ui/nautilus-preferences-window.ui:1027
 msgid "_Files on this computer only"
 msgstr "Vai_n tämän tietokoneen tiedostoista"
 
-#: src/resources/ui/nautilus-preferences-window.ui:998
-#| msgid "All Files"
+#: src/resources/ui/nautilus-preferences-window.ui:1044
 msgid "A_ll files"
 msgstr "Kaiki_sta tiedostoista"
 
-#: src/resources/ui/nautilus-preferences-window.ui:1015
-#| msgid "Never"
+#: src/resources/ui/nautilus-preferences-window.ui:1061
 msgid "N_ever"
 msgstr "Ei k_oskaan"
 
-#: src/resources/ui/nautilus-preferences-window.ui:1039
-#| msgid "_Only for files smaller than:"
+#: src/resources/ui/nautilus-preferences-window.ui:1085
 msgid "Onl_y for files smaller than:"
 msgstr "_Vain kun tiedosto on pienempi kuin:"
 
-#: src/resources/ui/nautilus-preferences-window.ui:1092
-#| msgid "File conflict"
+#: src/resources/ui/nautilus-preferences-window.ui:1138
 msgid "File count"
 msgstr "Tiedostojen lukumäärä"
 
-#: src/resources/ui/nautilus-preferences-window.ui:1108
-#| msgid "Count _number of items:"
+#: src/resources/ui/nautilus-preferences-window.ui:1154
 msgid "Count number of files in folders:"
 msgstr "Laske tiedostojen lukumäärät:"
 
-#: src/resources/ui/nautilus-preferences-window.ui:1119
-#| msgid "Folder is Empty"
+#: src/resources/ui/nautilus-preferences-window.ui:1165
 msgid "F_olders in this computer only"
 msgstr "Vain t_ämän tietokoneen kansioista"
 
-#: src/resources/ui/nautilus-preferences-window.ui:1136
-#| msgid "All Files"
+#: src/resources/ui/nautilus-preferences-window.ui:1182
 msgid "All folder_s"
 msgstr "Kaikis_ta tiedostoista"
 
-#: src/resources/ui/nautilus-preferences-window.ui:1153
+#: src/resources/ui/nautilus-preferences-window.ui:1199
 msgid "Ne_ver"
 msgstr "Ei kosk_aan"
 
-#: src/resources/ui/nautilus-preferences-window.ui:1185
-#| msgid "Search files"
+#: src/resources/ui/nautilus-preferences-window.ui:1231
 msgid "Search & Preview"
 msgstr "Haku ja esikatselu"
 
@@ -5073,12 +5243,10 @@ msgid "When"
 msgstr "Ajankohta"
 
 #: src/resources/ui/nautilus-search-popover.ui:45
-#| msgid "Select type"
 msgid "Select a date"
 msgstr "Valitse päivä"
 
 #: src/resources/ui/nautilus-search-popover.ui:67
-#| msgid "Reload the current location"
 msgid "Clear the currently selected date"
 msgstr "Tyhjennä parhaillaan valittuna oleva päivä"
 
@@ -5087,12 +5255,10 @@ msgid "Since…"
 msgstr "Mistä lähtien…"
 
 #: src/resources/ui/nautilus-search-popover.ui:194
-#| msgid "Last modified:"
 msgid "Last _modified"
 msgstr "Viimeksi _muokattu"
 
 #: src/resources/ui/nautilus-search-popover.ui:211
-#| msgid "Last _Trashed"
 msgid "Last _used"
 msgstr "Viimeksi _käytetty"
 
@@ -5101,12 +5267,10 @@ msgid "What"
 msgstr "Mitä"
 
 #: src/resources/ui/nautilus-search-popover.ui:264
-#| msgid "This file cannot be started"
 msgid "Which file types will be searched"
 msgstr "Mitä tiedostotyyppejä etsitään"
 
 #: src/resources/ui/nautilus-search-popover.ui:359
-#| msgid "Text"
 msgid "Full Text"
 msgstr "Koko teksti"
 
@@ -5115,27 +5279,22 @@ msgid "Search on the file content and name"
 msgstr "Etsi tiedostojen sisällöstä ja nimestä"
 
 #: src/resources/ui/nautilus-search-popover.ui:377
-#| msgid "File name"
 msgid "File Name"
 msgstr "Tiedoston nimi"
 
 #: src/resources/ui/nautilus-search-popover.ui:381
-#| msgid "Search documents and folders by name"
 msgid "Search only on the file name"
 msgstr "Etsi vain tiedostojen nimistä"
 
 #: src/resources/ui/nautilus-toolbar-menu.ui:23
-#| msgid "New Folder"
 msgid "New folder"
 msgstr "Uusi kansio"
 
 #: src/resources/ui/nautilus-toolbar-menu.ui:42
-#| msgid "_Bookmark this Location"
 msgid "Bookmark this location"
 msgstr "Lisää sijainti kirjanmerkkeihin"
 
 #: src/resources/ui/nautilus-toolbar-menu.ui:61
-#| msgid "New tab"
 msgid "New tab"
 msgstr "Uusi välilehti"
 
@@ -5168,17 +5327,14 @@ msgid "Open operations in progress"
 msgstr "Avaa meneillään olevat toiminnot"
 
 #: src/resources/ui/nautilus-toolbar-view-menu.ui:21
-#| msgid "Zoom out"
 msgid "Zoom out"
 msgstr "Loitonna"
 
 #: src/resources/ui/nautilus-toolbar-view-menu.ui:40
-#| msgid "Reset zoom"
 msgid "Reset zoom"
 msgstr "Palauta mittakaava"
 
 #: src/resources/ui/nautilus-toolbar-view-menu.ui:58
-#| msgid "Zoom in"
 msgid "Zoom in"
 msgstr "Lähennä"
 
@@ -5199,7 +5355,6 @@ msgid "Last _Modified"
 msgstr "Viimeksi _muokattu"
 
 #: src/resources/ui/nautilus-toolbar-view-menu.ui:136
-#| msgid "Last _Modified"
 msgid "_First Modified"
 msgstr "_Ensin muokattu"
 
@@ -5224,7 +5379,6 @@ msgid "Show _Hidden Files"
 msgstr "Näytä _piilotiedostot"
 
 #: src/resources/ui/nautilus-toolbar-view-menu.ui:198
-#| msgid "_Reload"
 msgid "R_eload"
 msgstr "Päi_vitä"
 
@@ -5289,7 +5443,6 @@ msgstr "Tämä tietokone"
 #.
 #: src/gtk/nautilusgtkplacesviewrow.c:134
 #, c-format
-#| msgid "%s / %s available"
 msgid "%s / %s available"
 msgid_plural "%s / %s available"
 msgstr[0] "%s / %s käytettävissä"
@@ -5305,7 +5458,6 @@ msgid "Unmount"
 msgstr "Irrota"
 
 #: src/gtk/nautilusgtkplacesview.ui:30
-#| msgid "Enter server address…"
 msgid "Server Addresses"
 msgstr "Palvelinten osoitteet"
 
@@ -5345,8 +5497,9 @@ msgid "SSH File Transfer Protocol"
 msgstr "SSH File Transfer Protocol"
 
 #: src/gtk/nautilusgtkplacesview.ui:147
-msgid "WebDav"
-msgstr "WebDav"
+#| msgid "WebDav"
+msgid "WebDAV"
+msgstr "WebDAV"
 
 #: src/gtk/nautilusgtkplacesview.ui:158
 msgid "Prefix"
@@ -5387,6 +5540,26 @@ msgstr "Yhdistä _palvelimeen"
 msgid "Enter server address…"
 msgstr "Anna palvelimen _osoite…"
 
+#~ msgid ""
+#~ "Files in the folder “%B” cannot be deleted because you do not have "
+#~ "permissions to see them."
+#~ msgstr ""
+#~ "Tiedostoja kansiossa ”%B” ei voi poistaa, koska sinulla ei ole oikeutta "
+#~ "niiden käyttöön."
+
+#~ 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."
+
+#~ msgid "Could not remove the folder %B."
+#~ msgstr "Kansion %B poistaminen epäonnistui."
+
+#~ msgid "Could not remove files from the already existing folder %F."
+#~ msgstr "Tiedostoja ei voitu poistaa jo olemassa olevasta kansiosta %F."
+
 #~ msgctxt "folder"
 #~ msgid "%s Properties"
 #~ msgstr "Ominaisuudet: %s"


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