GNOME.org
 

[meld] Updated Slovenian translation

commit 0e3534d152b825ae42aa77b3c5b6d6e69fc0e8a3
Author: Matej UrbanÄiÄ <mateju svn gnome org>
Date:   Wed Apr 4 13:43:24 2012 +0200

    Updated Slovenian translation

 po/sl.po |  585 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 290 insertions(+), 295 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index e86ddd5..bca2d60 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: 2011-12-03 14:57+0000\n"
-"PO-Revision-Date: 2011-12-08 21:58+0100\n"
+"POT-Creation-Date: 2012-04-04 08:05+0000\n"
+"PO-Revision-Date: 2012-04-04 13:37+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"
@@ -21,82 +21,82 @@ msgstr ""
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../bin/meld:96
+#: ../bin/meld:97
 msgid "Cannot import: "
 msgstr "Ni mogoÄe uvoziti:"
 
-#: ../bin/meld:99
+#: ../bin/meld:100
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Program Meld zahteva najmanj razliÄico %s."
 
 #: ../data/meld.desktop.in.h:1
-msgid "Compare and merge your files"
-msgstr "Primerjava in zdruÅevanje datotek"
+#: ../data/ui/meldapp.ui.h:1
+msgid "Meld"
+msgstr "Meld"
 
 #: ../data/meld.desktop.in.h:2
 msgid "Diff Viewer"
 msgstr "Pregledovalnik sprememb"
 
 #: ../data/meld.desktop.in.h:3
-#: ../data/ui/meldapp.ui.h:5
-msgid "Meld"
-msgstr "Meld"
-
-#: ../data/meld.desktop.in.h:4
 msgid "Meld Diff Viewer"
 msgstr "Meld pregledovalnik razliÄic"
 
+#: ../data/meld.desktop.in.h:4
+msgid "Compare and merge your files"
+msgstr "Primerjava in zdruÅevanje datotek"
+
 #: ../data/ui/EditableList.ui.h:1
-msgid "Active"
-msgstr "Dejavno"
+msgid "Editable List"
+msgstr "Uredljiv seznam"
 
 #: ../data/ui/EditableList.ui.h:2
-msgid "Add new filter"
-msgstr "Dodaj nov filter"
+msgid "Active"
+msgstr "Dejavno"
 
 #: ../data/ui/EditableList.ui.h:3
-msgid "Editable List"
-msgstr "Uredljiv seznam"
+#: ../meld/vcview.py:166
+msgid "Name"
+msgstr "Ime"
 
 #: ../data/ui/EditableList.ui.h:4
-msgid "Move _Down"
-msgstr "Premakni navz_dol"
+msgid "Pattern"
+msgstr "Vzorec"
 
 #: ../data/ui/EditableList.ui.h:5
-msgid "Move _Up"
-msgstr "Premakni _navzgor"
+msgid "Add new filter"
+msgstr "Dodaj nov filter"
 
 #: ../data/ui/EditableList.ui.h:6
-msgid "Move item down"
-msgstr "Premakni predmet navzdol"
+#: ../meld/vcview.py:130
+msgid "_Add"
+msgstr "_Dodaj"
 
 #: ../data/ui/EditableList.ui.h:7
-msgid "Move item up"
-msgstr "Premakni predmet navzgor"
+msgid "Remove selected filter"
+msgstr "Odstrani izbrani filter"
 
 #: ../data/ui/EditableList.ui.h:8
-#: ../meld/vcview.py:156
-msgid "Name"
-msgstr "Ime"
+#: ../meld/vcview.py:132
+msgid "_Remove"
+msgstr "_Odstrani"
 
 #: ../data/ui/EditableList.ui.h:9
-msgid "Pattern"
-msgstr "Vzorec"
+msgid "Move item up"
+msgstr "Premakni predmet navzgor"
 
 #: ../data/ui/EditableList.ui.h:10
-msgid "Remove selected filter"
-msgstr "Odstrani izbrani filter"
+msgid "Move _Up"
+msgstr "Premakni _navzgor"
 
 #: ../data/ui/EditableList.ui.h:11
-#: ../meld/vcview.py:121
-msgid "_Add"
-msgstr "_Dodaj"
+msgid "Move item down"
+msgstr "Premakni predmet navzdol"
 
 #: ../data/ui/EditableList.ui.h:12
-#: ../meld/vcview.py:123
-msgid "_Remove"
-msgstr "_Odstrani"
+msgid "Move _Down"
+msgstr "Premakni navz_dol"
 
 #: ../data/ui/filediff.ui.h:1
 msgid "Save modified files?"
@@ -119,109 +119,109 @@ msgid "_Save Selected"
 msgstr "_Shrani izbrano"
 
 #: ../data/ui/findbar.ui.h:1
-msgid "Regular E_xpression"
-msgstr "_LogiÄni izraz"
+#: ../meld/meldwindow.py:141
+msgid "_Replace"
+msgstr "_Zamenjaj"
 
 #: ../data/ui/findbar.ui.h:2
 msgid "Replace _All"
 msgstr "Zamenjaj _vse"
 
 #: ../data/ui/findbar.ui.h:3
-msgid "Replace _With"
-msgstr "Zamenjaj _z"
+msgid "_Previous"
+msgstr "_Predhodni"
 
 #: ../data/ui/findbar.ui.h:4
-msgid "Who_le word"
-msgstr "Cele _besede"
+msgid "_Next"
+msgstr "_Naslednji"
 
 #: ../data/ui/findbar.ui.h:5
-msgid "_Match Case"
-msgstr "_UpoÅtevaj velikost Ärk"
+msgid "_Search for"
+msgstr "_PoiÅÄi"
 
 #: ../data/ui/findbar.ui.h:6
-msgid "_Next"
-msgstr "_Naslednji"
+msgid "Replace _With"
+msgstr "Zamenjaj _z"
 
 #: ../data/ui/findbar.ui.h:7
-msgid "_Previous"
-msgstr "_Predhodni"
+msgid "_Match Case"
+msgstr "_UpoÅtevaj velikost Ärk"
 
 #: ../data/ui/findbar.ui.h:8
-#: ../meld/meldwindow.py:141
-msgid "_Replace"
-msgstr "_Zamenjaj"
+msgid "Who_le word"
+msgstr "Cele _besede"
 
 #: ../data/ui/findbar.ui.h:9
-msgid "_Search for"
-msgstr "_PoiÅÄi"
-
-#: ../data/ui/meldapp.ui.h:1
-msgid "Choose Files"
-msgstr "Izbor datotek"
+msgid "Regular E_xpression"
+msgstr "_LogiÄni izraz"
 
 #: ../data/ui/meldapp.ui.h:2
 msgid ""
 "Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
-"Copyright &#xA9; 2009-2011 Kai Willadsen"
+"Copyright &#xA9; 2009-2012 Kai Willadsen"
 msgstr ""
 "Avtorske pravice &#xA9; 2002-2009 Stephen Kennedy\n"
-"Avtorske pravice &#xA9; 2009-2011 Kai Willadsen"
+"Avtorske pravice &#xA9; 2009-2012 Kai Willadsen"
 
 #: ../data/ui/meldapp.ui.h:4
-msgid "Directory"
-msgstr "Mapa"
+msgid "translator-credits"
+msgstr "Matej UrbanÄiÄ <mateju svn gnome org>"
+
+#: ../data/ui/meldapp.ui.h:5
+msgid "Choose Files"
+msgstr "Izbor datotek"
+
+#: ../data/ui/meldapp.ui.h:6
+msgid "_Three Way Compare"
+msgstr "_Trojna primerjava"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:7
+#: ../data/ui/meldapp.ui.h:8
 msgid "Mine"
 msgstr "Lastno"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:9
+#: ../data/ui/meldapp.ui.h:10
 msgid "Original"
 msgstr "Izvorno"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:11
+#: ../data/ui/meldapp.ui.h:12
 msgid "Other"
 msgstr "Drugo"
 
-#: ../data/ui/meldapp.ui.h:12
-msgid "Select VC Directory"
-msgstr "Izbor VC mape"
-
 #: ../data/ui/meldapp.ui.h:13
-msgid "_Directory Comparison"
-msgstr "_Primerjava vsebine map"
-
-#: ../data/ui/meldapp.ui.h:14
 msgid "_File Comparison"
 msgstr "_Primerjava datotek"
 
+#: ../data/ui/meldapp.ui.h:14
+msgid "_Directory Comparison"
+msgstr "_Primerjava vsebine map"
+
 #: ../data/ui/meldapp.ui.h:15
-msgid "_Three Way Compare"
-msgstr "_Trojna primerjava"
+msgid "Select VC Directory"
+msgstr "Izbor VC mape"
 
 #: ../data/ui/meldapp.ui.h:16
-msgid "_Version Control Browser"
-msgstr "_Brskalnik po nadzoru razliÄic"
+msgid "Directory"
+msgstr "Mapa"
 
 #: ../data/ui/meldapp.ui.h:17
-msgid "translator-credits"
-msgstr "Matej UrbanÄiÄ <mateju svn gnome org>"
+msgid "_Version Control Browser"
+msgstr "_Brskalnik po nadzoru razliÄic"
 
 #: ../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
+#: ../data/ui/patch-dialog.ui.h:2
 msgid "Create a patch"
 msgstr "Ustvari programski popravek"
 
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Use differences between:"
+msgstr "Uporabi razlike med:"
+
 #: ../data/ui/patch-dialog.ui.h:4
 msgid "Left and middle panes"
 msgstr "Levi in srednji pladenj"
@@ -231,284 +231,263 @@ 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/patch-dialog.ui.h:7
+msgid "Copy to Clipboard"
+msgstr "Kopiraj v odloÅiÅÄe"
+
 #: ../data/ui/preferences.ui.h:1
-msgid "Display"
-msgstr "Prikaz"
+msgid "Meld Preferences"
+msgstr "MoÅnosti Meld"
 
 #: ../data/ui/preferences.ui.h:2
-msgid "Do not _split words over two lines"
-msgstr "Ne _deli besed preko dveh vrstic"
+msgid "Font"
+msgstr "Pisava"
 
 #: ../data/ui/preferences.ui.h:3
-msgid "Edito_r command:"
-msgstr "Ukaz _urejevalnika:"
+msgid "_Use the system fixed width font"
+msgstr "_Uporabi sistemsko pisavo doloÄene Åirine"
 
 #: ../data/ui/preferences.ui.h:4
-msgid "Editor"
-msgstr "Urejevalnik"
+msgid "_Editor font:"
+msgstr "Pisava _urejevalnika:"
 
 #: ../data/ui/preferences.ui.h:5
-msgid "Enable text _wrapping"
-msgstr "OmogoÄi _prelom besedila"
+msgid "Display"
+msgstr "Prikaz"
 
 #: ../data/ui/preferences.ui.h:6
-msgid "Encoding"
-msgstr "Nabor znakov"
+msgid "_Tab width:"
+msgstr "Åirina _tabulatorja:"
 
 #: ../data/ui/preferences.ui.h:7
-msgid "External editor"
-msgstr "Zunanji urejevalnik"
+msgid "_Insert spaces instead of tabs"
+msgstr "Vstavi _presledke namesto tabulatorjev"
 
 #: ../data/ui/preferences.ui.h:8
-msgid "File Filters"
-msgstr "Filtri datotek"
+msgid "Enable text _wrapping"
+msgstr "OmogoÄi _prelom besedila"
 
 #: ../data/ui/preferences.ui.h:9
-msgid "Font"
-msgstr "Pisava"
+msgid "Do not _split words over two lines"
+msgstr "Ne _deli besed preko dveh vrstic"
 
 #: ../data/ui/preferences.ui.h:10
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "Prezri spremembe, s katerimi se vstavijo ali izbriÅejo prazne vrstice"
+msgid "Show _line numbers"
+msgstr "PokaÅi _Åtevilke vrstic"
 
 #: ../data/ui/preferences.ui.h:11
-msgid "Ignore symbolic links"
-msgstr "Prezri simbolne povezave"
+msgid "Show w_hitespace"
+msgstr "PokaÅi _presledne znake"
 
 #: ../data/ui/preferences.ui.h:12
-msgid "Loading"
-msgstr "Nalaganje"
+msgid "Use s_yntax highlighting"
+msgstr "Uporabi _barvno poudarjanje skladnje"
 
 #: ../data/ui/preferences.ui.h:13
-msgid "Meld Preferences"
-msgstr "MoÅnosti Meld"
+msgid "External editor"
+msgstr "Zunanji urejevalnik"
 
 #: ../data/ui/preferences.ui.h:14
-msgid "Show _line numbers"
-msgstr "PokaÅi _Åtevilke vrstic"
+msgid "Use _default system editor"
+msgstr "Uporabi _privzet sistemski urejevalnik besedil."
 
 #: ../data/ui/preferences.ui.h:15
-msgid "Show w_hitespace"
-msgstr "PokaÅi _presledne znake"
+msgid "Edito_r command:"
+msgstr "Ukaz _urejevalnika:"
 
 #: ../data/ui/preferences.ui.h:16
-msgid "Text Filters"
-msgstr "Filtri besedila"
+msgid "Editor"
+msgstr "Urejevalnik"
 
 #: ../data/ui/preferences.ui.h:17
-msgid "Use _default system editor"
-msgstr "Uporabi _privzet sistemski urejevalnik besedil."
+msgid "When performing directory comparisons, you may filter out files and directories by name. Each pattern is a list of shell style wildcards separated by spaces."
+msgstr "Pri primerjavi map je mogoÄe filtrirati datoteke in mape po imenu. Vsak vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), loÄenimi s presledki."
 
 #: ../data/ui/preferences.ui.h:18
-msgid "Use s_yntax highlighting"
-msgstr "Uporabi _barvno poudarjanje skladnje"
+msgid "Ignore symbolic links"
+msgstr "Prezri simbolne povezave"
 
 #: ../data/ui/preferences.ui.h:19
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr "Med nalaganjem naj bodo preverjeni nabori v vrsti (na primer: utf8, iso1250)"
+msgid "File Filters"
+msgstr "Filtri datotek"
 
 #: ../data/ui/preferences.ui.h:20
-msgid "When performing directory comparisons, you may filter out files and directories by name. Each pattern is a list of shell style wildcards separated by spaces."
-msgstr "Pri primerjavi map je mogoÄe filtrirati datoteke in mape po imenu. Vsak vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), loÄenimi s presledki."
-
-#: ../data/ui/preferences.ui.h:21
 msgid "When performing file comparisons, you may ignore certain types of changes. Each pattern here is a python regular expression which replaces matching text with the empty string before comparison is performed. If the expression contains groups, only the groups are replaced. See the user manual for more details."
 msgstr "Pri primerjavi datotek je mogoÄe prezreti nekatere vrste sprememb. Vsak vzorec na seznamu je zapisan z logiÄnimi izrazi, s katerimi se zamenja Åeleno besedilo s praznim nizom, preden je primerjava izvede. V primeru, da izraz vkljuÄuje skupine, so zamenjane le te. VeÄ podrobnosti je zapisanih v priroÄniku."
 
+#: ../data/ui/preferences.ui.h:21
+msgid "Ignore changes which insert or delete blank lines"
+msgstr "Prezri spremembe, s katerimi se vstavijo ali izbriÅejo prazne vrstice"
+
 #: ../data/ui/preferences.ui.h:22
-msgid "_Editor font:"
-msgstr "Pisava _urejevalnika:"
+msgid "Text Filters"
+msgstr "Filtri besedila"
 
 #: ../data/ui/preferences.ui.h:23
-msgid "_Insert spaces instead of tabs"
-msgstr "Vstavi _presledke namesto tabulatorjev"
+msgid "Loading"
+msgstr "Nalaganje"
 
 #: ../data/ui/preferences.ui.h:24
-msgid "_Tab width:"
-msgstr "Åirina _tabulatorja:"
+msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+msgstr "Med nalaganjem naj bodo preverjeni nabori v vrsti (na primer: utf8, iso1250)"
 
 #: ../data/ui/preferences.ui.h:25
-msgid "_Use the system fixed width font"
-msgstr "_Uporabi sistemsko pisavo doloÄene Åirine"
+msgid "Encoding"
+msgstr "Nabor znakov"
 
 #: ../data/ui/vcview.ui.h:1
-msgid "Commit Files"
-msgstr "Uveljavi datoteke"
+msgid "VC Log"
+msgstr "VC dnevnik"
 
 #: ../data/ui/vcview.ui.h:2
-msgid "Compare Options"
-msgstr "MoÅnosti primerjave"
+msgid "Commit Files"
+msgstr "Uveljavi datoteke"
 
 #: ../data/ui/vcview.ui.h:3
-msgid "Date"
-msgstr "Datum"
+msgid "Previous Logs"
+msgstr "Predhodni dnevniki"
 
 #: ../data/ui/vcview.ui.h:4
-msgid "Local copy against other remote revision"
-msgstr "Krajevna razliÄica napram drugi oddaljeni razliÄici"
-
-#: ../data/ui/vcview.ui.h:5
-msgid "Local copy against same remote revision"
-msgstr "Krajevna razliÄica napram enaki oddaljeni razliÄici"
-
-#: ../data/ui/vcview.ui.h:6
 msgid "Log Message"
 msgstr "SporoÄilo beleÅenja"
 
-#: ../data/ui/vcview.ui.h:7
-msgid "Previous Logs"
-msgstr "Predhodni dnevniki"
-
-#: ../data/ui/vcview.ui.h:8
-#: ../meld/vcview.py:179
-msgid "Tag"
-msgstr "Oznaka"
-
-#: ../data/ui/vcview.ui.h:9
-msgid "VC Log"
-msgstr "VC dnevnik"
-
-#: ../meld/dirdiff.py:226
-#: ../meld/vcview.py:118
+#: ../meld/dirdiff.py:232
+#: ../meld/vcview.py:127
 msgid "_Compare"
 msgstr "_Primerjava"
 
-#: ../meld/dirdiff.py:226
-#: ../meld/vcview.py:118
+#: ../meld/dirdiff.py:232
+#: ../meld/vcview.py:127
 msgid "Compare selected"
 msgstr "Primerjaj izbrano"
 
-#: ../meld/dirdiff.py:227
+#: ../meld/dirdiff.py:233
 msgid "Copy _Left"
 msgstr "Kopiraj _levo"
 
-#: ../meld/dirdiff.py:227
+#: ../meld/dirdiff.py:233
 msgid "Copy to left"
 msgstr "Kopiraj na levo"
 
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:234
 msgid "Copy _Right"
 msgstr "Kopiraj _desno"
 
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:234
 msgid "Copy to right"
 msgstr "Kopiraj na desno"
 
-#: ../meld/dirdiff.py:229
+#: ../meld/dirdiff.py:235
 msgid "Delete selected"
 msgstr "IzbriÅi izbor"
 
-#: ../meld/dirdiff.py:230
-#: ../meld/filediff.py:1157
+#: ../meld/dirdiff.py:236
+#: ../meld/filediff.py:1165
 msgid "Hide"
 msgstr "Skrij"
 
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:236
 msgid "Hide selected"
 msgstr "Skrij izbrano"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:240
 msgid "Case"
 msgstr "Ärke"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:240
 msgid "Ignore case of entries"
 msgstr "Prezri velikosti Ärk"
 
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:241
 msgid "Same"
 msgstr "Enako"
 
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:241
 msgid "Show identical"
 msgstr "PokaÅi enako"
 
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:242
 msgid "New"
 msgstr "Novo"
 
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:242
 msgid "Show new"
 msgstr "PokaÅi novejÅe"
 
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:243
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: ../meld/dirdiff.py:237
-#: ../meld/vcview.py:131
+#: ../meld/dirdiff.py:243
+#: ../meld/vcview.py:140
 msgid "Show modified"
 msgstr "PokaÅi spremenjeno"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:245
 msgid "Filters"
 msgstr "Filtri"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:245
 msgid "Set active filters"
 msgstr "DoloÄi dejavne filtre"
 
-#: ../meld/dirdiff.py:355
+#: ../meld/dirdiff.py:362
 #, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:458
-#: ../meld/dirdiff.py:471
-#: ../meld/vcview.py:304
-#: ../meld/vcview.py:332
+#: ../meld/dirdiff.py:466
+#: ../meld/dirdiff.py:479
+#: ../meld/vcview.py:323
+#: ../meld/vcview.py:347
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:570
+#: ../meld/dirdiff.py:578
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] konÄano"
 
-#: ../meld/dirdiff.py:574
+#: ../meld/dirdiff.py:582
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je priÅlo do veÄ napak."
 
-#: ../meld/dirdiff.py:575
+#: ../meld/dirdiff.py:583
 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:577
+#: ../meld/dirdiff.py:585
 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:579
+#: ../meld/dirdiff.py:587
 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:581
+#: ../meld/dirdiff.py:589
 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:592
+#: ../meld/dirdiff.py:600
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:617
+#: ../meld/dirdiff.py:625
 #: ../meld/filediff.py:1008
-#: ../meld/filediff.py:1161
+#: ../meld/filediff.py:1169
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/dirdiff.py:667
+#: ../meld/dirdiff.py:675
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -517,7 +496,7 @@ msgstr ""
 "'%s' Åe obstaja.\n"
 "Ali naj bo prepisana?"
 
-#: ../meld/dirdiff.py:674
+#: ../meld/dirdiff.py:682
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -528,8 +507,8 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:692
-#: ../meld/vcview.py:504
+#: ../meld/dirdiff.py:700
+#: ../meld/vcview.py:536
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -538,8 +517,8 @@ msgstr ""
 "'%s' je mapa.\n"
 "Ali naj bo odstranjena vsa vsebina?"
 
-#: ../meld/dirdiff.py:699
-#: ../meld/vcview.py:509
+#: ../meld/dirdiff.py:707
+#: ../meld/vcview.py:541
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -550,7 +529,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:711
+#: ../meld/dirdiff.py:741
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -559,7 +538,7 @@ msgstr[1] "%i sekunda"
 msgstr[2] "%i sekundi"
 msgstr[3] "%i sekunde"
 
-#: ../meld/dirdiff.py:712
+#: ../meld/dirdiff.py:742
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -568,7 +547,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuti"
 msgstr[3] "%i minute"
 
-#: ../meld/dirdiff.py:713
+#: ../meld/dirdiff.py:743
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -577,7 +556,7 @@ msgstr[1] "%i ura"
 msgstr[2] "%i uri"
 msgstr[3] "%i ure"
 
-#: ../meld/dirdiff.py:714
+#: ../meld/dirdiff.py:744
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -586,7 +565,7 @@ msgstr[1] "%i dan"
 msgstr[2] "%i dni"
 msgstr[3] "%i dni"
 
-#: ../meld/dirdiff.py:715
+#: ../meld/dirdiff.py:745
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -595,7 +574,7 @@ msgstr[1] "%i teden"
 msgstr[2] "%i tedna"
 msgstr[3] "%i tedni"
 
-#: ../meld/dirdiff.py:716
+#: ../meld/dirdiff.py:746
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -604,7 +583,7 @@ msgstr[1] "%i mesec"
 msgstr[2] "%i meseca"
 msgstr[3] "%i meseci"
 
-#: ../meld/dirdiff.py:717
+#: ../meld/dirdiff.py:747
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -813,19 +792,19 @@ msgstr "%s ni zapisan v naboru: %s"
 msgid "[%s] Computing differences"
 msgstr "[%s] RaÄunanje razlik"
 
-#: ../meld/filediff.py:1148
+#: ../meld/filediff.py:1156
 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:1154
+#: ../meld/filediff.py:1162
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1164
+#: ../meld/filediff.py:1172
 msgid "Show without filters"
 msgstr "PokaÅi brez filtrov"
 
-#: ../meld/filediff.py:1354
+#: ../meld/filediff.py:1361
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -834,7 +813,7 @@ msgstr ""
 "\"%s\" Åe obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1367
+#: ../meld/filediff.py:1374
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -845,12 +824,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1376
+#: ../meld/filediff.py:1383
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:1391
+#: ../meld/filediff.py:1398
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -861,7 +840,7 @@ msgstr ""
 "\n"
 "Kateri zapis Åelite uporabiti?"
 
-#: ../meld/filediff.py:1407
+#: ../meld/filediff.py:1414
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -870,7 +849,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:1466
+#: ../meld/filediff.py:1473
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -888,78 +867,78 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] ZdruÅevanje datotek"
 
-#: ../meld/meldapp.py:149
+#: ../meld/meldapp.py:152
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Neveljavno Åtevilo argumentov pri ukazu --diff."
 
-#: ../meld/meldapp.py:153
+#: ../meld/meldapp.py:156
 msgid "Start with an empty window"
 msgstr "Zagon brez odprtih oken"
 
-#: ../meld/meldapp.py:154
-#: ../meld/meldapp.py:155
 #: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:160
 msgid "file"
 msgstr "datoteka"
 
-#: ../meld/meldapp.py:154
-#: ../meld/meldapp.py:156
 #: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:159
+#: ../meld/meldapp.py:160
 msgid "dir"
 msgstr "mapa"
 
-#: ../meld/meldapp.py:154
+#: ../meld/meldapp.py:157
 msgid "Start a version control comparison"
 msgstr "Zagon primerjave nadzora razliÄic"
 
-#: ../meld/meldapp.py:155
+#: ../meld/meldapp.py:158
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:159
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo map"
 
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:160
 msgid "Start a comparison between file and dir/file"
 msgstr "Zagon primerjave med datoteko in mapo/datoteko"
 
-#: ../meld/meldapp.py:163
+#: ../meld/meldapp.py:166
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je orodje za primerjavo vsebine datotek in map."
 
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:169
 msgid "Set label to use instead of file name"
 msgstr "DoloÄi naslov namesto imena datoteke"
 
-#: ../meld/meldapp.py:168
+#: ../meld/meldapp.py:171
 msgid "Automatically compare all differing files on startup"
 msgstr "Ob zagonu samodejno primerjaj vse razliÄne datoteke."
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:173
 msgid "Ignored for compatibility"
 msgstr "Prezrto zaradi skladnosti"
 
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:176
 msgid "Set the target file for saving a merge result"
 msgstr "DoloÄitev ciljne datoteke za shranjevanje rezultatov zdruÅevanja."
 
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:179
 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:179
+#: ../meld/meldapp.py:182
 #, python-format
 msgid "too many arguments (wanted 0-4, got %d)"
 msgstr "preveÄ argumentov (zahtevanih 0-4, prejetih %d)"
 
-#: ../meld/meldapp.py:181
-#: ../meld/meldapp.py:185
+#: ../meld/meldapp.py:184
+#: ../meld/meldapp.py:188
 msgid "can't compare more than three directories"
 msgstr "ni mogoÄe primerjati veÄ kot treh map"
 
-#: ../meld/melddoc.py:49
-#: ../meld/melddoc.py:50
+#: ../meld/melddoc.py:56
+#: ../meld/melddoc.py:57
 msgid "untitled"
 msgstr "neimenovano"
 
@@ -1213,38 +1192,38 @@ msgstr "oznaka"
 msgid "pattern"
 msgstr "vzorec"
 
-#: ../meld/preferences.py:105
+#: ../meld/preferences.py:111
 msgid "Only available if you have gnome-python-desktop installed"
 msgstr "Na voljo le, Äe je nameÅÄen paket gnome-python-desktop"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:233
+#: ../meld/preferences.py:234
 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:235
+#: ../meld/preferences.py:236
 msgid "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db Desktop.ini\n"
 msgstr "ZnaÄilni metapodatki OS\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db Desktop.ini\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:237
+#: ../meld/preferences.py:238
 #, 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:239
+#: ../meld/preferences.py:240
 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:241
+#: ../meld/preferences.py:242
 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:243
+#: ../meld/preferences.py:244
 msgid ""
 "CVS keywords\t0\t\\$\\w+(:[^\\n"
 "$]+)?\\$\n"
@@ -1253,182 +1232,186 @@ msgstr ""
 "$]+)?\\$\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:245
+#: ../meld/preferences.py:246
 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:247
+#: ../meld/preferences.py:248
 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:249
+#: ../meld/preferences.py:250
 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:251
+#: ../meld/preferences.py:252
 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:253
+#: ../meld/preferences.py:254
 msgid "Script comment\t0\t#.*"
 msgstr "Opomba skripta\t0\t#.*"
 
-#: ../meld/vcview.py:119
+#: ../meld/vcview.py:128
 msgid "Co_mmit"
 msgstr "_Uveljavi"
 
-#: ../meld/vcview.py:119
+#: ../meld/vcview.py:128
 msgid "Commit"
 msgstr "Uveljavi"
 
-#: ../meld/vcview.py:120
+#: ../meld/vcview.py:129
 msgid "_Update"
 msgstr "_Posodobi"
 
-#: ../meld/vcview.py:120
+#: ../meld/vcview.py:129
 msgid "Update"
 msgstr "Posodobi"
 
-#: ../meld/vcview.py:121
+#: ../meld/vcview.py:130
 msgid "Add to VC"
 msgstr "Dodaj v VC"
 
-#: ../meld/vcview.py:122
+#: ../meld/vcview.py:131
 msgid "Add _Binary"
 msgstr "Dodaj _dvojiÅko"
 
-#: ../meld/vcview.py:122
+#: ../meld/vcview.py:131
 msgid "Add binary to VC"
 msgstr "Dodaj dvojiÅko datoteko v VC"
 
-#: ../meld/vcview.py:123
+#: ../meld/vcview.py:132
 msgid "Remove from VC"
 msgstr "Odstrani iz VC"
 
-#: ../meld/vcview.py:124
+#: ../meld/vcview.py:133
 msgid "_Resolved"
 msgstr "_RazreÅeno"
 
-#: ../meld/vcview.py:124
+#: ../meld/vcview.py:133
 msgid "Mark as resolved for VC"
 msgstr "OznaÄi kot razreÅeno v VC"
 
-#: ../meld/vcview.py:125
+#: ../meld/vcview.py:134
 msgid "Revert to original"
 msgstr "_Povrni na izvirne vrednosti"
 
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:135
 msgid "Delete locally"
 msgstr "IzbriÅi krajevno"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:139
 msgid "_Flatten"
 msgstr "_Razpni"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:139
 msgid "Flatten directories"
 msgstr "_Razpni mape"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:140
 msgid "_Modified"
 msgstr "_Spremenjeno"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:141
 msgid "_Normal"
 msgstr "_ObiÄajno"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:141
 msgid "Show normal"
 msgstr "PokaÅi obiÄajno"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:142
 msgid "Non _VC"
 msgstr "Ni _VC"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:142
 msgid "Show unversioned files"
 msgstr "PokaÅi datoteke z nedoloÄenimi razliÄicami"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:143
 msgid "Ignored"
 msgstr "Prezrto"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:143
 msgid "Show ignored files"
 msgstr "PokaÅi prezrte datoteke"
 
-#: ../meld/vcview.py:176
-#: ../meld/vcview.py:300
+#: ../meld/vcview.py:186
+#: ../meld/vcview.py:319
 msgid "Location"
 msgstr "Mesto"
 
-#: ../meld/vcview.py:177
+#: ../meld/vcview.py:187
 msgid "Status"
 msgstr "Stanje"
 
-#: ../meld/vcview.py:178
+#: ../meld/vcview.py:188
 msgid "Rev"
 msgstr "Rev"
 
-#: ../meld/vcview.py:180
+#: ../meld/vcview.py:189
+msgid "Tag"
+msgstr "Oznaka"
+
+#: ../meld/vcview.py:190
 msgid "Options"
 msgstr "MoÅnosti"
 
-#: ../meld/vcview.py:232
+#: ../meld/vcview.py:249
 msgid "Choose one Version Control"
 msgstr "Izbor nadzora razliÄic"
 
-#: ../meld/vcview.py:233
+#: ../meld/vcview.py:250
 msgid "Only one Version Control in this directory"
 msgstr "V tej mapi je le en nadzornik razliÄic"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:246
+#: ../meld/vcview.py:263
 #, python-format
 msgid "%s Not Installed"
 msgstr "%s paket ni nameÅÄen"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:250
+#: ../meld/vcview.py:267
 msgid "Invalid Repository"
 msgstr "Neveljavno skladiÅÄe"
 
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:276
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:300
+#: ../meld/vcview.py:319
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:348
+#: ../meld/vcview.py:363
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:386
+#: ../meld/vcview.py:401
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Iskanje razlik"
 
-#: ../meld/vcview.py:394
+#: ../meld/vcview.py:409
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Pripenjanje popravka"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:511
 msgid "Select some files first."
 msgstr "Najprej je treba izbrati datoteke."
 
-#: ../meld/vcview.py:552
+#: ../meld/vcview.py:584
 #, python-format
 msgid ""
 "\n"
@@ -1530,6 +1513,18 @@ msgstr ""
 "DoloÄen je bil vzorec '%s'\n"
 "Javljena napaka je '%s'"
 
+#~ msgid "Compare Options"
+#~ msgstr "MoÅnosti primerjave"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Local copy against other remote revision"
+#~ msgstr "Krajevna razliÄica napram drugi oddaljeni razliÄici"
+
+#~ msgid "Local copy against same remote revision"
+#~ msgstr "Krajevna razliÄica napram enaki oddaljeni razliÄici"
+
 #~ msgid "Open selected"
 #~ msgstr "Odpri izbrano"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]