[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, 20 Feb 2011 12:52:52 +0000 (UTC)
commit d0b7c594b15fa2fe85c3144b4f9e12cd8a6b2d61
Author: Matej UrbanÄ?iÄ? <mateju svn gnome org>
Date:   Sun Feb 20 13:52:47 2011 +0100

    Updated Slovenian translation

 po/sl.po |  607 ++++++++++++++++++++++++--------------------------------------
 1 files changed, 238 insertions(+), 369 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 02782df..47ee9e2 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,20 +2,20 @@
 # Copyright (C) 2009 meld's COPYRIGHT HOLDER
 # This file is distributed under the same license as the meld package.
 #
-# Matej UrbanÄ?iÄ? <mateju svn gnome org>, 2009 - 2010.
+# Matej UrbanÄ?iÄ? <mateju svn gnome org>, 2009 - 2011.
 #
 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: 2011-02-05 22:54+0000\n"
-"PO-Revision-Date: 2011-02-11 09:02+0100\n"
+"POT-Creation-Date: 2011-02-19 11:13+0000\n"
+"PO-Revision-Date: 2011-02-20 13:36+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \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-Language: Slovenian\n"
 "X-Poedit-Country: SLOVENIA\n"
@@ -96,7 +96,6 @@ msgid "_Previous"
 msgstr "_Predhodni"
 
 #: ../data/ui/findbar.ui.h:8
-#: ../meld/meldapp.py:147
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
@@ -324,152 +323,146 @@ msgstr "Oznaka"
 msgid "VC Log"
 msgstr "VC dnevnik"
 
-#: ../meld/dirdiff.py:226
+#: ../meld/dirdiff.py:215
 #: ../meld/vcview.py:118
 msgid "_Compare"
 msgstr "_Primerjava"
 
-#: ../meld/dirdiff.py:226
+#: ../meld/dirdiff.py:215
 #: ../meld/vcview.py:118
 msgid "Compare selected"
 msgstr "Primerjaj izbrano"
 
-#: ../meld/dirdiff.py:227
+#: ../meld/dirdiff.py:216
 msgid "Copy _Left"
 msgstr "Kopiraj _levo"
 
-#: ../meld/dirdiff.py:227
+#: ../meld/dirdiff.py:216
 msgid "Copy to left"
 msgstr "Kopiraj na levo"
 
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:217
 msgid "Copy _Right"
 msgstr "Kopiraj _desno"
 
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:217
 msgid "Copy to right"
 msgstr "Kopiraj na desno"
 
-#: ../meld/dirdiff.py:229
+#: ../meld/dirdiff.py:218
 msgid "Delete selected"
 msgstr "IzbriÅ¡i izbor"
 
-#: ../meld/dirdiff.py:230
-#: ../meld/filediff.py:982
+#: ../meld/dirdiff.py:219
+#: ../meld/filediff.py:997
 msgid "Hide"
 msgstr "Skrij"
 
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:219
 msgid "Hide selected"
 msgstr "Skrij izbrano"
 
-#: ../meld/dirdiff.py:232
-#: ../meld/filediff.py:250
+#: ../meld/dirdiff.py:221
+#: ../meld/filediff.py:263
 #: ../meld/vcview.py:119
 msgid "Open selected"
 msgstr "Odpri izbrano"
 
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:225
 msgid "Case"
 msgstr "Ä?rke"
 
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:225
 msgid "Ignore case of entries"
 msgstr "Prezri velikosti Ä?rk"
 
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:226
 msgid "Same"
 msgstr "Enako"
 
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:226
 msgid "Show identical"
 msgstr "PokaÅ¾i enako"
 
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:227
 msgid "New"
 msgstr "Novo"
 
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:227
 msgid "Show new"
 msgstr "PokaÅ¾i novejÅ¡e"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:228
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:228
 #: ../meld/vcview.py:132
 msgid "Show modified"
 msgstr "PokaÅ¾i spremenjeno"
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:230
 msgid "Filters"
 msgstr "Filtri"
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:230
 msgid "Set active filters"
 msgstr "DoloÄ?i dejavne filtre"
 
-#: ../meld/dirdiff.py:299
 #: ../meld/dirdiff.py:347
 #, python-format
-msgid "Error converting pattern '%s' to regular expression"
-msgstr "Napaka med pretvarjanjem vzorca '%s' v logiÄ?ni izraz"
-
-#: ../meld/dirdiff.py:358
-#, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:443
-#: ../meld/dirdiff.py:456
+#: ../meld/dirdiff.py:449
+#: ../meld/dirdiff.py:462
 #: ../meld/vcview.py:304
 #: ../meld/vcview.py:332
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:553
+#: ../meld/dirdiff.py:561
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] konÄ?ano"
 
-#: ../meld/dirdiff.py:557
+#: ../meld/dirdiff.py:565
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je priÅ¡lo do veÄ? napak."
 
-#: ../meld/dirdiff.py:558
+#: ../meld/dirdiff.py:566
 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:560
+#: ../meld/dirdiff.py:568
 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:562
+#: ../meld/dirdiff.py:570
 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:564
+#: ../meld/dirdiff.py:572
 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:575
+#: ../meld/dirdiff.py:583
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:600
-#: ../meld/filediff.py:859
-#: ../meld/filediff.py:986
+#: ../meld/dirdiff.py:608
+#: ../meld/filediff.py:874
+#: ../meld/filediff.py:1001
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/dirdiff.py:650
+#: ../meld/dirdiff.py:658
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -478,7 +471,7 @@ msgstr ""
 "'%s' Å¾e obstaja.\n"
 "Ali naj bo prepisana?"
 
-#: ../meld/dirdiff.py:657
+#: ../meld/dirdiff.py:665
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -489,7 +482,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:675
+#: ../meld/dirdiff.py:683
 #: ../meld/vcview.py:504
 #, python-format
 msgid ""
@@ -499,7 +492,7 @@ msgstr ""
 "'%s' je mapa.\n"
 "Ali naj bo odstranjena vsa vsebina?"
 
-#: ../meld/dirdiff.py:682
+#: ../meld/dirdiff.py:690
 #: ../meld/vcview.py:509
 #, python-format
 msgid ""
@@ -511,7 +504,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:694
+#: ../meld/dirdiff.py:702
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -520,7 +513,7 @@ msgstr[1] "%i sekunda"
 msgstr[2] "%i sekundi"
 msgstr[3] "%i sekunde"
 
-#: ../meld/dirdiff.py:695
+#: ../meld/dirdiff.py:703
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -529,7 +522,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuti"
 msgstr[3] "%i minute"
 
-#: ../meld/dirdiff.py:696
+#: ../meld/dirdiff.py:704
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -538,7 +531,7 @@ msgstr[1] "%i ura"
 msgstr[2] "%i uri"
 msgstr[3] "%i ure"
 
-#: ../meld/dirdiff.py:697
+#: ../meld/dirdiff.py:705
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -547,7 +540,7 @@ msgstr[1] "%i dan"
 msgstr[2] "%i dni"
 msgstr[3] "%i dni"
 
-#: ../meld/dirdiff.py:698
+#: ../meld/dirdiff.py:706
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -556,7 +549,7 @@ msgstr[1] "%i teden"
 msgstr[2] "%i tedna"
 msgstr[3] "%i tedni"
 
-#: ../meld/dirdiff.py:699
+#: ../meld/dirdiff.py:707
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -565,7 +558,7 @@ msgstr[1] "%i mesec"
 msgstr[2] "%i meseca"
 msgstr[3] "%i meseci"
 
-#: ../meld/dirdiff.py:700
+#: ../meld/dirdiff.py:708
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -574,203 +567,203 @@ msgstr[1] "%i leto"
 msgstr[2] "%i leti"
 msgstr[3] "%i leta"
 
-#: ../meld/filediff.py:251
+#: ../meld/filediff.py:264
 msgid "Format as patch..."
 msgstr "Oblikuj kot popravek ..."
 
-#: ../meld/filediff.py:251
+#: ../meld/filediff.py:264
 msgid "Create a patch using differences between files"
 msgstr "Ustvari popravek z razlikovanjem med datotekami"
 
-#: ../meld/filediff.py:252
+#: ../meld/filediff.py:265
 msgid "Previous conflict"
 msgstr "Predhodni spor"
 
-#: ../meld/filediff.py:252
+#: ../meld/filediff.py:265
 msgid "Go to the previous conflict"
 msgstr "SkoÄ?i na predhodni niz v sporu"
 
-#: ../meld/filediff.py:253
+#: ../meld/filediff.py:266
 msgid "Next conflict"
 msgstr "Naslednji spor"
 
-#: ../meld/filediff.py:253
+#: ../meld/filediff.py:266
 msgid "Go to the next conflict"
 msgstr "SkoÄ?i na naslednji niz v sporu"
 
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:267
 msgid "Push to left"
 msgstr "Potisni levo"
 
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:267
 msgid "Push current change to the left"
 msgstr "Potisni trenutne spremembe na levo"
 
-#: ../meld/filediff.py:255
+#: ../meld/filediff.py:268
 msgid "Push to right"
 msgstr "Potisni desno"
 
-#: ../meld/filediff.py:255
+#: ../meld/filediff.py:268
 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:257
+#: ../meld/filediff.py:270
 msgid "Pull from left"
 msgstr "Potegni z leve"
 
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:270
 msgid "Pull change from the left"
 msgstr "Potegni spremembe z leve"
 
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:271
 msgid "Pull from right"
 msgstr "Potegni z desne"
 
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:271
 msgid "Pull change from the right"
 msgstr "Potegni spremembe z desne"
 
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:272
 msgid "Copy above left"
 msgstr "Kopiraj nad levo"
 
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:272
 msgid "Copy change above the left chunk"
 msgstr "Kopiraj spremembe nad levi del"
 
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:273
 msgid "Copy below left"
 msgstr "Kopiraj pod levo"
 
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:273
 msgid "Copy change below the left chunk"
 msgstr "Kopiraj spremembe pod levi del"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:274
 msgid "Copy above right"
 msgstr "Kopiraj nad desno"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:274
 msgid "Copy change above the right chunk"
 msgstr "Kopiraj spremembe nad desni del"
 
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:275
 msgid "Copy below right"
 msgstr "Kopiraj pod desno"
 
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:275
 msgid "Copy change below the right chunk"
 msgstr "Kopiraj spremembe pod desni del"
 
-#: ../meld/filediff.py:263
+#: ../meld/filediff.py:276
 msgid "Delete"
 msgstr "IzbriÅ¡i"
 
-#: ../meld/filediff.py:263
+#: ../meld/filediff.py:276
 msgid "Delete change"
 msgstr "IzbriÅ¡i spremembo"
 
-#: ../meld/filediff.py:264
+#: ../meld/filediff.py:277
 msgid "Merge all changes from left"
 msgstr "ZdruÅ¾i vse spremembe z leve"
 
-#: ../meld/filediff.py:264
+#: ../meld/filediff.py:277
 msgid "Merge all non-conflicting changes from the left"
 msgstr "ZdruÅ¾i vse spremembe brez sporov z leve"
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:278
 msgid "Merge all changes from right"
 msgstr "ZdruÅ¾i vse spremembe z desne"
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:278
 msgid "Merge all non-conflicting changes from the right"
 msgstr "ZdruÅ¾i vse spremembe brez sporov z desne"
 
-#: ../meld/filediff.py:266
+#: ../meld/filediff.py:279
 msgid "Merge all non-conflicting"
 msgstr "ZdruÅ¾i vse spremembe brez sporov"
 
-#: ../meld/filediff.py:266
+#: ../meld/filediff.py:279
 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:270
+#: ../meld/filediff.py:283
 msgid "Lock scrolling"
 msgstr "Zakleni drsenje"
 
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:284
 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:345
+#: ../meld/filediff.py:364
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:345
+#: ../meld/filediff.py:364
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:347
+#: ../meld/filediff.py:366
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:549
+#: ../meld/filediff.py:569
 #, python-format
-msgid "Regular expression '%s' changed the number of lines in the file. Comparison will be incorrect. See the user manual for more details."
-msgstr "Po dejanju logiÄ?nega izraza '%s' se je spremenilo Å¡tevilo vrstic v datoteki, zato primerjava ne bo natanÄ?na. Za veÄ? podrobnosti si oglejte priroÄ?nik."
+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."
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:657
+#: ../meld/filediff.py:672
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: ../meld/filediff.py:847
+#: ../meld/filediff.py:862
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] DoloÄ?i okna"
 
-#: ../meld/filediff.py:853
+#: ../meld/filediff.py:868
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:880
-#: ../meld/filediff.py:889
+#: ../meld/filediff.py:892
 #: ../meld/filediff.py:901
-#: ../meld/filediff.py:907
+#: ../meld/filediff.py:913
+#: ../meld/filediff.py:919
 msgid "Could not read file"
 msgstr "Ni mogoÄ?e prebrati datoteke"
 
-#: ../meld/filediff.py:881
+#: ../meld/filediff.py:893
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:890
+#: ../meld/filediff.py:902
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiÅ¡ka datoteka."
 
-#: ../meld/filediff.py:902
+#: ../meld/filediff.py:914
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:932
+#: ../meld/filediff.py:944
 #: ../meld/filemerge.py:69
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] RaÄ?unanje razlik"
 
-#: ../meld/filediff.py:980
+#: ../meld/filediff.py:995
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1123
+#: ../meld/filediff.py:1138
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -779,7 +772,7 @@ msgstr ""
 "\"%s\" Å¾e obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1136
+#: ../meld/filediff.py:1151
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -790,12 +783,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1145
+#: ../meld/filediff.py:1160
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:1160
+#: ../meld/filediff.py:1175
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -806,7 +799,7 @@ msgstr ""
 "\n"
 "Kateri zapis Å¾elite uporabiti?"
 
-#: ../meld/filediff.py:1176
+#: ../meld/filediff.py:1191
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -815,7 +808,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:1235
+#: ../meld/filediff.py:1250
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -833,240 +826,63 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] ZdruÅ¾evanje datotek"
 
-#: ../meld/meldapp.py:132
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../meld/meldapp.py:133
-msgid "_New..."
-msgstr "_Novo ..."
-
-#: ../meld/meldapp.py:133
-msgid "Start a new comparison"
-msgstr "Nova primerjava"
-
-#: ../meld/meldapp.py:134
-msgid "Save the current file"
-msgstr "Shrani trenutno datoteko"
-
-#: ../meld/meldapp.py:136
-msgid "Close the current file"
-msgstr "Zapri trenutno datoteko"
-
-#: ../meld/meldapp.py:137
-msgid "Quit the program"
-msgstr "KonÄ?aj program"
-
-#: ../meld/meldapp.py:139
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: ../meld/meldapp.py:140
-msgid "Undo the last action"
-msgstr "Razveljavi zadnje dejanje"
-
-#: ../meld/meldapp.py:141
-msgid "Redo the last undone action"
-msgstr "Obnovi zadnje razveljavljeno dejanje"
-
-#: ../meld/meldapp.py:142
-msgid "Cut the selection"
-msgstr "IzreÅ¾i izbrano"
-
-#: ../meld/meldapp.py:143
-msgid "Copy the selection"
-msgstr "Kopiraj izbrano"
-
-#: ../meld/meldapp.py:144
-msgid "Paste the clipboard"
-msgstr "Prilepi iz odloÅ¾iÅ¡Ä?a"
-
-#: ../meld/meldapp.py:145
-msgid "Search for text"
-msgstr "PoiÅ¡Ä?i besedilo"
-
-#: ../meld/meldapp.py:146
-msgid "Find Ne_xt"
-msgstr "Najdi _naslednje"
-
-#: ../meld/meldapp.py:146
-msgid "Search forwards for the same text"
-msgstr "PoiÅ¡Ä?i niz naprej po besedilu"
-
-#: ../meld/meldapp.py:147
-msgid "Find and replace text"
-msgstr "PoiÅ¡Ä?i in zamenjaj besedilo"
-
-#: ../meld/meldapp.py:148
-msgid "Prefere_nces"
-msgstr "_Lastnosti"
-
-#: ../meld/meldapp.py:148
-msgid "Configure the application"
-msgstr "Spremeni nastavitve programa"
-
-#: ../meld/meldapp.py:150
-msgid "_Changes"
-msgstr "_Spremembe"
-
-#: ../meld/meldapp.py:151
-msgid "Next change"
-msgstr "Naslednja sprememba"
-
-#: ../meld/meldapp.py:151
-msgid "Go to the next change"
-msgstr "SkoÄ?i na naslednjo spremembo"
-
-#: ../meld/meldapp.py:152
-msgid "Previous change"
-msgstr "Predhodna sprememba"
-
-#: ../meld/meldapp.py:152
-msgid "Go to the previous change"
-msgstr "SkoÄ?i na predhodno spremembo"
-
-#: ../meld/meldapp.py:154
-msgid "_View"
-msgstr "_Pogled"
-
-#: ../meld/meldapp.py:155
-msgid "File status"
-msgstr "Stanje datoteke"
-
-#: ../meld/meldapp.py:156
-msgid "Version status"
-msgstr "Stanje razliÄ?ice"
-
-#: ../meld/meldapp.py:157
-msgid "File filters"
-msgstr "Filtri datotek"
-
-#: ../meld/meldapp.py:158
-msgid "Stop the current action"
-msgstr "Ustavi trenutno dejanje"
-
-#: ../meld/meldapp.py:159
-msgid "Refresh the view"
-msgstr "OsveÅ¾i pogled"
-
-#: ../meld/meldapp.py:160
-msgid "Reload"
-msgstr "Ponovno naloÅ¾i"
-
-#: ../meld/meldapp.py:160
-msgid "Reload the comparison"
-msgstr "Ponovno naloÅ¾i primerjavo"
-
-#: ../meld/meldapp.py:162
-msgid "_Help"
-msgstr "Pomo_Ä?"
-
-#: ../meld/meldapp.py:163
-msgid "_Contents"
-msgstr "_Vsebina"
-
-#: ../meld/meldapp.py:163
-msgid "Open the Meld manual"
-msgstr "Odpri priroÄ?nik Meld"
-
-#: ../meld/meldapp.py:164
-msgid "Report _Bug"
-msgstr "PoÅ¡lji poroÄ?ilo o _hroÅ¡Ä?u"
-
-#: ../meld/meldapp.py:164
-msgid "Report a bug in Meld"
-msgstr "PoroÄ?ilo o hroÅ¡Ä?u programa Meld"
-
-#: ../meld/meldapp.py:165
-msgid "About this program"
-msgstr "O programu"
-
-#: ../meld/meldapp.py:168
-msgid "Full Screen"
-msgstr "Celozaslonski naÄ?in"
-
-#: ../meld/meldapp.py:168
-msgid "View the comparison in full screen"
-msgstr "Ogled primerjave v celozaslonskem naÄ?inu"
-
-#: ../meld/meldapp.py:169
-msgid "_Toolbar"
-msgstr "_Orodna vrstica"
-
-#: ../meld/meldapp.py:169
-msgid "Show or hide the toolbar"
-msgstr "PokaÅ¾i ali skrij orodno vrstico"
-
-#: ../meld/meldapp.py:170
-msgid "_Statusbar"
-msgstr "_Vrstica stanja"
-
-#: ../meld/meldapp.py:170
-msgid "Show or hide the statusbar"
-msgstr "PokaÅ¾i ali skrij vrstico stanja"
-
-#. exit at first non found directory + file
-#: ../meld/meldapp.py:544
-msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "Ni mogoÄ?e primerjati meÅ¡anice datotek in map.\n"
-
-#: ../meld/meldapp.py:599
+#: ../meld/meldapp.py:149
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Neveljavno Å¡tevilo argumentov pri ukazu --diff."
 
-#: ../meld/meldapp.py:603
+#: ../meld/meldapp.py:153
 msgid "Start with an empty window"
 msgstr "Zagon brez odprtih oken"
 
-#: ../meld/meldapp.py:604
-#: ../meld/meldapp.py:605
-#: ../meld/meldapp.py:607
+#: ../meld/meldapp.py:154
+#: ../meld/meldapp.py:155
+#: ../meld/meldapp.py:157
 msgid "file"
 msgstr "datoteka"
 
-#: ../meld/meldapp.py:604
-#: ../meld/meldapp.py:606
-#: ../meld/meldapp.py:607
+#: ../meld/meldapp.py:154
+#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:157
 msgid "dir"
 msgstr "mapa"
 
-#: ../meld/meldapp.py:604
+#: ../meld/meldapp.py:154
 msgid "Start a version control comparison"
 msgstr "Zagon primerjave nadzora razliÄ?ic"
 
-#: ../meld/meldapp.py:605
+#: ../meld/meldapp.py:155
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: ../meld/meldapp.py:606
+#: ../meld/meldapp.py:156
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo map"
 
-#: ../meld/meldapp.py:607
+#: ../meld/meldapp.py:157
 msgid "Start a comparison between file and dir/file"
 msgstr "Zagon primerjave med datoteko in mapo/datoteko"
 
-#: ../meld/meldapp.py:613
+#: ../meld/meldapp.py:163
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je orodje za primerjavo vsebine datotek in map."
 
-#: ../meld/meldapp.py:616
+#: ../meld/meldapp.py:166
 msgid "Set label to use instead of file name"
 msgstr "DoloÄ?i naslov namesto imena datoteke"
 
-#: ../meld/meldapp.py:618
+#: ../meld/meldapp.py:168
 msgid "Automatically compare all differing files on startup"
 msgstr "Ob zagonu samodejno primerjaj vse razliÄ?ne datoteke."
 
-#: ../meld/meldapp.py:621
+#: ../meld/meldapp.py:171
 msgid "Set the target file for saving a merge result"
 msgstr "DoloÄ?itev ciljne datoteke za shranjevanje rezultatov zdruÅ¾evanja."
 
-#: ../meld/meldapp.py:624
+#: ../meld/meldapp.py:174
 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:627
+#: ../meld/meldapp.py:177
 #, python-format
 msgid "too many arguments (wanted 0-4, got %d)"
 msgstr "preveÄ? argumentov (zahtevanih 0-4, prejetih %d)"
@@ -1077,70 +893,49 @@ msgid "untitled"
 msgstr "neimenovano"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:192
+#: ../meld/misc.py:174
 msgid "[None]"
 msgstr "[noben]"
 
-#: ../meld/patchdialog.py:119
+#: ../meld/patchdialog.py:122
 msgid "Save Patch As..."
 msgstr "Shrani popravke kot ..."
 
-#: ../meld/preferences.py:81
+#: ../meld/preferences.py:37
 msgid "label"
 msgstr "oznaka"
 
-#: ../meld/preferences.py:81
+#: ../meld/preferences.py:37
 msgid "pattern"
 msgstr "vzorec"
 
-#: ../meld/preferences.py:142
+#: ../meld/preferences.py:105
 msgid "Only available if you have gnome-python-desktop installed"
 msgstr "Na voljo le, Ä?e je nameÅ¡Ä?en paket gnome-python-desktop"
 
-#. file filters
-#. text filters
-#: ../meld/preferences.py:167
-#: ../meld/preferences.py:172
-#: ../meld/vcview.py:156
-msgid "Name"
-msgstr "Ime"
-
-#: ../meld/preferences.py:167
-#: ../meld/preferences.py:172
-msgid "Active"
-msgstr "Dejavno"
-
-#: ../meld/preferences.py:167
-msgid "Pattern"
-msgstr "Vzorec"
-
-#: ../meld/preferences.py:172
-msgid "Regex"
-msgstr "LogiÄ?ni izraz"
-
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:269
+#: ../meld/preferences.py:232
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 msgstr "Varnostne kopije\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:271
+#: ../meld/preferences.py:234
 #, python-format
 msgid "Version Control\t1\t%s\n"
 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:273
+#: ../meld/preferences.py:236
 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"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:275
+#: ../meld/preferences.py:238
 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}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:277
+#: ../meld/preferences.py:240
 msgid ""
 "CVS keywords\t0\t\\$\\w+(:[^\\n"
 "$]+)?\\$\n"
@@ -1149,27 +944,27 @@ msgstr ""
 "$]+)?\\$\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:279
+#: ../meld/preferences.py:242
 msgid "C++ comment\t0\t//.*\n"
 msgstr "C++ opombe\t0\t//.*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:281
+#: ../meld/preferences.py:244
 msgid "C comment\t0\t/\\*.*?\\*/\n"
 msgstr "C opombe\t0\t/\\*.*?\\*/\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:283
+#: ../meld/preferences.py:246
 msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
 msgstr "Vsi presledni znaki\t0\t[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:285
+#: ../meld/preferences.py:248
 msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
 msgstr "ZaÄ?etni presledni znaki\t0\t^[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:287
+#: ../meld/preferences.py:250
 msgid "Script comment\t0\t#.*"
 msgstr "Opomba skripta\t0\t#.*"
 
@@ -1265,6 +1060,10 @@ msgstr "Prezrto"
 msgid "Show ignored files"
 msgstr "PokaÅ¾i prezrte datoteke"
 
+#: ../meld/vcview.py:156
+msgid "Name"
+msgstr "Ime"
+
 #: ../meld/vcview.py:176
 #: ../meld/vcview.py:300
 msgid "Location"
@@ -1434,90 +1233,160 @@ msgstr ""
 "DoloÄ?en je bil vzorec '%s'\n"
 "Javljena napaka je '%s'"
 
+#~ msgid "Error converting pattern '%s' to regular expression"
+#~ msgstr "Napaka med pretvarjanjem vzorca '%s' v logiÄ?ni izraz"
+#~ msgid "_File"
+#~ msgstr "_Datoteka"
+#~ msgid "_New..."
+#~ msgstr "_Novo ..."
+#~ msgid "Start a new comparison"
+#~ msgstr "Nova primerjava"
+#~ msgid "Save the current file"
+#~ msgstr "Shrani trenutno datoteko"
+#~ msgid "Close the current file"
+#~ msgstr "Zapri trenutno datoteko"
+#~ msgid "Quit the program"
+#~ msgstr "KonÄ?aj program"
+#~ msgid "_Edit"
+#~ msgstr "_Uredi"
+#~ msgid "Undo the last action"
+#~ msgstr "Razveljavi zadnje dejanje"
+#~ msgid "Redo the last undone action"
+#~ msgstr "Obnovi zadnje razveljavljeno dejanje"
+#~ msgid "Cut the selection"
+#~ msgstr "IzreÅ¾i izbrano"
+#~ msgid "Copy the selection"
+#~ msgstr "Kopiraj izbrano"
+#~ msgid "Paste the clipboard"
+#~ msgstr "Prilepi iz odloÅ¾iÅ¡Ä?a"
+#~ msgid "Search for text"
+#~ msgstr "PoiÅ¡Ä?i besedilo"
+#~ msgid "Find Ne_xt"
+#~ msgstr "Najdi _naslednje"
+#~ msgid "Search forwards for the same text"
+#~ msgstr "PoiÅ¡Ä?i niz naprej po besedilu"
+#~ msgid "Find and replace text"
+#~ msgstr "PoiÅ¡Ä?i in zamenjaj besedilo"
+#~ msgid "Prefere_nces"
+#~ msgstr "_Lastnosti"
+#~ msgid "Configure the application"
+#~ msgstr "Spremeni nastavitve programa"
+#~ msgid "_Changes"
+#~ msgstr "_Spremembe"
+#~ msgid "Next change"
+#~ msgstr "Naslednja sprememba"
+#~ msgid "Go to the next change"
+#~ msgstr "SkoÄ?i na naslednjo spremembo"
+#~ msgid "Previous change"
+#~ msgstr "Predhodna sprememba"
+#~ msgid "Go to the previous change"
+#~ msgstr "SkoÄ?i na predhodno spremembo"
+#~ msgid "_View"
+#~ msgstr "_Pogled"
+#~ msgid "File status"
+#~ msgstr "Stanje datoteke"
+#~ msgid "Version status"
+#~ msgstr "Stanje razliÄ?ice"
+#~ msgid "File filters"
+#~ msgstr "Filtri datotek"
+#~ msgid "Stop the current action"
+#~ msgstr "Ustavi trenutno dejanje"
+#~ msgid "Refresh the view"
+#~ msgstr "OsveÅ¾i pogled"
+#~ msgid "Reload"
+#~ msgstr "Ponovno naloÅ¾i"
+#~ msgid "Reload the comparison"
+#~ msgstr "Ponovno naloÅ¾i primerjavo"
+#~ msgid "_Help"
+#~ msgstr "Pomo_Ä?"
+#~ msgid "_Contents"
+#~ msgstr "_Vsebina"
+#~ msgid "Open the Meld manual"
+#~ msgstr "Odpri priroÄ?nik Meld"
+#~ msgid "Report _Bug"
+#~ msgstr "PoÅ¡lji poroÄ?ilo o _hroÅ¡Ä?u"
+#~ msgid "Report a bug in Meld"
+#~ msgstr "PoroÄ?ilo o hroÅ¡Ä?u programa Meld"
+#~ msgid "About this program"
+#~ msgstr "O programu"
+#~ msgid "Full Screen"
+#~ msgstr "Celozaslonski naÄ?in"
+#~ msgid "View the comparison in full screen"
+#~ msgstr "Ogled primerjave v celozaslonskem naÄ?inu"
+#~ msgid "_Toolbar"
+#~ msgstr "_Orodna vrstica"
+#~ msgid "Show or hide the toolbar"
+#~ msgstr "PokaÅ¾i ali skrij orodno vrstico"
+#~ msgid "_Statusbar"
+#~ msgstr "_Vrstica stanja"
+#~ msgid "Show or hide the statusbar"
+#~ msgstr "PokaÅ¾i ali skrij vrstico stanja"
+#~ msgid "Cannot compare a mixture of files and directories.\n"
+#~ msgstr "Ni mogoÄ?e primerjati meÅ¡anice datotek in map.\n"
+#~ msgid "Active"
+#~ msgstr "Dejavno"
+#~ msgid "Pattern"
+#~ msgstr "Vzorec"
+#~ msgid "Regex"
+#~ msgstr "LogiÄ?ni izraz"
 #~ msgid "Left"
 #~ msgstr "Levo"
-
 #~ msgid "Right"
 #~ msgstr "Desno"
-
 #~ msgid "_Commit"
 #~ msgstr "_Uveljavi"
-
 #~ msgid "No differences found."
 #~ msgstr "Ni razlik."
-
 #~ msgid "Three way directory"
 #~ msgstr "Trojni pogled map"
-
 #~ msgid "Three way file"
 #~ msgstr "Trojni pogled datotek"
-
 #~ msgid "Two way directory"
 #~ msgstr "Dvojni pogled map"
-
 #~ msgid "Two way file"
 #~ msgstr "Dvojni pogled datotek"
-
 #~ msgid "Version control view"
 #~ msgstr "Pogled nadzora razliÄ?ic"
-
 #~ msgid "<b>Font</b>"
 #~ msgstr "<b>Pisava</b>"
-
 #~ msgid "_Automatically supply missing newline at end of file"
 #~ msgstr "Samodejno vstavi manjkajoÄ?o _novo vrstico na koncu datoteke"
-
 #~ msgid "Ignored for compatibility"
 #~ msgstr "Prezrto zaradi skladnosti"
-
 #~ msgid "Copy all changes from right pane to left pane"
 #~ msgstr "Kopiraj vse spremembe iz desne polovice na levo"
-
 #~ msgid "<b>Edit Menu</b>"
 #~ msgstr "<b>Uredi meni</b>"
-
 #~ msgid "Custom command"
 #~ msgstr "Ukaz po meri"
-
 #~ msgid "Edit files with:"
 #~ msgstr "Uredi datoteke z:"
-
 #~ msgid "Line Wrapping "
 #~ msgstr "Prelom vrstic"
-
 #~ msgid "Preferences : Meld"
 #~ msgstr "MoÅ¾nosti : Meld"
-
 #~ msgid "Use GNOME monospace font"
 #~ msgstr "Uporabi pisavo enotne Å¡irine"
-
 #~ msgid "Use custom font"
 #~ msgstr "Uporabi pisavo po meri"
-
 #~ msgid "_Character"
 #~ msgstr "_Znak"
-
 #~ msgid "_None"
 #~ msgstr "_Brez"
-
 #~ msgid "_Word"
 #~ msgstr "_Beseda"
-
 #~ msgid "The error was:"
 #~ msgstr "Napaka je:"
-
 #~ msgid ""
 #~ "It contains ascii nulls.\n"
 #~ "Perhaps it is a binary file."
 #~ msgstr ""
 #~ "Vsebuje tudi ascii niÄ?elne znake.\n"
 #~ "Morda je datoteka dvojiÅ¡ka."
-
 #~ msgid "Start with Version Control browser in '%s'"
 #~ msgstr "Zagon z brskalnikom nadzornika razliÄ?ic v '%s'"
-
 #~ msgid "Start with Version Control diff of '%s'"
 #~ msgstr "Zagon s primerjavo diff nadzornika razliÄ?ic '%s'"
-
 #~ msgid "Wrong number of arguments (Got %i)"
 #~ msgstr "Neveljavno Å¡tevilo argumentov (pridobljeno %i)"
+
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]