[meld] Finnish translation update by Jiri Grönroos

[Ville-Pekka Vainio <vpv src gnome org>]

commit 8f50ed12e9ab8f7facb96638357bd2f793d572a4
Author: Ville-Pekka Vainio <vpvainio iki fi>
Date:   Thu Sep 11 22:27:59 2014 +0300

    Finnish translation update by Jiri Grönroos

 po/fi.po |  588 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 329 insertions(+), 259 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index eaf2f72..bf4f0c7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,34 +3,35 @@
 # This file is distributed under the same license as the meld package.
 #
 # Ilkka Tuohela <hile iki fi>, 2006-2008.
-# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2013, 2014.
 # Lasse Liehu <lasse liehu gmail com>, 2014.
+# Jiri Grönroos <jiri gronroos+l10n iki fi>, 2013, 2014.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
-"cgi?product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-05-03 09:33+0000\n"
-"PO-Revision-Date: 2014-05-04 04:09+0300\n"
-"Last-Translator: Lasse Liehu <lasse liehu gmail com>\n"
-"Language-Team: Finnish <kde-i18n-doc kde org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=meld&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-09-10 09:47+0000\n"
+"PO-Revision-Date: 2014-09-10 18:48+0300\n"
+"Last-Translator: Jiri Grönroos <jiri gronroos+l10n iki fi>\n"
+"Language-Team: suomi <gnome-fi-laatu lists sourceforge net>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
-#: ../bin/meld:134
+#: ../bin/meld:138
 msgid "Cannot import: "
 msgstr "Tuonti ei onnistu: "
 
-#: ../bin/meld:137
+#: ../bin/meld:141
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld vaatii version %s tai uudemman."
 
-#: ../bin/meld:141
+#: ../bin/meld:145
 msgid "Meld does not support Python 3."
 msgstr "Meld ei tue Python 3:a."
 
@@ -57,12 +58,20 @@ msgid ""
 "two- and three-way comparison of both files and directories, and supports "
 "many version control systems including Git, Mercurial, Bazaar and Subversion."
 msgstr ""
+"Meld on visuaalinen työkalu eroavaisuuksien (diff) vertailuun ja "
+"yhdistämiseen (merge). Sovelluksen kohderyhmänä on sovelluskehittäjät. Meld "
+"auttaa vertailemaan tiedostoja, kansioita ja versiohallittuja projekteja. "
+"Meld tarjoaa kaksi- ja kolmisuuntaisen vertailun tiedostoille ja kansioille. "
+"Versionhallintajärjestelmistä tuettuina ovat muun muassa Git, Mercurial, "
+"Bazaar ja Subversion."
 
 #: ../data/meld.appdata.xml.in.h:2
 msgid ""
 "Meld helps you review code changes, understand patches, and makes enormous "
 "merge conflicts slightly less painful."
 msgstr ""
+"Meld helpottaa tarkastelemaan koodimuutoksia ja ymmärtämään paikkatiedostoja "
+"samalla helpottaen mahdollisia suuria yhdistämiseen liittyviä ristiriitoja."
 
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
@@ -73,187 +82,192 @@ msgid "Default window size"
 msgstr "Ikkunan oletuskoko"
 
 #: ../data/org.gnome.meld.gschema.xml.h:2
+#| msgid "Default window size"
+msgid "Default window state"
+msgstr "Ikkunan oletustila"
+
+#: ../data/org.gnome.meld.gschema.xml.h:3
 msgid "Show toolbar"
 msgstr "Näytä työkalupalkki"
 
-#: ../data/org.gnome.meld.gschema.xml.h:3
+#: ../data/org.gnome.meld.gschema.xml.h:4
 msgid "If true, the window toolbar is visible."
 msgstr "Jos tosi, ikkunan työkalupalkki näytetään."
 
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: ../data/org.gnome.meld.gschema.xml.h:5
 msgid "Show statusbar"
 msgstr "Näytä tilapalkki"
 
-#: ../data/org.gnome.meld.gschema.xml.h:5
+#: ../data/org.gnome.meld.gschema.xml.h:6
 msgid "If true, the window statusbar is visible."
 msgstr "Jos tosi, ikkunan tilapalkki näytetään."
 
-#: ../data/org.gnome.meld.gschema.xml.h:6
+#: ../data/org.gnome.meld.gschema.xml.h:7
 msgid "Automatically detected text encodings"
-msgstr ""
+msgstr "Automaattisesti havaitut merkistökoodaukset"
 
-#: ../data/org.gnome.meld.gschema.xml.h:7
+#: ../data/org.gnome.meld.gschema.xml.h:8
 msgid ""
 "These text encodings will be automatically used (in order) to try to decode "
 "loaded text files."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: ../data/org.gnome.meld.gschema.xml.h:9
 msgid "Width of an indentation step"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:9
+#: ../data/org.gnome.meld.gschema.xml.h:10
 msgid "The number of spaces to use for a single indent step"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: ../data/org.gnome.meld.gschema.xml.h:11
 msgid "Whether to indent using spaces or tabs"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:11
+#: ../data/org.gnome.meld.gschema.xml.h:12
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: ../data/org.gnome.meld.gschema.xml.h:13
 msgid "Show line numbers"
 msgstr "Näytä rivinumerot"
 
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: ../data/org.gnome.meld.gschema.xml.h:14
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: ../data/org.gnome.meld.gschema.xml.h:15
 msgid "Highlight syntax"
 msgstr "Korosta syntaksi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: ../data/org.gnome.meld.gschema.xml.h:16
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld's own color "
 "highlighting, this is off by default."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: ../data/org.gnome.meld.gschema.xml.h:17
 #, fuzzy
 #| msgid "Show w_hitespace"
 msgid "Displayed whitespace"
 msgstr "Näytä _tyhjätila"
 
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: ../data/org.gnome.meld.gschema.xml.h:18
 msgid ""
 "Selector for individual whitespace character types to be shown. Possible "
 "values are 'space', 'tab', 'newline' and 'nbsp'."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../data/org.gnome.meld.gschema.xml.h:19
 #, fuzzy
 #| msgid "_Wrap around"
 msgid "Wrap mode"
 msgstr "_Rivitä"
 
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: ../data/org.gnome.meld.gschema.xml.h:20
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
 "('word')."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:21
 msgid "Highlight current line"
 msgstr "Korosta nykyinen rivi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:21
+#: ../data/org.gnome.meld.gschema.xml.h:22
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:23
 #, fuzzy
 #| msgid "Use the system default editor"
 msgid "Use the system default monospace font"
 msgstr "Käytä järjestelmän oletusmuokkainta"
 
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: ../data/org.gnome.meld.gschema.xml.h:24
 msgid ""
 "If false, the defined custom font will be used instead of the system "
 "monospace font."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:25
 msgid "Custom font"
 msgstr "Omavalintainen fontti"
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:26
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: ../data/org.gnome.meld.gschema.xml.h:27
 msgid "Ignore blank lines when comparing files"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: ../data/org.gnome.meld.gschema.xml.h:28
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:29
 msgid "Use the system default editor"
 msgstr "Käytä järjestelmän oletusmuokkainta"
 
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: ../data/org.gnome.meld.gschema.xml.h:30
 msgid ""
 "If false, the defined custom editor will be used instead of the system "
 "editor when opening files externally."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:31
 msgid "The custom editor launch command"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: ../data/org.gnome.meld.gschema.xml.h:32
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:33
 msgid "Columns to display"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: ../data/org.gnome.meld.gschema.xml.h:34
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:34 ../data/ui/preferences.ui.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:35 ../data/ui/preferences.ui.h:30
 msgid "Ignore symbolic links"
 msgstr "Älä huomioi symbolisia linkkejä"
 
-#: ../data/org.gnome.meld.gschema.xml.h:35
+#: ../data/org.gnome.meld.gschema.xml.h:36
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:37
 msgid "Use shallow comparison"
 msgstr "Käytä pinnallista vertailua"
 
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: ../data/org.gnome.meld.gschema.xml.h:38
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
 "different otherwise."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: ../data/org.gnome.meld.gschema.xml.h:39
 msgid "File timestamp resolution"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:39
+#: ../data/org.gnome.meld.gschema.xml.h:40
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they're considered to have different mtimes. This "
@@ -261,119 +275,120 @@ msgid ""
 "resolution."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: ../data/org.gnome.meld.gschema.xml.h:41
 #, fuzzy
 #| msgid "File Filters"
 msgid "File status filters"
 msgstr "Tiedostosuodattimet"
 
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: ../data/org.gnome.meld.gschema.xml.h:42
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: ../data/org.gnome.meld.gschema.xml.h:43
 #, fuzzy
 #| msgid "Choose which version control system to use"
 msgid "Show the version control console output"
 msgstr "Valitse käytettävä versionhallinta"
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: ../data/org.gnome.meld.gschema.xml.h:44
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:45
 #, fuzzy
 #| msgid "Version control view"
 msgid "Version control pane position"
 msgstr "Versionhallintanäkymä"
 
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../data/org.gnome.meld.gschema.xml.h:46
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:47
 msgid "Present version comparisons as left-local/right-remote"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:48
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
 "a left-is-theirs, right-is-mine scheme is used."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:49
 #, fuzzy
 #| msgid "Start a version control comparison"
 msgid "Order for files in three-way version control merge comparisons"
 msgstr "Aloita versionhallinnan vertailu"
 
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../data/org.gnome.meld.gschema.xml.h:50
 msgid ""
 "Choices for file order are remote/merge/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
 "control view, so is used solely for merges/conflict resolution within Meld."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:51
 msgid "Show margin in commit message editor"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: ../data/org.gnome.meld.gschema.xml.h:52
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:53
 msgid "Margin column in commit message editor"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: ../data/org.gnome.meld.gschema.xml.h:54
 msgid ""
-"The column of the margin is at in the version control commit message editor."
+"The column at which to show the margin in the version control commit message "
+"editor."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: ../data/org.gnome.meld.gschema.xml.h:55
 msgid "Automatically hard-wrap commit messages"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:56
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the defined commit margin before commit."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: ../data/org.gnome.meld.gschema.xml.h:57
 #, fuzzy
 #| msgid "Version control view"
 msgid "Version control status filters"
 msgstr "Versionhallintanäkymä"
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:58
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: ../data/org.gnome.meld.gschema.xml.h:59
 msgid "Filename-based filters"
 msgstr "Tiedostonimeen pohjautuvat suodattimet"
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:60
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: ../data/org.gnome.meld.gschema.xml.h:61
 msgid "Text-based filters"
 msgstr "Tekstipohjaiset suodattimet"
 
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: ../data/org.gnome.meld.gschema.xml.h:62
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
@@ -444,7 +459,7 @@ msgstr "Kopioi oikealle"
 msgid "Delete selected"
 msgstr "Poista valittu"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1439
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1449
 msgid "Hide"
 msgstr "Piilota"
 
@@ -513,7 +528,7 @@ msgid "_Add"
 msgstr "_Lisää"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:723
+#: ../meld/vcview.py:747
 msgid "_Remove"
 msgstr "_Poista"
 
@@ -534,7 +549,8 @@ msgid "Move _Down"
 msgstr "Siirrä _alas"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:364 ../meld/vcview.py:203
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:363
+#: ../meld/vcview.py:203
 msgid "Name"
 msgstr "Nimi"
 
@@ -575,28 +591,28 @@ msgid ""
 "This file can not be written to. You may click here to unlock this file and "
 "make changes anyway, but these changes must be saved to a new file."
 msgstr ""
+"Tähän tiedostoon ei voi kirjoittaa. Voit napsauttaa tästä avataksesi "
+"tiedoston lukituksen ja tehdäksesi muutokset, mutta kyseiset muutokset tulee "
+"tallentaa uuteen tiedostoon."
 
 #: ../data/ui/filediff.ui.h:7
-#, fuzzy
 #| msgid "_File"
 msgid "File 3"
-msgstr "_Tiedosto"
+msgstr "Tiedosto 3"
 
 #: ../data/ui/filediff.ui.h:8
-#, fuzzy
 #| msgid "_File"
 msgid "File 2"
-msgstr "_Tiedosto"
+msgstr "Tiedosto 2"
 
 #: ../data/ui/filediff.ui.h:9
-#, fuzzy
 #| msgid "_File"
 msgid "File 1"
-msgstr "_Tiedosto"
+msgstr "Tiedosto 1"
 
 #: ../data/ui/filediff.ui.h:10
 msgid "Revert unsaved changes to documents?"
-msgstr ""
+msgstr "Perutaanko tallentamattomat muutokset asiakirjoihin?"
 
 #: ../data/ui/filediff.ui.h:11
 msgid "Changes made to the following documents will be permanently lost:\n"
@@ -681,16 +697,14 @@ msgid "Left is local, right is remote"
 msgstr "Vasemmalla on paikallinen, oikealla on etä"
 
 #: ../data/ui/preferences.ui.h:3
-#, fuzzy
 #| msgid "Left is remote, right is local"
 msgid "Remote, merge, local"
-msgstr "Vasemmalla on etä, oikealla on paikallinen"
+msgstr "Etä, yhdistäminen, paikallinen"
 
 #: ../data/ui/preferences.ui.h:4
-#, fuzzy
 #| msgid "Left is local, right is remote"
 msgid "Local, merge, remote"
-msgstr "Vasemmalla on paikallinen, oikealla on etä"
+msgstr "Paikallinen, yhdistäminen, etä"
 
 #: ../data/ui/preferences.ui.h:5
 msgid "1ns (ext4)"
@@ -782,7 +796,7 @@ msgstr "Pinnallinen vertailu"
 
 #: ../data/ui/preferences.ui.h:27
 msgid "C_ompare files based only on size and timestamp"
-msgstr ""
+msgstr "_Vertaa tiedostoja pohjautuen vain kokoon ja aikaleimaan"
 
 #: ../data/ui/preferences.ui.h:28
 msgid "_Timestamp resolution:"
@@ -797,16 +811,14 @@ msgid "Visible Columns"
 msgstr "Näkyvät sarakkeet"
 
 #: ../data/ui/preferences.ui.h:32
-#, fuzzy
 #| msgid "_File Comparison"
 msgid "Folder Comparisons"
-msgstr "_Tiedostojen vertailu"
+msgstr "Kansiovertailut"
 
 #: ../data/ui/preferences.ui.h:33
-#, fuzzy
 #| msgid "_File Comparison"
 msgid "Version Comparisons"
-msgstr "_Tiedostojen vertailu"
+msgstr "Versiovertailut"
 
 #: ../data/ui/preferences.ui.h:34
 msgid "_Order when comparing file revisions:"
@@ -817,10 +829,9 @@ msgid "Order when _merging files:"
 msgstr ""
 
 #: ../data/ui/preferences.ui.h:36
-#, fuzzy
 #| msgid "Log Message"
 msgid "Commit Messages"
-msgstr "Lokiviesti"
+msgstr "Pysyvien muutosten viestit"
 
 #: ../data/ui/preferences.ui.h:37
 msgid "Show _right margin at:"
@@ -835,6 +846,12 @@ msgid "Version Control"
 msgstr "Versionhallinta"
 
 #: ../data/ui/preferences.ui.h:40
+#, fuzzy
+#| msgid "Filename-based filters"
+msgid "Filename filters"
+msgstr "Tiedostonimeen pohjautuvat suodattimet"
+
+#: ../data/ui/preferences.ui.h:41
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -844,11 +861,25 @@ msgstr ""
 "suoritettaessa hakemistojen vertailuja. Kukin malli on lista komentorivin "
 "tapaisia jokerimerkkejä erotettuna välilyönneillä."
 
-#: ../data/ui/preferences.ui.h:41 ../meld/meldwindow.py:103
+#: ../data/ui/preferences.ui.h:42 ../meld/meldwindow.py:103
 msgid "File Filters"
 msgstr "Tiedostosuodattimet"
 
-#: ../data/ui/preferences.ui.h:42
+#: ../data/ui/preferences.ui.h:43
+msgid "Change trimming"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:44
+msgid "Trim blank line differences from the start and end of changes"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:45
+#, fuzzy
+#| msgid "Text Filters"
+msgid "Text filters"
+msgstr "Tekstisuodattimet"
+
+#: ../data/ui/preferences.ui.h:46
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -862,15 +893,11 @@ msgstr ""
 "vertailua. Jos lauseke sisältää ryhmiä, vain ryhmät korvataan. Katso "
 "lisätietoja käyttöohjeesta."
 
-#: ../data/ui/preferences.ui.h:43
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "Älä huomioi muutoksia, jotka lisäävät tai poistavat tyhjiä rivejä"
-
-#: ../data/ui/preferences.ui.h:44
+#: ../data/ui/preferences.ui.h:47
 msgid "Text Filters"
 msgstr "Tekstisuodattimet"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:583
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:623
 msgid "New comparison"
 msgstr "Uusi vertalu"
 
@@ -919,10 +946,9 @@ msgid "Select A Version-Controlled Folder"
 msgstr "Valitse versiohallittu kansio"
 
 #: ../data/ui/tab-placeholder.ui.h:13
-#, fuzzy
 #| msgid "_File Comparison"
 msgid "_Blank comparison"
-msgstr "_Tiedostojen vertailu"
+msgstr "T_yhjä vertailu"
 
 #: ../data/ui/tab-placeholder.ui.h:14
 msgid "C_ompare"
@@ -942,15 +968,15 @@ msgstr "_Päivitä"
 
 #: ../data/ui/vcview.ui.h:6
 msgid "Update working copy from version control"
-msgstr ""
+msgstr "Päivitä työskentelyhakemisto versionhallinnasta"
 
 #: ../data/ui/vcview.ui.h:7
 msgid "_Push"
-msgstr ""
+msgstr "Ty_önnä"
 
 #: ../data/ui/vcview.ui.h:8
 msgid "Push local changes to remote"
-msgstr ""
+msgstr "Työnnä paikalliset muutokset etäpäähän"
 
 #: ../data/ui/vcview.ui.h:10
 msgid "Add to version control"
@@ -962,11 +988,11 @@ msgstr "Poista versionhallinnasta"
 
 #: ../data/ui/vcview.ui.h:13
 msgid "Mar_k as Resolved"
-msgstr ""
+msgstr "Merkitse _selvitetyksi"
 
 #: ../data/ui/vcview.ui.h:14
 msgid "Mark as resolved in version control"
-msgstr ""
+msgstr "Merkitse selvitetyksi versionhallinnassa"
 
 #: ../data/ui/vcview.ui.h:15
 msgid "Re_vert"
@@ -1018,7 +1044,7 @@ msgstr "Näytä normaalit tiedostot"
 
 #: ../data/ui/vcview.ui.h:26
 msgid "Un_versioned"
-msgstr ""
+msgstr "_Versioimattomat"
 
 #: ../data/ui/vcview.ui.h:27
 msgid "Show unversioned files"
@@ -1058,69 +1084,67 @@ msgstr ""
 
 #: ../data/ui/vcview.ui.h:36
 msgid "Push local commits to remote?"
-msgstr ""
+msgstr "Työnnetäänkö paikalliset pysyvät muutokset etäpäähän?"
 
 #: ../data/ui/vcview.ui.h:37
 msgid "The commits to be pushed are determined by your version control system."
 msgstr ""
 
 #: ../data/ui/vcview.ui.h:38
-#, fuzzy
 #| msgid "_Commit"
 msgid "_Push commits"
-msgstr "_Toteuta"
+msgstr "_Työnnä pysyvät muutokset"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:382
+#: ../meld/dirdiff.py:381 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Koko"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:390
+#: ../meld/dirdiff.py:389 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Muokkausaika"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:398
+#: ../meld/dirdiff.py:397 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Oikeudet"
 
-#: ../meld/dirdiff.py:546
+#: ../meld/dirdiff.py:543
 #, python-format
 msgid "Hide %s"
 msgstr "Piilota %s"
 
-#: ../meld/dirdiff.py:675 ../meld/dirdiff.py:697
+#: ../meld/dirdiff.py:672 ../meld/dirdiff.py:694
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Tutkitaan %s"
 
-#: ../meld/dirdiff.py:826
+#: ../meld/dirdiff.py:823
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Valmis"
 
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:830
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Tätä kansiota tutkittaessa tapahtui lukuisia virheitä"
 
-#: ../meld/dirdiff.py:834
+#: ../meld/dirdiff.py:831
 msgid "Files with invalid encodings found"
 msgstr "Virheellisellä merkistökoodauksella varustettuja tiedostoja löytyi"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:836
+#: ../meld/dirdiff.py:833
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Joillain tiedostoilla on virheellinen merkistö. Nimet ovat jotain tällaisia:"
 
-#: ../meld/dirdiff.py:838
+#: ../meld/dirdiff.py:835
 msgid "Files hidden by case insensitive comparison"
 msgstr ""
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:840
-#, fuzzy
+#: ../meld/dirdiff.py:837
 #| msgid ""
 #| "You are running a case insensitive comparison on a case sensitive "
 #| "filesystem. Some files are not visible:\n"
@@ -1129,21 +1153,20 @@ msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
 msgstr ""
-"Suoritat kirjainkoosta riippuvaa vertailua tiedostojärjestelmässä, joka ei "
-"tue kirjainkokoja. Jotkut tiedostot eivät näy:\n"
-"%s"
+"Suoritat kirjainkoosta riippumatonta vertailua kirjainkoon huomioivassa "
+"tiedostojärjestelmässä. Seuraavat tiedostot tässä hakemistossa on piilotettu:"
 
-#: ../meld/dirdiff.py:851
+#: ../meld/dirdiff.py:848
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "\"%s\" piilottanut \"%s\""
 
-#: ../meld/dirdiff.py:876 ../meld/filediff.py:1117 ../meld/filediff.py:1265
-#: ../meld/filediff.py:1441 ../meld/filediff.py:1471 ../meld/filediff.py:1473
+#: ../meld/dirdiff.py:873 ../meld/filediff.py:1124 ../meld/filediff.py:1275
+#: ../meld/filediff.py:1451 ../meld/filediff.py:1481 ../meld/filediff.py:1483
 msgid "Hi_de"
 msgstr "_Piilota"
 
-#: ../meld/dirdiff.py:907
+#: ../meld/dirdiff.py:904
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -1152,12 +1175,12 @@ msgstr ""
 "\"%s\" on olemassa.\n"
 "Korvataanko se?"
 
-#: ../meld/dirdiff.py:915
+#: ../meld/dirdiff.py:912
 msgid "Error copying file"
 msgstr "Virhe tiedostoa kopioitaessa"
 
-#: ../meld/dirdiff.py:916
-#, fuzzy, python-format
+#: ../meld/dirdiff.py:913
+#, python-format
 #| msgid ""
 #| "Error copying '%s' to '%s'\n"
 #| "\n"
@@ -1168,11 +1191,12 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Virhe kopioitaessa \"%s\" kohteeseen \"%s\"\n"
+"Virhe kopioitaessa \"%s\"\n"
+"kohteeseen \"%s\".\n"
 "\n"
-"%s."
+"%s"
 
-#: ../meld/dirdiff.py:939
+#: ../meld/dirdiff.py:936
 #, python-format
 msgid "Error deleting %s"
 msgstr "Virhe poistettaessa %s"
@@ -1195,7 +1219,7 @@ msgstr ""
 
 #: ../meld/filediff.py:250
 msgid "Revert files to their saved versions"
-msgstr ""
+msgstr "Palauta tiedostot tallennettuihin versioihin"
 
 #: ../meld/filediff.py:252
 msgid "Add Synchronization Point"
@@ -1327,7 +1351,7 @@ msgstr "Yhdistä kaikki vasemmalta"
 
 #: ../meld/filediff.py:297
 msgid "Merge all non-conflicting changes from the left"
-msgstr ""
+msgstr "Yhdistä kaikki ilman ristiriitoja olevat muutokset vasemmalta"
 
 #: ../meld/filediff.py:299
 msgid "Merge All from Right"
@@ -1335,17 +1359,17 @@ msgstr "Yhdistä kaikki oikealta"
 
 #: ../meld/filediff.py:300
 msgid "Merge all non-conflicting changes from the right"
-msgstr ""
+msgstr "Yhdistä kaikki ilman ristiriitoja olevat muutokset oikealta"
 
 #: ../meld/filediff.py:302
 msgid "Merge All"
 msgstr "Yhdistä kaikki"
 
 #: ../meld/filediff.py:303
-#, fuzzy
 #| msgid "Copy all changes from left pane to right pane"
 msgid "Merge all non-conflicting changes from left and right panes"
-msgstr "Kopioi kaikki muutokset vasemmasta paneelista oikeaan"
+msgstr ""
+"Yhdistä kaikki ilman ristiriitoja olevat muutokset vasemmalta ja oikealta"
 
 #: ../meld/filediff.py:307
 msgid "Cycle Through Documents"
@@ -1364,25 +1388,25 @@ msgid "Lock scrolling of all panes"
 msgstr ""
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:479
+#: ../meld/filediff.py:472
 #, fuzzy
 #| msgid "INS,OVR"
 msgid "INS"
 msgstr "INS, OVR"
 
-#: ../meld/filediff.py:479
+#: ../meld/filediff.py:472
 #, fuzzy
 #| msgid "INS,OVR"
 msgid "OVR"
 msgstr "INS, OVR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:481
+#: ../meld/filediff.py:474
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Rv %i, sar %i"
 
-#: ../meld/filediff.py:818
+#: ../meld/filediff.py:821
 #, fuzzy, python-format
 #| msgid ""
 #| "Regular expression '%s' changed the number of lines in the file. "
@@ -1394,107 +1418,107 @@ msgstr ""
 "Säännöllinen lauseke \"%s\" muutti tiedoston rivien määrää, joten vertailu "
 "on nyt virheellinen. Katso opaskirjasta lisätietoja."
 
-#: ../meld/filediff.py:887
+#: ../meld/filediff.py:890
 msgid "Mark conflict as resolved?"
-msgstr ""
+msgstr "Merkitäänkö ristiriita selvitetyksi?"
 
-#: ../meld/filediff.py:889
+#: ../meld/filediff.py:892
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
+"Jos ristiriita selvitettiin onnistuneesti, voit merkitä sen selvitetyksi."
 
-#: ../meld/filediff.py:891
-#, fuzzy
+#: ../meld/filediff.py:894
 #| msgid "_Cancel"
 msgid "Cancel"
-msgstr "_Peru"
+msgstr "Peru"
 
-#: ../meld/filediff.py:892
+#: ../meld/filediff.py:895
 msgid "Mark _Resolved"
-msgstr ""
+msgstr "Merkitse _selvitetyksi"
 
-#: ../meld/filediff.py:1105
+#: ../meld/filediff.py:1111
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s} aseta paneelien lukumäärä"
 
-#: ../meld/filediff.py:1111
+#: ../meld/filediff.py:1118
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] avataan tiedostoja"
 
-#: ../meld/filediff.py:1134 ../meld/filediff.py:1144 ../meld/filediff.py:1157
-#: ../meld/filediff.py:1163
+#: ../meld/filediff.py:1141 ../meld/filediff.py:1151 ../meld/filediff.py:1164
+#: ../meld/filediff.py:1170
 msgid "Could not read file"
 msgstr "Tiedoston lukeminen epäonnistui"
 
-#: ../meld/filediff.py:1135
+#: ../meld/filediff.py:1142
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] luetaan tiedostoja"
 
-#: ../meld/filediff.py:1145
+#: ../meld/filediff.py:1152
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s vaikuttaa binääritiedostolta."
 
-#: ../meld/filediff.py:1158
+#: ../meld/filediff.py:1165
 #, fuzzy, python-format
 #| msgid "I tried encodings %s."
 msgid "%s is not in encodings: %s"
 msgstr "Yritettiin merkistöjä %s."
 
-#: ../meld/filediff.py:1193
+#: ../meld/filediff.py:1203
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] lasketaan eroja"
 
-#: ../meld/filediff.py:1260
+#: ../meld/filediff.py:1270
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Tiedosto %s on muuttunut levyllä"
 
-#: ../meld/filediff.py:1261
+#: ../meld/filediff.py:1271
 msgid "Do you want to reload the file?"
 msgstr "Haluatko ladata tiedoston uudelleen?"
 
-#: ../meld/filediff.py:1264
+#: ../meld/filediff.py:1274
 msgid "_Reload"
 msgstr "_Lataa uudestaan"
 
-#: ../meld/filediff.py:1430
+#: ../meld/filediff.py:1440
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
 msgstr ""
 
-#: ../meld/filediff.py:1436
+#: ../meld/filediff.py:1446
 msgid "Files are identical"
 msgstr "Tiedostot ovat identtiset"
 
-#: ../meld/filediff.py:1444
+#: ../meld/filediff.py:1454
 msgid "Show without filters"
 msgstr "Näytä ilman suodattimia"
 
-#: ../meld/filediff.py:1466
+#: ../meld/filediff.py:1476
 msgid "Change highlighting incomplete"
 msgstr ""
 
-#: ../meld/filediff.py:1467
+#: ../meld/filediff.py:1477
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
 msgstr ""
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1485
 msgid "Keep highlighting"
 msgstr "Säilytä korostus"
 
-#: ../meld/filediff.py:1477
+#: ../meld/filediff.py:1487
 msgid "_Keep highlighting"
 msgstr "_Säilytä korostus"
 
-#: ../meld/filediff.py:1608
+#: ../meld/filediff.py:1618
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -1503,7 +1527,7 @@ msgstr ""
 "\"%s\" on olemassa\n"
 "Korvataanko se?"
 
-#: ../meld/filediff.py:1621
+#: ../meld/filediff.py:1631
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -1514,36 +1538,36 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1632
+#: ../meld/filediff.py:1642
 msgid "Save Left Pane As"
 msgstr ""
 
-#: ../meld/filediff.py:1634
+#: ../meld/filediff.py:1644
 msgid "Save Middle Pane As"
 msgstr ""
 
-#: ../meld/filediff.py:1636
+#: ../meld/filediff.py:1646
 msgid "Save Right Pane As"
 msgstr ""
 
-#: ../meld/filediff.py:1649
+#: ../meld/filediff.py:1659
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Tiedosto %s on muuttunut levyllä sen avaamisen jälkeen"
 
-#: ../meld/filediff.py:1651
+#: ../meld/filediff.py:1661
 msgid "If you save it, any external changes will be lost."
 msgstr "Jos tallennat sen, kaikki ulkoiset muutokset häviävät pysyvästi."
 
-#: ../meld/filediff.py:1654
+#: ../meld/filediff.py:1664
 msgid "Save Anyway"
 msgstr "Tallenna silti"
 
-#: ../meld/filediff.py:1655
+#: ../meld/filediff.py:1665
 msgid "Don't Save"
 msgstr "Älä tallenna"
 
-#: ../meld/filediff.py:1679
+#: ../meld/filediff.py:1689
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -1554,7 +1578,7 @@ msgstr ""
 "\n"
 "Mitä muotoa haluat käyttää?"
 
-#: ../meld/filediff.py:1695
+#: ../meld/filediff.py:1705
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -1563,11 +1587,11 @@ msgstr ""
 "\"%s\" sisältää merkkejä, joita ei voi esittää merkistössä \"%s\".\n"
 "Haluatko tallentaa UTF-8 -muodossa?"
 
-#: ../meld/filediff.py:2056
+#: ../meld/filediff.py:2068
 msgid "Live comparison updating disabled"
-msgstr ""
+msgstr "Reaaliaikainen vertailupäivitys poistettu käytöstä"
 
-#: ../meld/filediff.py:2057
+#: ../meld/filediff.py:2069
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1592,90 +1616,95 @@ msgstr "Kopioi _vasemmalle"
 msgid "Copy _down"
 msgstr "Kopioi _vasemmalle"
 
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:170
 #, fuzzy
 #| msgid "Wrong number of arguments (Got %i)"
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Virheellinen määrä argumentteja (saatiin %i)"
 
-#: ../meld/meldapp.py:165
+#: ../meld/meldapp.py:175
 msgid "Start with an empty window"
 msgstr "Aloita tyhjällä ikkunalla"
 
-#: ../meld/meldapp.py:166 ../meld/meldapp.py:168
+#: ../meld/meldapp.py:176 ../meld/meldapp.py:178
 msgid "file"
 msgstr "tiedosto"
 
-#: ../meld/meldapp.py:166 ../meld/meldapp.py:170
+#: ../meld/meldapp.py:176 ../meld/meldapp.py:180
 msgid "folder"
 msgstr "kansio"
 
-#: ../meld/meldapp.py:167
+#: ../meld/meldapp.py:177
 msgid "Start a version control comparison"
 msgstr "Aloita versionhallinnan vertailu"
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:179
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Aloita 2- tai 3-osainen tiedostovertailu"
 
-#: ../meld/meldapp.py:171
-#, fuzzy
+#: ../meld/meldapp.py:181
 #| msgid "Start a 2- or 3-way file comparison"
 msgid "Start a 2- or 3-way folder comparison"
-msgstr "Aloita 2- tai 3-osainen tiedostovertailu"
+msgstr "Aloita 2- tai 3-osainen kansiovertailu"
+
+#: ../meld/meldapp.py:224
+#, python-format
+#| msgid "Error"
+msgid "Error: %s\n"
+msgstr "Virhe: %s\n"
 
-#: ../meld/meldapp.py:209
+#: ../meld/meldapp.py:231
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld on työkalu tiedostojen ja kansioiden vertailuun."
 
-#: ../meld/meldapp.py:213
+#: ../meld/meldapp.py:235
 msgid "Set label to use instead of file name"
 msgstr "Aseta käytettävä otsikko tiedostonimen sijasta"
 
-#: ../meld/meldapp.py:216
+#: ../meld/meldapp.py:238
 msgid "Open a new tab in an already running instance"
 msgstr "Avaa uusi välilehti jo avoinna olevassa ikkunassa"
 
-#: ../meld/meldapp.py:219
+#: ../meld/meldapp.py:241
 msgid "Automatically compare all differing files on startup"
 msgstr ""
 
-#: ../meld/meldapp.py:222
+#: ../meld/meldapp.py:244
 msgid "Ignored for compatibility"
 msgstr "Jätetty huomioimatta yhteensopivuuden takaamiseksi"
 
-#: ../meld/meldapp.py:226
+#: ../meld/meldapp.py:248
 msgid "Set the target file for saving a merge result"
 msgstr ""
 
-#: ../meld/meldapp.py:229
+#: ../meld/meldapp.py:251
 msgid "Automatically merge files"
-msgstr ""
+msgstr "Yhdistä tiedostot automaattisesti"
 
-#: ../meld/meldapp.py:233
+#: ../meld/meldapp.py:255
 msgid "Load a saved comparison from a Meld comparison file"
-msgstr ""
+msgstr "Lataa tallennettu vertailu Meld-vertailutiedostosta"
 
-#: ../meld/meldapp.py:237
+#: ../meld/meldapp.py:259
 msgid "Create a diff tab for the supplied files or folders"
 msgstr ""
 
-#: ../meld/meldapp.py:249
+#: ../meld/meldapp.py:279
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr ""
 
-#: ../meld/meldapp.py:252
+#: ../meld/meldapp.py:282
 msgid "can't auto-merge less than 3 files"
 msgstr ""
 
-#: ../meld/meldapp.py:254
+#: ../meld/meldapp.py:284
 #, fuzzy
 #| msgid "Flatten directories"
 msgid "can't auto-merge directories"
 msgstr "Litistä kansiot"
 
-#: ../meld/meldapp.py:264
+#: ../meld/meldapp.py:298
 msgid "Error reading saved comparison file"
 msgstr ""
 
@@ -1684,7 +1713,7 @@ msgstr ""
 msgid "<unnamed>"
 msgstr "<nimetön>"
 
-#: ../meld/melddoc.py:76 ../meld/melddoc.py:77
+#: ../meld/melddoc.py:78 ../meld/melddoc.py:79
 msgid "untitled"
 msgstr "nimeämätön"
 
@@ -1880,15 +1909,46 @@ msgstr "Avaa viimeisimpiä"
 msgid "Open recent files"
 msgstr "Avaa viimeisimpiä tiedostoja"
 
-#: ../meld/meldwindow.py:506
+#: ../meld/meldwindow.py:164
+#| msgid "Meld"
+msgid "_Meld"
+msgstr "_Meld"
+
+#: ../meld/meldwindow.py:165
+msgid "Quit the program"
+msgstr "Lopeta sovellus"
+
+#: ../meld/meldwindow.py:167
+#| msgid "_Preferences"
+msgid "Prefere_nces"
+msgstr "_Asetukset"
+
+#: ../meld/meldwindow.py:168
+#| msgid "Cut the selection"
+msgid "Configure the application"
+msgstr "Muuta sovelluksen asetuksia"
+
+#: ../meld/meldwindow.py:170
+msgid "_Contents"
+msgstr "_Sisältö"
+
+#: ../meld/meldwindow.py:171
+msgid "Open the Meld manual"
+msgstr "Avaa Meldin ohje"
+
+#: ../meld/meldwindow.py:173
+#| msgid "Cut the selection"
+msgid "About this application"
+msgstr "Tietoja sovelluksesta"
+
+#: ../meld/meldwindow.py:546
 msgid "Switch to this tab"
 msgstr "Vaihda tähän välilehteen"
 
-#: ../meld/meldwindow.py:629
-#, fuzzy
+#: ../meld/meldwindow.py:669
 #| msgid "Cannot compare a mixture of files and directories.\n"
 msgid "Cannot compare a mixture of files and directories"
-msgstr "Hakemistoja ja tiedostoja ei voi verrata samanaikaisesti.\n"
+msgstr "Hakemistoja ja tiedostoja ei voi verrata samanaikaisesti"
 
 #. no common path. empty names get changed to "[None]"
 #: ../meld/misc.py:213
@@ -1903,11 +1963,11 @@ msgstr "otsikko"
 msgid "pattern"
 msgstr "malli"
 
-#: ../meld/recent.py:105
+#: ../meld/recent.py:114
 msgid "Version control:"
 msgstr "Versionhallinta:"
 
-#: ../meld/ui/findbar.py:141
+#: ../meld/ui/findbar.py:144
 msgid "Regular expression error"
 msgstr "Säännöllisen lausekkeen virhe"
 
@@ -1932,15 +1992,15 @@ msgstr ""
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d työntämätön pysyvä muutos"
+msgstr[1] "%d työntämätöntä pysyvää muutosta"
 
 #: ../meld/vc/git.py:129
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d haara"
+msgstr[1] "%d haaraa"
 
 #: ../meld/vc/git.py:348
 #, python-format
@@ -1949,7 +2009,7 @@ msgstr ""
 
 #: ../meld/vc/_vc.py:47
 msgid "Merged"
-msgstr ""
+msgstr "Yhdistetty"
 
 #: ../meld/vc/_vc.py:47
 msgid "Base"
@@ -1973,25 +2033,30 @@ msgstr "Virhe"
 
 #: ../meld/vc/_vc.py:70
 msgid "Newly added"
-msgstr ""
+msgstr "Äskettäin lisätty"
 
 #: ../meld/vc/_vc.py:72
+#| msgid "<unnamed>"
+msgid "Renamed"
+msgstr "Nimetty uudelleen"
+
+#: ../meld/vc/_vc.py:73
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: ../meld/vc/_vc.py:73
+#: ../meld/vc/_vc.py:74
 msgid "Removed"
 msgstr "Poistettu"
 
-#: ../meld/vc/_vc.py:74
+#: ../meld/vc/_vc.py:75
 msgid "Missing"
-msgstr ""
+msgstr "Puuttuu"
 
-#: ../meld/vc/_vc.py:75
+#: ../meld/vc/_vc.py:76
 msgid "Not present"
-msgstr ""
+msgstr "Ei läsnä"
 
-#: ../meld/vcview.py:233 ../meld/vcview.py:401
+#: ../meld/vcview.py:233 ../meld/vcview.py:417
 msgid "Location"
 msgstr "Sijainti"
 
@@ -2009,102 +2074,107 @@ msgstr "Vaihtoehdot"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:312
+#: ../meld/vcview.py:324
 #, python-format
 msgid "%s not installed"
 msgstr "%s ei ole asennettu"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:316
+#: ../meld/vcview.py:328
 msgid "Invalid repository"
 msgstr "Virheellinen tietovarasto"
 
-#: ../meld/vcview.py:325
+#: ../meld/vcview.py:337
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:327 ../meld/vcview.py:335
+#: ../meld/vcview.py:339 ../meld/vcview.py:347
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../meld/vcview.py:346
+#: ../meld/vcview.py:358
 msgid "No valid version control system found in this folder"
 msgstr "Tästä kansiosta ei löytynyt kelvollista versionhallintajärjestelmää"
 
-#: ../meld/vcview.py:348
+#: ../meld/vcview.py:360
 msgid "Only one version control system found in this folder"
 msgstr "Tästä kansiosta löytyi vain yksi versionhallintajärjestelmä"
 
-#: ../meld/vcview.py:350
+#: ../meld/vcview.py:362
 msgid "Choose which version control system to use"
 msgstr "Valitse käytettävä versionhallinta"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:401
+#: ../meld/vcview.py:417
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:415 ../meld/vcview.py:423
+#: ../meld/vcview.py:431 ../meld/vcview.py:439
 #, python-format
 msgid "Scanning %s"
 msgstr "Tutkitaan %s"
 
-#: ../meld/vcview.py:458
+#: ../meld/vcview.py:479
 msgid "(Empty)"
 msgstr "(tyhjä)"
 
-#: ../meld/vcview.py:498
+#: ../meld/vcview.py:522
 #, python-format
 msgid "%s — local"
-msgstr ""
+msgstr "%s — paikallinen"
 
-#: ../meld/vcview.py:499
+#: ../meld/vcview.py:523
 #, python-format
 msgid "%s — remote"
-msgstr ""
+msgstr "%s — etä"
 
-#: ../meld/vcview.py:507
-#, fuzzy, python-format
+#: ../meld/vcview.py:531
+#, python-format
 #| msgid "Left is local, right is remote"
 msgid "%s (local, merge, remote)"
-msgstr "Vasemmalla on paikallinen, oikealla on etä"
+msgstr "%s (paikallinen, yhdistäminen, etä)"
 
-#: ../meld/vcview.py:512
-#, fuzzy, python-format
+#: ../meld/vcview.py:536
+#, python-format
 #| msgid "Left is remote, right is local"
 msgid "%s (remote, merge, local)"
-msgstr "Vasemmalla on etä, oikealla on paikallinen"
+msgstr "%s (etä, yhdistäminen, paikallinen)"
 
-#: ../meld/vcview.py:523
-#, fuzzy, python-format
+#: ../meld/vcview.py:547
+#, python-format
 #| msgid "Invalid repository"
 msgid "%s — repository"
-msgstr "Virheellinen tietovarasto"
+msgstr "%s — tietovarasto"
 
-#: ../meld/vcview.py:529
+#: ../meld/vcview.py:553
 #, python-format
 msgid "%s (working, repository)"
-msgstr ""
+msgstr "%s (työskentely, tietovarasto)"
 
-#: ../meld/vcview.py:533
+#: ../meld/vcview.py:557
 #, python-format
 msgid "%s (repository, working)"
-msgstr ""
+msgstr "%s (tietovarasto, työskentely)"
 
-#: ../meld/vcview.py:717
+#: ../meld/vcview.py:741
 msgid "Remove folder and all its files?"
 msgstr "Poistetaanko kansio ja kaikki sen tiedostot?"
 
-#: ../meld/vcview.py:719
+#: ../meld/vcview.py:743
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
 msgstr ""
+"Tämä poistaa kaikki valitut tiedostot ja kansiot sekä kaikki valituissa "
+"kansioissa olevat tiedostot versionhallinnasta."
 
-#: ../meld/vcview.py:753
+#: ../meld/vcview.py:777
 #, python-format
 msgid "Error removing %s"
 msgstr "Virhe kohdetta %s poistaessa"
+
+#~ msgid "Ignore changes which insert or delete blank lines"
+#~ msgstr "Älä huomioi muutoksia, jotka lisäävät tai poistavat tyhjiä rivejä"