[meld] Finnish translation update

[Timo Jyrinki <tjyrinki src gnome org>]

commit 6401b43c0962f53b0fd2dd0069ad0086ac5f91a6
Author: Jiri Grönroos <jiri gronroos+l10n iki fi>
Date:   Wed Jan 15 15:12:14 2014 +0200

    Finnish translation update

 po/fi.po |  742 +++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 426 insertions(+), 316 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index bca094f..024c016 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ 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: 2013-11-23 17:29+0000\n"
-"PO-Revision-Date: 2013-11-24 20:43+0200\n"
+"POT-Creation-Date: 2013-12-09 06:09+0000\n"
+"PO-Revision-Date: 2013-12-11 20:18+0200\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"
@@ -20,11 +20,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../bin/meld:114
+#: ../bin/meld:115
 msgid "Cannot import: "
 msgstr "Tuonti ei onnistu: "
 
-#: ../bin/meld:117
+#: ../bin/meld:118
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld vaatii version %s tai uudemman."
@@ -61,125 +61,197 @@ msgstr ""
 
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
-msgstr ""
+msgstr "Meld-vertailun kuvaus"
 
 #: ../data/org.gnome.meld.gschema.xml.h:1
+msgid "Default window size"
+msgstr "Ikkunan oletuskoko"
+
+#: ../data/org.gnome.meld.gschema.xml.h:2
+#| msgid "Show or hide the toolbar"
+msgid "Show toolbar"
+msgstr "Näytä työkalupalkki"
+
+#: ../data/org.gnome.meld.gschema.xml.h:3
+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
+#| msgid "_Statusbar"
+msgid "Show statusbar"
+msgstr "Näytä tilapalkki"
+
+#: ../data/org.gnome.meld.gschema.xml.h:5
+msgid "If true, the window statusbar is visible."
+msgstr "Jos tosi, ikkunan tilapalkki näytetään."
+
+#: ../data/org.gnome.meld.gschema.xml.h:6
+msgid "Automatically detected text encodings"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:7
+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
 msgid "Width of an indentation step"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:2
+#: ../data/org.gnome.meld.gschema.xml.h:9
 msgid "The number of spaces to use for a single indent step"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:3
+#: ../data/org.gnome.meld.gschema.xml.h:10
 msgid "Whether to indent using spaces or tabs"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: ../data/org.gnome.meld.gschema.xml.h:11
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:5
-#| msgid "Show _line numbers"
+#: ../data/org.gnome.meld.gschema.xml.h:12
 msgid "Show line numbers"
 msgstr "Näytä rivinumerot"
 
-#: ../data/org.gnome.meld.gschema.xml.h:6
+#: ../data/org.gnome.meld.gschema.xml.h:13
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:7
-#| msgid "Highlight _current line"
+#: ../data/org.gnome.meld.gschema.xml.h:14
 msgid "Highlight syntax"
 msgstr "Korosta syntaksi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: ../data/org.gnome.meld.gschema.xml.h:15
 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:9
+#: ../data/org.gnome.meld.gschema.xml.h:16
 #, fuzzy
 #| msgid "Show w_hitespace"
 msgid "Displayed whitespace"
 msgstr "Näytä _tyhjätila"
 
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: ../data/org.gnome.meld.gschema.xml.h:17
 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:11
-#| msgid "Highlight _current line"
+#: ../data/org.gnome.meld.gschema.xml.h:18
+#, fuzzy
+#| msgid "_Wrap around"
+msgid "Wrap mode"
+msgstr "_Rivitä"
+
+#: ../data/org.gnome.meld.gschema.xml.h:19
+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
 msgid "Highlight current line"
 msgstr "Korosta nykyinen rivi"
 
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: ../data/org.gnome.meld.gschema.xml.h:21
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:13
-#| msgid "Use _default system editor"
+#: ../data/org.gnome.meld.gschema.xml.h:22
+#, 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
+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
+#| msgid "Use custom font"
+msgid "Custom font"
+msgstr "Omavalintainen kirjasin"
+
+#: ../data/org.gnome.meld.gschema.xml.h:25
+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
+msgid "Ignore blank lines when comparing files"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:27
+msgid ""
+"If true, blank lines will be trimmed when highlighting changes between files."
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:28
 msgid "Use the system default editor"
 msgstr "Käytä järjestelmän oletusmuokkainta"
 
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: ../data/org.gnome.meld.gschema.xml.h:29
 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:15
+#: ../data/org.gnome.meld.gschema.xml.h:30
 msgid "The custom editor launch command"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: ../data/org.gnome.meld.gschema.xml.h:31
 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:17
+#: ../data/org.gnome.meld.gschema.xml.h:32
 msgid "Columns to display"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../data/org.gnome.meld.gschema.xml.h:33
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:19 ../data/ui/preferences.ui.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:34 ../data/ui/preferences.ui.h:28
 msgid "Ignore symbolic links"
 msgstr "Älä huomioi symbolisia linkkejä"
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:35
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:21
-#| msgid "Shallow Comparison"
+#: ../data/org.gnome.meld.gschema.xml.h:36
 msgid "Use shallow comparison"
 msgstr "Käytä pinnallista vertailua"
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:37
 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:23
+#: ../data/org.gnome.meld.gschema.xml.h:38
 msgid "File timestamp resolution"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:39
 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 "
@@ -187,43 +259,109 @@ msgid ""
 "resolution."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:40
+#, fuzzy
+#| msgid "File Filters"
+msgid "File status filters"
+msgstr "Tiedostosuodattimet"
+
+#: ../data/org.gnome.meld.gschema.xml.h:41
+msgid "List of statuses used to filter visible files in folder comparison."
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:42
+#, 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
+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
+msgid "Present version comparisons as left-local/right-remote"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:45
+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:46
 msgid "Show margin in commit message editor"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: ../data/org.gnome.meld.gschema.xml.h:47
 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:27
+#: ../data/org.gnome.meld.gschema.xml.h:48
 msgid "Margin column in commit message editor"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:49
 msgid ""
 "The column of the margin is at in the version control commit message editor."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: ../data/org.gnome.meld.gschema.xml.h:50
 msgid "Automatically hard-wrap commit messages"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:51
 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:52
+#, fuzzy
+#| msgid "Version control view"
+msgid "Version control status filters"
+msgstr "Versionhallintanäkymä"
+
+#: ../data/org.gnome.meld.gschema.xml.h:53
+msgid ""
+"List of statuses used to filter visible files in version control comparison."
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:54
+#, fuzzy
+#| msgid "File Filters"
+msgid "Filename-based filters"
+msgstr "Tiedostosuodattimet"
+
+#: ../data/org.gnome.meld.gschema.xml.h:55
+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:56
+#, fuzzy
+#| msgid "Text Filters"
+msgid "Text-based filters"
+msgstr "Tekstisuodattimet"
+
+#: ../data/org.gnome.meld.gschema.xml.h:57
+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, "
+"but won't contribute to the comparison itself."
+msgstr ""
+
 #: ../data/ui/application.ui.h:1
 msgid "About Meld"
 msgstr "Tietoja - Meld"
 
 #: ../data/ui/application.ui.h:2
-#| msgid ""
-#| "Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
-#| "Copyright &#xA9; 2009-2013 Kai Willadsen"
 msgid ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
 "Copyright © 2009-2013 Kai Willadsen"
@@ -240,7 +378,6 @@ msgid "translator-credits"
 msgstr "Jiri Grönroos"
 
 #: ../data/ui/application.ui.h:6
-#| msgid "Prefere_nces"
 msgid "_Preferences"
 msgstr "_Asetukset"
 
@@ -284,7 +421,7 @@ msgstr "Kopioi oikealle"
 msgid "Delete selected"
 msgstr "Poista valittu"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1415
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1418
 msgid "Hide"
 msgstr "Piilota"
 
@@ -353,7 +490,7 @@ msgid "_Add"
 msgstr "_Lisää"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:647
+#: ../meld/vcview.py:670
 msgid "_Remove"
 msgstr "_Poista"
 
@@ -374,8 +511,8 @@ msgid "Move _Down"
 msgstr "Siirrä _alas"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:358
-#: ../meld/vcview.py:176
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:365
+#: ../meld/vcview.py:186
 msgid "Name"
 msgstr "Nimi"
 
@@ -417,7 +554,7 @@ msgid ""
 "make changes anyway, but these changes must be saved to a new file."
 msgstr ""
 
-#: ../data/ui/filediff.ui.h:7 ../meld/filediff.py:297
+#: ../data/ui/filediff.ui.h:7 ../meld/filediff.py:301
 msgid "Lock scrolling of all panes"
 msgstr ""
 
@@ -495,7 +632,7 @@ msgstr ""
 msgid "Copy to Clipboard"
 msgstr "Kopioi leikepöydälle"
 
-#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:123
+#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:121
 msgid "Save Patch"
 msgstr "Tallenna paikkatiedosto"
 
@@ -508,128 +645,144 @@ msgid "Left is local, right is remote"
 msgstr "Vasemmalla on paikallinen, oikealla on etä"
 
 #: ../data/ui/preferences.ui.h:3
+msgid "1ns (ext4)"
+msgstr "1ns (ext4)"
+
+#: ../data/ui/preferences.ui.h:4
+msgid "100ns (NTFS)"
+msgstr "100ns (NTFS)"
+
+#: ../data/ui/preferences.ui.h:5
+msgid "1s (ext2/ext3)"
+msgstr "1s (ext2/ext3)"
+
+#: ../data/ui/preferences.ui.h:6
+msgid "2s (VFAT)"
+msgstr "2s (VFAT)"
+
+#: ../data/ui/preferences.ui.h:7
 msgid "Meld Preferences"
 msgstr "Meldin asetukset"
 
-#: ../data/ui/preferences.ui.h:4
+#: ../data/ui/preferences.ui.h:8
 msgid "Font"
 msgstr "Kirjasin"
 
-#: ../data/ui/preferences.ui.h:5
+#: ../data/ui/preferences.ui.h:9
 msgid "_Use the system fixed width font"
 msgstr "_Käytä järjestelmän tasalevyistä kirjasinta"
 
-#: ../data/ui/preferences.ui.h:6
+#: ../data/ui/preferences.ui.h:10
 msgid "_Editor font:"
 msgstr "_Muokkaimen kirjasin:"
 
-#: ../data/ui/preferences.ui.h:7
+#: ../data/ui/preferences.ui.h:11
 msgid "Display"
 msgstr "Näytä"
 
-#: ../data/ui/preferences.ui.h:8
+#: ../data/ui/preferences.ui.h:12
 msgid "_Tab width:"
 msgstr "_Sarkaimen leveys:"
 
-#: ../data/ui/preferences.ui.h:9
+#: ../data/ui/preferences.ui.h:13
 msgid "_Insert spaces instead of tabs"
 msgstr "Lis_ää välilyöntejä sarkainten sijaan"
 
-#: ../data/ui/preferences.ui.h:10
+#: ../data/ui/preferences.ui.h:14
 msgid "Enable text _wrapping"
 msgstr "Käytä te_kstin rivitystä"
 
-#: ../data/ui/preferences.ui.h:11
+#: ../data/ui/preferences.ui.h:15
 msgid "Do not _split words over two lines"
 msgstr "Älä jaa sano_ja kahdelle riville"
 
-#: ../data/ui/preferences.ui.h:12
+#: ../data/ui/preferences.ui.h:16
 msgid "Highlight _current line"
 msgstr "Ko_rosta nykyinen rivi"
 
-#: ../data/ui/preferences.ui.h:13
+#: ../data/ui/preferences.ui.h:17
 msgid "Show _line numbers"
 msgstr "Näytä _rivinumerot"
 
-#: ../data/ui/preferences.ui.h:14
+#: ../data/ui/preferences.ui.h:18
 msgid "Show w_hitespace"
 msgstr "Näytä _tyhjätila"
 
-#: ../data/ui/preferences.ui.h:15
+#: ../data/ui/preferences.ui.h:19
 msgid "Use s_yntax highlighting"
 msgstr "Käytä s_yntaksin korostusta"
 
-#: ../data/ui/preferences.ui.h:16
+#: ../data/ui/preferences.ui.h:20
 msgid "External Editor"
 msgstr "Ulkoinen muokkain"
 
-#: ../data/ui/preferences.ui.h:17
+#: ../data/ui/preferences.ui.h:21
 msgid "Use _default system editor"
 msgstr "Käytä _järjestelmän oletusmuokkainta"
 
-#: ../data/ui/preferences.ui.h:18
+#: ../data/ui/preferences.ui.h:22
 msgid "Edito_r command:"
 msgstr "Muokkaimen kom_ento:"
 
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:23
 msgid "Editor"
 msgstr "Muokkain"
 
-#: ../data/ui/preferences.ui.h:20
+#: ../data/ui/preferences.ui.h:24
 msgid "Shallow Comparison"
 msgstr "Pinnallinen vertailu"
 
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:25
 msgid "C_ompare files based only on size and timestamp"
 msgstr ""
 
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:26
 msgid "_Timestamp resolution:"
 msgstr ""
 
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:27
 msgid "Symbolic Links"
 msgstr "Symboliset linkit"
 
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:29
 msgid "Visible Columns"
 msgstr "Näkyvät sarakkeet"
 
-#: ../data/ui/preferences.ui.h:26
+#: ../data/ui/preferences.ui.h:30
 #, fuzzy
 #| msgid "_File Comparison"
 msgid "Folder Comparisons"
 msgstr "_Tiedostojen vertailu"
 
-#: ../data/ui/preferences.ui.h:27
+#: ../data/ui/preferences.ui.h:31
 #, fuzzy
 #| msgid "_File Comparison"
 msgid "Version Comparisons"
 msgstr "_Tiedostojen vertailu"
 
-#: ../data/ui/preferences.ui.h:28
+#: ../data/ui/preferences.ui.h:32
 msgid "_When comparing file revisions:"
 msgstr ""
 
-#: ../data/ui/preferences.ui.h:29
+#: ../data/ui/preferences.ui.h:33
 #, fuzzy
 #| msgid "Log Message"
 msgid "Commit Messages"
 msgstr "Lokiviesti"
 
-#: ../data/ui/preferences.ui.h:30
+#: ../data/ui/preferences.ui.h:34
 msgid "Show _right margin at:"
 msgstr ""
 
-#: ../data/ui/preferences.ui.h:31
+#: ../data/ui/preferences.ui.h:35
 msgid "Automatically _break lines at right margin on commit"
 msgstr ""
 
-#: ../data/ui/preferences.ui.h:32
+#: ../data/ui/preferences.ui.h:36
 msgid "Version Control"
 msgstr "Versionhallinta"
 
-#: ../data/ui/preferences.ui.h:33
+#: ../data/ui/preferences.ui.h:37
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -639,11 +792,11 @@ msgstr ""
 "suoritettaessa hakemistojen vertailuja. Kukin malli on lista komentorivin "
 "tapaisia jokerimerkkejä erotettuna välilyönneillä."
 
-#: ../data/ui/preferences.ui.h:34 ../meld/meldwindow.py:106
+#: ../data/ui/preferences.ui.h:38 ../meld/meldwindow.py:106
 msgid "File Filters"
 msgstr "Tiedostosuodattimet"
 
-#: ../data/ui/preferences.ui.h:35
+#: ../data/ui/preferences.ui.h:39
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -657,27 +810,15 @@ msgstr ""
 "vertailua. Jos lauseke sisältää ryhmiä, vain ryhmät korvataan. Katso "
 "lisätietoja käyttöohjeesta."
 
-#: ../data/ui/preferences.ui.h:36
+#: ../data/ui/preferences.ui.h:40
 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:37
+#: ../data/ui/preferences.ui.h:41
 msgid "Text Filters"
 msgstr "Tekstisuodattimet"
 
-#: ../data/ui/preferences.ui.h:38
-msgid "Loading"
-msgstr "Lataaminen"
-
-#: ../data/ui/preferences.ui.h:39
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr "Kokeile ladattaessa näitä merkistökoodauksiä järjestyksessä."
-
-#: ../data/ui/preferences.ui.h:40
-msgid "Encoding"
-msgstr "Merkistö"
-
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:620
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:618
 msgid "New comparison"
 msgstr "Uusi vertalu"
 
@@ -870,55 +1011,55 @@ msgid "_Push commits"
 msgstr "_Toteuta"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:376
+#: ../meld/dirdiff.py:383
 msgid "Size"
 msgstr "Koko"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:384
+#: ../meld/dirdiff.py:391
 msgid "Modification time"
 msgstr "Muokkausaika"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:392
+#: ../meld/dirdiff.py:399
 msgid "Permissions"
 msgstr "Oikeudet"
 
-#: ../meld/dirdiff.py:550
+#: ../meld/dirdiff.py:558
 #, python-format
 msgid "Hide %s"
 msgstr "Piilota %s"
 
-#: ../meld/dirdiff.py:677 ../meld/dirdiff.py:699
+#: ../meld/dirdiff.py:686 ../meld/dirdiff.py:708
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Tutkitaan %s"
 
-#: ../meld/dirdiff.py:799
+#: ../meld/dirdiff.py:808
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Valmis"
 
-#: ../meld/dirdiff.py:805
+#: ../meld/dirdiff.py:814
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Tätä kansiota tutkittaessa tapahtui lukuisia virheitä"
 
-#: ../meld/dirdiff.py:806
+#: ../meld/dirdiff.py:815
 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:808
+#: ../meld/dirdiff.py:817
 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:810
+#: ../meld/dirdiff.py:819
 msgid "Files hidden by case insensitive comparison"
 msgstr ""
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:812
+#: ../meld/dirdiff.py:821
 #, fuzzy
 #| msgid ""
 #| "You are running a case insensitive comparison on a case sensitive "
@@ -932,17 +1073,17 @@ msgstr ""
 "tue kirjainkokoja. Jotkut tiedostot eivät näy:\n"
 "%s"
 
-#: ../meld/dirdiff.py:823
+#: ../meld/dirdiff.py:832
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "\"%s\" piilottanut \"%s\""
 
-#: ../meld/dirdiff.py:848 ../meld/filediff.py:1109 ../meld/filediff.py:1246
-#: ../meld/filediff.py:1417 ../meld/filediff.py:1447 ../meld/filediff.py:1449
+#: ../meld/dirdiff.py:857 ../meld/filediff.py:1111 ../meld/filediff.py:1249
+#: ../meld/filediff.py:1420 ../meld/filediff.py:1450 ../meld/filediff.py:1452
 msgid "Hi_de"
 msgstr "_Piilota"
 
-#: ../meld/dirdiff.py:879
+#: ../meld/dirdiff.py:888
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -951,11 +1092,11 @@ msgstr ""
 "\"%s\" on olemassa.\n"
 "Korvataanko se?"
 
-#: ../meld/dirdiff.py:887
+#: ../meld/dirdiff.py:896
 msgid "Error copying file"
 msgstr "Virhe tiedostoa kopioitaessa"
 
-#: ../meld/dirdiff.py:888
+#: ../meld/dirdiff.py:897
 #, fuzzy, python-format
 #| msgid ""
 #| "Error copying '%s' to '%s'\n"
@@ -971,7 +1112,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:911
+#: ../meld/dirdiff.py:920
 #, fuzzy, python-format
 #| msgid ""
 #| "Error removing %s\n"
@@ -983,257 +1124,257 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:1042
+#: ../meld/dirdiff.py:1051
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i sekunti"
 msgstr[1] "%i sekuntia"
 
-#: ../meld/dirdiff.py:1043
+#: ../meld/dirdiff.py:1052
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuutti"
 msgstr[1] "%i minuuttia"
 
-#: ../meld/dirdiff.py:1044
+#: ../meld/dirdiff.py:1053
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i tunti"
 msgstr[1] "%i tuntia"
 
-#: ../meld/dirdiff.py:1045
+#: ../meld/dirdiff.py:1054
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i päivä"
 msgstr[1] "%i päivää"
 
-#: ../meld/dirdiff.py:1046
+#: ../meld/dirdiff.py:1055
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i viikko"
 msgstr[1] "%i viikkoa"
 
-#: ../meld/dirdiff.py:1047
+#: ../meld/dirdiff.py:1056
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i kuukausi"
 msgstr[1] "%i kuukautta"
 
-#: ../meld/dirdiff.py:1048
+#: ../meld/dirdiff.py:1057
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i vuosi"
 msgstr[1] "%i vuotta"
 
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:229
 msgid "Format as Patch..."
 msgstr "Muotoile paikkatiedosto..."
 
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:230
 msgid "Create a patch using differences between files"
 msgstr "Luo paikkatiedosto käyttäen tiedostojen välisiä eroja"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:232
 msgid "Save A_ll"
 msgstr "Tallenna _kaikki"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:233
 msgid "Save all files in the current comparison"
 msgstr ""
 
-#: ../meld/filediff.py:232
+#: ../meld/filediff.py:236
 msgid "Revert files to their saved versions"
 msgstr ""
 
-#: ../meld/filediff.py:234
+#: ../meld/filediff.py:238
 msgid "Add Synchronization Point"
 msgstr "Lisää synkronointipiste"
 
-#: ../meld/filediff.py:235
+#: ../meld/filediff.py:239
 msgid "Add a manual point for synchronization of changes between files"
 msgstr ""
 
-#: ../meld/filediff.py:238
+#: ../meld/filediff.py:242
 msgid "Clear Synchronization Points"
 msgstr "Tyhjennä synkronointipisteet"
 
-#: ../meld/filediff.py:239
+#: ../meld/filediff.py:243
 msgid "Clear manual change sychronization points"
 msgstr ""
 
-#: ../meld/filediff.py:241
+#: ../meld/filediff.py:245
 msgid "Previous Conflict"
 msgstr "Edellinen ristiriita"
 
-#: ../meld/filediff.py:242
+#: ../meld/filediff.py:246
 msgid "Go to the previous conflict"
 msgstr "Siirry edelliseen ristiriitaan"
 
-#: ../meld/filediff.py:244
+#: ../meld/filediff.py:248
 msgid "Next Conflict"
 msgstr "Seuraava ristiriita"
 
-#: ../meld/filediff.py:245
+#: ../meld/filediff.py:249
 msgid "Go to the next conflict"
 msgstr "Siirry seuraavaan ristiriitaan"
 
-#: ../meld/filediff.py:247
+#: ../meld/filediff.py:251
 msgid "Push to Left"
 msgstr ""
 
-#: ../meld/filediff.py:248
+#: ../meld/filediff.py:252
 msgid "Push current change to the left"
 msgstr ""
 
-#: ../meld/filediff.py:251
+#: ../meld/filediff.py:255
 #, fuzzy
 #| msgid "Copy To Right"
 msgid "Push to Right"
 msgstr "Kopioi oikealle"
 
-#: ../meld/filediff.py:252
+#: ../meld/filediff.py:256
 msgid "Push current change to the right"
 msgstr ""
 
-#: ../meld/filediff.py:256
+#: ../meld/filediff.py:260
 msgid "Pull from Left"
 msgstr ""
 
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:261
 #, fuzzy
 #| msgid "Copy all changes from right pane to left pane"
 msgid "Pull change from the left"
 msgstr "Kopioi kaikki muutokset oikeasta paneelista vasempaan"
 
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:264
 #, fuzzy
 #| msgid "Copy All To _Right"
 msgid "Pull from Right"
 msgstr "Kopioi kaikki _Oikealle"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:265
 #, fuzzy
 #| msgid "Copy all changes from left pane to right pane"
 msgid "Pull change from the right"
 msgstr "Kopioi kaikki muutokset vasemmasta paneelista oikeaan"
 
-#: ../meld/filediff.py:263
+#: ../meld/filediff.py:267
 #, fuzzy
 #| msgid "Copy To Left"
 msgid "Copy Above Left"
 msgstr "Kopioi vasemmalle"
 
-#: ../meld/filediff.py:264
+#: ../meld/filediff.py:268
 msgid "Copy change above the left chunk"
 msgstr ""
 
-#: ../meld/filediff.py:266
+#: ../meld/filediff.py:270
 #, fuzzy
 #| msgid "Copy To Left"
 msgid "Copy Below Left"
 msgstr "Kopioi vasemmalle"
 
-#: ../meld/filediff.py:267
+#: ../meld/filediff.py:271
 msgid "Copy change below the left chunk"
 msgstr ""
 
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:273
 #, fuzzy
 #| msgid "Copy To Right"
 msgid "Copy Above Right"
 msgstr "Kopioi oikealle"
 
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:274
 #, fuzzy
 #| msgid "Copy all changes from left pane to right pane"
 msgid "Copy change above the right chunk"
 msgstr "Kopioi kaikki muutokset vasemmasta paneelista oikeaan"
 
-#: ../meld/filediff.py:272
+#: ../meld/filediff.py:276
 #, fuzzy
 #| msgid "Copy To Right"
 msgid "Copy Below Right"
 msgstr "Kopioi oikealle"
 
-#: ../meld/filediff.py:273
+#: ../meld/filediff.py:277
 #, fuzzy
 #| msgid "Copy all changes from left pane to right pane"
 msgid "Copy change below the right chunk"
 msgstr "Kopioi kaikki muutokset vasemmasta paneelista oikeaan"
 
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:279
 msgid "Delete"
 msgstr "Poista"
 
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:280
 msgid "Delete change"
 msgstr "Poista muutos"
 
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:282
 msgid "Merge All from Left"
 msgstr "Yhdistä kaikki vasemmalta"
 
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:283
 msgid "Merge all non-conflicting changes from the left"
 msgstr ""
 
-#: ../meld/filediff.py:281
+#: ../meld/filediff.py:285
 msgid "Merge All from Right"
 msgstr "Yhdistä kaikki oikealta"
 
-#: ../meld/filediff.py:282
+#: ../meld/filediff.py:286
 msgid "Merge all non-conflicting changes from the right"
 msgstr ""
 
-#: ../meld/filediff.py:284
+#: ../meld/filediff.py:288
 msgid "Merge All"
 msgstr "Yhdistä kaikki"
 
-#: ../meld/filediff.py:285
+#: ../meld/filediff.py:289
 #, 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"
 
-#: ../meld/filediff.py:289
+#: ../meld/filediff.py:293
 msgid "Cycle Through Documents"
 msgstr "Vaihda asiakirjojen välillä"
 
-#: ../meld/filediff.py:290
+#: ../meld/filediff.py:294
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr "Siirrä näppäimistön kohdistus seuraavaan vertailun asiakirjaan"
 
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:300
 msgid "Lock Scrolling"
 msgstr "Lukitse vieritys"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:456
+#: ../meld/filediff.py:472
 #, fuzzy
 #| msgid "INS,OVR"
 msgid "INS"
 msgstr "INS, OVR"
 
-#: ../meld/filediff.py:456
+#: ../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:458
+#: ../meld/filediff.py:474
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Rv %i, sar %i"
 
-#: ../meld/filediff.py:795
+#: ../meld/filediff.py:811
 #, fuzzy, python-format
 #| msgid ""
 #| "Regular expression '%s' changed the number of lines in the file. "
@@ -1245,90 +1386,88 @@ msgstr ""
 "Säännöllinen lauseke \"%s\" muutti tiedoston rivien määrää, joten vertailu "
 "on nyt virheellinen. Katso opaskirjasta lisätietoja."
 
-#: ../meld/filediff.py:1097
+#: ../meld/filediff.py:1099
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s} aseta paneelien lukumäärä"
 
-#: ../meld/filediff.py:1103
+#: ../meld/filediff.py:1105
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] avataan tiedostoja"
 
-#: ../meld/filediff.py:1126 ../meld/filediff.py:1136 ../meld/filediff.py:1149
-#: ../meld/filediff.py:1155
+#: ../meld/filediff.py:1128 ../meld/filediff.py:1138 ../meld/filediff.py:1151
+#: ../meld/filediff.py:1157
 msgid "Could not read file"
 msgstr "Tiedoston lukeminen epäonnistui"
 
-#: ../meld/filediff.py:1127
+#: ../meld/filediff.py:1129
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] luetaan tiedostoja"
 
-#: ../meld/filediff.py:1137
+#: ../meld/filediff.py:1139
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s vaikuttaa binääritiedostolta."
 
-#: ../meld/filediff.py:1150
+#: ../meld/filediff.py:1152
 #, fuzzy, python-format
 #| msgid "I tried encodings %s."
 msgid "%s is not in encodings: %s"
 msgstr "Yritettiin merkistöjä %s."
 
-#: ../meld/filediff.py:1185
+#: ../meld/filediff.py:1187
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] lasketaan eroja"
 
-#: ../meld/filediff.py:1241
+#: ../meld/filediff.py:1244
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Tiedosto %s on muuttunut levyllä"
 
-#: ../meld/filediff.py:1242
-#| msgid "Could not read file"
+#: ../meld/filediff.py:1245
 msgid "Do you want to reload the file?"
 msgstr "Haluatko ladata tiedoston uudelleen?"
 
-#: ../meld/filediff.py:1245
-#| msgid "Reload"
+#: ../meld/filediff.py:1248
 msgid "_Reload"
 msgstr "_Lataa uudestaan"
 
-#: ../meld/filediff.py:1406
+#: ../meld/filediff.py:1409
 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:1412
+#: ../meld/filediff.py:1415
 msgid "Files are identical"
 msgstr "Tiedostot ovat identtiset"
 
-#: ../meld/filediff.py:1420
+#: ../meld/filediff.py:1423
 msgid "Show without filters"
 msgstr "Näytä ilman suodattimia"
 
-#: ../meld/filediff.py:1442
+#: ../meld/filediff.py:1445
 msgid "Change highlighting incomplete"
 msgstr ""
 
-#: ../meld/filediff.py:1443
+#: ../meld/filediff.py:1446
 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:1451
+#: ../meld/filediff.py:1454
 msgid "Keep highlighting"
 msgstr "Säilytä korostus"
 
-#: ../meld/filediff.py:1453
+#: ../meld/filediff.py:1456
 msgid "_Keep highlighting"
 msgstr "_Säilytä korostus"
 
-#: ../meld/filediff.py:1584
+#: ../meld/filediff.py:1587
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -1337,7 +1476,7 @@ msgstr ""
 "\"%s\" on olemassa\n"
 "Korvataanko se?"
 
-#: ../meld/filediff.py:1597
+#: ../meld/filediff.py:1600
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -1348,38 +1487,36 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1608
+#: ../meld/filediff.py:1611
 msgid "Save Left Pane As"
 msgstr ""
 
-#: ../meld/filediff.py:1610
+#: ../meld/filediff.py:1613
 msgid "Save Middle Pane As"
 msgstr ""
 
-#: ../meld/filediff.py:1612
+#: ../meld/filediff.py:1615
 msgid "Save Right Pane As"
 msgstr ""
 
-#: ../meld/filediff.py:1623
+#: ../meld/filediff.py:1626
 #, 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:1625
-#| msgid "If you don't save, changes will be permanently lost."
+#: ../meld/filediff.py:1628
 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:1628
-#| msgid "Save A_ll"
+#: ../meld/filediff.py:1631
 msgid "Save Anyway"
 msgstr "Tallenna silti"
 
-#: ../meld/filediff.py:1629
+#: ../meld/filediff.py:1632
 msgid "Don't Save"
 msgstr "Älä tallenna"
 
-#: ../meld/filediff.py:1653
+#: ../meld/filediff.py:1656
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -1390,7 +1527,7 @@ msgstr ""
 "\n"
 "Mitä muotoa haluat käyttää?"
 
-#: ../meld/filediff.py:1669
+#: ../meld/filediff.py:1672
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -1399,11 +1536,11 @@ msgstr ""
 "\"%s\" sisältää merkkejä, joita ei voi esittää merkistössä \"%s\".\n"
 "Haluatko tallentaa UTF-8 -muodossa?"
 
-#: ../meld/filediff.py:2040
+#: ../meld/filediff.py:2049
 msgid "Live comparison updating disabled"
 msgstr ""
 
-#: ../meld/filediff.py:2041
+#: ../meld/filediff.py:2050
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1428,88 +1565,88 @@ msgstr "Kopioi _vasemmalle"
 msgid "Copy _down"
 msgstr "Kopioi _vasemmalle"
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:138
 #, 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:174
+#: ../meld/meldapp.py:143
 msgid "Start with an empty window"
 msgstr "Aloita tyhjällä ikkunalla"
 
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:177
+#: ../meld/meldapp.py:144 ../meld/meldapp.py:146
 msgid "file"
 msgstr "tiedosto"
 
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
+#: ../meld/meldapp.py:144 ../meld/meldapp.py:148
 msgid "dir"
 msgstr "kansio"
 
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:145
 msgid "Start a version control comparison"
 msgstr "Aloita versionhallinnan vertailu"
 
-#: ../meld/meldapp.py:178
+#: ../meld/meldapp.py:147
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Aloita 2- tai 3-osainen tiedostovertailu"
 
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:149
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Aloita 2- tai 3-osainen kansiovertailu"
 
-#: ../meld/meldapp.py:188
+#: ../meld/meldapp.py:157
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld on työkalu tiedostojen ja kansioiden vertailuun."
 
-#: ../meld/meldapp.py:191
+#: ../meld/meldapp.py:160
 msgid "Set label to use instead of file name"
 msgstr "Aseta käytettävä otsikko tiedostonimen sijasta"
 
-#: ../meld/meldapp.py:193
+#: ../meld/meldapp.py:162
 msgid "Open a new tab in an already running instance"
 msgstr "Avaa uusi välilehti jo avoinna olevassa ikkunassa"
 
-#: ../meld/meldapp.py:196
+#: ../meld/meldapp.py:165
 msgid "Automatically compare all differing files on startup"
 msgstr ""
 
-#: ../meld/meldapp.py:198
+#: ../meld/meldapp.py:167
 msgid "Ignored for compatibility"
 msgstr "Jätetty huomioimatta yhteensopivuuden takaamiseksi"
 
-#: ../meld/meldapp.py:201
+#: ../meld/meldapp.py:170
 msgid "Set the target file for saving a merge result"
 msgstr ""
 
-#: ../meld/meldapp.py:203
+#: ../meld/meldapp.py:172
 msgid "Automatically merge files"
 msgstr ""
 
-#: ../meld/meldapp.py:206
+#: ../meld/meldapp.py:175
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr ""
 
-#: ../meld/meldapp.py:209
+#: ../meld/meldapp.py:178
 msgid "Create a diff tab for the supplied files or folders"
 msgstr ""
 
-#: ../meld/meldapp.py:212
+#: ../meld/meldapp.py:181
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr ""
 
-#: ../meld/meldapp.py:215
+#: ../meld/meldapp.py:184
 msgid "can't auto-merge less than 3 files"
 msgstr ""
 
-#: ../meld/meldapp.py:217
+#: ../meld/meldapp.py:186
 #, fuzzy
 #| msgid "Flatten directories"
 msgid "can't auto-merge directories"
 msgstr "Litistä kansiot"
 
-#: ../meld/meldapp.py:227
+#: ../meld/meldapp.py:196
 msgid "Error reading saved comparison file"
 msgstr ""
 
@@ -1518,7 +1655,7 @@ msgstr ""
 msgid "<unnamed>"
 msgstr "<nimetön>"
 
-#: ../meld/melddoc.py:79 ../meld/melddoc.py:80
+#: ../meld/melddoc.py:77 ../meld/melddoc.py:78
 msgid "untitled"
 msgstr "nimeämätön"
 
@@ -1726,11 +1863,11 @@ msgstr "Avaa viimeisimpiä"
 msgid "Open recent files"
 msgstr "Avaa viimeisimpiä tiedostoja"
 
-#: ../meld/meldwindow.py:541
+#: ../meld/meldwindow.py:539
 msgid "Switch to this tab"
 msgstr "Vaihda tähän välilehteen"
 
-#: ../meld/meldwindow.py:664
+#: ../meld/meldwindow.py:662
 #, fuzzy
 #| msgid "Cannot compare a mixture of files and directories.\n"
 msgid "Cannot compare a mixture of files and directories"
@@ -1741,77 +1878,14 @@ msgstr "Hakemistoja ja tiedostoja ei voi verrata samanaikaisesti.\n"
 msgid "[None]"
 msgstr "[Ei mitään]"
 
-#: ../meld/preferences.py:44
+#: ../meld/preferences.py:36
 msgid "label"
 msgstr "otsikko"
 
-#: ../meld/preferences.py:44
+#: ../meld/preferences.py:36
 msgid "pattern"
 msgstr "malli"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:309
-msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-msgstr "Varmuuuskopiot\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:311
-msgid ""
-"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
-"Desktop.ini\n"
-msgstr ""
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:313
-#, fuzzy, python-format
-#| msgid "_Version Control Browser"
-msgid "Version Control\t1\t%s\n"
-msgstr "_Versinhallinnan selain"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:315
-#, fuzzy
-#| msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
-msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
-msgstr "Binäärit\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:317
-#, fuzzy
-#| msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
-msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
-msgstr "Mediatiedostot\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:319
-msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
-msgstr "CVS-avainsanat\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:321
-msgid "C++ comment\t0\t//.*\n"
-msgstr "C++-kommentti\t0\t//.*\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:323
-msgid "C comment\t0\t/\\*.*?\\*/\n"
-msgstr "C-kommentti\t0\t/\\*.*?\\*/\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:325
-msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
-msgstr "Kaikki tyhjät merkit\t0\t[ \\t\\r\\f\\v]*\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:327
-msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
-msgstr "Alun tyhjät merkit\t0\t^[ \\t\\r\\f\\v]*\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:329
-msgid "Script comment\t0\t#.*"
-msgstr "Skriptin kommentti\t0\t#.*"
-
 #: ../meld/recent.py:109
 msgid "Version control:"
 msgstr "Versionhallinta:"
@@ -1820,7 +1894,7 @@ msgstr "Versionhallinta:"
 msgid "Regular expression error"
 msgstr "Säännöllisen lausekkeen virhe"
 
-#: ../meld/ui/notebooklabel.py:65
+#: ../meld/ui/notebooklabel.py:67
 msgid "Close tab"
 msgstr "Sulje välilehti"
 
@@ -1885,92 +1959,134 @@ msgstr ""
 "Ei huomioitu:Ei versiohallinnassa:::Virhe::Lisätty:Muokattu:<b>Ristiriita</"
 "b>:Poistettu:"
 
-#: ../meld/vcview.py:206 ../meld/vcview.py:363
+#: ../meld/vcview.py:216 ../meld/vcview.py:386
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../meld/vcview.py:207
+#: ../meld/vcview.py:217
 msgid "Status"
 msgstr "Tila"
 
-#: ../meld/vcview.py:208
+#: ../meld/vcview.py:218
 msgid "Revision"
 msgstr ""
 
-#: ../meld/vcview.py:209
+#: ../meld/vcview.py:219
 msgid "Options"
 msgstr "Vaihtoehdot"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:274
+#: ../meld/vcview.py:297
 #, 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:278
+#: ../meld/vcview.py:301
 msgid "Invalid repository"
 msgstr "Virheellinen tietovarasto"
 
-#: ../meld/vcview.py:287
+#: ../meld/vcview.py:310
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:289 ../meld/vcview.py:297
+#: ../meld/vcview.py:312 ../meld/vcview.py:320
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../meld/vcview.py:308
+#: ../meld/vcview.py:331
 msgid "No valid version control system found in this folder"
 msgstr "Tästä kansiosta ei löytynyt kelvollista versionhallintajärjestelmää"
 
-#: ../meld/vcview.py:310
+#: ../meld/vcview.py:333
 msgid "Only one version control system found in this folder"
 msgstr "Tästä kansiosta löytyi vain yksi versionhallintajärjestelmä"
 
-#: ../meld/vcview.py:312
+#: ../meld/vcview.py:335
 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:363
+#: ../meld/vcview.py:386
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:377 ../meld/vcview.py:385
+#: ../meld/vcview.py:400 ../meld/vcview.py:408
 #, python-format
 msgid "Scanning %s"
 msgstr "Tutkitaan %s"
 
-#: ../meld/vcview.py:418
+#: ../meld/vcview.py:441
 msgid "(Empty)"
 msgstr "(tyhjä)"
 
-#: ../meld/vcview.py:641
+#: ../meld/vcview.py:664
 msgid "Remove folder and all its files?"
 msgstr "Poistetaanko kansio ja kaikki sen tiedostot?"
 
-#: ../meld/vcview.py:643
+#: ../meld/vcview.py:666
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
 msgstr ""
 
-#: ../meld/vcview.py:677
-#, fuzzy, python-format
+#: ../meld/vcview.py:700
+#, python-format
 #| msgid ""
 #| "Error removing %s\n"
 #| "\n"
 #| "%s."
 msgid "Error removing %s"
-msgstr ""
-"Virhe poistettaessa %s\n"
-"\n"
-"%s."
+msgstr "Virhe kohdetta %s poistaessa"
+
+#~ msgid "Loading"
+#~ msgstr "Lataaminen"
+
+#~ msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+#~ msgstr "Kokeile ladattaessa näitä merkistökoodauksiä järjestyksessä."
+
+#~ msgid "Encoding"
+#~ msgstr "Merkistö"
+
+#~ msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+#~ msgstr "Varmuuuskopiot\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+
+#, fuzzy
+#~| msgid "_Version Control Browser"
+#~ msgid "Version Control\t1\t%s\n"
+#~ msgstr "_Versinhallinnan selain"
+
+#, fuzzy
+#~| msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+#~ msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
+#~ msgstr "Binäärit\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+
+#, fuzzy
+#~| msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+#~ msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
+#~ msgstr "Mediatiedostot\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm"
+
+#~ msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+#~ msgstr "CVS-avainsanat\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+
+#~ msgid "C++ comment\t0\t//.*\n"
+#~ msgstr "C++-kommentti\t0\t//.*\n"
+
+#~ msgid "C comment\t0\t/\\*.*?\\*/\n"
+#~ msgstr "C-kommentti\t0\t/\\*.*?\\*/\n"
+
+#~ msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
+#~ msgstr "Kaikki tyhjät merkit\t0\t[ \\t\\r\\f\\v]*\n"
+
+#~ msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
+#~ msgstr "Alun tyhjät merkit\t0\t^[ \\t\\r\\f\\v]*\n"
+
+#~ msgid "Script comment\t0\t#.*"
+#~ msgstr "Skriptin kommentti\t0\t#.*"
 
 #~ msgid "D-Bus error; comparisons will open in a new window."
 #~ msgstr "D-Bus-virhe; vertailut avataan uuteen ikkunaan."
@@ -2094,9 +2210,6 @@ msgstr ""
 #~ msgid "_Save Selected"
 #~ msgstr "_Tallenna valittu"
 
-#~ msgid "_Wrap around"
-#~ msgstr "_Rivitä"
-
 #~ msgid "(gnome-default-editor)"
 #~ msgstr "(gnomen-oletusmuokkain)"
 
@@ -2228,9 +2341,6 @@ msgstr ""
 #~ msgid "Use GNOME monospace font"
 #~ msgstr "Käytä Gnomen tasalevyistä kirjasinta"
 
-#~ msgid "Use custom font"
-#~ msgstr "Käytä omaa kirjasinta"
-
 #~ msgid "Whitespace is significant"
 #~ msgstr "Välilyönnit huomioidaan"