GNOME.org
 

[meld] Updated Slovenian translation

commit 67a743df6407ce982171a818ac267c15665cd960
Author: Matej UrbanÄ?iÄ? <mateju svn gnome org>
Date:   Thu May 27 15:11:03 2010 +0200

    Updated Slovenian translation

 po/sl.po |  696 ++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 365 insertions(+), 331 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index ebe97bb..488c937 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&component=general\n";
-"POT-Creation-Date: 2010-03-02 07:00+0000\n"
-"PO-Revision-Date: 2010-03-02 15:30+0100\n"
+"POT-Creation-Date: 2010-05-25 18:45+0000\n"
+"PO-Revision-Date: 2010-05-27 09:27+0100\n"
 "Last-Translator: Matej UrbanÄ?iÄ? <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,7 @@ msgstr "Ni mogoÄ?e uvoziti:"
 #: ../bin/meld:80
 #, c-format
 msgid "Meld requires %s or higher."
-msgstr "Program Meld zahteva razliÄ?ico %s ali viÅ¡je."
+msgstr "Program Meld zahteva najmanj razliÄ?ico %s."
 
 #: ../data/meld.desktop.in.h:1
 msgid "Compare and merge your files"
@@ -38,7 +38,7 @@ msgid "Diff Viewer"
 msgstr "Pregledovalnik sprememb"
 
 #: ../data/meld.desktop.in.h:3
-#: ../data/ui/meldapp.glade.h:20
+#: ../data/ui/meldapp.glade.h:4
 msgid "Meld"
 msgstr "Meld"
 
@@ -52,14 +52,14 @@ msgid ""
 "Which ones would you like to save?</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Nekatere datoteke so bile spremenjene.\n"
-"Katere datoteke naj bodo shranjene?</span>"
+"Katere datoteke naj se shranjenijo?</span>"
 
 #: ../data/ui/filediff.glade.h:3
 msgid "Copy to Clipboard"
 msgstr "Kopiraj v odložiÅ¡Ä?e"
 
 #: ../data/ui/filediff.glade.h:4
-#: ../meld/filediff.py:180
+#: ../meld/filediff.py:179
 msgid "Create Patch"
 msgstr "Ustvari popravek"
 
@@ -104,7 +104,7 @@ msgid "_Previous"
 msgstr "_Predhodni"
 
 #: ../data/ui/findbar.glade.h:8
-#: ../meld/meldapp.py:443
+#: ../meld/meldapp.py:154
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
@@ -113,180 +113,172 @@ msgid "_Search for"
 msgstr "_PoiÅ¡Ä?i"
 
 #: ../data/ui/meldapp.glade.h:1
-msgid "<b>Edit Menu</b>"
-msgstr "<b>Uredi meni</b>"
+msgid "Choose Files"
+msgstr "Izbor datotek"
 
 #: ../data/ui/meldapp.glade.h:2
-msgid "<b>Font</b>"
-msgstr "<b>Pisava</b>"
+msgid "Copyright © 2002-2009 Stephen Kennedy"
+msgstr "Avtorske pravice © 2002-2009 Stephen Kennedy"
 
 #: ../data/ui/meldapp.glade.h:3
-msgid "<b>Loading</b>"
-msgstr "<b>Nalaganje</b>"
-
-#: ../data/ui/meldapp.glade.h:4
-msgid "<b>Misc</b>"
-msgstr "<b>Razno</b>"
+msgid "Directory"
+msgstr "Mapa"
 
 #: ../data/ui/meldapp.glade.h:5
-msgid "Automatically supply missing newline at end of file"
-msgstr "Samodejno vstavi manjkajoÄ?o novo vrstico na koncu datoteke"
+msgid "Mine"
+msgstr "Lastno"
 
 #: ../data/ui/meldapp.glade.h:6
-msgid "Choose Files"
-msgstr "Izbor datotek"
+msgid "Original"
+msgstr "Izvorno"
 
 #: ../data/ui/meldapp.glade.h:7
-msgid "Copyright © 2002-2009 Stephen Kennedy"
-msgstr "Avtorske pravice © 2002-2009 Stephen Kennedy"
+msgid "Other"
+msgstr "Drugo"
 
 #: ../data/ui/meldapp.glade.h:8
-msgid "Custom command"
-msgstr "Ukaz po meri"
+msgid "Three way directory"
+msgstr "Trojni pogled map"
 
 #: ../data/ui/meldapp.glade.h:9
-msgid "Directory"
-msgstr "Mapa"
+msgid "Three way file"
+msgstr "Trojni pogled datotek"
 
 #: ../data/ui/meldapp.glade.h:10
-msgid "Edit files with:"
-msgstr "Uredi datoteke z:"
+msgid "Two way directory"
+msgstr "Dvojni pogled map"
 
 #: ../data/ui/meldapp.glade.h:11
-msgid "Editor"
-msgstr "Urejevalnik"
+msgid "Two way file"
+msgstr "Dvojni pogled datotek"
 
 #: ../data/ui/meldapp.glade.h:12
-msgid "Encoding"
-msgstr "Nabor znakov"
+msgid "Version control view"
+msgstr "Pogled nadzora razliÄ?ic"
 
 #: ../data/ui/meldapp.glade.h:13
-msgid "File Filters"
-msgstr "Filtri datotek"
+msgid "_Directory Comparison"
+msgstr "_Primerjava vsebine map"
 
 #: ../data/ui/meldapp.glade.h:14
-msgid "Gnome default editor"
-msgstr "Privzeti urejevalnik Gnome"
+msgid "_File Comparison"
+msgstr "_Primerjava datotek"
 
 #: ../data/ui/meldapp.glade.h:15
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "Prezri spremembe, s katerimi se vstavijo ali izbrišejo prazne vrstice"
+msgid "_Three Way Compare"
+msgstr "_Trojna primerjava"
 
 #: ../data/ui/meldapp.glade.h:16
-msgid "Ignore symbolic links"
-msgstr "Prezri simbolne povezave"
+msgid "_Version Control Browser"
+msgstr "_Brskalnik po nadzoru razliÄ?ic"
 
-#: ../data/ui/meldapp.glade.h:17
-msgid "Insert spaces instead of tabs"
-msgstr "Vstavi presledke namesto tabulatorjev"
+#: ../data/ui/preferences.glade.h:1
+msgid "<b>Display</b>"
+msgstr "<b>Prikaz</b>"
 
-#: ../data/ui/meldapp.glade.h:18
-msgid "Internal editor"
-msgstr "Notranji urejevalnik"
+#: ../data/ui/preferences.glade.h:2
+msgid "<b>Edit Menu</b>"
+msgstr "<b>Uredi meni</b>"
 
-#: ../data/ui/meldapp.glade.h:19
-msgid "Line Wrapping "
-msgstr "Prelom vrstic"
+#: ../data/ui/preferences.glade.h:3
+msgid "<b>Font</b>"
+msgstr "<b>Pisava</b>"
 
-#: ../data/ui/meldapp.glade.h:21
-msgid "Mine"
-msgstr "Lastno"
+#: ../data/ui/preferences.glade.h:4
+msgid "<b>Loading</b>"
+msgstr "<b>Nalaganje</b>"
 
-#: ../data/ui/meldapp.glade.h:22
-msgid "Original"
-msgstr "Izvorno"
+#: ../data/ui/preferences.glade.h:5
+msgid "Custom command"
+msgstr "Ukaz po meri"
 
-#: ../data/ui/meldapp.glade.h:23
-msgid "Other"
-msgstr "Ostalo"
+#: ../data/ui/preferences.glade.h:6
+msgid "Do not _split words over two lines"
+msgstr "Ne _deli besed preko dveh vrstic"
 
-#: ../data/ui/meldapp.glade.h:24
-msgid "Preferences : Meld"
-msgstr "Možnosti : Meld"
+#: ../data/ui/preferences.glade.h:7
+msgid "Edit files with:"
+msgstr "Uredi datoteke z:"
 
-#: ../data/ui/meldapp.glade.h:25
-msgid "Show line numbers"
-msgstr "Pokaži številke vrstic"
+#: ../data/ui/preferences.glade.h:8
+msgid "Editor"
+msgstr "Urejevalnik"
 
-#: ../data/ui/meldapp.glade.h:26
-msgid "Tab width"
-msgstr "Å irina tabulatorja"
+#: ../data/ui/preferences.glade.h:9
+msgid "Enable text _wrapping"
+msgstr "OmogoÄ?i _prelom besedila"
 
-#: ../data/ui/meldapp.glade.h:27
-msgid "Text Filters"
-msgstr "Filtri besedila"
+#: ../data/ui/preferences.glade.h:10
+msgid "Encoding"
+msgstr "Nabor znakov"
 
-#: ../data/ui/meldapp.glade.h:28
-msgid "Three way directory"
-msgstr "Trojni pogled map"
+#: ../data/ui/preferences.glade.h:11
+msgid "File Filters"
+msgstr "Filtri datotek"
 
-#: ../data/ui/meldapp.glade.h:29
-msgid "Three way file"
-msgstr "Trojni pogled datotek"
+#: ../data/ui/preferences.glade.h:12
+msgid "Gnome default editor"
+msgstr "Privzeti urejevalnik Gnome"
 
-#: ../data/ui/meldapp.glade.h:30
-msgid "Two way directory"
-msgstr "Dvojni pogled map"
+#: ../data/ui/preferences.glade.h:13
+msgid "Ignore changes which insert or delete blank lines"
+msgstr "Prezri spremembe, s katerimi se vstavijo ali izbrišejo prazne vrstice"
 
-#: ../data/ui/meldapp.glade.h:31
-msgid "Two way file"
-msgstr "Dvojni pogled datotek"
+#: ../data/ui/preferences.glade.h:14
+msgid "Ignore symbolic links"
+msgstr "Prezri simbolne povezave"
 
-#: ../data/ui/meldapp.glade.h:32
-msgid "Use GNOME monospace font"
-msgstr "Uporabi pisavo enotne Å¡irine"
+#: ../data/ui/preferences.glade.h:15
+msgid "Internal editor"
+msgstr "Notranji urejevalnik"
 
-#: ../data/ui/meldapp.glade.h:33
-msgid "Use custom font"
-msgstr "Uporabi pisavo po meri"
+#: ../data/ui/preferences.glade.h:16
+msgid "Meld Preferences"
+msgstr "Možnosti Meld"
 
-#: ../data/ui/meldapp.glade.h:34
-msgid "Use syntax highlighting"
-msgstr "Uporabi barvno poudarjanje skladnje"
+#: ../data/ui/preferences.glade.h:17
+msgid "Show _line numbers"
+msgstr "Pokaži _številke vrstic"
 
-#: ../data/ui/meldapp.glade.h:35
-msgid "Version control view"
-msgstr "Pogled nadzora razliÄ?ic"
+#: ../data/ui/preferences.glade.h:18
+msgid "Text Filters"
+msgstr "Filtri besedila"
+
+#: ../data/ui/preferences.glade.h:19
+msgid "Use s_yntax highlighting"
+msgstr "Uporabi _barvno poudarjanje skladnje"
 
-#: ../data/ui/meldapp.glade.h:36
+#: ../data/ui/preferences.glade.h:20
 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/meldapp.glade.h:37
+#: ../data/ui/preferences.glade.h:21
 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/meldapp.glade.h:38
+#: ../data/ui/preferences.glade.h:22
 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/meldapp.glade.h:39
-msgid "_Character"
-msgstr "_Znak"
-
-#: ../data/ui/meldapp.glade.h:40
-msgid "_Directory Comparison"
-msgstr "_Primerjava vsebine map"
-
-#: ../data/ui/meldapp.glade.h:41
-msgid "_File Comparison"
-msgstr "_Primerjava datotek"
+#: ../data/ui/preferences.glade.h:23
+msgid "_Automatically supply missing newline at end of file"
+msgstr "Samodejno vstavi manjkajoÄ?o _novo vrstico na koncu datoteke"
 
-#: ../data/ui/meldapp.glade.h:42
-msgid "_None"
-msgstr "_Brez"
+#: ../data/ui/preferences.glade.h:24
+msgid "_Editor font:"
+msgstr "Pisava _urejevalnika:"
 
-#: ../data/ui/meldapp.glade.h:43
-msgid "_Three Way Compare"
-msgstr "_Trojna primerjava"
+#: ../data/ui/preferences.glade.h:25
+msgid "_Insert spaces instead of tabs"
+msgstr "Vstavi _presledke namesto tabulatorjev"
 
-#: ../data/ui/meldapp.glade.h:44
-msgid "_Version Control Browser"
-msgstr "_Brskalnik po nadzoru razliÄ?ic"
+#: ../data/ui/preferences.glade.h:26
+msgid "_Tab width:"
+msgstr "Å irina _tabulatorja:"
 
-#: ../data/ui/meldapp.glade.h:45
-msgid "_Word"
-msgstr "_Beseda"
+#: ../data/ui/preferences.glade.h:27
+msgid "_Use the system fixed width font"
+msgstr "_Uporabi sistemsko pisavo doloÄ?ene Å¡irine"
 
 #: ../data/ui/vcview.glade.h:1
 msgid "Commit Files"
@@ -314,7 +306,7 @@ msgstr "SporoÄ?ilo beleženja"
 
 #: ../data/ui/vcview.glade.h:7
 msgid "Previous Logs"
-msgstr "Predhodno beleženje"
+msgstr "Predhodni dnevniki"
 
 #: ../data/ui/vcview.glade.h:8
 #: ../meld/vcview.py:183
@@ -340,7 +332,7 @@ msgid "Left"
 msgstr "Levo"
 
 #: ../meld/dirdiff.py:185
-#: ../meld/filediff.py:187
+#: ../meld/filediff.py:186
 msgid "Copy To Left"
 msgstr "Kopiraj na levo"
 
@@ -349,7 +341,7 @@ msgid "Right"
 msgstr "Desno"
 
 #: ../meld/dirdiff.py:186
-#: ../meld/filediff.py:188
+#: ../meld/filediff.py:187
 msgid "Copy To Right"
 msgstr "Kopiraj na desno"
 
@@ -358,7 +350,7 @@ msgid "Delete selected"
 msgstr "Izbriši izbor"
 
 #: ../meld/dirdiff.py:188
-#: ../meld/filediff.py:759
+#: ../meld/filediff.py:793
 msgid "Hide"
 msgstr "Skrij"
 
@@ -367,7 +359,7 @@ msgid "Hide selected"
 msgstr "Skrij izbrano"
 
 #: ../meld/dirdiff.py:190
-#: ../meld/filediff.py:179
+#: ../meld/filediff.py:178
 #: ../meld/vcview.py:126
 msgid "Open selected"
 msgstr "Odpri izbrano"
@@ -426,8 +418,8 @@ msgstr "Skrij %s"
 
 #: ../meld/dirdiff.py:394
 #: ../meld/dirdiff.py:404
-#: ../meld/vcview.py:272
-#: ../meld/vcview.py:300
+#: ../meld/vcview.py:276
+#: ../meld/vcview.py:304
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
@@ -472,7 +464,7 @@ msgstr ""
 "%s."
 
 #: ../meld/dirdiff.py:587
-#: ../meld/vcview.py:464
+#: ../meld/vcview.py:463
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -482,14 +474,14 @@ msgstr ""
 "Ali naj bo odstranjena vsa vsebina?"
 
 #: ../meld/dirdiff.py:594
-#: ../meld/vcview.py:469
+#: ../meld/vcview.py:468
 #, python-format
 msgid ""
 "Error removing %s\n"
 "\n"
 "%s."
 msgstr ""
-"napaka med odstranjevanjem %s\n"
+"Napaka med odstranjevanjem %s\n"
 "\n"
 "%s."
 
@@ -556,56 +548,56 @@ msgstr[1] "%i leto"
 msgstr[2] "%i leti"
 msgstr[3] "%i leta"
 
-#: ../meld/filediff.py:180
+#: ../meld/filediff.py:179
 msgid "Create a patch"
 msgstr "Ustvari programski popravek"
 
-#: ../meld/filediff.py:181
+#: ../meld/filediff.py:180
 msgid "Push to left"
 msgstr "Potisni levo"
 
-#: ../meld/filediff.py:181
+#: ../meld/filediff.py:180
 msgid "Push current change to the left"
 msgstr "Potisni trenutne spremembe na levo"
 
-#: ../meld/filediff.py:182
+#: ../meld/filediff.py:181
 msgid "Push to right"
 msgstr "Potisni desno"
 
-#: ../meld/filediff.py:182
+#: ../meld/filediff.py:181
 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:184
+#: ../meld/filediff.py:183
 msgid "Pull from left"
 msgstr "Potegni z leve"
 
-#: ../meld/filediff.py:184
+#: ../meld/filediff.py:183
 msgid "Pull change from the left"
 msgstr "Potegni spremembe z leve"
 
-#: ../meld/filediff.py:185
+#: ../meld/filediff.py:184
 msgid "Pull from right"
 msgstr "Potegni z desne"
 
-#: ../meld/filediff.py:185
+#: ../meld/filediff.py:184
 msgid "Pull change from the right"
 msgstr "Potegni spremembe z desne"
 
-#: ../meld/filediff.py:186
+#: ../meld/filediff.py:185
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../meld/filediff.py:186
+#: ../meld/filediff.py:185
 msgid "Delete change"
 msgstr "Izbriši spremembo"
 
-#: ../meld/filediff.py:187
+#: ../meld/filediff.py:186
 msgid "Copy all changes from right pane to left pane"
 msgstr "Kopiraj vse spremembe iz desne polovice na levo"
 
-#: ../meld/filediff.py:188
+#: ../meld/filediff.py:187
 msgid "Copy all changes from left pane to right pane"
 msgstr "Kopiraj vse spremembe iz leve polovice na desno"
 
@@ -624,63 +616,64 @@ msgstr "PRE"
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:386
+#: ../meld/filediff.py:392
 #, 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."
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:483
+#: ../meld/filediff.py:489
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: ../meld/filediff.py:664
+#: ../meld/filediff.py:674
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] DoloÄ?i okna"
 
-#: ../meld/filediff.py:670
+#: ../meld/filediff.py:680
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:676
-#: ../meld/filediff.py:763
+#: ../meld/filediff.py:686
+#: ../meld/filediff.py:797
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/filediff.py:697
-#: ../meld/filediff.py:708
-#: ../meld/filediff.py:721
-#: ../meld/filediff.py:727
+#: ../meld/filediff.py:707
+#: ../meld/filediff.py:718
+#: ../meld/filediff.py:731
+#: ../meld/filediff.py:737
 msgid "Could not read file"
 msgstr "Ni mogoÄ?e prebrati datoteke"
 
-#: ../meld/filediff.py:700
+#: ../meld/filediff.py:710
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:709
+#: ../meld/filediff.py:719
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiška datoteka."
 
-#: ../meld/filediff.py:722
+#: ../meld/filediff.py:732
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:747
+#: ../meld/filediff.py:757
+#: ../meld/filemerge.py:70
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] RaÄ?unanje razlik"
 
-#: ../meld/filediff.py:758
+#: ../meld/filediff.py:791
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:913
+#: ../meld/filediff.py:925
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -689,7 +682,7 @@ msgstr ""
 "\"%s\" že obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:926
+#: ../meld/filediff.py:938
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -700,23 +693,23 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:935
+#: ../meld/filediff.py:947
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:949
+#: ../meld/filediff.py:961
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
 "\n"
 "Which format would you like to use?"
 msgstr ""
-"Datoteka '%s' vsebuje meÅ¡anico razliÄ?nih zakljuÄ?nih znakov vrstic.\n"
+"Datoteka '%s' vsebuje razliÄ?ne zakljuÄ?ne znake vrstic.\n"
 "\n"
 "Kateri zapis želite uporabiti?"
 
-#: ../meld/filediff.py:965
+#: ../meld/filediff.py:977
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -726,11 +719,11 @@ msgstr ""
 "Ali naj se datoteka shrani v naboru UTF-8?"
 
 #. save as
-#: ../meld/filediff.py:1003
+#: ../meld/filediff.py:1015
 msgid "Save patch as..."
 msgstr "Shrani popravke kot ..."
 
-#: ../meld/filediff.py:1061
+#: ../meld/filediff.py:1073
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -743,319 +736,248 @@ msgstr ""
 "\n"
 "Dejanja ni mogoÄ?e povrniti."
 
-#: ../meld/meldapp.py:151
-msgid "label"
-msgstr "oznaka"
-
-#: ../meld/meldapp.py:151
-msgid "pattern"
-msgstr "vzorec"
-
-#: ../meld/meldapp.py:219
-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/meldapp.py:229
-#: ../meld/meldapp.py:234
-#: ../meld/vcview.py:163
-msgid "Name"
-msgstr "Ime"
-
-#: ../meld/meldapp.py:229
-#: ../meld/meldapp.py:234
-msgid "Active"
-msgstr "Dejavno"
-
-#: ../meld/meldapp.py:229
-msgid "Pattern"
-msgstr "Vzorec"
-
-#: ../meld/meldapp.py:234
-msgid "Regex"
-msgstr "LogiÄ?ni izraz"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:341
-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/meldapp.py:343
+#: ../meld/filemerge.py:78
 #, 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/meldapp.py:345
-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/meldapp.py:347
-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/meldapp.py:349
-msgid ""
-"CVS keywords\t0\t\\$\\w+(:[^\\n"
-"$]+)?\\$\n"
-msgstr ""
-"KljuÄ?ne besede CVS\t0\t\\$\\w+(:[^\\n"
-"$]+)?\\$\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:351
-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/meldapp.py:353
-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/meldapp.py:355
-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/meldapp.py:357
-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/meldapp.py:359
-msgid "Script comment\t0\t#.*"
-msgstr "Opomba skripta\t0\t#.*"
+msgid "[%s] Merging files"
+msgstr "[%s] Združevanje datotek"
 
-#: ../meld/meldapp.py:428
+#: ../meld/meldapp.py:139
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../meld/meldapp.py:429
+#: ../meld/meldapp.py:140
 msgid "_New..."
 msgstr "_Novo ..."
 
-#: ../meld/meldapp.py:429
+#: ../meld/meldapp.py:140
 msgid "Start a new comparison"
 msgstr "Nova primerjava"
 
-#: ../meld/meldapp.py:430
+#: ../meld/meldapp.py:141
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
-#: ../meld/meldapp.py:432
+#: ../meld/meldapp.py:143
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
-#: ../meld/meldapp.py:433
+#: ../meld/meldapp.py:144
 msgid "Quit the program"
 msgstr "KonÄ?aj program"
 
-#: ../meld/meldapp.py:435
+#: ../meld/meldapp.py:146
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../meld/meldapp.py:436
+#: ../meld/meldapp.py:147
 msgid "Undo the last action"
 msgstr "Razveljavi zadnje dejanje"
 
-#: ../meld/meldapp.py:437
+#: ../meld/meldapp.py:148
 msgid "Redo the last undone action"
 msgstr "Obnovi zadnje razveljavljeno dejanje"
 
-#: ../meld/meldapp.py:438
+#: ../meld/meldapp.py:149
 msgid "Cut the selection"
 msgstr "Izreži izbrano"
 
-#: ../meld/meldapp.py:439
+#: ../meld/meldapp.py:150
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
-#: ../meld/meldapp.py:440
+#: ../meld/meldapp.py:151
 msgid "Paste the clipboard"
 msgstr "Prilepi iz odložiÅ¡Ä?a"
 
-#: ../meld/meldapp.py:441
+#: ../meld/meldapp.py:152
 msgid "Search for text"
 msgstr "PoiÅ¡Ä?i besedilo"
 
-#: ../meld/meldapp.py:442
+#: ../meld/meldapp.py:153
 msgid "Find Ne_xt"
 msgstr "Najdi _naslednje"
 
-#: ../meld/meldapp.py:442
+#: ../meld/meldapp.py:153
 msgid "Search forwards for the same text"
 msgstr "PoiÅ¡Ä?i niz naprej po besedilu"
 
-#: ../meld/meldapp.py:443
+#: ../meld/meldapp.py:154
 msgid "Find and replace text"
 msgstr "PoiÅ¡Ä?i in zamenjaj besedilo"
 
-#: ../meld/meldapp.py:444
-msgid "Go to the next difference"
-msgstr "SkoÄ?i na naslednjo razliko v datoteki"
-
-#: ../meld/meldapp.py:445
-msgid "Go to the previous difference"
-msgstr "SkoÄ?i na predhodno razliko v datoteki"
-
-#: ../meld/meldapp.py:446
+#: ../meld/meldapp.py:155
 msgid "Prefere_nces"
 msgstr "_Lastnosti"
 
-#: ../meld/meldapp.py:446
+#: ../meld/meldapp.py:155
 msgid "Configure the application"
 msgstr "Spremeni nastavitve programa"
 
-#: ../meld/meldapp.py:448
+#: ../meld/meldapp.py:157
+msgid "_Changes"
+msgstr "_Spremembe"
+
+#: ../meld/meldapp.py:158
+msgid "Next change"
+msgstr "Naslednja sprememba"
+
+#: ../meld/meldapp.py:158
+msgid "Go to the next change"
+msgstr "SkoÄ?i na naslednjo spremembo"
+
+#: ../meld/meldapp.py:159
+msgid "Previous change"
+msgstr "Predhodna sprememba"
+
+#: ../meld/meldapp.py:159
+msgid "Go to the previous change"
+msgstr "SkoÄ?i na predhodno spremembo"
+
+#: ../meld/meldapp.py:161
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../meld/meldapp.py:449
+#: ../meld/meldapp.py:162
 msgid "File status"
 msgstr "Stanje datoteke"
 
-#: ../meld/meldapp.py:450
+#: ../meld/meldapp.py:163
 msgid "Version status"
 msgstr "Stanje razliÄ?ice"
 
-#: ../meld/meldapp.py:451
+#: ../meld/meldapp.py:164
 msgid "File filters"
 msgstr "Filtri datotek"
 
-#: ../meld/meldapp.py:452
+#: ../meld/meldapp.py:165
 msgid "Stop the current action"
 msgstr "Ustavi trenutno dejanje"
 
-#: ../meld/meldapp.py:453
+#: ../meld/meldapp.py:166
 msgid "Refresh the view"
 msgstr "Osveži pogled"
 
-#: ../meld/meldapp.py:454
+#: ../meld/meldapp.py:167
 msgid "Reload"
 msgstr "Ponovno naloži"
 
-#: ../meld/meldapp.py:454
+#: ../meld/meldapp.py:167
 msgid "Reload the comparison"
 msgstr "Ponovno naloži primerjavo"
 
-#: ../meld/meldapp.py:456
+#: ../meld/meldapp.py:169
 msgid "_Help"
-msgstr "_PomoÄ?"
+msgstr "Pomo_Ä?"
 
-#: ../meld/meldapp.py:457
+#: ../meld/meldapp.py:170
 msgid "_Contents"
 msgstr "_Vsebina"
 
-#: ../meld/meldapp.py:457
+#: ../meld/meldapp.py:170
 msgid "Open the Meld manual"
 msgstr "Odpri priroÄ?nik Meld"
 
-#: ../meld/meldapp.py:458
+#: ../meld/meldapp.py:171
 msgid "Report _Bug"
 msgstr "PoÅ¡lji poroÄ?ilo o _hroÅ¡Ä?u"
 
-#: ../meld/meldapp.py:458
+#: ../meld/meldapp.py:171
 msgid "Report a bug in Meld"
 msgstr "PoroÄ?ilo o hroÅ¡Ä?u programa Meld"
 
-#: ../meld/meldapp.py:459
+#: ../meld/meldapp.py:172
 msgid "About this program"
 msgstr "O programu"
 
-#: ../meld/meldapp.py:462
+#: ../meld/meldapp.py:175
 msgid "Full Screen"
 msgstr "Celozaslonski naÄ?in"
 
-#: ../meld/meldapp.py:462
+#: ../meld/meldapp.py:175
 msgid "View the comparison in full screen"
 msgstr "Ogled primerjave v celozaslonskem naÄ?inu"
 
-#: ../meld/meldapp.py:463
+#: ../meld/meldapp.py:176
 msgid "_Toolbar"
 msgstr "_Orodna vrstica"
 
-#: ../meld/meldapp.py:463
+#: ../meld/meldapp.py:176
 msgid "Show or hide the toolbar"
 msgstr "Pokaži ali skrij orodno vrstico"
 
-#: ../meld/meldapp.py:464
+#: ../meld/meldapp.py:177
 msgid "_Statusbar"
 msgstr "_Vrstica stanja"
 
-#: ../meld/meldapp.py:464
+#: ../meld/meldapp.py:177
 msgid "Show or hide the statusbar"
 msgstr "Pokaži ali skrij vrstico stanja"
 
 #. exit at first non found directory + file
-#: ../meld/meldapp.py:816
+#: ../meld/meldapp.py:533
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Ni mogoÄ?e primerjati meÅ¡anice datotek in map.\n"
 
-#: ../meld/meldapp.py:870
+#: ../meld/meldapp.py:587
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Neveljavno Å¡tevilo argumentov pri ukazu --diff."
 
-#: ../meld/meldapp.py:874
+#: ../meld/meldapp.py:591
 msgid "Start with an empty window"
 msgstr "Zagon brez odprtih oken"
 
-#: ../meld/meldapp.py:875
-#: ../meld/meldapp.py:876
-#: ../meld/meldapp.py:878
+#: ../meld/meldapp.py:592
+#: ../meld/meldapp.py:593
+#: ../meld/meldapp.py:595
 msgid "file"
 msgstr "datoteka"
 
-#: ../meld/meldapp.py:875
-#: ../meld/meldapp.py:877
-#: ../meld/meldapp.py:878
+#: ../meld/meldapp.py:592
+#: ../meld/meldapp.py:594
+#: ../meld/meldapp.py:595
 msgid "dir"
 msgstr "mapa"
 
-#: ../meld/meldapp.py:875
+#: ../meld/meldapp.py:592
 msgid "Start a version control comparison"
 msgstr "Zagon primerjave nadzora razliÄ?ic"
 
-#: ../meld/meldapp.py:876
+#: ../meld/meldapp.py:593
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: ../meld/meldapp.py:877
+#: ../meld/meldapp.py:594
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo map"
 
-#: ../meld/meldapp.py:878
+#: ../meld/meldapp.py:595
 msgid "Start a comparison between file and dir/file"
-msgstr "Zagon primerjave med datoteko in mapa/datoteko"
+msgstr "Zagon primerjave med datoteko in mapo/datoteko"
 
-#: ../meld/meldapp.py:884
+#: ../meld/meldapp.py:601
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je orodje za primerjavo vsebine datotek in map."
 
-#: ../meld/meldapp.py:887
+#: ../meld/meldapp.py:604
 msgid "Set label to use instead of file name"
 msgstr "DoloÄ?i naslov namesto imena datoteke"
 
-#: ../meld/meldapp.py:889
+#: ../meld/meldapp.py:606
 msgid "Automatically compare all differing files on startup"
 msgstr "Ob zagonu samodejno primerjaj vse razliÄ?ne datoteke."
 
-#: ../meld/meldapp.py:890
-#: ../meld/meldapp.py:891
-#: ../meld/meldapp.py:892
-#: ../meld/meldapp.py:893
+#: ../meld/meldapp.py:607
+#: ../meld/meldapp.py:608
+#: ../meld/meldapp.py:609
+#: ../meld/meldapp.py:610
 msgid "Ignored for compatibility"
 msgstr "Prezrto zaradi skladnosti"
 
-#: ../meld/meldapp.py:896
+#: ../meld/meldapp.py:613
 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:899
+#: ../meld/meldapp.py:616
 #, python-format
 msgid "too many arguments (wanted 0-4, got %d)"
 msgstr "preveÄ? argumentov (zahtevanih 0-4, prejetih %d)"
@@ -1069,6 +991,94 @@ msgstr "neimenovano"
 msgid "[None]"
 msgstr "[noben]"
 
+#: ../meld/preferences.py:81
+msgid "label"
+msgstr "oznaka"
+
+#: ../meld/preferences.py:81
+msgid "pattern"
+msgstr "vzorec"
+
+#: ../meld/preferences.py:147
+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:162
+#: ../meld/preferences.py:167
+#: ../meld/vcview.py:163
+msgid "Name"
+msgstr "Ime"
+
+#: ../meld/preferences.py:162
+#: ../meld/preferences.py:167
+msgid "Active"
+msgstr "Dejavno"
+
+#: ../meld/preferences.py:162
+msgid "Pattern"
+msgstr "Vzorec"
+
+#: ../meld/preferences.py:167
+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:260
+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:262
+#, 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:264
+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:266
+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:268
+msgid ""
+"CVS keywords\t0\t\\$\\w+(:[^\\n"
+"$]+)?\\$\n"
+msgstr ""
+"KljuÄ?ne besede CVS\t0\t\\$\\w+(:[^\\n"
+"$]+)?\\$\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:270
+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:272
+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:274
+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:276
+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:278
+msgid "Script comment\t0\t#.*"
+msgstr "Opomba skripta\t0\t#.*"
+
 #: ../meld/vcview.py:127
 msgid "_Commit"
 msgstr "_Uveljavi"
@@ -1190,29 +1200,29 @@ msgstr "Izbor nadzora razliÄ?ic"
 msgid "Only one Version Control in this directory"
 msgstr "V tej mapi je le en nadzornik razliÄ?ic"
 
-#: ../meld/vcview.py:316
+#: ../meld/vcview.py:320
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:349
+#: ../meld/vcview.py:353
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Iskanje razlik"
 
-#: ../meld/vcview.py:356
+#: ../meld/vcview.py:360
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Pripenjanje popravka"
 
-#: ../meld/vcview.py:360
+#: ../meld/vcview.py:364
 msgid "No differences found."
 msgstr "Ni razlik."
 
-#: ../meld/vcview.py:439
+#: ../meld/vcview.py:438
 msgid "Select some files first."
 msgstr "Najprej je treba izbrati datoteke."
 
-#: ../meld/vcview.py:505
+#: ../meld/vcview.py:504
 #, python-format
 msgid ""
 "\n"
@@ -1284,7 +1294,7 @@ msgstr "Pot do datoteke"
 
 #: ../meld/ui/historyentry.py:258
 msgid "Pop up a file selector to choose a file"
-msgstr "Pokaži izbirnik datotek za izbor datoteke"
+msgstr "Pokaži izbirnik za izbor datoteke"
 
 #: ../meld/ui/historyentry.py:379
 msgid "Select directory"
@@ -1314,18 +1324,42 @@ msgstr ""
 "DoloÄ?en je bil vzorec '%s'\n"
 "Javljena napaka je '%s'"
 
+#~ 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]