[meld] Updated Slovenian translation

From: Matej Urbančič <mateju src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Slovenian translation
Date: Mon, 16 Oct 2017 18:52:17 +0000 (UTC)
commit 469ddc3706f48c05f86845cfa6a04500d664336d
Author: Matej Urbančič <mateju svn gnome org>
Date:   Mon Oct 16 20:52:08 2017 +0200

    Updated Slovenian translation

 po/sl.po |  540 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 298 insertions(+), 242 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index f6002fb..25af366 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-08-09 22:02+0200\n"
-"PO-Revision-Date: 2017-08-09 22:06+0200\n"
+"POT-Creation-Date: 2017-10-03 11:39+0000\n"
+"PO-Revision-Date: 2017-10-15 22:18+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"
@@ -20,7 +20,7 @@ msgstr ""
 "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 2.0.1\n"
+"X-Generator: Poedit 2.0.4\n"
 
 #: ../bin/meld:179
 msgid "Cannot import: "
@@ -34,7 +34,7 @@ msgstr "Program Meld zahteva najmanj različico %s."
 #: ../bin/meld:227
 #, c-format
 msgid ""
-"Couldn't load Meld-specific CSS (%s)\n"
+"Couldn’t load Meld-specific CSS (%s)\n"
 "%s"
 msgstr ""
 
@@ -58,7 +58,7 @@ msgstr "Primerjava in združevanje datotek"
 #. 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 ""
+msgstr "diff;merge;primerjava;usklajevanje;"
 
 #: ../data/meld.appdata.xml.in.h:3
 msgid ""
@@ -100,7 +100,7 @@ msgstr "Privzeto stanje okna"
 #, fuzzy
 #| msgid "Default window state"
 msgid "Default window fullscreen state"
-msgstr "Privzeto stanje okna"
+msgstr "Postavi okno v celozaslonski način."
 
 #: ../data/org.gnome.meld.gschema.xml.h:5
 msgid "Show toolbar"
@@ -109,7 +109,7 @@ msgstr "Pokaži orodno vrstico"
 #: ../data/org.gnome.meld.gschema.xml.h:6
 #, fuzzy
 msgid "If true, the window toolbar is visible."
-msgstr "Prav, če je okno lastnosti razpeto."
+msgstr "Ali naj bo orodna vrstica vidna."
 
 #: ../data/org.gnome.meld.gschema.xml.h:7
 msgid "Show statusbar"
@@ -118,7 +118,7 @@ msgstr "Pokaži vrstico stanja"
 #: ../data/org.gnome.meld.gschema.xml.h:8
 #, fuzzy
 msgid "If true, the window statusbar is visible."
-msgstr "Prav, če je okno lastnosti razpeto."
+msgstr "Vrstica stanja je vidna"
 
 #: ../data/org.gnome.meld.gschema.xml.h:9
 msgid "Additional automatically detected text encodings"
@@ -129,13 +129,13 @@ 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 "
 "and the current locale-default encoding will always be used; other encodings "
-"may also be tried, depending on the user's locale."
+"may also be tried, depending on the user’s locale."
 msgstr ""
 
 #: ../data/org.gnome.meld.gschema.xml.h:11
 #, fuzzy
 msgid "Width of an indentation step"
-msgstr "V korak z"
+msgstr "Število presledkov posamezne ravni zamikanja"
 
 #: ../data/org.gnome.meld.gschema.xml.h:12
 #, fuzzy
@@ -143,8 +143,9 @@ 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:13
+#, fuzzy
 msgid "Whether to indent using spaces or tabs"
-msgstr ""
+msgstr "Ali naj gedit vstavlja presledke namesto zamikov (tabulatorjev)."
 
 #: ../data/org.gnome.meld.gschema.xml.h:14
 msgid "If true, any new indentation will use spaces instead of tabs."
@@ -164,13 +165,14 @@ msgstr "Poudarjanje skladnje"
 
 #: ../data/org.gnome.meld.gschema.xml.h:18
 msgid ""
-"Whether to highlight syntax in comparisons. Because of Meld's own color "
+"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:19
+#, fuzzy
 msgid "Color scheme to use for syntax highlighting"
-msgstr ""
+msgstr "Ime barvne sheme gtksourceview za poudarjanje skladnje."
 
 #: ../data/org.gnome.meld.gschema.xml.h:20
 msgid "Used by GtkSourceView to determine colors for syntax highlighting"
@@ -179,7 +181,7 @@ msgstr ""
 #: ../data/org.gnome.meld.gschema.xml.h:21
 #, fuzzy
 msgid "Displayed whitespace"
-msgstr "Prikazana stran"
+msgstr "Presledni znaki"
 
 #: ../data/org.gnome.meld.gschema.xml.h:22
 msgid ""
@@ -251,7 +253,7 @@ msgstr ""
 #: ../data/org.gnome.meld.gschema.xml.h:35
 #, fuzzy
 msgid "The custom editor launch command"
-msgstr "Ukaz za zagon urejevalnika:"
+msgstr "Ukaz za zagon urejevalnika: "
 
 #: ../data/org.gnome.meld.gschema.xml.h:36
 msgid ""
@@ -282,7 +284,7 @@ msgstr ""
 #: ../data/org.gnome.meld.gschema.xml.h:41
 #, fuzzy
 msgid "Use shallow comparison"
-msgstr "Nova primerjava"
+msgstr "Groba primerjava"
 
 #: ../data/org.gnome.meld.gschema.xml.h:42
 msgid ""
@@ -294,12 +296,12 @@ msgstr ""
 #: ../data/org.gnome.meld.gschema.xml.h:43
 #, fuzzy
 msgid "File timestamp resolution"
-msgstr "Ploskev žariščne ločljivosti X"
+msgstr "Ločljivost časovnega _žiga:"
 
 #: ../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 "
+"between two files before they’re considered to have different mtimes. This "
 "is useful when comparing files between filesystems with different timestamp "
 "resolution."
 msgstr ""
@@ -326,7 +328,7 @@ msgstr ""
 #: ../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"
+msgstr "Pokaži/Skrij odvod konzole"
 
 #: ../data/org.gnome.meld.gschema.xml.h:50
 msgid ""
@@ -337,7 +339,7 @@ msgstr ""
 #: ../data/org.gnome.meld.gschema.xml.h:51
 #, fuzzy
 msgid "Version control pane position"
-msgstr "Vstavek sistema nadzora različic"
+msgstr "Nadzor različic"
 
 #: ../data/org.gnome.meld.gschema.xml.h:52
 msgid ""
@@ -403,7 +405,7 @@ msgstr ""
 #: ../data/org.gnome.meld.gschema.xml.h:63
 #, fuzzy
 msgid "Version control status filters"
-msgstr "Vstavek sistema nadzora različic"
+msgstr "Filtri stanja datotek"
 
 #: ../data/org.gnome.meld.gschema.xml.h:64
 msgid ""
@@ -413,7 +415,7 @@ msgstr ""
 #: ../data/org.gnome.meld.gschema.xml.h:65
 #, fuzzy
 msgid "Filename-based filters"
-msgstr "Izvoz Balsinih filtrov"
+msgstr "Datotečni filtri"
 
 #: ../data/org.gnome.meld.gschema.xml.h:66
 msgid ""
@@ -424,39 +426,47 @@ msgstr ""
 #: ../data/org.gnome.meld.gschema.xml.h:67
 #, fuzzy
 msgid "Text-based filters"
-msgstr "Izvoz Balsinih filtrov"
+msgstr "Filtri besedila"
 
 #: ../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, "
-"but won't contribute to the comparison itself."
+"but won’t contribute to the comparison itself."
 msgstr ""
 
 #: ../data/styles/meld-base.xml.h:1
+#, fuzzy
 msgid "Meld base scheme"
-msgstr ""
+msgstr "SHEMA"
 
 #: ../data/styles/meld-base.xml.h:2
+#, fuzzy
 msgid "Base color scheme for Meld highlighting"
-msgstr ""
+msgstr "Ime barvne sheme gtksourceview za poudarjanje skladnje."
 
 #: ../data/styles/meld-dark.xml.h:1
+#, fuzzy
 msgid "Meld dark scheme"
-msgstr ""
+msgstr "Meld"
 
 #: ../data/styles/meld-dark.xml.h:2
+#, fuzzy
 msgid "Dark color scheme for Meld highlighting"
-msgstr ""
+msgstr "Temna barvna shema z barvno paleto tango"
 
 #: ../data/ui/application.ui.h:1
 msgid "About Meld"
 msgstr "O programu"
 
 #: ../data/ui/application.ui.h:2
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2002-2009 Stephen Kennedy\n"
+#| "Copyright © 2009-2013 Kai Willadsen"
 msgid ""
 "Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2013 Kai Willadsen"
+"Copyright © 2009-2017 Kai Willadsen"
 msgstr ""
 "Avtorske pravice © 2002-2009 Stephen Kennedy\n"
 "Avtorske pravice © 2009-2011 Kai Willadsen"
@@ -479,7 +489,7 @@ msgstr "Pomo_č"
 
 #: ../data/ui/application.ui.h:8
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "Tipkovne bližnjice"
 
 #: ../data/ui/application.ui.h:9
 msgid "_About"
@@ -517,7 +527,7 @@ msgstr "Kopiraj na desno"
 msgid "Delete selected"
 msgstr "Izbriši izbor"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:855 ../meld/filediff.py:1357
+#: ../data/ui/dirdiff.ui.h:8 ../meld/dirdiff.py:856 ../meld/filediff.py:1360
 msgid "Hide"
 msgstr "Skrij"
 
@@ -553,7 +563,7 @@ msgstr "Novo"
 msgid "Show new"
 msgstr "Pokaži novejše"
 
-#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:76
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:77
 msgid "Modified"
 msgstr "Spremenjeno"
 
@@ -586,7 +596,7 @@ msgid "_Add"
 msgstr "_Dodaj"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:644
+#: ../meld/vcview.py:680
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -608,7 +618,7 @@ msgstr "Premakni navz_dol"
 
 #. Create icon and filename CellRenderer
 #: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:373
+#: ../meld/dirdiff.py:374
 msgid "Name"
 msgstr "Ime"
 
@@ -625,8 +635,10 @@ msgid "Remove selected filter"
 msgstr "Odstrani izbrani filter"
 
 #: ../data/ui/filediff.ui.h:1
-msgid "Format as Patch..."
-msgstr "Oblikuj kot popravek ..."
+#, fuzzy
+#| msgid "Format as Patch"
+msgid "Format as Patch…"
+msgstr "Oblikuj kot popravek"
 
 #: ../data/ui/filediff.ui.h:2
 msgid "Create a patch using differences between files"
@@ -773,16 +785,19 @@ 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
+#, fuzzy
 msgid "Previous Pane"
-msgstr ""
+msgstr "Premakni žarišče na naslednje/predhodno okno"
 
 #: ../data/ui/filediff.ui.h:39
+#, fuzzy
 msgid "Move keyboard focus to the previous document in this comparison"
-msgstr ""
+msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
 
 #: ../data/ui/filediff.ui.h:40
+#, fuzzy
 msgid "Next Pane"
-msgstr ""
+msgstr "Premakni žarišče na naslednje/predhodno okno"
 
 #: ../data/ui/filediff.ui.h:41
 msgid "Move keyboard focus to the next document in this comparison"
@@ -801,15 +816,15 @@ msgid "Save changes to documents before closing?"
 msgstr "Ali želite shraniti spremembe dokumenta pred zapiranjem?"
 
 #: ../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."
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "V kolikor sprememb ne shranite, bodo te trajno izgubljene."
 
 #: ../data/ui/filediff.ui.h:46
 msgid "Close _without Saving"
 msgstr "Zapri _brez shranjevanja"
 
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:937 ../meld/filediff.py:1423
-#: ../meld/filediff.py:1495
+#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:938 ../meld/filediff.py:1426
+#: ../meld/filediff.py:1498
 msgid "_Cancel"
 msgstr "_Prekliči"
 
@@ -846,7 +861,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:938 ../meld/filediff.py:1424
+#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:939 ../meld/filediff.py:1427
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
@@ -1026,7 +1041,7 @@ msgstr "_Med primerjavo predelav datotek"
 #: ../data/ui/preferences.ui.h:30
 #, fuzzy
 msgid "Order when _merging files:"
-msgstr "Predvajaj _glasbene datoteke, ko so povezane"
+msgstr "[%s] Združevanje datotek"
 
 #: ../data/ui/preferences.ui.h:31
 msgid "Commit Messages"
@@ -1065,7 +1080,7 @@ msgstr "Filtri datotek"
 #: ../data/ui/preferences.ui.h:38
 #, fuzzy
 msgid "Change trimming"
-msgstr "Spremeni opazovanje"
+msgstr "Spremeni _v:"
 
 #: ../data/ui/preferences.ui.h:39
 msgid "Trim blank line differences from the start and end of changes"
@@ -1104,12 +1119,12 @@ 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>"
+msgstr "Vse krajevne in dejavne oddaljene mape"
 
 #: ../data/ui/preferences.ui.h:46
 #, fuzzy
 msgid "Local, merge, remote"
-msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
+msgstr "Vse krajevne in dejavne oddaljene mape"
 
 #: ../data/ui/preferences.ui.h:47
 msgid "1ns (ext4)"
@@ -1130,17 +1145,18 @@ msgstr "2s (VFAT)"
 #: ../data/ui/shortcuts.ui.h:1
 msgctxt "shortcut window"
 msgid "General"
-msgstr ""
+msgstr "Splošno"
 
 #: ../data/ui/shortcuts.ui.h:2
 msgctxt "shortcut window"
 msgid "New comparison"
-msgstr ""
+msgstr "Nova primerjava"
 
 #: ../data/ui/shortcuts.ui.h:3
+#, fuzzy
 msgctxt "shortcut window"
 msgid "Close a comparison"
-msgstr ""
+msgstr "Groba primerjava"
 
 #: ../data/ui/shortcuts.ui.h:4
 msgctxt "shortcut window"
@@ -1150,32 +1166,36 @@ msgstr "Končaj program"
 #: ../data/ui/shortcuts.ui.h:5
 msgctxt "shortcut window"
 msgid "Stop the current action"
-msgstr ""
+msgstr "Ustavi trenutno dejanje"
 
 #: ../data/ui/shortcuts.ui.h:6
+#, fuzzy
 msgctxt "shortcut window"
 msgid "Refresh comparison"
 msgstr ""
+"Živo posodabljanje primerjav je onemogočeno, kadar je dejavno usklajevanje. "
+"Še vedno je mogoče ročno osvežiti primerjavo, živo posodabljanje pa bo spet "
+"na voljo, ko bo usklajevanje končano."
 
 #: ../data/ui/shortcuts.ui.h:7
 msgctxt "shortcut window"
 msgid "Fullscreen"
-msgstr ""
+msgstr "Celozaslonski način"
 
 #: ../data/ui/shortcuts.ui.h:8
 msgctxt "shortcut window"
 msgid "Tabs"
-msgstr ""
+msgstr "Zavihki"
 
 #: ../data/ui/shortcuts.ui.h:9
 msgctxt "shortcut window"
 msgid "Go to previous tab"
-msgstr ""
+msgstr "Skoči na predhodni zavihek"
 
 #: ../data/ui/shortcuts.ui.h:10
 msgctxt "shortcut window"
 msgid "Go to next tab"
-msgstr ""
+msgstr "Skoči na naslednji zavihek"
 
 #: ../data/ui/shortcuts.ui.h:11
 msgctxt "shortcut window"
@@ -1195,17 +1215,19 @@ msgstr "Premakni zavihek desno"
 #: ../data/ui/shortcuts.ui.h:14
 msgctxt "shortcut window"
 msgid "Changes"
-msgstr ""
+msgstr "Spremembe"
 
 #: ../data/ui/shortcuts.ui.h:15
+#, fuzzy
 msgctxt "shortcut window"
 msgid "Go to previous change"
-msgstr ""
+msgstr "Skoči na predhodno spremembo"
 
 #: ../data/ui/shortcuts.ui.h:16
+#, fuzzy
 msgctxt "shortcut window"
 msgid "Go to next change"
-msgstr ""
+msgstr "Skoči na naslednjo spremembo"
 
 #: ../data/ui/shortcuts.ui.h:17
 msgctxt "shortcut window"
@@ -1333,19 +1355,22 @@ msgid "Delete change"
 msgstr "Izbriši spremembo"
 
 #: ../data/ui/shortcuts.ui.h:42
+#, fuzzy
 msgctxt "shortcut window"
 msgid "Previous comparison pane"
-msgstr ""
+msgstr "Premakni žarišče na naslednje/predhodno okno"
 
 #: ../data/ui/shortcuts.ui.h:43
+#, fuzzy
 msgctxt "shortcut window"
 msgid "Next comparison pane"
-msgstr ""
+msgstr "Premakni žarišče na naslednje/predhodno okno"
 
 #: ../data/ui/shortcuts.ui.h:44
+#, fuzzy
 msgctxt "shortcut window"
 msgid "Folder comparison"
-msgstr ""
+msgstr "Primerjava objav"
 
 #: ../data/ui/shortcuts.ui.h:45
 msgctxt "shortcut window"
@@ -1430,7 +1455,9 @@ msgid "C_ompare"
 msgstr "_Primerjava"
 
 #: ../data/ui/vcview.ui.h:3
-msgid "Co_mmit..."
+#, fuzzy
+#| msgid "Co_mmit"
+msgid "Co_mmit…"
 msgstr "U_veljavi ..."
 
 #: ../data/ui/vcview.ui.h:4
@@ -1522,7 +1549,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:69
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70
 msgid "Ignored"
 msgstr "Prezrto"
 
@@ -1550,7 +1577,7 @@ msgstr "Predhodni dnevniki:"
 msgid "Co_mmit"
 msgstr "_Uveljavi"
 
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:332
+#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:333
 msgid "Location"
 msgstr "Mesto"
 
@@ -1591,82 +1618,83 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:391 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:392 ../meld/preferences.py:82
 msgid "Size"
 msgstr "Velikost"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:399 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:400 ../meld/preferences.py:83
 msgid "Modification time"
 msgstr "Čas spremembe"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:407 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:408 ../meld/preferences.py:84
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: ../meld/dirdiff.py:534
+#: ../meld/dirdiff.py:535
 #, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:666 ../meld/dirdiff.py:690
+#: ../meld/dirdiff.py:667 ../meld/dirdiff.py:691
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:822
+#: ../meld/dirdiff.py:823
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] končano"
 
-#: ../meld/dirdiff.py:830
+#: ../meld/dirdiff.py:831
+#, fuzzy
 msgid "Folders have no differences"
-msgstr ""
+msgstr "Vrstične razlike"
 
-#: ../meld/dirdiff.py:832
+#: ../meld/dirdiff.py:833
 msgid "Contents of scanned files in folders are identical."
 msgstr ""
 
-#: ../meld/dirdiff.py:834
+#: ../meld/dirdiff.py:835
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:838
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 
-#: ../meld/dirdiff.py:839
+#: ../meld/dirdiff.py:840
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 
-#: ../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
+#: ../meld/dirdiff.py:858 ../meld/filediff.py:1362 ../meld/filediff.py:1392
+#: ../meld/filediff.py:1394 ../meld/ui/msgarea.py:105 ../meld/ui/msgarea.py:118
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/dirdiff.py:867
+#: ../meld/dirdiff.py:868
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je prišlo do več napak."
 
-#: ../meld/dirdiff.py:868
+#: ../meld/dirdiff.py:869
 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:870
+#: ../meld/dirdiff.py:871
 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:872
+#: ../meld/dirdiff.py:873
 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:874
+#: ../meld/dirdiff.py:875
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1675,48 +1703,51 @@ msgstr ""
 "razlike velikosti upošteva. Nekatere datoteke so skrite:\n"
 "%s"
 
-#: ../meld/dirdiff.py:885
-#, python-format
-msgid "'%s' hidden by '%s'"
+#: ../meld/dirdiff.py:886
+#, fuzzy, python-format
+#| msgid "'%s' hidden by '%s'"
+msgid "“%s” hidden by “%s”"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:941
+#: ../meld/dirdiff.py:942
 #, python-format
 msgid "Replace folder “%s”?"
-msgstr ""
+msgstr "Ali želite zamenjati mapo »%s«?"
 
-#: ../meld/dirdiff.py:943
+#: ../meld/dirdiff.py:944
 #, 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:956
+#: ../meld/dirdiff.py:957
 msgid "Error copying file"
 msgstr "Napaka kopiranja datoteke"
 
-#: ../meld/dirdiff.py:957
-#, python-format
+#: ../meld/dirdiff.py:958
+#, fuzzy, python-format
+#| msgid ""
+#| "Couldn't copy %s\n"
+#| "to %s.\n"
+#| "\n"
+#| "%s"
 msgid ""
-"Couldn't copy %s\n"
+"Couldn’t copy %s\n"
 "to %s.\n"
 "\n"
 "%s"
-msgstr ""
-"Ni mogoče kopirati %s\n"
-"v %s.\n"
-"\n"
-"%s"
+msgstr "Ni mogoče naložiti zalednih programov: %s"
 
-#: ../meld/dirdiff.py:980
+#: ../meld/dirdiff.py:981
 #, python-format
 msgid "Error deleting %s"
 msgstr "Napaka med brisanjem %s"
 
-#: ../meld/dirdiff.py:1491
+#: ../meld/dirdiff.py:1497
+#, fuzzy
 msgid "No folder"
-msgstr ""
+msgstr "mapa"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
 #: ../meld/filediff.py:335
@@ -1734,8 +1765,9 @@ msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
 #: ../meld/filediff.py:762
+#, fuzzy
 msgid "Comparison results will be inaccurate"
-msgstr ""
+msgstr "Rezultati:"
 
 #: ../meld/filediff.py:764
 msgid ""
@@ -1746,7 +1778,7 @@ msgstr ""
 #: ../meld/filediff.py:820
 #, fuzzy
 msgid "Mark conflict as resolved?"
-msgstr "Označi kot razrešeno v VC"
+msgstr "Označi kot razrešeno v sistemu nadzora različic"
 
 #: ../meld/filediff.py:822
 msgid ""
@@ -1759,49 +1791,49 @@ msgstr "Prekliči"
 
 #: ../meld/filediff.py:825
 msgid "Mark _Resolved"
-msgstr ""
+msgstr "Označi kot _razrešeno"
 
-#: ../meld/filediff.py:1073
+#: ../meld/filediff.py:1076
 #, python-format
 msgid "There was a problem opening the file “%s”."
-msgstr ""
+msgstr "Prišlo je do napake med odpiranjem datoteke “%s”."
 
-#: ../meld/filediff.py:1081
-#, python-format
+#: ../meld/filediff.py:1084
+#, fuzzy, python-format
 msgid "File %s appears to be a binary file."
-msgstr ""
+msgstr "Datoteka je videti kot besedilna datoteka"
 
-#: ../meld/filediff.py:1083
+#: ../meld/filediff.py:1086
 msgid "Do you want to open the file using the default application?"
 msgstr ""
 
-#: ../meld/filediff.py:1085
+#: ../meld/filediff.py:1088
 msgid "Open"
 msgstr "Odpri"
 
-#: ../meld/filediff.py:1101
+#: ../meld/filediff.py:1104
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Računanje razlik"
 
-#: ../meld/filediff.py:1163
+#: ../meld/filediff.py:1166
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Datoteka %s je bila na disku spremenjena."
 
-#: ../meld/filediff.py:1164
+#: ../meld/filediff.py:1167
 msgid "Do you want to reload the file?"
 msgstr "Ali želite ponovno naložiti datoteko?"
 
-#: ../meld/filediff.py:1166
+#: ../meld/filediff.py:1169
 msgid "_Reload"
 msgstr "_Ponovno naloži"
 
-#: ../meld/filediff.py:1322
+#: ../meld/filediff.py:1325
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1335
+#: ../meld/filediff.py:1338
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1809,26 +1841,26 @@ msgstr ""
 "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
 "Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: ../meld/filediff.py:1340
+#: ../meld/filediff.py:1343
 msgid "Files differ in line endings only"
 msgstr ""
 
-#: ../meld/filediff.py:1342
+#: ../meld/filediff.py:1345
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
 "%s"
 msgstr ""
 
-#: ../meld/filediff.py:1362
+#: ../meld/filediff.py:1365
 msgid "Show without filters"
 msgstr "Pokaži brez filtrov"
 
-#: ../meld/filediff.py:1384
+#: ../meld/filediff.py:1387
 msgid "Change highlighting incomplete"
 msgstr "Spremeni označevanje kot nedokončano"
 
-#: ../meld/filediff.py:1385
+#: ../meld/filediff.py:1388
 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."
@@ -1836,91 +1868,94 @@ 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:1393
+#: ../meld/filediff.py:1396
 msgid "Keep highlighting"
 msgstr "Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1395
+#: ../meld/filediff.py:1398
 msgid "_Keep highlighting"
 msgstr "_Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1427
+#: ../meld/filediff.py:1430
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Ali želite zamenjati datoteko »%s«?"
 
-#: ../meld/filediff.py:1429
+#: ../meld/filediff.py:1432
 #, 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:1446
+#: ../meld/filediff.py:1449
 msgid "Save Left Pane As"
 msgstr "Shrani levi pladenj kot"
 
-#: ../meld/filediff.py:1448
+#: ../meld/filediff.py:1451
 msgid "Save Middle Pane As"
 msgstr "Shrani srednji pladenj kot"
 
-#: ../meld/filediff.py:1450
+#: ../meld/filediff.py:1453
 msgid "Save Right Pane As"
 msgstr "Shrani desni pladenj kot"
 
-#: ../meld/filediff.py:1464
-#, python-format
+#: ../meld/filediff.py:1467
+#, fuzzy, python-format
 msgid "File %s has changed on disk since it was opened"
-msgstr ""
+msgstr "Datoteka %s je bila na disku spremenjena."
 
-#: ../meld/filediff.py:1466
+#: ../meld/filediff.py:1469
 #, 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?"
+msgstr "V primeru, da datoteke ne shranite, bodo izgubljene vse spremembe."
 
-#: ../meld/filediff.py:1469
+#: ../meld/filediff.py:1472
 msgid "Save Anyway"
 msgstr "Vseeno shrani"
 
-#: ../meld/filediff.py:1470
-msgid "Don't Save"
+#: ../meld/filediff.py:1473
+msgid "Don’t Save"
 msgstr "Ne shrani"
 
-#: ../meld/filediff.py:1496
+#: ../meld/filediff.py:1499
 msgid "_Save as UTF-8"
 msgstr "_Shrani kot UTF-8"
 
-#: ../meld/filediff.py:1499
-#, python-format
-msgid "Couldn't encode text as “%s”"
-msgstr ""
+#: ../meld/filediff.py:1502
+#, fuzzy, python-format
+msgid "Couldn’t encode text as “%s”"
+msgstr "Ni mogoče zagnati zalednega programa »%s«."
 
-#: ../meld/filediff.py:1501
-#, python-format
+#: ../meld/filediff.py:1504
+#, fuzzy, python-format
+#| msgid ""
+#| "'%s' contains characters not encodable with '%s'\n"
+#| "Would you like to save as UTF-8?"
 msgid ""
-"File “%s” contains characters that can't be encoded using encoding “%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:1541 ../meld/patchdialog.py:130
-#, python-format
+#: ../meld/filediff.py:1544 ../meld/patchdialog.py:130
+#, fuzzy, python-format
 msgid "Could not save file %s."
-msgstr ""
+msgstr "Ni mogoče shraniti datoteke %s"
 
-#: ../meld/filediff.py:1542 ../meld/patchdialog.py:131
-#, python-format
+#: ../meld/filediff.py:1545 ../meld/patchdialog.py:131
+#, fuzzy, python-format
 msgid ""
-"Couldn't save file due to:\n"
+"Couldn’t save file due to:\n"
 "%s"
-msgstr ""
+msgstr "Ni mogoče shraniti slike v datoteko"
 
-#: ../meld/filediff.py:1906
+#: ../meld/filediff.py:1909
 msgid "Live comparison updating disabled"
 msgstr "Živo posodabljanje ob primerjavi je onemogočeno"
 
-#: ../meld/filediff.py:1907
+#: ../meld/filediff.py:1910
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1943,97 +1978,101 @@ msgstr "Kopiraj _navzgor"
 msgid "Copy _down"
 msgstr "Kopiraj _navzdol"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:179
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Neveljavno število argumentov pri ukazu --diff."
 
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:184
 msgid "Start with an empty window"
 msgstr "Zagon brez odprtih oken"
 
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:183
+#: ../meld/meldapp.py:185 ../meld/meldapp.py:187
 msgid "file"
 msgstr "datoteka"
 
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
+#: ../meld/meldapp.py:185 ../meld/meldapp.py:189
 msgid "folder"
 msgstr "mapa"
 
-#: ../meld/meldapp.py:182
+#: ../meld/meldapp.py:186
 msgid "Start a version control comparison"
 msgstr "Zagon primerjave nadzora različic"
 
-#: ../meld/meldapp.py:184
+#: ../meld/meldapp.py:188
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: ../meld/meldapp.py:186
+#: ../meld/meldapp.py:190
 #, fuzzy
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: ../meld/meldapp.py:229
+#: ../meld/meldapp.py:233
 #, python-format
 msgid "Error: %s\n"
 msgstr "Napaka: %s\n"
 
-#: ../meld/meldapp.py:236
+#: ../meld/meldapp.py:240
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je orodje za primerjavo vsebine datotek in map."
 
-#: ../meld/meldapp.py:240
+#: ../meld/meldapp.py:244
 msgid "Set label to use instead of file name"
 msgstr "Določi naslov namesto imena datoteke"
 
-#: ../meld/meldapp.py:243
+#: ../meld/meldapp.py:247
 msgid "Open a new tab in an already running instance"
 msgstr "Odpri nov zavihek v že zagnanem programu"
 
-#: ../meld/meldapp.py:246
+#: ../meld/meldapp.py:250
 msgid "Automatically compare all differing files on startup"
 msgstr "Ob zagonu samodejno primerjaj vse različne datoteke."
 
-#: ../meld/meldapp.py:249
+#: ../meld/meldapp.py:253
 msgid "Ignored for compatibility"
 msgstr "Prezrto zaradi skladnosti"
 
-#: ../meld/meldapp.py:253
+#: ../meld/meldapp.py:257
 msgid "Set the target file for saving a merge result"
 msgstr "Določitev ciljne datoteke za shranjevanje rezultatov združevanja."
 
-#: ../meld/meldapp.py:256
+#: ../meld/meldapp.py:260
 msgid "Automatically merge files"
 msgstr "Samodejno združi datoteke"
 
-#: ../meld/meldapp.py:260
+#: ../meld/meldapp.py:264
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Naloži shranjeno datoteko primerjav Meld"
 
-#: ../meld/meldapp.py:264
+#: ../meld/meldapp.py:268
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Ustvari zavihke primerjav za navedene datoteke ali mape."
 
-#: ../meld/meldapp.py:284
+#: ../meld/meldapp.py:288
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "preveč argumentov (zahtevanih 0-3, prejetih %d)"
 
-#: ../meld/meldapp.py:287
-msgid "can't auto-merge less than 3 files"
+#: ../meld/meldapp.py:291
+#, fuzzy
+#| msgid "can't auto-merge less than 3 files"
+msgid "can’t auto-merge less than 3 files"
 msgstr "manj kot treh datotek ni mogoče samodejno združevati"
 
-#: ../meld/meldapp.py:289
-msgid "can't auto-merge directories"
-msgstr "map ni mogoče samodejno združevati"
+#: ../meld/meldapp.py:293
+#, fuzzy
+#| msgid "can't auto-merge directories"
+msgid "can’t auto-merge directories"
+msgstr "Ni mogoče združiti map"
 
-#: ../meld/meldapp.py:303
+#: ../meld/meldapp.py:307
 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 ""
+#: ../meld/meldapp.py:349
+#, fuzzy, python-format
+msgid "invalid path or URI “%s”"
+msgstr "Neveljaven naslov URI mape »%s«"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
 #: ../meld/meldbuffer.py:131
@@ -2049,7 +2088,9 @@ msgid "_File"
 msgstr "_Datoteka"
 
 #: ../meld/meldwindow.py:50
-msgid "_New Comparison..."
+#, fuzzy
+#| msgid "_New Comparison..."
+msgid "_New Comparison…"
 msgstr "_Nova primerjava ..."
 
 #: ../meld/meldwindow.py:51
@@ -2061,8 +2102,10 @@ msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
 #: ../meld/meldwindow.py:56
-msgid "Save As..."
-msgstr "Shrani kot ..."
+#, fuzzy
+#| msgid "Save As..."
+msgid "Save As…"
+msgstr "_Shrani ..."
 
 #: ../meld/meldwindow.py:57
 msgid "Save the current file with a different name"
@@ -2097,7 +2140,7 @@ msgid "Paste the clipboard"
 msgstr "Prilepi iz odložišča"
 
 #: ../meld/meldwindow.py:76
-msgid "Find..."
+msgid "Find…"
 msgstr "Najdi ..."
 
 #: ../meld/meldwindow.py:76
@@ -2121,7 +2164,9 @@ msgid "Search backwards for the same text"
 msgstr "Besedilo najdi nazaj po besedilu"
 
 #: ../meld/meldwindow.py:85
-msgid "_Replace..."
+#, fuzzy
+#| msgid "_Replace"
+msgid "_Replace…"
 msgstr "_Zamenjaj ..."
 
 #: ../meld/meldwindow.py:86
@@ -2228,18 +2273,18 @@ msgstr "Odpri priročnik Meld"
 msgid "About this application"
 msgstr "O programu"
 
-#: ../meld/meldwindow.py:596
+#: ../meld/meldwindow.py:595
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr ""
 
-#: ../meld/meldwindow.py:610
+#: ../meld/meldwindow.py:609
 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"
+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]"
@@ -2294,18 +2339,19 @@ msgstr[1] "%d veja"
 msgstr[2] "%d veji"
 msgstr[3] "%d veje"
 
-#: ../meld/vc/git.py:332
+#: ../meld/vc/git.py:333
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Način je spremenjen iz %s v %s"
 
-#: ../meld/vc/git.py:340
+#: ../meld/vc/git.py:341
+#, fuzzy
 msgid "Partially staged"
-msgstr ""
+msgstr "delno označeno"
 
-#: ../meld/vc/git.py:340
+#: ../meld/vc/git.py:341
 msgid "Staged"
-msgstr ""
+msgstr "V pripravljenosti"
 
 #. Translators: This is the displayed name of a version control system
 #. when no version control system is actually found.
@@ -2314,71 +2360,71 @@ msgid "None"
 msgstr "Brez"
 
 #: ../meld/vc/svn.py:204
-#, python-format
+#, fuzzy, python-format
 msgid "Rev %s"
-msgstr ""
+msgstr "Za '%s':"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Merged"
 msgstr "Združeno"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Base"
 msgstr "Osnova"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Local"
 msgstr "Krajevno"
 
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
 msgid "Remote"
 msgstr "Oddaljeno"
 
-#: ../meld/vc/_vc.py:70
+#: ../meld/vc/_vc.py:71
 msgid "Unversioned"
 msgstr "Brez določene različice"
 
-#: ../meld/vc/_vc.py:73
+#: ../meld/vc/_vc.py:74
 msgid "Error"
 msgstr "Napaka"
 
-#: ../meld/vc/_vc.py:75
+#: ../meld/vc/_vc.py:76
 msgid "Newly added"
 msgstr "Nedavno dodano"
 
-#: ../meld/vc/_vc.py:77
+#: ../meld/vc/_vc.py:78
 msgid "Renamed"
 msgstr "Preimenovano"
 
-#: ../meld/vc/_vc.py:78
+#: ../meld/vc/_vc.py:79
 msgid "Conflict"
 msgstr "V sporu"
 
-#: ../meld/vc/_vc.py:79
+#: ../meld/vc/_vc.py:80
 msgid "Removed"
 msgstr "Odstranjeno"
 
-#: ../meld/vc/_vc.py:80
+#: ../meld/vc/_vc.py:81
 msgid "Missing"
 msgstr "Manjkajoče"
 
-#: ../meld/vc/_vc.py:81
+#: ../meld/vc/_vc.py:82
 msgid "Not present"
 msgstr "Ni na voljo"
 
 #. Translators: This error message is shown when a version
 #. control binary isn't installed.
 #: ../meld/vcview.py:251
-#, python-format
+#, fuzzy, python-format
 msgid "%(name)s (%(cmd)s not installed)"
-msgstr ""
+msgstr "Nameščena različica %s %s"
 
 #. Translators: This error message is shown when a version
 #. controlled repository is invalid.
 #: ../meld/vcview.py:255
-#, python-format
+#, fuzzy, python-format
 msgid "%(name)s (Invalid repository)"
-msgstr ""
+msgstr "Neveljavno ime skupine: %s"
 
 #: ../meld/vcview.py:276
 msgid "No valid version control system found in this folder"
@@ -2393,60 +2439,68 @@ 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:332
+#: ../meld/vcview.py:333
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:352
+#. Initial yield so when we add this to our tasks, we don't
+#. create iterators that may be invalidated.
+#: ../meld/vcview.py:340
+#, fuzzy
+#| msgid "Invalid repository"
+msgid "Scanning repository"
+msgstr "Preiskovanje"
+
+#: ../meld/vcview.py:369
 #, python-format
 msgid "Scanning %s"
 msgstr "Preiskovanje %s"
 
-#: ../meld/vcview.py:391
+#: ../meld/vcview.py:408
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:435
+#: ../meld/vcview.py:452
 #, python-format
 msgid "%s — local"
 msgstr "%s — krajevno"
 
-#: ../meld/vcview.py:436
+#: ../meld/vcview.py:453
 #, python-format
 msgid "%s — remote"
 msgstr "%s — oddaljeno"
 
-#: ../meld/vcview.py:444
+#: ../meld/vcview.py:461
 #, fuzzy, python-format
 msgid "%s (local, merge, remote)"
-msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
+msgstr "Levo je oddaljeno, desno krajevno"
 
-#: ../meld/vcview.py:449
+#: ../meld/vcview.py:466
 #, fuzzy, python-format
 msgid "%s (remote, merge, local)"
-msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
+msgstr "Levo je oddaljeno, desno krajevno"
 
-#: ../meld/vcview.py:460
+#: ../meld/vcview.py:477
 #, python-format
 msgid "%s — repository"
 msgstr "%s — skladišče"
 
-#: ../meld/vcview.py:466
+#: ../meld/vcview.py:483
 #, python-format
 msgid "%s (working, repository)"
 msgstr "%s (delovno, skladišče)"
 
-#: ../meld/vcview.py:470
+#: ../meld/vcview.py:487
 #, python-format
 msgid "%s (repository, working)"
 msgstr "%s (skladišče, delovno)"
 
-#: ../meld/vcview.py:638
+#: ../meld/vcview.py:674
 msgid "Remove folder and all its files?"
 msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
 
-#: ../meld/vcview.py:640
+#: ../meld/vcview.py:676
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -2454,15 +2508,27 @@ msgstr ""
 "S tem dejanjem bodo odstranjene vse izbrane datoteke in mape in vse "
 "podrejene datoteke iz sistema za nadzor različic"
 
-#: ../meld/vcview.py:665
+#: ../meld/vcview.py:701
 #, python-format
 msgid "Error removing %s"
 msgstr "Napaka med odstranjevanjem %s"
 
-#: ../meld/vcview.py:745
+#: ../meld/vcview.py:780
 msgid "Clear"
 msgstr "Počisti"
 
+#~ msgid "Format as Patch..."
+#~ msgstr "Oblikuj kot popravek ..."
+
+#~ msgid "Co_mmit..."
+#~ msgstr "U_veljavi ..."
+
+#~ msgid "Find..."
+#~ msgstr "Najdi ..."
+
+#~ msgid "_Replace..."
+#~ msgstr "_Zamenjaj ..."
+
 #~ msgid "Meld does not support Python 3."
 #~ msgstr "Program Meld ne podpira okolja Python 3."
 
@@ -2542,13 +2608,6 @@ msgstr "Počisti"
 #~ "\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"
 
@@ -2591,9 +2650,6 @@ msgstr "Počisti"
 #~ msgid "%s not installed"
 #~ msgstr "Program %s ni nameščen"
 
-#~ msgid "Invalid repository"
-#~ msgstr "Neveljavno skladišče"
-
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]