[meld] Updated Slovenian translation

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

commit 6a2c9e258e3ca079194a187f2a485dc7292dd693
Author: Matej UrbanÄiÄ <mateju svn gnome org>
Date:   Mon Dec 10 21:55:00 2012 +0100

    Updated Slovenian translation

 po/sl.po |  737 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 397 insertions(+), 340 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 94b93b6..7ae555d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,31 +7,31 @@
 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: 2012-11-06 13:06+0000\n"
-"PO-Revision-Date: 2012-11-06 19:54+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=meld&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-12-09 19:51+0000\n"
+"PO-Revision-Date: 2012-12-10 21:41+0100\n"
 "Last-Translator: Matej UrbanÄiÄ <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
-"Language: \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"
-"X-Poedit-Language: Slovenian\n"
-"X-Poedit-Country: SLOVENIA\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"
 
-#: ../bin/meld:103
+#: ../bin/meld:113
 msgid "Cannot import: "
 msgstr "Ni mogoÄe uvoziti:"
 
-#: ../bin/meld:106
+#: ../bin/meld:116
 #, 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"
 
@@ -55,8 +55,7 @@ msgstr "Uredljiv seznam"
 msgid "Active"
 msgstr "Dejavno"
 
-#: ../data/ui/EditableList.ui.h:3
-#: ../meld/vcview.py:164
+#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:199
 msgid "Name"
 msgstr "Ime"
 
@@ -68,8 +67,7 @@ msgstr "Vzorec"
 msgid "Add new filter"
 msgstr "Dodaj nov filter"
 
-#: ../data/ui/EditableList.ui.h:6
-#: ../meld/vcview.py:128
+#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:162
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -77,8 +75,7 @@ msgstr "_Dodaj"
 msgid "Remove selected filter"
 msgstr "Odstrani izbrani filter"
 
-#: ../data/ui/EditableList.ui.h:8
-#: ../meld/vcview.py:129
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:163
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -99,27 +96,26 @@ msgid "Move _Down"
 msgstr "Premakni navz_dol"
 
 #: ../data/ui/filediff.ui.h:1
-msgid "Save modified files?"
-msgstr "Ali naj se spremenjene datoteke shranijo?"
+msgid "Save changes to documents before closing?"
+msgstr "Ali Åelite shraniti spremembe dokumenta pred zapiranjem?"
 
 #: ../data/ui/filediff.ui.h:2
-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 "If you don't save, changes will be permanently lost."
+msgstr "V primeru, da sprememb ne shranite, bodo te trajno izgubljene."
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Close _without saving"
+msgstr "Zapri _brez shranjevanja"
 
 #: ../data/ui/filediff.ui.h:4
-msgid "_Discard Changes"
-msgstr "_Prezri spremembe"
+msgid "_Cancel"
+msgstr "_PrekliÄi"
 
 #: ../data/ui/filediff.ui.h:5
-msgid "_Save Selected"
-msgstr "_Shrani izbrano"
+msgid "_Save"
+msgstr "_Shrani"
 
-#: ../data/ui/findbar.ui.h:1
-#: ../meld/meldwindow.py:126
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:128
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
@@ -169,17 +165,31 @@ 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"
@@ -321,8 +331,14 @@ msgid "Editor"
 msgstr "Urejevalnik"
 
 #: ../data/ui/preferences.ui.h:17
-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:18
 msgid "Ignore symbolic links"
@@ -333,8 +349,18 @@ msgid "File Filters"
 msgstr "Filtri datotek"
 
 #: ../data/ui/preferences.ui.h:20
-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:21
 msgid "Ignore changes which insert or delete blank lines"
@@ -350,7 +376,8 @@ msgstr "Nalaganje"
 
 #: ../data/ui/preferences.ui.h:24
 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:25
 msgid "Encoding"
@@ -372,142 +399,141 @@ msgstr "Predhodni dnevniki"
 msgid "Log Message"
 msgstr "SporoÄilo beleÅenja"
 
-#: ../meld/dirdiff.py:229
-#: ../meld/vcview.py:125
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:159
 msgid "_Compare"
 msgstr "_Primerjava"
 
-#: ../meld/dirdiff.py:229
-#: ../meld/vcview.py:125
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:159
 msgid "Compare selected"
 msgstr "Primerjaj izbrano"
 
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:233
 msgid "Copy _Left"
 msgstr "Kopiraj _levo"
 
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:233
 msgid "Copy to left"
 msgstr "Kopiraj na levo"
 
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:234
 msgid "Copy _Right"
 msgstr "Kopiraj _desno"
 
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:234
 msgid "Copy to right"
 msgstr "Kopiraj na desno"
 
-#: ../meld/dirdiff.py:232
+#: ../meld/dirdiff.py:235
 msgid "Delete selected"
 msgstr "IzbriÅi izbor"
 
-#: ../meld/dirdiff.py:233
-#: ../meld/filediff.py:1216
+#: ../meld/dirdiff.py:236 ../meld/filediff.py:1226
 msgid "Hide"
 msgstr "Skrij"
 
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:236
 msgid "Hide selected"
 msgstr "Skrij izbrano"
 
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:240
 msgid "Ignore filename case"
 msgstr "Prezri velikost Ärk imen datotek"
 
-#: ../meld/dirdiff.py:237
-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:240
+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:238
+#: ../meld/dirdiff.py:241
 msgid "Same"
 msgstr "Enako"
 
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:241
 msgid "Show identical"
 msgstr "PokaÅi enako"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:242
 msgid "New"
 msgstr "Novo"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:242
 msgid "Show new"
 msgstr "PokaÅi novejÅe"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:243
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: ../meld/dirdiff.py:240
-#: ../meld/vcview.py:137
+#: ../meld/dirdiff.py:243 ../meld/vcview.py:171
 msgid "Show modified"
 msgstr "PokaÅi spremenjeno"
 
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:245
 msgid "Filters"
 msgstr "Filtri"
 
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:245
 msgid "Set active filters"
 msgstr "DoloÄi dejavne filtre"
 
-#: ../meld/dirdiff.py:406
+#: ../meld/dirdiff.py:410
 #, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:510
-#: ../meld/dirdiff.py:529
-#: ../meld/vcview.py:326
-#: ../meld/vcview.py:350
+#: ../meld/dirdiff.py:516 ../meld/dirdiff.py:535 ../meld/vcview.py:366
+#: ../meld/vcview.py:390
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:628
+#: ../meld/dirdiff.py:634
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] konÄano"
 
-#: ../meld/dirdiff.py:632
+#: ../meld/dirdiff.py:639
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je priÅlo do veÄ napak."
 
-#: ../meld/dirdiff.py:633
+#: ../meld/dirdiff.py:640
 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:635
+#: ../meld/dirdiff.py:642
 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:637
+#: ../meld/dirdiff.py:644
 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:639
-msgid "You are running a case insensitive comparison on a case sensitive filesystem. The following files in this folder are hidden:"
+#: ../meld/dirdiff.py:646
+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:650
+#: ../meld/dirdiff.py:657
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:675
-#: ../meld/filediff.py:979
-#: ../meld/filediff.py:1220
-#: ../meld/vcview.py:572
-#: ../meld/vcview.py:614
+#: ../meld/dirdiff.py:682 ../meld/filediff.py:989 ../meld/filediff.py:1230
+#: ../meld/vcview.py:616 ../meld/vcview.py:658
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/dirdiff.py:725
+#: ../meld/dirdiff.py:714
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -516,7 +542,7 @@ msgstr ""
 "'%s' Åe obstaja.\n"
 "Ali naj bo prepisana?"
 
-#: ../meld/dirdiff.py:732
+#: ../meld/dirdiff.py:721
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -527,8 +553,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:750
-#: ../meld/vcview.py:546
+#: ../meld/dirdiff.py:739 ../meld/vcview.py:590
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -537,8 +562,7 @@ msgstr ""
 "'%s' je mapa.\n"
 "Ali naj bo odstranjena vsa vsebina?"
 
-#: ../meld/dirdiff.py:757
-#: ../meld/vcview.py:551
+#: ../meld/dirdiff.py:746 ../meld/vcview.py:595
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -549,7 +573,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:842
+#: ../meld/dirdiff.py:846
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -558,7 +582,7 @@ msgstr[1] "%i sekunda"
 msgstr[2] "%i sekundi"
 msgstr[3] "%i sekunde"
 
-#: ../meld/dirdiff.py:843
+#: ../meld/dirdiff.py:847
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -567,7 +591,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuti"
 msgstr[3] "%i minute"
 
-#: ../meld/dirdiff.py:844
+#: ../meld/dirdiff.py:848
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -576,7 +600,7 @@ msgstr[1] "%i ura"
 msgstr[2] "%i uri"
 msgstr[3] "%i ure"
 
-#: ../meld/dirdiff.py:845
+#: ../meld/dirdiff.py:849
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -585,7 +609,7 @@ msgstr[1] "%i dan"
 msgstr[2] "%i dni"
 msgstr[3] "%i dni"
 
-#: ../meld/dirdiff.py:846
+#: ../meld/dirdiff.py:850
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -594,7 +618,7 @@ msgstr[1] "%i teden"
 msgstr[2] "%i tedna"
 msgstr[3] "%i tedni"
 
-#: ../meld/dirdiff.py:847
+#: ../meld/dirdiff.py:851
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -603,7 +627,7 @@ msgstr[1] "%i mesec"
 msgstr[2] "%i meseca"
 msgstr[3] "%i meseci"
 
-#: ../meld/dirdiff.py:848
+#: ../meld/dirdiff.py:852
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -612,213 +636,219 @@ msgstr[1] "%i leto"
 msgstr[2] "%i leti"
 msgstr[3] "%i leta"
 
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:216
 msgid "Format as patch..."
 msgstr "Oblikuj kot popravek ..."
 
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:216
 msgid "Create a patch using differences between files"
 msgstr "Ustvari popravek z razlikovanjem med datotekami"
 
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:217
 msgid "Previous conflict"
 msgstr "Predhodni spor"
 
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:217
 msgid "Go to the previous conflict"
 msgstr "SkoÄi na predhodni niz v sporu"
 
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:218
 msgid "Next conflict"
 msgstr "Naslednji spor"
 
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:218
 msgid "Go to the next conflict"
 msgstr "SkoÄi na naslednji niz v sporu"
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:219
 msgid "Push to left"
 msgstr "Potisni levo"
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:219
 msgid "Push current change to the left"
 msgstr "Potisni trenutne spremembe na levo"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:220
 msgid "Push to right"
 msgstr "Potisni desno"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:220
 msgid "Push current change to the right"
 msgstr "Potisni trenutne spremembe na desno"
 
 #. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:222
 msgid "Pull from left"
 msgstr "Potegni z leve"
 
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:222
 msgid "Pull change from the left"
 msgstr "Potegni spremembe z leve"
 
-#: ../meld/filediff.py:221
+#: ../meld/filediff.py:223
 msgid "Pull from right"
 msgstr "Potegni z desne"
 
-#: ../meld/filediff.py:221
+#: ../meld/filediff.py:223
 msgid "Pull change from the right"
 msgstr "Potegni spremembe z desne"
 
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:224
 msgid "Copy above left"
 msgstr "Kopiraj nad levo"
 
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:224
 msgid "Copy change above the left chunk"
 msgstr "Kopiraj spremembe nad levi del"
 
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:225
 msgid "Copy below left"
 msgstr "Kopiraj pod levo"
 
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:225
 msgid "Copy change below the left chunk"
 msgstr "Kopiraj spremembe pod levi del"
 
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:226
 msgid "Copy above right"
 msgstr "Kopiraj nad desno"
 
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:226
 msgid "Copy change above the right chunk"
 msgstr "Kopiraj spremembe nad desni del"
 
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:227
 msgid "Copy below right"
 msgstr "Kopiraj pod desno"
 
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:227
 msgid "Copy change below the right chunk"
 msgstr "Kopiraj spremembe pod desni del"
 
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:228
 msgid "Delete"
 msgstr "IzbriÅi"
 
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:228
 msgid "Delete change"
 msgstr "IzbriÅi spremembo"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:229
 msgid "Merge all changes from left"
 msgstr "ZdruÅi vse spremembe z leve"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:229
 msgid "Merge all non-conflicting changes from the left"
 msgstr "ZdruÅi vse spremembe brez sporov z leve"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:230
 msgid "Merge all changes from right"
 msgstr "ZdruÅi vse spremembe z desne"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:230
 msgid "Merge all non-conflicting changes from the right"
 msgstr "ZdruÅi vse spremembe brez sporov z desne"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:231
 msgid "Merge all non-conflicting"
 msgstr "ZdruÅi vse spremembe brez sporov"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:231
 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:230
+#: ../meld/filediff.py:232
 msgid "Cycle through documents"
 msgstr "Preklopi med dokumenti"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:232
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
 
-#: ../meld/filediff.py:234
+#: ../meld/filediff.py:236
 msgid "Lock scrolling"
 msgstr "Zakleni drsenje"
 
-#: ../meld/filediff.py:235
+#: ../meld/filediff.py:237
 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:353
+#: ../meld/filediff.py:355
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:353
+#: ../meld/filediff.py:355
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:355
+#: ../meld/filediff.py:357
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:682
+#: ../meld/filediff.py:684
 #, 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:967
+#: ../meld/filediff.py:977
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] DoloÄi okna"
 
-#: ../meld/filediff.py:973
+#: ../meld/filediff.py:983
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:997
-#: ../meld/filediff.py:1007
-#: ../meld/filediff.py:1020
-#: ../meld/filediff.py:1026
+#: ../meld/filediff.py:1007 ../meld/filediff.py:1017 ../meld/filediff.py:1030
+#: ../meld/filediff.py:1036
 msgid "Could not read file"
 msgstr "Ni mogoÄe prebrati datoteke"
 
-#: ../meld/filediff.py:998
+#: ../meld/filediff.py:1008
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:1008
+#: ../meld/filediff.py:1018
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiÅka datoteka."
 
-#: ../meld/filediff.py:1021
+#: ../meld/filediff.py:1031
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:1052
+#: ../meld/filediff.py:1062
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] RaÄunanje razlik"
 
-#: ../meld/filediff.py:1207
-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:1217
+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:1213
+#: ../meld/filediff.py:1223
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1223
+#: ../meld/filediff.py:1233
 msgid "Show without filters"
 msgstr "PokaÅi brez filtrov"
 
-#: ../meld/filediff.py:1347
+#: ../meld/filediff.py:1357
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -827,7 +857,7 @@ msgstr ""
 "\"%s\" Åe obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1360
+#: ../meld/filediff.py:1370
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -838,12 +868,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1369
+#: ../meld/filediff.py:1379
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:1384
+#: ../meld/filediff.py:1394
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -854,7 +884,7 @@ msgstr ""
 "\n"
 "Kateri zapis Åelite uporabiti?"
 
-#: ../meld/filediff.py:1400
+#: ../meld/filediff.py:1410
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -863,340 +893,326 @@ 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:1457
-#, python-format
-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."
+#: ../meld/filediff.py:1463
+msgid "Save changes to documents before reloading?"
+msgstr "Ali naj bodo spremembe v dokumentu shranjene pred ponovnim nalaganjem?"
 
-#: ../meld/filemerge.py:47
+#: ../meld/filemerge.py:48
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] ZdruÅevanje datotek"
 
-#: ../meld/meldapp.py:152
+#: ../meld/meldapp.py:89
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Neveljavno Åtevilo argumentov pri ukazu --diff."
 
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:93
 msgid "Start with an empty window"
 msgstr "Zagon brez odprtih oken"
 
-#: ../meld/meldapp.py:157
-#: ../meld/meldapp.py:158
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:94 ../meld/meldapp.py:95 ../meld/meldapp.py:97
 msgid "file"
 msgstr "datoteka"
 
-#: ../meld/meldapp.py:157
-#: ../meld/meldapp.py:159
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:94 ../meld/meldapp.py:96 ../meld/meldapp.py:97
 msgid "dir"
 msgstr "mapa"
 
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:94
 msgid "Start a version control comparison"
 msgstr "Zagon primerjave nadzora razliÄic"
 
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:95
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: ../meld/meldapp.py:159
+#: ../meld/meldapp.py:96
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo map"
 
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:97
 msgid "Start a comparison between file and dir/file"
 msgstr "Zagon primerjave med datoteko in mapo/datoteko"
 
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:103
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je orodje za primerjavo vsebine datotek in map."
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:106
 msgid "Set label to use instead of file name"
 msgstr "DoloÄi naslov namesto imena datoteke"
 
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:108
 msgid "Open a new tab in an already running instance"
 msgstr "Odpri nov zavihek v Åe zagnanem programu"
 
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:110
 msgid "Automatically compare all differing files on startup"
 msgstr "Ob zagonu samodejno primerjaj vse razliÄne datoteke."
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:112
 msgid "Ignored for compatibility"
 msgstr "Prezrto zaradi skladnosti"
 
-#: ../meld/meldapp.py:178
+#: ../meld/meldapp.py:115
 msgid "Set the target file for saving a merge result"
 msgstr "DoloÄitev ciljne datoteke za shranjevanje rezultatov zdruÅevanja."
 
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:117
 msgid "Automatically merge files"
 msgstr "Samodejno zdruÅi datoteke"
 
-#: ../meld/meldapp.py:183
+#: ../meld/meldapp.py:120
 msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr "Ustvari zavihke primerjav za do tri datoteke ali mape."
 
-#: ../meld/meldapp.py:186
+#: ../meld/meldapp.py:123
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "preveÄ argumentov (zahtevanih 0-3, prejetih %d)"
 
-#: ../meld/meldapp.py:188
+#: ../meld/meldapp.py:125
 msgid "can't auto-merge less than 3 files"
 msgstr "manj kot treh datotek ni mogoÄe samodejno zdruÅevati"
 
-#: ../meld/meldapp.py:190
+#: ../meld/meldapp.py:127
 msgid "can't auto-merge directories"
 msgstr "map ni mogoÄe samodejno zdruÅevati"
 
-#: ../meld/meldapp.py:196
+#: ../meld/meldapp.py:133
 msgid "D-Bus error; comparisons will open in a new window."
 msgstr "Napaka vodila D-Bus; primerjave se odprejo v novem oknu."
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:83
+#: ../meld/meldbuffer.py:88
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: ../meld/melddoc.py:57
-#: ../meld/melddoc.py:58
+#: ../meld/melddoc.py:58 ../meld/melddoc.py:59
 msgid "untitled"
 msgstr "neimenovano"
 
-#: ../meld/meldwindow.py:110
+#: ../meld/meldwindow.py:112
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../meld/meldwindow.py:111
+#: ../meld/meldwindow.py:113
 msgid "_New..."
 msgstr "_Novo ..."
 
-#: ../meld/meldwindow.py:111
+#: ../meld/meldwindow.py:113
 msgid "Start a new comparison"
 msgstr "Nova primerjava"
 
-#: ../meld/meldwindow.py:112
+#: ../meld/meldwindow.py:114
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
-#: ../meld/meldwindow.py:114
+#: ../meld/meldwindow.py:116
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:117
 msgid "Quit the program"
 msgstr "KonÄaj program"
 
-#: ../meld/meldwindow.py:117
+#: ../meld/meldwindow.py:119
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../meld/meldwindow.py:118
+#: ../meld/meldwindow.py:120
 msgid "Undo the last action"
 msgstr "Razveljavi zadnje dejanje"
 
-#: ../meld/meldwindow.py:119
+#: ../meld/meldwindow.py:121
 msgid "Redo the last undone action"
 msgstr "Obnovi zadnje razveljavljeno dejanje"
 
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:122
 msgid "Cut the selection"
 msgstr "IzreÅi izbrano"
 
-#: ../meld/meldwindow.py:121
+#: ../meld/meldwindow.py:123
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
-#: ../meld/meldwindow.py:122
+#: ../meld/meldwindow.py:124
 msgid "Paste the clipboard"
 msgstr "Prilepi iz odloÅiÅÄa"
 
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:125
 msgid "Search for text"
 msgstr "PoiÅÄi besedilo"
 
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:126
 msgid "Find Ne_xt"
 msgstr "Najdi _naslednje"
 
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:126
 msgid "Search forwards for the same text"
 msgstr "PoiÅÄi niz naprej po besedilu"
 
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:127
 msgid "Find _Previous"
 msgstr "Najdi _predhodne"
 
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:127
 msgid "Search backwards for the same text"
 msgstr "Besedilo najdi nazaj po besedilu"
 
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:128
 msgid "Find and replace text"
 msgstr "PoiÅÄi in zamenjaj besedilo"
 
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:129
 msgid "Prefere_nces"
 msgstr "_Lastnosti"
 
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:129
 msgid "Configure the application"
 msgstr "Spremeni nastavitve programa"
 
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:131
 msgid "_Changes"
 msgstr "_Spremembe"
 
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:132
 msgid "Next change"
 msgstr "Naslednja sprememba"
 
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:132
 msgid "Go to the next change"
 msgstr "SkoÄi na naslednjo spremembo"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:133
 msgid "Previous change"
 msgstr "Predhodna sprememba"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:133
 msgid "Go to the previous change"
 msgstr "SkoÄi na predhodno spremembo"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:134
 msgid "Open externally"
 msgstr "Odpri v zunanjem programu"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:134
 msgid "Open selected file or directory in the default external application"
 msgstr "Odpri zbrano datoteko ali mapo v privzetem  zunanjem programu"
 
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:136
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:137
 msgid "File status"
 msgstr "Stanje datoteke"
 
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:138
 msgid "Version status"
 msgstr "Stanje razliÄice"
 
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:139
 msgid "File filters"
 msgstr "Filtri datotek"
 
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:140
 msgid "Stop the current action"
 msgstr "Ustavi trenutno dejanje"
 
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:141
 msgid "Refresh the view"
 msgstr "OsveÅi pogled"
 
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:142
 msgid "Reload"
 msgstr "Ponovno naloÅi"
 
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:142
 msgid "Reload the comparison"
 msgstr "Ponovno naloÅi primerjavo"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:144
 msgid "_Tabs"
 msgstr "_Zavihki"
 
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:145
 msgid "_Previous Tab"
 msgstr "_Predhodni zavihek"
 
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:145
 msgid "Activate previous tab"
 msgstr "PokaÅi predhodni zavihek"
 
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:146
 msgid "_Next Tab"
 msgstr "_Naslednji zavihek"
 
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:146
 msgid "Activate next tab"
 msgstr "PokaÅi naslednji zavihek"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:147
 msgid "Move Tab _Left"
 msgstr "Premakni zavihek _levo"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:147
 msgid "Move current tab to left"
 msgstr "Premakni trenutni zavihek na levo"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:148
 msgid "Move Tab _Right"
 msgstr "Premakni zavihek _desno"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:148
 msgid "Move current tab to right"
 msgstr "Premakni trenutni zavihek na desno"
 
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:150
 msgid "_Help"
 msgstr "Pomo_Ä"
 
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:151
 msgid "_Contents"
 msgstr "_Vsebina"
 
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:151
 msgid "Open the Meld manual"
 msgstr "Odpri priroÄnik Meld"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:152
 msgid "Report _Bug"
 msgstr "PoÅlji poroÄilo o _hroÅÄu"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:152
 msgid "Report a bug in Meld"
 msgstr "PoroÄilo o hroÅÄu programa Meld"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:153
 msgid "About this program"
 msgstr "O programu"
 
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:156
 msgid "Full Screen"
 msgstr "Celozaslonski naÄin"
 
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:156
 msgid "View the comparison in full screen"
 msgstr "Ogled primerjave v celozaslonskem naÄinu"
 
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:157
 msgid "_Toolbar"
 msgstr "_Orodna vrstica"
 
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:157
 msgid "Show or hide the toolbar"
 msgstr "PokaÅi ali skrij orodno vrstico"
 
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:158
 msgid "_Statusbar"
 msgstr "_Vrstica stanja"
 
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:158
 msgid "Show or hide the statusbar"
 msgstr "PokaÅi ali skrij vrstico stanja"
 
@@ -1210,255 +1226,262 @@ msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Ni mogoÄe primerjati meÅanice datotek in map.\n"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:177
+#: ../meld/misc.py:180
 msgid "[None]"
 msgstr "[noben]"
 
-#: ../meld/patchdialog.py:122
+#: ../meld/patchdialog.py:124
 msgid "Save Patch As..."
 msgstr "Shrani popravke kot ..."
 
-#: ../meld/preferences.py:37
+#: ../meld/preferences.py:38
 msgid "label"
 msgstr "oznaka"
 
-#: ../meld/preferences.py:37
+#: ../meld/preferences.py:38
 msgid "pattern"
 msgstr "vzorec"
 
-#: ../meld/preferences.py:111
+#: ../meld/preferences.py:112
 msgid "Only available if you have gnome-python-desktop installed"
 msgstr "Na voljo le, Äe je nameÅÄen paket gnome-python-desktop"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:228
+#: ../meld/preferences.py:229
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 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:230
-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"
+#: ../meld/preferences.py:231
+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:232
+#: ../meld/preferences.py:233
 #, python-format
 msgid "Version Control\t1\t%s\n"
 msgstr "Nadzor razliÄic\t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:234
+#: ../meld/preferences.py:235
 msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
 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:236
+#: ../meld/preferences.py:237
 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:238
-msgid ""
-"CVS keywords\t0\t\\$\\w+(:[^\\n"
-"$]+)?\\$\n"
-msgstr ""
-"KljuÄne besede CVS\t0\t\\$\\w+(:[^\\n"
-"$]+)?\\$\n"
+#: ../meld/preferences.py:239
+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:240
+#: ../meld/preferences.py:241
 msgid "C++ comment\t0\t//.*\n"
 msgstr "C++ opombe\t0\t//.*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:242
+#: ../meld/preferences.py:243
 msgid "C comment\t0\t/\\*.*?\\*/\n"
 msgstr "C opombe\t0\t/\\*.*?\\*/\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:244
+#: ../meld/preferences.py:245
 msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
 msgstr "Vsi presledni znaki\t0\t[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:246
+#: ../meld/preferences.py:247
 msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
 msgstr "ZaÄetni presledni znaki\t0\t^[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:248
+#: ../meld/preferences.py:249
 msgid "Script comment\t0\t#.*"
 msgstr "Opomba skripta\t0\t#.*"
 
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:160
 msgid "Co_mmit"
 msgstr "_Uveljavi"
 
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:160
 msgid "Commit"
 msgstr "Uveljavi"
 
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:161
 msgid "_Update"
 msgstr "_Posodobi"
 
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:161
 msgid "Update"
 msgstr "Posodobi"
 
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:162
 msgid "Add to VC"
 msgstr "Dodaj v VC"
 
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:163
 msgid "Remove from VC"
 msgstr "Odstrani iz VC"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:164
 msgid "_Resolved"
 msgstr "_RazreÅeno"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:164
 msgid "Mark as resolved for VC"
 msgstr "OznaÄi kot razreÅeno v VC"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:165
 msgid "Revert to original"
 msgstr "_Povrni na izvirne vrednosti"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:166
 msgid "Delete locally"
 msgstr "IzbriÅi krajevno"
 
-#: ../meld/vcview.py:136
+#: ../meld/vcview.py:170
 msgid "_Flatten"
 msgstr "_Razpni"
 
-#: ../meld/vcview.py:136
+#: ../meld/vcview.py:170
 msgid "Flatten directories"
 msgstr "_Razpni mape"
 
-#: ../meld/vcview.py:137
+#: ../meld/vcview.py:171
 msgid "_Modified"
 msgstr "_Spremenjeno"
 
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:172
 msgid "_Normal"
 msgstr "_ObiÄajno"
 
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:172
 msgid "Show normal"
 msgstr "PokaÅi obiÄajno"
 
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:173
 msgid "Non _VC"
 msgstr "Ni _VC"
 
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:173
 msgid "Show unversioned files"
 msgstr "PokaÅi datoteke z nedoloÄenimi razliÄicami"
 
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:174
 msgid "Ignored"
 msgstr "Prezrto"
 
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:174
 msgid "Show ignored files"
 msgstr "PokaÅi prezrte datoteke"
 
-#: ../meld/vcview.py:190
-#: ../meld/vcview.py:322
+#: ../meld/vcview.py:225 ../meld/vcview.py:362
 msgid "Location"
 msgstr "Mesto"
 
-#: ../meld/vcview.py:191
+#: ../meld/vcview.py:226
 msgid "Status"
 msgstr "Stanje"
 
-#: ../meld/vcview.py:192
+#: ../meld/vcview.py:227
 msgid "Rev"
 msgstr "Rev"
 
-#: ../meld/vcview.py:193
+#: ../meld/vcview.py:228
 msgid "Tag"
 msgstr "Oznaka"
 
-#: ../meld/vcview.py:194
+#: ../meld/vcview.py:229
 msgid "Options"
 msgstr "MoÅnosti"
 
-#: ../meld/vcview.py:252
+#: ../meld/vcview.py:291
 msgid "Choose one Version Control"
 msgstr "Izbor nadzora razliÄic"
 
-#: ../meld/vcview.py:253
+#: ../meld/vcview.py:292
 msgid "Only one Version Control in this directory"
 msgstr "V tej mapi je le en nadzornik razliÄic"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:266
+#: ../meld/vcview.py:305
 #, python-format
 msgid "%s Not Installed"
 msgstr "%s paket ni nameÅÄen"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:270
+#: ../meld/vcview.py:309
 msgid "Invalid Repository"
 msgstr "Neveljavno skladiÅÄe"
 
-#: ../meld/vcview.py:279
+#: ../meld/vcview.py:318
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:322
+#: ../meld/vcview.py:362
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:366
+#: ../meld/vcview.py:405
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:404
+#: ../meld/vcview.py:437
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Iskanje razlik"
 
-#: ../meld/vcview.py:418
+#: ../meld/vcview.py:450
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Pripenjanje popravka"
 
-#: ../meld/vcview.py:522
-msgid "Select some files first."
-msgstr "Najprej je treba izbrati datoteke."
-
-#: ../meld/vcview.py:565
+#: ../meld/vcview.py:609
 msgid "Patch tool not found"
 msgstr "Orodja za uveljavljanje popravkov ni mogoÄe najti"
 
-#: ../meld/vcview.py:566
+#: ../meld/vcview.py:610
 #, 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:606
+#: ../meld/vcview.py:650
 msgid "Error fetching original comparison file"
 msgstr "Napaka pridobivanja izvorne datoteke za primerjavo"
 
-#: ../meld/vcview.py:607
-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:651
+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:615
+#: ../meld/vcview.py:659
 msgid "Report a bug"
 msgstr "PoÅlji poroÄilo o hroÅÄu"
 
-#: ../meld/ui/findbar.py:142
+#: ../meld/ui/findbar.py:145
 #, python-format
 msgid ""
 "Regular expression error\n"
@@ -1467,40 +1490,44 @@ msgstr ""
 "Napaka v logiÄnem izrazu\n"
 "'%s'"
 
-#: ../meld/ui/historyentry.py:293
+#: ../meld/ui/historyentry.py:296
 msgid "_Browse..."
 msgstr "_Prebrskaj ..."
 
-#: ../meld/ui/historyentry.py:301
+#: ../meld/ui/historyentry.py:304
 msgid "Path"
 msgstr "Pot"
 
-#: ../meld/ui/historyentry.py:302
+#: ../meld/ui/historyentry.py:305
 msgid "Path to file"
 msgstr "Pot do datoteke"
 
-#: ../meld/ui/historyentry.py:303
+#: ../meld/ui/historyentry.py:306
 msgid "Pop up a file selector to choose a file"
 msgstr "PokaÅi izbirnik za izbor datoteke"
 
-#: ../meld/ui/historyentry.py:441
+#: ../meld/ui/historyentry.py:444
 msgid "Select directory"
 msgstr "Izbor mape"
 
-#: ../meld/ui/historyentry.py:445
+#: ../meld/ui/historyentry.py:448
 msgid "Select file"
 msgstr "Izbor datoteke"
 
-#: ../meld/ui/notebooklabel.py:60
+#: ../meld/ui/notebooklabel.py:61
 msgid "Close tab"
 msgstr "Zapri zavihek"
 
 #. 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"
+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:161
+#: ../meld/vc/cvs.py:165
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"
@@ -1511,11 +1538,41 @@ msgstr ""
 "DoloÄen je bil vzorec '%s'\n"
 "Javljena napaka je '%s'"
 
-#: ../meld/vc/git.py:152
+#: ../meld/vc/git.py:181
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "NaÄin je spremenjen iz %s v %s"
 
+#~ 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"