[meld] Updated Slovenian translation

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

commit f4e7e2e9aab419bd35dd7efd5162f9d69a46934a
Author: Matej Urbančič <mateju svn gnome org>
Date:   Wed Aug 9 22:14:32 2017 +0200

    Updated Slovenian translation

 po/sl.po |  693 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 357 insertions(+), 336 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 6d72c20..f6002fb 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,35 +2,36 @@
 # 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-2016.
+# Matej Urbančič <mateju svn gnome org>, 2009–2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-08-18 22:43+0200\n"
-"PO-Revision-Date: 2016-08-18 22:44+0200\n"
+"POT-Creation-Date: 2017-08-09 22:02+0200\n"
+"PO-Revision-Date: 2017-08-09 22:06+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_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.8.7.1\n"
+"X-Generator: Poedit 2.0.1\n"
 
-#: ../bin/meld:142
+#: ../bin/meld:179
 msgid "Cannot import: "
 msgstr "Ni mogoče uvoziti:"
 
-#: ../bin/meld:145
+#: ../bin/meld:182
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Program Meld zahteva najmanj različico %s."
 
-#: ../bin/meld:194
+#: ../bin/meld:227
 #, c-format
 msgid ""
 "Couldn't load Meld-specific CSS (%s)\n"
@@ -73,41 +74,57 @@ msgid ""
 "merge conflicts slightly less painful."
 msgstr ""
 
+#: ../data/meld.appdata.xml.in.h:5
+msgid "The GNOME Project"
+msgstr "Projekt GNOME"
+
 #: ../data/mime/meld.xml.in.h:1
 msgid "Meld comparison description"
 msgstr "Opis primerjave Meld"
 
 #: ../data/org.gnome.meld.gschema.xml.h:1
-msgid "Default window size"
-msgstr "Privzeta velikost okna"
+msgid "Default window width"
+msgstr "Privzeta širina okna"
 
 #: ../data/org.gnome.meld.gschema.xml.h:2
-msgid "Default window state"
-msgstr "Privzeto stanje okna"
+msgid "Default window height"
+msgstr "Privzeta višina okna"
 
 #: ../data/org.gnome.meld.gschema.xml.h:3
+#, fuzzy
+#| msgid "Default window state"
+msgid "Default window maximised state"
+msgstr "Privzeto stanje okna"
+
+#: ../data/org.gnome.meld.gschema.xml.h:4
+#, fuzzy
+#| msgid "Default window state"
+msgid "Default window fullscreen state"
+msgstr "Privzeto stanje okna"
+
+#: ../data/org.gnome.meld.gschema.xml.h:5
 msgid "Show toolbar"
 msgstr "Pokaži orodno vrstico"
 
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: ../data/org.gnome.meld.gschema.xml.h:6
 #, fuzzy
 msgid "If true, the window toolbar is visible."
 msgstr "Prav, če je okno lastnosti razpeto."
 
-#: ../data/org.gnome.meld.gschema.xml.h:5
+#: ../data/org.gnome.meld.gschema.xml.h:7
 msgid "Show statusbar"
 msgstr "Pokaži vrstico stanja"
 
-#: ../data/org.gnome.meld.gschema.xml.h:6
+#: ../data/org.gnome.meld.gschema.xml.h:8
 #, fuzzy
 msgid "If true, the window statusbar is visible."
 msgstr "Prav, če je okno lastnosti razpeto."
 
-#: ../data/org.gnome.meld.gschema.xml.h:7
+#: ../data/org.gnome.meld.gschema.xml.h:9
 msgid "Additional automatically detected text encodings"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: ../data/org.gnome.meld.gschema.xml.h:10
 msgid ""
 "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 "
@@ -115,171 +132,171 @@ msgid ""
 "may also be tried, depending on the user's locale."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:9
+#: ../data/org.gnome.meld.gschema.xml.h:11
 #, fuzzy
 msgid "Width of an indentation step"
 msgstr "V korak z"
 
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: ../data/org.gnome.meld.gschema.xml.h:12
 #, fuzzy
 msgid "The number of spaces to use for a single indent step"
 msgstr "Število presledkov za vsak korak zamika"
 
-#: ../data/org.gnome.meld.gschema.xml.h:11
+#: ../data/org.gnome.meld.gschema.xml.h:13
 msgid "Whether to indent using spaces or tabs"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: ../data/org.gnome.meld.gschema.xml.h:14
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: ../data/org.gnome.meld.gschema.xml.h:15
 msgid "Show line numbers"
 msgstr "Pokaži številke vrstic"
 
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: ../data/org.gnome.meld.gschema.xml.h:16
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: ../data/org.gnome.meld.gschema.xml.h:17
 msgid "Highlight syntax"
 msgstr "Poudarjanje skladnje"
 
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: ../data/org.gnome.meld.gschema.xml.h:18
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld's own color "
 "highlighting, this is off by default."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: ../data/org.gnome.meld.gschema.xml.h:19
 msgid "Color scheme to use for syntax highlighting"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../data/org.gnome.meld.gschema.xml.h:20
 msgid "Used by GtkSourceView to determine colors for syntax highlighting"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: ../data/org.gnome.meld.gschema.xml.h:21
 #, fuzzy
 msgid "Displayed whitespace"
 msgstr "Prikazana stran"
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:22
 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:21
+#: ../data/org.gnome.meld.gschema.xml.h:23
 msgid "Wrap mode"
 msgstr "Način preloma"
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:24
 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:23
+#: ../data/org.gnome.meld.gschema.xml.h:25
 msgid "Highlight current line"
 msgstr "Poudari trenutno vrstico"
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:26
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:27
 #, 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:26
+#: ../data/org.gnome.meld.gschema.xml.h:28
 msgid ""
 "If false, custom-font will be used instead of the system monospace font."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: ../data/org.gnome.meld.gschema.xml.h:29
 msgid "Custom font"
 msgstr "Pisava po meri"
 
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:30
 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:29
+#: ../data/org.gnome.meld.gschema.xml.h:31
 msgid "Ignore blank lines when comparing files"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:32
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: ../data/org.gnome.meld.gschema.xml.h:33
 #, fuzzy
 msgid "Use the system default editor"
 msgstr "Uporabi _privzet sistemski urejevalnik besedil."
 
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:34
 msgid ""
 "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:33
+#: ../data/org.gnome.meld.gschema.xml.h:35
 #, fuzzy
 msgid "The custom editor launch command"
 msgstr "Ukaz za zagon urejevalnika:"
 
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: ../data/org.gnome.meld.gschema.xml.h:36
 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:35
+#: ../data/org.gnome.meld.gschema.xml.h:37
 msgid "Columns to display"
 msgstr "Prikazani stolpci"
 
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:38
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:37 ../data/ui/preferences.ui.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25
 msgid "Ignore symbolic links"
 msgstr "Prezri simbolne povezave"
 
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: ../data/org.gnome.meld.gschema.xml.h:40
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:39
+#: ../data/org.gnome.meld.gschema.xml.h:41
 #, fuzzy
 msgid "Use shallow comparison"
 msgstr "Nova primerjava"
 
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: ../data/org.gnome.meld.gschema.xml.h:42
 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:41
+#: ../data/org.gnome.meld.gschema.xml.h:43
 #, fuzzy
 msgid "File timestamp resolution"
 msgstr "Ploskev žariščne ločljivosti X"
 
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: ../data/org.gnome.meld.gschema.xml.h:44
 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 "
@@ -287,129 +304,129 @@ msgid ""
 "resolution."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:43 ../data/ui/preferences.ui.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22
 msgid "Apply text filters during folder comparisons"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:46
 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
+#: ../data/org.gnome.meld.gschema.xml.h:47
 msgid "File status filters"
 msgstr "Filtri stanja datotek"
 
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:48
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:49
 #, 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:48
+#: ../data/org.gnome.meld.gschema.xml.h:50
 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:49
+#: ../data/org.gnome.meld.gschema.xml.h:51
 #, fuzzy
 msgid "Version control pane position"
 msgstr "Vstavek sistema nadzora različic"
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:52
 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:51
+#: ../data/org.gnome.meld.gschema.xml.h:53
 msgid "Present version comparisons as left-local/right-remote"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:54
 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:53
+#: ../data/org.gnome.meld.gschema.xml.h:55
 #, 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:54
+#: ../data/org.gnome.meld.gschema.xml.h:56
 msgid ""
 "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:55
+#: ../data/org.gnome.meld.gschema.xml.h:57
 #, 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:56
+#: ../data/org.gnome.meld.gschema.xml.h:58
 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:57
+#: ../data/org.gnome.meld.gschema.xml.h:59
 #, 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:58
+#: ../data/org.gnome.meld.gschema.xml.h:60
 msgid ""
 "The column at which to show the margin in the version control commit message "
 "editor."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:61
 msgid "Automatically hard-wrap commit messages"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: ../data/org.gnome.meld.gschema.xml.h:62
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the commit margin before commit."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: ../data/org.gnome.meld.gschema.xml.h:63
 #, fuzzy
 msgid "Version control status filters"
 msgstr "Vstavek sistema nadzora različic"
 
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: ../data/org.gnome.meld.gschema.xml.h:64
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:63
+#: ../data/org.gnome.meld.gschema.xml.h:65
 #, fuzzy
 msgid "Filename-based filters"
 msgstr "Izvoz Balsinih filtrov"
 
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: ../data/org.gnome.meld.gschema.xml.h:66
 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:65
+#: ../data/org.gnome.meld.gschema.xml.h:67
 #, fuzzy
 msgid "Text-based filters"
 msgstr "Izvoz Balsinih filtrov"
 
-#: ../data/org.gnome.meld.gschema.xml.h:66
+#: ../data/org.gnome.meld.gschema.xml.h:68
 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, "
@@ -482,7 +499,7 @@ msgstr "Primerjajo izbrane datoteke"
 
 #: ../data/ui/dirdiff.ui.h:3
 msgid "Copy to _Left"
-msgstr ""
+msgstr "Kopiraj na _levo"
 
 #: ../data/ui/dirdiff.ui.h:4
 msgid "Copy to left"
@@ -490,7 +507,7 @@ msgstr "Kopiraj na levo"
 
 #: ../data/ui/dirdiff.ui.h:5
 msgid "Copy to _Right"
-msgstr ""
+msgstr "Kopiraj na _desno"
 
 #: ../data/ui/dirdiff.ui.h:6
 msgid "Copy to right"
@@ -500,7 +517,7 @@ msgstr "Kopiraj na desno"
 msgid "Delete selected"
 msgstr "Izbriši izbor"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:859 ../meld/filediff.py:1384
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:855 ../meld/filediff.py:1357
 msgid "Hide"
 msgstr "Skrij"
 
@@ -569,7 +586,7 @@ msgid "_Add"
 msgstr "_Dodaj"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:638
+#: ../meld/vcview.py:644
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -791,8 +808,8 @@ msgstr "V primeru, da sprememb ne shranite, bodo te trajno izgubljene."
 msgid "Close _without Saving"
 msgstr "Zapri _brez shranjevanja"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:941 ../meld/filediff.py:1450
-#: ../meld/filediff.py:1518
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:937 ../meld/filediff.py:1423
+#: ../meld/filediff.py:1495
 msgid "_Cancel"
 msgstr "_Prekliči"
 
@@ -829,7 +846,7 @@ msgstr "Ali naj se povrnejo neshranjene spremembe dokumentov?"
 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 ../meld/dirdiff.py:942 ../meld/filediff.py:1451
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:938 ../meld/filediff.py:1424
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
@@ -877,7 +894,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:144
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:154
 msgid "Save Patch"
 msgstr "Shrani popravek"
 
@@ -898,170 +915,140 @@ msgid "_Reverse patch direction"
 msgstr "Obrni smer popravka"
 
 #: ../data/ui/preferences.ui.h:1
-msgid "Left is remote, right is local"
-msgstr "Levo je oddaljeno, desno krajevno"
-
-#: ../data/ui/preferences.ui.h:2
-msgid "Left is local, right is remote"
-msgstr "Levo je krajevno, desno oddaljeno"
-
-#: ../data/ui/preferences.ui.h:3
-#, fuzzy
-msgid "Remote, merge, local"
-msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
-
-#: ../data/ui/preferences.ui.h:4
-#, fuzzy
-msgid "Local, merge, remote"
-msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
-
-#: ../data/ui/preferences.ui.h:5
-msgid "1ns (ext4)"
-msgstr "1ns (ext4)"
-
-#: ../data/ui/preferences.ui.h:6
-msgid "100ns (NTFS)"
-msgstr "100ns (NTFS)"
-
-#: ../data/ui/preferences.ui.h:7
-msgid "1s (ext2/ext3)"
-msgstr "1s (ext2/ext3)"
-
-#: ../data/ui/preferences.ui.h:8
-msgid "2s (VFAT)"
-msgstr "2s (VFAT)"
-
-#: ../data/ui/preferences.ui.h:9
 msgid "Meld Preferences"
 msgstr "Možnosti Meld"
 
-#: ../data/ui/preferences.ui.h:10
+#: ../data/ui/preferences.ui.h:2
 msgid "Font"
 msgstr "Pisava"
 
-#: ../data/ui/preferences.ui.h:11
+#: ../data/ui/preferences.ui.h:3
 msgid "_Use the system fixed width font"
 msgstr "_Uporabi sistemsko pisavo določene širine"
 
-#: ../data/ui/preferences.ui.h:12
+#: ../data/ui/preferences.ui.h:4
 msgid "_Editor font:"
 msgstr "Pisava _urejevalnika:"
 
-#: ../data/ui/preferences.ui.h:13
+#: ../data/ui/preferences.ui.h:5
 msgid "Display"
 msgstr "Prikaz"
 
-#: ../data/ui/preferences.ui.h:14
+#: ../data/ui/preferences.ui.h:6
 msgid "_Tab width:"
 msgstr "Širina _tabulatorja:"
 
-#: ../data/ui/preferences.ui.h:15
+#: ../data/ui/preferences.ui.h:7
 msgid "_Insert spaces instead of tabs"
 msgstr "Vstavi _presledke namesto tabulatorjev"
 
-#: ../data/ui/preferences.ui.h:16
+#: ../data/ui/preferences.ui.h:8
 msgid "Enable text _wrapping"
 msgstr "Omogoči _prelom besedila"
 
-#: ../data/ui/preferences.ui.h:17
+#: ../data/ui/preferences.ui.h:9
 msgid "Do not _split words over two lines"
 msgstr "Ne _deli besed preko dveh vrstic"
 
-#: ../data/ui/preferences.ui.h:18
+#: ../data/ui/preferences.ui.h:10
 msgid "Highlight _current line"
 msgstr "Poudari _trenutno vrstico"
 
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:11
 msgid "Show _line numbers"
 msgstr "Pokaži _številke vrstic"
 
-#: ../data/ui/preferences.ui.h:20
+#: ../data/ui/preferences.ui.h:12
 msgid "Show w_hitespace"
 msgstr "Pokaži _presledne znake"
 
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:13
 msgid "Use s_yntax highlighting"
 msgstr "Uporabi _barvno poudarjanje skladnje"
 
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:14
 msgid "Syntax highlighting color scheme:"
 msgstr ""
 
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:15
 msgid "External Editor"
 msgstr "Zunanji urejevalnik"
 
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:16
 msgid "Use _default system editor"
 msgstr "Uporabi _privzet sistemski urejevalnik besedil."
 
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:17
 msgid "Edito_r command:"
 msgstr "Ukaz _urejevalnika:"
 
-#: ../data/ui/preferences.ui.h:26
+#: ../data/ui/preferences.ui.h:18
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: ../data/ui/preferences.ui.h:27
+#: ../data/ui/preferences.ui.h:19
 msgid "Shallow Comparison"
 msgstr "Groba primerjava"
 
-#: ../data/ui/preferences.ui.h:28
+#: ../data/ui/preferences.ui.h:20
 msgid "C_ompare files based only on size and timestamp"
 msgstr "_Primerjaj datoteke na osnovi velikosti in časovnega žiga"
 
-#: ../data/ui/preferences.ui.h:29
+#: ../data/ui/preferences.ui.h:21
 msgid "_Timestamp resolution:"
 msgstr "Ločljivost časovnega _žiga:"
 
-#: ../data/ui/preferences.ui.h:31
+#: ../data/ui/preferences.ui.h:23
+msgid "Note: enabling text filters may make comparing large files much slower"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:24
 msgid "Symbolic Links"
 msgstr "Simbolne povezave"
 
-#: ../data/ui/preferences.ui.h:33
+#: ../data/ui/preferences.ui.h:26
 msgid "Visible Columns"
 msgstr "Vidni stolpci"
 
-#: ../data/ui/preferences.ui.h:34
+#: ../data/ui/preferences.ui.h:27
 msgid "Folder Comparisons"
 msgstr "Primerjava map"
 
-#: ../data/ui/preferences.ui.h:35
+#: ../data/ui/preferences.ui.h:28
 msgid "Version Comparisons"
 msgstr "Primerjave različic"
 
-#: ../data/ui/preferences.ui.h:36
+#: ../data/ui/preferences.ui.h:29
 #, fuzzy
 msgid "_Order when comparing file revisions:"
 msgstr "_Med primerjavo predelav datotek"
 
-#: ../data/ui/preferences.ui.h:37
+#: ../data/ui/preferences.ui.h:30
 #, fuzzy
 msgid "Order when _merging files:"
 msgstr "Predvajaj _glasbene datoteke, ko so povezane"
 
-#: ../data/ui/preferences.ui.h:38
+#: ../data/ui/preferences.ui.h:31
 msgid "Commit Messages"
 msgstr "Uveljavi sporočila"
 
-#: ../data/ui/preferences.ui.h:39
+#: ../data/ui/preferences.ui.h:32
 msgid "Show _right margin at:"
 msgstr "Pokaži _desni rob pri:"
 
-#: ../data/ui/preferences.ui.h:40
+#: ../data/ui/preferences.ui.h:33
 msgid "Automatically _break lines at right margin on commit"
 msgstr "Samodejno _prelomi vrstice na desnem robu ob uveljavitvi"
 
-#: ../data/ui/preferences.ui.h:41
+#: ../data/ui/preferences.ui.h:34
 msgid "Version Control"
 msgstr "Nadzor različic"
 
-#: ../data/ui/preferences.ui.h:42
+#: ../data/ui/preferences.ui.h:35
 msgid "Filename filters"
 msgstr "Datotečni filtri"
 
-#: ../data/ui/preferences.ui.h:43
+#: ../data/ui/preferences.ui.h:36
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -1071,24 +1058,24 @@ msgstr ""
 "vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), ločenimi s "
 "presledki."
 
-#: ../data/ui/preferences.ui.h:44 ../meld/meldwindow.py:103
+#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:104
 msgid "File Filters"
 msgstr "Filtri datotek"
 
-#: ../data/ui/preferences.ui.h:45
+#: ../data/ui/preferences.ui.h:38
 #, fuzzy
 msgid "Change trimming"
 msgstr "Spremeni opazovanje"
 
-#: ../data/ui/preferences.ui.h:46
+#: ../data/ui/preferences.ui.h:39
 msgid "Trim blank line differences from the start and end of changes"
 msgstr ""
 
-#: ../data/ui/preferences.ui.h:47
+#: ../data/ui/preferences.ui.h:40
 msgid "Text filters"
 msgstr "Filtri besedila"
 
-#: ../data/ui/preferences.ui.h:48
+#: ../data/ui/preferences.ui.h:41
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -1102,10 +1089,44 @@ msgstr ""
 "izraz vključuje skupine, so zamenjane le te. Več podrobnosti je zapisanih v "
 "priročniku."
 
-#: ../data/ui/preferences.ui.h:49
+#: ../data/ui/preferences.ui.h:42
 msgid "Text Filters"
 msgstr "Filtri besedila"
 
+#: ../data/ui/preferences.ui.h:43
+msgid "Left is remote, right is local"
+msgstr "Levo je oddaljeno, desno krajevno"
+
+#: ../data/ui/preferences.ui.h:44
+msgid "Left is local, right is remote"
+msgstr "Levo je krajevno, desno oddaljeno"
+
+#: ../data/ui/preferences.ui.h:45
+#, fuzzy
+msgid "Remote, merge, local"
+msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
+
+#: ../data/ui/preferences.ui.h:46
+#, fuzzy
+msgid "Local, merge, remote"
+msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
+
+#: ../data/ui/preferences.ui.h:47
+msgid "1ns (ext4)"
+msgstr "1ns (ext4)"
+
+#: ../data/ui/preferences.ui.h:48
+msgid "100ns (NTFS)"
+msgstr "100ns (NTFS)"
+
+#: ../data/ui/preferences.ui.h:49
+msgid "1s (ext2/ext3)"
+msgstr "1s (ext2/ext3)"
+
+#: ../data/ui/preferences.ui.h:50
+msgid "2s (VFAT)"
+msgstr "2s (VFAT)"
+
 #: ../data/ui/shortcuts.ui.h:1
 msgctxt "shortcut window"
 msgid "General"
@@ -1159,17 +1180,17 @@ msgstr ""
 #: ../data/ui/shortcuts.ui.h:11
 msgctxt "shortcut window"
 msgid "Switch to tab"
-msgstr ""
+msgstr "Preklopi na zavihek"
 
 #: ../data/ui/shortcuts.ui.h:12
 msgctxt "shortcut window"
 msgid "Move tab left"
-msgstr ""
+msgstr "Premakni zavihek levo"
 
 #: ../data/ui/shortcuts.ui.h:13
 msgctxt "shortcut window"
 msgid "Move tab right"
-msgstr ""
+msgstr "Premakni zavihek desno"
 
 #: ../data/ui/shortcuts.ui.h:14
 msgctxt "shortcut window"
@@ -1189,127 +1210,127 @@ msgstr ""
 #: ../data/ui/shortcuts.ui.h:17
 msgctxt "shortcut window"
 msgid "Editing"
-msgstr ""
+msgstr "Urejanje"
 
 #: ../data/ui/shortcuts.ui.h:18
 msgctxt "shortcut window"
 msgid "Undo"
-msgstr ""
+msgstr "Razveljavi"
 
 #: ../data/ui/shortcuts.ui.h:19
 msgctxt "shortcut window"
 msgid "Redo"
-msgstr ""
+msgstr "Ponovi"
 
 #: ../data/ui/shortcuts.ui.h:20
 msgctxt "shortcut window"
 msgid "Cut"
-msgstr ""
+msgstr "Izreži"
 
 #: ../data/ui/shortcuts.ui.h:21
 msgctxt "shortcut window"
 msgid "Copy"
-msgstr ""
+msgstr "Kopiraj"
 
 #: ../data/ui/shortcuts.ui.h:22
 msgctxt "shortcut window"
 msgid "Paste"
-msgstr ""
+msgstr "Prilepi"
 
 #: ../data/ui/shortcuts.ui.h:23
 msgctxt "shortcut window"
 msgid "Find"
-msgstr ""
+msgstr "Najdi"
 
 #: ../data/ui/shortcuts.ui.h:24
 msgctxt "shortcut window"
 msgid "Find Next"
-msgstr ""
+msgstr "Najdi naslednje"
 
 #: ../data/ui/shortcuts.ui.h:25
 msgctxt "shortcut window"
 msgid "Find Previous"
-msgstr ""
+msgstr "Najdi predhodno"
 
 #: ../data/ui/shortcuts.ui.h:26
 msgctxt "shortcut window"
 msgid "Replace"
-msgstr ""
+msgstr "Zamenjaj"
 
 #: ../data/ui/shortcuts.ui.h:27
 msgctxt "shortcut window"
 msgid "File comparison"
-msgstr ""
+msgstr "Primerjava datotek"
 
 #: ../data/ui/shortcuts.ui.h:28
 msgctxt "shortcut window"
 msgid "Save current file"
-msgstr ""
+msgstr "Shrani trenutno datoteko"
 
 #: ../data/ui/shortcuts.ui.h:29
 msgctxt "shortcut window"
 msgid "Save current file to new path"
-msgstr ""
+msgstr "Shrani trenutni izbor kot novo prednastavitev"
 
 #: ../data/ui/shortcuts.ui.h:30
 msgctxt "shortcut window"
 msgid "Save all files in comparison"
-msgstr ""
+msgstr "Shrani vse datoteke trenutne primerjave"
 
 #: ../data/ui/shortcuts.ui.h:31
 msgctxt "shortcut window"
 msgid "Previous conflict"
-msgstr ""
+msgstr "Predhodni spor"
 
 #: ../data/ui/shortcuts.ui.h:32
 msgctxt "shortcut window"
 msgid "Next conflict"
-msgstr ""
+msgstr "Naslednji spor"
 
 #: ../data/ui/shortcuts.ui.h:33
 msgctxt "shortcut window"
 msgid "Push change to left"
-msgstr ""
+msgstr "Potisni trenutne spremembe na levo"
 
 #: ../data/ui/shortcuts.ui.h:34
 msgctxt "shortcut window"
 msgid "Push change to right"
-msgstr ""
+msgstr "Potisni trenutne spremembe na desno"
 
 #: ../data/ui/shortcuts.ui.h:35
 msgctxt "shortcut window"
 msgid "Pull change from left"
-msgstr ""
+msgstr "Potegni spremembe z leve"
 
 #: ../data/ui/shortcuts.ui.h:36
 msgctxt "shortcut window"
 msgid "Pull change from right"
-msgstr ""
+msgstr "Potegni spremembe z desne"
 
 #: ../data/ui/shortcuts.ui.h:37
 msgctxt "shortcut window"
 msgid "Copy change above left"
-msgstr ""
+msgstr "Kopiraj spremembe nad levi del"
 
 #: ../data/ui/shortcuts.ui.h:38
 msgctxt "shortcut window"
 msgid "Copy change below left"
-msgstr ""
+msgstr "Kopiraj spremembe pod levi del"
 
 #: ../data/ui/shortcuts.ui.h:39
 msgctxt "shortcut window"
 msgid "Copy change above right"
-msgstr ""
+msgstr "Kopiraj spremembe nad desni del"
 
 #: ../data/ui/shortcuts.ui.h:40
 msgctxt "shortcut window"
 msgid "Copy change below right"
-msgstr ""
+msgstr "Kopiraj spremembe pod desni del"
 
 #: ../data/ui/shortcuts.ui.h:41
 msgctxt "shortcut window"
 msgid "Delete change"
-msgstr ""
+msgstr "Izbriši spremembo"
 
 #: ../data/ui/shortcuts.ui.h:42
 msgctxt "shortcut window"
@@ -1329,29 +1350,29 @@ msgstr ""
 #: ../data/ui/shortcuts.ui.h:45
 msgctxt "shortcut window"
 msgid "Copy to left"
-msgstr ""
+msgstr "Kopiraj na levo"
 
 #: ../data/ui/shortcuts.ui.h:46
 msgctxt "shortcut window"
 msgid "Copy to right"
-msgstr ""
+msgstr "Kopiraj na desno"
 
 #: ../data/ui/shortcuts.ui.h:47
 msgctxt "shortcut window"
 msgid "Version control comparison"
-msgstr ""
+msgstr "Primerjava nadzora različic"
 
 #: ../data/ui/shortcuts.ui.h:48
 msgctxt "shortcut window"
 msgid "Commit to version control"
-msgstr ""
+msgstr "Uveljavi spremembe v sistem za nadzor različic"
 
 #: ../data/ui/shortcuts.ui.h:49
 msgctxt "shortcut window"
 msgid "Show/hide console output"
-msgstr ""
+msgstr "Pokaži/Skrij odvod konzole"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:570
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:562
 #: ../meld/newdifftab.py:38
 msgid "New comparison"
 msgstr "Nova primerjava"
@@ -1529,7 +1550,7 @@ msgstr "Predhodni dnevniki:"
 msgid "Co_mmit"
 msgstr "_Uveljavi"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:326
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332
 msgid "Location"
 msgstr "Mesto"
 
@@ -1539,7 +1560,7 @@ msgstr "Stanje"
 
 #: ../data/ui/vcview.ui.h:38
 msgid "Extra"
-msgstr ""
+msgstr "Dodatno"
 
 #: ../data/ui/vcview.ui.h:39
 msgid "Console output"
@@ -1559,15 +1580,15 @@ msgstr "_Objavi uveljavitve"
 
 #: ../meld/const.py:12
 msgid "UNIX (LF)"
-msgstr ""
+msgstr "UNIX (LF)"
 
 #: ../meld/const.py:13
 msgid "DOS/Windows (CR-LF)"
-msgstr ""
+msgstr "DOS/Windows (CR-LF)"
 
 #: ../meld/const.py:14
 msgid "Mac OS (CR)"
-msgstr ""
+msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
 #: ../meld/dirdiff.py:391 ../meld/preferences.py:82
@@ -1584,68 +1605,68 @@ msgstr "Čas spremembe"
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: ../meld/dirdiff.py:537
+#: ../meld/dirdiff.py:534
 #, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:669 ../meld/dirdiff.py:693
+#: ../meld/dirdiff.py:666 ../meld/dirdiff.py:690
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:826
+#: ../meld/dirdiff.py:822
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] končano"
 
-#: ../meld/dirdiff.py:834
+#: ../meld/dirdiff.py:830
 msgid "Folders have no differences"
 msgstr ""
 
-#: ../meld/dirdiff.py:836
+#: ../meld/dirdiff.py:832
 msgid "Contents of scanned files in folders are identical."
 msgstr ""
 
-#: ../meld/dirdiff.py:838
+#: ../meld/dirdiff.py:834
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 
-#: ../meld/dirdiff.py:841
+#: ../meld/dirdiff.py:837
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 
-#: ../meld/dirdiff.py:843
+#: ../meld/dirdiff.py:839
 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
+#: ../meld/dirdiff.py:857 ../meld/filediff.py:1359 ../meld/filediff.py:1389
+#: ../meld/filediff.py:1391 ../meld/ui/msgarea.py:105 ../meld/ui/msgarea.py:118
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/dirdiff.py:871
+#: ../meld/dirdiff.py:867
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je prišlo do več napak."
 
-#: ../meld/dirdiff.py:872
+#: ../meld/dirdiff.py:868
 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:874
+#: ../meld/dirdiff.py:870
 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:876
+#: ../meld/dirdiff.py:872
 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:878
+#: ../meld/dirdiff.py:874
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1654,28 +1675,28 @@ msgstr ""
 "razlike velikosti upošteva. Nekatere datoteke so skrite:\n"
 "%s"
 
-#: ../meld/dirdiff.py:889
+#: ../meld/dirdiff.py:885
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:945
+#: ../meld/dirdiff.py:941
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr ""
 
-#: ../meld/dirdiff.py:947
+#: ../meld/dirdiff.py:943
 #, python-format
 msgid ""
 "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 ""
 
-#: ../meld/dirdiff.py:960
+#: ../meld/dirdiff.py:956
 msgid "Error copying file"
 msgstr "Napaka kopiranja datoteke"
 
-#: ../meld/dirdiff.py:961
+#: ../meld/dirdiff.py:957
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1688,99 +1709,99 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:984
+#: ../meld/dirdiff.py:980
 #, python-format
 msgid "Error deleting %s"
 msgstr "Napaka med brisanjem %s"
 
-#: ../meld/dirdiff.py:1489
+#: ../meld/dirdiff.py:1491
 msgid "No folder"
 msgstr ""
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:354
+#: ../meld/filediff.py:335
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:354
+#: ../meld/filediff.py:335
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:356
+#: ../meld/filediff.py:337
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:781
+#: ../meld/filediff.py:762
 msgid "Comparison results will be inaccurate"
 msgstr ""
 
-#: ../meld/filediff.py:783
+#: ../meld/filediff.py:764
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
 msgstr ""
 
-#: ../meld/filediff.py:841
+#: ../meld/filediff.py:820
 #, fuzzy
 msgid "Mark conflict as resolved?"
 msgstr "Označi kot razrešeno v VC"
 
-#: ../meld/filediff.py:843
+#: ../meld/filediff.py:822
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 
-#: ../meld/filediff.py:845
+#: ../meld/filediff.py:824
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../meld/filediff.py:846
+#: ../meld/filediff.py:825
 msgid "Mark _Resolved"
 msgstr ""
 
-#: ../meld/filediff.py:1095
+#: ../meld/filediff.py:1073
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr ""
 
-#: ../meld/filediff.py:1103
+#: ../meld/filediff.py:1081
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr ""
 
-#: ../meld/filediff.py:1105
+#: ../meld/filediff.py:1083
 msgid "Do you want to open the file using the default application?"
 msgstr ""
 
-#: ../meld/filediff.py:1107
+#: ../meld/filediff.py:1085
 msgid "Open"
-msgstr ""
+msgstr "Odpri"
 
-#: ../meld/filediff.py:1123
+#: ../meld/filediff.py:1101
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Računanje razlik"
 
-#: ../meld/filediff.py:1188
+#: ../meld/filediff.py:1163
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Datoteka %s je bila na disku spremenjena."
 
-#: ../meld/filediff.py:1189
+#: ../meld/filediff.py:1164
 msgid "Do you want to reload the file?"
 msgstr "Ali želite ponovno naložiti datoteko?"
 
-#: ../meld/filediff.py:1191
+#: ../meld/filediff.py:1166
 msgid "_Reload"
 msgstr "_Ponovno naloži"
 
-#: ../meld/filediff.py:1349
+#: ../meld/filediff.py:1322
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1362
+#: ../meld/filediff.py:1335
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1788,26 +1809,26 @@ msgstr ""
 "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
 "Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: ../meld/filediff.py:1367
+#: ../meld/filediff.py:1340
 msgid "Files differ in line endings only"
 msgstr ""
 
-#: ../meld/filediff.py:1369
+#: ../meld/filediff.py:1342
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
 "%s"
 msgstr ""
 
-#: ../meld/filediff.py:1389
+#: ../meld/filediff.py:1362
 msgid "Show without filters"
 msgstr "Pokaži brez filtrov"
 
-#: ../meld/filediff.py:1411
+#: ../meld/filediff.py:1384
 msgid "Change highlighting incomplete"
 msgstr "Spremeni označevanje kot nedokončano"
 
-#: ../meld/filediff.py:1412
+#: ../meld/filediff.py:1385
 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."
@@ -1815,91 +1836,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:1420
+#: ../meld/filediff.py:1393
 msgid "Keep highlighting"
 msgstr "Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1422
+#: ../meld/filediff.py:1395
 msgid "_Keep highlighting"
 msgstr "_Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1454
+#: ../meld/filediff.py:1427
 #, python-format
 msgid "Replace file “%s”?"
-msgstr ""
+msgstr "Ali želite zamenjati datoteko »%s«?"
 
-#: ../meld/filediff.py:1456
+#: ../meld/filediff.py:1429
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
 "If you replace the existing file, its contents will be lost."
 msgstr ""
 
-#: ../meld/filediff.py:1473
+#: ../meld/filediff.py:1446
 msgid "Save Left Pane As"
 msgstr "Shrani levi pladenj kot"
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1448
 msgid "Save Middle Pane As"
 msgstr "Shrani srednji pladenj kot"
 
-#: ../meld/filediff.py:1477
+#: ../meld/filediff.py:1450
 msgid "Save Right Pane As"
 msgstr "Shrani desni pladenj kot"
 
-#: ../meld/filediff.py:1491
+#: ../meld/filediff.py:1464
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr ""
 
-#: ../meld/filediff.py:1493
+#: ../meld/filediff.py:1466
 #, 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:1496
+#: ../meld/filediff.py:1469
 msgid "Save Anyway"
 msgstr "Vseeno shrani"
 
-#: ../meld/filediff.py:1497
+#: ../meld/filediff.py:1470
 msgid "Don't Save"
 msgstr "Ne shrani"
 
-#: ../meld/filediff.py:1519
+#: ../meld/filediff.py:1496
 msgid "_Save as UTF-8"
-msgstr ""
+msgstr "_Shrani kot UTF-8"
 
-#: ../meld/filediff.py:1522
+#: ../meld/filediff.py:1499
 #, python-format
 msgid "Couldn't encode text as “%s”"
 msgstr ""
 
-#: ../meld/filediff.py:1524
+#: ../meld/filediff.py:1501
 #, python-format
 msgid ""
 "File “%s” contains characters that can't be encoded using encoding “%s”.\n"
 "Would you like to save as UTF-8?"
 msgstr ""
 
-#: ../meld/filediff.py:1564 ../meld/patchdialog.py:120
+#: ../meld/filediff.py:1541 ../meld/patchdialog.py:130
 #, python-format
 msgid "Could not save file %s."
 msgstr ""
 
-#: ../meld/filediff.py:1565 ../meld/patchdialog.py:121
+#: ../meld/filediff.py:1542 ../meld/patchdialog.py:131
 #, python-format
 msgid ""
 "Couldn't save file due to:\n"
 "%s"
 msgstr ""
 
-#: ../meld/filediff.py:1910
+#: ../meld/filediff.py:1906
 msgid "Live comparison updating disabled"
 msgstr "Živo posodabljanje ob primerjavi je onemogočeno"
 
-#: ../meld/filediff.py:1911
+#: ../meld/filediff.py:1907
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1914,11 +1935,11 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] Združevanje datotek"
 
-#: ../meld/gutterrendererchunk.py:159
+#: ../meld/gutterrendererchunk.py:210
 msgid "Copy _up"
 msgstr "Kopiraj _navzgor"
 
-#: ../meld/gutterrendererchunk.py:160
+#: ../meld/gutterrendererchunk.py:211
 msgid "Copy _down"
 msgstr "Kopiraj _navzdol"
 
@@ -2023,196 +2044,196 @@ msgstr "<neimenovano>"
 msgid "untitled"
 msgstr "neimenovano"
 
-#: ../meld/meldwindow.py:48
+#: ../meld/meldwindow.py:49
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../meld/meldwindow.py:49
+#: ../meld/meldwindow.py:50
 msgid "_New Comparison..."
 msgstr "_Nova primerjava ..."
 
-#: ../meld/meldwindow.py:50
+#: ../meld/meldwindow.py:51
 msgid "Start a new comparison"
 msgstr "Nova primerjava"
 
-#: ../meld/meldwindow.py:53
+#: ../meld/meldwindow.py:54
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
-#: ../meld/meldwindow.py:55
+#: ../meld/meldwindow.py:56
 msgid "Save As..."
 msgstr "Shrani kot ..."
 
-#: ../meld/meldwindow.py:56
+#: ../meld/meldwindow.py:57
 msgid "Save the current file with a different name"
 msgstr "Shrani trenutno datoteko z drugim imenom"
 
-#: ../meld/meldwindow.py:59
+#: ../meld/meldwindow.py:60
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
-#: ../meld/meldwindow.py:62
+#: ../meld/meldwindow.py:63
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../meld/meldwindow.py:64
+#: ../meld/meldwindow.py:65
 msgid "Undo the last action"
 msgstr "Razveljavi zadnje dejanje"
 
-#: ../meld/meldwindow.py:67
+#: ../meld/meldwindow.py:68
 msgid "Redo the last undone action"
 msgstr "Obnovi zadnje razveljavljeno dejanje"
 
-#: ../meld/meldwindow.py:69
+#: ../meld/meldwindow.py:70
 msgid "Cut the selection"
 msgstr "Izreži izbrano"
 
-#: ../meld/meldwindow.py:71
+#: ../meld/meldwindow.py:72
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
-#: ../meld/meldwindow.py:73
+#: ../meld/meldwindow.py:74
 msgid "Paste the clipboard"
 msgstr "Prilepi iz odložišča"
 
-#: ../meld/meldwindow.py:75
+#: ../meld/meldwindow.py:76
 msgid "Find..."
 msgstr "Najdi ..."
 
-#: ../meld/meldwindow.py:75
+#: ../meld/meldwindow.py:76
 msgid "Search for text"
 msgstr "Poišči besedilo"
 
-#: ../meld/meldwindow.py:77
+#: ../meld/meldwindow.py:78
 msgid "Find Ne_xt"
 msgstr "Najdi _naslednje"
 
-#: ../meld/meldwindow.py:78
+#: ../meld/meldwindow.py:79
 msgid "Search forwards for the same text"
 msgstr "Poišči niz naprej po besedilu"
 
-#: ../meld/meldwindow.py:80
+#: ../meld/meldwindow.py:81
 msgid "Find _Previous"
 msgstr "Najdi _predhodne"
 
-#: ../meld/meldwindow.py:81
+#: ../meld/meldwindow.py:82
 msgid "Search backwards for the same text"
 msgstr "Besedilo najdi nazaj po besedilu"
 
-#: ../meld/meldwindow.py:84
+#: ../meld/meldwindow.py:85
 msgid "_Replace..."
 msgstr "_Zamenjaj ..."
 
-#: ../meld/meldwindow.py:85
+#: ../meld/meldwindow.py:86
 msgid "Find and replace text"
 msgstr "Poišči in zamenjaj besedilo"
 
-#: ../meld/meldwindow.py:88
+#: ../meld/meldwindow.py:89
 msgid "_Changes"
 msgstr "_Spremembe"
 
-#: ../meld/meldwindow.py:89
+#: ../meld/meldwindow.py:90
 msgid "Next Change"
 msgstr "Naslednja sprememba"
 
-#: ../meld/meldwindow.py:90
+#: ../meld/meldwindow.py:91
 msgid "Go to the next change"
 msgstr "Skoči na naslednjo spremembo"
 
-#: ../meld/meldwindow.py:92
+#: ../meld/meldwindow.py:93
 msgid "Previous Change"
 msgstr "Predhodna sprememba"
 
-#: ../meld/meldwindow.py:93
+#: ../meld/meldwindow.py:94
 msgid "Go to the previous change"
 msgstr "Skoči na predhodno spremembo"
 
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:96
 msgid "Open Externally"
 msgstr "Odpri v zunanjem programu"
 
-#: ../meld/meldwindow.py:96
+#: ../meld/meldwindow.py:97
 msgid "Open selected file or directory in the default external application"
 msgstr "Odpri zbrano datoteko ali mapo v privzetem  zunanjem programu"
 
-#: ../meld/meldwindow.py:100
+#: ../meld/meldwindow.py:101
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../meld/meldwindow.py:101
+#: ../meld/meldwindow.py:102
 msgid "File Status"
 msgstr "Stanje datoteke"
 
-#: ../meld/meldwindow.py:102
+#: ../meld/meldwindow.py:103
 msgid "Version Status"
 msgstr "Stanje različice"
 
-#: ../meld/meldwindow.py:105
+#: ../meld/meldwindow.py:106
 msgid "Stop the current action"
 msgstr "Ustavi trenutno dejanje"
 
-#: ../meld/meldwindow.py:108
+#: ../meld/meldwindow.py:109
 msgid "Refresh the view"
 msgstr "Osveži pogled"
 
-#: ../meld/meldwindow.py:112
+#: ../meld/meldwindow.py:113
 msgid "Fullscreen"
 msgstr "Celozaslonski način"
 
-#: ../meld/meldwindow.py:113
+#: ../meld/meldwindow.py:114
 msgid "View the comparison in fullscreen"
 msgstr "Pokaži primerjavo v celozaslonskem načinu"
 
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:116
 msgid "_Toolbar"
 msgstr "_Orodna vrstica"
 
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:117
 msgid "Show or hide the toolbar"
 msgstr "Pokaži ali skrij orodno vrstico"
 
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:127
 msgid "Open Recent"
 msgstr "Odpri nedavno"
 
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:128
 msgid "Open recent files"
 msgstr "Odpri nedavne datoteke"
 
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:150
 msgid "_Meld"
 msgstr "_Meld"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:151
 msgid "Quit the program"
 msgstr "Končaj program"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:153
 msgid "Prefere_nces"
 msgstr "Mož_nosti"
 
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:154
 msgid "Configure the application"
 msgstr "Spremeni nastavitve programa"
 
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:156
 msgid "_Contents"
 msgstr "_Vsebina"
 
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:157
 msgid "Open the Meld manual"
 msgstr "Odpri priročnik Meld"
 
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:159
 msgid "About this application"
 msgstr "O programu"
 
-#: ../meld/meldwindow.py:604
+#: ../meld/meldwindow.py:596
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr ""
 
-#: ../meld/meldwindow.py:618
+#: ../meld/meldwindow.py:610
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Ni mogoče sočasno primerjati datotek in map"
 
@@ -2222,7 +2243,7 @@ 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:263
+#: ../meld/misc.py:261
 msgid "[None]"
 msgstr "[noben]"
 
@@ -2273,16 +2294,16 @@ msgstr[1] "%d veja"
 msgstr[2] "%d veji"
 msgstr[3] "%d veje"
 
-#: ../meld/vc/git.py:330
+#: ../meld/vc/git.py:332
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Način je spremenjen iz %s v %s"
 
-#: ../meld/vc/git.py:338
+#: ../meld/vc/git.py:340
 msgid "Partially staged"
 msgstr ""
 
-#: ../meld/vc/git.py:338
+#: ../meld/vc/git.py:340
 msgid "Staged"
 msgstr ""
 
@@ -2347,85 +2368,85 @@ msgstr "Ni na voljo"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
-#: ../meld/vcview.py:245
+#: ../meld/vcview.py:251
 #, python-format
 msgid "%(name)s (%(cmd)s not installed)"
 msgstr ""
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
-#: ../meld/vcview.py:249
+#: ../meld/vcview.py:255
 #, python-format
 msgid "%(name)s (Invalid repository)"
 msgstr ""
 
-#: ../meld/vcview.py:270
+#: ../meld/vcview.py:276
 msgid "No valid version control system found in this folder"
 msgstr "Ni veljavnega sistema za nadzor različic v tej mapi"
 
-#: ../meld/vcview.py:272
+#: ../meld/vcview.py:278
 msgid "Only one version control system found in this folder"
 msgstr "V tej mapi je le en sistem nadzora različic"
 
-#: ../meld/vcview.py:274
+#: ../meld/vcview.py:280
 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 being viewed
-#: ../meld/vcview.py:326
+#: ../meld/vcview.py:332
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:346
+#: ../meld/vcview.py:352
 #, python-format
 msgid "Scanning %s"
 msgstr "Preiskovanje %s"
 
-#: ../meld/vcview.py:385
+#: ../meld/vcview.py:391
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:429
+#: ../meld/vcview.py:435
 #, python-format
 msgid "%s — local"
 msgstr "%s — krajevno"
 
-#: ../meld/vcview.py:430
+#: ../meld/vcview.py:436
 #, python-format
 msgid "%s — remote"
 msgstr "%s — oddaljeno"
 
-#: ../meld/vcview.py:438
+#: ../meld/vcview.py:444
 #, fuzzy, python-format
 msgid "%s (local, merge, remote)"
 msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
 
-#: ../meld/vcview.py:443
+#: ../meld/vcview.py:449
 #, fuzzy, python-format
 msgid "%s (remote, merge, local)"
 msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
 
-#: ../meld/vcview.py:454
+#: ../meld/vcview.py:460
 #, python-format
 msgid "%s — repository"
 msgstr "%s — skladišče"
 
-#: ../meld/vcview.py:460
+#: ../meld/vcview.py:466
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (delovno, skladišče)"
 
-#: ../meld/vcview.py:464
+#: ../meld/vcview.py:470
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (skladišče, delovno)"
 
-#: ../meld/vcview.py:632
+#: ../meld/vcview.py:638
 msgid "Remove folder and all its files?"
 msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
 
-#: ../meld/vcview.py:634
+#: ../meld/vcview.py:640
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2433,14 +2454,14 @@ msgstr ""
 "S tem dejanjem bodo odstranjene vse izbrane datoteke in mape in vse "
 "podrejene datoteke iz sistema za nadzor različic"
 
-#: ../meld/vcview.py:659
+#: ../meld/vcview.py:665
 #, python-format
 msgid "Error removing %s"
 msgstr "Napaka med odstranjevanjem %s"
 
-#: ../meld/vcview.py:739
+#: ../meld/vcview.py:745
 msgid "Clear"
-msgstr ""
+msgstr "Počisti"
 
 #~ msgid "Meld does not support Python 3."
 #~ msgstr "Program Meld ne podpira okolja Python 3."