[meld] Updated Slovenian translation

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

commit caca46ff2fd573ab10930bb302ee55636d29db7d
Author: Matej Urbančič <mateju svn gnome org>
Date:   Fri Jan 3 22:28:52 2014 +0100

    Updated Slovenian translation

 po/sl.po |  282 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 151 insertions(+), 131 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 5c5ac29..524afa2 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-2013.
+# Matej Urbančič <mateju svn gnome org>, 2009-2014.
 #
 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: 2013-12-19 15:19+0000\n"
-"PO-Revision-Date: 2013-12-22 19:40+0100\n"
+"POT-Creation-Date: 2014-01-03 06:48+0000\n"
+"PO-Revision-Date: 2014-01-03 22:27+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"
@@ -21,11 +21,11 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: ../bin/meld:117
+#: ../bin/meld:115
 msgid "Cannot import: "
 msgstr "Ni mogoče uvoziti:"
 
-#: ../bin/meld:120
+#: ../bin/meld:118
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Program Meld zahteva najmanj različico %s."
@@ -70,7 +70,6 @@ msgid "Default window size"
 msgstr "Privzeta vodoravna velikost okna"
 
 #: ../data/org.gnome.meld.gschema.xml.h:2
-#, fuzzy
 msgid "Show toolbar"
 msgstr "Pokaži orodno vrstico"
 
@@ -80,7 +79,6 @@ msgid "If true, the window toolbar is visible."
 msgstr "Prav, če je okno lastnosti razpeto."
 
 #: ../data/org.gnome.meld.gschema.xml.h:4
-#, fuzzy
 msgid "Show statusbar"
 msgstr "Pokaži vrstico stanja"
 
@@ -128,7 +126,6 @@ msgid "If true, line numbers will be shown in the gutter of file comparisons."
 msgstr ""
 
 #: ../data/org.gnome.meld.gschema.xml.h:14
-#, fuzzy
 msgid "Highlight syntax"
 msgstr "Poudarjanje skladnje"
 
@@ -150,7 +147,6 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.meld.gschema.xml.h:18
-#, fuzzy
 msgid "Wrap mode"
 msgstr "Način preloma"
 
@@ -430,7 +426,7 @@ msgstr "Kopiraj na desno"
 msgid "Delete selected"
 msgstr "Izbriši izbor"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1418
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1414
 msgid "Hide"
 msgstr "Skrij"
 
@@ -466,7 +462,7 @@ msgstr "Novo"
 msgid "Show new"
 msgstr "Pokaži novejše"
 
-#: ../data/ui/dirdiff.ui.h:16
+#: ../data/ui/dirdiff.ui.h:16 ../meld/vc/_vc.py:71
 msgid "Modified"
 msgstr "Spremenjeno"
 
@@ -499,7 +495,7 @@ msgid "_Add"
 msgstr "_Dodaj"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:677
+#: ../meld/vcview.py:678
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -520,8 +516,8 @@ msgid "Move _Down"
 msgstr "Premakni navz_dol"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:365
-#: ../meld/vcview.py:187
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:366
+#: ../meld/vcview.py:188
 msgid "Name"
 msgstr "Ime"
 
@@ -566,15 +562,11 @@ msgstr ""
 "in vsebino spreminjate, vendar pa je treba spremembe shraniti v datoteko z "
 "drugim imenom."
 
-#: ../data/ui/filediff.ui.h:7 ../meld/filediff.py:301
-msgid "Lock scrolling of all panes"
-msgstr "Zakleni drsenje vseh pladnjev"
-
-#: ../data/ui/filediff.ui.h:8
+#: ../data/ui/filediff.ui.h:7
 msgid "Revert unsaved changes to documents?"
 msgstr "Ali naj se povrnejo neshranjene spremembe dokumentov?"
 
-#: ../data/ui/filediff.ui.h:9
+#: ../data/ui/filediff.ui.h:8
 msgid "Changes made to the following documents will be permanently lost:\n"
 msgstr "Spremembe navedenih dokumentov bodo trajno izgubljene:\n"
 
@@ -962,7 +954,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:26
+#: ../data/ui/vcview.ui.h:26 ../meld/vc/_vc.py:64
 msgid "Ignored"
 msgstr "Prezrto"
 
@@ -1003,55 +995,55 @@ msgid "_Push commits"
 msgstr "_Objavi uveljavitve"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:383
+#: ../meld/dirdiff.py:384
 msgid "Size"
 msgstr "Velikost"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:391
+#: ../meld/dirdiff.py:392
 msgid "Modification time"
 msgstr "Čas spremembe"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:399
+#: ../meld/dirdiff.py:400
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: ../meld/dirdiff.py:558
+#: ../meld/dirdiff.py:559
 #, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:687 ../meld/dirdiff.py:709
+#: ../meld/dirdiff.py:688 ../meld/dirdiff.py:710
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:809
+#: ../meld/dirdiff.py:810
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] končano"
 
-#: ../meld/dirdiff.py:815
+#: ../meld/dirdiff.py:817
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je prišlo do več napak."
 
-#: ../meld/dirdiff.py:816
+#: ../meld/dirdiff.py:818
 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:818
+#: ../meld/dirdiff.py:820
 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:820
+#: ../meld/dirdiff.py:822
 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:822
+#: ../meld/dirdiff.py:824
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1060,17 +1052,17 @@ msgstr ""
 "razlike velikosti upošteva. Nekatere datoteke so skrite:\n"
 "%s"
 
-#: ../meld/dirdiff.py:833
+#: ../meld/dirdiff.py:835
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:858 ../meld/filediff.py:1111 ../meld/filediff.py:1249
-#: ../meld/filediff.py:1420 ../meld/filediff.py:1450 ../meld/filediff.py:1452
+#: ../meld/dirdiff.py:860 ../meld/filediff.py:1107 ../meld/filediff.py:1245
+#: ../meld/filediff.py:1416 ../meld/filediff.py:1446 ../meld/filediff.py:1448
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/dirdiff.py:889
+#: ../meld/dirdiff.py:891
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -1079,11 +1071,11 @@ msgstr ""
 "'%s' že obstaja.\n"
 "Ali naj bo prepisana?"
 
-#: ../meld/dirdiff.py:897
+#: ../meld/dirdiff.py:899
 msgid "Error copying file"
 msgstr "Napaka kopiranja datoteke"
 
-#: ../meld/dirdiff.py:898
+#: ../meld/dirdiff.py:900
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -1096,12 +1088,12 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:921
+#: ../meld/dirdiff.py:923
 #, python-format
 msgid "Error deleting %s"
 msgstr "Napaka med brisanjem %s"
 
-#: ../meld/dirdiff.py:1052
+#: ../meld/dirdiff.py:1054
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -1110,7 +1102,7 @@ msgstr[1] "%i sekunda"
 msgstr[2] "%i sekundi"
 msgstr[3] "%i sekunde"
 
-#: ../meld/dirdiff.py:1053
+#: ../meld/dirdiff.py:1055
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -1119,7 +1111,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuti"
 msgstr[3] "%i minute"
 
-#: ../meld/dirdiff.py:1054
+#: ../meld/dirdiff.py:1056
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -1128,7 +1120,7 @@ msgstr[1] "%i ura"
 msgstr[2] "%i uri"
 msgstr[3] "%i ure"
 
-#: ../meld/dirdiff.py:1055
+#: ../meld/dirdiff.py:1057
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -1137,7 +1129,7 @@ msgstr[1] "%i dan"
 msgstr[2] "%i dni"
 msgstr[3] "%i dni"
 
-#: ../meld/dirdiff.py:1056
+#: ../meld/dirdiff.py:1058
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -1146,7 +1138,7 @@ msgstr[1] "%i teden"
 msgstr[2] "%i tedna"
 msgstr[3] "%i tedni"
 
-#: ../meld/dirdiff.py:1057
+#: ../meld/dirdiff.py:1059
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -1155,7 +1147,7 @@ msgstr[1] "%i mesec"
 msgstr[2] "%i meseca"
 msgstr[3] "%i meseci"
 
-#: ../meld/dirdiff.py:1058
+#: ../meld/dirdiff.py:1060
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -1324,22 +1316,26 @@ msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
 msgid "Lock Scrolling"
 msgstr "Zakleni drsenje"
 
+#: ../meld/filediff.py:301
+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:486
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:472
+#: ../meld/filediff.py:486
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:474
+#: ../meld/filediff.py:488
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:811
+#: ../meld/filediff.py:825
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -1348,55 +1344,55 @@ 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:1099
+#: ../meld/filediff.py:1095
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Določi okna"
 
-#: ../meld/filediff.py:1105
+#: ../meld/filediff.py:1101
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:1128 ../meld/filediff.py:1138 ../meld/filediff.py:1151
-#: ../meld/filediff.py:1157
+#: ../meld/filediff.py:1124 ../meld/filediff.py:1134 ../meld/filediff.py:1147
+#: ../meld/filediff.py:1153
 msgid "Could not read file"
 msgstr "Ni mogoče prebrati datoteke"
 
-#: ../meld/filediff.py:1129
+#: ../meld/filediff.py:1125
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:1139
+#: ../meld/filediff.py:1135
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiška datoteka."
 
-#: ../meld/filediff.py:1152
+#: ../meld/filediff.py:1148
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:1187
+#: ../meld/filediff.py:1183
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Računanje razlik"
 
-#: ../meld/filediff.py:1244
+#: ../meld/filediff.py:1240
 #, python-format
 msgid "File %s has changed on disk"
-msgstr ""
+msgstr "Datoteka %s je bila na disku spremenjena."
 
-#: ../meld/filediff.py:1245
+#: ../meld/filediff.py:1241
 msgid "Do you want to reload the file?"
 msgstr "Ali želite ponovno naložiti datoteko?"
 
-#: ../meld/filediff.py:1248
+#: ../meld/filediff.py:1244
 msgid "_Reload"
 msgstr "_Ponovno naloži"
 
-#: ../meld/filediff.py:1409
+#: ../meld/filediff.py:1405
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1404,19 +1400,19 @@ msgstr ""
 "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
 "Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: ../meld/filediff.py:1415
+#: ../meld/filediff.py:1411
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1423
+#: ../meld/filediff.py:1419
 msgid "Show without filters"
 msgstr "Pokaži brez filtrov"
 
-#: ../meld/filediff.py:1445
+#: ../meld/filediff.py:1441
 msgid "Change highlighting incomplete"
 msgstr "Spremeni označevanje kot nedokončano"
 
-#: ../meld/filediff.py:1446
+#: ../meld/filediff.py:1442
 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."
@@ -1424,15 +1420,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:1454
+#: ../meld/filediff.py:1450
 msgid "Keep highlighting"
 msgstr "Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1456
+#: ../meld/filediff.py:1452
 msgid "_Keep highlighting"
 msgstr "_Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1587
+#: ../meld/filediff.py:1583
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -1441,7 +1437,7 @@ msgstr ""
 "\"%s\" že obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1600
+#: ../meld/filediff.py:1596
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -1452,41 +1448,39 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1611
+#: ../meld/filediff.py:1607
 msgid "Save Left Pane As"
 msgstr "Shrani levi pladenj kot"
 
-#: ../meld/filediff.py:1613
+#: ../meld/filediff.py:1609
 msgid "Save Middle Pane As"
 msgstr "Shrani srednji pladenj kot"
 
-#: ../meld/filediff.py:1615
+#: ../meld/filediff.py:1611
 msgid "Save Right Pane As"
 msgstr "Shrani desni pladenj kot"
 
-#: ../meld/filediff.py:1626
+#: ../meld/filediff.py:1622
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr ""
 
-#: ../meld/filediff.py:1628
+#: ../meld/filediff.py:1624
 #, 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:1631
-#, fuzzy
+#: ../meld/filediff.py:1627
 msgid "Save Anyway"
 msgstr "Vseeno shrani"
 
-#: ../meld/filediff.py:1632
-#, fuzzy
+#: ../meld/filediff.py:1628
 msgid "Don't Save"
 msgstr "Ne shrani"
 
-#: ../meld/filediff.py:1656
+#: ../meld/filediff.py:1652
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -1497,7 +1491,7 @@ msgstr ""
 "\n"
 "Kateri zapis želite uporabiti?"
 
-#: ../meld/filediff.py:1672
+#: ../meld/filediff.py:1668
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -1506,11 +1500,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:2048
+#: ../meld/filediff.py:2032
 msgid "Live comparison updating disabled"
 msgstr "Živo posodabljanje ob primerjavi je onemogočeno"
 
-#: ../meld/filediff.py:2049
+#: ../meld/filediff.py:2033
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1533,84 +1527,84 @@ msgstr "Kopiraj _navzgor"
 msgid "Copy _down"
 msgstr "Kopiraj _navzdol"
 
-#: ../meld/meldapp.py:138
+#: ../meld/meldapp.py:134
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Neveljavno število argumentov pri ukazu --diff."
 
-#: ../meld/meldapp.py:143
+#: ../meld/meldapp.py:139
 msgid "Start with an empty window"
 msgstr "Zagon brez odprtih oken"
 
-#: ../meld/meldapp.py:144 ../meld/meldapp.py:146
+#: ../meld/meldapp.py:140 ../meld/meldapp.py:142
 msgid "file"
 msgstr "datoteka"
 
-#: ../meld/meldapp.py:144 ../meld/meldapp.py:148
+#: ../meld/meldapp.py:140 ../meld/meldapp.py:144
 msgid "dir"
 msgstr "mapa"
 
-#: ../meld/meldapp.py:145
+#: ../meld/meldapp.py:141
 msgid "Start a version control comparison"
 msgstr "Zagon primerjave nadzora različic"
 
-#: ../meld/meldapp.py:147
+#: ../meld/meldapp.py:143
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: ../meld/meldapp.py:149
+#: ../meld/meldapp.py:145
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo map"
 
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:153
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je orodje za primerjavo vsebine datotek in map."
 
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:156
 msgid "Set label to use instead of file name"
 msgstr "Določi naslov namesto imena datoteke"
 
-#: ../meld/meldapp.py:162
+#: ../meld/meldapp.py:158
 msgid "Open a new tab in an already running instance"
 msgstr "Odpri nov zavihek v že zagnanem programu"
 
-#: ../meld/meldapp.py:165
+#: ../meld/meldapp.py:161
 msgid "Automatically compare all differing files on startup"
 msgstr "Ob zagonu samodejno primerjaj vse različne datoteke."
 
-#: ../meld/meldapp.py:167
+#: ../meld/meldapp.py:163
 msgid "Ignored for compatibility"
 msgstr "Prezrto zaradi skladnosti"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:166
 msgid "Set the target file for saving a merge result"
 msgstr "Določitev ciljne datoteke za shranjevanje rezultatov združevanja."
 
-#: ../meld/meldapp.py:172
+#: ../meld/meldapp.py:168
 msgid "Automatically merge files"
 msgstr "Samodejno združi datoteke"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:171
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Naloži shranjeno datoteko primerjav Meld"
 
-#: ../meld/meldapp.py:178
+#: ../meld/meldapp.py:174
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Ustvari zavihke primerjav za navedene datoteke ali mape."
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:177
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "preveč argumentov (zahtevanih 0-3, prejetih %d)"
 
-#: ../meld/meldapp.py:184
+#: ../meld/meldapp.py:180
 msgid "can't auto-merge less than 3 files"
 msgstr "manj kot treh datotek ni mogoče samodejno združevati"
 
-#: ../meld/meldapp.py:186
+#: ../meld/meldapp.py:182
 msgid "can't auto-merge directories"
 msgstr "map ni mogoče samodejno združevati"
 
-#: ../meld/meldapp.py:196
+#: ../meld/meldapp.py:192
 msgid "Error reading saved comparison file"
 msgstr "Napaka med branjem datoteke primerjav"
 
@@ -1844,7 +1838,7 @@ msgstr "oznaka"
 msgid "pattern"
 msgstr "vzorec"
 
-#: ../meld/recent.py:109
+#: ../meld/recent.py:107
 msgid "Version control:"
 msgstr "Nadzor različic:"
 
@@ -1852,7 +1846,7 @@ msgstr "Nadzor različic:"
 msgid "Regular expression error"
 msgstr "Napaka v logičnem izrazu"
 
-#: ../meld/ui/notebooklabel.py:67
+#: ../meld/ui/notebooklabel.py:68
 msgid "Close tab"
 msgstr "Zapri zavihek"
 
@@ -1908,85 +1902,104 @@ msgstr "Krajevno"
 msgid "Remote"
 msgstr "Oddaljeno"
 
-#. These are the possible states of files. Be sure to get the colons correct.
-#: ../meld/vc/_vc.py:62
-msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:"
-"Not present"
-msgstr ""
-"Prezrto:Nedoločeno:::Napaka::Novo dodano:Spremenjeno:V sporu:Odstranjeno:"
-"Manjkajoče:Nedostopno"
+#: ../meld/vc/_vc.py:65
+msgid "Unversioned"
+msgstr "Brez določene različice"
+
+#: ../meld/vc/_vc.py:68
+msgid "Error"
+msgstr "Napaka"
+
+#: ../meld/vc/_vc.py:70
+msgid "Newly added"
+msgstr "Nedavno dodano"
+
+#: ../meld/vc/_vc.py:72
+msgid "Conflict"
+msgstr "V sporu"
+
+#: ../meld/vc/_vc.py:73
+msgid "Removed"
+msgstr "Odstranjeno"
+
+#: ../meld/vc/_vc.py:74
+msgid "Missing"
+msgstr "Manjkajoče"
+
+#: ../meld/vc/_vc.py:75
+msgid "Not present"
+msgstr "Ni na voljo"
 
-#: ../meld/vcview.py:217 ../meld/vcview.py:392
+#: ../meld/vcview.py:218 ../meld/vcview.py:393
 msgid "Location"
 msgstr "Mesto"
 
-#: ../meld/vcview.py:218
+#: ../meld/vcview.py:219
 msgid "Status"
 msgstr "Stanje"
 
-#: ../meld/vcview.py:219
+#: ../meld/vcview.py:220
 msgid "Revision"
 msgstr "Predelava"
 
-#: ../meld/vcview.py:220
+#: ../meld/vcview.py:221
 msgid "Options"
 msgstr "Možnosti"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:303
+#: ../meld/vcview.py:304
 #, python-format
 msgid "%s not installed"
 msgstr "Program %s ni nameščen"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:307
+#: ../meld/vcview.py:308
 msgid "Invalid repository"
 msgstr "Neveljavno skladišče"
 
-#: ../meld/vcview.py:316
+#: ../meld/vcview.py:317
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:318 ../meld/vcview.py:326
+#: ../meld/vcview.py:319 ../meld/vcview.py:327
 msgid "None"
 msgstr "Brez"
 
-#: ../meld/vcview.py:337
+#: ../meld/vcview.py:338
 msgid "No valid version control system found in this folder"
 msgstr "Ni veljavnega sistema za nadzor različic v tej mapi"
 
-#: ../meld/vcview.py:339
+#: ../meld/vcview.py:340
 msgid "Only one version control system found in this folder"
 msgstr "V tej mapi je le en sistem nadzora različic"
 
-#: ../meld/vcview.py:341
+#: ../meld/vcview.py:342
 msgid "Choose which version control system to use"
 msgstr "Izbor različice sistema za nadzor različic za uporabo"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:392
+#: ../meld/vcview.py:393
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:406 ../meld/vcview.py:414
+#: ../meld/vcview.py:407 ../meld/vcview.py:415
 #, python-format
 msgid "Scanning %s"
 msgstr "Preiskovanje %s"
 
-#: ../meld/vcview.py:448
+#: ../meld/vcview.py:449
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:671
+#: ../meld/vcview.py:672
 msgid "Remove folder and all its files?"
 msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
 
-#: ../meld/vcview.py:673
+#: ../meld/vcview.py:674
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -1994,11 +2007,18 @@ msgstr ""
 "S tem dejanjem bodo odstranjene vse izbrane datoteke in mape in vse "
 "podrejene datoteke iz sistema za nadzor različic"
 
-#: ../meld/vcview.py:707
+#: ../meld/vcview.py:708
 #, python-format
 msgid "Error removing %s"
 msgstr "Napaka med odstranjevanjem %s"
 
+#~ msgid ""
+#~ "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:"
+#~ "Missing:Not present"
+#~ msgstr ""
+#~ "Prezrto:Nedoločeno:::Napaka::Novo dodano:Spremenjeno:V sporu:Odstranjeno:"
+#~ "Manjkajoče:Nedostopno"
+
 #~ msgid "http://meldmerge.org/";
 #~ msgstr "http://meldmerge.org/";