GNOME.org
 

[meld] Updated Slovenian translation

commit 6c6fe55f7d3d4345b0905e45bc9dc3be206e2e1a
Author: Matej UrbanÄiÄ <mateju svn gnome org>
Date:   Wed Sep 26 08:38:07 2012 +0200

    Updated Slovenian translation

 po/sl.po |  125 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 67 insertions(+), 58 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 0470cdd..758fd55 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&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2012-09-06 16:28+0000\n"
-"PO-Revision-Date: 2012-09-06 22:01+0100\n"
+"POT-Creation-Date: 2012-09-25 22:25+0000\n"
+"PO-Revision-Date: 2012-09-26 08:30+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"
@@ -173,9 +173,9 @@ msgid ""
 msgstr ""
 "Meld je prosta programska oprema; lahko jo razÅirjate in/ali spreminjate pod pogoji SploÅnega javnega dovoljenja GNU (GNU General Public License), kot ga je objavila ustanova Free Software Foundation; bodisi razliÄice 2 ali (po vaÅi izbiri) katerekoli poznejÅe razliÄice.\n"
 "\n"
-"Program Meld se razÅirja v upanju, da bo uporaben, vendar BREZ VSAKRÅNEGA JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA DOLOÄEN NAMEN.  Za podrobnosti glejte besedilo Javnega dovoljenja GNU.\n"
+"Program Meld se razÅirja v upanju, da bo uporaben, vendar BREZ VSAKRÅNEGA JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA DOLOÄEN NAMEN. Za podrobnosti glejte besedilo Javnega dovoljenja GNU.\n"
 "\n"
-"Skupaj s programom bi morali prejeti izvod sploÅne javne licence GNU (GNU General Public License); Äe ga niste si oglejte spletno stran <http://www.gnu.org/licenses/>."
+"Skupaj s programom bi morali prejeti izvod sploÅnega javnega dovoljenja GNU (GNU General Public License); Äe ga niste si oglejte spletno stran <http://www.gnu.org/licenses/>."
 
 #: ../data/ui/meldapp.ui.h:9
 msgid "translator-credits"
@@ -399,7 +399,7 @@ msgid "Delete selected"
 msgstr "IzbriÅi izbor"
 
 #: ../meld/dirdiff.py:233
-#: ../meld/filediff.py:1101
+#: ../meld/filediff.py:1103
 msgid "Hide"
 msgstr "Skrij"
 
@@ -454,54 +454,54 @@ msgid "Hide %s"
 msgstr "Skrij %s"
 
 #: ../meld/dirdiff.py:502
-#: ../meld/dirdiff.py:515
+#: ../meld/dirdiff.py:521
 #: ../meld/vcview.py:329
 #: ../meld/vcview.py:353
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:614
+#: ../meld/dirdiff.py:620
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] konÄano"
 
-#: ../meld/dirdiff.py:618
+#: ../meld/dirdiff.py:624
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je priÅlo do veÄ napak."
 
-#: ../meld/dirdiff.py:619
+#: ../meld/dirdiff.py:625
 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:621
+#: ../meld/dirdiff.py:627
 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:623
+#: ../meld/dirdiff.py:629
 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:625
+#: ../meld/dirdiff.py:631
 msgid "You are running a case insensitive comparison on a case sensitive filesystem. The following files in this folder are hidden:"
 msgstr ""
 "Zagnan je naÄin primerjave brez upoÅtevanja velikosti Ärk na sistemu, ki razlike velikosti upoÅteva. Nekatere datoteke so skrite:\n"
 "%s"
 
-#: ../meld/dirdiff.py:636
+#: ../meld/dirdiff.py:642
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:661
-#: ../meld/filediff.py:937
-#: ../meld/filediff.py:1105
+#: ../meld/dirdiff.py:667
+#: ../meld/filediff.py:940
+#: ../meld/filediff.py:1107
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/dirdiff.py:711
+#: ../meld/dirdiff.py:717
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -510,7 +510,7 @@ msgstr ""
 "'%s' Åe obstaja.\n"
 "Ali naj bo prepisana?"
 
-#: ../meld/dirdiff.py:718
+#: ../meld/dirdiff.py:724
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -521,7 +521,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:736
+#: ../meld/dirdiff.py:742
 #: ../meld/vcview.py:542
 #, python-format
 msgid ""
@@ -531,7 +531,7 @@ msgstr ""
 "'%s' je mapa.\n"
 "Ali naj bo odstranjena vsa vsebina?"
 
-#: ../meld/dirdiff.py:743
+#: ../meld/dirdiff.py:749
 #: ../meld/vcview.py:547
 #, python-format
 msgid ""
@@ -543,7 +543,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:826
+#: ../meld/dirdiff.py:832
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -552,7 +552,7 @@ msgstr[1] "%i sekunda"
 msgstr[2] "%i sekundi"
 msgstr[3] "%i sekunde"
 
-#: ../meld/dirdiff.py:827
+#: ../meld/dirdiff.py:833
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -561,7 +561,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuti"
 msgstr[3] "%i minute"
 
-#: ../meld/dirdiff.py:828
+#: ../meld/dirdiff.py:834
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -570,7 +570,7 @@ msgstr[1] "%i ura"
 msgstr[2] "%i uri"
 msgstr[3] "%i ure"
 
-#: ../meld/dirdiff.py:829
+#: ../meld/dirdiff.py:835
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -579,7 +579,7 @@ msgstr[1] "%i dan"
 msgstr[2] "%i dni"
 msgstr[3] "%i dni"
 
-#: ../meld/dirdiff.py:830
+#: ../meld/dirdiff.py:836
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -588,7 +588,7 @@ msgstr[1] "%i teden"
 msgstr[2] "%i tedna"
 msgstr[3] "%i tedni"
 
-#: ../meld/dirdiff.py:831
+#: ../meld/dirdiff.py:837
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -597,7 +597,7 @@ msgstr[1] "%i mesec"
 msgstr[2] "%i meseca"
 msgstr[3] "%i meseci"
 
-#: ../meld/dirdiff.py:832
+#: ../meld/dirdiff.py:838
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -763,57 +763,56 @@ msgstr "Vr. %i, St. %i"
 msgid "Filter '%s' changed the number of lines in the file. Comparison will be incorrect. See the user manual for more details."
 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:925
+#: ../meld/filediff.py:928
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] DoloÄi okna"
 
-#: ../meld/filediff.py:931
+#: ../meld/filediff.py:934
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:955
-#: ../meld/filediff.py:965
-#: ../meld/filediff.py:978
-#: ../meld/filediff.py:984
+#: ../meld/filediff.py:958
+#: ../meld/filediff.py:968
+#: ../meld/filediff.py:981
+#: ../meld/filediff.py:987
 msgid "Could not read file"
 msgstr "Ni mogoÄe prebrati datoteke"
 
-#: ../meld/filediff.py:956
+#: ../meld/filediff.py:959
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:966
+#: ../meld/filediff.py:969
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiÅka datoteka."
 
-#: ../meld/filediff.py:979
+#: ../meld/filediff.py:982
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:1010
-#: ../meld/filemerge.py:67
+#: ../meld/filediff.py:1013
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] RaÄunanje razlik"
 
-#: ../meld/filediff.py:1092
+#: ../meld/filediff.py:1094
 msgid "Text filters are being used, and may be masking differences between files. Would you like to compare the unfiltered files?"
 msgstr "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: ../meld/filediff.py:1098
+#: ../meld/filediff.py:1100
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1108
+#: ../meld/filediff.py:1110
 msgid "Show without filters"
 msgstr "PokaÅi brez filtrov"
 
-#: ../meld/filediff.py:1298
+#: ../meld/filediff.py:1303
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -822,7 +821,7 @@ msgstr ""
 "\"%s\" Åe obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1311
+#: ../meld/filediff.py:1316
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -833,12 +832,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1320
+#: ../meld/filediff.py:1325
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:1335
+#: ../meld/filediff.py:1340
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -849,7 +848,7 @@ msgstr ""
 "\n"
 "Kateri zapis Åelite uporabiti?"
 
-#: ../meld/filediff.py:1351
+#: ../meld/filediff.py:1356
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -858,7 +857,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:1408
+#: ../meld/filediff.py:1413
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -871,7 +870,7 @@ msgstr ""
 "\n"
 "Dejanja ni mogoÄe povrniti."
 
-#: ../meld/filemerge.py:82
+#: ../meld/filemerge.py:47
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] ZdruÅevanje datotek"
@@ -936,21 +935,28 @@ msgstr "Prezrto zaradi skladnosti"
 msgid "Set the target file for saving a merge result"
 msgstr "DoloÄitev ciljne datoteke za shranjevanje rezultatov zdruÅevanja."
 
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:180
+msgid "Automatically merge files"
+msgstr "Samodejno zdruÅi datoteke"
+
+#: ../meld/meldapp.py:183
 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:184
+#: ../meld/meldapp.py:186
 #, python-format
-msgid "too many arguments (wanted 0-4, got %d)"
-msgstr "preveÄ argumentov (zahtevanih 0-4, prejetih %d)"
+msgid "too many arguments (wanted 0-3, got %d)"
+msgstr "preveÄ argumentov (zahtevanih 0-3, prejetih %d)"
 
-#: ../meld/meldapp.py:186
-#: ../meld/meldapp.py:199
-msgid "can't compare more than three directories"
-msgstr "ni mogoÄe primerjati veÄ kot treh map"
+#: ../meld/meldapp.py:188
+msgid "can't auto-merge less than 3 files"
+msgstr "manj kot treh datotek ni mogoÄe samodejno zdruÅevati"
 
-#: ../meld/meldapp.py:192
+#: ../meld/meldapp.py:190
+msgid "can't auto-merge directories"
+msgstr "map ni mogoÄe samodejno zdruÅevati"
+
+#: ../meld/meldapp.py:196
 msgid "D-Bus error; comparisons will open in a new window."
 msgstr "Napaka vodila D-Bus; primerjave se odprejo v novem oknu."
 
@@ -1193,7 +1199,7 @@ msgid "Switch to this tab"
 msgstr "Preklopi na ta zavihek"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:665
+#: ../meld/meldwindow.py:669
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Ni mogoÄe primerjati meÅanice datotek in map.\n"
 
@@ -1535,6 +1541,9 @@ msgstr ""
 "DoloÄen je bil vzorec '%s'\n"
 "Javljena napaka je '%s'"
 
+#~ msgid "can't compare more than three directories"
+#~ msgstr "ni mogoÄe primerjati veÄ kot treh map"
+
 #~ msgid "Case"
 #~ msgstr "Ärke"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]