[meld] Updated Slovenian translation

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

commit 77836c470910291634d31df56086f78d5ee38cd4
Author: Martin Srebotnjak <miles filmsi net>
Date:   Thu May 16 22:26:48 2013 +0200

    Updated Slovenian translation

 po/sl.po |  150 +++++++++++++++++++++++--------------------------------------
 1 files changed, 57 insertions(+), 93 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index e6c3748..6dd1d9b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,15 +9,16 @@ 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-05-03 23:13+0000\n"
-"PO-Revision-Date: 2013-05-04 20:51+0100\n"
+"POT-Creation-Date: 2013-05-08 20:33+0000\n"
+"PO-Revision-Date: 2013-05-16 22:22+0100\n"
 "Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
 "Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.5.4\n"
 
@@ -394,7 +395,7 @@ msgstr ""
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:666
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:668
 msgid "New comparison"
 msgstr "Nova primerjava"
 
@@ -498,7 +499,7 @@ msgstr "Kopiraj na desno"
 msgid "Delete selected"
 msgstr "Izbriši izbor"
 
-#: ../meld/dirdiff.py:273 ../meld/filediff.py:1338 ../meld/filediff.py:1373
+#: ../meld/dirdiff.py:273 ../meld/filediff.py:1346 ../meld/filediff.py:1381
 msgid "Hide"
 msgstr "Skrij"
 
@@ -570,8 +571,8 @@ msgstr "Dovoljenja"
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:636 ../meld/dirdiff.py:655 ../meld/vcview.py:474
-#: ../meld/vcview.py:498
+#: ../meld/dirdiff.py:636 ../meld/dirdiff.py:655 ../meld/vcview.py:482
+#: ../meld/vcview.py:506
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
@@ -614,8 +615,8 @@ msgstr ""
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:804 ../meld/filediff.py:1074 ../meld/filediff.py:1342
-#: ../meld/filediff.py:1375 ../meld/vcview.py:778 ../meld/vcview.py:820
+#: ../meld/dirdiff.py:804 ../meld/filediff.py:1074 ../meld/filediff.py:1350
+#: ../meld/filediff.py:1383 ../meld/vcview.py:786 ../meld/vcview.py:828
 msgid "Hi_de"
 msgstr "S_krij"
 
@@ -639,7 +640,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:861 ../meld/vcview.py:752
+#: ../meld/dirdiff.py:861 ../meld/vcview.py:760
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -648,7 +649,7 @@ msgstr ""
 "'%s' je mapa.\n"
 "Ali naj bo odstranjena vsa vsebina?"
 
-#: ../meld/dirdiff.py:868 ../meld/vcview.py:757
+#: ../meld/dirdiff.py:868 ../meld/vcview.py:765
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -941,7 +942,7 @@ msgstr "%s ni zapisan v naboru: %s"
 msgid "[%s] Computing differences"
 msgstr "[%s] Računanje razlik"
 
-#: ../meld/filediff.py:1329
+#: ../meld/filediff.py:1337
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -949,19 +950,19 @@ msgstr ""
 "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
 "Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: ../meld/filediff.py:1335
+#: ../meld/filediff.py:1343
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1345
+#: ../meld/filediff.py:1353
 msgid "Show without filters"
 msgstr "Pokaži brez filtrov"
 
-#: ../meld/filediff.py:1367
+#: ../meld/filediff.py:1375
 msgid "Change highlighting incomplete"
 msgstr "Spremeni označevanje kot nedokončano"
 
-#: ../meld/filediff.py:1368
+#: ../meld/filediff.py:1376
 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."
@@ -969,15 +970,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:1377
+#: ../meld/filediff.py:1385
 msgid "Keep highlighting"
 msgstr "Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1379
+#: ../meld/filediff.py:1387
 msgid "_Keep highlighting"
 msgstr "_Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1505
+#: ../meld/filediff.py:1513
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -986,7 +987,7 @@ msgstr ""
 "\"%s\" že obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1518
+#: ../meld/filediff.py:1526
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -997,19 +998,19 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1529
+#: ../meld/filediff.py:1537
 msgid "Save Left Pane As"
 msgstr "Shrani levi pladenj kot"
 
-#: ../meld/filediff.py:1531
+#: ../meld/filediff.py:1539
 msgid "Save Middle Pane As"
 msgstr "Shrani srednji pladenj kot"
 
-#: ../meld/filediff.py:1533
+#: ../meld/filediff.py:1541
 msgid "Save Right Pane As"
 msgstr "Shrani desni pladenj kot"
 
-#: ../meld/filediff.py:1554
+#: ../meld/filediff.py:1562
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -1020,7 +1021,7 @@ msgstr ""
 "\n"
 "Kateri zapis želite uporabiti?"
 
-#: ../meld/filediff.py:1570
+#: ../meld/filediff.py:1578
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -1337,12 +1338,14 @@ msgid "About this program"
 msgstr "O programu"
 
 #: ../meld/meldwindow.py:157
-msgid "Full Screen"
+#| msgid "Full Screen"
+msgid "Fullscreen"
 msgstr "Celozaslonski način"
 
 #: ../meld/meldwindow.py:158
-msgid "View the comparison in full screen"
-msgstr "Ogled primerjave v celozaslonskem načinu"
+#| msgid "View the comparison in full screen"
+msgid "View the comparison in fullscreen"
+msgstr "Pokaži primerjavo v celozaslonskem načinu"
 
 #: ../meld/meldwindow.py:160
 msgid "_Toolbar"
@@ -1368,12 +1371,12 @@ msgstr "Odpri nedavno"
 msgid "Open recent files"
 msgstr "Odpri nedavne datoteke"
 
-#: ../meld/meldwindow.py:586
+#: ../meld/meldwindow.py:588
 msgid "Switch to this tab"
 msgstr "Preklopi na ta zavihek"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:719
+#: ../meld/meldwindow.py:721
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Ni mogoče primerjati mešanice datotek in map.\n"
 
@@ -1559,7 +1562,7 @@ msgstr "Prezrto"
 msgid "Show ignored files"
 msgstr "Pokaži prezrte datoteke"
 
-#: ../meld/vcview.py:321 ../meld/vcview.py:470
+#: ../meld/vcview.py:321 ../meld/vcview.py:478
 msgid "Location"
 msgstr "Mesto"
 
@@ -1610,30 +1613,30 @@ 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:470
+#: ../meld/vcview.py:478
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:513
+#: ../meld/vcview.py:521
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:545
+#: ../meld/vcview.py:553
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Iskanje razlik"
 
-#: ../meld/vcview.py:558
+#: ../meld/vcview.py:566
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Pripenjanje popravka"
 
-#: ../meld/vcview.py:771
+#: ../meld/vcview.py:779
 msgid "Patch tool not found"
 msgstr "Orodja za uveljavljanje popravkov ni mogoče najti"
 
-#: ../meld/vcview.py:772
+#: ../meld/vcview.py:780
 #, python-format
 msgid ""
 "Meld needs the <i>patch</i> tool to be installed to perform comparisons in "
@@ -1643,11 +1646,11 @@ msgstr ""
 "popravkov pri izvajanju primerjav v skladiščih %s. Namestite orodje "
 "<i>patch</i> in poskusite znova."
 
-#: ../meld/vcview.py:812
+#: ../meld/vcview.py:820
 msgid "Error fetching original comparison file"
 msgstr "Napaka pridobivanja izvorne datoteke za primerjavo"
 
-#: ../meld/vcview.py:813
+#: ../meld/vcview.py:821
 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 "
@@ -1657,7 +1660,7 @@ msgstr ""
 "uporabljate najnovejšo različico programa, pošljite poročilo o hrošču s čim "
 "več podrobnostmi."
 
-#: ../meld/vcview.py:821
+#: ../meld/vcview.py:829
 msgid "Report a bug"
 msgstr "Pošlji poročilo o hrošču"
 
@@ -1738,59 +1741,20 @@ msgstr ""
 "Določen je bil vzorec '%s'\n"
 "Javljena napaka je '%s'"
 
-#: ../meld/vc/git.py:274
+#: ../meld/vc/git.py:108
+#, python-format
+msgid "Unpushed commits found: %d in %d branch"
+msgid_plural "Unpushed commits found: %d in %d branches"
+msgstr[0] "Najdene nepotisnjene uveljavitve: %d v %d vejah"
+msgstr[1] "Najdene nepotisnjene uveljavitve: %d v %d veji"
+msgstr[2] "Najdene nepotisnjene uveljavitve: %d v %d vejah"
+msgstr[3] "Najdene nepotisnjene uveljavitve: %d v %d vejah"
+
+#: ../meld/vc/git.py:112
+msgid "No unpushed commits found"
+msgstr "Nepotisnjenih uveljavitev ni mogoče najti"
+
+#: ../meld/vc/git.py:308
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Način je spremenjen iz %s v %s"
-
-#~ msgid "Create Patch"
-#~ msgstr "Ustvari popravek"
-
-#~ msgid "Create a patch"
-#~ msgstr "Ustvari programski popravek"
-
-#~ msgid "VC Log"
-#~ msgstr "VC dnevnik"
-
-#~ msgid "Merge All Non-conflicting"
-#~ msgstr "Združi vse spremembe brez sporov"
-
-#~ msgid "Choose a name for buffer %i."
-#~ msgstr "Izbor imena za medpomnilnik %i."
-
-#~ msgid "Save changes to documents before reloading?"
-#~ msgstr ""
-#~ "Ali naj bodo spremembe v dokumentu shranjene pred ponovnim nalaganjem?"
-
-#~ msgid "Reload"
-#~ msgstr "Ponovno naloži"
-
-#~ msgid "Reload the comparison"
-#~ msgstr "Ponovno naloži primerjavo"
-
-#~ msgid "Update"
-#~ msgstr "Posodobi"
-
-#~ msgid "Add to VC"
-#~ msgstr "Dodaj v VC"
-
-#~ msgid "Remove from VC"
-#~ msgstr "Odstrani iz VC"
-
-#~ msgid "_Resolved"
-#~ msgstr "_Razrešeno"
-
-#~ msgid "Delete locally"
-#~ msgstr "Izbriši krajevno"
-
-#~ msgid "Show normal"
-#~ msgstr "Pokaži običajno"
-
-#~ msgid "Non _VC"
-#~ msgstr "Ni _VC"
-
-#~ msgid "Rev"
-#~ msgstr "Rev"
-
-#~ msgid "File filters"
-#~ msgstr "Filtri datotek"