[meld] Updated Slovenian translation

From: Matej Urbančič <mateju src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Slovenian translation
Date: Sun, 29 Sep 2013 12:09:09 +0000 (UTC)
commit a951896d78a2f3c17bb1b2cac2d9cfbfd75dbe40
Author: Matej Urbančič <mateju svn gnome org>
Date:   Sun Sep 29 14:09:02 2013 +0200

    Updated Slovenian translation

 po/sl.po |  668 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 332 insertions(+), 336 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 4edb988..26ade8d 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-09-21 23:03+0000\n"
-"PO-Revision-Date: 2013-09-22 21:40+0100\n"
+"POT-Creation-Date: 2013-09-29 06:47+0000\n"
+"PO-Revision-Date: 2013-09-29 14:08+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"
@@ -51,6 +51,86 @@ msgstr "Primerjava in združevanje datotek"
 msgid "Meld comparison description"
 msgstr "Opis primerjave Meld"
 
+#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
+msgid "_Compare"
+msgstr "_Primerjava"
+
+#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
+msgid "Compare selected files"
+msgstr "Primerjajo izbrane datoteke"
+
+#: ../data/ui/dirdiff.ui.h:3
+msgid "Copy _Left"
+msgstr "Kopiraj _levo"
+
+#: ../data/ui/dirdiff.ui.h:4
+msgid "Copy to left"
+msgstr "Kopiraj na levo"
+
+#: ../data/ui/dirdiff.ui.h:5
+msgid "Copy _Right"
+msgstr "Kopiraj _desno"
+
+#: ../data/ui/dirdiff.ui.h:6
+msgid "Copy to right"
+msgstr "Kopiraj na desno"
+
+#: ../data/ui/dirdiff.ui.h:7
+msgid "Delete selected"
+msgstr "Izbriši izbor"
+
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1379
+msgid "Hide"
+msgstr "Skrij"
+
+#: ../data/ui/dirdiff.ui.h:9
+msgid "Hide selected"
+msgstr "Skrij izbrano"
+
+#: ../data/ui/dirdiff.ui.h:10
+msgid "Ignore Filename Case"
+msgstr "Prezri velikost črk imen datotek"
+
+#: ../data/ui/dirdiff.ui.h:11
+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."
+
+#: ../data/ui/dirdiff.ui.h:12
+msgid "Same"
+msgstr "Enako"
+
+#: ../data/ui/dirdiff.ui.h:13
+msgid "Show identical"
+msgstr "Pokaži enako"
+
+#: ../data/ui/dirdiff.ui.h:14
+msgid "New"
+msgstr "Novo"
+
+#: ../data/ui/dirdiff.ui.h:15
+msgid "Show new"
+msgstr "Pokaži novejše"
+
+#: ../data/ui/dirdiff.ui.h:16
+msgid "Modified"
+msgstr "Spremenjeno"
+
+#: ../data/ui/dirdiff.ui.h:17
+msgid "Show modified"
+msgstr "Pokaži spremenjeno"
+
+#: ../data/ui/dirdiff.ui.h:18
+msgid "Filters"
+msgstr "Filtri"
+
+#: ../data/ui/dirdiff.ui.h:19
+msgid "Set active filters"
+msgstr "Določi dejavne filtre"
+
 #: ../data/ui/EditableList.ui.h:1
 msgid "Editable List"
 msgstr "Uredljiv seznam"
@@ -63,11 +143,12 @@ msgstr "Dejavno"
 msgid "Column Name"
 msgstr "Ime stolpca"
 
-#: ../data/ui/EditableList.ui.h:4 ../meld/vcview.py:172
+#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../data/ui/EditableList.ui.h:5 ../meld/vcview.py:175 ../meld/vcview.py:715
+#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
+#: ../meld/vcview.py:644
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -88,8 +169,8 @@ msgid "Move _Down"
 msgstr "Premakni navz_dol"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:343
-#: ../meld/vcview.py:231
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:324
+#: ../meld/vcview.py:174
 msgid "Name"
 msgstr "Ime"
 
@@ -142,7 +223,7 @@ msgstr ""
 "in vsebino spreminjate, vendar pa je treba spremembe shraniti v datoteko z "
 "drugim imenom."
 
-#: ../data/ui/filediff.ui.h:10 ../meld/filediff.py:295
+#: ../data/ui/filediff.ui.h:10 ../meld/filediff.py:299
 msgid "Lock scrolling of all panes"
 msgstr "Zakleni drsenje vseh pladnjev"
 
@@ -487,168 +568,180 @@ msgstr "_Prazna primerjava"
 msgid "C_ompare"
 msgstr "_Primerjava"
 
-#: ../data/ui/vcview.ui.h:1
-msgid "Commit"
-msgstr "Uveljavi"
-
-#: ../data/ui/vcview.ui.h:2
-msgid "Commit Files"
-msgstr "Uveljavi datoteke"
-
 #: ../data/ui/vcview.ui.h:3
-msgid "Log Message"
-msgstr "Sporočilo beleženja"
+msgid "Co_mmit..."
+msgstr "U_veljavi ..."
 
 #: ../data/ui/vcview.ui.h:4
-msgid "Previous logs:"
-msgstr "Predhodni dnevniki:"
+msgid "Commit changes to version control"
+msgstr "Uveljavi spremembe v sistem za nadzor različic"
 
 #: ../data/ui/vcview.ui.h:5
-msgid "Co_mmit"
-msgstr "_Uveljavi"
+msgid "_Update"
+msgstr "_Posodobi"
 
 #: ../data/ui/vcview.ui.h:6
-msgid "Push local commits to remote?"
-msgstr "Ali naj se objavijo krajevne uveljavitve v oddaljeno skladišče?"
+msgid "Update working copy from version control"
+msgstr "Posodobi delovno kopijo preko nadzora različic"
 
 #: ../data/ui/vcview.ui.h:7
-msgid "The commits to be pushed are determined by your version control system."
-msgstr "Uveljavitve za objavo določa sistem za nadzor različic."
+msgid "_Push"
+msgstr "_Objavi"
 
 #: ../data/ui/vcview.ui.h:8
-msgid "_Push commits"
-msgstr "_Objavi uveljavitve"
+msgid "Push local changes to remote"
+msgstr "Objavi spremembe v oddaljeno skladišče"
 
-#: ../meld/dirdiff.py:269 ../meld/vcview.py:160
-msgid "_Compare"
-msgstr "_Primerjava"
+#: ../data/ui/vcview.ui.h:10
+msgid "Add to version control"
+msgstr "Dodaj v sistem nadzora različic"
 
-#: ../meld/dirdiff.py:269
-msgid "Compare selected"
-msgstr "Primerjaj izbrano"
+#: ../data/ui/vcview.ui.h:12
+msgid "Remove from version control"
+msgstr "Odstrani iz sistema nadzora različic"
 
-#: ../meld/dirdiff.py:270
-msgid "Copy _Left"
-msgstr "Kopiraj _levo"
+#: ../data/ui/vcview.ui.h:13
+msgid "Mar_k as Resolved"
+msgstr "Označi kot _razrešeno"
 
-#: ../meld/dirdiff.py:270
-msgid "Copy to left"
-msgstr "Kopiraj na levo"
+#: ../data/ui/vcview.ui.h:14
+msgid "Mark as resolved in version control"
+msgstr "Označi kot razrešeno v sistemu nadzora različic"
 
-#: ../meld/dirdiff.py:271
-msgid "Copy _Right"
-msgstr "Kopiraj _desno"
+#: ../data/ui/vcview.ui.h:15
+msgid "Re_vert"
+msgstr "Po&vrni"
 
-#: ../meld/dirdiff.py:271
-msgid "Copy to right"
-msgstr "Kopiraj na desno"
+#: ../data/ui/vcview.ui.h:16
+msgid "Revert working copy to original state"
+msgstr "Povrni delovno kopijo na izvorno stanje"
 
-#: ../meld/dirdiff.py:272
-msgid "Delete selected"
-msgstr "Izbriši izbor"
+#: ../data/ui/vcview.ui.h:17
+msgid "Delete from working copy"
+msgstr "Izbriši iz delovne kopije"
 
-#: ../meld/dirdiff.py:273 ../meld/filediff.py:1368 ../meld/filediff.py:1403
-msgid "Hide"
-msgstr "Skrij"
+#: ../data/ui/vcview.ui.h:18
+msgid "_Flatten"
+msgstr "_Razpni"
 
-#: ../meld/dirdiff.py:273
-msgid "Hide selected"
-msgstr "Skrij izbrano"
+#: ../data/ui/vcview.ui.h:19
+msgid "Flatten directories"
+msgstr "_Razpni mape"
 
-#: ../meld/dirdiff.py:277
-msgid "Ignore Filename Case"
-msgstr "Prezri velikost črk imen datotek"
+#: ../data/ui/vcview.ui.h:20
+msgid "_Modified"
+msgstr "_Spremenjeno"
 
-#: ../meld/dirdiff.py:277
-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."
+#: ../data/ui/vcview.ui.h:21
+msgid "Show modified files"
+msgstr "Pokaži spremenjene datoteke"
 
-#: ../meld/dirdiff.py:278
-msgid "Same"
-msgstr "Enako"
+#: ../data/ui/vcview.ui.h:22
+msgid "_Normal"
+msgstr "_Običajno"
 
-#: ../meld/dirdiff.py:278
-msgid "Show identical"
-msgstr "Pokaži enako"
+#: ../data/ui/vcview.ui.h:23
+msgid "Show normal files"
+msgstr "Pokaži običajne datoteke"
 
-#: ../meld/dirdiff.py:279
-msgid "New"
-msgstr "Novo"
+#: ../data/ui/vcview.ui.h:24
+msgid "Un_versioned"
+msgstr "Brez določene _različice"
 
-#: ../meld/dirdiff.py:279
-msgid "Show new"
-msgstr "Pokaži novejše"
+#: ../data/ui/vcview.ui.h:25
+msgid "Show unversioned files"
+msgstr "Pokaži datoteke z nedoločenimi različicami"
 
-#: ../meld/dirdiff.py:280
-msgid "Modified"
-msgstr "Spremenjeno"
+#: ../data/ui/vcview.ui.h:26
+msgid "Ignored"
+msgstr "Prezrto"
 
-#: ../meld/dirdiff.py:280
-msgid "Show modified"
-msgstr "Pokaži spremenjeno"
+#: ../data/ui/vcview.ui.h:27
+msgid "Show ignored files"
+msgstr "Pokaži prezrte datoteke"
 
-#: ../meld/dirdiff.py:282
-msgid "Filters"
-msgstr "Filtri"
+#: ../data/ui/vcview.ui.h:28
+msgid "Commit"
+msgstr "Uveljavi"
 
-#: ../meld/dirdiff.py:282
-msgid "Set active filters"
-msgstr "Določi dejavne filtre"
+#: ../data/ui/vcview.ui.h:29
+msgid "Commit Files"
+msgstr "Uveljavi datoteke"
+
+#: ../data/ui/vcview.ui.h:30
+msgid "Log Message"
+msgstr "Sporočilo beleženja"
+
+#: ../data/ui/vcview.ui.h:31
+msgid "Previous logs:"
+msgstr "Predhodni dnevniki:"
+
+#: ../data/ui/vcview.ui.h:32
+msgid "Co_mmit"
+msgstr "_Uveljavi"
+
+#: ../data/ui/vcview.ui.h:33
+msgid "Push local commits to remote?"
+msgstr "Ali naj se objavijo krajevne uveljavitve v oddaljeno skladišče?"
+
+#: ../data/ui/vcview.ui.h:34
+msgid "The commits to be pushed are determined by your version control system."
+msgstr "Uveljavitve za objavo določa sistem za nadzor različic."
+
+#: ../data/ui/vcview.ui.h:35
+msgid "_Push commits"
+msgstr "_Objavi uveljavitve"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:361
+#: ../meld/dirdiff.py:342
 msgid "Size"
 msgstr "Velikost"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:369
+#: ../meld/dirdiff.py:350
 msgid "Modification time"
 msgstr "Čas spremembe"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:377
+#: ../meld/dirdiff.py:358
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: ../meld/dirdiff.py:511
+#: ../meld/dirdiff.py:492
 #, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:637 ../meld/dirdiff.py:656
+#: ../meld/dirdiff.py:618 ../meld/dirdiff.py:637
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:756
+#: ../meld/dirdiff.py:737
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] končano"
 
-#: ../meld/dirdiff.py:762
+#: ../meld/dirdiff.py:743
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je prišlo do več napak."
 
-#: ../meld/dirdiff.py:763
+#: ../meld/dirdiff.py:744
 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:765
+#: ../meld/dirdiff.py:746
 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:767
+#: ../meld/dirdiff.py:748
 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:769
+#: ../meld/dirdiff.py:750
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -657,17 +750,17 @@ msgstr ""
 "razlike velikosti upošteva. Nekatere datoteke so skrite:\n"
 "%s"
 
-#: ../meld/dirdiff.py:780
+#: ../meld/dirdiff.py:761
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:805 ../meld/filediff.py:1096 ../meld/filediff.py:1372
-#: ../meld/filediff.py:1405
+#: ../meld/dirdiff.py:786 ../meld/filediff.py:1095 ../meld/filediff.py:1381
+#: ../meld/filediff.py:1411 ../meld/filediff.py:1413
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/dirdiff.py:837
+#: ../meld/dirdiff.py:817
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -676,38 +769,29 @@ msgstr ""
 "'%s' že obstaja.\n"
 "Ali naj bo prepisana?"
 
-#: ../meld/dirdiff.py:844
+#: ../meld/dirdiff.py:825
+msgid "Error copying file"
+msgstr "Napaka kopiranja datoteke"
+
+#: ../meld/dirdiff.py:826
 #, python-format
 msgid ""
-"Error copying '%s' to '%s'\n"
+"Couldn't copy %s\n"
+"to %s.\n"
 "\n"
-"%s."
+"%s"
 msgstr ""
-"Napaka med kopiranjem '%s' v '%s'\n"
+"Ni mogoče kopirati %s\n"
+"v %s.\n"
 "\n"
-"%s."
+"%s"
 
-#: ../meld/dirdiff.py:862 ../meld/vcview.py:745
+#: ../meld/dirdiff.py:849
 #, python-format
-msgid ""
-"'%s' is a directory.\n"
-"Remove recursively?"
-msgstr ""
-"'%s' je mapa.\n"
-"Ali naj bo odstranjena vsa vsebina?"
+msgid "Error deleting %s"
+msgstr "Napaka med brisanjem %s"
 
-#: ../meld/dirdiff.py:869 ../meld/vcview.py:750
-#, python-format
-msgid ""
-"Error removing %s\n"
-"\n"
-"%s."
-msgstr ""
-"Napaka med odstranjevanjem %s\n"
-"\n"
-"%s."
-
-#: ../meld/dirdiff.py:1000
+#: ../meld/dirdiff.py:980
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -716,7 +800,7 @@ msgstr[1] "%i sekunda"
 msgstr[2] "%i sekundi"
 msgstr[3] "%i sekunde"
 
-#: ../meld/dirdiff.py:1001
+#: ../meld/dirdiff.py:981
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -725,7 +809,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuti"
 msgstr[3] "%i minute"
 
-#: ../meld/dirdiff.py:1002
+#: ../meld/dirdiff.py:982
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -734,7 +818,7 @@ msgstr[1] "%i ura"
 msgstr[2] "%i uri"
 msgstr[3] "%i ure"
 
-#: ../meld/dirdiff.py:1003
+#: ../meld/dirdiff.py:983
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -743,7 +827,7 @@ msgstr[1] "%i dan"
 msgstr[2] "%i dni"
 msgstr[3] "%i dni"
 
-#: ../meld/dirdiff.py:1004
+#: ../meld/dirdiff.py:984
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -752,7 +836,7 @@ msgstr[1] "%i teden"
 msgstr[2] "%i tedna"
 msgstr[3] "%i tedni"
 
-#: ../meld/dirdiff.py:1005
+#: ../meld/dirdiff.py:985
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -761,7 +845,7 @@ msgstr[1] "%i mesec"
 msgstr[2] "%i meseca"
 msgstr[3] "%i meseci"
 
-#: ../meld/dirdiff.py:1006
+#: ../meld/dirdiff.py:986
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -770,182 +854,182 @@ msgstr[1] "%i leto"
 msgstr[2] "%i leti"
 msgstr[3] "%i leta"
 
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:227
 msgid "Format as Patch..."
 msgstr "Oblikuj kot popravek ..."
 
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:228
 msgid "Create a patch using differences between files"
 msgstr "Ustvari popravek z razlikovanjem med datotekami"
 
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:230
 msgid "Save A_ll"
 msgstr "Shrani _vse"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:231
 msgid "Save all files in the current comparison"
 msgstr "Shrani vse datoteke trenutne primerjave"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:234
 msgid "Revert files to their saved versions"
 msgstr "Povrni datoteke na shranjene različice"
 
-#: ../meld/filediff.py:232
+#: ../meld/filediff.py:236
 msgid "Add Synchronization Point"
 msgstr "Dodaj točko usklajevanja"
 
-#: ../meld/filediff.py:233
+#: ../meld/filediff.py:237
 msgid "Add a manual point for synchronization of changes between files"
 msgstr "Dodaj ročno točko usklajevanja sprememb med datotekami"
 
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:240
 msgid "Clear Synchronization Points"
 msgstr "Počisti točke usklajevanja"
 
-#: ../meld/filediff.py:237
+#: ../meld/filediff.py:241
 msgid "Clear manual change sychronization points"
 msgstr "Počisti ročno spremenjene točke usklajevanja"
 
-#: ../meld/filediff.py:239
+#: ../meld/filediff.py:243
 msgid "Previous Conflict"
 msgstr "Predhodni spor"
 
-#: ../meld/filediff.py:240
+#: ../meld/filediff.py:244
 msgid "Go to the previous conflict"
 msgstr "Skoči na predhodni niz v sporu"
 
-#: ../meld/filediff.py:242
+#: ../meld/filediff.py:246
 msgid "Next Conflict"
 msgstr "Naslednji spor"
 
-#: ../meld/filediff.py:243
+#: ../meld/filediff.py:247
 msgid "Go to the next conflict"
 msgstr "Skoči na naslednji niz v sporu"
 
-#: ../meld/filediff.py:245
+#: ../meld/filediff.py:249
 msgid "Push to Left"
 msgstr "Potisni levo"
 
-#: ../meld/filediff.py:246
+#: ../meld/filediff.py:250
 msgid "Push current change to the left"
 msgstr "Potisni trenutne spremembe na levo"
 
-#: ../meld/filediff.py:249
+#: ../meld/filediff.py:253
 msgid "Push to Right"
 msgstr "Potisni desno"
 
-#: ../meld/filediff.py:250
+#: ../meld/filediff.py:254
 msgid "Push current change to the right"
 msgstr "Potisni trenutne spremembe na desno"
 
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:258
 msgid "Pull from Left"
 msgstr "Potegni z leve"
 
-#: ../meld/filediff.py:255
+#: ../meld/filediff.py:259
 msgid "Pull change from the left"
 msgstr "Potegni spremembe z leve"
 
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:262
 msgid "Pull from Right"
 msgstr "Potegni z desne"
 
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:263
 msgid "Pull change from the right"
 msgstr "Potegni spremembe z desne"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:265
 msgid "Copy Above Left"
 msgstr "Kopiraj nad levo"
 
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:266
 msgid "Copy change above the left chunk"
 msgstr "Kopiraj spremembe nad levi del"
 
-#: ../meld/filediff.py:264
+#: ../meld/filediff.py:268
 msgid "Copy Below Left"
 msgstr "Kopiraj pod levo"
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:269
 msgid "Copy change below the left chunk"
 msgstr "Kopiraj spremembe pod levi del"
 
-#: ../meld/filediff.py:267
+#: ../meld/filediff.py:271
 msgid "Copy Above Right"
 msgstr "Kopiraj nad desno"
 
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:272
 msgid "Copy change above the right chunk"
 msgstr "Kopiraj spremembe nad desni del"
 
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:274
 msgid "Copy Below Right"
 msgstr "Kopiraj pod desno"
 
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:275
 msgid "Copy change below the right chunk"
 msgstr "Kopiraj spremembe pod desni del"
 
-#: ../meld/filediff.py:273
+#: ../meld/filediff.py:277
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:278
 msgid "Delete change"
 msgstr "Izbriši spremembo"
 
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:280
 msgid "Merge All from Left"
 msgstr "Združi vse spremembe z leve"
 
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:281
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Združi vse spremembe brez sporov z leve"
 
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:283
 msgid "Merge All from Right"
 msgstr "Združi vse spremembe z desne"
 
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:284
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Združi vse spremembe brez sporov z desne"
 
-#: ../meld/filediff.py:282
+#: ../meld/filediff.py:286
 msgid "Merge All"
 msgstr "Združi vse"
 
-#: ../meld/filediff.py:283
+#: ../meld/filediff.py:287
 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:287
+#: ../meld/filediff.py:291
 msgid "Cycle Through Documents"
 msgstr "Preklopi med dokumenti"
 
-#: ../meld/filediff.py:288
+#: ../meld/filediff.py:292
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
 
-#: ../meld/filediff.py:294
+#: ../meld/filediff.py:298
 msgid "Lock Scrolling"
 msgstr "Zakleni drsenje"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:417
+#: ../meld/filediff.py:420
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:417
+#: ../meld/filediff.py:420
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:419
+#: ../meld/filediff.py:422
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:754
+#: ../meld/filediff.py:757
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -954,42 +1038,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:1084
+#: ../meld/filediff.py:1083
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Določi okna"
 
-#: ../meld/filediff.py:1090
+#: ../meld/filediff.py:1089
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:1114 ../meld/filediff.py:1124 ../meld/filediff.py:1137
-#: ../meld/filediff.py:1143
+#: ../meld/filediff.py:1112 ../meld/filediff.py:1122 ../meld/filediff.py:1135
+#: ../meld/filediff.py:1141
 msgid "Could not read file"
 msgstr "Ni mogoče prebrati datoteke"
 
-#: ../meld/filediff.py:1115
+#: ../meld/filediff.py:1113
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:1125
+#: ../meld/filediff.py:1123
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiška datoteka."
 
-#: ../meld/filediff.py:1138
+#: ../meld/filediff.py:1136
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:1172
+#: ../meld/filediff.py:1170
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Računanje razlik"
 
-#: ../meld/filediff.py:1359
+#: ../meld/filediff.py:1370
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -997,19 +1081,19 @@ msgstr ""
 "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
 "Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: ../meld/filediff.py:1365
+#: ../meld/filediff.py:1376
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1375
+#: ../meld/filediff.py:1384
 msgid "Show without filters"
 msgstr "Pokaži brez filtrov"
 
-#: ../meld/filediff.py:1397
+#: ../meld/filediff.py:1406
 msgid "Change highlighting incomplete"
 msgstr "Spremeni označevanje kot nedokončano"
 
-#: ../meld/filediff.py:1398
+#: ../meld/filediff.py:1407
 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."
@@ -1017,15 +1101,15 @@ msgstr ""
 "Nekaterih sprememb ni mogoče poudariti, ker so prevelike. Označevanje je "
 "mogoče vsiliti, vendar je postopek lahko zelo dolgotrajen."
 
-#: ../meld/filediff.py:1407
+#: ../meld/filediff.py:1415
 msgid "Keep highlighting"
 msgstr "Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1409
+#: ../meld/filediff.py:1417
 msgid "_Keep highlighting"
 msgstr "_Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1541
+#: ../meld/filediff.py:1549
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -1034,7 +1118,7 @@ msgstr ""
 "\"%s\" že obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1554
+#: ../meld/filediff.py:1562
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -1045,19 +1129,19 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1565
+#: ../meld/filediff.py:1573
 msgid "Save Left Pane As"
 msgstr "Shrani levi pladenj kot"
 
-#: ../meld/filediff.py:1567
+#: ../meld/filediff.py:1575
 msgid "Save Middle Pane As"
 msgstr "Shrani srednji pladenj kot"
 
-#: ../meld/filediff.py:1569
+#: ../meld/filediff.py:1577
 msgid "Save Right Pane As"
 msgstr "Shrani desni pladenj kot"
 
-#: ../meld/filediff.py:1590
+#: ../meld/filediff.py:1598
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -1068,7 +1152,7 @@ msgstr ""
 "\n"
 "Kateri zapis želite uporabiti?"
 
-#: ../meld/filediff.py:1606
+#: ../meld/filediff.py:1614
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -1077,11 +1161,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:1974
+#: ../meld/filediff.py:1982
 msgid "Live comparison updating disabled"
 msgstr "Živo posodabljanje ob primerjavi je onemogočeno"
 
-#: ../meld/filediff.py:1975
+#: ../meld/filediff.py:1983
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1440,7 +1524,7 @@ 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:172
+#: ../meld/misc.py:189
 msgid "[None]"
 msgstr "[noben]"
 
@@ -1521,172 +1605,76 @@ msgstr "Opomba skripta\t0\t#.*"
 msgid "Version control:"
 msgstr "Nadzor različic:"
 
-#: ../meld/vcview.py:161
-msgid "Compare selected files"
-msgstr "Primerjajo izbrane datoteke"
-
-#: ../meld/vcview.py:163
-msgid "Co_mmit..."
-msgstr "U_veljavi ..."
-
-#: ../meld/vcview.py:164
-msgid "Commit changes to version control"
-msgstr "Uveljavi spremembe v sistem za nadzor različic"
-
-#: ../meld/vcview.py:166
-msgid "_Update"
-msgstr "_Posodobi"
-
-#: ../meld/vcview.py:167
-msgid "Update working copy from version control"
-msgstr "Posodobi delovno kopijo preko nadzora različic"
-
-#: ../meld/vcview.py:169
-msgid "_Push"
-msgstr "_Objavi"
-
-#: ../meld/vcview.py:170
-msgid "Push local changes to remote"
-msgstr "Objavi spremembe v oddaljeno skladišče"
-
-#: ../meld/vcview.py:173
-msgid "Add to version control"
-msgstr "Dodaj v sistem nadzora različic"
-
-#: ../meld/vcview.py:176
-msgid "Remove from version control"
-msgstr "Odstrani iz sistema nadzora različic"
-
-#: ../meld/vcview.py:178
-msgid "Mar_k as Resolved"
-msgstr "Označi kot _razrešeno"
-
-#: ../meld/vcview.py:179
-msgid "Mark as resolved in version control"
-msgstr "Označi kot razrešeno v sistemu nadzora različic"
-
-#: ../meld/vcview.py:181
-msgid "Re_vert"
-msgstr "Po&vrni"
-
-#: ../meld/vcview.py:182
-msgid "Revert working copy to original state"
-msgstr "Povrni delovno kopijo na izvorno stanje"
-
-#: ../meld/vcview.py:185
-msgid "Delete from working copy"
-msgstr "Izbriši iz delovne kopije"
-
-#: ../meld/vcview.py:190
-msgid "_Flatten"
-msgstr "_Razpni"
-
-#: ../meld/vcview.py:191
-msgid "Flatten directories"
-msgstr "_Razpni mape"
-
-#: ../meld/vcview.py:193
-msgid "_Modified"
-msgstr "_Spremenjeno"
-
-#: ../meld/vcview.py:194
-msgid "Show modified files"
-msgstr "Pokaži spremenjene datoteke"
-
-#: ../meld/vcview.py:196
-msgid "_Normal"
-msgstr "_Običajno"
-
-#: ../meld/vcview.py:197
-msgid "Show normal files"
-msgstr "Pokaži običajne datoteke"
-
-#: ../meld/vcview.py:199
-msgid "Un_versioned"
-msgstr "Brez določene _različice"
-
-#: ../meld/vcview.py:200
-msgid "Show unversioned files"
-msgstr "Pokaži datoteke z nedoločenimi različicami"
-
-#: ../meld/vcview.py:202
-msgid "Ignored"
-msgstr "Prezrto"
-
-#: ../meld/vcview.py:203
-msgid "Show ignored files"
-msgstr "Pokaži prezrte datoteke"
-
-#: ../meld/vcview.py:262 ../meld/vcview.py:432
+#: ../meld/vcview.py:205 ../meld/vcview.py:363
 msgid "Location"
 msgstr "Mesto"
 
-#: ../meld/vcview.py:263
+#: ../meld/vcview.py:206
 msgid "Status"
 msgstr "Stanje"
 
-#: ../meld/vcview.py:264
+#: ../meld/vcview.py:207
 msgid "Revision"
 msgstr "Predelava"
 
-#: ../meld/vcview.py:265
+#: ../meld/vcview.py:208
 msgid "Options"
 msgstr "Možnosti"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:342
+#: ../meld/vcview.py:273
 #, python-format
 msgid "%s not installed"
 msgstr "Program %s ni nameščen"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:346
+#: ../meld/vcview.py:277
 msgid "Invalid repository"
 msgstr "Neveljavno skladišče"
 
-#: ../meld/vcview.py:355
+#: ../meld/vcview.py:286
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:357 ../meld/vcview.py:365
+#: ../meld/vcview.py:288 ../meld/vcview.py:296
 msgid "None"
 msgstr "Brez"
 
-#: ../meld/vcview.py:376
+#: ../meld/vcview.py:307
 msgid "No valid version control system found in this folder"
 msgstr "Ni veljavnega sistema za nadzor različic v tej mapi"
 
-#: ../meld/vcview.py:378
+#: ../meld/vcview.py:309
 msgid "Only one version control system found in this folder"
 msgstr "V tej mapi je le en sistem nadzora različic"
 
-#: ../meld/vcview.py:380
+#: ../meld/vcview.py:311
 msgid "Choose which version control system to use"
 msgstr "Izbor različice sistema za nadzor različic za uporabo"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:432
+#: ../meld/vcview.py:363
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:446 ../meld/vcview.py:454
+#: ../meld/vcview.py:377 ../meld/vcview.py:385
 #, python-format
 msgid "Scanning %s"
 msgstr "Preiskovanje %s"
 
-#: ../meld/vcview.py:487
+#: ../meld/vcview.py:418
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:709
+#: ../meld/vcview.py:638
 msgid "Remove folder and all its files?"
 msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
 
-#: ../meld/vcview.py:711
+#: ../meld/vcview.py:640
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -1694,14 +1682,14 @@ msgstr ""
 "S tem dejanjem bodo odstranjene vse izbrane datoteke in mape in vse "
 "podrejene datoteke iz sistema za nadzor različic"
 
-#: ../meld/ui/findbar.py:150
+#: ../meld/vcview.py:674
 #, python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr ""
-"Napaka v logičnem izrazu\n"
-"'%s'"
+msgid "Error removing %s"
+msgstr "Napaka med odstranjevanjem %s"
+
+#: ../meld/ui/findbar.py:143
+msgid "Regular expression error"
+msgstr "Napaka v logičnem izrazu"
 
 #: ../meld/ui/historyentry.py:381
 msgid "_Browse..."
@@ -1760,27 +1748,16 @@ msgstr ""
 "Prezrto:Nedoločeno:::Napaka::Novo dodano:Spremenjeno:V sporu:Odstranjeno:"
 "Manjkajoče:Nedostopno"
 
-#: ../meld/vc/cvs.py:231
-#, python-format
-msgid ""
-"Error converting to a regular expression\n"
-"The pattern was '%s'\n"
-"The error was '%s'"
-msgstr ""
-"Napaka med pretvarjanjem logičnega izraza\n"
-"Določen je bil vzorec '%s'\n"
-"Javljena napaka je '%s'"
-
 #. Translators: First %s is replaced by translated "%d unpushed
 #. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:120
+#: ../meld/vc/git.py:126
 #, python-format
 msgid "%s in %s"
 msgstr "%s v %s"
 
 #. Translators: These messages cover the case where there is
 #. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:121 ../meld/vc/git.py:128
+#: ../meld/vc/git.py:127 ../meld/vc/git.py:134
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -1789,7 +1766,7 @@ msgstr[1] "%d neobjavljena uveljavitev"
 msgstr[2] "%d neobjavljeni uveljavitvi"
 msgstr[3] "%d neobjavljene uveljavitve"
 
-#: ../meld/vc/git.py:123
+#: ../meld/vc/git.py:129
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
@@ -1798,11 +1775,30 @@ msgstr[1] "%d veja"
 msgstr[2] "%d veji"
 msgstr[3] "%d veje"
 
-#: ../meld/vc/git.py:333
+#: ../meld/vc/git.py:341
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Način je spremenjen iz %s v %s"
 
+#~ msgid "Compare selected"
+#~ msgstr "Primerjaj izbrano"
+
+#~ msgid ""
+#~ "'%s' is a directory.\n"
+#~ "Remove recursively?"
+#~ msgstr ""
+#~ "'%s' je mapa.\n"
+#~ "Ali naj bo odstranjena vsa vsebina?"
+
+#~ msgid ""
+#~ "Error converting to a regular expression\n"
+#~ "The pattern was '%s'\n"
+#~ "The error was '%s'"
+#~ msgstr ""
+#~ "Napaka med pretvarjanjem logičnega izraza\n"
+#~ "Določen je bil vzorec '%s'\n"
+#~ "Javljena napaka je '%s'"
+
 #~ msgid "[%s] Fetching differences"
 #~ msgstr "[%s] Iskanje razlik"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]