[meld] Updated Slovenian translation

[Matej Urbančič <mateju src gnome org>]

commit 805b04dc21a15c7397fc30914d74fd584f566a5b
Author: Matej Urbančič <mateju svn gnome org>
Date:   Thu Aug 18 23:15:45 2016 +0200

    Updated Slovenian translation

 po/sl.po | 1554 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 1006 insertions(+), 548 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 8a1cd8f..6d72c20 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,40 +2,43 @@
 # Copyright (C) 2009 meld's COPYRIGHT HOLDER
 # This file is distributed under the same license as the meld package.
 #
-# Matej Urbančič <mateju svn gnome org>, 2009-2015.
+# Matej Urbančič <mateju svn gnome org>, 2009-2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-24 11:18+0000\n"
-"PO-Revision-Date: 2015-03-24 19:50+0100\n"
+"POT-Creation-Date: 2016-08-18 22:43+0200\n"
+"PO-Revision-Date: 2016-08-18 22:44+0200\n"
 "Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
-"Language: sl\n"
+"Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: ../bin/meld:138
+#: ../bin/meld:142
 msgid "Cannot import: "
 msgstr "Ni mogoče uvoziti:"
 
-#: ../bin/meld:141
+#: ../bin/meld:145
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Program Meld zahteva najmanj različico %s."
 
-#: ../bin/meld:145
-msgid "Meld does not support Python 3."
-msgstr "Program Meld ne podpira okolja Python 3."
+#: ../bin/meld:194
+#, c-format
+msgid ""
+"Couldn't load Meld-specific CSS (%s)\n"
+"%s"
+msgstr ""
 
-#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+#: ../data/meld.desktop.in.h:1 ../data/meld.appdata.xml.in.h:1
+#: ../data/ui/meldapp.ui.h:1
 msgid "Meld"
 msgstr "Meld"
 
@@ -47,11 +50,16 @@ msgstr "Pregledovalnik sprememb"
 msgid "Meld Diff Viewer"
 msgstr "Meld pregledovalnik različic"
 
-#: ../data/meld.desktop.in.h:4
+#: ../data/meld.desktop.in.h:4 ../data/meld.appdata.xml.in.h:2
 msgid "Compare and merge your files"
 msgstr "Primerjava in združevanje datotek"
 
-#: ../data/meld.appdata.xml.in.h:1
+#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: ../data/meld.desktop.in.h:6
+msgid "diff;merge;"
+msgstr ""
+
+#: ../data/meld.appdata.xml.in.h:3
 msgid ""
 "Meld is a visual diff and merge tool targeted at developers. Meld helps you "
 "compare files, directories, and version controlled projects. It provides "
@@ -59,7 +67,7 @@ msgid ""
 "many version control systems including Git, Mercurial, Bazaar and Subversion."
 msgstr ""
 
-#: ../data/meld.appdata.xml.in.h:2
+#: ../data/meld.appdata.xml.in.h:4
 msgid ""
 "Meld helps you review code changes, understand patches, and makes enormous "
 "merge conflicts slightly less painful."
@@ -96,14 +104,15 @@ msgid "If true, the window statusbar is visible."
 msgstr "Prav, če je okno lastnosti razpeto."
 
 #: ../data/org.gnome.meld.gschema.xml.h:7
-#, fuzzy
-msgid "Automatically detected text encodings"
-msgstr "Dovoli samodejno skrčenje besedila ob združevanju"
+msgid "Additional automatically detected text encodings"
+msgstr ""
 
 #: ../data/org.gnome.meld.gschema.xml.h:8
 msgid ""
-"These text encodings will be automatically used (in order) to try to decode "
-"loaded text files."
+"Meld will use these text encodings to try to decode loaded text files before "
+"trying any other encodings. In addition to the encodings in this list, UTF-8 "
+"and the current locale-default encoding will always be used; other encodings "
+"may also be tried, depending on the user's locale."
 msgstr ""
 
 #: ../data/org.gnome.meld.gschema.xml.h:9
@@ -143,127 +152,134 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.meld.gschema.xml.h:17
+msgid "Color scheme to use for syntax highlighting"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:18
+msgid "Used by GtkSourceView to determine colors for syntax highlighting"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:19
 #, fuzzy
 msgid "Displayed whitespace"
 msgstr "Prikazana stran"
 
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../data/org.gnome.meld.gschema.xml.h:20
 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:19
+#: ../data/org.gnome.meld.gschema.xml.h:21
 msgid "Wrap mode"
 msgstr "Način preloma"
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:22
 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:21
+#: ../data/org.gnome.meld.gschema.xml.h:23
 msgid "Highlight current line"
 msgstr "Poudari trenutno vrstico"
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:24
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: ../data/org.gnome.meld.gschema.xml.h:25
 #, fuzzy
 msgid "Use the system default monospace font"
 msgstr "Ali naj se uporabi privzeta sistemska pisava enake širine znakov"
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:26
 msgid ""
-"If false, the defined custom font will be used instead of the system "
-"monospace font."
+"If false, custom-font will be used instead of the system monospace font."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:27
 msgid "Custom font"
 msgstr "Pisava po meri"
 
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: ../data/org.gnome.meld.gschema.xml.h:28
 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:27
+#: ../data/org.gnome.meld.gschema.xml.h:29
 msgid "Ignore blank lines when comparing files"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:30
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: ../data/org.gnome.meld.gschema.xml.h:31
 #, fuzzy
 msgid "Use the system default editor"
 msgstr "Uporabi _privzet sistemski urejevalnik besedil."
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:32
 msgid ""
-"If false, the defined custom editor will be used instead of the system "
-"editor when opening files externally."
+"If false, custom-editor-command will be used instead of the system editor "
+"when opening files externally."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: ../data/org.gnome.meld.gschema.xml.h:33
 #, fuzzy
 msgid "The custom editor launch command"
 msgstr "Ukaz za zagon urejevalnika:"
 
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:34
 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:33
+#: ../data/org.gnome.meld.gschema.xml.h:35
 msgid "Columns to display"
 msgstr "Prikazani stolpci"
 
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: ../data/org.gnome.meld.gschema.xml.h:36
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:35 ../data/ui/preferences.ui.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32
 msgid "Ignore symbolic links"
 msgstr "Prezri simbolne povezave"
 
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:38
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: ../data/org.gnome.meld.gschema.xml.h:39
 #, fuzzy
 msgid "Use shallow comparison"
 msgstr "Nova primerjava"
 
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: ../data/org.gnome.meld.gschema.xml.h:40
 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:39
+#: ../data/org.gnome.meld.gschema.xml.h:41
 #, fuzzy
 msgid "File timestamp resolution"
 msgstr "Ploskev žariščne ločljivosti X"
 
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: ../data/org.gnome.meld.gschema.xml.h:42
 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 "
@@ -271,124 +287,151 @@ msgid ""
 "resolution."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30
+msgid "Apply text filters during folder comparisons"
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:44
+msgid ""
+"If true, folder comparisons that compare file contents also apply active "
+"text filters and the blank line trimming option, and ignore newline "
+"differences."
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:45
 msgid "File status filters"
 msgstr "Filtri stanja datotek"
 
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: ../data/org.gnome.meld.gschema.xml.h:46
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: ../data/org.gnome.meld.gschema.xml.h:47
 #, fuzzy
 msgid "Show the version control console output"
 msgstr "Izbor različice sistema za nadzor različic za uporabo"
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:48
 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:45
+#: ../data/org.gnome.meld.gschema.xml.h:49
 #, fuzzy
 msgid "Version control pane position"
 msgstr "Vstavek sistema nadzora različic"
 
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:50
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:51
 msgid "Present version comparisons as left-local/right-remote"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:52
 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:49
+#: ../data/org.gnome.meld.gschema.xml.h:53
 #, fuzzy
 msgid "Order for files in three-way version control merge comparisons"
 msgstr "Zagon primerjave nadzora različic"
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:54
 msgid ""
-"Choices for file order are remote/merge/local and local/merged/remote. This "
+"Choices for file order are remote/merged/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
 "control view, so is used solely for merges/conflict resolution within Meld."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: ../data/org.gnome.meld.gschema.xml.h:55
 #, fuzzy
 msgid "Show margin in commit message editor"
 msgstr "Pokaži desni rob v pogledu sporočil uveljavitev"
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:56
 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:53
+#: ../data/org.gnome.meld.gschema.xml.h:57
 #, fuzzy
 msgid "Margin column in commit message editor"
 msgstr "Pokaži desni rob v pogledu sporočil uveljavitev"
 
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: ../data/org.gnome.meld.gschema.xml.h:58
 msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:59
 msgid "Automatically hard-wrap commit messages"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: ../data/org.gnome.meld.gschema.xml.h:60
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
-"insert line breaks) at the defined commit margin before commit."
+"insert line breaks) at the commit margin before commit."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:61
 #, fuzzy
 msgid "Version control status filters"
 msgstr "Vstavek sistema nadzora različic"
 
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: ../data/org.gnome.meld.gschema.xml.h:62
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:63
 #, fuzzy
 msgid "Filename-based filters"
 msgstr "Izvoz Balsinih filtrov"
 
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: ../data/org.gnome.meld.gschema.xml.h:64
 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:61
+#: ../data/org.gnome.meld.gschema.xml.h:65
 #, fuzzy
 msgid "Text-based filters"
 msgstr "Izvoz Balsinih filtrov"
 
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: ../data/org.gnome.meld.gschema.xml.h:66
 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/styles/meld-base.xml.h:1
+msgid "Meld base scheme"
+msgstr ""
+
+#: ../data/styles/meld-base.xml.h:2
+msgid "Base color scheme for Meld highlighting"
+msgstr ""
+
+#: ../data/styles/meld-dark.xml.h:1
+msgid "Meld dark scheme"
+msgstr ""
+
+#: ../data/styles/meld-dark.xml.h:2
+msgid "Dark color scheme for Meld highlighting"
+msgstr ""
+
 #: ../data/ui/application.ui.h:1
 msgid "About Meld"
 msgstr "O programu"
@@ -418,10 +461,14 @@ msgid "_Help"
 msgstr "Pomo_č"
 
 #: ../data/ui/application.ui.h:8
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../data/ui/application.ui.h:9
 msgid "_About"
 msgstr "_O programu"
 
-#: ../data/ui/application.ui.h:9
+#: ../data/ui/application.ui.h:10
 msgid "_Quit"
 msgstr "_Končaj"
 
@@ -434,16 +481,16 @@ msgid "Compare selected files"
 msgstr "Primerjajo izbrane datoteke"
 
 #: ../data/ui/dirdiff.ui.h:3
-msgid "Copy _Left"
-msgstr "Kopiraj _levo"
+msgid "Copy to _Left"
+msgstr ""
 
 #: ../data/ui/dirdiff.ui.h:4
 msgid "Copy to left"
 msgstr "Kopiraj na levo"
 
 #: ../data/ui/dirdiff.ui.h:5
-msgid "Copy _Right"
-msgstr "Kopiraj _desno"
+msgid "Copy to _Right"
+msgstr ""
 
 #: ../data/ui/dirdiff.ui.h:6
 msgid "Copy to right"
@@ -453,7 +500,7 @@ msgstr "Kopiraj na desno"
 msgid "Delete selected"
 msgstr "Izbriši izbor"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1463
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384
 msgid "Hide"
 msgstr "Skrij"
 
@@ -489,7 +536,7 @@ msgstr "Novo"
 msgid "Show new"
 msgstr "Pokaži novejše"
 
-#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:71
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76
 msgid "Modified"
 msgstr "Spremenjeno"
 
@@ -522,7 +569,7 @@ msgid "_Add"
 msgstr "_Dodaj"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:747
+#: ../meld/vcview.py:638
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -543,8 +590,8 @@ msgid "Move _Down"
 msgstr "Premakni navz_dol"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:363
-#: ../meld/vcview.py:203
+#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
+#: ../meld/dirdiff.py:373
 msgid "Name"
 msgstr "Ime"
 
@@ -561,26 +608,199 @@ msgid "Remove selected filter"
 msgstr "Odstrani izbrani filter"
 
 #: ../data/ui/filediff.ui.h:1
+msgid "Format as Patch..."
+msgstr "Oblikuj kot popravek ..."
+
+#: ../data/ui/filediff.ui.h:2
+msgid "Create a patch using differences between files"
+msgstr "Ustvari popravek z razlikovanjem med datotekami"
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Save A_ll"
+msgstr "Shrani _vse"
+
+#: ../data/ui/filediff.ui.h:4
+msgid "Save all files in the current comparison"
+msgstr "Shrani vse datoteke trenutne primerjave"
+
+#: ../data/ui/filediff.ui.h:5
+msgid "Revert files to their saved versions"
+msgstr "Povrni datoteke na shranjene različice"
+
+#: ../data/ui/filediff.ui.h:6
+msgid "Add Synchronization Point"
+msgstr "Dodaj točko usklajevanja"
+
+#: ../data/ui/filediff.ui.h:7
+msgid "Add a synchronization point for changes between files"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:8
+msgid "Clear Synchronization Points"
+msgstr "Počisti točke usklajevanja"
+
+#: ../data/ui/filediff.ui.h:9
+msgid "Clear sychronization points for changes between files"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:10
+msgid "Previous Conflict"
+msgstr "Predhodni spor"
+
+#: ../data/ui/filediff.ui.h:11
+msgid "Go to the previous conflict"
+msgstr "Skoči na predhodni niz v sporu"
+
+#: ../data/ui/filediff.ui.h:12
+msgid "Next Conflict"
+msgstr "Naslednji spor"
+
+#: ../data/ui/filediff.ui.h:13
+msgid "Go to the next conflict"
+msgstr "Skoči na naslednji niz v sporu"
+
+#: ../data/ui/filediff.ui.h:14
+msgid "Push to Left"
+msgstr "Potisni levo"
+
+#: ../data/ui/filediff.ui.h:15
+msgid "Push current change to the left"
+msgstr "Potisni trenutne spremembe na levo"
+
+#: ../data/ui/filediff.ui.h:16
+msgid "Push to Right"
+msgstr "Potisni desno"
+
+#: ../data/ui/filediff.ui.h:17
+msgid "Push current change to the right"
+msgstr "Potisni trenutne spremembe na desno"
+
+#: ../data/ui/filediff.ui.h:18
+msgid "Pull from Left"
+msgstr "Potegni z leve"
+
+#: ../data/ui/filediff.ui.h:19
+msgid "Pull change from the left"
+msgstr "Potegni spremembe z leve"
+
+#: ../data/ui/filediff.ui.h:20
+msgid "Pull from Right"
+msgstr "Potegni z desne"
+
+#: ../data/ui/filediff.ui.h:21
+msgid "Pull change from the right"
+msgstr "Potegni spremembe z desne"
+
+#: ../data/ui/filediff.ui.h:22
+msgid "Copy Above Left"
+msgstr "Kopiraj nad levo"
+
+#: ../data/ui/filediff.ui.h:23
+msgid "Copy change above the left chunk"
+msgstr "Kopiraj spremembe nad levi del"
+
+#: ../data/ui/filediff.ui.h:24
+msgid "Copy Below Left"
+msgstr "Kopiraj pod levo"
+
+#: ../data/ui/filediff.ui.h:25
+msgid "Copy change below the left chunk"
+msgstr "Kopiraj spremembe pod levi del"
+
+#: ../data/ui/filediff.ui.h:26
+msgid "Copy Above Right"
+msgstr "Kopiraj nad desno"
+
+#: ../data/ui/filediff.ui.h:27
+msgid "Copy change above the right chunk"
+msgstr "Kopiraj spremembe nad desni del"
+
+#: ../data/ui/filediff.ui.h:28
+msgid "Copy Below Right"
+msgstr "Kopiraj pod desno"
+
+#: ../data/ui/filediff.ui.h:29
+msgid "Copy change below the right chunk"
+msgstr "Kopiraj spremembe pod desni del"
+
+#: ../data/ui/filediff.ui.h:30
+msgid "Delete"
+msgstr "Izbriši"
+
+#: ../data/ui/filediff.ui.h:31
+msgid "Delete change"
+msgstr "Izbriši spremembo"
+
+#: ../data/ui/filediff.ui.h:32
+msgid "Merge All from Left"
+msgstr "Združi vse spremembe z leve"
+
+#: ../data/ui/filediff.ui.h:33
+msgid "Merge all non-conflicting changes from the left"
+msgstr "Združi vse spremembe brez sporov z leve"
+
+#: ../data/ui/filediff.ui.h:34
+msgid "Merge All from Right"
+msgstr "Združi vse spremembe z desne"
+
+#: ../data/ui/filediff.ui.h:35
+msgid "Merge all non-conflicting changes from the right"
+msgstr "Združi vse spremembe brez sporov z desne"
+
+#: ../data/ui/filediff.ui.h:36
+msgid "Merge All"
+msgstr "Združi vse"
+
+#: ../data/ui/filediff.ui.h:37
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr "Združi vse spremembe brez sporov z leve in z desne"
+
+#: ../data/ui/filediff.ui.h:38
+msgid "Previous Pane"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:39
+msgid "Move keyboard focus to the previous document in this comparison"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:40
+msgid "Next Pane"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:41
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
+
+#: ../data/ui/filediff.ui.h:42
+msgid "Lock Scrolling"
+msgstr "Zakleni drsenje"
+
+#: ../data/ui/filediff.ui.h:43
+msgid "Lock scrolling of all panes"
+msgstr "Zakleni drsenje vseh pladnjev"
+
+#: ../data/ui/filediff.ui.h:44
 msgid "Save changes to documents before closing?"
 msgstr "Ali želite shraniti spremembe dokumenta pred zapiranjem?"
 
-#: ../data/ui/filediff.ui.h:2
+#: ../data/ui/filediff.ui.h:45
 msgid "If you don't save, changes will be permanently lost."
 msgstr "V primeru, da sprememb ne shranite, bodo te trajno izgubljene."
 
-#: ../data/ui/filediff.ui.h:3
+#: ../data/ui/filediff.ui.h:46
 msgid "Close _without Saving"
 msgstr "Zapri _brez shranjevanja"
 
-#: ../data/ui/filediff.ui.h:4
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450
+#: ../meld/filediff.py:1518
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: ../data/ui/filediff.ui.h:5
+#: ../data/ui/filediff.ui.h:48
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ../data/ui/filediff.ui.h:6
+#: ../data/ui/filediff.ui.h:49
 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."
@@ -589,27 +809,27 @@ msgstr ""
 "in vsebino spreminjate, vendar pa je treba spremembe shraniti v datoteko z "
 "drugim imenom."
 
-#: ../data/ui/filediff.ui.h:7
+#: ../data/ui/filediff.ui.h:50
 msgid "File 3"
 msgstr "Datoteka 3"
 
-#: ../data/ui/filediff.ui.h:8
+#: ../data/ui/filediff.ui.h:51
 msgid "File 2"
 msgstr "Datoteka 2"
 
-#: ../data/ui/filediff.ui.h:9
+#: ../data/ui/filediff.ui.h:52
 msgid "File 1"
 msgstr "Datoteka 1"
 
-#: ../data/ui/filediff.ui.h:10
+#: ../data/ui/filediff.ui.h:53
 msgid "Revert unsaved changes to documents?"
 msgstr "Ali naj se povrnejo neshranjene spremembe dokumentov?"
 
-#: ../data/ui/filediff.ui.h:11
+#: ../data/ui/filediff.ui.h:54
 msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr "Spremembe navedenih dokumentov bodo trajno izgubljene:\n"
 
-#: ../data/ui/findbar.ui.h:1
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:942 ../meld/filediff.py:1451
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
@@ -657,7 +877,7 @@ msgstr "Oblikuj kot popravek"
 msgid "Copy to Clipboard"
 msgstr "Kopiraj v odložišče"
 
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:119
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:144
 msgid "Save Patch"
 msgstr "Shrani popravek"
 
@@ -764,80 +984,84 @@ msgid "Use s_yntax highlighting"
 msgstr "Uporabi _barvno poudarjanje skladnje"
 
 #: ../data/ui/preferences.ui.h:22
+msgid "Syntax highlighting color scheme:"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:23
 msgid "External Editor"
 msgstr "Zunanji urejevalnik"
 
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:24
 msgid "Use _default system editor"
 msgstr "Uporabi _privzet sistemski urejevalnik besedil."
 
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:25
 msgid "Edito_r command:"
 msgstr "Ukaz _urejevalnika:"
 
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:26
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: ../data/ui/preferences.ui.h:26
+#: ../data/ui/preferences.ui.h:27
 msgid "Shallow Comparison"
 msgstr "Groba primerjava"
 
-#: ../data/ui/preferences.ui.h:27
+#: ../data/ui/preferences.ui.h:28
 msgid "C_ompare files based only on size and timestamp"
 msgstr "_Primerjaj datoteke na osnovi velikosti in časovnega žiga"
 
-#: ../data/ui/preferences.ui.h:28
+#: ../data/ui/preferences.ui.h:29
 msgid "_Timestamp resolution:"
 msgstr "Ločljivost časovnega _žiga:"
 
-#: ../data/ui/preferences.ui.h:29
+#: ../data/ui/preferences.ui.h:31
 msgid "Symbolic Links"
 msgstr "Simbolne povezave"
 
-#: ../data/ui/preferences.ui.h:31
+#: ../data/ui/preferences.ui.h:33
 msgid "Visible Columns"
 msgstr "Vidni stolpci"
 
-#: ../data/ui/preferences.ui.h:32
+#: ../data/ui/preferences.ui.h:34
 msgid "Folder Comparisons"
 msgstr "Primerjava map"
 
-#: ../data/ui/preferences.ui.h:33
+#: ../data/ui/preferences.ui.h:35
 msgid "Version Comparisons"
 msgstr "Primerjave različic"
 
-#: ../data/ui/preferences.ui.h:34
+#: ../data/ui/preferences.ui.h:36
 #, fuzzy
 msgid "_Order when comparing file revisions:"
 msgstr "_Med primerjavo predelav datotek"
 
-#: ../data/ui/preferences.ui.h:35
+#: ../data/ui/preferences.ui.h:37
 #, fuzzy
 msgid "Order when _merging files:"
 msgstr "Predvajaj _glasbene datoteke, ko so povezane"
 
-#: ../data/ui/preferences.ui.h:36
+#: ../data/ui/preferences.ui.h:38
 msgid "Commit Messages"
 msgstr "Uveljavi sporočila"
 
-#: ../data/ui/preferences.ui.h:37
+#: ../data/ui/preferences.ui.h:39
 msgid "Show _right margin at:"
 msgstr "Pokaži _desni rob pri:"
 
-#: ../data/ui/preferences.ui.h:38
+#: ../data/ui/preferences.ui.h:40
 msgid "Automatically _break lines at right margin on commit"
 msgstr "Samodejno _prelomi vrstice na desnem robu ob uveljavitvi"
 
-#: ../data/ui/preferences.ui.h:39
+#: ../data/ui/preferences.ui.h:41
 msgid "Version Control"
 msgstr "Nadzor različic"
 
-#: ../data/ui/preferences.ui.h:40
+#: ../data/ui/preferences.ui.h:42
 msgid "Filename filters"
 msgstr "Datotečni filtri"
 
-#: ../data/ui/preferences.ui.h:41
+#: ../data/ui/preferences.ui.h:43
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -847,24 +1071,24 @@ msgstr ""
 "vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), ločenimi s "
 "presledki."
 
-#: ../data/ui/preferences.ui.h:42 ../meld/meldwindow.py:103
+#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103
 msgid "File Filters"
 msgstr "Filtri datotek"
 
-#: ../data/ui/preferences.ui.h:43
+#: ../data/ui/preferences.ui.h:45
 #, fuzzy
 msgid "Change trimming"
 msgstr "Spremeni opazovanje"
 
-#: ../data/ui/preferences.ui.h:44
+#: ../data/ui/preferences.ui.h:46
 msgid "Trim blank line differences from the start and end of changes"
 msgstr ""
 
-#: ../data/ui/preferences.ui.h:45
+#: ../data/ui/preferences.ui.h:47
 msgid "Text filters"
 msgstr "Filtri besedila"
 
-#: ../data/ui/preferences.ui.h:46
+#: ../data/ui/preferences.ui.h:48
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -878,11 +1102,257 @@ msgstr ""
 "izraz vključuje skupine, so zamenjane le te. Več podrobnosti je zapisanih v "
 "priročniku."
 
-#: ../data/ui/preferences.ui.h:47
+#: ../data/ui/preferences.ui.h:49
 msgid "Text Filters"
 msgstr "Filtri besedila"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:623
+#: ../data/ui/shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "General"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:2
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:3
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:4
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Končaj program"
+
+#: ../data/ui/shortcuts.ui.h:5
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:6
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:7
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:8
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:9
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:10
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:11
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:12
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:13
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:14
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:15
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:16
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:17
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:18
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:19
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:20
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:21
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:22
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:23
+msgctxt "shortcut window"
+msgid "Find"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:24
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:25
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:26
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:27
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:28
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:29
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:30
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:31
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:32
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:33
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:34
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:35
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:36
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:37
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:38
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:39
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:40
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:41
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:42
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:43
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:44
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:45
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:46
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:47
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:48
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr ""
+
+#: ../data/ui/shortcuts.ui.h:49
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr ""
+
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570
+#: ../meld/newdifftab.py:38
 msgid "New comparison"
 msgstr "Nova primerjava"
 
@@ -1031,7 +1501,7 @@ msgstr "Brez določene _različice"
 msgid "Show unversioned files"
 msgstr "Pokaži datoteke z nedoločenimi različicami"
 
-#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:64
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69
 msgid "Ignored"
 msgstr "Prezrto"
 
@@ -1059,72 +1529,123 @@ msgstr "Predhodni dnevniki:"
 msgid "Co_mmit"
 msgstr "_Uveljavi"
 
-#: ../data/ui/vcview.ui.h:35
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:326
+msgid "Location"
+msgstr "Mesto"
+
+#: ../data/ui/vcview.ui.h:37
+msgid "Status"
+msgstr "Stanje"
+
+#: ../data/ui/vcview.ui.h:38
+msgid "Extra"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:39
 msgid "Console output"
 msgstr "Odvod konzole"
 
-#: ../data/ui/vcview.ui.h:36
+#: ../data/ui/vcview.ui.h:40
 msgid "Push local commits to remote?"
 msgstr "Ali naj se objavijo krajevne uveljavitve v oddaljeno skladišče?"
 
-#: ../data/ui/vcview.ui.h:37
+#: ../data/ui/vcview.ui.h:41
 msgid "The commits to be pushed are determined by your version control system."
 msgstr "Uveljavitve za objavo določa sistem za nadzor različic."
 
-#: ../data/ui/vcview.ui.h:38
+#: ../data/ui/vcview.ui.h:42
 msgid "_Push commits"
 msgstr "_Objavi uveljavitve"
 
+#: ../meld/const.py:12
+msgid "UNIX (LF)"
+msgstr ""
+
+#: ../meld/const.py:13
+msgid "DOS/Windows (CR-LF)"
+msgstr ""
+
+#: ../meld/const.py:14
+msgid "Mac OS (CR)"
+msgstr ""
+
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:381 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:391 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Velikost"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:389 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:399 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Čas spremembe"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:397 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:407 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: ../meld/dirdiff.py:543
+#: ../meld/dirdiff.py:537
 #, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:672 ../meld/dirdiff.py:694
+#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:823
+#: ../meld/dirdiff.py:826
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] končano"
 
-#: ../meld/dirdiff.py:830
+#: ../meld/dirdiff.py:834
+msgid "Folders have no differences"
+msgstr ""
+
+#: ../meld/dirdiff.py:836
+msgid "Contents of scanned files in folders are identical."
+msgstr ""
+
+#: ../meld/dirdiff.py:838
+msgid ""
+"Scanned files in folders appear identical, but contents have not been "
+"scanned."
+msgstr ""
+
+#: ../meld/dirdiff.py:841
+msgid "File filters are in use, so not all files have been scanned."
+msgstr ""
+
+#: ../meld/dirdiff.py:843
+msgid "Text filters are in use and may be masking content differences."
+msgstr ""
+
+#: ../meld/dirdiff.py:861 ../meld/filediff.py:1386 ../meld/filediff.py:1416
+#: ../meld/filediff.py:1418 ../meld/ui/msgarea.py:109 ../meld/ui/msgarea.py:122
+msgid "Hi_de"
+msgstr "S_krij"
+
+#: ../meld/dirdiff.py:871
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je prišlo do več napak."
 
-#: ../meld/dirdiff.py:831
+#: ../meld/dirdiff.py:872
 msgid "Files with invalid encodings found"
 msgstr "Zaznane so datoteke z neveljavnim znakovnim naborom"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:874
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "Zaznane so datoteke z neveljavnim znakovnim naborom. Imena so na primer:"
 
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:876
 msgid "Files hidden by case insensitive comparison"
 msgstr "Datoteke skrite zaradi primerjave brez upoštevanja velikosti črk"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:878
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1133,30 +1654,28 @@ msgstr ""
 "razlike velikosti upošteva. Nekatere datoteke so skrite:\n"
 "%s"
 
-#: ../meld/dirdiff.py:848
+#: ../meld/dirdiff.py:889
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:873 ../meld/filediff.py:1138 ../meld/filediff.py:1289
-#: ../meld/filediff.py:1465 ../meld/filediff.py:1495 ../meld/filediff.py:1497
-msgid "Hi_de"
-msgstr "S_krij"
+#: ../meld/dirdiff.py:945
+#, python-format
+msgid "Replace folder “%s”?"
+msgstr ""
 
-#: ../meld/dirdiff.py:904
+#: ../meld/dirdiff.py:947
 #, python-format
 msgid ""
-"'%s' exists.\n"
-"Overwrite?"
+"Another folder with the same name already exists in “%s”.\n"
+"If you replace the existing folder, all files in it will be lost."
 msgstr ""
-"'%s' že obstaja.\n"
-"Ali naj bo prepisana?"
 
-#: ../meld/dirdiff.py:912
+#: ../meld/dirdiff.py:960
 msgid "Error copying file"
 msgstr "Napaka kopiranja datoteke"
 
-#: ../meld/dirdiff.py:913
+#: ../meld/dirdiff.py:961
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1169,266 +1688,99 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:936
+#: ../meld/dirdiff.py:984
 #, python-format
 msgid "Error deleting %s"
 msgstr "Napaka med brisanjem %s"
 
-#: ../meld/filediff.py:251
-msgid "Format as Patch..."
-msgstr "Oblikuj kot popravek ..."
-
-#: ../meld/filediff.py:252
-msgid "Create a patch using differences between files"
-msgstr "Ustvari popravek z razlikovanjem med datotekami"
-
-#: ../meld/filediff.py:254
-msgid "Save A_ll"
-msgstr "Shrani _vse"
-
-#: ../meld/filediff.py:255
-msgid "Save all files in the current comparison"
-msgstr "Shrani vse datoteke trenutne primerjave"
-
-#: ../meld/filediff.py:258
-msgid "Revert files to their saved versions"
-msgstr "Povrni datoteke na shranjene različice"
-
-#: ../meld/filediff.py:260
-msgid "Add Synchronization Point"
-msgstr "Dodaj točko usklajevanja"
-
-#: ../meld/filediff.py:261
-msgid "Add a manual point for synchronization of changes between files"
-msgstr "Dodaj ročno točko usklajevanja sprememb med datotekami"
-
-#: ../meld/filediff.py:264
-msgid "Clear Synchronization Points"
-msgstr "Počisti točke usklajevanja"
-
-#: ../meld/filediff.py:265
-msgid "Clear manual change sychronization points"
-msgstr "Počisti ročno spremenjene točke usklajevanja"
-
-#: ../meld/filediff.py:267
-msgid "Previous Conflict"
-msgstr "Predhodni spor"
-
-#: ../meld/filediff.py:268
-msgid "Go to the previous conflict"
-msgstr "Skoči na predhodni niz v sporu"
-
-#: ../meld/filediff.py:270
-msgid "Next Conflict"
-msgstr "Naslednji spor"
-
-#: ../meld/filediff.py:271
-msgid "Go to the next conflict"
-msgstr "Skoči na naslednji niz v sporu"
-
-#: ../meld/filediff.py:273
-msgid "Push to Left"
-msgstr "Potisni levo"
-
-#: ../meld/filediff.py:274
-msgid "Push current change to the left"
-msgstr "Potisni trenutne spremembe na levo"
-
-#: ../meld/filediff.py:277
-msgid "Push to Right"
-msgstr "Potisni desno"
-
-#: ../meld/filediff.py:278
-msgid "Push current change to the right"
-msgstr "Potisni trenutne spremembe na desno"
-
-#: ../meld/filediff.py:282
-msgid "Pull from Left"
-msgstr "Potegni z leve"
-
-#: ../meld/filediff.py:283
-msgid "Pull change from the left"
-msgstr "Potegni spremembe z leve"
-
-#: ../meld/filediff.py:286
-msgid "Pull from Right"
-msgstr "Potegni z desne"
-
-#: ../meld/filediff.py:287
-msgid "Pull change from the right"
-msgstr "Potegni spremembe z desne"
-
-#: ../meld/filediff.py:289
-msgid "Copy Above Left"
-msgstr "Kopiraj nad levo"
-
-#: ../meld/filediff.py:290
-msgid "Copy change above the left chunk"
-msgstr "Kopiraj spremembe nad levi del"
-
-#: ../meld/filediff.py:292
-msgid "Copy Below Left"
-msgstr "Kopiraj pod levo"
-
-#: ../meld/filediff.py:293
-msgid "Copy change below the left chunk"
-msgstr "Kopiraj spremembe pod levi del"
-
-#: ../meld/filediff.py:295
-msgid "Copy Above Right"
-msgstr "Kopiraj nad desno"
-
-#: ../meld/filediff.py:296
-msgid "Copy change above the right chunk"
-msgstr "Kopiraj spremembe nad desni del"
-
-#: ../meld/filediff.py:298
-msgid "Copy Below Right"
-msgstr "Kopiraj pod desno"
-
-#: ../meld/filediff.py:299
-msgid "Copy change below the right chunk"
-msgstr "Kopiraj spremembe pod desni del"
-
-#: ../meld/filediff.py:301
-msgid "Delete"
-msgstr "Izbriši"
-
-#: ../meld/filediff.py:302
-msgid "Delete change"
-msgstr "Izbriši spremembo"
-
-#: ../meld/filediff.py:304
-msgid "Merge All from Left"
-msgstr "Združi vse spremembe z leve"
-
-#: ../meld/filediff.py:305
-msgid "Merge all non-conflicting changes from the left"
-msgstr "Združi vse spremembe brez sporov z leve"
-
-#: ../meld/filediff.py:307
-msgid "Merge All from Right"
-msgstr "Združi vse spremembe z desne"
-
-#: ../meld/filediff.py:308
-msgid "Merge all non-conflicting changes from the right"
-msgstr "Združi vse spremembe brez sporov z desne"
-
-#: ../meld/filediff.py:310
-msgid "Merge All"
-msgstr "Združi vse"
-
-#: ../meld/filediff.py:311
-msgid "Merge all non-conflicting changes from left and right panes"
-msgstr "Združi vse spremembe brez sporov z leve in z desne"
-
-#: ../meld/filediff.py:315
-msgid "Cycle Through Documents"
-msgstr "Preklopi med dokumenti"
-
-#: ../meld/filediff.py:316
-msgid "Move keyboard focus to the next document in this comparison"
-msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
-
-#: ../meld/filediff.py:322
-msgid "Lock Scrolling"
-msgstr "Zakleni drsenje"
-
-#: ../meld/filediff.py:323
-msgid "Lock scrolling of all panes"
-msgstr "Zakleni drsenje vseh pladnjev"
+#: ../meld/dirdiff.py:1489
+msgid "No folder"
+msgstr ""
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:483
+#: ../meld/filediff.py:354
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:483
+#: ../meld/filediff.py:354
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:485
+#: ../meld/filediff.py:356
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:832
-#, python-format
+#: ../meld/filediff.py:781
+msgid "Comparison results will be inaccurate"
+msgstr ""
+
+#: ../meld/filediff.py:783
 msgid ""
-"Filter '%s' changed the number of lines in the file. Comparison will be "
-"incorrect. See the user manual for more details."
+"A filter changed the number of lines in the file, which is unsupported. The "
+"comparison will not be accurate."
 msgstr ""
-"Po uporabi filtra '%s' se je spremenilo število vrstic v datoteki, zato "
-"primerjava ne bo natančna. Za več podrobnosti si oglejte priročnik."
 
-#: ../meld/filediff.py:904
+#: ../meld/filediff.py:841
 #, fuzzy
 msgid "Mark conflict as resolved?"
 msgstr "Označi kot razrešeno v VC"
 
-#: ../meld/filediff.py:906
+#: ../meld/filediff.py:843
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 
-#: ../meld/filediff.py:908
+#: ../meld/filediff.py:845
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../meld/filediff.py:909
+#: ../meld/filediff.py:846
 msgid "Mark _Resolved"
 msgstr ""
 
-#: ../meld/filediff.py:1125
+#: ../meld/filediff.py:1095
 #, python-format
-msgid "[%s] Set num panes"
-msgstr "[%s] Določi okna"
-
-#: ../meld/filediff.py:1132
-#, python-format
-msgid "[%s] Opening files"
-msgstr "[%s] Odpiranje datotek"
-
-#: ../meld/filediff.py:1155 ../meld/filediff.py:1165 ../meld/filediff.py:1178
-#: ../meld/filediff.py:1184
-msgid "Could not read file"
-msgstr "Ni mogoče prebrati datoteke"
+msgid "There was a problem opening the file “%s”."
+msgstr ""
 
-#: ../meld/filediff.py:1156
+#: ../meld/filediff.py:1103
 #, python-format
-msgid "[%s] Reading files"
-msgstr "[%s] Branje datotek"
+msgid "File %s appears to be a binary file."
+msgstr ""
 
-#: ../meld/filediff.py:1166
-#, python-format
-msgid "%s appears to be a binary file."
-msgstr "%s je videti kot dvojiška datoteka."
+#: ../meld/filediff.py:1105
+msgid "Do you want to open the file using the default application?"
+msgstr ""
 
-#: ../meld/filediff.py:1179
-#, python-format
-msgid "%s is not in encodings: %s"
-msgstr "%s ni zapisan v naboru: %s"
+#: ../meld/filediff.py:1107
+msgid "Open"
+msgstr ""
 
-#: ../meld/filediff.py:1217
+#: ../meld/filediff.py:1123
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Računanje razlik"
 
-#: ../meld/filediff.py:1284
+#: ../meld/filediff.py:1188
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Datoteka %s je bila na disku spremenjena."
 
-#: ../meld/filediff.py:1285
+#: ../meld/filediff.py:1189
 msgid "Do you want to reload the file?"
 msgstr "Ali želite ponovno naložiti datoteko?"
 
-#: ../meld/filediff.py:1288
+#: ../meld/filediff.py:1191
 msgid "_Reload"
 msgstr "_Ponovno naloži"
 
-#: ../meld/filediff.py:1454
+#: ../meld/filediff.py:1349
+msgid "Files are identical"
+msgstr "Datoteki sta enaki"
+
+#: ../meld/filediff.py:1362
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1436,19 +1788,26 @@ msgstr ""
 "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
 "Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: ../meld/filediff.py:1460
-msgid "Files are identical"
-msgstr "Datoteki sta enaki"
+#: ../meld/filediff.py:1367
+msgid "Files differ in line endings only"
+msgstr ""
+
+#: ../meld/filediff.py:1369
+#, python-format
+msgid ""
+"Files are identical except for differing line endings:\n"
+"%s"
+msgstr ""
 
-#: ../meld/filediff.py:1468
+#: ../meld/filediff.py:1389
 msgid "Show without filters"
 msgstr "Pokaži brez filtrov"
 
-#: ../meld/filediff.py:1490
+#: ../meld/filediff.py:1411
 msgid "Change highlighting incomplete"
 msgstr "Spremeni označevanje kot nedokončano"
 
-#: ../meld/filediff.py:1491
+#: ../meld/filediff.py:1412
 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."
@@ -1456,91 +1815,91 @@ msgstr ""
 "Nekaterih sprememb ni mogoče poudariti, ker so prevelike. Označevanje je "
 "mogoče vsiliti, vendar je postopek lahko zelo dolgotrajen."
 
-#: ../meld/filediff.py:1499
+#: ../meld/filediff.py:1420
 msgid "Keep highlighting"
 msgstr "Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1501
+#: ../meld/filediff.py:1422
 msgid "_Keep highlighting"
 msgstr "_Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1630
+#: ../meld/filediff.py:1454
 #, python-format
-msgid ""
-"\"%s\" exists!\n"
-"Overwrite?"
+msgid "Replace file “%s”?"
 msgstr ""
-"\"%s\" že obstaja!\n"
-"Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1643
+#: ../meld/filediff.py:1456
 #, python-format
 msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
+"A file with this name already exists in “%s”.\n"
+"If you replace the existing file, its contents will be lost."
 msgstr ""
-"Napaka med pisanjem na %s\n"
-"\n"
-"%s."
 
-#: ../meld/filediff.py:1654
+#: ../meld/filediff.py:1473
 msgid "Save Left Pane As"
 msgstr "Shrani levi pladenj kot"
 
-#: ../meld/filediff.py:1656
+#: ../meld/filediff.py:1475
 msgid "Save Middle Pane As"
 msgstr "Shrani srednji pladenj kot"
 
-#: ../meld/filediff.py:1658
+#: ../meld/filediff.py:1477
 msgid "Save Right Pane As"
 msgstr "Shrani desni pladenj kot"
 
-#: ../meld/filediff.py:1671
+#: ../meld/filediff.py:1491
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr ""
 
-#: ../meld/filediff.py:1673
+#: ../meld/filediff.py:1493
 #, fuzzy
 msgid "If you save it, any external changes will be lost."
 msgstr ""
 "V primeru, da datoteko shranite, bodo vse zunanje spremembe izgubljene. Ali "
 "jo želite vseeno shraniti?"
 
-#: ../meld/filediff.py:1676
+#: ../meld/filediff.py:1496
 msgid "Save Anyway"
 msgstr "Vseeno shrani"
 
-#: ../meld/filediff.py:1677
+#: ../meld/filediff.py:1497
 msgid "Don't Save"
 msgstr "Ne shrani"
 
-#: ../meld/filediff.py:1701
+#: ../meld/filediff.py:1519
+msgid "_Save as UTF-8"
+msgstr ""
+
+#: ../meld/filediff.py:1522
 #, python-format
-msgid ""
-"This file '%s' contains a mixture of line endings.\n"
-"\n"
-"Which format would you like to use?"
+msgid "Couldn't encode text as “%s”"
 msgstr ""
-"Datoteka '%s' vsebuje različne zaključne znake vrstic.\n"
-"\n"
-"Kateri zapis želite uporabiti?"
 
-#: ../meld/filediff.py:1717
+#: ../meld/filediff.py:1524
 #, python-format
 msgid ""
-"'%s' contains characters not encodable with '%s'\n"
+"File “%s” contains characters that can't be encoded using encoding “%s”.\n"
 "Would you like to save as UTF-8?"
 msgstr ""
-"'%s' vsebuje znake, ki jih ni mogoče kodirati v naboru '%s'\n"
-"Ali naj se datoteka shrani v naboru UTF-8?"
 
-#: ../meld/filediff.py:2084
+#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120
+#, python-format
+msgid "Could not save file %s."
+msgstr ""
+
+#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121
+#, python-format
+msgid ""
+"Couldn't save file due to:\n"
+"%s"
+msgstr ""
+
+#: ../meld/filediff.py:1910
 msgid "Live comparison updating disabled"
 msgstr "Živo posodabljanje ob primerjavi je onemogočeno"
 
-#: ../meld/filediff.py:2085
+#: ../meld/filediff.py:1911
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1550,112 +1909,117 @@ msgstr ""
 "Še vedno je mogoče ročno osvežiti primerjavo, živo posodabljanje pa bo spet "
 "na voljo, ko bo usklajevanje končano."
 
-#: ../meld/filemerge.py:48
+#: ../meld/filemerge.py:37
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Združevanje datotek"
 
-#: ../meld/gutterrendererchunk.py:90
+#: ../meld/gutterrendererchunk.py:159
 msgid "Copy _up"
 msgstr "Kopiraj _navzgor"
 
-#: ../meld/gutterrendererchunk.py:91
+#: ../meld/gutterrendererchunk.py:160
 msgid "Copy _down"
 msgstr "Kopiraj _navzdol"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:175
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Neveljavno število argumentov pri ukazu --diff."
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:180
 msgid "Start with an empty window"
 msgstr "Zagon brez odprtih oken"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:178
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:183
 msgid "file"
 msgstr "datoteka"
 
-#: ../meld/meldapp.py:176 ../meld/meldapp.py:180
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
 msgid "folder"
 msgstr "mapa"
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:182
 msgid "Start a version control comparison"
 msgstr "Zagon primerjave nadzora različic"
 
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:184
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:186
 #, fuzzy
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: ../meld/meldapp.py:224
+#: ../meld/meldapp.py:229
 #, python-format
 msgid "Error: %s\n"
 msgstr "Napaka: %s\n"
 
-#: ../meld/meldapp.py:231
+#: ../meld/meldapp.py:236
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je orodje za primerjavo vsebine datotek in map."
 
-#: ../meld/meldapp.py:235
+#: ../meld/meldapp.py:240
 msgid "Set label to use instead of file name"
 msgstr "Določi naslov namesto imena datoteke"
 
-#: ../meld/meldapp.py:238
+#: ../meld/meldapp.py:243
 msgid "Open a new tab in an already running instance"
 msgstr "Odpri nov zavihek v že zagnanem programu"
 
-#: ../meld/meldapp.py:241
+#: ../meld/meldapp.py:246
 msgid "Automatically compare all differing files on startup"
 msgstr "Ob zagonu samodejno primerjaj vse različne datoteke."
 
-#: ../meld/meldapp.py:244
+#: ../meld/meldapp.py:249
 msgid "Ignored for compatibility"
 msgstr "Prezrto zaradi skladnosti"
 
-#: ../meld/meldapp.py:248
+#: ../meld/meldapp.py:253
 msgid "Set the target file for saving a merge result"
 msgstr "Določitev ciljne datoteke za shranjevanje rezultatov združevanja."
 
-#: ../meld/meldapp.py:251
+#: ../meld/meldapp.py:256
 msgid "Automatically merge files"
 msgstr "Samodejno združi datoteke"
 
-#: ../meld/meldapp.py:255
+#: ../meld/meldapp.py:260
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Naloži shranjeno datoteko primerjav Meld"
 
-#: ../meld/meldapp.py:259
+#: ../meld/meldapp.py:264
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Ustvari zavihke primerjav za navedene datoteke ali mape."
 
-#: ../meld/meldapp.py:279
+#: ../meld/meldapp.py:284
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "preveč argumentov (zahtevanih 0-3, prejetih %d)"
 
-#: ../meld/meldapp.py:282
+#: ../meld/meldapp.py:287
 msgid "can't auto-merge less than 3 files"
 msgstr "manj kot treh datotek ni mogoče samodejno združevati"
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:289
 msgid "can't auto-merge directories"
 msgstr "map ni mogoče samodejno združevati"
 
-#: ../meld/meldapp.py:298
+#: ../meld/meldapp.py:303
 msgid "Error reading saved comparison file"
 msgstr "Napaka med branjem datoteke primerjav"
 
+#: ../meld/meldapp.py:330
+#, python-format
+msgid "invalid path or URI \"%s\""
+msgstr ""
+
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
 #: ../meld/meldbuffer.py:131
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: ../meld/melddoc.py:78 ../meld/melddoc.py:79
+#: ../meld/melddoc.py:64
 msgid "untitled"
 msgstr "neimenovano"
 
@@ -1791,109 +2155,74 @@ msgstr "Ustavi trenutno dejanje"
 msgid "Refresh the view"
 msgstr "Osveži pogled"
 
-#: ../meld/meldwindow.py:111
-msgid "_Tabs"
-msgstr "_Zavihki"
-
 #: ../meld/meldwindow.py:112
-msgid "_Previous Tab"
-msgstr "_Predhodni zavihek"
-
-#: ../meld/meldwindow.py:113
-msgid "Activate previous tab"
-msgstr "Pokaži predhodni zavihek"
-
-#: ../meld/meldwindow.py:115
-msgid "_Next Tab"
-msgstr "_Naslednji zavihek"
-
-#: ../meld/meldwindow.py:116
-msgid "Activate next tab"
-msgstr "Pokaži naslednji zavihek"
-
-#: ../meld/meldwindow.py:119
-msgid "Move Tab _Left"
-msgstr "Premakni zavihek _levo"
-
-#: ../meld/meldwindow.py:120
-msgid "Move current tab to left"
-msgstr "Premakni trenutni zavihek na levo"
-
-#: ../meld/meldwindow.py:123
-msgid "Move Tab _Right"
-msgstr "Premakni zavihek _desno"
-
-#: ../meld/meldwindow.py:124
-msgid "Move current tab to right"
-msgstr "Premakni trenutni zavihek na desno"
-
-#: ../meld/meldwindow.py:128
 msgid "Fullscreen"
 msgstr "Celozaslonski način"
 
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:113
 msgid "View the comparison in fullscreen"
 msgstr "Pokaži primerjavo v celozaslonskem načinu"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:115
 msgid "_Toolbar"
 msgstr "_Orodna vrstica"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:116
 msgid "Show or hide the toolbar"
 msgstr "Pokaži ali skrij orodno vrstico"
 
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:126
 msgid "Open Recent"
 msgstr "Odpri nedavno"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:127
 msgid "Open recent files"
 msgstr "Odpri nedavne datoteke"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:149
 msgid "_Meld"
 msgstr "_Meld"
 
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:150
 msgid "Quit the program"
 msgstr "Končaj program"
 
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:152
 msgid "Prefere_nces"
 msgstr "Mož_nosti"
 
-#: ../meld/meldwindow.py:168
+#: ../meld/meldwindow.py:153
 msgid "Configure the application"
 msgstr "Spremeni nastavitve programa"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:155
 msgid "_Contents"
 msgstr "_Vsebina"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:156
 msgid "Open the Meld manual"
 msgstr "Odpri priročnik Meld"
 
-#: ../meld/meldwindow.py:173
+#: ../meld/meldwindow.py:158
 msgid "About this application"
 msgstr "O programu"
 
-#: ../meld/meldwindow.py:546
-msgid "Switch to this tab"
-msgstr "Preklopi na ta zavihek"
-
-#: ../meld/meldwindow.py:657
+#: ../meld/meldwindow.py:604
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr ""
 
-#: ../meld/meldwindow.py:671
+#: ../meld/meldwindow.py:618
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Ni mogoče sočasno primerjati datotek in map"
 
+#: ../meld/misc.py:203
+#, python-format
+msgid "Couldn't find colour scheme details for %s-%s; this is a bad install"
+msgstr ""
+
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:218
+#: ../meld/misc.py:263
 msgid "[None]"
 msgstr "[noben]"
 
@@ -1909,28 +2238,24 @@ msgstr "vzorec"
 msgid "Version control:"
 msgstr "Nadzor različic:"
 
-#: ../meld/ui/findbar.py:144
-msgid "Regular expression error"
-msgstr "Napaka v logičnem izrazu"
-
-#: ../meld/ui/notebooklabel.py:65
+#: ../meld/ui/notebooklabel.py:63
 msgid "Close tab"
 msgstr "Zapri zavihek"
 
-#: ../meld/ui/vcdialogs.py:61
+#: ../meld/ui/vcdialogs.py:48
 msgid "No files will be committed"
 msgstr "Ni pripravljenih datotek za uveljavitev"
 
 #. Translators: First %s is replaced by translated "%d unpushed
 #. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:126
+#: ../meld/vc/git.py:94
 #, python-format
 msgid "%s in %s"
 msgstr "%s v %s"
 
 #. Translators: These messages cover the case where there is
 #. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:127 ../meld/vc/git.py:134
+#: ../meld/vc/git.py:95 ../meld/vc/git.py:102
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -1939,7 +2264,7 @@ msgstr[1] "%d neobjavljena uveljavitev"
 msgstr[2] "%d neobjavljeni uveljavitvi"
 msgstr[3] "%d neobjavljene uveljavitve"
 
-#: ../meld/vc/git.py:129
+#: ../meld/vc/git.py:97
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
@@ -1948,164 +2273,159 @@ msgstr[1] "%d veja"
 msgstr[2] "%d veji"
 msgstr[3] "%d veje"
 
-#: ../meld/vc/git.py:348
+#: ../meld/vc/git.py:330
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Način je spremenjen iz %s v %s"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/git.py:338
+msgid "Partially staged"
+msgstr ""
+
+#: ../meld/vc/git.py:338
+msgid "Staged"
+msgstr ""
+
+#. Translators: This is the displayed name of a version control system
+#. when no version control system is actually found.
+#: ../meld/vc/_null.py:38
+msgid "None"
+msgstr "Brez"
+
+#: ../meld/vc/svn.py:204
+#, python-format
+msgid "Rev %s"
+msgstr ""
+
+#: ../meld/vc/_vc.py:54
 msgid "Merged"
 msgstr "Združeno"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/_vc.py:54
 msgid "Base"
 msgstr "Osnova"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/_vc.py:54
 msgid "Local"
 msgstr "Krajevno"
 
-#: ../meld/vc/_vc.py:47
+#: ../meld/vc/_vc.py:54
 msgid "Remote"
 msgstr "Oddaljeno"
 
-#: ../meld/vc/_vc.py:65
+#: ../meld/vc/_vc.py:70
 msgid "Unversioned"
 msgstr "Brez določene različice"
 
-#: ../meld/vc/_vc.py:68
+#: ../meld/vc/_vc.py:73
 msgid "Error"
 msgstr "Napaka"
 
-#: ../meld/vc/_vc.py:70
+#: ../meld/vc/_vc.py:75
 msgid "Newly added"
 msgstr "Nedavno dodano"
 
-#: ../meld/vc/_vc.py:72
+#: ../meld/vc/_vc.py:77
 msgid "Renamed"
 msgstr "Preimenovano"
 
-#: ../meld/vc/_vc.py:73
+#: ../meld/vc/_vc.py:78
 msgid "Conflict"
 msgstr "V sporu"
 
-#: ../meld/vc/_vc.py:74
+#: ../meld/vc/_vc.py:79
 msgid "Removed"
 msgstr "Odstranjeno"
 
-#: ../meld/vc/_vc.py:75
+#: ../meld/vc/_vc.py:80
 msgid "Missing"
 msgstr "Manjkajoče"
 
-#: ../meld/vc/_vc.py:76
+#: ../meld/vc/_vc.py:81
 msgid "Not present"
 msgstr "Ni na voljo"
 
-#: ../meld/vcview.py:233 ../meld/vcview.py:417
-msgid "Location"
-msgstr "Mesto"
-
-#: ../meld/vcview.py:234
-msgid "Status"
-msgstr "Stanje"
-
-#: ../meld/vcview.py:235
-msgid "Revision"
-msgstr "Predelava"
-
-#: ../meld/vcview.py:236
-msgid "Options"
-msgstr "Možnosti"
-
-#. TRANSLATORS: this is an error message when a version control
-#. application isn't installed or can't be found
-#: ../meld/vcview.py:324
+#. Translators: This error message is shown when a version
+#. control binary isn't installed.
+#: ../meld/vcview.py:245
 #, python-format
-msgid "%s not installed"
-msgstr "Program %s ni nameščen"
-
-#. TRANSLATORS: this is an error message when a version
-#. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:328
-msgid "Invalid repository"
-msgstr "Neveljavno skladišče"
+msgid "%(name)s (%(cmd)s not installed)"
+msgstr ""
 
-#: ../meld/vcview.py:337
+#. Translators: This error message is shown when a version
+#. controlled repository is invalid.
+#: ../meld/vcview.py:249
 #, python-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../meld/vcview.py:339 ../meld/vcview.py:347
-msgid "None"
-msgstr "Brez"
+msgid "%(name)s (Invalid repository)"
+msgstr ""
 
-#: ../meld/vcview.py:358
+#: ../meld/vcview.py:270
 msgid "No valid version control system found in this folder"
 msgstr "Ni veljavnega sistema za nadzor različic v tej mapi"
 
-#: ../meld/vcview.py:360
+#: ../meld/vcview.py:272
 msgid "Only one version control system found in this folder"
 msgstr "V tej mapi je le en sistem nadzora različic"
 
-#: ../meld/vcview.py:362
+#: ../meld/vcview.py:274
 msgid "Choose which version control system to use"
 msgstr "Izbor različice sistema za nadzor različic za uporabo"
 
-#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:417
+#. TRANSLATORS: This is the location of the directory being viewed
+#: ../meld/vcview.py:326
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:431 ../meld/vcview.py:439
+#: ../meld/vcview.py:346
 #, python-format
 msgid "Scanning %s"
 msgstr "Preiskovanje %s"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:385
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:522
+#: ../meld/vcview.py:429
 #, python-format
 msgid "%s — local"
 msgstr "%s — krajevno"
 
-#: ../meld/vcview.py:523
+#: ../meld/vcview.py:430
 #, python-format
 msgid "%s — remote"
 msgstr "%s — oddaljeno"
 
-#: ../meld/vcview.py:531
+#: ../meld/vcview.py:438
 #, fuzzy, python-format
 msgid "%s (local, merge, remote)"
 msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
 
-#: ../meld/vcview.py:536
+#: ../meld/vcview.py:443
 #, fuzzy, python-format
 msgid "%s (remote, merge, local)"
 msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
 
-#: ../meld/vcview.py:547
+#: ../meld/vcview.py:454
 #, python-format
 msgid "%s — repository"
 msgstr "%s — skladišče"
 
-#: ../meld/vcview.py:553
+#: ../meld/vcview.py:460
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (delovno, skladišče)"
 
-#: ../meld/vcview.py:557
+#: ../meld/vcview.py:464
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (skladišče, delovno)"
 
-#: ../meld/vcview.py:741
+#: ../meld/vcview.py:632
 msgid "Remove folder and all its files?"
 msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
 
-#: ../meld/vcview.py:743
+#: ../meld/vcview.py:634
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2113,11 +2433,149 @@ msgstr ""
 "S tem dejanjem bodo odstranjene vse izbrane datoteke in mape in vse "
 "podrejene datoteke iz sistema za nadzor različic"
 
-#: ../meld/vcview.py:777
+#: ../meld/vcview.py:659
 #, python-format
 msgid "Error removing %s"
 msgstr "Napaka med odstranjevanjem %s"
 
+#: ../meld/vcview.py:739
+msgid "Clear"
+msgstr ""
+
+#~ msgid "Meld does not support Python 3."
+#~ msgstr "Program Meld ne podpira okolja Python 3."
+
+#, fuzzy
+#~ msgid "Automatically detected text encodings"
+#~ msgstr "Dovoli samodejno skrčenje besedila ob združevanju"
+
+#~ msgid "Copy _Left"
+#~ msgstr "Kopiraj _levo"
+
+#~ msgid "Copy _Right"
+#~ msgstr "Kopiraj _desno"
+
+#~ msgid ""
+#~ "'%s' exists.\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "'%s' že obstaja.\n"
+#~ "Ali naj bo prepisana?"
+
+#~ msgid "Add a manual point for synchronization of changes between files"
+#~ msgstr "Dodaj ročno točko usklajevanja sprememb med datotekami"
+
+#~ msgid "Clear manual change sychronization points"
+#~ msgstr "Počisti ročno spremenjene točke usklajevanja"
+
+#~ msgid "Cycle Through Documents"
+#~ msgstr "Preklopi med dokumenti"
+
+#~ msgid ""
+#~ "Filter '%s' changed the number of lines in the file. Comparison will be "
+#~ "incorrect. See the user manual for more details."
+#~ msgstr ""
+#~ "Po uporabi filtra '%s' se je spremenilo število vrstic v datoteki, zato "
+#~ "primerjava ne bo natančna. Za več podrobnosti si oglejte priročnik."
+
+#~ msgid "[%s] Set num panes"
+#~ msgstr "[%s] Določi okna"
+
+#~ msgid "[%s] Opening files"
+#~ msgstr "[%s] Odpiranje datotek"
+
+#~ msgid "Could not read file"
+#~ msgstr "Ni mogoče prebrati datoteke"
+
+#~ msgid "[%s] Reading files"
+#~ msgstr "[%s] Branje datotek"
+
+#~ msgid "%s appears to be a binary file."
+#~ msgstr "%s je videti kot dvojiška datoteka."
+
+#~ msgid "%s is not in encodings: %s"
+#~ msgstr "%s ni zapisan v naboru: %s"
+
+#~ msgid ""
+#~ "\"%s\" exists!\n"
+#~ "Overwrite?"
+#~ msgstr ""
+#~ "\"%s\" že obstaja!\n"
+#~ "Ali naj bo datoteka prepisana?"
+
+#~ msgid ""
+#~ "Error writing to %s\n"
+#~ "\n"
+#~ "%s."
+#~ msgstr ""
+#~ "Napaka med pisanjem na %s\n"
+#~ "\n"
+#~ "%s."
+
+#~ msgid ""
+#~ "This file '%s' contains a mixture of line endings.\n"
+#~ "\n"
+#~ "Which format would you like to use?"
+#~ msgstr ""
+#~ "Datoteka '%s' vsebuje različne zaključne znake vrstic.\n"
+#~ "\n"
+#~ "Kateri zapis želite uporabiti?"
+
+#~ msgid ""
+#~ "'%s' contains characters not encodable with '%s'\n"
+#~ "Would you like to save as UTF-8?"
+#~ msgstr ""
+#~ "'%s' vsebuje znake, ki jih ni mogoče kodirati v naboru '%s'\n"
+#~ "Ali naj se datoteka shrani v naboru UTF-8?"
+
+#~ msgid "_Tabs"
+#~ msgstr "_Zavihki"
+
+#~ msgid "_Previous Tab"
+#~ msgstr "_Predhodni zavihek"
+
+#~ msgid "Activate previous tab"
+#~ msgstr "Pokaži predhodni zavihek"
+
+#~ msgid "_Next Tab"
+#~ msgstr "_Naslednji zavihek"
+
+#~ msgid "Activate next tab"
+#~ msgstr "Pokaži naslednji zavihek"
+
+#~ msgid "Move Tab _Left"
+#~ msgstr "Premakni zavihek _levo"
+
+#~ msgid "Move current tab to left"
+#~ msgstr "Premakni trenutni zavihek na levo"
+
+#~ msgid "Move Tab _Right"
+#~ msgstr "Premakni zavihek _desno"
+
+#~ msgid "Move current tab to right"
+#~ msgstr "Premakni trenutni zavihek na desno"
+
+#~ msgid "Switch to this tab"
+#~ msgstr "Preklopi na ta zavihek"
+
+#~ msgid "Regular expression error"
+#~ msgstr "Napaka v logičnem izrazu"
+
+#~ msgid "Revision"
+#~ msgstr "Predelava"
+
+#~ msgid "Options"
+#~ msgstr "Možnosti"
+
+#~ msgid "%s not installed"
+#~ msgstr "Program %s ni nameščen"
+
+#~ msgid "Invalid repository"
+#~ msgstr "Neveljavno skladišče"
+
+#~ msgid "%s (%s)"
+#~ msgstr "%s (%s)"
+
 #~ msgid "Ignore changes which insert or delete blank lines"
 #~ msgstr ""
 #~ "Prezri spremembe, s katerimi se vstavijo ali izbrišejo prazne vrstice"