[meld] Updated Slovenian translation



commit fd8fa7b3d59441352af63e0743bc1c822fe94987
Author: Matej Urbančič <mateju svn gnome org>
Date:   Sun Apr 21 08:29:20 2013 +0200

    Updated Slovenian translation

 po/sl.po | 452 +++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 239 insertions(+), 213 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 7b5de06..327065a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,8 +9,8 @@ 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-04-03 20:50+0000\n"
-"PO-Revision-Date: 2013-04-04 21:18+0100\n"
+"POT-Creation-Date: 2013-04-20 21:12+0000\n"
+"PO-Revision-Date: 2013-04-21 08:14+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"
@@ -47,6 +47,10 @@ msgstr "Meld pregledovalnik različic"
 msgid "Compare and merge your files"
 msgstr "Primerjava in združevanje datotek"
 
+#: ../data/mime/meld.xml.in.h:1
+msgid "Meld comparison description"
+msgstr "Opis primerjave Meld"
+
 #: ../data/ui/EditableList.ui.h:1
 msgid "Editable List"
 msgstr "Uredljiv seznam"
@@ -84,7 +88,7 @@ msgid "Move _Down"
 msgstr "Premakni navz_dol"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:339
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:342
 #: ../meld/vcview.py:204
 msgid "Name"
 msgstr "Ime"
@@ -130,7 +134,7 @@ msgstr ""
 "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:100
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
@@ -340,7 +344,7 @@ msgstr ""
 "vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), ločenimi s "
 "presledki."
 
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:25 ../meld/meldwindow.py:122
 msgid "File Filters"
 msgstr "Filtri datotek"
 
@@ -379,7 +383,7 @@ msgstr ""
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:612
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:673
 msgid "New comparison"
 msgstr "Nova primerjava"
 
@@ -451,47 +455,47 @@ msgstr "Predhodni dnevniki"
 msgid "Log Message"
 msgstr "Sporočilo beleženja"
 
-#: ../meld/dirdiff.py:268 ../meld/vcview.py:164
+#: ../meld/dirdiff.py:269 ../meld/vcview.py:164
 msgid "_Compare"
 msgstr "_Primerjava"
 
-#: ../meld/dirdiff.py:268 ../meld/vcview.py:164
+#: ../meld/dirdiff.py:269 ../meld/vcview.py:164
 msgid "Compare selected"
 msgstr "Primerjaj izbrano"
 
-#: ../meld/dirdiff.py:269
+#: ../meld/dirdiff.py:270
 msgid "Copy _Left"
 msgstr "Kopiraj _levo"
 
-#: ../meld/dirdiff.py:269
+#: ../meld/dirdiff.py:270
 msgid "Copy to left"
 msgstr "Kopiraj na levo"
 
-#: ../meld/dirdiff.py:270
+#: ../meld/dirdiff.py:271
 msgid "Copy _Right"
 msgstr "Kopiraj _desno"
 
-#: ../meld/dirdiff.py:270
+#: ../meld/dirdiff.py:271
 msgid "Copy to right"
 msgstr "Kopiraj na desno"
 
-#: ../meld/dirdiff.py:271
+#: ../meld/dirdiff.py:272
 msgid "Delete selected"
 msgstr "Izbriši izbor"
 
-#: ../meld/dirdiff.py:272 ../meld/filediff.py:1282
+#: ../meld/dirdiff.py:273 ../meld/filediff.py:1329 ../meld/filediff.py:1364
 msgid "Hide"
 msgstr "Skrij"
 
-#: ../meld/dirdiff.py:272
+#: ../meld/dirdiff.py:273
 msgid "Hide selected"
 msgstr "Skrij izbrano"
 
-#: ../meld/dirdiff.py:276
-msgid "Ignore filename case"
+#: ../meld/dirdiff.py:277
+msgid "Ignore Filename Case"
 msgstr "Prezri velikost črk imen datotek"
 
-#: ../meld/dirdiff.py:276
+#: ../meld/dirdiff.py:277
 msgid ""
 "Consider differently-cased filenames that are otherwise-identical to be the "
 "same"
@@ -499,89 +503,89 @@ msgstr ""
 "Obravnavaj datoteke, ki imajo v imenu črke različne velikosti, vendar so "
 "sicer enake, kot da so enake."
 
-#: ../meld/dirdiff.py:277
+#: ../meld/dirdiff.py:278
 msgid "Same"
 msgstr "Enako"
 
-#: ../meld/dirdiff.py:277
+#: ../meld/dirdiff.py:278
 msgid "Show identical"
 msgstr "Pokaži enako"
 
-#: ../meld/dirdiff.py:278
+#: ../meld/dirdiff.py:279
 msgid "New"
 msgstr "Novo"
 
-#: ../meld/dirdiff.py:278
+#: ../meld/dirdiff.py:279
 msgid "Show new"
 msgstr "Pokaži novejše"
 
-#: ../meld/dirdiff.py:279
+#: ../meld/dirdiff.py:280
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: ../meld/dirdiff.py:279 ../meld/vcview.py:176
+#: ../meld/dirdiff.py:280 ../meld/vcview.py:176
 msgid "Show modified"
 msgstr "Pokaži spremenjeno"
 
-#: ../meld/dirdiff.py:281
+#: ../meld/dirdiff.py:282
 msgid "Filters"
 msgstr "Filtri"
 
-#: ../meld/dirdiff.py:281
+#: ../meld/dirdiff.py:282
 msgid "Set active filters"
 msgstr "Določi dejavne filtre"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:356
+#: ../meld/dirdiff.py:359
 msgid "Size"
 msgstr "Velikost"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:363
+#: ../meld/dirdiff.py:366
 msgid "Modification time"
 msgstr "Čas spremembe"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:370
+#: ../meld/dirdiff.py:373
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: ../meld/dirdiff.py:503
+#: ../meld/dirdiff.py:506
 #, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:620 ../meld/dirdiff.py:639 ../meld/vcview.py:382
+#: ../meld/dirdiff.py:631 ../meld/dirdiff.py:650 ../meld/vcview.py:382
 #: ../meld/vcview.py:406
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:738
+#: ../meld/dirdiff.py:750
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] končano"
 
-#: ../meld/dirdiff.py:744
+#: ../meld/dirdiff.py:756
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je prišlo do več napak."
 
-#: ../meld/dirdiff.py:745
+#: ../meld/dirdiff.py:757
 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:747
+#: ../meld/dirdiff.py:759
 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:749
+#: ../meld/dirdiff.py:761
 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:751
+#: ../meld/dirdiff.py:763
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -590,17 +594,17 @@ msgstr ""
 "razlike velikosti upošteva. Nekatere datoteke so skrite:\n"
 "%s"
 
-#: ../meld/dirdiff.py:762
+#: ../meld/dirdiff.py:774
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:787 ../meld/filediff.py:1025 ../meld/filediff.py:1286
-#: ../meld/vcview.py:676 ../meld/vcview.py:718
+#: ../meld/dirdiff.py:799 ../meld/filediff.py:1065 ../meld/filediff.py:1333
+#: ../meld/filediff.py:1366 ../meld/vcview.py:676 ../meld/vcview.py:718
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/dirdiff.py:819
+#: ../meld/dirdiff.py:831
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -609,7 +613,7 @@ msgstr ""
 "'%s' že obstaja.\n"
 "Ali naj bo prepisana?"
 
-#: ../meld/dirdiff.py:826
+#: ../meld/dirdiff.py:838
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -620,7 +624,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:844 ../meld/vcview.py:650
+#: ../meld/dirdiff.py:856 ../meld/vcview.py:650
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -629,7 +633,7 @@ msgstr ""
 "'%s' je mapa.\n"
 "Ali naj bo odstranjena vsa vsebina?"
 
-#: ../meld/dirdiff.py:851 ../meld/vcview.py:655
+#: ../meld/dirdiff.py:863 ../meld/vcview.py:655
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -640,7 +644,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:979
+#: ../meld/dirdiff.py:994
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -649,7 +653,7 @@ msgstr[1] "%i sekunda"
 msgstr[2] "%i sekundi"
 msgstr[3] "%i sekunde"
 
-#: ../meld/dirdiff.py:980
+#: ../meld/dirdiff.py:995
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -658,7 +662,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuti"
 msgstr[3] "%i minute"
 
-#: ../meld/dirdiff.py:981
+#: ../meld/dirdiff.py:996
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -667,7 +671,7 @@ msgstr[1] "%i ura"
 msgstr[2] "%i uri"
 msgstr[3] "%i ure"
 
-#: ../meld/dirdiff.py:982
+#: ../meld/dirdiff.py:997
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -676,7 +680,7 @@ msgstr[1] "%i dan"
 msgstr[2] "%i dni"
 msgstr[3] "%i dni"
 
-#: ../meld/dirdiff.py:983
+#: ../meld/dirdiff.py:998
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -685,7 +689,7 @@ msgstr[1] "%i teden"
 msgstr[2] "%i tedna"
 msgstr[3] "%i tedni"
 
-#: ../meld/dirdiff.py:984
+#: ../meld/dirdiff.py:999
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -694,7 +698,7 @@ msgstr[1] "%i mesec"
 msgstr[2] "%i meseca"
 msgstr[3] "%i meseci"
 
-#: ../meld/dirdiff.py:985
+#: ../meld/dirdiff.py:1000
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -703,175 +707,174 @@ msgstr[1] "%i leto"
 msgstr[2] "%i leti"
 msgstr[3] "%i leta"
 
-#: ../meld/filediff.py:220
-msgid "Format as patch..."
+#: ../meld/filediff.py:221
+msgid "Format as Patch..."
 msgstr "Oblikuj kot popravek ..."
 
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:222
 msgid "Create a patch using differences between files"
 msgstr "Ustvari popravek z razlikovanjem med datotekami"
 
-#: ../meld/filediff.py:221
-msgid "Add synchronization point"
+#: ../meld/filediff.py:224
+msgid "Add Synchronization Point"
 msgstr "Dodaj točko usklajevanja"
 
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:225
 msgid "Add a manual point for synchronization of changes between files"
 msgstr "Dodaj ročno točko usklajevanja sprememb med datotekami"
 
-#: ../meld/filediff.py:225
-msgid "Clear synchronization points"
+#: ../meld/filediff.py:228
+msgid "Clear Synchronization Points"
 msgstr "Počisti točke usklajevanja"
 
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:229
 msgid "Clear manual change sychronization points"
 msgstr "Počisti ročno spremenjene točke usklajevanja"
 
-#: ../meld/filediff.py:228
-msgid "Previous conflict"
+#: ../meld/filediff.py:231
+msgid "Previous Conflict"
 msgstr "Predhodni spor"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:232
 msgid "Go to the previous conflict"
 msgstr "Skoči na predhodni niz v sporu"
 
-#: ../meld/filediff.py:229
-msgid "Next conflict"
+#: ../meld/filediff.py:234
+msgid "Next Conflict"
 msgstr "Naslednji spor"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:235
 msgid "Go to the next conflict"
 msgstr "Skoči na naslednji niz v sporu"
 
-#: ../meld/filediff.py:230
-msgid "Push to left"
+#: ../meld/filediff.py:237
+msgid "Push to Left"
 msgstr "Potisni levo"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:238
 msgid "Push current change to the left"
 msgstr "Potisni trenutne spremembe na levo"
 
-#: ../meld/filediff.py:231
-msgid "Push to right"
+#: ../meld/filediff.py:241
+msgid "Push to Right"
 msgstr "Potisni desno"
 
-#: ../meld/filediff.py:231
+#: ../meld/filediff.py:242
 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:233
-msgid "Pull from left"
+#: ../meld/filediff.py:246
+msgid "Pull from Left"
 msgstr "Potegni z leve"
 
-#: ../meld/filediff.py:233
+#: ../meld/filediff.py:247
 msgid "Pull change from the left"
 msgstr "Potegni spremembe z leve"
 
-#: ../meld/filediff.py:234
-msgid "Pull from right"
+#: ../meld/filediff.py:250
+msgid "Pull from Right"
 msgstr "Potegni z desne"
 
-#: ../meld/filediff.py:234
+#: ../meld/filediff.py:251
 msgid "Pull change from the right"
 msgstr "Potegni spremembe z desne"
 
-#: ../meld/filediff.py:235
-msgid "Copy above left"
+#: ../meld/filediff.py:253
+msgid "Copy Above Left"
 msgstr "Kopiraj nad levo"
 
-#: ../meld/filediff.py:235
+#: ../meld/filediff.py:254
 msgid "Copy change above the left chunk"
 msgstr "Kopiraj spremembe nad levi del"
 
-#: ../meld/filediff.py:236
-msgid "Copy below left"
+#: ../meld/filediff.py:256
+msgid "Copy Below Left"
 msgstr "Kopiraj pod levo"
 
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:257
 msgid "Copy change below the left chunk"
 msgstr "Kopiraj spremembe pod levi del"
 
-#: ../meld/filediff.py:237
-msgid "Copy above right"
+#: ../meld/filediff.py:259
+msgid "Copy Above Right"
 msgstr "Kopiraj nad desno"
 
-#: ../meld/filediff.py:237
+#: ../meld/filediff.py:260
 msgid "Copy change above the right chunk"
 msgstr "Kopiraj spremembe nad desni del"
 
-#: ../meld/filediff.py:238
-msgid "Copy below right"
+#: ../meld/filediff.py:262
+msgid "Copy Below Right"
 msgstr "Kopiraj pod desno"
 
-#: ../meld/filediff.py:238
+#: ../meld/filediff.py:263
 msgid "Copy change below the right chunk"
 msgstr "Kopiraj spremembe pod desni del"
 
-#: ../meld/filediff.py:239
+#: ../meld/filediff.py:265
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../meld/filediff.py:239
+#: ../meld/filediff.py:266
 msgid "Delete change"
 msgstr "Izbriši spremembo"
 
-#: ../meld/filediff.py:240
-msgid "Merge all changes from left"
+#: ../meld/filediff.py:268
+msgid "Merge All Changes from Left"
 msgstr "Združi vse spremembe z leve"
 
-#: ../meld/filediff.py:240
+#: ../meld/filediff.py:269
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Združi vse spremembe brez sporov z leve"
 
-#: ../meld/filediff.py:241
-msgid "Merge all changes from right"
+#: ../meld/filediff.py:271
+msgid "Merge All Changes from Right"
 msgstr "Združi vse spremembe z desne"
 
-#: ../meld/filediff.py:241
+#: ../meld/filediff.py:272
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Združi vse spremembe brez sporov z desne"
 
-#: ../meld/filediff.py:242
-msgid "Merge all non-conflicting"
+#: ../meld/filediff.py:274
+msgid "Merge All Non-conflicting"
 msgstr "Združi vse spremembe brez sporov"
 
-#: ../meld/filediff.py:242
+#: ../meld/filediff.py:275
 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:243
-msgid "Cycle through documents"
+#: ../meld/filediff.py:279
+msgid "Cycle Through Documents"
 msgstr "Preklopi med dokumenti"
 
-#: ../meld/filediff.py:243
+#: ../meld/filediff.py:280
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
 
-#: ../meld/filediff.py:247
-msgid "Lock scrolling"
+#: ../meld/filediff.py:286
+msgid "Lock Scrolling"
 msgstr "Zakleni drsenje"
 
-#: ../meld/filediff.py:248
+#: ../meld/filediff.py:287
 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:370
+#: ../meld/filediff.py:407
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:370
+#: ../meld/filediff.py:407
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:372
+#: ../meld/filediff.py:409
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:709
+#: ../meld/filediff.py:742
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -880,42 +883,42 @@ 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:1013
+#: ../meld/filediff.py:1053
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Določi okna"
 
-#: ../meld/filediff.py:1019
+#: ../meld/filediff.py:1059
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:1043 ../meld/filediff.py:1053 ../meld/filediff.py:1066
-#: ../meld/filediff.py:1072
+#: ../meld/filediff.py:1083 ../meld/filediff.py:1093 ../meld/filediff.py:1106
+#: ../meld/filediff.py:1112
 msgid "Could not read file"
 msgstr "Ni mogoče prebrati datoteke"
 
-#: ../meld/filediff.py:1044
+#: ../meld/filediff.py:1084
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:1054
+#: ../meld/filediff.py:1094
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiška datoteka."
 
-#: ../meld/filediff.py:1067
+#: ../meld/filediff.py:1107
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:1101
+#: ../meld/filediff.py:1141
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Računanje razlik"
 
-#: ../meld/filediff.py:1273
+#: ../meld/filediff.py:1320
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -923,15 +926,35 @@ msgstr ""
 "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
 "Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: ../meld/filediff.py:1279
+#: ../meld/filediff.py:1326
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1289
+#: ../meld/filediff.py:1336
 msgid "Show without filters"
 msgstr "Pokaži brez filtrov"
 
-#: ../meld/filediff.py:1420
+#: ../meld/filediff.py:1358
+msgid "Change highlighting incomplete"
+msgstr "Spremeni označevanje kot nedokončano"
+
+#: ../meld/filediff.py:1359
+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."
+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:1368
+msgid "Keep highlighting"
+msgstr "Poudarjanje skladnje"
+
+#: ../meld/filediff.py:1370
+msgid "_Keep highlighting"
+msgstr "_Poudarjanje skladnje"
+
+#: ../meld/filediff.py:1496
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -940,7 +963,7 @@ msgstr ""
 "\"%s\" že obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1433
+#: ../meld/filediff.py:1509
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -951,12 +974,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1442
+#: ../meld/filediff.py:1518
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:1458
+#: ../meld/filediff.py:1538
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -967,7 +990,7 @@ msgstr ""
 "\n"
 "Kateri zapis želite uporabiti?"
 
-#: ../meld/filediff.py:1474
+#: ../meld/filediff.py:1554
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -976,11 +999,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:1539
+#: ../meld/filediff.py:1620
 msgid "Save changes to documents before reloading?"
 msgstr "Ali naj bodo spremembe v dokumentu shranjene pred ponovnim nalaganjem?"
 
-#: ../meld/filemerge.py:53
+#: ../meld/filemerge.py:51
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Združevanje datotek"
@@ -1079,248 +1102,248 @@ msgstr "Napaka med branjem datoteke primerjav"
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: ../meld/melddoc.py:59 ../meld/melddoc.py:60
+#: ../meld/melddoc.py:58 ../meld/melddoc.py:59
 msgid "untitled"
 msgstr "neimenovano"
 
-#: ../meld/meldwindow.py:62
+#: ../meld/meldwindow.py:61
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../meld/meldwindow.py:63
-msgid "_New comparison"
+#: ../meld/meldwindow.py:62
+msgid "_New Comparison"
 msgstr "_Nova primerjava"
 
 #: ../meld/meldwindow.py:63
 msgid "Start a new comparison"
 msgstr "Nova primerjava"
 
-#: ../meld/meldwindow.py:64
+#: ../meld/meldwindow.py:66
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
-#: ../meld/meldwindow.py:66
+#: ../meld/meldwindow.py:69
+msgid "Save the current file with a different name"
+msgstr "Shrani trenutno datoteko z drugim imenom"
+
+#: ../meld/meldwindow.py:72
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
-#: ../meld/meldwindow.py:67
+#: ../meld/meldwindow.py:75
 msgid "Quit the program"
 msgstr "Končaj program"
 
-#: ../meld/meldwindow.py:69
+#: ../meld/meldwindow.py:78
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../meld/meldwindow.py:70
+#: ../meld/meldwindow.py:80
 msgid "Undo the last action"
 msgstr "Razveljavi zadnje dejanje"
 
-#: ../meld/meldwindow.py:71
+#: ../meld/meldwindow.py:83
 msgid "Redo the last undone action"
 msgstr "Obnovi zadnje razveljavljeno dejanje"
 
-#: ../meld/meldwindow.py:72
+#: ../meld/meldwindow.py:85
 msgid "Cut the selection"
 msgstr "Izreži izbrano"
 
-#: ../meld/meldwindow.py:73
+#: ../meld/meldwindow.py:87
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
-#: ../meld/meldwindow.py:74
+#: ../meld/meldwindow.py:89
 msgid "Paste the clipboard"
 msgstr "Prilepi iz odložišča"
 
-#: ../meld/meldwindow.py:75
+#: ../meld/meldwindow.py:91
 msgid "Search for text"
 msgstr "Poišči besedilo"
 
-#: ../meld/meldwindow.py:76
+#: ../meld/meldwindow.py:93
 msgid "Find Ne_xt"
 msgstr "Najdi _naslednje"
 
-#: ../meld/meldwindow.py:76
+#: ../meld/meldwindow.py:94
 msgid "Search forwards for the same text"
 msgstr "Poišči niz naprej po besedilu"
 
-#: ../meld/meldwindow.py:77
+#: ../meld/meldwindow.py:96
 msgid "Find _Previous"
 msgstr "Najdi _predhodne"
 
-#: ../meld/meldwindow.py:77
+#: ../meld/meldwindow.py:97
 msgid "Search backwards for the same text"
 msgstr "Besedilo najdi nazaj po besedilu"
 
-#: ../meld/meldwindow.py:78
+#: ../meld/meldwindow.py:101
 msgid "Find and replace text"
 msgstr "Poišči in zamenjaj besedilo"
 
-#: ../meld/meldwindow.py:79
+#: ../meld/meldwindow.py:103
 msgid "Prefere_nces"
 msgstr "_Lastnosti"
 
-#: ../meld/meldwindow.py:79
+#: ../meld/meldwindow.py:104
 msgid "Configure the application"
 msgstr "Spremeni nastavitve programa"
 
-#: ../meld/meldwindow.py:81
+#: ../meld/meldwindow.py:107
 msgid "_Changes"
 msgstr "_Spremembe"
 
-#: ../meld/meldwindow.py:82
-msgid "Next change"
+#: ../meld/meldwindow.py:108
+msgid "Next Change"
 msgstr "Naslednja sprememba"
 
-#: ../meld/meldwindow.py:82
+#: ../meld/meldwindow.py:109
 msgid "Go to the next change"
 msgstr "Skoči na naslednjo spremembo"
 
-#: ../meld/meldwindow.py:83
-msgid "Previous change"
+#: ../meld/meldwindow.py:111
+msgid "Previous Change"
 msgstr "Predhodna sprememba"
 
-#: ../meld/meldwindow.py:83
+#: ../meld/meldwindow.py:112
 msgid "Go to the previous change"
 msgstr "Skoči na predhodno spremembo"
 
-#: ../meld/meldwindow.py:84
-msgid "Open externally"
+#: ../meld/meldwindow.py:114
+msgid "Open Externally"
 msgstr "Odpri v zunanjem programu"
 
-#: ../meld/meldwindow.py:84
+#: ../meld/meldwindow.py:115
 msgid "Open selected file or directory in the default external application"
 msgstr "Odpri zbrano datoteko ali mapo v privzetem  zunanjem programu"
 
-#: ../meld/meldwindow.py:86
+#: ../meld/meldwindow.py:119
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../meld/meldwindow.py:87
-msgid "File status"
+#: ../meld/meldwindow.py:120
+msgid "File Status"
 msgstr "Stanje datoteke"
 
-#: ../meld/meldwindow.py:88
-msgid "Version status"
+#: ../meld/meldwindow.py:121
+msgid "Version Status"
 msgstr "Stanje različice"
 
-#: ../meld/meldwindow.py:89
-msgid "File filters"
-msgstr "Filtri datotek"
-
-#: ../meld/meldwindow.py:90
+#: ../meld/meldwindow.py:124
 msgid "Stop the current action"
 msgstr "Ustavi trenutno dejanje"
 
-#: ../meld/meldwindow.py:91
+#: ../meld/meldwindow.py:127
 msgid "Refresh the view"
 msgstr "Osveži pogled"
 
-#: ../meld/meldwindow.py:92
+#: ../meld/meldwindow.py:129
 msgid "Reload"
 msgstr "Ponovno naloži"
 
-#: ../meld/meldwindow.py:92
+#: ../meld/meldwindow.py:130
 msgid "Reload the comparison"
 msgstr "Ponovno naloži primerjavo"
 
-#: ../meld/meldwindow.py:94
+#: ../meld/meldwindow.py:133
 msgid "_Tabs"
 msgstr "_Zavihki"
 
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:134
 msgid "_Previous Tab"
 msgstr "_Predhodni zavihek"
 
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:135
 msgid "Activate previous tab"
 msgstr "Pokaži predhodni zavihek"
 
-#: ../meld/meldwindow.py:96
+#: ../meld/meldwindow.py:137
 msgid "_Next Tab"
 msgstr "_Naslednji zavihek"
 
-#: ../meld/meldwindow.py:96
+#: ../meld/meldwindow.py:138
 msgid "Activate next tab"
 msgstr "Pokaži naslednji zavihek"
 
-#: ../meld/meldwindow.py:97
+#: ../meld/meldwindow.py:141
 msgid "Move Tab _Left"
 msgstr "Premakni zavihek _levo"
 
-#: ../meld/meldwindow.py:97
+#: ../meld/meldwindow.py:142
 msgid "Move current tab to left"
 msgstr "Premakni trenutni zavihek na levo"
 
-#: ../meld/meldwindow.py:98
+#: ../meld/meldwindow.py:145
 msgid "Move Tab _Right"
 msgstr "Premakni zavihek _desno"
 
-#: ../meld/meldwindow.py:98
+#: ../meld/meldwindow.py:146
 msgid "Move current tab to right"
 msgstr "Premakni trenutni zavihek na desno"
 
-#: ../meld/meldwindow.py:100
+#: ../meld/meldwindow.py:149
 msgid "_Help"
 msgstr "Pomo_č"
 
-#: ../meld/meldwindow.py:101
+#: ../meld/meldwindow.py:150
 msgid "_Contents"
 msgstr "_Vsebina"
 
-#: ../meld/meldwindow.py:101
+#: ../meld/meldwindow.py:151
 msgid "Open the Meld manual"
 msgstr "Odpri priročnik Meld"
 
-#: ../meld/meldwindow.py:102
+#: ../meld/meldwindow.py:152
 msgid "Report _Bug"
 msgstr "Pošlji poročilo o _hrošču"
 
-#: ../meld/meldwindow.py:102
+#: ../meld/meldwindow.py:153
 msgid "Report a bug in Meld"
 msgstr "Poročilo o hrošču programa Meld"
 
-#: ../meld/meldwindow.py:103
+#: ../meld/meldwindow.py:156
 msgid "About this program"
 msgstr "O programu"
 
-#: ../meld/meldwindow.py:106
+#: ../meld/meldwindow.py:160
 msgid "Full Screen"
 msgstr "Celozaslonski način"
 
-#: ../meld/meldwindow.py:106
+#: ../meld/meldwindow.py:161
 msgid "View the comparison in full screen"
 msgstr "Ogled primerjave v celozaslonskem načinu"
 
-#: ../meld/meldwindow.py:107
+#: ../meld/meldwindow.py:163
 msgid "_Toolbar"
 msgstr "_Orodna vrstica"
 
-#: ../meld/meldwindow.py:107
+#: ../meld/meldwindow.py:164
 msgid "Show or hide the toolbar"
 msgstr "Pokaži ali skrij orodno vrstico"
 
-#: ../meld/meldwindow.py:108
+#: ../meld/meldwindow.py:166
 msgid "_Statusbar"
 msgstr "_Vrstica stanja"
 
-#: ../meld/meldwindow.py:108
+#: ../meld/meldwindow.py:167
 msgid "Show or hide the statusbar"
 msgstr "Pokaži ali skrij vrstico stanja"
 
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:176
 msgid "Open Recent"
 msgstr "Odpri nedavno"
 
-#: ../meld/meldwindow.py:117
+#: ../meld/meldwindow.py:177
 msgid "Open recent files"
 msgstr "Odpri nedavne datoteke"
 
-#: ../meld/meldwindow.py:533
+#: ../meld/meldwindow.py:593
 msgid "Switch to this tab"
 msgstr "Preklopi na ta zavihek"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:665
+#: ../meld/meldwindow.py:726
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Ni mogoče primerjati mešanice datotek in map.\n"
 
@@ -1333,25 +1356,25 @@ msgstr "[noben]"
 msgid "Save Patch As..."
 msgstr "Shrani popravke kot ..."
 
-#: ../meld/preferences.py:44
+#: ../meld/preferences.py:49
 msgid "label"
 msgstr "oznaka"
 
-#: ../meld/preferences.py:44
+#: ../meld/preferences.py:49
 msgid "pattern"
 msgstr "vzorec"
 
-#: ../meld/preferences.py:160
+#: ../meld/preferences.py:165
 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:306
+#: ../meld/preferences.py:311
 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:308
+#: ../meld/preferences.py:313
 msgid ""
 "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
 "Desktop.ini\n"
@@ -1360,49 +1383,49 @@ msgstr ""
 "Desktop.ini\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:310
+#: ../meld/preferences.py:315
 #, 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:312
+#: ../meld/preferences.py:317
 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:314
+#: ../meld/preferences.py:319
 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}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:316
+#: ../meld/preferences.py:321
 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
+#: ../meld/preferences.py:323
 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:320
+#: ../meld/preferences.py:325
 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:322
+#: ../meld/preferences.py:327
 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:324
+#: ../meld/preferences.py:329
 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:326
+#: ../meld/preferences.py:331
 msgid "Script comment\t0\t#.*"
 msgstr "Opomba skripta\t0\t#.*"
 
@@ -1657,3 +1680,6 @@ msgstr ""
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Način je spremenjen iz %s v %s"
+
+#~ msgid "File filters"
+#~ msgstr "Filtri datotek"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]