[meld] Updated Slovenian translation

From: Matej UrbanÄiÄ <mateju src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Slovenian translation
Date: Wed, 19 Dec 2012 10:28:53 +0000 (UTC)
commit 7ac6fc7b8adf73dc3b778a92eed40dbaa0575420
Author: Matej UrbanÄiÄ <mateju svn gnome org>
Date:   Wed Dec 19 11:28:48 2012 +0100

    Updated Slovenian translation

 po/sl.po |  456 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 236 insertions(+), 220 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 7ae555d..38d20e5 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: 2012-12-09 19:51+0000\n"
-"PO-Revision-Date: 2012-12-10 21:41+0100\n"
+"POT-Creation-Date: 2012-12-16 20:03+0000\n"
+"PO-Revision-Date: 2012-12-19 11:28+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"
@@ -55,7 +55,7 @@ msgstr "Uredljiv seznam"
 msgid "Active"
 msgstr "Dejavno"
 
-#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:199
+#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:200
 msgid "Name"
 msgstr "Ime"
 
@@ -67,7 +67,7 @@ msgstr "Vzorec"
 msgid "Add new filter"
 msgstr "Dodaj nov filter"
 
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:162
+#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:163
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -75,7 +75,7 @@ msgstr "_Dodaj"
 msgid "Remove selected filter"
 msgstr "Odstrani izbrani filter"
 
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:163
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:164
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -115,7 +115,7 @@ msgstr "_PrekliÄi"
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:128
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:132
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
@@ -399,47 +399,47 @@ msgstr "Predhodni dnevniki"
 msgid "Log Message"
 msgstr "SporoÄilo beleÅenja"
 
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:159
+#: ../meld/dirdiff.py:233 ../meld/vcview.py:160
 msgid "_Compare"
 msgstr "_Primerjava"
 
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:159
+#: ../meld/dirdiff.py:233 ../meld/vcview.py:160
 msgid "Compare selected"
 msgstr "Primerjaj izbrano"
 
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:234
 msgid "Copy _Left"
 msgstr "Kopiraj _levo"
 
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:234
 msgid "Copy to left"
 msgstr "Kopiraj na levo"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:235
 msgid "Copy _Right"
 msgstr "Kopiraj _desno"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:235
 msgid "Copy to right"
 msgstr "Kopiraj na desno"
 
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:236
 msgid "Delete selected"
 msgstr "IzbriÅi izbor"
 
-#: ../meld/dirdiff.py:236 ../meld/filediff.py:1226
+#: ../meld/dirdiff.py:237 ../meld/filediff.py:1239
 msgid "Hide"
 msgstr "Skrij"
 
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:237
 msgid "Hide selected"
 msgstr "Skrij izbrano"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:241
 msgid "Ignore filename case"
 msgstr "Prezri velikost Ärk imen datotek"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:241
 msgid ""
 "Consider differently-cased filenames that are otherwise-identical to be the "
 "same"
@@ -447,74 +447,74 @@ msgstr ""
 "Obravnavaj datoteke, ki imajo v imenu Ärke razliÄne velikosti, vendar so "
 "sicer enake, kot da so enake."
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:242
 msgid "Same"
 msgstr "Enako"
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:242
 msgid "Show identical"
 msgstr "PokaÅi enako"
 
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:243
 msgid "New"
 msgstr "Novo"
 
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:243
 msgid "Show new"
 msgstr "PokaÅi novejÅe"
 
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:244
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: ../meld/dirdiff.py:243 ../meld/vcview.py:171
+#: ../meld/dirdiff.py:244 ../meld/vcview.py:172
 msgid "Show modified"
 msgstr "PokaÅi spremenjeno"
 
-#: ../meld/dirdiff.py:245
+#: ../meld/dirdiff.py:246
 msgid "Filters"
 msgstr "Filtri"
 
-#: ../meld/dirdiff.py:245
+#: ../meld/dirdiff.py:246
 msgid "Set active filters"
 msgstr "DoloÄi dejavne filtre"
 
-#: ../meld/dirdiff.py:410
+#: ../meld/dirdiff.py:407
 #, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:516 ../meld/dirdiff.py:535 ../meld/vcview.py:366
-#: ../meld/vcview.py:390
+#: ../meld/dirdiff.py:521 ../meld/dirdiff.py:540 ../meld/vcview.py:370
+#: ../meld/vcview.py:394
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:634
+#: ../meld/dirdiff.py:639
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] konÄano"
 
-#: ../meld/dirdiff.py:639
+#: ../meld/dirdiff.py:644
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je priÅlo do veÄ napak."
 
-#: ../meld/dirdiff.py:640
+#: ../meld/dirdiff.py:645
 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:642
+#: ../meld/dirdiff.py:647
 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:644
+#: ../meld/dirdiff.py:649
 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:646
+#: ../meld/dirdiff.py:651
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -523,17 +523,17 @@ msgstr ""
 "razlike velikosti upoÅteva. Nekatere datoteke so skrite:\n"
 "%s"
 
-#: ../meld/dirdiff.py:657
+#: ../meld/dirdiff.py:662
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:682 ../meld/filediff.py:989 ../meld/filediff.py:1230
-#: ../meld/vcview.py:616 ../meld/vcview.py:658
+#: ../meld/dirdiff.py:687 ../meld/filediff.py:1002 ../meld/filediff.py:1243
+#: ../meld/vcview.py:620 ../meld/vcview.py:662
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/dirdiff.py:714
+#: ../meld/dirdiff.py:719
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -542,7 +542,7 @@ msgstr ""
 "'%s' Åe obstaja.\n"
 "Ali naj bo prepisana?"
 
-#: ../meld/dirdiff.py:721
+#: ../meld/dirdiff.py:726
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -553,7 +553,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:739 ../meld/vcview.py:590
+#: ../meld/dirdiff.py:744 ../meld/vcview.py:594
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -562,7 +562,7 @@ msgstr ""
 "'%s' je mapa.\n"
 "Ali naj bo odstranjena vsa vsebina?"
 
-#: ../meld/dirdiff.py:746 ../meld/vcview.py:595
+#: ../meld/dirdiff.py:751 ../meld/vcview.py:599
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -573,7 +573,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:846
+#: ../meld/dirdiff.py:851
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -582,7 +582,7 @@ msgstr[1] "%i sekunda"
 msgstr[2] "%i sekundi"
 msgstr[3] "%i sekunde"
 
-#: ../meld/dirdiff.py:847
+#: ../meld/dirdiff.py:852
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -591,7 +591,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuti"
 msgstr[3] "%i minute"
 
-#: ../meld/dirdiff.py:848
+#: ../meld/dirdiff.py:853
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -600,7 +600,7 @@ msgstr[1] "%i ura"
 msgstr[2] "%i uri"
 msgstr[3] "%i ure"
 
-#: ../meld/dirdiff.py:849
+#: ../meld/dirdiff.py:854
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -609,7 +609,7 @@ msgstr[1] "%i dan"
 msgstr[2] "%i dni"
 msgstr[3] "%i dni"
 
-#: ../meld/dirdiff.py:850
+#: ../meld/dirdiff.py:855
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -618,7 +618,7 @@ msgstr[1] "%i teden"
 msgstr[2] "%i tedna"
 msgstr[3] "%i tedni"
 
-#: ../meld/dirdiff.py:851
+#: ../meld/dirdiff.py:856
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -627,7 +627,7 @@ msgstr[1] "%i mesec"
 msgstr[2] "%i meseca"
 msgstr[3] "%i meseci"
 
-#: ../meld/dirdiff.py:852
+#: ../meld/dirdiff.py:857
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -636,159 +636,159 @@ msgstr[1] "%i leto"
 msgstr[2] "%i leti"
 msgstr[3] "%i leta"
 
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:217
 msgid "Format as patch..."
 msgstr "Oblikuj kot popravek ..."
 
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:217
 msgid "Create a patch using differences between files"
 msgstr "Ustvari popravek z razlikovanjem med datotekami"
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:218
 msgid "Previous conflict"
 msgstr "Predhodni spor"
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:218
 msgid "Go to the previous conflict"
 msgstr "SkoÄi na predhodni niz v sporu"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:219
 msgid "Next conflict"
 msgstr "Naslednji spor"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:219
 msgid "Go to the next conflict"
 msgstr "SkoÄi na naslednji niz v sporu"
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:220
 msgid "Push to left"
 msgstr "Potisni levo"
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:220
 msgid "Push current change to the left"
 msgstr "Potisni trenutne spremembe na levo"
 
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:221
 msgid "Push to right"
 msgstr "Potisni desno"
 
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:221
 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:222
+#: ../meld/filediff.py:223
 msgid "Pull from left"
 msgstr "Potegni z leve"
 
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:223
 msgid "Pull change from the left"
 msgstr "Potegni spremembe z leve"
 
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:224
 msgid "Pull from right"
 msgstr "Potegni z desne"
 
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:224
 msgid "Pull change from the right"
 msgstr "Potegni spremembe z desne"
 
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:225
 msgid "Copy above left"
 msgstr "Kopiraj nad levo"
 
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:225
 msgid "Copy change above the left chunk"
 msgstr "Kopiraj spremembe nad levi del"
 
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:226
 msgid "Copy below left"
 msgstr "Kopiraj pod levo"
 
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:226
 msgid "Copy change below the left chunk"
 msgstr "Kopiraj spremembe pod levi del"
 
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:227
 msgid "Copy above right"
 msgstr "Kopiraj nad desno"
 
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:227
 msgid "Copy change above the right chunk"
 msgstr "Kopiraj spremembe nad desni del"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:228
 msgid "Copy below right"
 msgstr "Kopiraj pod desno"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:228
 msgid "Copy change below the right chunk"
 msgstr "Kopiraj spremembe pod desni del"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:229
 msgid "Delete"
 msgstr "IzbriÅi"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:229
 msgid "Delete change"
 msgstr "IzbriÅi spremembo"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:230
 msgid "Merge all changes from left"
 msgstr "ZdruÅi vse spremembe z leve"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:230
 msgid "Merge all non-conflicting changes from the left"
 msgstr "ZdruÅi vse spremembe brez sporov z leve"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:231
 msgid "Merge all changes from right"
 msgstr "ZdruÅi vse spremembe z desne"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:231
 msgid "Merge all non-conflicting changes from the right"
 msgstr "ZdruÅi vse spremembe brez sporov z desne"
 
-#: ../meld/filediff.py:231
+#: ../meld/filediff.py:232
 msgid "Merge all non-conflicting"
 msgstr "ZdruÅi vse spremembe brez sporov"
 
-#: ../meld/filediff.py:231
+#: ../meld/filediff.py:232
 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:232
+#: ../meld/filediff.py:233
 msgid "Cycle through documents"
 msgstr "Preklopi med dokumenti"
 
-#: ../meld/filediff.py:232
+#: ../meld/filediff.py:233
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
 
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:237
 msgid "Lock scrolling"
 msgstr "Zakleni drsenje"
 
-#: ../meld/filediff.py:237
+#: ../meld/filediff.py:238
 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:355
+#: ../meld/filediff.py:354
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:355
+#: ../meld/filediff.py:354
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:357
+#: ../meld/filediff.py:356
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:684
+#: ../meld/filediff.py:693
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -797,42 +797,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:977
+#: ../meld/filediff.py:990
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] DoloÄi okna"
 
-#: ../meld/filediff.py:983
+#: ../meld/filediff.py:996
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:1007 ../meld/filediff.py:1017 ../meld/filediff.py:1030
-#: ../meld/filediff.py:1036
+#: ../meld/filediff.py:1020 ../meld/filediff.py:1030 ../meld/filediff.py:1043
+#: ../meld/filediff.py:1049
 msgid "Could not read file"
 msgstr "Ni mogoÄe prebrati datoteke"
 
-#: ../meld/filediff.py:1008
+#: ../meld/filediff.py:1021
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:1018
+#: ../meld/filediff.py:1031
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiÅka datoteka."
 
-#: ../meld/filediff.py:1031
+#: ../meld/filediff.py:1044
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:1062
+#: ../meld/filediff.py:1075
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] RaÄunanje razlik"
 
-#: ../meld/filediff.py:1217
+#: ../meld/filediff.py:1230
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -840,15 +840,15 @@ msgstr ""
 "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
 "Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: ../meld/filediff.py:1223
+#: ../meld/filediff.py:1236
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1233
+#: ../meld/filediff.py:1246
 msgid "Show without filters"
 msgstr "PokaÅi brez filtrov"
 
-#: ../meld/filediff.py:1357
+#: ../meld/filediff.py:1370
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -857,7 +857,7 @@ msgstr ""
 "\"%s\" Åe obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1370
+#: ../meld/filediff.py:1383
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -868,12 +868,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1379
+#: ../meld/filediff.py:1392
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:1394
+#: ../meld/filediff.py:1407
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -884,7 +884,7 @@ msgstr ""
 "\n"
 "Kateri zapis Åelite uporabiti?"
 
-#: ../meld/filediff.py:1410
+#: ../meld/filediff.py:1423
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -893,96 +893,104 @@ 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:1463
+#: ../meld/filediff.py:1476
 msgid "Save changes to documents before reloading?"
 msgstr "Ali naj bodo spremembe v dokumentu shranjene pred ponovnim nalaganjem?"
 
-#: ../meld/filemerge.py:48
+#: ../meld/filemerge.py:53
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] ZdruÅevanje datotek"
 
-#: ../meld/meldapp.py:89
+#: ../meld/meldapp.py:93
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Neveljavno Åtevilo argumentov pri ukazu --diff."
 
-#: ../meld/meldapp.py:93
+#: ../meld/meldapp.py:97
 msgid "Start with an empty window"
 msgstr "Zagon brez odprtih oken"
 
-#: ../meld/meldapp.py:94 ../meld/meldapp.py:95 ../meld/meldapp.py:97
+#: ../meld/meldapp.py:98 ../meld/meldapp.py:99 ../meld/meldapp.py:101
 msgid "file"
 msgstr "datoteka"
 
-#: ../meld/meldapp.py:94 ../meld/meldapp.py:96 ../meld/meldapp.py:97
+#: ../meld/meldapp.py:98 ../meld/meldapp.py:100 ../meld/meldapp.py:101
 msgid "dir"
 msgstr "mapa"
 
-#: ../meld/meldapp.py:94
+#: ../meld/meldapp.py:98
 msgid "Start a version control comparison"
 msgstr "Zagon primerjave nadzora razliÄic"
 
-#: ../meld/meldapp.py:95
+#: ../meld/meldapp.py:99
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: ../meld/meldapp.py:96
+#: ../meld/meldapp.py:100
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo map"
 
-#: ../meld/meldapp.py:97
+#: ../meld/meldapp.py:101
 msgid "Start a comparison between file and dir/file"
 msgstr "Zagon primerjave med datoteko in mapo/datoteko"
 
-#: ../meld/meldapp.py:103
+#: ../meld/meldapp.py:107
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je orodje za primerjavo vsebine datotek in map."
 
-#: ../meld/meldapp.py:106
+#: ../meld/meldapp.py:110
 msgid "Set label to use instead of file name"
 msgstr "DoloÄi naslov namesto imena datoteke"
 
-#: ../meld/meldapp.py:108
+#: ../meld/meldapp.py:112
 msgid "Open a new tab in an already running instance"
 msgstr "Odpri nov zavihek v Åe zagnanem programu"
 
-#: ../meld/meldapp.py:110
+#: ../meld/meldapp.py:114
 msgid "Automatically compare all differing files on startup"
 msgstr "Ob zagonu samodejno primerjaj vse razliÄne datoteke."
 
-#: ../meld/meldapp.py:112
+#: ../meld/meldapp.py:116
 msgid "Ignored for compatibility"
 msgstr "Prezrto zaradi skladnosti"
 
-#: ../meld/meldapp.py:115
+#: ../meld/meldapp.py:119
 msgid "Set the target file for saving a merge result"
 msgstr "DoloÄitev ciljne datoteke za shranjevanje rezultatov zdruÅevanja."
 
-#: ../meld/meldapp.py:117
+#: ../meld/meldapp.py:121
 msgid "Automatically merge files"
 msgstr "Samodejno zdruÅi datoteke"
 
-#: ../meld/meldapp.py:120
+#: ../meld/meldapp.py:124
+msgid "Load a saved comparison from a Meld comparison file"
+msgstr "NaloÅi shranjeno datoteko primerjav Meld"
+
+#: ../meld/meldapp.py:127
 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:123
+#: ../meld/meldapp.py:130
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "preveÄ argumentov (zahtevanih 0-3, prejetih %d)"
 
-#: ../meld/meldapp.py:125
+#: ../meld/meldapp.py:132
 msgid "can't auto-merge less than 3 files"
 msgstr "manj kot treh datotek ni mogoÄe samodejno zdruÅevati"
 
-#: ../meld/meldapp.py:127
+#: ../meld/meldapp.py:134
 msgid "can't auto-merge directories"
 msgstr "map ni mogoÄe samodejno zdruÅevati"
 
-#: ../meld/meldapp.py:133
+#: ../meld/meldapp.py:140
 msgid "D-Bus error; comparisons will open in a new window."
 msgstr "Napaka vodila D-Bus; primerjave se odprejo v novem oknu."
 
+#: ../meld/meldapp.py:158
+msgid "Error reading saved comparison file"
+msgstr "Napaka med branjem datoteke primerjav"
+
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
 #: ../meld/meldbuffer.py:88
 msgid "<unnamed>"
@@ -992,236 +1000,244 @@ msgstr "<neimenovano>"
 msgid "untitled"
 msgstr "neimenovano"
 
-#: ../meld/meldwindow.py:112
+#: ../meld/meldwindow.py:116
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../meld/meldwindow.py:113
+#: ../meld/meldwindow.py:117
 msgid "_New..."
 msgstr "_Novo ..."
 
-#: ../meld/meldwindow.py:113
+#: ../meld/meldwindow.py:117
 msgid "Start a new comparison"
 msgstr "Nova primerjava"
 
-#: ../meld/meldwindow.py:114
+#: ../meld/meldwindow.py:118
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:120
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
-#: ../meld/meldwindow.py:117
+#: ../meld/meldwindow.py:121
 msgid "Quit the program"
 msgstr "KonÄaj program"
 
-#: ../meld/meldwindow.py:119
+#: ../meld/meldwindow.py:123
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:124
 msgid "Undo the last action"
 msgstr "Razveljavi zadnje dejanje"
 
-#: ../meld/meldwindow.py:121
+#: ../meld/meldwindow.py:125
 msgid "Redo the last undone action"
 msgstr "Obnovi zadnje razveljavljeno dejanje"
 
-#: ../meld/meldwindow.py:122
+#: ../meld/meldwindow.py:126
 msgid "Cut the selection"
 msgstr "IzreÅi izbrano"
 
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:127
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:128
 msgid "Paste the clipboard"
 msgstr "Prilepi iz odloÅiÅÄa"
 
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:129
 msgid "Search for text"
 msgstr "PoiÅÄi besedilo"
 
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:130
 msgid "Find Ne_xt"
 msgstr "Najdi _naslednje"
 
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:130
 msgid "Search forwards for the same text"
 msgstr "PoiÅÄi niz naprej po besedilu"
 
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:131
 msgid "Find _Previous"
 msgstr "Najdi _predhodne"
 
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:131
 msgid "Search backwards for the same text"
 msgstr "Besedilo najdi nazaj po besedilu"
 
-#: ../meld/meldwindow.py:128
+#: ../meld/meldwindow.py:132
 msgid "Find and replace text"
 msgstr "PoiÅÄi in zamenjaj besedilo"
 
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:133
 msgid "Prefere_nces"
 msgstr "_Lastnosti"
 
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:133
 msgid "Configure the application"
 msgstr "Spremeni nastavitve programa"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:135
 msgid "_Changes"
 msgstr "_Spremembe"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:136
 msgid "Next change"
 msgstr "Naslednja sprememba"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:136
 msgid "Go to the next change"
 msgstr "SkoÄi na naslednjo spremembo"
 
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:137
 msgid "Previous change"
 msgstr "Predhodna sprememba"
 
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:137
 msgid "Go to the previous change"
 msgstr "SkoÄi na predhodno spremembo"
 
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:138
 msgid "Open externally"
 msgstr "Odpri v zunanjem programu"
 
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:138
 msgid "Open selected file or directory in the default external application"
 msgstr "Odpri zbrano datoteko ali mapo v privzetem  zunanjem programu"
 
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:140
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:141
 msgid "File status"
 msgstr "Stanje datoteke"
 
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:142
 msgid "Version status"
 msgstr "Stanje razliÄice"
 
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:143
 msgid "File filters"
 msgstr "Filtri datotek"
 
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:144
 msgid "Stop the current action"
 msgstr "Ustavi trenutno dejanje"
 
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:145
 msgid "Refresh the view"
 msgstr "OsveÅi pogled"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:146
 msgid "Reload"
 msgstr "Ponovno naloÅi"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:146
 msgid "Reload the comparison"
 msgstr "Ponovno naloÅi primerjavo"
 
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:148
 msgid "_Tabs"
 msgstr "_Zavihki"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:149
 msgid "_Previous Tab"
 msgstr "_Predhodni zavihek"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:149
 msgid "Activate previous tab"
 msgstr "PokaÅi predhodni zavihek"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:150
 msgid "_Next Tab"
 msgstr "_Naslednji zavihek"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:150
 msgid "Activate next tab"
 msgstr "PokaÅi naslednji zavihek"
 
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:151
 msgid "Move Tab _Left"
 msgstr "Premakni zavihek _levo"
 
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:151
 msgid "Move current tab to left"
 msgstr "Premakni trenutni zavihek na levo"
 
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:152
 msgid "Move Tab _Right"
 msgstr "Premakni zavihek _desno"
 
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:152
 msgid "Move current tab to right"
 msgstr "Premakni trenutni zavihek na desno"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:154
 msgid "_Help"
 msgstr "Pomo_Ä"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:155
 msgid "_Contents"
 msgstr "_Vsebina"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:155
 msgid "Open the Meld manual"
 msgstr "Odpri priroÄnik Meld"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:156
 msgid "Report _Bug"
 msgstr "PoÅlji poroÄilo o _hroÅÄu"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:156
 msgid "Report a bug in Meld"
 msgstr "PoroÄilo o hroÅÄu programa Meld"
 
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:157
 msgid "About this program"
 msgstr "O programu"
 
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:160
 msgid "Full Screen"
 msgstr "Celozaslonski naÄin"
 
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:160
 msgid "View the comparison in full screen"
 msgstr "Ogled primerjave v celozaslonskem naÄinu"
 
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:161
 msgid "_Toolbar"
 msgstr "_Orodna vrstica"
 
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:161
 msgid "Show or hide the toolbar"
 msgstr "PokaÅi ali skrij orodno vrstico"
 
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:162
 msgid "_Statusbar"
 msgstr "_Vrstica stanja"
 
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:162
 msgid "Show or hide the statusbar"
 msgstr "PokaÅi ali skrij vrstico stanja"
 
-#: ../meld/meldwindow.py:546
+#: ../meld/meldwindow.py:170
+msgid "Open Recent"
+msgstr "Odpri nedavno"
+
+#: ../meld/meldwindow.py:171
+msgid "Open recent files"
+msgstr "Odpri nedavne datoteke"
+
+#: ../meld/meldwindow.py:569
 msgid "Switch to this tab"
 msgstr "Preklopi na ta zavihek"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:651
+#: ../meld/meldwindow.py:674
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Ni mogoÄe primerjati meÅanice datotek in map.\n"
 
@@ -1307,153 +1323,153 @@ msgstr "ZaÄetni presledni znaki\t0\t^[ \\t\\r\\f\\v]*\n"
 msgid "Script comment\t0\t#.*"
 msgstr "Opomba skripta\t0\t#.*"
 
-#: ../meld/vcview.py:160
+#: ../meld/vcview.py:161
 msgid "Co_mmit"
 msgstr "_Uveljavi"
 
-#: ../meld/vcview.py:160
+#: ../meld/vcview.py:161
 msgid "Commit"
 msgstr "Uveljavi"
 
-#: ../meld/vcview.py:161
+#: ../meld/vcview.py:162
 msgid "_Update"
 msgstr "_Posodobi"
 
-#: ../meld/vcview.py:161
+#: ../meld/vcview.py:162
 msgid "Update"
 msgstr "Posodobi"
 
-#: ../meld/vcview.py:162
+#: ../meld/vcview.py:163
 msgid "Add to VC"
 msgstr "Dodaj v VC"
 
-#: ../meld/vcview.py:163
+#: ../meld/vcview.py:164
 msgid "Remove from VC"
 msgstr "Odstrani iz VC"
 
-#: ../meld/vcview.py:164
+#: ../meld/vcview.py:165
 msgid "_Resolved"
 msgstr "_RazreÅeno"
 
-#: ../meld/vcview.py:164
+#: ../meld/vcview.py:165
 msgid "Mark as resolved for VC"
 msgstr "OznaÄi kot razreÅeno v VC"
 
-#: ../meld/vcview.py:165
+#: ../meld/vcview.py:166
 msgid "Revert to original"
 msgstr "_Povrni na izvirne vrednosti"
 
-#: ../meld/vcview.py:166
+#: ../meld/vcview.py:167
 msgid "Delete locally"
 msgstr "IzbriÅi krajevno"
 
-#: ../meld/vcview.py:170
+#: ../meld/vcview.py:171
 msgid "_Flatten"
 msgstr "_Razpni"
 
-#: ../meld/vcview.py:170
+#: ../meld/vcview.py:171
 msgid "Flatten directories"
 msgstr "_Razpni mape"
 
-#: ../meld/vcview.py:171
+#: ../meld/vcview.py:172
 msgid "_Modified"
 msgstr "_Spremenjeno"
 
-#: ../meld/vcview.py:172
+#: ../meld/vcview.py:173
 msgid "_Normal"
 msgstr "_ObiÄajno"
 
-#: ../meld/vcview.py:172
+#: ../meld/vcview.py:173
 msgid "Show normal"
 msgstr "PokaÅi obiÄajno"
 
-#: ../meld/vcview.py:173
+#: ../meld/vcview.py:174
 msgid "Non _VC"
 msgstr "Ni _VC"
 
-#: ../meld/vcview.py:173
+#: ../meld/vcview.py:174
 msgid "Show unversioned files"
 msgstr "PokaÅi datoteke z nedoloÄenimi razliÄicami"
 
-#: ../meld/vcview.py:174
+#: ../meld/vcview.py:175
 msgid "Ignored"
 msgstr "Prezrto"
 
-#: ../meld/vcview.py:174
+#: ../meld/vcview.py:175
 msgid "Show ignored files"
 msgstr "PokaÅi prezrte datoteke"
 
-#: ../meld/vcview.py:225 ../meld/vcview.py:362
+#: ../meld/vcview.py:226 ../meld/vcview.py:366
 msgid "Location"
 msgstr "Mesto"
 
-#: ../meld/vcview.py:226
+#: ../meld/vcview.py:227
 msgid "Status"
 msgstr "Stanje"
 
-#: ../meld/vcview.py:227
+#: ../meld/vcview.py:228
 msgid "Rev"
 msgstr "Rev"
 
-#: ../meld/vcview.py:228
+#: ../meld/vcview.py:229
 msgid "Tag"
 msgstr "Oznaka"
 
-#: ../meld/vcview.py:229
+#: ../meld/vcview.py:230
 msgid "Options"
 msgstr "MoÅnosti"
 
-#: ../meld/vcview.py:291
+#: ../meld/vcview.py:292
 msgid "Choose one Version Control"
 msgstr "Izbor nadzora razliÄic"
 
-#: ../meld/vcview.py:292
+#: ../meld/vcview.py:293
 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:305
+#: ../meld/vcview.py:306
 #, 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:309
+#: ../meld/vcview.py:310
 msgid "Invalid Repository"
 msgstr "Neveljavno skladiÅÄe"
 
-#: ../meld/vcview.py:318
+#: ../meld/vcview.py:319
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:362
+#: ../meld/vcview.py:366
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:405
+#: ../meld/vcview.py:409
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:437
+#: ../meld/vcview.py:441
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Iskanje razlik"
 
-#: ../meld/vcview.py:450
+#: ../meld/vcview.py:454
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Pripenjanje popravka"
 
-#: ../meld/vcview.py:609
+#: ../meld/vcview.py:613
 msgid "Patch tool not found"
 msgstr "Orodja za uveljavljanje popravkov ni mogoÄe najti"
 
-#: ../meld/vcview.py:610
+#: ../meld/vcview.py:614
 #, python-format
 msgid ""
 "Meld needs the <i>patch</i> tool to be installed to perform comparisons in "
@@ -1463,11 +1479,11 @@ msgstr ""
 "popravkov pri izvajanju primerjav v skladiÅÄih %s. Namestite orodje "
 "<i>patch</i> in poskusite znova."
 
-#: ../meld/vcview.py:650
+#: ../meld/vcview.py:654
 msgid "Error fetching original comparison file"
 msgstr "Napaka pridobivanja izvorne datoteke za primerjavo"
 
-#: ../meld/vcview.py:651
+#: ../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 "
@@ -1477,7 +1493,7 @@ msgstr ""
 "uporabljate najnovejÅo razliÄico programa, poÅljite poroÄilo o hroÅÄu s Äim "
 "veÄ podrobnostmi."
 
-#: ../meld/vcview.py:659
+#: ../meld/vcview.py:663
 msgid "Report a bug"
 msgstr "PoÅlji poroÄilo o hroÅÄu"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]