GNOME.org
 

[meld/meld-1-8] Finnish translation update

commit cb748900ccdf2c88c8f616a59a0e0d6df86f6e17
Author: Lasse Liehu <lasse liehu gmail com>
Date:   Fri May 30 15:54:18 2014 +0300

    Finnish translation update

 po/fi.po | 2392 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 1528 insertions(+), 864 deletions(-)
---
diff --git a/po/fi.po b/po/fi.po
index 9426727..1b78e4a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,4 +1,4 @@
-# Finnish messages for meld 
+# Finnish messages for meld
 # Copyright (C) 2006-2008 Free Software Foundation Inc.
 # This file is distributed under the same license as the meld package.
 # Ilkka Tuohela <hile iki fi>, 2006-2008.
@@ -6,127 +6,731 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
-"Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2008-09-22 10:33+0300\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: 2008-09-22 10:30+0300\n"
 "Last-Translator: Ilkka Tuohela <hile iki fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../dirdiff.py:194 ../glade2/meldapp.glade.h:65 ../vcview.py:120
+#: ../bin/meld:126
+msgid "Cannot import: "
+msgstr ""
+
+#: ../bin/meld:129
+#, c-format
+msgid "Meld requires %s or higher."
+msgstr "Meld vaatii version %s tai uudemman."
+
+#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+msgid "Meld"
+msgstr "Meld"
+
+#: ../data/meld.desktop.in.h:2
+#, fuzzy
+#| msgid "Meld Diff Viewer"
+msgid "Diff Viewer"
+msgstr "Meld - erojen vertailija"
+
+#: ../data/meld.desktop.in.h:3
+msgid "Meld Diff Viewer"
+msgstr "Meld - erojen vertailija"
+
+#: ../data/meld.desktop.in.h:4
+#, fuzzy
+#| msgid "Compare and merge your files."
+msgid "Compare and merge your files"
+msgstr "Vertaa ja yhdistä tiedostojasi."
+
+#: ../data/mime/meld.xml.in.h:1
+msgid "Meld comparison description"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:1
+#, fuzzy
+#| msgid "Edit files with:"
+msgid "Editable List"
+msgstr "Muokkaa tiedostoja ohjelmalla:"
+
+#: ../data/ui/EditableList.ui.h:2
+msgid "Active"
+msgstr "Aktiivinen"
+
+#: ../data/ui/EditableList.ui.h:3
+msgid "Column Name"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:4 ../meld/vcview.py:172
+msgid "_Add"
+msgstr "_Lisää"
+
+#: ../data/ui/EditableList.ui.h:5 ../meld/vcview.py:175 ../meld/vcview.py:715
+msgid "_Remove"
+msgstr "_Poista"
+
+#: ../data/ui/EditableList.ui.h:6
+msgid "Move item up"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:7
+msgid "Move _Up"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:8
+msgid "Move item down"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:9
+#, fuzzy
+#| msgid "_Down"
+msgid "Move _Down"
+msgstr "_Alas"
+
+#. Create icon and filename CellRenderer
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:343 ../meld/vcview.py:231
+msgid "Name"
+msgstr "Nimi"
+
+#: ../data/ui/EditableList.ui.h:11
+msgid "Pattern"
+msgstr "Malli"
+
+#: ../data/ui/EditableList.ui.h:12
+msgid "Add new filter"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:13
+#, fuzzy
+#| msgid "Edit the selected file"
+msgid "Remove selected filter"
+msgstr "Muokkaa valittua tiedostoa"
+
+#: ../data/ui/filediff.ui.h:1
+msgid "Save changes to documents before closing?"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:2
+msgid "If you don't save, changes will be permanently lost."
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Close _without Saving"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:4
+msgid "_Cancel"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:5
+msgid "_Save"
+msgstr "_Tallenna"
+
+#: ../data/ui/filediff.ui.h:6
+msgid "Revert unsaved changes to documents?"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:7
+msgid "Changes made to the following documents will be permanently lost:\n"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:9
+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 ""
+
+#: ../data/ui/filediff.ui.h:10 ../meld/filediff.py:295
+msgid "Lock scrolling of all panes"
+msgstr ""
+
+#: ../data/ui/findbar.ui.h:1
+msgid "_Replace"
+msgstr ""
+
+#: ../data/ui/findbar.ui.h:2
+msgid "Replace _All"
+msgstr ""
+
+#: ../data/ui/findbar.ui.h:3
+#, fuzzy
+#| msgid "Previous Logs"
+msgid "_Previous"
+msgstr "Edelliset lokit"
+
+#: ../data/ui/findbar.ui.h:4
+msgid "_Next"
+msgstr ""
+
+#: ../data/ui/findbar.ui.h:5
+#, fuzzy
+#| msgid "Find"
+msgid "Find:"
+msgstr "Etsi"
+
+#: ../data/ui/findbar.ui.h:6
+msgid "Replace _with:"
+msgstr ""
+
+#: ../data/ui/findbar.ui.h:7
+msgid "_Match case"
+msgstr "Huomioi _kirjainkoko"
+
+#: ../data/ui/findbar.ui.h:8
+msgid "Who_le word"
+msgstr ""
+
+#: ../data/ui/findbar.ui.h:9
+msgid "Regular e_xpression"
+msgstr "Säännöllinen _lauseke"
+
+#: ../data/ui/findbar.ui.h:10
+msgid "Wrapped"
+msgstr ""
+
+#: ../data/ui/meldapp.ui.h:2
+msgid ""
+"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
+"Copyright &#xA9; 2009-2013 Kai Willadsen"
+msgstr ""
+
+#: ../data/ui/meldapp.ui.h:4
+msgid ""
+"Meld is free software: you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation, either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Meld is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details. \n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: ../data/ui/meldapp.ui.h:9
+msgid "translator-credits"
+msgstr ""
+
+#: ../data/ui/patch-dialog.ui.h:1
+#, fuzzy
+#| msgid "Create a patch"
+msgid "Format as Patch"
+msgstr "Luo paikkatiedosto"
+
+#: ../data/ui/patch-dialog.ui.h:2
+#, fuzzy
+#| msgid "No differences found."
+msgid "Use differences between:"
+msgstr "Eroja ei löytynyt."
+
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Left and middle panes"
+msgstr ""
+
+#: ../data/ui/patch-dialog.ui.h:4
+msgid "Middle and right panes"
+msgstr ""
+
+#: ../data/ui/patch-dialog.ui.h:5
+msgid "_Reverse patch direction"
+msgstr ""
+
+#: ../data/ui/patch-dialog.ui.h:6
+msgid "Copy to Clipboard"
+msgstr "Kopioi leikepöydälle"
+
+#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:124
+#, fuzzy
+#| msgid "Create Patch"
+msgid "Save Patch"
+msgstr "Luo paikkatiedosto"
+
+#: ../data/ui/preferences.ui.h:1
+msgid "Left is remote, right is local"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:2
+msgid "Left is local, right is remote"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:3
+#, fuzzy
+#| msgid "Preferences : Meld"
+msgid "Meld Preferences"
+msgstr "Asetukset: Meld"
+
+#: ../data/ui/preferences.ui.h:4
+msgid "Font"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:5
+msgid "_Use the system fixed width font"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:6
+#, fuzzy
+#| msgid "Editor"
+msgid "_Editor font:"
+msgstr "Muokkain"
+
+#: ../data/ui/preferences.ui.h:7
+msgid "Display"
+msgstr "Näytä"
+
+#: ../data/ui/preferences.ui.h:8
+#, fuzzy
+#| msgid "Tab width"
+msgid "_Tab width:"
+msgstr "Sarkaimen leveys"
+
+#: ../data/ui/preferences.ui.h:9
+msgid "_Insert spaces instead of tabs"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:10
+msgid "Enable text _wrapping"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:11
+msgid "Do not _split words over two lines"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:12
+msgid "Highlight _current line"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:13
+#, fuzzy
+#| msgid "Show line numbers"
+msgid "Show _line numbers"
+msgstr "Näytä rivinumerot"
+
+#: ../data/ui/preferences.ui.h:14
+msgid "Show w_hitespace"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:15
+#, fuzzy
+#| msgid "Use syntax highlighting"
+msgid "Use s_yntax highlighting"
+msgstr "Käytä syntaksin korostusta"
+
+#: ../data/ui/preferences.ui.h:16
+#, fuzzy
+#| msgid "Internal editor"
+msgid "External Editor"
+msgstr "Sisäinen muokkain"
+
+#: ../data/ui/preferences.ui.h:17
+#, fuzzy
+#| msgid "Gnome default editor"
+msgid "Use _default system editor"
+msgstr "Gnomen oletusmuokkain"
+
+#: ../data/ui/preferences.ui.h:18
+#, fuzzy
+#| msgid "Custom command"
+msgid "Edito_r command:"
+msgstr "Oma komento"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "Editor"
+msgstr "Muokkain"
+
+#: ../data/ui/preferences.ui.h:20
+#, fuzzy
+#| msgid "_File Comparison"
+msgid "Shallow Comparison"
+msgstr "_Tiedostojen vertailu"
+
+#: ../data/ui/preferences.ui.h:21
+msgid "C_ompare files based only on size and timestamp"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:22
+msgid "_Timestamp resolution:"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:23
+#, fuzzy
+#| msgid "Ignore symbolic links"
+msgid "Symbolic Links"
+msgstr "Älä huomioi symbolisia linkkejä"
+
+#: ../data/ui/preferences.ui.h:24
+msgid "Ignore symbolic links"
+msgstr "Älä huomioi symbolisia linkkejä"
+
+#: ../data/ui/preferences.ui.h:25
+msgid "Visible Columns"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:26
+#, fuzzy
+#| msgid "_File Comparison"
+msgid "Folder Comparisons"
+msgstr "_Tiedostojen vertailu"
+
+#: ../data/ui/preferences.ui.h:27
+#, fuzzy
+#| msgid "_File Comparison"
+msgid "Version Comparisons"
+msgstr "_Tiedostojen vertailu"
+
+#: ../data/ui/preferences.ui.h:28
+msgid "_When comparing file revisions:"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:29
+#, fuzzy
+#| msgid "Log Message"
+msgid "Commit Messages"
+msgstr "Lokiviesti"
+
+#: ../data/ui/preferences.ui.h:30
+msgid "Show _right margin at:"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:31
+msgid "Automatically _break lines at right margin on commit"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:32
+#, fuzzy
+#| msgid "Version control view"
+msgid "Version Control"
+msgstr "Versionhallintanäkymä"
+
+#: ../data/ui/preferences.ui.h:33
+msgid ""
+"When performing directory comparisons, you may filter out files and "
+"directories by name. Each pattern is a list of shell style wildcards "
+"separated by spaces."
+msgstr ""
+"Voit suodattaa pois tiedostoja ja hakemistoja nimen perusteella "
+"suoritettaessa hakemistojen vertailuja. Kukin malli on lista komentorivin "
+"tapaisia jokerimerkkejä erotettuna välilyönneillä."
+
+#: ../data/ui/preferences.ui.h:34 ../meld/meldwindow.py:122
+msgid "File Filters"
+msgstr "Tiedostosuodattimet"
+
+#: ../data/ui/preferences.ui.h:35
+msgid ""
+"When performing file comparisons, you may ignore certain types of changes. "
+"Each pattern here is a python regular expression which replaces matching "
+"text with the empty string before comparison is performed. If the expression "
+"contains groups, only the groups are replaced. See the user manual for more "
+"details."
+msgstr ""
+"Tietyn tyyppiset muutokset voidaan jättää huomiotta vertailtaessa "
+"suoritettaessa tiedostojen vertailuja. Kukin malli on pythonin säännöllinen "
+"lauseke, joka korvaa täsmäävän tekstin tyhjällä merkkijonolla ennen "
+"vertailua. Jos lauseke sisältää ryhmiä, vain ryhmät korvataan. Katso "
+"lisätietoja käyttöohjeesta."
+
+#: ../data/ui/preferences.ui.h:36
+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
+msgid "Text Filters"
+msgstr "Tekstisuodattimet"
+
+#: ../data/ui/preferences.ui.h:38
+#, fuzzy
+#| msgid "<b>Loading</b>"
+msgid "Loading"
+msgstr "<b>Lataaminen</b>"
+
+#: ../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:681
+#, fuzzy
+#| msgid "_File Comparison"
+msgid "New comparison"
+msgstr "_Tiedostojen vertailu"
+
+#: ../data/ui/tab-placeholder.ui.h:2
+#, fuzzy
+#| msgid "_File Comparison"
+msgid "File comparison"
+msgstr "_Tiedostojen vertailu"
+
+#: ../data/ui/tab-placeholder.ui.h:3
+#, fuzzy
+#| msgid "_Directory Comparison"
+msgid "Directory comparison"
+msgstr "_Kansioiden vertailu"
+
+#: ../data/ui/tab-placeholder.ui.h:4
+msgid "Version control view"
+msgstr "Versionhallintanäkymä"
+
+#: ../data/ui/tab-placeholder.ui.h:5
+#, fuzzy
+#| msgid "_File Comparison"
+msgid "_3-way comparison"
+msgstr "_Tiedostojen vertailu"
+
+#: ../data/ui/tab-placeholder.ui.h:6
+msgid "Select Third File"
+msgstr ""
+
+#: ../data/ui/tab-placeholder.ui.h:7
+msgid "Select Second File"
+msgstr ""
+
+#: ../data/ui/tab-placeholder.ui.h:8
+msgid "Select First File"
+msgstr ""
+
+#: ../data/ui/tab-placeholder.ui.h:9
+msgid "Select First Folder"
+msgstr ""
+
+#: ../data/ui/tab-placeholder.ui.h:10
+msgid "Select Second Folder"
+msgstr ""
+
+#: ../data/ui/tab-placeholder.ui.h:11
+msgid "Select Third Folder"
+msgstr ""
+
+#: ../data/ui/tab-placeholder.ui.h:12
+#, fuzzy
+#| msgid "_Version Control Browser"
+msgid "Select A Version-Controlled Folder"
+msgstr "_Versinhallinnan selain"
+
+#: ../data/ui/tab-placeholder.ui.h:13
+#, fuzzy
+#| msgid "_File Comparison"
+msgid "_Blank comparison"
+msgstr "_Tiedostojen vertailu"
+
+#: ../data/ui/tab-placeholder.ui.h:14
+#, fuzzy
+#| msgid "Compare"
+msgid "C_ompare"
+msgstr "Vertaa"
+
+#: ../data/ui/vcview.ui.h:1
+msgid "Commit"
+msgstr "Toteuta"
+
+#: ../data/ui/vcview.ui.h:2
+msgid "Commit Files"
+msgstr "Toteuta tiedostot"
+
+#: ../data/ui/vcview.ui.h:3
+msgid "Log Message"
+msgstr "Lokiviesti"
+
+#: ../data/ui/vcview.ui.h:4
+#, fuzzy
+#| msgid "Previous Logs"
+msgid "Previous logs:"
+msgstr "Edelliset lokit"
+
+#: ../data/ui/vcview.ui.h:5
+#, fuzzy
+#| msgid "Commit"
+msgid "Co_mmit"
+msgstr "Toteuta"
+
+#: ../data/ui/vcview.ui.h:6
+msgid "Push local commits to remote?"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:7
+msgid "The commits to be pushed are determined by your version control system."
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:8
+#, fuzzy
+#| msgid "_Commit"
+msgid "_Push commits"
+msgstr "_Toteuta"
+
+#: ../meld/dirdiff.py:269 ../meld/vcview.py:160
 msgid "_Compare"
 msgstr "_Vertaa"
 
-#: ../dirdiff.py:194 ../vcview.py:120
+#: ../meld/dirdiff.py:269
 msgid "Compare selected"
 msgstr "Vertaa valittuja"
 
-#. FIXME: the glade files were inconsistent: GO_BACK vs GOTO_FIRST, "Left" vs "Copy To Left"
-#: ../dirdiff.py:196
-msgid "Left"
-msgstr "Vasen"
+#: ../meld/dirdiff.py:270
+#, fuzzy
+#| msgid "Copy To Left"
+msgid "Copy _Left"
+msgstr "Kopioi vasemmalle"
 
-#: ../dirdiff.py:196 ../filediff.py:142
-msgid "Copy To Left"
+#: ../meld/dirdiff.py:270
+#, fuzzy
+#| msgid "Copy To Left"
+msgid "Copy to left"
 msgstr "Kopioi vasemmalle"
 
-#. FIXME: the glade files were inconsistent: GO_FORWARD vs GOTO_LAST, "Right" vs "Copy To Right"
-#: ../dirdiff.py:198
-msgid "Right"
-msgstr "Oikea"
+#: ../meld/dirdiff.py:271
+#, fuzzy
+#| msgid "Copy To Right"
+msgid "Copy _Right"
+msgstr "Kopioi oikealle"
 
-#: ../dirdiff.py:198 ../filediff.py:143
-msgid "Copy To Right"
+#: ../meld/dirdiff.py:271
+#, fuzzy
+#| msgid "Copy To Right"
+msgid "Copy to right"
 msgstr "Kopioi oikealle"
 
-#: ../dirdiff.py:199
+#: ../meld/dirdiff.py:272
 msgid "Delete selected"
 msgstr "Poista valittu"
 
-#: ../dirdiff.py:200
-msgid "Hide..."
+#: ../meld/dirdiff.py:273 ../meld/filediff.py:1368 ../meld/filediff.py:1403
+#, fuzzy
+#| msgid "Hide..."
+msgid "Hide"
 msgstr "Piilota..."
 
-#: ../dirdiff.py:200
+#: ../meld/dirdiff.py:273
 msgid "Hide selected"
 msgstr "Piilota valittu"
 
-#: ../dirdiff.py:202 ../filediff.py:140 ../vcview.py:121
-msgid "Open selected"
-msgstr "Avaa valittu"
-
-#: ../dirdiff.py:206
-msgid "Case"
-msgstr "Kirjainkoko"
+#: ../meld/dirdiff.py:277
+msgid "Ignore Filename Case"
+msgstr ""
 
-#: ../dirdiff.py:206
-msgid "Ignore case of entries"
-msgstr "Älä huomioi syötteiden kirjainten kokoa"
+#: ../meld/dirdiff.py:277
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr ""
 
-#: ../dirdiff.py:207
+#: ../meld/dirdiff.py:278
 msgid "Same"
 msgstr "Sama"
 
-#: ../dirdiff.py:207
+#: ../meld/dirdiff.py:278
 msgid "Show identical"
 msgstr "Näytä identtiset"
 
-#: ../dirdiff.py:208
+#: ../meld/dirdiff.py:279
 msgid "New"
 msgstr "Uusi"
 
-#: ../dirdiff.py:208
+#: ../meld/dirdiff.py:279
 msgid "Show new"
 msgstr "Näytä uudet"
 
-#: ../dirdiff.py:209
+#: ../meld/dirdiff.py:280
 msgid "Modified"
 msgstr "Muokattu"
 
-#: ../dirdiff.py:209 ../vcview.py:133
+#: ../meld/dirdiff.py:280
 msgid "Show modified"
 msgstr "Näytä muokatut"
 
-#: ../dirdiff.py:270 ../dirdiff.py:285
-#, python-format
-msgid "Error converting pattern '%s' to regular expression"
-msgstr "Virhe muunnettaessa mallia \"%s\" säännölliseksi lausekkeeksi"
+#: ../meld/dirdiff.py:282
+#, fuzzy
+#| msgid "File Filters"
+msgid "Filters"
+msgstr "Tiedostosuodattimet"
 
-#: ../dirdiff.py:293
+#: ../meld/dirdiff.py:282
+#, fuzzy
+#| msgid "File Filters"
+msgid "Set active filters"
+msgstr "Tiedostosuodattimet"
+
+#. Create file size CellRenderer
+#: ../meld/dirdiff.py:361
+msgid "Size"
+msgstr ""
+
+#. Create date-time CellRenderer
+#: ../meld/dirdiff.py:369
+msgid "Modification time"
+msgstr ""
+
+#. Create permissions CellRenderer
+#: ../meld/dirdiff.py:377
+msgid "Permissions"
+msgstr ""
+
+#: ../meld/dirdiff.py:511
 #, python-format
 msgid "Hide %s"
 msgstr "Piilota %s"
 
-#: ../dirdiff.py:378 ../dirdiff.py:388 ../vcview.py:225 ../vcview.py:253
+#: ../meld/dirdiff.py:637 ../meld/dirdiff.py:656
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Tutkitaan %s"
 
-#: ../dirdiff.py:421
+#: ../meld/dirdiff.py:756
 #, python-format
-msgid "'%s' hidden by '%s'"
-msgstr "\"%s\" piilottanut \"%s\""
+msgid "[%s] Done"
+msgstr "[%s] Valmis"
 
-#: ../dirdiff.py:427
-#, python-format
+#: ../meld/dirdiff.py:762
+msgid "Multiple errors occurred while scanning this folder"
+msgstr ""
+
+#: ../meld/dirdiff.py:763
+msgid "Files with invalid encodings found"
+msgstr ""
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:765
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr ""
+
+#: ../meld/dirdiff.py:767
+msgid "Files hidden by case insensitive comparison"
+msgstr ""
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:769
+#, fuzzy
+#| msgid ""
+#| "You are running a case insensitive comparison on a case sensitive "
+#| "filesystem. Some files are not visible:\n"
+#| "%s"
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
-"filesystem. Some files are not visible:\n"
-"%s"
+"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"
 
-#: ../dirdiff.py:501
+#: ../meld/dirdiff.py:780
 #, python-format
-msgid "[%s] Done"
-msgstr "[%s] Valmis"
+msgid "'%s' hidden by '%s'"
+msgstr "\"%s\" piilottanut \"%s\""
+
+#: ../meld/dirdiff.py:805 ../meld/filediff.py:1096 ../meld/filediff.py:1372
+#: ../meld/filediff.py:1405
+msgid "Hi_de"
+msgstr ""
 
-#: ../dirdiff.py:547
+#: ../meld/dirdiff.py:837
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -135,7 +739,7 @@ msgstr ""
 "\"%s\" on olemassa.\n"
 "Kirjoitetaanko yli?"
 
-#: ../dirdiff.py:554
+#: ../meld/dirdiff.py:844
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -146,16 +750,19 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../dirdiff.py:572 ../vcview.py:417
-#, python-format
+#: ../meld/dirdiff.py:862 ../meld/vcview.py:745
+#, fuzzy, python-format
+#| msgid ""
+#| "'%s' is a directory.\n"
+#| "Remove recusively?"
 msgid ""
 "'%s' is a directory.\n"
-"Remove recusively?"
+"Remove recursively?"
 msgstr ""
 "\"%s\" on kansio.\n"
 "Poistetaanko rekursiivisesti?"
 
-#: ../dirdiff.py:579 ../vcview.py:422
+#: ../meld/dirdiff.py:869 ../meld/vcview.py:750
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -166,173 +773,365 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../dirdiff.py:590
+#: ../meld/dirdiff.py:1000
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i sekunti"
 msgstr[1] "%i sekuntia"
 
-#: ../dirdiff.py:591
+#: ../meld/dirdiff.py:1001
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i minuutti"
 msgstr[1] "%i minuuttia"
 
-#: ../dirdiff.py:592
+#: ../meld/dirdiff.py:1002
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i tunti"
 msgstr[1] "%i tuntia"
 
-#: ../dirdiff.py:593
+#: ../meld/dirdiff.py:1003
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i päivä"
 msgstr[1] "%i päivää"
 
-#: ../dirdiff.py:594
+#: ../meld/dirdiff.py:1004
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i viikko"
 msgstr[1] "%i viikkoa"
 
-#: ../dirdiff.py:595
+#: ../meld/dirdiff.py:1005
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i kuukausi"
 msgstr[1] "%i kuukautta"
 
-#: ../dirdiff.py:596
+#: ../meld/dirdiff.py:1006
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i vuosi"
 msgstr[1] "%i vuotta"
 
-#: ../filediff.py:135 ../meldapp.py:533
-msgid "Save the current file"
-msgstr "Tallenna nykyinen tiedosto"
+#: ../meld/filediff.py:223
+#, fuzzy
+#| msgid "Create a patch"
+msgid "Format as Patch..."
+msgstr "Luo paikkatiedosto"
 
-#: ../filediff.py:136
-msgid "Save the current file with a different name"
-msgstr "Tallenna nykyinen tiedosto toisella nimellä"
+#: ../meld/filediff.py:224
+msgid "Create a patch using differences between files"
+msgstr ""
 
-#: ../filediff.py:137 ../meldapp.py:541
-msgid "Cut the selection"
-msgstr "Leikkaa valinta"
+#: ../meld/filediff.py:226
+#, fuzzy
+#| msgid "Save _As"
+msgid "Save A_ll"
+msgstr "Tallenna _nimellä"
 
-#: ../filediff.py:138 ../meldapp.py:542
-msgid "Copy the selection"
-msgstr "Kopioi valinta"
+#: ../meld/filediff.py:227
+msgid "Save all files in the current comparison"
+msgstr ""
 
-#: ../filediff.py:139 ../meldapp.py:543
-msgid "Paste the clipboard"
-msgstr "Liitä leikepöydältä"
+#: ../meld/filediff.py:230
+msgid "Revert files to their saved versions"
+msgstr ""
 
-#: ../filediff.py:141 ../glade2/filediff.glade.h:4
-msgid "Create Patch"
-msgstr "Luo paikkatiedosto"
+#: ../meld/filediff.py:232
+msgid "Add Synchronization Point"
+msgstr ""
 
-#: ../filediff.py:141
-msgid "Create a patch"
-msgstr "Luo paikkatiedosto"
+#: ../meld/filediff.py:233
+msgid "Add a manual point for synchronization of changes between files"
+msgstr ""
 
-#: ../filediff.py:142
-msgid "Copy all changes from right pane to left pane"
+#: ../meld/filediff.py:236
+msgid "Clear Synchronization Points"
+msgstr ""
+
+#: ../meld/filediff.py:237
+msgid "Clear manual change sychronization points"
+msgstr ""
+
+#: ../meld/filediff.py:239
+#, fuzzy
+#| msgid "Previous Logs"
+msgid "Previous Conflict"
+msgstr "Edelliset lokit"
+
+#: ../meld/filediff.py:240
+#, fuzzy
+#| msgid "Go to the previous difference"
+msgid "Go to the previous conflict"
+msgstr "Siirry edelliseen eroon"
+
+#: ../meld/filediff.py:242
+msgid "Next Conflict"
+msgstr ""
+
+#: ../meld/filediff.py:243
+#, fuzzy
+#| msgid "Go to the next difference"
+msgid "Go to the next conflict"
+msgstr "Siirry seuraavaan eroon"
+
+#: ../meld/filediff.py:245
+msgid "Push to Left"
+msgstr ""
+
+#: ../meld/filediff.py:246
+msgid "Push current change to the left"
+msgstr ""
+
+#: ../meld/filediff.py:249
+#, fuzzy
+#| msgid "Copy To Right"
+msgid "Push to Right"
+msgstr "Kopioi oikealle"
+
+#: ../meld/filediff.py:250
+msgid "Push current change to the right"
+msgstr ""
+
+#: ../meld/filediff.py:254
+msgid "Pull from Left"
+msgstr ""
+
+#: ../meld/filediff.py:255
+#, fuzzy
+#| msgid "Copy all changes from right pane to left pane"
+msgid "Pull change from the left"
 msgstr "Kopioi kaikki muutokset oikeasta paneelista vasempaan"
 
-#: ../filediff.py:143
-msgid "Copy all changes from left pane to right pane"
+#: ../meld/filediff.py:258
+#, fuzzy
+#| msgid "Copy All To _Right"
+msgid "Pull from Right"
+msgstr "Kopioi kaikki _Oikealle"
+
+#: ../meld/filediff.py:259
+#, 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:261
+#, fuzzy
+#| msgid "Copy To Left"
+msgid "Copy Above Left"
+msgstr "Kopioi vasemmalle"
+
+#: ../meld/filediff.py:262
+msgid "Copy change above the left chunk"
+msgstr ""
+
+#: ../meld/filediff.py:264
+#, fuzzy
+#| msgid "Copy To Left"
+msgid "Copy Below Left"
+msgstr "Kopioi vasemmalle"
+
+#: ../meld/filediff.py:265
+msgid "Copy change below the left chunk"
+msgstr ""
+
+#: ../meld/filediff.py:267
+#, fuzzy
+#| msgid "Copy To Right"
+msgid "Copy Above Right"
+msgstr "Kopioi oikealle"
+
+#: ../meld/filediff.py:268
+#, 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:270
+#, fuzzy
+#| msgid "Copy To Right"
+msgid "Copy Below Right"
+msgstr "Kopioi oikealle"
+
+#: ../meld/filediff.py:271
+#, 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:273
+#, fuzzy
+#| msgid "Delete locally"
+msgid "Delete"
+msgstr "Poista paikallinen kopio"
+
+#: ../meld/filediff.py:274
+#, fuzzy
+#| msgid "Delete locally"
+msgid "Delete change"
+msgstr "Poista paikallinen kopio"
+
+#: ../meld/filediff.py:276
+#, fuzzy
+#| msgid "Copy All To _Left"
+msgid "Merge All from Left"
+msgstr "Kopioi kaikki _vasemmalle"
+
+#: ../meld/filediff.py:277
+msgid "Merge all non-conflicting changes from the left"
+msgstr ""
+
+#: ../meld/filediff.py:279
+#, fuzzy
+#| msgid "Copy All To _Right"
+msgid "Merge All from Right"
+msgstr "Kopioi kaikki _Oikealle"
+
+#: ../meld/filediff.py:280
+msgid "Merge all non-conflicting changes from the right"
+msgstr ""
+
+#: ../meld/filediff.py:282
+msgid "Merge All"
+msgstr ""
+
+#: ../meld/filediff.py:283
+#, 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"
 
-#. Abbreviation for insert,overwrite so that it will fit in the status bar
-#: ../filediff.py:192
-msgid "INS,OVR"
+#: ../meld/filediff.py:287
+msgid "Cycle Through Documents"
+msgstr ""
+
+#: ../meld/filediff.py:288
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr ""
+
+#: ../meld/filediff.py:294
+msgid "Lock Scrolling"
+msgstr ""
+
+#. Abbreviations for insert and overwrite that fit in the status bar
+#: ../meld/filediff.py:417
+#, fuzzy
+#| msgid "INS,OVR"
+msgid "INS"
+msgstr "INS, OVR"
+
+#: ../meld/filediff.py:417
+#, fuzzy
+#| msgid "INS,OVR"
+msgid "OVR"
 msgstr "INS, OVR"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../filediff.py:194
+#: ../meld/filediff.py:419
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Rv %i, sar %i"
 
-#: ../filediff.py:252
-#, python-format
+#: ../meld/filediff.py:754
+#, fuzzy, python-format
+#| msgid ""
+#| "Regular expression '%s' changed the number of lines in the file. "
+#| "Comparison will be incorrect. See the user manual for more details."
 msgid ""
-"Regular expression '%s' changed the number of lines in the file. Comparison "
-"will be incorrect. See the user manual for more details."
+"Filter '%s' changed the number of lines in the file. Comparison will be "
+"incorrect. See the user manual for more details."
 msgstr ""
 "Säännöllinen lauseke \"%s\" muutti tiedoston rivien määrää, joten vertailu "
 "on nyt virheellinen. Katso opaskirjasta lisätietoja."
 
-#: ../filediff.py:506
-#, python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr ""
-"Säännöllisen lausekkeen virh\n"
-"\"%s\""
-
-#: ../filediff.py:518
-#, python-format
-msgid "The regular expression '%s' was not found."
-msgstr "Säännöllistä lauseketta \"%s\" ei löytynyt."
-
-#: ../filediff.py:520
-#, python-format
-msgid "The text '%s' was not found."
-msgstr "Tekstiä \"%s\" ei löytynyt."
-
-#: ../filediff.py:572
+#: ../meld/filediff.py:1084
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s} aseta paneelien lukumäärä"
 
-#: ../filediff.py:579
+#: ../meld/filediff.py:1090
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] avataan tiedostoja"
 
-#: ../filediff.py:596 ../filediff.py:610 ../filediff.py:626 ../filediff.py:633
-#, python-format
-msgid "Could not read from '%s'"
+#: ../meld/filediff.py:1114 ../meld/filediff.py:1124 ../meld/filediff.py:1137
+#: ../meld/filediff.py:1143
+#, fuzzy
+#| msgid "Could not read from '%s'"
+msgid "Could not read file"
 msgstr "Tiedostosta \"%s\" ei voitu lukea"
 
-#: ../filediff.py:597 ../filediff.py:634
-msgid "The error was:"
-msgstr "Virhe oli:"
-
-#: ../filediff.py:602
+#: ../meld/filediff.py:1115
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] luetaan tiedostoja"
 
-#: ../filediff.py:611
-msgid ""
-"It contains ascii nulls.\n"
-"Perhaps it is a binary file."
+#: ../meld/filediff.py:1125
+#, python-format
+msgid "%s appears to be a binary file."
 msgstr ""
-"Sisältää ASCII-NULL -merkkejä.\n"
-"Tiedosto saattaa olla binääritiedosto."
 
-#: ../filediff.py:627
-#, python-format
-msgid "I tried encodings %s."
+#: ../meld/filediff.py:1138
+#, fuzzy, python-format
+#| msgid "I tried encodings %s."
+msgid "%s is not in encodings: %s"
 msgstr "Yritettiin merkistöjä %s."
 
-#: ../filediff.py:656
+#: ../meld/filediff.py:1172
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] lasketaan eroja"
 
-#: ../filediff.py:762
+#: ../meld/filediff.py:1359
+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:1365
+#, fuzzy
+#| msgid "Show identical"
+msgid "Files are identical"
+msgstr "Näytä identtiset"
+
+#: ../meld/filediff.py:1375
+#, fuzzy
+#| msgid "Show ignored files"
+msgid "Show without filters"
+msgstr "Näytä versioimattomat tiedostot"
+
+#: ../meld/filediff.py:1397
+msgid "Change highlighting incomplete"
+msgstr ""
+
+#: ../meld/filediff.py:1398
+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:1407
+#, fuzzy
+#| msgid "Use syntax highlighting"
+msgid "Keep highlighting"
+msgstr "Käytä syntaksin korostusta"
+
+#: ../meld/filediff.py:1409
+#, fuzzy
+#| msgid "Use syntax highlighting"
+msgid "_Keep highlighting"
+msgstr "Käytä syntaksin korostusta"
+
+#: ../meld/filediff.py:1541
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -341,7 +1140,7 @@ msgstr ""
 "\"%s\" on olemassa\n"
 "Kirjoitetaanko yli?"
 
-#: ../filediff.py:775
+#: ../meld/filediff.py:1554
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -352,12 +1151,19 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../filediff.py:784
-#, python-format
-msgid "Choose a name for buffer %i."
-msgstr "Valitse nimi puskurille %i."
+#: ../meld/filediff.py:1565
+msgid "Save Left Pane As"
+msgstr ""
+
+#: ../meld/filediff.py:1567
+msgid "Save Middle Pane As"
+msgstr ""
 
-#: ../filediff.py:797
+#: ../meld/filediff.py:1569
+msgid "Save Right Pane As"
+msgstr ""
+
+#: ../meld/filediff.py:1590
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -368,7 +1174,7 @@ msgstr ""
 "\n"
 "Mitä muotoa haluat käyttää?"
 
-#: ../filediff.py:813
+#: ../meld/filediff.py:1606
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -377,948 +1183,806 @@ msgstr ""
 "\"%s\" sisältää merkkejä, joita ei voi esittää merkistössä \"%s\".\n"
 "Haluatko tallentaa UTF-8 -muodossa?"
 
-#. save as
-#: ../filediff.py:864
-msgid "Save patch as..."
-msgstr "Tallenna paikkatiedosto nimellä..."
-
-#: ../filediff.py:923
-#, python-format
-msgid ""
-"Reloading will discard changes in:\n"
-"%s\n"
-"\n"
-"You cannot undo this operation."
+#: ../meld/filediff.py:1974
+msgid "Live comparison updating disabled"
 msgstr ""
-"Uudelleenlataus hukkaa muutokset tiedostossa:\n"
-"%s\n"
-"\n"
-"Suoritettua toimintoa ei voi perua."
 
-#: ../glade2/filediff.glade.h:1
+#: ../meld/filediff.py:1975
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
-"Which ones would you like to save?</span>"
+"Live updating of comparisons is disabled when synchronization points are "
+"active. You can still manually refresh the comparison, and live updates will "
+"resume when synchronization points are cleared."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Joitain tiedostoja on muokattu.\n"
-"Mitkä haluat tallentaa?</span>"
-
-#: ../glade2/filediff.glade.h:3
-msgid "Copy to Clipboard"
-msgstr "Kopioi leikepöydälle"
 
-#: ../glade2/filediff.glade.h:5
-msgid "Find"
-msgstr "Etsi"
-
-#: ../glade2/filediff.glade.h:6
-msgid "Match _entire word only"
-msgstr "Täsmää vain _koko sanoihin"
-
-#: ../glade2/filediff.glade.h:7
-msgid "Regular e_xpression"
-msgstr "Säännöllinen _lauseke"
+#: ../meld/filemerge.py:51
+#, fuzzy, python-format
+#| msgid "[%s] Opening files"
+msgid "[%s] Merging files"
+msgstr "[%s] avataan tiedostoja"
 
-#: ../glade2/filediff.glade.h:8
-msgid "Save modified files?"
-msgstr "Tallennetaanko muokatut tiedostot?"
+#: ../meld/meldapp.py:95
+#, fuzzy
+#| msgid "Wrong number of arguments (Got %i)"
+msgid "wrong number of arguments supplied to --diff"
+msgstr "Virheellinen määrä argumentteja (saatiin %i)"
 
-#: ../glade2/filediff.glade.h:9
-msgid "Search for:"
-msgstr "Etsi:"
+#: ../meld/meldapp.py:99
+msgid "Start with an empty window"
+msgstr ""
 
-#: ../glade2/filediff.glade.h:10
-msgid "_Match case"
-msgstr "Huomioi _kirjainkoko"
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:102 ../meld/meldapp.py:106
+msgid "file"
+msgstr ""
 
-#: ../glade2/filediff.glade.h:11
-msgid "_Save Selected"
-msgstr "_Tallenna valittu"
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:104 ../meld/meldapp.py:106
+#, fuzzy
+#| msgid "Editor"
+msgid "dir"
+msgstr "Muokkain"
 
-#: ../glade2/filediff.glade.h:12
-msgid "_Wrap around"
-msgstr "_Rivitä"
+#: ../meld/meldapp.py:101
+#, fuzzy
+#| msgid "Start a new comparison"
+msgid "Start a version control comparison"
+msgstr "Aloita uusi vertailu"
 
-#: ../glade2/meldapp.glade.h:1
-msgid "(gnome-default-editor)"
-msgstr "(gnomen-oletusmuokkain)"
+#: ../meld/meldapp.py:103
+#, fuzzy
+#| msgid "Start a new comparison"
+msgid "Start a 2- or 3-way file comparison"
+msgstr "Aloita uusi vertailu"
 
-#: ../glade2/meldapp.glade.h:2
-msgid "<b>Drawing Style</b>"
-msgstr "<b>Piirtotyyli</b>"
+#: ../meld/meldapp.py:105
+#, fuzzy
+#| msgid "Start a new comparison"
+msgid "Start a 2- or 3-way directory comparison"
+msgstr "Aloita uusi vertailu"
 
-#: ../glade2/meldapp.glade.h:3
-msgid "<b>Edit Menu</b>"
-msgstr "<b>Muokkausvalikko</b>"
+#: ../meld/meldapp.py:107
+msgid "Start a comparison between file and dir/file"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:4
-msgid "<b>Font</b>"
-msgstr "<b>Kirjasin</b>"
+#: ../meld/meldapp.py:114
+msgid "Meld is a file and directory comparison tool."
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:5
-msgid "<b>Loading</b>"
-msgstr "<b>Lataaminen</b>"
+#: ../meld/meldapp.py:117
+msgid "Set label to use instead of file name"
+msgstr "Aseta käytettävä otsikko tiedostonimen sijasta"
 
-#: ../glade2/meldapp.glade.h:6
-msgid "<b>Misc</b>"
-msgstr "<b>Lisäasetukset</b>"
+#: ../meld/meldapp.py:119
+msgid "Open a new tab in an already running instance"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:7
-msgid "<b>Saving</b>"
-msgstr "<b>Tallentaminen</b>"
+#: ../meld/meldapp.py:122
+msgid "Automatically compare all differing files on startup"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:8
-msgid "<b>Toolbar Appearance</b>"
-msgstr "<b>Työkalupalkin ulkoasu</b>"
+#: ../meld/meldapp.py:124
+msgid "Ignored for compatibility"
+msgstr "Jätetty huomioimatta yhteensopivuuden takaamiseksi"
 
-#: ../glade2/meldapp.glade.h:9
-msgid "<b>Whitespace</b>"
-msgstr "<b>Tyhjä teksti</b>"
+#: ../meld/meldapp.py:127
+msgid "Set the target file for saving a merge result"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:10
-msgid "<span weight=\"bold\" size=\"x-large\">Compare</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Vertaa</span>"
+#: ../meld/meldapp.py:129
+msgid "Automatically merge files"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:11
-msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Näytä</span>"
+#: ../meld/meldapp.py:132
+msgid "Load a saved comparison from a Meld comparison file"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:12
-msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Muokkain</span>"
+#: ../meld/meldapp.py:135
+msgid "Create a diff tab for the supplied files or folders"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:13
-msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Merkistö</span>"
+#: ../meld/meldapp.py:138
+#, python-format
+msgid "too many arguments (wanted 0-3, got %d)"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:14
-msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Tiedostosuodattimet</span>"
+#: ../meld/meldapp.py:141
+msgid "can't auto-merge less than 3 files"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:15
-msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Tekstisuodattimet</span>"
+#: ../meld/meldapp.py:143
+#, fuzzy
+#| msgid "Flatten directories"
+msgid "can't auto-merge directories"
+msgstr "Litistä kansiot"
 
-#: ../glade2/meldapp.glade.h:16
-msgid "Automatically supply missing newline at end of file"
-msgstr "Lisää puuttuva rivinvaihto automattisesti tiedoston loppuun"
+#: ../meld/meldapp.py:149
+msgid "D-Bus error; comparisons will open in a new window."
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:17
-msgid "Choose Files"
-msgstr "Valitse tiedostot"
+#: ../meld/meldapp.py:167
+msgid "Error reading saved comparison file"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:18
-msgid ""
-"Choose how the central bar of the diff viewer is drawn. You may wish to "
-"choose a simpler mode if you find scrolling is slow."
+#. TRANSLATORS: This is the label of a new, currently-unnamed file.
+#: ../meld/meldbuffer.py:89
+msgid "<unnamed>"
 msgstr ""
-"Valitse, kuinka vertailunäkymän keskipalkki piirretään. Voi olla että haluat "
-"käyttää yksinkertaisempaa mallia, jos vieritys tuntuu hitaalta."
 
-#: ../glade2/meldapp.glade.h:19
-msgid "Copyright (C) 2002-2006 Stephen Kennedy"
-msgstr "Copyright (©) 2002-2006 Stephen Kennedy"
+#: ../meld/melddoc.py:58 ../meld/melddoc.py:59
+msgid "untitled"
+msgstr "nimeämätön"
 
-#: ../glade2/meldapp.glade.h:20
-msgid "Curved: Filled Curves"
-msgstr "Kaaret: täytettyjä kaaria"
+#: ../meld/meldwindow.py:61
+#, fuzzy
+#| msgid "My File"
+msgid "_File"
+msgstr "Oma tiedosto"
 
-#: ../glade2/meldapp.glade.h:21
-msgid "Custom command"
-msgstr "Oma komento"
+#: ../meld/meldwindow.py:62
+#, fuzzy
+#| msgid "_File Comparison"
+msgid "_New Comparison..."
+msgstr "_Tiedostojen vertailu"
 
-#: ../glade2/meldapp.glade.h:22
-msgid "Directory"
-msgstr "Kansio"
+#: ../meld/meldwindow.py:63
+msgid "Start a new comparison"
+msgstr "Aloita uusi vertailu"
 
-#: ../glade2/meldapp.glade.h:23
-msgid "Display"
-msgstr "Näytä"
+#: ../meld/meldwindow.py:66
+msgid "Save the current file"
+msgstr "Tallenna nykyinen tiedosto"
 
-#: ../glade2/meldapp.glade.h:24
-msgid "Edit files with:"
-msgstr "Muokkaa tiedostoja ohjelmalla:"
+#: ../meld/meldwindow.py:68
+#, fuzzy
+#| msgid "Save _As"
+msgid "Save As..."
+msgstr "Tallenna _nimellä"
 
-#: ../glade2/meldapp.glade.h:25
-msgid "Editor"
-msgstr "Muokkain"
+#: ../meld/meldwindow.py:69
+msgid "Save the current file with a different name"
+msgstr "Tallenna nykyinen tiedosto toisella nimellä"
 
-#: ../glade2/meldapp.glade.h:26
-msgid "Encoding"
-msgstr "Merkistö"
+#: ../meld/meldwindow.py:72
+msgid "Close the current file"
+msgstr "Sulje nykyinen tiedosto"
 
-#: ../glade2/meldapp.glade.h:27
-msgid "File Filters"
-msgstr "Tiedostosuodattimet"
+#: ../meld/meldwindow.py:75
+msgid "Quit the program"
+msgstr "Lopeta ohjelma"
 
-#: ../glade2/meldapp.glade.h:28
-msgid "Gnome Default"
-msgstr "Gnomen oletus"
+#: ../meld/meldwindow.py:78
+msgid "_Edit"
+msgstr "_Muokkaa"
 
-#: ../glade2/meldapp.glade.h:29
-msgid "Gnome default editor"
-msgstr "Gnomen oletusmuokkain"
+#: ../meld/meldwindow.py:80
+msgid "Undo the last action"
+msgstr "Peru viimeisin toiminto"
 
-#: ../glade2/meldapp.glade.h:30
-msgid "Icons Only"
-msgstr "Vain kuvakkeet"
+#: ../meld/meldwindow.py:83
+msgid "Redo the last undone action"
+msgstr "Tee viimeisin peruttu toiminto uudestaan"
 
-#: ../glade2/meldapp.glade.h:31
-msgid "Ignore changes in amount of white space"
-msgstr "Älä huomioi muutoksia välilyöntien määrään"
+#: ../meld/meldwindow.py:85
+msgid "Cut the selection"
+msgstr "Leikkaa valinta"
 
-#: ../glade2/meldapp.glade.h:32
-msgid ""
-"Ignore changes in case; consider upper and lower-case letters equivalent"
-msgstr ""
-"Älä huomioi muutoksia kirjainkoossa: pienet ja suuret kirjaimet ovat sama "
-"asia."
+#: ../meld/meldwindow.py:87
+msgid "Copy the selection"
+msgstr "Kopioi valinta"
 
-#: ../glade2/meldapp.glade.h:33
-msgid "Ignore changes that just insert or delete blank lines"
-msgstr "Älä huomioi muutoksia, jotka vain lisäävät tai poistavat tyhjiä rivejä"
+#: ../meld/meldwindow.py:89
+msgid "Paste the clipboard"
+msgstr "Liitä leikepöydältä"
 
-#: ../glade2/meldapp.glade.h:34
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "Älä huomioi muutoksia, jotka lisäävät tai poistavat tyhjiä rivejä"
+#: ../meld/meldwindow.py:91
+#, fuzzy
+#| msgid "Find"
+msgid "Find..."
+msgstr "Etsi"
 
-#: ../glade2/meldapp.glade.h:35
-msgid "Ignore symbolic links"
-msgstr "Älä huomioi symbolisia linkkejä"
+#: ../meld/meldwindow.py:91
+msgid "Search for text"
+msgstr "Etsi tekstiä"
 
-#: ../glade2/meldapp.glade.h:36
-msgid "Internal editor"
-msgstr "Sisäinen muokkain"
+#: ../meld/meldwindow.py:93
+msgid "Find Ne_xt"
+msgstr "Etsi _seuraava"
 
-#: ../glade2/meldapp.glade.h:37
-msgid "Line Wrapping "
-msgstr "Rivitys "
+#: ../meld/meldwindow.py:94
+msgid "Search forwards for the same text"
+msgstr "Etsi samaa tekstiä eteenpäin"
 
-#: ../glade2/meldapp.glade.h:38
-msgid "Meld"
-msgstr "Meld"
+#: ../meld/meldwindow.py:96
+msgid "Find _Previous"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:39
-msgid "Mine"
-msgstr "Oma"
+#: ../meld/meldwindow.py:97
+#, fuzzy
+#| msgid "Search forwards for the same text"
+msgid "Search backwards for the same text"
+msgstr "Etsi samaa tekstiä eteenpäin"
 
-#: ../glade2/meldapp.glade.h:40
-msgid "Original"
-msgstr "Alkuperäinen"
+#: ../meld/meldwindow.py:100
+msgid "_Replace..."
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:41
-msgid "Other"
-msgstr "Muu"
+#: ../meld/meldwindow.py:101
+msgid "Find and replace text"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:42
-msgid "Preferences : Meld"
+#: ../meld/meldwindow.py:103
+#, fuzzy
+#| msgid "Preferences : Meld"
+msgid "Prefere_nces"
 msgstr "Asetukset: Meld"
 
-#: ../glade2/meldapp.glade.h:43
-msgid "Save in UTF-8 encoding"
-msgstr "Tallenna UTF-8 -koodauksella"
+#: ../meld/meldwindow.py:104
+msgid "Configure the application"
+msgstr "Muuta ohjelman asetuksia"
 
-#: ../glade2/meldapp.glade.h:44
-msgid "Save in the files original encoding"
-msgstr "Tallenna käyttäen tiedoston alkuperäistä merkistökoodausta"
+#: ../meld/meldwindow.py:107
+msgid "_Changes"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:45
-msgid "Show line numbers"
-msgstr "Näytä rivinumerot"
+#: ../meld/meldwindow.py:108
+msgid "Next Change"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:46
-msgid "Simple: Lines only"
-msgstr "Yksinkertainen - vain rivit"
+#: ../meld/meldwindow.py:109
+#, fuzzy
+#| msgid "Go to the next difference"
+msgid "Go to the next change"
+msgstr "Siirry seuraavaan eroon"
 
-#: ../glade2/meldapp.glade.h:47
-msgid "Solid: Filled Quadilaterals"
-msgstr "Kiinteä - täytetyt nelikulmiot"
+#: ../meld/meldwindow.py:111
+#, fuzzy
+#| msgid "Previous Logs"
+msgid "Previous Change"
+msgstr "Edelliset lokit"
 
-#: ../glade2/meldapp.glade.h:48
-msgid "Tab width"
-msgstr "Sarkaimen leveys"
+#: ../meld/meldwindow.py:112
+#, fuzzy
+#| msgid "Go to the previous difference"
+msgid "Go to the previous change"
+msgstr "Siirry edelliseen eroon"
 
-#: ../glade2/meldapp.glade.h:49
-msgid "Text Beside Icons"
-msgstr "Teksti kuvakkeiden vierellä"
+#: ../meld/meldwindow.py:114
+msgid "Open Externally"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:50
-msgid "Text Filters"
-msgstr "Tekstisuodattimet"
+#: ../meld/meldwindow.py:115
+msgid "Open selected file or directory in the default external application"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:51
-msgid "Text Only"
-msgstr "Vain teksti"
+#: ../meld/meldwindow.py:119
+msgid "_View"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:52
-msgid "Text Under Icons"
-msgstr "Teksti kuvakkeiden alla"
+#: ../meld/meldwindow.py:120
+#, fuzzy
+#| msgid "Status"
+msgid "File Status"
+msgstr "Tila"
 
-#: ../glade2/meldapp.glade.h:53
-msgid "Three way directory"
-msgstr "Kolmiosainen kansio"
+#: ../meld/meldwindow.py:121
+#, fuzzy
+#| msgid "Status"
+msgid "Version Status"
+msgstr "Tila"
 
-#: ../glade2/meldapp.glade.h:54
-msgid "Three way file"
-msgstr "Kolmiosainen tiedosto"
+#: ../meld/meldwindow.py:124
+msgid "Stop the current action"
+msgstr "Pysäytä nykyinen toiminto"
 
-#: ../glade2/meldapp.glade.h:55
-msgid "Two way directory"
-msgstr "Kaksiosainen kansio"
+#: ../meld/meldwindow.py:127
+msgid "Refresh the view"
+msgstr "Päivitä näkymä"
 
-#: ../glade2/meldapp.glade.h:56
-msgid "Two way file"
-msgstr "Kaksiosainen tiedosto"
+#: ../meld/meldwindow.py:130
+msgid "_Tabs"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:57
-msgid "Use GNOME monospace font"
-msgstr "Käytä Gnomen tasalevyistä kirjasinta"
+#: ../meld/meldwindow.py:131
+#, fuzzy
+#| msgid "Previous Logs"
+msgid "_Previous Tab"
+msgstr "Edelliset lokit"
 
-#: ../glade2/meldapp.glade.h:58
-msgid "Use custom font"
-msgstr "Käytä omaa kirjasinta"
+#: ../meld/meldwindow.py:132
+msgid "Activate previous tab"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:59
-msgid "Use syntax highlighting"
-msgstr "Käytä syntaksin korostusta"
+#: ../meld/meldwindow.py:134
+msgid "_Next Tab"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:60
-msgid "Version control view"
-msgstr "Versionhallintanäkymä"
+#: ../meld/meldwindow.py:135
+msgid "Activate next tab"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:61
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr "Kokeile ladattaessa näitä merkistökoodauksiä järjestyksessä."
+#: ../meld/meldwindow.py:138
+#, fuzzy
+#| msgid "Copy To Left"
+msgid "Move Tab _Left"
+msgstr "Kopioi vasemmalle"
 
-#: ../glade2/meldapp.glade.h:62
-msgid ""
-"When performing directory comparisons, you may filter out files and "
-"directories by name. Each pattern is a list of shell style wildcards "
-"separated by spaces."
+#: ../meld/meldwindow.py:139
+msgid "Move current tab to left"
 msgstr ""
-"Voit suodattaa pois tiedostoja ja hakemistoja nimen perusteella "
-"suoritettaessa hakemistojen vertailuja. Kukin malli on lista komentorivin "
-"tapaisia jokerimerkkejä erotettuna välilyönneillä."
 
-#: ../glade2/meldapp.glade.h:63
-msgid ""
-"When performing file comparisons, you may ignore certain types of changes. "
-"Each pattern here is a python regular expression which replaces matching "
-"text with the empty string before comparison is performed. If the expression "
-"contains groups, only the groups are replaced. See the user manual for more "
-"details."
-msgstr ""
-"Tietyn tyyppiset muutokset voidaan jättää huomiotta vertailtaessa "
-"suoritettaessa tiedostojen vertailuja. Kukin malli on pythonin säännöllinen "
-"lauseke, joka korvaa täsmäävän tekstin tyhjällä merkkijonolla ennen "
-"vertailua. Jos lauseke sisältää ryhmiä, vain ryhmät korvataan. Katso "
-"lisätietoja käyttöohjeesta."
+#: ../meld/meldwindow.py:142
+#, fuzzy
+#| msgid "Copy To Right"
+msgid "Move Tab _Right"
+msgstr "Kopioi oikealle"
 
-#: ../glade2/meldapp.glade.h:64
-msgid "Whitespace is significant"
-msgstr "Välilyönnit huomioidaan"
+#: ../meld/meldwindow.py:143
+msgid "Move current tab to right"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:66
-msgid "_Directory Comparison"
-msgstr "_Kansioiden vertailu"
+#: ../meld/meldwindow.py:146
+msgid "_Help"
+msgstr ""
 
-#: ../glade2/meldapp.glade.h:67
-msgid "_File Comparison"
-msgstr "_Tiedostojen vertailu"
+#: ../meld/meldwindow.py:147
+msgid "_Contents"
+msgstr "_Sisältö"
 
-#: ../glade2/meldapp.glade.h:68
-msgid "_Logo"
-msgstr "_Logo"
+#: ../meld/meldwindow.py:148
+msgid "Open the Meld manual"
+msgstr "Avaa meldin ohje"
 
-#: ../glade2/meldapp.glade.h:69
-msgid "_Three Way Compare"
-msgstr "_Kolmiosainen vertailu"
+#: ../meld/meldwindow.py:149
+msgid "Report _Bug"
+msgstr "Raportoi _virhe"
 
-#: ../glade2/meldapp.glade.h:70
-msgid "_Version Control Browser"
-msgstr "_Versinhallinnan selain"
+#: ../meld/meldwindow.py:150
+msgid "Report a bug in Meld"
+msgstr "Raportoi vika meldissä"
 
-#: ../glade2/vcview.glade.h:1
-msgid "Commit Files"
-msgstr "Toteuta tiedostot"
+#: ../meld/meldwindow.py:153
+msgid "About this program"
+msgstr "Tietoja ohjelmasta"
 
-#: ../glade2/vcview.glade.h:2
-msgid "Compare Options"
-msgstr "Vertailun asetukset"
+#: ../meld/meldwindow.py:157
+msgid "Fullscreen"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:3
-msgid "Date"
-msgstr "Päiväys"
+#: ../meld/meldwindow.py:158
+msgid "View the comparison in fullscreen"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:4
-msgid "Local copy against other remote revision"
-msgstr "Paikallinen kopio toista etäversiota vastaan"
+#: ../meld/meldwindow.py:160
+msgid "_Toolbar"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:5
-msgid "Local copy against same remote revision"
-msgstr "Paikallinen kopio samaa etäversiota vastaan"
+#: ../meld/meldwindow.py:161
+msgid "Show or hide the toolbar"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:6
-msgid "Log Message"
-msgstr "Lokiviesti"
+#: ../meld/meldwindow.py:163
+#, fuzzy
+#| msgid "Status"
+msgid "_Statusbar"
+msgstr "Tila"
 
-#: ../glade2/vcview.glade.h:7
-msgid "Previous Logs"
-msgstr "Edelliset lokit"
+#: ../meld/meldwindow.py:164
+msgid "Show or hide the statusbar"
+msgstr ""
 
-#: ../glade2/vcview.glade.h:8 ../vcview.py:185
-msgid "Tag"
-msgstr "Merkintä"
+#: ../meld/meldwindow.py:173
+#, fuzzy
+#| msgid "Open selected"
+msgid "Open Recent"
+msgstr "Avaa valittu"
 
-#: ../glade2/vcview.glade.h:9
-msgid "VC Log"
-msgstr "Versionhallinnan loki"
+#: ../meld/meldwindow.py:174
+#, fuzzy
+#| msgid "Save the current file"
+msgid "Open recent files"
+msgstr "Tallenna nykyinen tiedosto"
 
-#: ../meld:47
-#, c-format
-msgid "Meld requires %s or higher."
-msgstr "Meld vaatii version %s tai uudemman."
+#: ../meld/meldwindow.py:601
+msgid "Switch to this tab"
+msgstr ""
 
-#: ../meld.desktop.in.h:1
-msgid "Compare and merge your files."
-msgstr "Vertaa ja yhdistä tiedostojasi."
+#. exit at first non found directory + file
+#: ../meld/meldwindow.py:734
+msgid "Cannot compare a mixture of files and directories.\n"
+msgstr "Hakemistoja ja tiedostoja ei voi verrata samanaikaisesti.\n"
 
-#: ../meld.desktop.in.h:2
-msgid "Meld Diff Viewer"
-msgstr "Meld - erojen vertailija"
+#. no common path. empty names get changed to "[None]"
+#: ../meld/misc.py:172
+msgid "[None]"
+msgstr "[Ei mitään]"
 
-#: ../meldapp.py:150
+#: ../meld/preferences.py:49
 msgid "label"
 msgstr "otsikko"
 
-#: ../meldapp.py:151
+#: ../meld/preferences.py:49
 msgid "pattern"
 msgstr "malli"
 
-#. file filters
-#. text filters
-#: ../meldapp.py:252 ../meldapp.py:257 ../vcview.py:165
-msgid "Name"
-msgstr "Nimi"
-
-#: ../meldapp.py:252 ../meldapp.py:257
-msgid "Active"
-msgstr "Aktiivinen"
-
-#: ../meldapp.py:252
-msgid "Pattern"
-msgstr "Malli"
-
-#: ../meldapp.py:257
-msgid "Regex"
-msgstr "Regexp"
-
-#: ../meldapp.py:291
-msgid ""
-"Line numbers are only available if you have gnome-python-desktop installed."
+#: ../meld/preferences.py:168 ../meld/preferences.py:240
+#, fuzzy
+#| msgid ""
+#| "Line numbers are only available if you have gnome-python-desktop "
+#| "installed."
+msgid "Only available if you have PyGtkSourceView 2 installed"
 msgstr ""
 "Rivinumerot ovat käytettävissä vain jos gnome-python-desktop on asennettu."
 
-#: ../meldapp.py:295
-msgid ""
-"Syntax highlighting is only available if you have gnome-python-desktop "
-"installed."
-msgstr ""
-"Syntaksin korostus on käytettävissä vain  jos gnome-python-desktop on "
-"asennettu."
-
-#: ../meldapp.py:383
-msgid "Close tab"
-msgstr "Sulje välilehti"
-
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:444
+#: ../meld/preferences.py:356
 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
-#: ../meldapp.py:446
+#: ../meld/preferences.py:358
 msgid ""
-"Version Control\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
+"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+"Desktop.ini\n"
 msgstr ""
-"Versionhallinta\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:448
-msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+#: ../meld/preferences.py:360
+#, 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:362
+#, 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
-#: ../meldapp.py:450
-msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+#: ../meld/preferences.py:364
+#, 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
-#: ../meldapp.py:452
+#: ../meld/preferences.py:366
 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
-#: ../meldapp.py:454
+#: ../meld/preferences.py:368
 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
-#: ../meldapp.py:456
+#: ../meld/preferences.py:370
 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
-#: ../meldapp.py:458
+#: ../meld/preferences.py:372
 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
-#: ../meldapp.py:460
+#: ../meld/preferences.py:374
 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
-#: ../meldapp.py:462
+#: ../meld/preferences.py:376
 msgid "Script comment\t0\t#.*"
 msgstr "Skriptin kommentti\t0\t#.*"
 
-#: ../meldapp.py:532
-msgid "_New..."
-msgstr "_Uusi..."
-
-#: ../meldapp.py:532
-msgid "Start a new comparison"
-msgstr "Aloita uusi vertailu"
-
-#: ../meldapp.py:535
-msgid "Close the current file"
-msgstr "Sulje nykyinen tiedosto"
-
-#: ../meldapp.py:536
-msgid "Quit the program"
-msgstr "Lopeta ohjelma"
-
-#: ../meldapp.py:539
-msgid "Undo the last action"
-msgstr "Peru viimeisin toiminto"
-
-#: ../meldapp.py:540
-msgid "Redo the last undone action"
-msgstr "Tee viimeisin peruttu toiminto uudestaan"
-
-#: ../meldapp.py:544
-msgid "Search for text"
-msgstr "Etsi tekstiä"
-
-#: ../meldapp.py:545
-msgid "Find Ne_xt"
-msgstr "Etsi _seuraava"
-
-#: ../meldapp.py:545
-msgid "Search forwards for the same text"
-msgstr "Etsi samaa tekstiä eteenpäin"
-
-#: ../meldapp.py:546
-msgid "Go to the next difference"
-msgstr "Siirry seuraavaan eroon"
-
-#: ../meldapp.py:547
-msgid "Go to the previous difference"
-msgstr "Siirry edelliseen eroon"
-
-#: ../meldapp.py:548
-msgid "Configure the application"
-msgstr "Muuta ohjelman asetuksia"
-
-#: ../meldapp.py:551
-msgid "Stop the current action"
-msgstr "Pysäytä nykyinen toiminto"
-
-#: ../meldapp.py:552
-msgid "Refresh the view"
-msgstr "Päivitä näkymä"
-
-#: ../meldapp.py:553
-msgid "Reload"
-msgstr "Lataa uudestaan"
-
-#: ../meldapp.py:553
-msgid "Reload the comparison"
-msgstr "Lataa vertailu uudestaan"
-
-#: ../meldapp.py:556
-msgid "_Contents"
-msgstr "_Sisältö"
-
-#: ../meldapp.py:556
-msgid "Open the Meld manual"
-msgstr "Avaa meldin ohje"
-
-#: ../meldapp.py:557
-msgid "Report _Bug"
-msgstr "Raportoi _virhe"
-
-#: ../meldapp.py:557
-msgid "Report a bug in Meld"
-msgstr "Raportoi vika meldissä"
-
-#: ../meldapp.py:558
-msgid "Mailing _List"
-msgstr "Sähköposti_lista"
-
-#: ../meldapp.py:558
-msgid "Go to the Meld mailing list"
-msgstr "Siirry meldin sähköpostilistalle"
+#: ../meld/recent.py:107
+#, fuzzy
+#| msgid "Version control view"
+msgid "Version control:"
+msgstr "Versionhallintanäkymä"
 
-#: ../meldapp.py:559
-msgid "About this program"
-msgstr "Tietoja ohjelmasta"
+#: ../meld/vcview.py:161
+#, fuzzy
+#| msgid "Compare selected"
+msgid "Compare selected files"
+msgstr "Vertaa valittuja"
 
-#: ../meldapp.py:821
-msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "Hakemistoja ja tiedostoja ei voi verrata samanaikaisesti.\n"
+#: ../meld/vcview.py:163
+#, fuzzy
+#| msgid "Commit"
+msgid "Co_mmit..."
+msgstr "Toteuta"
 
-#. ###############################################################################
-#.
-#. usage
-#.
-#. ###############################################################################
-#: ../meldapp.py:869
-#, python-format
-msgid ""
-"Meld %s\n"
-"Written by Stephen Kennedy <stevek gnome org>"
+#: ../meld/vcview.py:164
+msgid "Commit changes to version control"
 msgstr ""
-"Meld %s\n"
-"Ohjelmoinut Stephen Kennedy <stevek gnome org>"
-
-#: ../meldapp.py:898
-msgid "Set label to use instead of file name"
-msgstr "Aseta käytettävä otsikko tiedostonimen sijasta"
-
-#: ../meldapp.py:899 ../meldapp.py:900 ../meldapp.py:901 ../meldapp.py:902
-msgid "Ignored for compatibility"
-msgstr "Jätetty huomioimatta yhteensopivuuden takaamiseksi"
-
-#: ../meldapp.py:930
-#, python-format
-msgid "Wrong number of arguments (Got %i)"
-msgstr "Virheellinen määrä argumentteja (saatiin %i)"
-
-#: ../melddoc.py:46
-msgid "untitled"
-msgstr "nimeämätön"
 
-#. no common path. empty names get changed to "[None]"
-#: ../misc.py:121
-msgid "[None]"
-msgstr "[Ei mitään]"
-
-#: ../vcview.py:122
-msgid "_Commit"
-msgstr "_Toteuta"
-
-#: ../vcview.py:122
-msgid "Commit"
-msgstr "Toteuta"
-
-#. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../vcview.py:123
+#: ../meld/vcview.py:166
 msgid "_Update"
 msgstr "_Päivitä"
 
-#: ../vcview.py:123
-msgid "Update"
-msgstr "Päivitä"
+#: ../meld/vcview.py:167
+msgid "Update working copy from version control"
+msgstr ""
 
-#. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../vcview.py:124
-msgid "_Add"
-msgstr "_Lisää"
+#: ../meld/vcview.py:169
+msgid "_Push"
+msgstr ""
 
-#: ../vcview.py:124
-msgid "Add to VC"
-msgstr "Lisää versionhallintaan"
+#: ../meld/vcview.py:170
+msgid "Push local changes to remote"
+msgstr ""
 
-#. FIXME: popup used to use gtk.STOCK_ADD
-#: ../vcview.py:125
-msgid "Add _Binary"
-msgstr "Lisää _binääri"
+#: ../meld/vcview.py:173
+#, fuzzy
+#| msgid "Version control view"
+msgid "Add to version control"
+msgstr "Versionhallintanäkymä"
 
-#: ../vcview.py:125
-msgid "Add binary to VC"
-msgstr "Lisää binääritiedosto versiohallintaan"
+#: ../meld/vcview.py:176
+msgid "Remove from version control"
+msgstr ""
 
-#. FIXME: stock is inconsistent with other VC actions
-#: ../vcview.py:126
-msgid "_Remove"
-msgstr "_Poista"
+#: ../meld/vcview.py:178
+msgid "Mar_k as Resolved"
+msgstr ""
 
-#: ../vcview.py:126
-msgid "Remove from VC"
-msgstr "Poista versiohallinnasta"
+#: ../meld/vcview.py:179
+msgid "Mark as resolved in version control"
+msgstr ""
+
+#: ../meld/vcview.py:181
+msgid "Re_vert"
+msgstr ""
 
-#. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../vcview.py:127
-msgid "Revert to original"
+#: ../meld/vcview.py:182
+#, fuzzy
+#| msgid "Revert to original"
+msgid "Revert working copy to original state"
 msgstr "Palaa alkuperäiseen"
 
-#: ../vcview.py:128
-msgid "Delete locally"
-msgstr "Poista paikallinen kopio"
+#: ../meld/vcview.py:185
+msgid "Delete from working copy"
+msgstr ""
 
-#: ../vcview.py:132
+#: ../meld/vcview.py:190
 msgid "_Flatten"
 msgstr "_Litistä"
 
-#: ../vcview.py:132
+#: ../meld/vcview.py:191
 msgid "Flatten directories"
 msgstr "Litistä kansiot"
 
-#: ../vcview.py:133
+#: ../meld/vcview.py:193
 msgid "_Modified"
 msgstr "_Muokattu"
 
-#: ../vcview.py:134
+#: ../meld/vcview.py:194
+#, fuzzy
+#| msgid "Save modified files?"
+msgid "Show modified files"
+msgstr "Tallennetaanko muokatut tiedostot?"
+
+#: ../meld/vcview.py:196
 msgid "_Normal"
 msgstr "_Normaali"
 
-#: ../vcview.py:134
-msgid "Show normal"
-msgstr "Näytä tavallinen"
+#: ../meld/vcview.py:197
+#, fuzzy
+#| msgid "Show ignored files"
+msgid "Show normal files"
+msgstr "Näytä versioimattomat tiedostot"
 
-#: ../vcview.py:135
-msgid "Non _VC"
-msgstr "Ei _versiohallinnassa"
+#: ../meld/vcview.py:199
+msgid "Un_versioned"
+msgstr ""
 
-#: ../vcview.py:135
+#: ../meld/vcview.py:200
 msgid "Show unversioned files"
 msgstr "Näytä versioimattomat tiedostot"
 
-#: ../vcview.py:136
+#: ../meld/vcview.py:202
 msgid "Ignored"
 msgstr "Huomiotta jätetyt"
 
-#: ../vcview.py:136
+#: ../meld/vcview.py:203
 msgid "Show ignored files"
 msgstr "Näytä versioimattomat tiedostot"
 
-#: ../vcview.py:182
+#: ../meld/vcview.py:262 ../meld/vcview.py:432
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../vcview.py:183
+#: ../meld/vcview.py:263
 msgid "Status"
 msgstr "Tila"
 
-#: ../vcview.py:184
-msgid "Rev"
-msgstr "Versio"
+#: ../meld/vcview.py:264
+msgid "Revision"
+msgstr ""
 
-#: ../vcview.py:186
+#: ../meld/vcview.py:265
 msgid "Options"
 msgstr "Vaihtoehdot"
 
-#: ../vcview.py:269
-msgid "(Empty)"
-msgstr "[tyhjä]"
-
-#: ../vcview.py:306
+#. TRANSLATORS: this is an error message when a version control
+#. application isn't installed or can't be found
+#: ../meld/vcview.py:342
 #, python-format
-msgid "[%s] Fetching differences"
-msgstr "[%s] Noudetaan eroja"
+msgid "%s not installed"
+msgstr ""
+
+#. TRANSLATORS: this is an error message when a version
+#. controlled repository is invalid or corrupted
+#: ../meld/vcview.py:346
+#, fuzzy
+#| msgid "Internal editor"
+msgid "Invalid repository"
+msgstr "Sisäinen muokkain"
 
-#: ../vcview.py:313
+#: ../meld/vcview.py:355
 #, python-format
-msgid "[%s] Applying patch"
-msgstr "[%s] Toteutetaan paikka"
+msgid "%s (%s)"
+msgstr ""
 
-#: ../vcview.py:317
-msgid "No differences found."
-msgstr "Eroja ei löytynyt."
+#: ../meld/vcview.py:357 ../meld/vcview.py:365
+#, fuzzy
+#| msgid "_None"
+msgid "None"
+msgstr "_Ei mitään"
 
-#: ../vcview.py:394
-msgid "Select some files first."
-msgstr "Valitse ensin joitain tiedostoja."
+#: ../meld/vcview.py:376
+msgid "No valid version control system found in this folder"
+msgstr ""
 
-#: ../vcview.py:461
-msgid "Invoking patch failed, you need GNU patch."
-msgstr "Komentoa patch ei voitu käynnistää, tarvitset GNU patchin."
+#: ../meld/vcview.py:378
+msgid "Only one version control system found in this folder"
+msgstr ""
 
-#. These are the possible states of files. Be sure to get the colons correct.
-#: ../vc/_vc.py:40
-msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
-"Missing"
+#: ../meld/vcview.py:380
+msgid "Choose which version control system to use"
 msgstr ""
-"Ei huomioitu:Ei versiohallinnassa:::Virhe::Lisätty:Muokattu:<b>Ristiriita</"
-"b>:Poistettu:"
 
-#: ../vc/cvs.py:155
+#. TRANSLATORS: This is the location of the directory the user is diffing
+#: ../meld/vcview.py:432
 #, python-format
-msgid ""
-"Error converting to a regular expression\n"
-"The pattern was '%s'\n"
-"The error was '%s'"
+msgid "%s: %s"
 msgstr ""
-"Virhe muunnettaessa säännöllistä lauseketta\n"
-"Malli oli \"%s\"\n"
-"Virhe oli \"%s\""
-
-#~ msgid "Edit"
-#~ msgstr "Muokkaa"
-
-#~ msgid "Edit selected"
-#~ msgstr "Muokkaa valittua"
-
-#~ msgid "Edit the selected file"
-#~ msgstr "Muokkaa valittua tiedostoa"
-
-#~ msgid "_Edit"
-#~ msgstr "_Muokkaa"
-
-#~ msgid "Edit files"
-#~ msgstr "Muokkaa tiedostoja"
-
-#~ msgid "Compare"
-#~ msgstr "Vertaa"
-
-#~ msgid "Copy All To _Left"
-#~ msgstr "Kopioi kaikki _vasemmalle"
-
-#~ msgid "Copy All To _Right"
-#~ msgstr "Kopioi kaikki _Oikealle"
-
-#~ msgid "<b>Global options</b>"
-#~ msgstr "<b>Yleiset asetukset</b>"
-
-#~ msgid "<b>Update Options</b>"
-#~ msgstr "<b>Päivitysten valinnat</b>"
-
-#~ msgid "<span weight=\"bold\" size=\"x-large\">CVS</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">CVS</span>"
-
-#~ msgid "CVS"
-#~ msgstr "CVS"
 
-#~ msgid "CVS Directory"
-#~ msgstr "CVS-kansio"
-
-#~ msgid "CVS binary"
-#~ msgstr "CVS-binääri"
-
-#~ msgid "Create missing directories (-d)"
-#~ msgstr "Luo puuttuvat kansiot(-d)"
-
-#~ msgid "Ignore .cvsrc (-f)"
-#~ msgstr "Älä huomioi .cvsrc-tiedostoa (-f)"
-
-#~ msgid "Locate CVS binary : Meld"
-#~ msgstr "Etsi CVS-binääri: Meld"
-
-#~ msgid "My Directory"
-#~ msgstr "Oma kansio"
-
-#~ msgid "My File"
-#~ msgstr "Oma tiedosto"
+#: ../meld/vcview.py:446 ../meld/vcview.py:454
+#, fuzzy, python-format
+#| msgid "[%s] Scanning %s"
+msgid "Scanning %s"
+msgstr "[%s] Tutkitaan %s"
 
-#~ msgid "Original Directory"
-#~ msgstr "Alkuperäinen kansio"
+#: ../meld/vcview.py:487
+msgid "(Empty)"
+msgstr "[tyhjä]"
 
-#~ msgid "Original File"
-#~ msgstr "Alkuperäinen tiedosto"
+#: ../meld/vcview.py:709
+msgid "Remove folder and all its files?"
+msgstr ""
 
-#~ msgid "Other Directory"
-#~ msgstr "Muu kansio"
+#: ../meld/vcview.py:711
+msgid ""
+"This will remove all selected files and folders, and all files within any "
+"selected folders, from version control."
+msgstr ""
 
-#~ msgid "Other File"
-#~ msgstr "Muu tiedosto"
+#: ../meld/ui/findbar.py:150
+#, python-format
+msgid ""
+"Regular expression error\n"
+"'%s'"
+msgstr ""
+"Säännöllisen lausekkeen virh\n"
+"\"%s\""
 
-#~ msgid "Prune empty directories (-P)"
-#~ msgstr "Poista tyhjät hakemistot (-P)"
+#: ../meld/ui/historyentry.py:381
+msgid "_Browse..."
+msgstr ""
 
-#~ msgid "Quiet mode (-q)"
-#~ msgstr "Hiljainen tila (-q)"
+#: ../meld/ui/historyentry.py:389
+msgid "Path"
+msgstr ""
 
-#~ msgid "Save _As"
-#~ msgstr "Tallenna _nimellä"
+#: ../meld/ui/historyentry.py:390
+#, fuzzy
+#| msgid "Save the current file"
+msgid "Path to file"
+msgstr "Tallenna nykyinen tiedosto"
 
-#~ msgid "Use Compression (-z)"
-#~ msgstr "Käytä pakkausta (-z)"
+#: ../meld/ui/historyentry.py:391
+msgid "Pop up a file selector to choose a file"
+msgstr ""
 
-#~ msgid "_Character"
-#~ msgstr "_Merkki"
+#: ../meld/ui/historyentry.py:529
+#, fuzzy
+#| msgid "CVS Directory"
+msgid "Select directory"
+msgstr "CVS-kansio"
 
-#~ msgid "_Down"
-#~ msgstr "_Alas"
+#: ../meld/ui/historyentry.py:533
+#, fuzzy
+#| msgid "Select some files first."
+msgid "Select file"
+msgstr "Valitse ensin joitain tiedostoja."
 
-#~ msgid "_None"
-#~ msgstr "_Ei mitään"
+#: ../meld/ui/notebooklabel.py:63
+msgid "Close tab"
+msgstr "Sulje välilehti"
 
-#~ msgid "_Save"
-#~ msgstr "_Tallenna"
+#: ../meld/ui/vcdialogs.py:57
+msgid "No files will be committed"
+msgstr ""
 
-#~ msgid "_Up"
-#~ msgstr "_Ylös"
+#: ../meld/vc/_vc.py:47
+msgid "Merged"
+msgstr ""
 
-#~ msgid "_Word"
-#~ msgstr "_Sana"
+#: ../meld/vc/_vc.py:47
+msgid "Base"
+msgstr ""
 
-#~ msgid "Remove _Locally"
-#~ msgstr "Poista _paikallinen"
+#: ../meld/vc/_vc.py:47
+#, fuzzy
+#| msgid "Location"
+msgid "Local"
+msgstr "Sijainti"
 
-#~ msgid ""
-#~ "Due to incompatible API changes some functions may not operate as "
-#~ "expected."
-#~ msgstr ""
-#~ "Epäyhteensopivista API-muutoksista johtuen jotkut funktiot eivät toimi "
-#~ "kuten voisi olettaa."
+#: ../meld/vc/_vc.py:47
+#, fuzzy
+#| msgid "_Remove"
+msgid "Remote"
+msgstr "_Poista"
 
-#~ msgid "Edit menu popup invokes"
-#~ msgstr "Ponnahdusikkunasta tuleva muokkausvalikko"
+#. These are the possible states of files. Be sure to get the colons correct.
+#: ../meld/vc/_vc.py:62
+#, fuzzy
+#| msgid ""
+#| "Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</"
+#| "b>:Removed:Missing"
+msgid ""
+"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:No"
+"t present"
+msgstr ""
+"Ei huomioitu:Ei versiohallinnassa:::Virhe::Lisätty:Muokattu:<b>Ristiriita</"
+"b>:Poistettu:"
 
-#~ msgid "New..."
-#~ msgstr "Uusi..."
+#: ../meld/vc/cvs.py:231
+#, python-format
+msgid ""
+"Error converting to a regular expression\n"
+"The pattern was '%s'\n"
+"The error was '%s'"
+msgstr ""
+"Virhe muunnettaessa säännöllistä lauseketta\n"
+"Malli oli \"%s\"\n"
+"Virhe oli \"%s\""
 
-#~ msgid "CVS\t1\tCVS\n"
-#~ msgstr "CVS\t1\tCVS\n"
+#. Translators: First %s is replaced by translated "%d unpushed
+#. commits", second %s is replaced by translated "%d branches"
+#: ../meld/vc/git.py:120
+#, python-format
+msgid "%s in %s"
+msgstr ""
 
-#~ msgid "SVN\t1\t.svn\n"
-#~ msgstr "SVN\t1\t.svn\n"
+#. Translators: These messages cover the case where there is
+#. only one branch, and are not part of another message.
+#: ../meld/vc/git.py:121 ../meld/vc/git.py:128
+#, python-format
+msgid "%d unpushed commit"
+msgid_plural "%d unpushed commits"
+msgstr[0] ""
+msgstr[1] ""
 
-#~ msgid "Monotone\t1\tMT\n"
-#~ msgstr "Monotone\t1\tMT\n"
+#: ../meld/vc/git.py:123
+#, python-format
+msgid "%d branch"
+msgid_plural "%d branches"
+msgstr[0] ""
+msgstr[1] ""
 
-#~ msgid ""
-#~ "Meld is a file and directory comparison tool. Usage:\n"
-#~ "\n"
-#~ "    meld                        Start with no windows open\n"
-#~ "    meld <dir>                  Start with VC browser in 'dir'\n"
-#~ "    meld <file>                 Start with VC diff of 'file'\n"
-#~ "    meld <file> <file> [file]   Start with 2 or 3 way file comparison\n"
-#~ "    meld <dir>  <dir>  [dir]    Start with 2 or 3 way directory "
-#~ "comparison\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "    -h, --help                  Show this help text and exit\n"
-#~ "    -v, --version               Display the version and exit\n"
-#~ "\n"
-#~ "For more information choose help -> contents.\n"
-#~ "Report bugs at http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
-#~ "Discuss meld at http://mail.gnome.org/mailman/listinfo/meld-list\n";
-#~ msgstr ""
-#~ "Meld on tiedostojen ja hakemistojen vertailutyökalu. Käyttö:\n"
-#~ "\n"
-#~ "    meld                      Käynnistä ilman avoimia vertailuja\n"
-#~ "    meld <hakemisto>          Käynnistä versionhallintaselain\n"
-#~ "    meld <file>               Käynnistä versionhallinnan vertailu\n"
-#~ "    meld <file> <file> [file] Käynnistä 2- tai 3-osainen "
-#~ "tiedostovertailu\n"
-#~ "    meld <dir>  <dir>  [dir]  Käynnistä 2- tai 3-osainen "
-#~ "hakemistovertailu\n"
-#~ "\n"
-#~ "Lisätietoja saat valitsemalla Ohje -> Sisältö.\n"
-#~ "Ilmoita virheistä osoitteessa\n"
-#~ "    http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
-#~ "Keskustele meldistä: http://mail.gnome.org/mailman/listinfo/meld-list\n";
+#: ../meld/vc/git.py:333
+#, python-format
+msgid "Mode changed from %s to %s"
+msgstr ""
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]