[meld] Updated Slovenian translation

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

commit c8c78da66610287db78ad16b54bbab21aa59e2e4
Author: Matej Urbančič <mateju svn gnome org>
Date:   Tue Mar 24 20:12:46 2015 +0100

    Updated Slovenian translation

 po/sl.po |  432 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 222 insertions(+), 210 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 5b60bc0..0c10e6a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,15 +2,15 @@
 # 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-2014.
+# Matej Urbančič <mateju svn gnome org>, 2009-2015.
 #
 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: 2014-06-23 09:40+0000\n"
-"PO-Revision-Date: 2014-06-23 22:36+0100\n"
+"POT-Creation-Date: 2015-03-24 11:18+0000\n"
+"PO-Revision-Date: 2015-03-24 19:50+0100\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"
@@ -22,16 +22,16 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: ../bin/meld:134
+#: ../bin/meld:138
 msgid "Cannot import: "
 msgstr "Ni mogoče uvoziti:"
 
-#: ../bin/meld:137
+#: ../bin/meld:141
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Program Meld zahteva najmanj različico %s."
 
-#: ../bin/meld:141
+#: ../bin/meld:145
 msgid "Meld does not support Python 3."
 msgstr "Program Meld ne podpira okolja Python 3."
 
@@ -74,195 +74,196 @@ msgid "Default window size"
 msgstr "Privzeta velikost okna"
 
 #: ../data/org.gnome.meld.gschema.xml.h:2
+msgid "Default window state"
+msgstr "Privzeto stanje okna"
+
+#: ../data/org.gnome.meld.gschema.xml.h:3
 msgid "Show toolbar"
 msgstr "Pokaži orodno vrstico"
 
-#: ../data/org.gnome.meld.gschema.xml.h:3
+#: ../data/org.gnome.meld.gschema.xml.h:4
 #, fuzzy
 msgid "If true, the window toolbar is visible."
 msgstr "Prav, če je okno lastnosti razpeto."
 
-#: ../data/org.gnome.meld.gschema.xml.h:4
+#: ../data/org.gnome.meld.gschema.xml.h:5
 msgid "Show statusbar"
 msgstr "Pokaži vrstico stanja"
 
-#: ../data/org.gnome.meld.gschema.xml.h:5
+#: ../data/org.gnome.meld.gschema.xml.h:6
 #, fuzzy
 msgid "If true, the window statusbar is visible."
 msgstr "Prav, če je okno lastnosti razpeto."
 
-#: ../data/org.gnome.meld.gschema.xml.h:6
+#: ../data/org.gnome.meld.gschema.xml.h:7
 #, fuzzy
 msgid "Automatically detected text encodings"
 msgstr "Dovoli samodejno skrčenje besedila ob združevanju"
 
-#: ../data/org.gnome.meld.gschema.xml.h:7
+#: ../data/org.gnome.meld.gschema.xml.h:8
 msgid ""
 "These text encodings will be automatically used (in order) to try to decode "
 "loaded text files."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:8
+#: ../data/org.gnome.meld.gschema.xml.h:9
 #, fuzzy
 msgid "Width of an indentation step"
 msgstr "V korak z"
 
-#: ../data/org.gnome.meld.gschema.xml.h:9
+#: ../data/org.gnome.meld.gschema.xml.h:10
 #, 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:10
+#: ../data/org.gnome.meld.gschema.xml.h:11
 msgid "Whether to indent using spaces or tabs"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:11
+#: ../data/org.gnome.meld.gschema.xml.h:12
 msgid "If true, any new indentation will use spaces instead of tabs."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:12
-#, fuzzy
+#: ../data/org.gnome.meld.gschema.xml.h:13
 msgid "Show line numbers"
 msgstr "Pokaži številke vrstic"
 
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: ../data/org.gnome.meld.gschema.xml.h:14
 msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: ../data/org.gnome.meld.gschema.xml.h:15
 msgid "Highlight syntax"
 msgstr "Poudarjanje skladnje"
 
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: ../data/org.gnome.meld.gschema.xml.h:16
 msgid ""
 "Whether to highlight syntax in comparisons. Because of Meld's own color "
 "highlighting, this is off by default."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: ../data/org.gnome.meld.gschema.xml.h:17
 #, fuzzy
 msgid "Displayed whitespace"
 msgstr "Prikazana stran"
 
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: ../data/org.gnome.meld.gschema.xml.h:18
 msgid ""
 "Selector for individual whitespace character types to be shown. Possible "
 "values are 'space', 'tab', 'newline' and 'nbsp'."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../data/org.gnome.meld.gschema.xml.h:19
 msgid "Wrap mode"
 msgstr "Način preloma"
 
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: ../data/org.gnome.meld.gschema.xml.h:20
 msgid ""
 "Lines in file comparisons will be wrapped according to this setting, either "
 "not at all ('none'), at any character ('char') or only at the end of words "
 "('word')."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:20
-#, fuzzy
+#: ../data/org.gnome.meld.gschema.xml.h:21
 msgid "Highlight current line"
 msgstr "Poudari trenutno vrstico"
 
-#: ../data/org.gnome.meld.gschema.xml.h:21
+#: ../data/org.gnome.meld.gschema.xml.h:22
 msgid ""
 "If true, the line containing the cursor will be highlighted in file "
 "comparisons."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:23
 #, fuzzy
 msgid "Use the system default monospace font"
 msgstr "Ali naj se uporabi privzeta sistemska pisava enake Å¡irine znakov"
 
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: ../data/org.gnome.meld.gschema.xml.h:24
 msgid ""
 "If false, the defined custom font will be used instead of the system "
 "monospace font."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:25
 msgid "Custom font"
 msgstr "Pisava po meri"
 
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:26
 msgid ""
 "The custom font to use, stored as a string and parsed as a Pango font "
 "description."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: ../data/org.gnome.meld.gschema.xml.h:27
 msgid "Ignore blank lines when comparing files"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: ../data/org.gnome.meld.gschema.xml.h:28
 msgid ""
 "If true, blank lines will be trimmed when highlighting changes between files."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:29
 #, fuzzy
 msgid "Use the system default editor"
 msgstr "Uporabi _privzet sistemski urejevalnik besedil."
 
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: ../data/org.gnome.meld.gschema.xml.h:30
 msgid ""
 "If false, the defined custom editor will be used instead of the system "
 "editor when opening files externally."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:31
 #, fuzzy
 msgid "The custom editor launch command"
 msgstr "Ukaz za zagon urejevalnika:"
 
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: ../data/org.gnome.meld.gschema.xml.h:32
 msgid ""
 "The command used to launch a custom editor. Some limited templating is "
 "supported here; at the moment '{file}' and '{line}' are recognised tokens."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:32
-#, fuzzy
+#: ../data/org.gnome.meld.gschema.xml.h:33
 msgid "Columns to display"
-msgstr "Å tevilo prikazanih stolpcev"
+msgstr "Prikazani stolpci"
 
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: ../data/org.gnome.meld.gschema.xml.h:34
 msgid ""
 "List of column names in folder comparison and whether they should be "
 "displayed."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:34 ../data/ui/preferences.ui.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:35 ../data/ui/preferences.ui.h:30
 msgid "Ignore symbolic links"
 msgstr "Prezri simbolne povezave"
 
-#: ../data/org.gnome.meld.gschema.xml.h:35
+#: ../data/org.gnome.meld.gschema.xml.h:36
 msgid ""
 "If true, folder comparisons do not follow symbolic links when traversing the "
 "folder tree."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:37
 #, fuzzy
 msgid "Use shallow comparison"
 msgstr "Nova primerjava"
 
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: ../data/org.gnome.meld.gschema.xml.h:38
 msgid ""
 "If true, folder comparisons compare files based solely on size and mtime, "
 "considering files to be identical if their size and mtime match, and "
 "different otherwise."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: ../data/org.gnome.meld.gschema.xml.h:39
 #, fuzzy
 msgid "File timestamp resolution"
 msgstr "Ploskev žariščne ločljivosti X"
 
-#: ../data/org.gnome.meld.gschema.xml.h:39
+#: ../data/org.gnome.meld.gschema.xml.h:40
 msgid ""
 "When comparing based on mtime, this is the minimum difference in nanoseconds "
 "between two files before they're considered to have different mtimes. This "
@@ -270,117 +271,118 @@ msgid ""
 "resolution."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: ../data/org.gnome.meld.gschema.xml.h:41
 msgid "File status filters"
 msgstr "Filtri stanja datotek"
 
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: ../data/org.gnome.meld.gschema.xml.h:42
 msgid "List of statuses used to filter visible files in folder comparison."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: ../data/org.gnome.meld.gschema.xml.h:43
 #, fuzzy
 msgid "Show the version control console output"
 msgstr "Izbor različice sistema za nadzor različic za uporabo"
 
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: ../data/org.gnome.meld.gschema.xml.h:44
 msgid ""
 "If true, a console output section will be shown in version control views, "
 "showing the commands run for version control operations."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:45
 #, fuzzy
 msgid "Version control pane position"
 msgstr "Vstavek sistema nadzora različic"
 
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../data/org.gnome.meld.gschema.xml.h:46
 msgid ""
 "This is the height of the main version control tree when the console pane is "
 "shown."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:47
 msgid "Present version comparisons as left-local/right-remote"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:48
 msgid ""
 "If true, version control comparisons will use a left-is-local, right-is-"
 "remote scheme to determine what order to present files in panes. Otherwise, "
 "a left-is-theirs, right-is-mine scheme is used."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:49
 #, fuzzy
 msgid "Order for files in three-way version control merge comparisons"
 msgstr "Zagon primerjave nadzora različic"
 
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../data/org.gnome.meld.gschema.xml.h:50
 msgid ""
 "Choices for file order are remote/merge/local and local/merged/remote. This "
 "preference only affects three-way comparisons launched from the version "
 "control view, so is used solely for merges/conflict resolution within Meld."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:51
 #, 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:51
+#: ../data/org.gnome.meld.gschema.xml.h:52
 msgid ""
 "If true, a guide will be displayed to show what column the margin is at in "
 "the version control commit message editor."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:53
 #, 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:53
+#: ../data/org.gnome.meld.gschema.xml.h:54
 msgid ""
-"The column of the margin is at in the version control commit message editor."
+"The column at which to show the margin in the version control commit message "
+"editor."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: ../data/org.gnome.meld.gschema.xml.h:55
 msgid "Automatically hard-wrap commit messages"
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:56
 msgid ""
 "If true, the version control commit message editor will hard-wrap (i.e., "
 "insert line breaks) at the defined commit margin before commit."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: ../data/org.gnome.meld.gschema.xml.h:57
 #, fuzzy
 msgid "Version control status filters"
 msgstr "Vstavek sistema nadzora različic"
 
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:58
 msgid ""
 "List of statuses used to filter visible files in version control comparison."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: ../data/org.gnome.meld.gschema.xml.h:59
 #, fuzzy
 msgid "Filename-based filters"
 msgstr "Izvoz Balsinih filtrov"
 
-#: ../data/org.gnome.meld.gschema.xml.h:59
+#: ../data/org.gnome.meld.gschema.xml.h:60
 msgid ""
 "List of predefined filename-based filters that, if active, will remove "
 "matching files from a folder comparison."
 msgstr ""
 
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: ../data/org.gnome.meld.gschema.xml.h:61
 #, fuzzy
 msgid "Text-based filters"
 msgstr "Izvoz Balsinih filtrov"
 
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: ../data/org.gnome.meld.gschema.xml.h:62
 msgid ""
 "List of predefined text-based regex filters that, if active, will remove "
 "text from being used in a file comparison. The text will still be displayed, "
@@ -451,7 +453,7 @@ msgstr "Kopiraj na desno"
 msgid "Delete selected"
 msgstr "Izbriši izbor"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1448
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1463
 msgid "Hide"
 msgstr "Skrij"
 
@@ -588,19 +590,16 @@ msgstr ""
 "drugim imenom."
 
 #: ../data/ui/filediff.ui.h:7
-#, fuzzy
 msgid "File 3"
-msgstr "_Datoteka"
+msgstr "Datoteka 3"
 
 #: ../data/ui/filediff.ui.h:8
-#, fuzzy
 msgid "File 2"
-msgstr "_Datoteka"
+msgstr "Datoteka 2"
 
 #: ../data/ui/filediff.ui.h:9
-#, fuzzy
 msgid "File 1"
-msgstr "_Datoteka"
+msgstr "Datoteka 1"
 
 #: ../data/ui/filediff.ui.h:10
 msgid "Revert unsaved changes to documents?"
@@ -655,29 +654,29 @@ msgid "Format as Patch"
 msgstr "Oblikuj kot popravek"
 
 #: ../data/ui/patch-dialog.ui.h:2
+msgid "Copy to Clipboard"
+msgstr "Kopiraj v odložišče"
+
+#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:119
+msgid "Save Patch"
+msgstr "Shrani popravek"
+
+#: ../data/ui/patch-dialog.ui.h:4
 msgid "Use differences between:"
 msgstr "Uporabi razlike med:"
 
-#: ../data/ui/patch-dialog.ui.h:3
+#: ../data/ui/patch-dialog.ui.h:5
 msgid "Left and middle panes"
 msgstr "Levi in srednji pladenj"
 
-#: ../data/ui/patch-dialog.ui.h:4
+#: ../data/ui/patch-dialog.ui.h:6
 msgid "Middle and right panes"
 msgstr "Srednji in desni pladenj"
 
-#: ../data/ui/patch-dialog.ui.h:5
+#: ../data/ui/patch-dialog.ui.h:7
 msgid "_Reverse patch direction"
 msgstr "Obrni smer popravka"
 
-#: ../data/ui/patch-dialog.ui.h:6
-msgid "Copy to Clipboard"
-msgstr "Kopiraj v odložišče"
-
-#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:119
-msgid "Save Patch"
-msgstr "Shrani popravek"
-
 #: ../data/ui/preferences.ui.h:1
 msgid "Left is remote, right is local"
 msgstr "Levo je oddaljeno, desno krajevno"
@@ -835,9 +834,8 @@ msgid "Version Control"
 msgstr "Nadzor različic"
 
 #: ../data/ui/preferences.ui.h:40
-#, fuzzy
 msgid "Filename filters"
-msgstr "Balsini filtri"
+msgstr "Datotečni filtri"
 
 #: ../data/ui/preferences.ui.h:41
 msgid ""
@@ -863,7 +861,6 @@ msgid "Trim blank line differences from the start and end of changes"
 msgstr ""
 
 #: ../data/ui/preferences.ui.h:45
-#, fuzzy
 msgid "Text filters"
 msgstr "Filtri besedila"
 
@@ -885,7 +882,7 @@ msgstr ""
 msgid "Text Filters"
 msgstr "Filtri besedila"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:583
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:623
 msgid "New comparison"
 msgstr "Nova primerjava"
 
@@ -994,7 +991,6 @@ msgid "Delete from working copy"
 msgstr "Izbriši iz delovne kopije"
 
 #: ../data/ui/vcview.ui.h:18
-#, fuzzy
 msgid "Console"
 msgstr "Konzola"
 
@@ -1064,9 +1060,8 @@ msgid "Co_mmit"
 msgstr "_Uveljavi"
 
 #: ../data/ui/vcview.ui.h:35
-#, fuzzy
 msgid "Console output"
-msgstr "Pokaži odvod konzole"
+msgstr "Odvod konzole"
 
 #: ../data/ui/vcview.ui.h:36
 msgid "Push local commits to remote?"
@@ -1143,8 +1138,8 @@ msgstr ""
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:873 ../meld/filediff.py:1123 ../meld/filediff.py:1274
-#: ../meld/filediff.py:1450 ../meld/filediff.py:1480 ../meld/filediff.py:1482
+#: ../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"
 
@@ -1179,186 +1174,186 @@ msgstr ""
 msgid "Error deleting %s"
 msgstr "Napaka med brisanjem %s"
 
-#: ../meld/filediff.py:243
+#: ../meld/filediff.py:251
 msgid "Format as Patch..."
 msgstr "Oblikuj kot popravek ..."
 
-#: ../meld/filediff.py:244
+#: ../meld/filediff.py:252
 msgid "Create a patch using differences between files"
 msgstr "Ustvari popravek z razlikovanjem med datotekami"
 
-#: ../meld/filediff.py:246
+#: ../meld/filediff.py:254
 msgid "Save A_ll"
 msgstr "Shrani _vse"
 
-#: ../meld/filediff.py:247
+#: ../meld/filediff.py:255
 msgid "Save all files in the current comparison"
 msgstr "Shrani vse datoteke trenutne primerjave"
 
-#: ../meld/filediff.py:250
+#: ../meld/filediff.py:258
 msgid "Revert files to their saved versions"
 msgstr "Povrni datoteke na shranjene različice"
 
-#: ../meld/filediff.py:252
+#: ../meld/filediff.py:260
 msgid "Add Synchronization Point"
 msgstr "Dodaj točko usklajevanja"
 
-#: ../meld/filediff.py:253
+#: ../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:256
+#: ../meld/filediff.py:264
 msgid "Clear Synchronization Points"
 msgstr "Počisti točke usklajevanja"
 
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:265
 msgid "Clear manual change sychronization points"
 msgstr "Počisti ročno spremenjene točke usklajevanja"
 
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:267
 msgid "Previous Conflict"
 msgstr "Predhodni spor"
 
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:268
 msgid "Go to the previous conflict"
 msgstr "Skoči na predhodni niz v sporu"
 
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:270
 msgid "Next Conflict"
 msgstr "Naslednji spor"
 
-#: ../meld/filediff.py:263
+#: ../meld/filediff.py:271
 msgid "Go to the next conflict"
 msgstr "Skoči na naslednji niz v sporu"
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:273
 msgid "Push to Left"
 msgstr "Potisni levo"
 
-#: ../meld/filediff.py:266
+#: ../meld/filediff.py:274
 msgid "Push current change to the left"
 msgstr "Potisni trenutne spremembe na levo"
 
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:277
 msgid "Push to Right"
 msgstr "Potisni desno"
 
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:278
 msgid "Push current change to the right"
 msgstr "Potisni trenutne spremembe na desno"
 
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:282
 msgid "Pull from Left"
 msgstr "Potegni z leve"
 
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:283
 msgid "Pull change from the left"
 msgstr "Potegni spremembe z leve"
 
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:286
 msgid "Pull from Right"
 msgstr "Potegni z desne"
 
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:287
 msgid "Pull change from the right"
 msgstr "Potegni spremembe z desne"
 
-#: ../meld/filediff.py:281
+#: ../meld/filediff.py:289
 msgid "Copy Above Left"
 msgstr "Kopiraj nad levo"
 
-#: ../meld/filediff.py:282
+#: ../meld/filediff.py:290
 msgid "Copy change above the left chunk"
 msgstr "Kopiraj spremembe nad levi del"
 
-#: ../meld/filediff.py:284
+#: ../meld/filediff.py:292
 msgid "Copy Below Left"
 msgstr "Kopiraj pod levo"
 
-#: ../meld/filediff.py:285
+#: ../meld/filediff.py:293
 msgid "Copy change below the left chunk"
 msgstr "Kopiraj spremembe pod levi del"
 
-#: ../meld/filediff.py:287
+#: ../meld/filediff.py:295
 msgid "Copy Above Right"
 msgstr "Kopiraj nad desno"
 
-#: ../meld/filediff.py:288
+#: ../meld/filediff.py:296
 msgid "Copy change above the right chunk"
 msgstr "Kopiraj spremembe nad desni del"
 
-#: ../meld/filediff.py:290
+#: ../meld/filediff.py:298
 msgid "Copy Below Right"
 msgstr "Kopiraj pod desno"
 
-#: ../meld/filediff.py:291
+#: ../meld/filediff.py:299
 msgid "Copy change below the right chunk"
 msgstr "Kopiraj spremembe pod desni del"
 
-#: ../meld/filediff.py:293
+#: ../meld/filediff.py:301
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../meld/filediff.py:294
+#: ../meld/filediff.py:302
 msgid "Delete change"
 msgstr "Izbriši spremembo"
 
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:304
 msgid "Merge All from Left"
 msgstr "Združi vse spremembe z leve"
 
-#: ../meld/filediff.py:297
+#: ../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:299
+#: ../meld/filediff.py:307
 msgid "Merge All from Right"
 msgstr "Združi vse spremembe z desne"
 
-#: ../meld/filediff.py:300
+#: ../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:302
+#: ../meld/filediff.py:310
 msgid "Merge All"
 msgstr "Združi vse"
 
-#: ../meld/filediff.py:303
+#: ../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:307
+#: ../meld/filediff.py:315
 msgid "Cycle Through Documents"
 msgstr "Preklopi med dokumenti"
 
-#: ../meld/filediff.py:308
+#: ../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:314
+#: ../meld/filediff.py:322
 msgid "Lock Scrolling"
 msgstr "Zakleni drsenje"
 
-#: ../meld/filediff.py:315
+#: ../meld/filediff.py:323
 msgid "Lock scrolling of all panes"
 msgstr "Zakleni drsenje vseh pladnjev"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:472
+#: ../meld/filediff.py:483
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:472
+#: ../meld/filediff.py:483
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:474
+#: ../meld/filediff.py:485
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:821
+#: ../meld/filediff.py:832
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -1367,75 +1362,73 @@ 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:890
+#: ../meld/filediff.py:904
 #, fuzzy
 msgid "Mark conflict as resolved?"
 msgstr "Označi kot razrešeno v VC"
 
-#: ../meld/filediff.py:892
+#: ../meld/filediff.py:906
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 
-#: ../meld/filediff.py:894
-#, fuzzy
+#: ../meld/filediff.py:908
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../meld/filediff.py:895
-#, fuzzy
+#: ../meld/filediff.py:909
 msgid "Mark _Resolved"
-msgstr "Razrešen psevdonim \"%s\" -> %s\n"
+msgstr ""
 
-#: ../meld/filediff.py:1111
+#: ../meld/filediff.py:1125
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Določi okna"
 
-#: ../meld/filediff.py:1117
+#: ../meld/filediff.py:1132
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:1140 ../meld/filediff.py:1150 ../meld/filediff.py:1163
-#: ../meld/filediff.py:1169
+#: ../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"
 
-#: ../meld/filediff.py:1141
+#: ../meld/filediff.py:1156
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:1151
+#: ../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:1164
+#: ../meld/filediff.py:1179
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:1202
+#: ../meld/filediff.py:1217
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Računanje razlik"
 
-#: ../meld/filediff.py:1269
+#: ../meld/filediff.py:1284
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Datoteka %s je bila na disku spremenjena."
 
-#: ../meld/filediff.py:1270
+#: ../meld/filediff.py:1285
 msgid "Do you want to reload the file?"
 msgstr "Ali želite ponovno naložiti datoteko?"
 
-#: ../meld/filediff.py:1273
+#: ../meld/filediff.py:1288
 msgid "_Reload"
 msgstr "_Ponovno naloži"
 
-#: ../meld/filediff.py:1439
+#: ../meld/filediff.py:1454
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1443,19 +1436,19 @@ msgstr ""
 "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
 "Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: ../meld/filediff.py:1445
+#: ../meld/filediff.py:1460
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1453
+#: ../meld/filediff.py:1468
 msgid "Show without filters"
 msgstr "Pokaži brez filtrov"
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1490
 msgid "Change highlighting incomplete"
 msgstr "Spremeni označevanje kot nedokončano"
 
-#: ../meld/filediff.py:1476
+#: ../meld/filediff.py:1491
 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."
@@ -1463,15 +1456,15 @@ 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:1484
+#: ../meld/filediff.py:1499
 msgid "Keep highlighting"
 msgstr "Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1486
+#: ../meld/filediff.py:1501
 msgid "_Keep highlighting"
 msgstr "_Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1617
+#: ../meld/filediff.py:1630
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -1480,7 +1473,7 @@ msgstr ""
 "\"%s\" že obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1630
+#: ../meld/filediff.py:1643
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -1491,39 +1484,39 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1641
+#: ../meld/filediff.py:1654
 msgid "Save Left Pane As"
 msgstr "Shrani levi pladenj kot"
 
-#: ../meld/filediff.py:1643
+#: ../meld/filediff.py:1656
 msgid "Save Middle Pane As"
 msgstr "Shrani srednji pladenj kot"
 
-#: ../meld/filediff.py:1645
+#: ../meld/filediff.py:1658
 msgid "Save Right Pane As"
 msgstr "Shrani desni pladenj kot"
 
-#: ../meld/filediff.py:1658
+#: ../meld/filediff.py:1671
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr ""
 
-#: ../meld/filediff.py:1660
+#: ../meld/filediff.py:1673
 #, 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:1663
+#: ../meld/filediff.py:1676
 msgid "Save Anyway"
 msgstr "Vseeno shrani"
 
-#: ../meld/filediff.py:1664
+#: ../meld/filediff.py:1677
 msgid "Don't Save"
 msgstr "Ne shrani"
 
-#: ../meld/filediff.py:1688
+#: ../meld/filediff.py:1701
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -1534,7 +1527,7 @@ msgstr ""
 "\n"
 "Kateri zapis želite uporabiti?"
 
-#: ../meld/filediff.py:1704
+#: ../meld/filediff.py:1717
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -1543,11 +1536,11 @@ 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:2065
+#: ../meld/filediff.py:2084
 msgid "Live comparison updating disabled"
 msgstr "Živo posodabljanje ob primerjavi je onemogočeno"
 
-#: ../meld/filediff.py:2066
+#: ../meld/filediff.py:2085
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1583,7 +1576,6 @@ msgid "file"
 msgstr "datoteka"
 
 #: ../meld/meldapp.py:176 ../meld/meldapp.py:180
-#, fuzzy
 msgid "folder"
 msgstr "mapa"
 
@@ -1601,7 +1593,7 @@ msgid "Start a 2- or 3-way folder comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
 #: ../meld/meldapp.py:224
-#, fuzzy, python-format
+#, python-format
 msgid "Error: %s\n"
 msgstr "Napaka: %s\n"
 
@@ -1663,7 +1655,7 @@ msgstr "Napaka med branjem datoteke primerjav"
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: ../meld/melddoc.py:77 ../meld/melddoc.py:78
+#: ../meld/melddoc.py:78 ../meld/melddoc.py:79
 msgid "untitled"
 msgstr "neimenovano"
 
@@ -1859,16 +1851,49 @@ msgstr "Odpri nedavno"
 msgid "Open recent files"
 msgstr "Odpri nedavne datoteke"
 
-#: ../meld/meldwindow.py:506
+#: ../meld/meldwindow.py:164
+msgid "_Meld"
+msgstr "_Meld"
+
+#: ../meld/meldwindow.py:165
+msgid "Quit the program"
+msgstr "Končaj program"
+
+#: ../meld/meldwindow.py:167
+msgid "Prefere_nces"
+msgstr "Mož_nosti"
+
+#: ../meld/meldwindow.py:168
+msgid "Configure the application"
+msgstr "Spremeni nastavitve programa"
+
+#: ../meld/meldwindow.py:170
+msgid "_Contents"
+msgstr "_Vsebina"
+
+#: ../meld/meldwindow.py:171
+msgid "Open the Meld manual"
+msgstr "Odpri priročnik Meld"
+
+#: ../meld/meldwindow.py:173
+msgid "About this application"
+msgstr "O programu"
+
+#: ../meld/meldwindow.py:546
 msgid "Switch to this tab"
 msgstr "Preklopi na ta zavihek"
 
-#: ../meld/meldwindow.py:629
+#: ../meld/meldwindow.py:657
+#, python-format
+msgid "Need three files to auto-merge, got: %r"
+msgstr ""
+
+#: ../meld/meldwindow.py:671
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Ni mogoče sočasno primerjati datotek in map"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:213
+#: ../meld/misc.py:218
 msgid "[None]"
 msgstr "[noben]"
 
@@ -1957,9 +1982,8 @@ msgid "Newly added"
 msgstr "Nedavno dodano"
 
 #: ../meld/vc/_vc.py:72
-#, fuzzy
 msgid "Renamed"
-msgstr "<neimenovano>"
+msgstr "Preimenovano"
 
 #: ../meld/vc/_vc.py:73
 msgid "Conflict"
@@ -2043,14 +2067,14 @@ msgid "(Empty)"
 msgstr "(Prazno)"
 
 #: ../meld/vcview.py:522
-#, fuzzy, python-format
+#, python-format
 msgid "%s — local"
-msgstr "Krajevno"
+msgstr "%s — krajevno"
 
 #: ../meld/vcview.py:523
-#, fuzzy, python-format
+#, python-format
 msgid "%s — remote"
-msgstr "<b>Oddaljeno:</b> %s"
+msgstr "%s — oddaljeno"
 
 #: ../meld/vcview.py:531
 #, fuzzy, python-format
@@ -2063,19 +2087,19 @@ msgid "%s (remote, merge, local)"
 msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
 
 #: ../meld/vcview.py:547
-#, fuzzy, python-format
+#, python-format
 msgid "%s — repository"
-msgstr "Skladišče:"
+msgstr "%s — skladišče"
 
 #: ../meld/vcview.py:553
-#, fuzzy, python-format
+#, python-format
 msgid "%s (working, repository)"
-msgstr "Stanje skladišča"
+msgstr "%s (delovno, skladišče)"
 
 #: ../meld/vcview.py:557
-#, fuzzy, python-format
+#, python-format
 msgid "%s (repository, working)"
-msgstr "Delovna mapa:"
+msgstr "%s (skladišče, delovno)"
 
 #: ../meld/vcview.py:741
 msgid "Remove folder and all its files?"
@@ -2252,18 +2276,6 @@ msgstr "Napaka med odstranjevanjem %s"
 #~ msgid "D-Bus error; comparisons will open in a new window."
 #~ msgstr "Napaka vodila D-Bus; primerjave se odprejo v novem oknu."
 
-#~ msgid "Quit the program"
-#~ msgstr "Končaj program"
-
-#~ msgid "Configure the application"
-#~ msgstr "Spremeni nastavitve programa"
-
-#~ msgid "_Contents"
-#~ msgstr "_Vsebina"
-
-#~ msgid "Open the Meld manual"
-#~ msgstr "Odpri priročnik Meld"
-
 #~ msgid "Report _Bug"
 #~ msgstr "Pošlji poročilo o _hrošču"