[meld] Updated Slovenian translation

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

commit 792613efd46a2c806db4a7bffd7a61390d3b7913
Author: Matej UrbanÄ?iÄ? <mateju svn gnome org>
Date:   Sat Dec 11 20:23:55 2010 +0100

    Updated Slovenian translation

 po/sl.po |  103 ++++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 67 insertions(+), 36 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 1900c31..8e82095 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&component=general\n";
-"POT-Creation-Date: 2010-11-26 21:33+0000\n"
-"PO-Revision-Date: 2010-12-03 19:54+0100\n"
+"POT-Creation-Date: 2010-12-11 17:28+0000\n"
+"PO-Revision-Date: 2010-12-11 20: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: \n"
@@ -120,42 +120,73 @@ msgstr ""
 msgid "Directory"
 msgstr "Mapa"
 
-#: ../data/ui/meldapp.ui.h:6
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:7
 msgid "Mine"
 msgstr "Lastno"
 
-#: ../data/ui/meldapp.ui.h:7
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:9
 msgid "Original"
 msgstr "Izvorno"
 
-#: ../data/ui/meldapp.ui.h:8
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:11
 msgid "Other"
 msgstr "Drugo"
 
-#: ../data/ui/meldapp.ui.h:9
+#: ../data/ui/meldapp.ui.h:12
 msgid "Select VC Directory"
 msgstr "Izbor VC mape"
 
-#: ../data/ui/meldapp.ui.h:10
+#: ../data/ui/meldapp.ui.h:13
 msgid "_Directory Comparison"
 msgstr "_Primerjava vsebine map"
 
-#: ../data/ui/meldapp.ui.h:11
+#: ../data/ui/meldapp.ui.h:14
 msgid "_File Comparison"
 msgstr "_Primerjava datotek"
 
-#: ../data/ui/meldapp.ui.h:12
+#: ../data/ui/meldapp.ui.h:15
 msgid "_Three Way Compare"
 msgstr "_Trojna primerjava"
 
-#: ../data/ui/meldapp.ui.h:13
+#: ../data/ui/meldapp.ui.h:16
 msgid "_Version Control Browser"
 msgstr "_Brskalnik po nadzoru razliÄ?ic"
 
-#: ../data/ui/meldapp.ui.h:14
+#: ../data/ui/meldapp.ui.h:17
 msgid "translator-credits"
 msgstr "Matej UrbanÄ?iÄ? <mateju svn gnome org>"
 
+#: ../data/ui/patch-dialog.ui.h:1
+msgid "Copy to Clipboard"
+msgstr "Kopiraj v odložiÅ¡Ä?e"
+
+#: ../data/ui/patch-dialog.ui.h:2
+msgid "Create Patch"
+msgstr "Ustvari popravek"
+
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Create a patch"
+msgstr "Ustvari programski popravek"
+
+#: ../data/ui/patch-dialog.ui.h:4
+msgid "Left and middle panes"
+msgstr "Levi in srednji pladenj"
+
+#: ../data/ui/patch-dialog.ui.h:5
+msgid "Middle and right panes"
+msgstr "Srednji in desni pladenj"
+
+#: ../data/ui/patch-dialog.ui.h:6
+msgid "Use differences between:"
+msgstr "Uporabi razlike med:"
+
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "_Reverse patch direction"
+msgstr "Obrni smer popravka"
+
 #: ../data/ui/preferences.ui.h:1
 msgid "Display"
 msgstr "Prikaz"
@@ -324,7 +355,7 @@ msgid "Delete selected"
 msgstr "Izbriši izbor"
 
 #: ../meld/dirdiff.py:146
-#: ../meld/filediff.py:957
+#: ../meld/filediff.py:962
 msgid "Hide"
 msgstr "Skrij"
 
@@ -668,54 +699,54 @@ msgstr "Po dejanju logiÄ?nega izraza '%s' se je spremenilo Å¡tevilo vrstic v dat
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: ../meld/filediff.py:823
+#: ../meld/filediff.py:828
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] DoloÄ?i okna"
 
-#: ../meld/filediff.py:829
+#: ../meld/filediff.py:834
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:835
-#: ../meld/filediff.py:961
+#: ../meld/filediff.py:840
+#: ../meld/filediff.py:966
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/filediff.py:856
-#: ../meld/filediff.py:865
-#: ../meld/filediff.py:877
-#: ../meld/filediff.py:883
+#: ../meld/filediff.py:861
+#: ../meld/filediff.py:870
+#: ../meld/filediff.py:882
+#: ../meld/filediff.py:888
 msgid "Could not read file"
 msgstr "Ni mogoÄ?e prebrati datoteke"
 
-#: ../meld/filediff.py:857
+#: ../meld/filediff.py:862
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:866
+#: ../meld/filediff.py:871
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiška datoteka."
 
-#: ../meld/filediff.py:878
+#: ../meld/filediff.py:883
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:908
+#: ../meld/filediff.py:913
 #: ../meld/filemerge.py:69
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] RaÄ?unanje razlik"
 
-#: ../meld/filediff.py:955
+#: ../meld/filediff.py:960
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1090
+#: ../meld/filediff.py:1095
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -724,7 +755,7 @@ msgstr ""
 "\"%s\" že obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1103
+#: ../meld/filediff.py:1108
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -735,12 +766,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1112
+#: ../meld/filediff.py:1117
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:1127
+#: ../meld/filediff.py:1132
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -751,7 +782,7 @@ msgstr ""
 "\n"
 "Kateri zapis želite uporabiti?"
 
-#: ../meld/filediff.py:1143
+#: ../meld/filediff.py:1148
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -760,7 +791,7 @@ 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:1200
+#: ../meld/filediff.py:1207
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -1004,10 +1035,14 @@ msgid "Automatically compare all differing files on startup"
 msgstr "Ob zagonu samodejno primerjaj vse razliÄ?ne datoteke."
 
 #: ../meld/meldapp.py:619
+msgid "Set the target file for saving a merge result"
+msgstr "DoloÄ?itev ciljne datoteke za shranjevanje rezultatov združevanja."
+
+#: ../meld/meldapp.py:622
 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:622
+#: ../meld/meldapp.py:625
 #, python-format
 msgid "too many arguments (wanted 0-4, got %d)"
 msgstr "preveÄ? argumentov (zahtevanih 0-4, prejetih %d)"
@@ -1384,10 +1419,6 @@ msgstr ""
 "DoloÄ?en je bil vzorec '%s'\n"
 "Javljena napaka je '%s'"
 
-#~ msgid "Copy to Clipboard"
-#~ msgstr "Kopiraj v odložiÅ¡Ä?e"
-#~ msgid "Create Patch"
-#~ msgstr "Ustvari popravek"
 #~ msgid "Three way directory"
 #~ msgstr "Trojni pogled map"
 #~ msgid "Three way file"