[meld] Updated Slovenian translation

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

commit 4038cbf2e0c72b6234f1a645953500229860f392
Author: Martin Srebotnjak <miles filmsi net>
Date:   Sat Mar 16 09:47:52 2013 +0100

    Updated Slovenian translation

 po/sl.po |  452 +++++++++++++++++++++----------------------------------------
 1 files changed, 156 insertions(+), 296 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 7917df4..82b711f 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,31 +7,32 @@
 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-03-01 19:49+0000\n"
-"PO-Revision-Date: 2013-03-07 22:08+0100\n"
+"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=meld&keywords=I18N+L10N&component=general\n";
+"POT-Creation-Date: 2013-03-14 20:55+0000\n"
+"PO-Revision-Date: 2013-03-15 16:45+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.5.4\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-Country: SLOVENIA\n"
 
-#: ../bin/meld:113
+#: ../bin/meld:121
 msgid "Cannot import: "
 msgstr "Ni mogoče uvoziti:"
 
-#: ../bin/meld:116
+#: ../bin/meld:124
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Program Meld zahteva najmanj različico %s."
 
-#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+#: ../data/meld.desktop.in.h:1
+#: ../data/ui/meldapp.ui.h:1
 msgid "Meld"
 msgstr "Meld"
 
@@ -59,11 +60,13 @@ msgstr "Dejavno"
 msgid "Column name"
 msgstr "Ime stolpca"
 
-#: ../data/ui/EditableList.ui.h:4 ../meld/vcview.py:163
+#: ../data/ui/EditableList.ui.h:4
+#: ../meld/vcview.py:163
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../data/ui/EditableList.ui.h:5 ../meld/vcview.py:164
+#: ../data/ui/EditableList.ui.h:5
+#: ../meld/vcview.py:164
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -84,7 +87,8 @@ msgid "Move _Down"
 msgstr "Premakni navz_dol"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:325
+#: ../data/ui/EditableList.ui.h:10
+#: ../meld/dirdiff.py:326
 #: ../meld/vcview.py:200
 msgid "Name"
 msgstr "Ime"
@@ -122,15 +126,11 @@ msgid "_Save"
 msgstr "_Shrani"
 
 #: ../data/ui/filediff.ui.h:6
-msgid ""
-"This file can not be written to. You may click here to unlock this file and "
-"make changes anyway, but these changes must be saved to a new file."
-msgstr ""
-"V datoteko ni mogoče pisati. S klikom na to mesto lahko odklenete datoteko "
-"in vsebino spreminjate, vendar pa je treba spremembe shraniti v datoteko z "
-"drugim imenom."
+msgid "This file can not be written to. You may click here to unlock this file and make changes anyway, but 
these changes must be saved to a new file."
+msgstr "V datoteko ni mogoče pisati. S klikom na to mesto lahko odklenete datoteko in vsebino spreminjate, 
vendar pa je treba spremembe shraniti v datoteko z drugim imenom."
 
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:78
+#: ../data/ui/findbar.ui.h:1
+#: ../meld/meldwindow.py:78
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
@@ -180,31 +180,17 @@ msgstr ""
 
 #: ../data/ui/meldapp.ui.h:4
 msgid ""
-"Meld is free software: you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation, either version 2 of the License, or (at your option) any later "
-"version.\n"
+"Meld is free software: you can redistribute it and/or modify it under the terms of the GNU General Public 
License as published by the Free Software Foundation, either version 2 of the License, or (at your option) 
any later version.\n"
 "\n"
-"Meld is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details. \n"
+"Meld is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more 
details. \n"
 "\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program.  If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with this program.  If not, see 
<http://www.gnu.org/licenses/>."
 msgstr ""
-"Meld je prosta programska oprema; lahko jo razširjate in/ali spreminjate pod "
-"pogoji Splošnega javnega dovoljenja GNU (GNU General Public License), kot ga "
-"je objavila ustanova Free Software Foundation; bodisi različice 2 ali (po "
-"vaši izbiri) katerekoli poznejše različice.\n"
+"Meld je prosta programska oprema; lahko jo razširjate in/ali spreminjate pod pogoji Splošnega javnega 
dovoljenja GNU (GNU General Public License), kot ga je objavila ustanova Free Software Foundation; bodisi 
različice 2 ali (po vaši izbiri) katerekoli poznejše različice.\n"
 "\n"
-"Program Meld se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA "
-"JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA "
-"DOLOČEN NAMEN. Za podrobnosti glejte besedilo Javnega dovoljenja GNU.\n"
+"Program Meld se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA JAMSTVA; tudi brez posredne 
zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA DOLOČEN NAMEN. Za podrobnosti glejte besedilo Javnega 
dovoljenja GNU.\n"
 "\n"
-"Skupaj s programom bi morali prejeti izvod splošnega javnega dovoljenja GNU "
-"(GNU General Public License); če ga niste si oglejte spletno stran <http://";
-"www.gnu.org/licenses/>."
+"Skupaj s programom bi morali prejeti izvod splošnega javnega dovoljenja GNU (GNU General Public License); 
če ga niste si oglejte spletno stran <http://www.gnu.org/licenses/>."
 
 #: ../data/ui/meldapp.ui.h:9
 msgid "translator-credits"
@@ -331,32 +317,16 @@ msgid "Folder comparisons"
 msgstr "Primerjave map"
 
 #: ../data/ui/preferences.ui.h:24
-msgid ""
-"When performing directory comparisons, you may filter out files and "
-"directories by name. Each pattern is a list of shell style wildcards "
-"separated by spaces."
-msgstr ""
-"Pri primerjavi map je mogoče filtrirati datoteke in mape po imenu. Vsak "
-"vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), ločenimi s "
-"presledki."
+msgid "When performing directory comparisons, you may filter out files and directories by name. Each pattern 
is a list of shell style wildcards separated by spaces."
+msgstr "Pri primerjavi map je mogoče filtrirati datoteke in mape po imenu. Vsak vzorec na seznamu je zapisan 
z nadomestnimi znaki (npr: * in ?), ločenimi s presledki."
 
 #: ../data/ui/preferences.ui.h:25
 msgid "File Filters"
 msgstr "Filtri datotek"
 
 #: ../data/ui/preferences.ui.h:26
-msgid ""
-"When performing file comparisons, you may ignore certain types of changes. "
-"Each pattern here is a python regular expression which replaces matching "
-"text with the empty string before comparison is performed. If the expression "
-"contains groups, only the groups are replaced. See the user manual for more "
-"details."
-msgstr ""
-"Pri primerjavi datotek je mogoče prezreti nekatere vrste sprememb. Vsak "
-"vzorec na seznamu je zapisan z logičnimi izrazi, s katerimi se zamenja "
-"želeno besedilo s praznim nizom, preden je primerjava izvede. V primeru, da "
-"izraz vključuje skupine, so zamenjane le te. Več podrobnosti je zapisanih v "
-"priročniku."
+msgid "When performing file comparisons, you may ignore certain types of changes. Each pattern here is a 
python regular expression which replaces matching text with the empty string before comparison is performed. 
If the expression contains groups, only the groups are replaced. See the user manual for more details."
+msgstr "Pri primerjavi datotek je mogoče prezreti nekatere vrste sprememb. Vsak vzorec na seznamu je zapisan 
z logičnimi izrazi, s katerimi se zamenja želeno besedilo s praznim nizom, preden je primerjava izvede. V 
primeru, da izraz vključuje skupine, so zamenjane le te. Več podrobnosti je zapisanih v priročniku."
 
 #: ../data/ui/preferences.ui.h:27
 msgid "Ignore changes which insert or delete blank lines"
@@ -372,14 +342,14 @@ msgstr "Nalaganje"
 
 #: ../data/ui/preferences.ui.h:30
 msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr ""
-"Med nalaganjem naj bodo preverjeni nabori v vrsti (na primer: utf8, iso1250)"
+msgstr "Med nalaganjem naj bodo preverjeni nabori v vrsti (na primer: utf8, iso1250)"
 
 #: ../data/ui/preferences.ui.h:31
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:604
+#: ../data/ui/tab-placeholder.ui.h:1
+#: ../meld/meldwindow.py:605
 msgid "New comparison"
 msgstr "Nova primerjava"
 
@@ -451,11 +421,13 @@ msgstr "Predhodni dnevniki"
 msgid "Log Message"
 msgstr "Sporočilo beleženja"
 
-#: ../meld/dirdiff.py:255 ../meld/vcview.py:160
+#: ../meld/dirdiff.py:255
+#: ../meld/vcview.py:160
 msgid "_Compare"
 msgstr "_Primerjava"
 
-#: ../meld/dirdiff.py:255 ../meld/vcview.py:160
+#: ../meld/dirdiff.py:255
+#: ../meld/vcview.py:160
 msgid "Compare selected"
 msgstr "Primerjaj izbrano"
 
@@ -479,7 +451,8 @@ msgstr "Kopiraj na desno"
 msgid "Delete selected"
 msgstr "Izbriši izbor"
 
-#: ../meld/dirdiff.py:259 ../meld/filediff.py:1250
+#: ../meld/dirdiff.py:259
+#: ../meld/filediff.py:1256
 msgid "Hide"
 msgstr "Skrij"
 
@@ -492,12 +465,8 @@ msgid "Ignore filename case"
 msgstr "Prezri velikost črk imen datotek"
 
 #: ../meld/dirdiff.py:263
-msgid ""
-"Consider differently-cased filenames that are otherwise-identical to be the "
-"same"
-msgstr ""
-"Obravnavaj datoteke, ki imajo v imenu črke različne velikosti, vendar so "
-"sicer enake, kot da so enake."
+msgid "Consider differently-cased filenames that are otherwise-identical to be the same"
+msgstr "Obravnavaj datoteke, ki imajo v imenu črke različne velikosti, vendar so sicer enake, kot da so 
enake."
 
 #: ../meld/dirdiff.py:264
 msgid "Same"
@@ -519,7 +488,8 @@ msgstr "Pokaži novejše"
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: ../meld/dirdiff.py:266 ../meld/vcview.py:172
+#: ../meld/dirdiff.py:266
+#: ../meld/vcview.py:172
 msgid "Show modified"
 msgstr "Pokaži spremenjeno"
 
@@ -532,75 +502,76 @@ msgid "Set active filters"
 msgstr "Določi dejavne filtre"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:342
+#: ../meld/dirdiff.py:343
 msgid "Size"
 msgstr "Velikost"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:349
+#: ../meld/dirdiff.py:350
 msgid "Modification time"
 msgstr "Čas spremembe"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:356
+#: ../meld/dirdiff.py:357
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: ../meld/dirdiff.py:481
+#: ../meld/dirdiff.py:482
 #, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:595 ../meld/dirdiff.py:614 ../meld/vcview.py:370
+#: ../meld/dirdiff.py:596
+#: ../meld/dirdiff.py:615
+#: ../meld/vcview.py:370
 #: ../meld/vcview.py:394
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:713
+#: ../meld/dirdiff.py:714
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] končano"
 
-#: ../meld/dirdiff.py:718
+#: ../meld/dirdiff.py:719
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je prišlo do več napak."
 
-#: ../meld/dirdiff.py:719
+#: ../meld/dirdiff.py:720
 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:721
+#: ../meld/dirdiff.py:722
 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:"
+msgstr "Zaznane so datoteke z neveljavnim znakovnim naborom. Imena so na primer:"
 
-#: ../meld/dirdiff.py:723
+#: ../meld/dirdiff.py:724
 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:725
-msgid ""
-"You are running a case insensitive comparison on a case sensitive "
-"filesystem. The following files in this folder are hidden:"
+#: ../meld/dirdiff.py:726
+msgid "You are running a case insensitive comparison on a case sensitive filesystem. The following files in 
this folder are hidden:"
 msgstr ""
-"Zagnan je način primerjave brez upoštevanja velikosti črk na sistemu, ki "
-"razlike velikosti upošteva. Nekatere datoteke so skrite:\n"
+"Zagnan je način primerjave brez upoštevanja velikosti črk na sistemu, ki razlike velikosti upošteva. 
Nekatere datoteke so skrite:\n"
 "%s"
 
-#: ../meld/dirdiff.py:736
+#: ../meld/dirdiff.py:737
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:761 ../meld/filediff.py:1001 ../meld/filediff.py:1254
-#: ../meld/vcview.py:620 ../meld/vcview.py:662
+#: ../meld/dirdiff.py:762
+#: ../meld/filediff.py:1004
+#: ../meld/filediff.py:1260
+#: ../meld/vcview.py:642
+#: ../meld/vcview.py:684
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/dirdiff.py:793
+#: ../meld/dirdiff.py:794
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -609,7 +580,7 @@ msgstr ""
 "'%s' že obstaja.\n"
 "Ali naj bo prepisana?"
 
-#: ../meld/dirdiff.py:800
+#: ../meld/dirdiff.py:801
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -620,7 +591,8 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:818 ../meld/vcview.py:594
+#: ../meld/dirdiff.py:819
+#: ../meld/vcview.py:616
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -629,7 +601,8 @@ msgstr ""
 "'%s' je mapa.\n"
 "Ali naj bo odstranjena vsa vsebina?"
 
-#: ../meld/dirdiff.py:825 ../meld/vcview.py:599
+#: ../meld/dirdiff.py:826
+#: ../meld/vcview.py:621
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -640,7 +613,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:925
+#: ../meld/dirdiff.py:926
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -649,7 +622,7 @@ msgstr[1] "%i sekunda"
 msgstr[2] "%i sekundi"
 msgstr[3] "%i sekunde"
 
-#: ../meld/dirdiff.py:926
+#: ../meld/dirdiff.py:927
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -658,7 +631,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuti"
 msgstr[3] "%i minute"
 
-#: ../meld/dirdiff.py:927
+#: ../meld/dirdiff.py:928
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -667,7 +640,7 @@ msgstr[1] "%i ura"
 msgstr[2] "%i uri"
 msgstr[3] "%i ure"
 
-#: ../meld/dirdiff.py:928
+#: ../meld/dirdiff.py:929
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -676,7 +649,7 @@ msgstr[1] "%i dan"
 msgstr[2] "%i dni"
 msgstr[3] "%i dni"
 
-#: ../meld/dirdiff.py:929
+#: ../meld/dirdiff.py:930
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -685,7 +658,7 @@ msgstr[1] "%i teden"
 msgstr[2] "%i tedna"
 msgstr[3] "%i tedni"
 
-#: ../meld/dirdiff.py:930
+#: ../meld/dirdiff.py:931
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -694,7 +667,7 @@ msgstr[1] "%i mesec"
 msgstr[2] "%i meseca"
 msgstr[3] "%i meseci"
 
-#: ../meld/dirdiff.py:931
+#: ../meld/dirdiff.py:932
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -841,81 +814,75 @@ 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:356
+#: ../meld/filediff.py:357
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:356
+#: ../meld/filediff.py:357
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:358
+#: ../meld/filediff.py:359
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:694
+#: ../meld/filediff.py:695
 #, python-format
-msgid ""
-"Filter '%s' changed the number of lines in the file. Comparison will be "
-"incorrect. See the user manual for more details."
-msgstr ""
-"Po uporabi filtra '%s' se je spremenilo število vrstic v datoteki, zato "
-"primerjava ne bo natančna. Za več podrobnosti si oglejte priročnik."
+msgid "Filter '%s' changed the number of lines in the file. Comparison will be incorrect. See the user 
manual for more details."
+msgstr "Po uporabi filtra '%s' se je spremenilo število vrstic v datoteki, zato primerjava ne bo natančna. 
Za več podrobnosti si oglejte priročnik."
 
-#: ../meld/filediff.py:989
+#: ../meld/filediff.py:992
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Določi okna"
 
-#: ../meld/filediff.py:995
+#: ../meld/filediff.py:998
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:1019 ../meld/filediff.py:1029 ../meld/filediff.py:1042
-#: ../meld/filediff.py:1048
+#: ../meld/filediff.py:1022
+#: ../meld/filediff.py:1032
+#: ../meld/filediff.py:1045
+#: ../meld/filediff.py:1051
 msgid "Could not read file"
 msgstr "Ni mogoče prebrati datoteke"
 
-#: ../meld/filediff.py:1020
+#: ../meld/filediff.py:1023
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:1030
+#: ../meld/filediff.py:1033
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiška datoteka."
 
-#: ../meld/filediff.py:1043
+#: ../meld/filediff.py:1046
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:1074
+#: ../meld/filediff.py:1080
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Računanje razlik"
 
-#: ../meld/filediff.py:1241
-msgid ""
-"Text filters are being used, and may be masking differences between files. "
-"Would you like to compare the unfiltered files?"
-msgstr ""
-"Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
-"Ali naj se primerja vsebina brez dejavnih filtrov?"
-
 #: ../meld/filediff.py:1247
+msgid "Text filters are being used, and may be masking differences between files. Would you like to compare 
the unfiltered files?"
+msgstr "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. Ali naj se primerja 
vsebina brez dejavnih filtrov?"
+
+#: ../meld/filediff.py:1253
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1257
+#: ../meld/filediff.py:1263
 msgid "Show without filters"
 msgstr "Pokaži brez filtrov"
 
-#: ../meld/filediff.py:1381
+#: ../meld/filediff.py:1387
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -924,7 +891,7 @@ msgstr ""
 "\"%s\" že obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1394
+#: ../meld/filediff.py:1400
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -935,12 +902,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1403
+#: ../meld/filediff.py:1409
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:1419
+#: ../meld/filediff.py:1425
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -951,7 +918,7 @@ msgstr ""
 "\n"
 "Kateri zapis želite uporabiti?"
 
-#: ../meld/filediff.py:1435
+#: ../meld/filediff.py:1441
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -960,7 +927,7 @@ 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:1500
+#: ../meld/filediff.py:1506
 msgid "Save changes to documents before reloading?"
 msgstr "Ali naj bodo spremembe v dokumentu shranjene pred ponovnim nalaganjem?"
 
@@ -977,11 +944,15 @@ msgstr "Neveljavno število argumentov pri ukazu --diff."
 msgid "Start with an empty window"
 msgstr "Zagon brez odprtih oken"
 
-#: ../meld/meldapp.py:100 ../meld/meldapp.py:102 ../meld/meldapp.py:106
+#: ../meld/meldapp.py:100
+#: ../meld/meldapp.py:102
+#: ../meld/meldapp.py:106
 msgid "file"
 msgstr "datoteka"
 
-#: ../meld/meldapp.py:100 ../meld/meldapp.py:104 ../meld/meldapp.py:106
+#: ../meld/meldapp.py:100
+#: ../meld/meldapp.py:104
+#: ../meld/meldapp.py:106
 msgid "dir"
 msgstr "mapa"
 
@@ -1063,7 +1034,8 @@ msgstr "Napaka med branjem datoteke primerjav"
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: ../meld/melddoc.py:58 ../meld/melddoc.py:59
+#: ../meld/melddoc.py:59
+#: ../meld/melddoc.py:60
 msgid "untitled"
 msgstr "neimenovano"
 
@@ -1304,7 +1276,7 @@ msgid "Switch to this tab"
 msgstr "Preklopi na ta zavihek"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:652
+#: ../meld/meldwindow.py:658
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Ni mogoče primerjati mešanice datotek in map.\n"
 
@@ -1336,12 +1308,8 @@ msgstr "Varnostne kopije\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:308
-msgid ""
-"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
-"Desktop.ini\n"
-msgstr ""
-"Značilni metapodatki OS\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
-"Desktop.ini\n"
+msgid "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db Desktop.ini\n"
+msgstr "Značilni metapodatki OS\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db Desktop.ini\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:310
@@ -1357,13 +1325,16 @@ msgstr "Binarne datoteke\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:314
 msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
-msgstr ""
-"Predstavne datoteke\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
+msgstr "Predstavne datoteke\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:316
-msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
-msgstr "Ključne besede CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+msgid ""
+"CVS keywords\t0\t\\$\\w+(:[^\\n"
+"$]+)?\\$\n"
+msgstr ""
+"Ključne besede CVS\t0\t\\$\\w+(:[^\\n"
+"$]+)?\\$\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:318
@@ -1466,7 +1437,8 @@ msgstr "Prezrto"
 msgid "Show ignored files"
 msgstr "Pokaži prezrte datoteke"
 
-#: ../meld/vcview.py:226 ../meld/vcview.py:366
+#: ../meld/vcview.py:226
+#: ../meld/vcview.py:366
 msgid "Location"
 msgstr "Mesto"
 
@@ -1532,35 +1504,24 @@ msgstr "[%s] Iskanje razlik"
 msgid "[%s] Applying patch"
 msgstr "[%s] Pripenjanje popravka"
 
-#: ../meld/vcview.py:613
+#: ../meld/vcview.py:635
 msgid "Patch tool not found"
 msgstr "Orodja za uveljavljanje popravkov ni mogoče najti"
 
-#: ../meld/vcview.py:614
+#: ../meld/vcview.py:636
 #, python-format
-msgid ""
-"Meld needs the <i>patch</i> tool to be installed to perform comparisons in "
-"%s repositories. Please install <i>patch</i> and try again."
-msgstr ""
-"Program Meld zahteva namestitev orodja <i>patch</i> za uveljavljanje "
-"popravkov pri izvajanju primerjav v skladiščih %s. Namestite orodje "
-"<i>patch</i> in poskusite znova."
+msgid "Meld needs the <i>patch</i> tool to be installed to perform comparisons in %s repositories. Please 
install <i>patch</i> and try again."
+msgstr "Program Meld zahteva namestitev orodja <i>patch</i> za uveljavljanje popravkov pri izvajanju 
primerjav v skladiščih %s. Namestite orodje <i>patch</i> in poskusite znova."
 
-#: ../meld/vcview.py:654
+#: ../meld/vcview.py:676
 msgid "Error fetching original comparison file"
 msgstr "Napaka pridobivanja izvorne datoteke za primerjavo"
 
-#: ../meld/vcview.py:655
-msgid ""
-"Meld couldn't obtain the original version of your comparison file. If you "
-"are using the most recent version of Meld, please report a bug, including as "
-"many details as possible."
-msgstr ""
-"Ni mogoče pridobiti izvorne različice datoteke za primerjavo. V primeru, da "
-"uporabljate najnovejšo različico programa, pošljite poročilo o hrošču s čim "
-"več podrobnostmi."
+#: ../meld/vcview.py:677
+msgid "Meld couldn't obtain the original version of your comparison file. If you are using the most recent 
version of Meld, please report a bug, including as many details as possible."
+msgstr "Ni mogoče pridobiti izvorne različice datoteke za primerjavo. V primeru, da uporabljate najnovejšo 
različico programa, pošljite poročilo o hrošču s čim več podrobnostmi."
 
-#: ../meld/vcview.py:663
+#: ../meld/vcview.py:685
 msgid "Report a bug"
 msgstr "Pošlji poročilo o hrošču"
 
@@ -1601,14 +1562,28 @@ msgstr "Izbor datoteke"
 msgid "Close tab"
 msgstr "Zapri zavihek"
 
+#: ../meld/vc/_vc.py:45
+msgid "Merged"
+msgstr "Združeno"
+
+#: ../meld/vc/_vc.py:45
+msgid "Base"
+msgstr "Osnova"
+
+#: ../meld/vc/_vc.py:45
+#| msgid "Location"
+msgid "Local"
+msgstr "Krajevno"
+
+#: ../meld/vc/_vc.py:45
+#| msgid "_Remove"
+msgid "Remote"
+msgstr "Oddaljeno"
+
 #. These are the possible states of files. Be sure to get the colons correct.
-#: ../meld/vc/_vc.py:40
-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:51
+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/cvs.py:165
 #, python-format
@@ -1621,123 +1596,8 @@ msgstr ""
 "Določen je bil vzorec '%s'\n"
 "Javljena napaka je '%s'"
 
-#: ../meld/vc/git.py:181
+#: ../meld/vc/git.py:201
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Način je spremenjen iz %s v %s"
 
-#~ msgid "Choose Files"
-#~ msgstr "Izbor datotek"
-
-#~ msgid "_Three Way Compare"
-#~ msgstr "_Trojna primerjava"
-
-#~ msgid "Mine"
-#~ msgstr "Lastno"
-
-#~ msgid "Original"
-#~ msgstr "Izvorno"
-
-#~ msgid "Other"
-#~ msgstr "Drugo"
-
-#~ msgid "Select VC Directory"
-#~ msgstr "Izbor VC mape"
-
-#~ msgid "Directory"
-#~ msgstr "Mapa"
-
-#~ msgid "_New..."
-#~ msgstr "_Novo ..."
-
-#~ msgid "Save modified files?"
-#~ msgstr "Ali naj se spremenjene datoteke shranijo?"
-
-#~ msgid ""
-#~ "Some files have been modified.\n"
-#~ "Which ones would you like to save?"
-#~ msgstr ""
-#~ "Nekatere datoteke so bile spremenjene.\n"
-#~ "Katere datoteke naj se shranjenijo?"
-
-#~ msgid "_Discard Changes"
-#~ msgstr "_Prezri spremembe"
-
-#~ msgid "_Save Selected"
-#~ msgstr "_Shrani izbrano"
-
-#~ msgid ""
-#~ "Reloading will discard changes in:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "You cannot undo this operation."
-#~ msgstr ""
-#~ "S ponovnim nalaganjem bodo izgubljene spremembe v:\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Dejanja ni mogoče povrniti."
-
-#~ msgid "Select some files first."
-#~ msgstr "Najprej je treba izbrati datoteke."
-
-#~ msgid "Add _Binary"
-#~ msgstr "Dodaj _dvojiško"
-
-#~ msgid "Add binary to VC"
-#~ msgstr "Dodaj dvojiško datoteko v VC"
-
-#~ msgid ""
-#~ "\n"
-#~ "                    Invoking 'patch' failed.\n"
-#~ "                    \n"
-#~ "                    Maybe you don't have 'GNU patch' installed,\n"
-#~ "                    or you use an untested version of %s.\n"
-#~ "                    \n"
-#~ "                    Please send email bug report to:\n"
-#~ "                    meld-list gnome org\n"
-#~ "                    \n"
-#~ "                    Containing the following information:\n"
-#~ "                    \n"
-#~ "                    - meld version: '%s'\n"
-#~ "                    - source control software type: '%s'\n"
-#~ "                    - source control software version: 'X.Y.Z'\n"
-#~ "                    - the output of '%s somefile.txt'\n"
-#~ "                    - patch command: '%s'\n"
-#~ "                    (no need to actually run it, just provide\n"
-#~ "                    the command line) \n"
-#~ "                    \n"
-#~ "                    Replace 'X.Y.Z' by the actual version for the\n"
-#~ "                    source control software you use.\n"
-#~ "                    "
-#~ msgstr ""
-#~ "\n"
-#~ "                    Priklic popravka ni uspel.\n"
-#~ "                    \n"
-#~ "                    Najverjetneje ni nameščenega paketa 'GNU patch' ,\n"
-#~ "                    ali pa je nameščena nepreverjena različica %s.\n"
-#~ "                    \n"
-#~ "                    Pošljite poročilo o hrošču na:\n"
-#~ "                    meld-list gnome org\n"
-#~ "                    \n"
-#~ "                    Podani bodo podatki:\n"
-#~ "                    \n"
-#~ "                    - različica meld: '%s'\n"
-#~ "                    - vrsta programskega nadzora: '%s'\n"
-#~ "                    - različica programa nadzora: 'X.Y.Z'\n"
-#~ "                    - izpis '%s datoteka.txt'\n"
-#~ "                    - ukaz patch : '%s'\n"
-#~ "                    (ukaza ni treba zagnati; zahtevan podatek je\n"
-#~ "                    ukazna vrstica) \n"
-#~ "                    \n"
-#~ "                    Zamenjajte 'X.Y.Z' s pravo različico\n"
-#~ "                    programske opreme za nadzor izvorne kode.\n"
-#~ "                    "
-
-#~ msgid "can't compare more than three directories"
-#~ msgstr "ni mogoče primerjati več kot treh map"
-
-#~ msgid "Case"
-#~ msgstr "Črke"
-
-#~ msgid "Ignore case of entries"
-#~ msgstr "Prezri velikosti črk"