GNOME.org
 

[meld] Updated Slovenian translation

commit 6b97d0c37634f5f2cba37a7aea5848c315d74090
Author: Matej UrbanÄiÄ <mateju svn gnome org>
Date:   Wed Aug 29 08:55:20 2012 +0200

    Updated Slovenian translation

 po/sl.po |  205 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 107 insertions(+), 98 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 6d287f3..f831297 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-06-17 19:14+0000\n"
-"PO-Revision-Date: 2012-06-17 21:23+0100\n"
+"POT-Creation-Date: 2012-08-27 21:51+0000\n"
+"PO-Revision-Date: 2012-08-29 08:53+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"
@@ -164,49 +164,58 @@ msgstr ""
 "Avtorske pravice &#xA9; 2009-2012 Kai Willadsen"
 
 #: ../data/ui/meldapp.ui.h:4
+msgid ""
+"Meld is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version.\n"
+"\n"
+"Meld is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details. \n"
+"\n"
+"You should have received a copy of the GNU General Public License along with this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: ../data/ui/meldapp.ui.h:9
 msgid "translator-credits"
 msgstr "Matej UrbanÄiÄ <mateju svn gnome org>"
 
-#: ../data/ui/meldapp.ui.h:5
+#: ../data/ui/meldapp.ui.h:10
 msgid "Choose Files"
 msgstr "Izbor datotek"
 
-#: ../data/ui/meldapp.ui.h:6
+#: ../data/ui/meldapp.ui.h:11
 msgid "_Three Way Compare"
 msgstr "_Trojna primerjava"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:8
+#: ../data/ui/meldapp.ui.h:13
 msgid "Mine"
 msgstr "Lastno"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:10
+#: ../data/ui/meldapp.ui.h:15
 msgid "Original"
 msgstr "Izvorno"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:12
+#: ../data/ui/meldapp.ui.h:17
 msgid "Other"
 msgstr "Drugo"
 
-#: ../data/ui/meldapp.ui.h:13
+#: ../data/ui/meldapp.ui.h:18
 msgid "_File Comparison"
 msgstr "_Primerjava datotek"
 
-#: ../data/ui/meldapp.ui.h:14
+#: ../data/ui/meldapp.ui.h:19
 msgid "_Directory Comparison"
 msgstr "_Primerjava vsebine map"
 
-#: ../data/ui/meldapp.ui.h:15
+#: ../data/ui/meldapp.ui.h:20
 msgid "Select VC Directory"
 msgstr "Izbor VC mape"
 
-#: ../data/ui/meldapp.ui.h:16
+#: ../data/ui/meldapp.ui.h:21
 msgid "Directory"
 msgstr "Mapa"
 
-#: ../data/ui/meldapp.ui.h:17
+#: ../data/ui/meldapp.ui.h:22
 msgid "_Version Control Browser"
 msgstr "_Brskalnik po nadzoru razliÄic"
 
@@ -385,7 +394,7 @@ msgid "Delete selected"
 msgstr "IzbriÅi izbor"
 
 #: ../meld/dirdiff.py:234
-#: ../meld/filediff.py:1078
+#: ../meld/filediff.py:1083
 msgid "Hide"
 msgstr "Skrij"
 
@@ -434,60 +443,60 @@ msgstr "Filtri"
 msgid "Set active filters"
 msgstr "DoloÄi dejavne filtre"
 
-#: ../meld/dirdiff.py:360
+#: ../meld/dirdiff.py:363
 #, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:464
-#: ../meld/dirdiff.py:477
+#: ../meld/dirdiff.py:467
+#: ../meld/dirdiff.py:480
 #: ../meld/vcview.py:323
 #: ../meld/vcview.py:347
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:576
+#: ../meld/dirdiff.py:579
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] konÄano"
 
-#: ../meld/dirdiff.py:580
+#: ../meld/dirdiff.py:583
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je priÅlo do veÄ napak."
 
-#: ../meld/dirdiff.py:581
+#: ../meld/dirdiff.py:584
 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:583
+#: ../meld/dirdiff.py:586
 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:585
+#: ../meld/dirdiff.py:588
 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:587
+#: ../meld/dirdiff.py:590
 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:598
+#: ../meld/dirdiff.py:601
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:623
-#: ../meld/filediff.py:921
-#: ../meld/filediff.py:1082
+#: ../meld/dirdiff.py:626
+#: ../meld/filediff.py:925
+#: ../meld/filediff.py:1087
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/dirdiff.py:673
+#: ../meld/dirdiff.py:676
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -496,7 +505,7 @@ msgstr ""
 "'%s' Åe obstaja.\n"
 "Ali naj bo prepisana?"
 
-#: ../meld/dirdiff.py:680
+#: ../meld/dirdiff.py:683
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -507,7 +516,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:698
+#: ../meld/dirdiff.py:701
 #: ../meld/vcview.py:536
 #, python-format
 msgid ""
@@ -517,7 +526,7 @@ msgstr ""
 "'%s' je mapa.\n"
 "Ali naj bo odstranjena vsa vsebina?"
 
-#: ../meld/dirdiff.py:705
+#: ../meld/dirdiff.py:708
 #: ../meld/vcview.py:541
 #, python-format
 msgid ""
@@ -529,7 +538,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:739
+#: ../meld/dirdiff.py:791
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -538,7 +547,7 @@ msgstr[1] "%i sekunda"
 msgstr[2] "%i sekundi"
 msgstr[3] "%i sekunde"
 
-#: ../meld/dirdiff.py:740
+#: ../meld/dirdiff.py:792
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -547,7 +556,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuti"
 msgstr[3] "%i minute"
 
-#: ../meld/dirdiff.py:741
+#: ../meld/dirdiff.py:793
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -556,7 +565,7 @@ msgstr[1] "%i ura"
 msgstr[2] "%i uri"
 msgstr[3] "%i ure"
 
-#: ../meld/dirdiff.py:742
+#: ../meld/dirdiff.py:794
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -565,7 +574,7 @@ msgstr[1] "%i dan"
 msgstr[2] "%i dni"
 msgstr[3] "%i dni"
 
-#: ../meld/dirdiff.py:743
+#: ../meld/dirdiff.py:795
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -574,7 +583,7 @@ msgstr[1] "%i teden"
 msgstr[2] "%i tedna"
 msgstr[3] "%i tedni"
 
-#: ../meld/dirdiff.py:744
+#: ../meld/dirdiff.py:796
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -583,7 +592,7 @@ msgstr[1] "%i mesec"
 msgstr[2] "%i meseca"
 msgstr[3] "%i meseci"
 
-#: ../meld/dirdiff.py:745
+#: ../meld/dirdiff.py:797
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -592,214 +601,214 @@ msgstr[1] "%i leto"
 msgstr[2] "%i leti"
 msgstr[3] "%i leta"
 
-#: ../meld/filediff.py:204
+#: ../meld/filediff.py:205
 msgid "Format as patch..."
 msgstr "Oblikuj kot popravek ..."
 
-#: ../meld/filediff.py:204
+#: ../meld/filediff.py:205
 msgid "Create a patch using differences between files"
 msgstr "Ustvari popravek z razlikovanjem med datotekami"
 
-#: ../meld/filediff.py:205
+#: ../meld/filediff.py:206
 msgid "Previous conflict"
 msgstr "Predhodni spor"
 
-#: ../meld/filediff.py:205
+#: ../meld/filediff.py:206
 msgid "Go to the previous conflict"
 msgstr "SkoÄi na predhodni niz v sporu"
 
-#: ../meld/filediff.py:206
+#: ../meld/filediff.py:207
 msgid "Next conflict"
 msgstr "Naslednji spor"
 
-#: ../meld/filediff.py:206
+#: ../meld/filediff.py:207
 msgid "Go to the next conflict"
 msgstr "SkoÄi na naslednji niz v sporu"
 
-#: ../meld/filediff.py:207
+#: ../meld/filediff.py:208
 msgid "Push to left"
 msgstr "Potisni levo"
 
-#: ../meld/filediff.py:207
+#: ../meld/filediff.py:208
 msgid "Push current change to the left"
 msgstr "Potisni trenutne spremembe na levo"
 
-#: ../meld/filediff.py:208
+#: ../meld/filediff.py:209
 msgid "Push to right"
 msgstr "Potisni desno"
 
-#: ../meld/filediff.py:208
+#: ../meld/filediff.py:209
 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:210
+#: ../meld/filediff.py:211
 msgid "Pull from left"
 msgstr "Potegni z leve"
 
-#: ../meld/filediff.py:210
+#: ../meld/filediff.py:211
 msgid "Pull change from the left"
 msgstr "Potegni spremembe z leve"
 
-#: ../meld/filediff.py:211
+#: ../meld/filediff.py:212
 msgid "Pull from right"
 msgstr "Potegni z desne"
 
-#: ../meld/filediff.py:211
+#: ../meld/filediff.py:212
 msgid "Pull change from the right"
 msgstr "Potegni spremembe z desne"
 
-#: ../meld/filediff.py:212
+#: ../meld/filediff.py:213
 msgid "Copy above left"
 msgstr "Kopiraj nad levo"
 
-#: ../meld/filediff.py:212
+#: ../meld/filediff.py:213
 msgid "Copy change above the left chunk"
 msgstr "Kopiraj spremembe nad levi del"
 
-#: ../meld/filediff.py:213
+#: ../meld/filediff.py:214
 msgid "Copy below left"
 msgstr "Kopiraj pod levo"
 
-#: ../meld/filediff.py:213
+#: ../meld/filediff.py:214
 msgid "Copy change below the left chunk"
 msgstr "Kopiraj spremembe pod levi del"
 
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:215
 msgid "Copy above right"
 msgstr "Kopiraj nad desno"
 
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:215
 msgid "Copy change above the right chunk"
 msgstr "Kopiraj spremembe nad desni del"
 
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:216
 msgid "Copy below right"
 msgstr "Kopiraj pod desno"
 
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:216
 msgid "Copy change below the right chunk"
 msgstr "Kopiraj spremembe pod desni del"
 
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:217
 msgid "Delete"
 msgstr "IzbriÅi"
 
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:217
 msgid "Delete change"
 msgstr "IzbriÅi spremembo"
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:218
 msgid "Merge all changes from left"
 msgstr "ZdruÅi vse spremembe z leve"
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:218
 msgid "Merge all non-conflicting changes from the left"
 msgstr "ZdruÅi vse spremembe brez sporov z leve"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:219
 msgid "Merge all changes from right"
 msgstr "ZdruÅi vse spremembe z desne"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:219
 msgid "Merge all non-conflicting changes from the right"
 msgstr "ZdruÅi vse spremembe brez sporov z desne"
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:220
 msgid "Merge all non-conflicting"
 msgstr "ZdruÅi vse spremembe brez sporov"
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:220
 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:220
+#: ../meld/filediff.py:221
 msgid "Cycle through documents"
 msgstr "Preklopi med dokumenti"
 
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:221
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
 
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:225
 msgid "Lock scrolling"
 msgstr "Zakleni drsenje"
 
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:226
 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:305
+#: ../meld/filediff.py:306
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:306
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:308
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:631
+#: ../meld/filediff.py:632
 #, python-format
 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:909
+#: ../meld/filediff.py:913
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] DoloÄi okna"
 
-#: ../meld/filediff.py:915
+#: ../meld/filediff.py:919
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:939
-#: ../meld/filediff.py:948
-#: ../meld/filediff.py:960
-#: ../meld/filediff.py:966
+#: ../meld/filediff.py:943
+#: ../meld/filediff.py:952
+#: ../meld/filediff.py:964
+#: ../meld/filediff.py:970
 msgid "Could not read file"
 msgstr "Ni mogoÄe prebrati datoteke"
 
-#: ../meld/filediff.py:940
+#: ../meld/filediff.py:944
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:949
+#: ../meld/filediff.py:953
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiÅka datoteka."
 
-#: ../meld/filediff.py:961
+#: ../meld/filediff.py:965
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:991
+#: ../meld/filediff.py:996
 #: ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] RaÄunanje razlik"
 
-#: ../meld/filediff.py:1069
+#: ../meld/filediff.py:1074
 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:1075
+#: ../meld/filediff.py:1080
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1085
+#: ../meld/filediff.py:1090
 msgid "Show without filters"
 msgstr "PokaÅi brez filtrov"
 
-#: ../meld/filediff.py:1274
+#: ../meld/filediff.py:1279
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -808,7 +817,7 @@ msgstr ""
 "\"%s\" Åe obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1287
+#: ../meld/filediff.py:1292
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -819,12 +828,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1296
+#: ../meld/filediff.py:1301
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:1311
+#: ../meld/filediff.py:1316
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -835,7 +844,7 @@ msgstr ""
 "\n"
 "Kateri zapis Åelite uporabiti?"
 
-#: ../meld/filediff.py:1327
+#: ../meld/filediff.py:1332
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -844,7 +853,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:1384
+#: ../meld/filediff.py:1389
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -1222,13 +1231,13 @@ msgstr "Nadzor razliÄic\t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:239
-msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
-msgstr "Binarne datoteke\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
+msgstr "Binarne datoteke\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:241
-msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
-msgstr "Medijske datoteke\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
+msgstr "Predstavne datoteke\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:243
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]