GNOME.org
 

[meld] Updated Slovenian translation

commit 94d312abd9c63723d8757673e96a04b611cbf4f1
Author: Matej UrbanÄ?iÄ? <mateju svn gnome org>
Date:   Sat Oct 9 20:16:05 2010 +0200

    Updated Slovenian translation

 po/sl.po |  538 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 265 insertions(+), 273 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index e6bf6c4..64c0201 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,10 +8,11 @@ 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-08-22 10:40+0000\n"
-"PO-Revision-Date: 2010-08-23 08:25+0100\n"
+"POT-Creation-Date: 2010-10-08 19:51+0000\n"
+"PO-Revision-Date: 2010-10-09 20:04+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"
@@ -20,11 +21,11 @@ msgstr ""
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../bin/meld:77
+#: ../bin/meld:95
 msgid "Cannot import: "
 msgstr "Ni mogoÄ?e uvoziti:"
 
-#: ../bin/meld:80
+#: ../bin/meld:98
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Program Meld zahteva najmanj razliÄ?ico %s."
@@ -38,7 +39,7 @@ msgid "Diff Viewer"
 msgstr "Pregledovalnik sprememb"
 
 #: ../data/meld.desktop.in.h:3
-#: ../data/ui/meldapp.glade.h:4
+#: ../data/ui/meldapp.ui.h:4
 msgid "Meld"
 msgstr "Meld"
 
@@ -46,266 +47,246 @@ msgstr "Meld"
 msgid "Meld Diff Viewer"
 msgstr "Meld pregledovalnik razliÄ?ic"
 
-#: ../data/ui/filediff.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
-"Which ones would you like to save?</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Nekatere datoteke so bile spremenjene.\n"
-"Katere datoteke naj se shranjenijo?</span>"
-
-#: ../data/ui/filediff.glade.h:3
+#: ../data/ui/filediff.ui.h:1
 msgid "Copy to Clipboard"
 msgstr "Kopiraj v odložiÅ¡Ä?e"
 
-#: ../data/ui/filediff.glade.h:4
-#: ../meld/filediff.py:180
+#: ../data/ui/filediff.ui.h:2
+#: ../meld/filediff.py:226
 msgid "Create Patch"
 msgstr "Ustvari popravek"
 
-#: ../data/ui/filediff.glade.h:5
+#: ../data/ui/filediff.ui.h:3
 msgid "Save modified files?"
 msgstr "Ali naj se spremenjene datoteke shranijo?"
 
-#: ../data/ui/filediff.glade.h:6
+#: ../data/ui/filediff.ui.h:4
+msgid ""
+"Some files have been modified.\n"
+"Which ones would you like to save?"
+msgstr ""
+"Nekatere datoteke so bile spremenjene.\n"
+"Katere datoteke naj se shranjenijo?"
+
+#: ../data/ui/filediff.ui.h:6
 msgid "_Discard Changes"
 msgstr "_Prezri spremembe"
 
-#: ../data/ui/filediff.glade.h:7
+#: ../data/ui/filediff.ui.h:7
 msgid "_Save Selected"
 msgstr "_Shrani izbrano"
 
-#: ../data/ui/findbar.glade.h:1
+#: ../data/ui/findbar.ui.h:1
 msgid "Regular E_xpression"
 msgstr "_LogiÄ?ni izraz"
 
-#: ../data/ui/findbar.glade.h:2
+#: ../data/ui/findbar.ui.h:2
 msgid "Replace _All"
 msgstr "Zamenjaj _vse"
 
-#: ../data/ui/findbar.glade.h:3
+#: ../data/ui/findbar.ui.h:3
 msgid "Replace _With"
 msgstr "Zamenjaj _z"
 
-#: ../data/ui/findbar.glade.h:4
+#: ../data/ui/findbar.ui.h:4
 msgid "Who_le word"
 msgstr "Cele _besede"
 
-#: ../data/ui/findbar.glade.h:5
+#: ../data/ui/findbar.ui.h:5
 msgid "_Match Case"
 msgstr "_UpoÅ¡tevaj velikost Ä?rk"
 
-#: ../data/ui/findbar.glade.h:6
+#: ../data/ui/findbar.ui.h:6
 msgid "_Next"
 msgstr "_Naslednji"
 
-#: ../data/ui/findbar.glade.h:7
+#: ../data/ui/findbar.ui.h:7
 msgid "_Previous"
 msgstr "_Predhodni"
 
-#: ../data/ui/findbar.glade.h:8
-#: ../meld/meldapp.py:154
+#: ../data/ui/findbar.ui.h:8
+#: ../meld/meldapp.py:153
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
-#: ../data/ui/findbar.glade.h:9
+#: ../data/ui/findbar.ui.h:9
 msgid "_Search for"
 msgstr "_PoiÅ¡Ä?i"
 
-#: ../data/ui/meldapp.glade.h:1
+#: ../data/ui/meldapp.ui.h:1
 msgid "Choose Files"
 msgstr "Izbor datotek"
 
-#: ../data/ui/meldapp.glade.h:2
-msgid "Copyright © 2002-2009 Stephen Kennedy"
-msgstr "Avtorske pravice © 2002-2009 Stephen Kennedy"
+#: ../data/ui/meldapp.ui.h:2
+msgid "Copyright &#xA9; 2002-2009 Stephen Kennedy"
+msgstr "Avtorske pravice &#xA9; 2002-2009 Stephen Kennedy"
 
-#: ../data/ui/meldapp.glade.h:3
+#: ../data/ui/meldapp.ui.h:3
 msgid "Directory"
 msgstr "Mapa"
 
-#: ../data/ui/meldapp.glade.h:5
+#: ../data/ui/meldapp.ui.h:5
 msgid "Mine"
 msgstr "Lastno"
 
-#: ../data/ui/meldapp.glade.h:6
+#: ../data/ui/meldapp.ui.h:6
 msgid "Original"
 msgstr "Izvorno"
 
-#: ../data/ui/meldapp.glade.h:7
+#: ../data/ui/meldapp.ui.h:7
 msgid "Other"
 msgstr "Drugo"
 
-#: ../data/ui/meldapp.glade.h:8
-msgid "Three way directory"
-msgstr "Trojni pogled map"
-
-#: ../data/ui/meldapp.glade.h:9
-msgid "Three way file"
-msgstr "Trojni pogled datotek"
+#: ../data/ui/meldapp.ui.h:8
+msgid "Select VC Directory"
+msgstr "Izbor VC mape"
 
-#: ../data/ui/meldapp.glade.h:10
-msgid "Two way directory"
-msgstr "Dvojni pogled map"
-
-#: ../data/ui/meldapp.glade.h:11
-msgid "Two way file"
-msgstr "Dvojni pogled datotek"
-
-#: ../data/ui/meldapp.glade.h:12
-msgid "Version control view"
-msgstr "Pogled nadzora razliÄ?ic"
-
-#: ../data/ui/meldapp.glade.h:13
+#: ../data/ui/meldapp.ui.h:9
 msgid "_Directory Comparison"
 msgstr "_Primerjava vsebine map"
 
-#: ../data/ui/meldapp.glade.h:14
+#: ../data/ui/meldapp.ui.h:10
 msgid "_File Comparison"
 msgstr "_Primerjava datotek"
 
-#: ../data/ui/meldapp.glade.h:15
+#: ../data/ui/meldapp.ui.h:11
 msgid "_Three Way Compare"
 msgstr "_Trojna primerjava"
 
-#: ../data/ui/meldapp.glade.h:16
+#: ../data/ui/meldapp.ui.h:12
 msgid "_Version Control Browser"
 msgstr "_Brskalnik po nadzoru razliÄ?ic"
 
-#: ../data/ui/preferences.glade.h:1
-msgid "<b>Display</b>"
-msgstr "<b>Prikaz</b>"
-
-#: ../data/ui/preferences.glade.h:2
-msgid "<b>External editor</b>"
-msgstr "<b>Zunanji urejevalnik</b>"
-
-#: ../data/ui/preferences.glade.h:3
-msgid "<b>Font</b>"
-msgstr "<b>Pisava</b>"
+#: ../data/ui/preferences.ui.h:1
+msgid "Display"
+msgstr "Prikaz"
 
-#: ../data/ui/preferences.glade.h:4
-msgid "<b>Loading</b>"
-msgstr "<b>Nalaganje</b>"
-
-#: ../data/ui/preferences.glade.h:5
+#: ../data/ui/preferences.ui.h:2
 msgid "Do not _split words over two lines"
 msgstr "Ne _deli besed preko dveh vrstic"
 
-#: ../data/ui/preferences.glade.h:6
+#: ../data/ui/preferences.ui.h:3
 msgid "Edito_r command:"
 msgstr "Ukaz _urejevalnika:"
 
-#: ../data/ui/preferences.glade.h:7
+#: ../data/ui/preferences.ui.h:4
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: ../data/ui/preferences.glade.h:8
+#: ../data/ui/preferences.ui.h:5
 msgid "Enable text _wrapping"
 msgstr "OmogoÄ?i _prelom besedila"
 
-#: ../data/ui/preferences.glade.h:9
+#: ../data/ui/preferences.ui.h:6
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: ../data/ui/preferences.glade.h:10
+#: ../data/ui/preferences.ui.h:7
+msgid "External editor"
+msgstr "Zunanji urejevalnik"
+
+#: ../data/ui/preferences.ui.h:8
 msgid "File Filters"
 msgstr "Filtri datotek"
 
-#: ../data/ui/preferences.glade.h:11
+#: ../data/ui/preferences.ui.h:9
+msgid "Font"
+msgstr "Pisava"
+
+#: ../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"
 
-#: ../data/ui/preferences.glade.h:12
+#: ../data/ui/preferences.ui.h:11
 msgid "Ignore symbolic links"
 msgstr "Prezri simbolne povezave"
 
-#: ../data/ui/preferences.glade.h:13
+#: ../data/ui/preferences.ui.h:12
+msgid "Loading"
+msgstr "Nalaganje"
+
+#: ../data/ui/preferences.ui.h:13
 msgid "Meld Preferences"
 msgstr "Možnosti Meld"
 
-#: ../data/ui/preferences.glade.h:14
+#: ../data/ui/preferences.ui.h:14
 msgid "Show _line numbers"
 msgstr "Pokaži _številke vrstic"
 
-#: ../data/ui/preferences.glade.h:15
+#: ../data/ui/preferences.ui.h:15
 msgid "Text Filters"
 msgstr "Filtri besedila"
 
-#: ../data/ui/preferences.glade.h:16
+#: ../data/ui/preferences.ui.h:16
 msgid "Use _default system editor"
 msgstr "Uporabi _privzet sistemski urejevalnik besedil."
 
-#: ../data/ui/preferences.glade.h:17
+#: ../data/ui/preferences.ui.h:17
 msgid "Use s_yntax highlighting"
 msgstr "Uporabi _barvno poudarjanje skladnje"
 
-#: ../data/ui/preferences.glade.h:18
+#: ../data/ui/preferences.ui.h:18
 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.glade.h:19
+#: ../data/ui/preferences.ui.h:19
 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.glade.h:20
+#: ../data/ui/preferences.ui.h:20
 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.glade.h:21
-msgid "_Automatically supply missing newline at end of file"
-msgstr "Samodejno vstavi manjkajoÄ?o _novo vrstico na koncu datoteke"
-
-#: ../data/ui/preferences.glade.h:22
+#: ../data/ui/preferences.ui.h:21
 msgid "_Editor font:"
 msgstr "Pisava _urejevalnika:"
 
-#: ../data/ui/preferences.glade.h:23
+#: ../data/ui/preferences.ui.h:22
 msgid "_Insert spaces instead of tabs"
 msgstr "Vstavi _presledke namesto tabulatorjev"
 
-#: ../data/ui/preferences.glade.h:24
+#: ../data/ui/preferences.ui.h:23
 msgid "_Tab width:"
 msgstr "Å irina _tabulatorja:"
 
-#: ../data/ui/preferences.glade.h:25
+#: ../data/ui/preferences.ui.h:24
 msgid "_Use the system fixed width font"
 msgstr "_Uporabi sistemsko pisavo doloÄ?ene Å¡irine"
 
-#: ../data/ui/vcview.glade.h:1
+#: ../data/ui/vcview.ui.h:1
 msgid "Commit Files"
 msgstr "Uveljavi datoteke"
 
-#: ../data/ui/vcview.glade.h:2
+#: ../data/ui/vcview.ui.h:2
 msgid "Compare Options"
 msgstr "Možnosti primerjave"
 
-#: ../data/ui/vcview.glade.h:3
+#: ../data/ui/vcview.ui.h:3
 msgid "Date"
 msgstr "Datum"
 
-#: ../data/ui/vcview.glade.h:4
+#: ../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.glade.h:5
+#: ../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.glade.h:6
+#: ../data/ui/vcview.ui.h:6
 msgid "Log Message"
 msgstr "SporoÄ?ilo beleženja"
 
-#: ../data/ui/vcview.glade.h:7
+#: ../data/ui/vcview.ui.h:7
 msgid "Previous Logs"
 msgstr "Predhodni dnevniki"
 
-#: ../data/ui/vcview.glade.h:8
+#: ../data/ui/vcview.ui.h:8
 #: ../meld/vcview.py:183
 msgid "Tag"
 msgstr "Oznaka"
 
-#: ../data/ui/vcview.glade.h:9
+#: ../data/ui/vcview.ui.h:9
 msgid "VC Log"
 msgstr "VC dnevnik"
 
@@ -340,7 +321,7 @@ msgid "Delete selected"
 msgstr "Izbriši izbor"
 
 #: ../meld/dirdiff.py:188
-#: ../meld/filediff.py:851
+#: ../meld/filediff.py:907
 msgid "Hide"
 msgstr "Skrij"
 
@@ -349,7 +330,7 @@ msgid "Hide selected"
 msgstr "Skrij izbrano"
 
 #: ../meld/dirdiff.py:190
-#: ../meld/filediff.py:179
+#: ../meld/filediff.py:225
 #: ../meld/vcview.py:126
 msgid "Open selected"
 msgstr "Odpri izbrano"
@@ -408,8 +389,8 @@ msgstr "Skrij %s"
 
 #: ../meld/dirdiff.py:394
 #: ../meld/dirdiff.py:404
-#: ../meld/vcview.py:302
-#: ../meld/vcview.py:330
+#: ../meld/vcview.py:301
+#: ../meld/vcview.py:329
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
@@ -454,7 +435,7 @@ msgstr ""
 "%s."
 
 #: ../meld/dirdiff.py:587
-#: ../meld/vcview.py:489
+#: ../meld/vcview.py:488
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -464,7 +445,7 @@ msgstr ""
 "Ali naj bo odstranjena vsa vsebina?"
 
 #: ../meld/dirdiff.py:594
-#: ../meld/vcview.py:494
+#: ../meld/vcview.py:493
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -538,148 +519,164 @@ msgstr[1] "%i leto"
 msgstr[2] "%i leti"
 msgstr[3] "%i leta"
 
-#: ../meld/filediff.py:180
+#: ../meld/filediff.py:226
 msgid "Create a patch"
 msgstr "Ustvari programski popravek"
 
-#: ../meld/filediff.py:181
+#: ../meld/filediff.py:227
+msgid "Previous conflict"
+msgstr "Predhodni spor"
+
+#: ../meld/filediff.py:227
+msgid "Go to the previous conflict"
+msgstr "SkoÄ?i na predhodni niz v sporu"
+
+#: ../meld/filediff.py:228
+msgid "Next conflict"
+msgstr "Naslednji spor"
+
+#: ../meld/filediff.py:228
+msgid "Go to the next conflict"
+msgstr "SkoÄ?i na naslednji niz v sporu"
+
+#: ../meld/filediff.py:229
 msgid "Push to left"
 msgstr "Potisni levo"
 
-#: ../meld/filediff.py:181
+#: ../meld/filediff.py:229
 msgid "Push current change to the left"
 msgstr "Potisni trenutne spremembe na levo"
 
-#: ../meld/filediff.py:182
+#: ../meld/filediff.py:230
 msgid "Push to right"
 msgstr "Potisni desno"
 
-#: ../meld/filediff.py:182
+#: ../meld/filediff.py:230
 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:232
 msgid "Pull from left"
 msgstr "Potegni z leve"
 
-#: ../meld/filediff.py:184
+#: ../meld/filediff.py:232
 msgid "Pull change from the left"
 msgstr "Potegni spremembe z leve"
 
-#: ../meld/filediff.py:185
+#: ../meld/filediff.py:233
 msgid "Pull from right"
 msgstr "Potegni z desne"
 
-#: ../meld/filediff.py:185
+#: ../meld/filediff.py:233
 msgid "Pull change from the right"
 msgstr "Potegni spremembe z desne"
 
-#: ../meld/filediff.py:186
+#: ../meld/filediff.py:234
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../meld/filediff.py:186
+#: ../meld/filediff.py:234
 msgid "Delete change"
 msgstr "Izbriši spremembo"
 
-#: ../meld/filediff.py:187
+#: ../meld/filediff.py:235
 msgid "Merge all changes from left"
 msgstr "Združi vse spremembe z leve"
 
-#: ../meld/filediff.py:187
+#: ../meld/filediff.py:235
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Združi vse spremembe brez sporov z leve"
 
-#: ../meld/filediff.py:188
+#: ../meld/filediff.py:236
 msgid "Merge all changes from right"
 msgstr "Združi vse spremembe z desne"
 
-#: ../meld/filediff.py:188
+#: ../meld/filediff.py:236
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Združi vse spremembe brez sporov z desne"
 
-#: ../meld/filediff.py:189
+#: ../meld/filediff.py:237
 msgid "Merge all non-conflicting"
 msgstr "Združi vse spremembe brez sporov"
 
-#: ../meld/filediff.py:189
+#: ../meld/filediff.py:237
 msgid "Merge all non-conflicting changes from left and right panes"
 msgstr "Združi vse spremembe brez sporov z leve in z desne"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:308
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:308
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:310
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:433
+#: ../meld/filediff.py:492
 #, 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:530
+#: ../meld/filediff.py:589
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: ../meld/filediff.py:706
+#: ../meld/filediff.py:765
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] DoloÄ?i okna"
 
-#: ../meld/filediff.py:712
+#: ../meld/filediff.py:771
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:718
-#: ../meld/filediff.py:855
+#: ../meld/filediff.py:777
+#: ../meld/filediff.py:911
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/filediff.py:740
-#: ../meld/filediff.py:751
-#: ../meld/filediff.py:764
-#: ../meld/filediff.py:770
+#: ../meld/filediff.py:799
+#: ../meld/filediff.py:810
+#: ../meld/filediff.py:823
+#: ../meld/filediff.py:829
 msgid "Could not read file"
 msgstr "Ni mogoÄ?e prebrati datoteke"
 
-#: ../meld/filediff.py:743
+#: ../meld/filediff.py:802
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:752
+#: ../meld/filediff.py:811
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiška datoteka."
 
-#: ../meld/filediff.py:765
+#: ../meld/filediff.py:824
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:800
+#: ../meld/filediff.py:856
 #: ../meld/filemerge.py:70
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] RaÄ?unanje razlik"
 
-#: ../meld/filediff.py:849
+#: ../meld/filediff.py:905
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:983
+#: ../meld/filediff.py:1040
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -688,7 +685,7 @@ msgstr ""
 "\"%s\" že obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:996
+#: ../meld/filediff.py:1053
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -699,12 +696,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1005
+#: ../meld/filediff.py:1062
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:1019
+#: ../meld/filediff.py:1076
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -715,7 +712,7 @@ msgstr ""
 "\n"
 "Kateri zapis želite uporabiti?"
 
-#: ../meld/filediff.py:1035
+#: ../meld/filediff.py:1092
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -725,11 +722,11 @@ msgstr ""
 "Ali naj se datoteka shrani v naboru UTF-8?"
 
 #. save as
-#: ../meld/filediff.py:1072
+#: ../meld/filediff.py:1129
 msgid "Save patch as..."
 msgstr "Shrani popravke kot ..."
 
-#: ../meld/filediff.py:1119
+#: ../meld/filediff.py:1176
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -747,253 +744,246 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] Združevanje datotek"
 
-#: ../meld/meldapp.py:139
+#: ../meld/meldapp.py:138
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../meld/meldapp.py:140
+#: ../meld/meldapp.py:139
 msgid "_New..."
 msgstr "_Novo ..."
 
-#: ../meld/meldapp.py:140
+#: ../meld/meldapp.py:139
 msgid "Start a new comparison"
 msgstr "Nova primerjava"
 
-#: ../meld/meldapp.py:141
+#: ../meld/meldapp.py:140
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
-#: ../meld/meldapp.py:143
+#: ../meld/meldapp.py:142
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
-#: ../meld/meldapp.py:144
+#: ../meld/meldapp.py:143
 msgid "Quit the program"
 msgstr "KonÄ?aj program"
 
-#: ../meld/meldapp.py:146
+#: ../meld/meldapp.py:145
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../meld/meldapp.py:147
+#: ../meld/meldapp.py:146
 msgid "Undo the last action"
 msgstr "Razveljavi zadnje dejanje"
 
-#: ../meld/meldapp.py:148
+#: ../meld/meldapp.py:147
 msgid "Redo the last undone action"
 msgstr "Obnovi zadnje razveljavljeno dejanje"
 
-#: ../meld/meldapp.py:149
+#: ../meld/meldapp.py:148
 msgid "Cut the selection"
 msgstr "Izreži izbrano"
 
-#: ../meld/meldapp.py:150
+#: ../meld/meldapp.py:149
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
-#: ../meld/meldapp.py:151
+#: ../meld/meldapp.py:150
 msgid "Paste the clipboard"
 msgstr "Prilepi iz odložiÅ¡Ä?a"
 
-#: ../meld/meldapp.py:152
+#: ../meld/meldapp.py:151
 msgid "Search for text"
 msgstr "PoiÅ¡Ä?i besedilo"
 
-#: ../meld/meldapp.py:153
+#: ../meld/meldapp.py:152
 msgid "Find Ne_xt"
 msgstr "Najdi _naslednje"
 
-#: ../meld/meldapp.py:153
+#: ../meld/meldapp.py:152
 msgid "Search forwards for the same text"
 msgstr "PoiÅ¡Ä?i niz naprej po besedilu"
 
-#: ../meld/meldapp.py:154
+#: ../meld/meldapp.py:153
 msgid "Find and replace text"
 msgstr "PoiÅ¡Ä?i in zamenjaj besedilo"
 
-#: ../meld/meldapp.py:155
+#: ../meld/meldapp.py:154
 msgid "Prefere_nces"
 msgstr "_Lastnosti"
 
-#: ../meld/meldapp.py:155
+#: ../meld/meldapp.py:154
 msgid "Configure the application"
 msgstr "Spremeni nastavitve programa"
 
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:156
 msgid "_Changes"
 msgstr "_Spremembe"
 
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:157
 msgid "Next change"
 msgstr "Naslednja sprememba"
 
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:157
 msgid "Go to the next change"
 msgstr "SkoÄ?i na naslednjo spremembo"
 
-#: ../meld/meldapp.py:159
+#: ../meld/meldapp.py:158
 msgid "Previous change"
 msgstr "Predhodna sprememba"
 
-#: ../meld/meldapp.py:159
+#: ../meld/meldapp.py:158
 msgid "Go to the previous change"
 msgstr "SkoÄ?i na predhodno spremembo"
 
-#: ../meld/meldapp.py:161
+#: ../meld/meldapp.py:160
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../meld/meldapp.py:162
+#: ../meld/meldapp.py:161
 msgid "File status"
 msgstr "Stanje datoteke"
 
-#: ../meld/meldapp.py:163
+#: ../meld/meldapp.py:162
 msgid "Version status"
 msgstr "Stanje razliÄ?ice"
 
-#: ../meld/meldapp.py:164
+#: ../meld/meldapp.py:163
 msgid "File filters"
 msgstr "Filtri datotek"
 
-#: ../meld/meldapp.py:165
+#: ../meld/meldapp.py:164
 msgid "Stop the current action"
 msgstr "Ustavi trenutno dejanje"
 
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:165
 msgid "Refresh the view"
 msgstr "Osveži pogled"
 
-#: ../meld/meldapp.py:167
+#: ../meld/meldapp.py:166
 msgid "Reload"
 msgstr "Ponovno naloži"
 
-#: ../meld/meldapp.py:167
+#: ../meld/meldapp.py:166
 msgid "Reload the comparison"
 msgstr "Ponovno naloži primerjavo"
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:168
 msgid "_Help"
 msgstr "Pomo_Ä?"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:169
 msgid "_Contents"
 msgstr "_Vsebina"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:169
 msgid "Open the Meld manual"
 msgstr "Odpri priroÄ?nik Meld"
 
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:170
 msgid "Report _Bug"
 msgstr "PoÅ¡lji poroÄ?ilo o _hroÅ¡Ä?u"
 
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:170
 msgid "Report a bug in Meld"
 msgstr "PoroÄ?ilo o hroÅ¡Ä?u programa Meld"
 
-#: ../meld/meldapp.py:172
+#: ../meld/meldapp.py:171
 msgid "About this program"
 msgstr "O programu"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:174
 msgid "Full Screen"
 msgstr "Celozaslonski naÄ?in"
 
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:174
 msgid "View the comparison in full screen"
 msgstr "Ogled primerjave v celozaslonskem naÄ?inu"
 
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:175
 msgid "_Toolbar"
 msgstr "_Orodna vrstica"
 
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:175
 msgid "Show or hide the toolbar"
 msgstr "Pokaži ali skrij orodno vrstico"
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:176
 msgid "_Statusbar"
 msgstr "_Vrstica stanja"
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:176
 msgid "Show or hide the statusbar"
 msgstr "Pokaži ali skrij vrstico stanja"
 
 #. exit at first non found directory + file
-#: ../meld/meldapp.py:533
+#: ../meld/meldapp.py:542
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Ni mogoÄ?e primerjati meÅ¡anice datotek in map.\n"
 
-#: ../meld/meldapp.py:587
+#: ../meld/meldapp.py:596
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Neveljavno Å¡tevilo argumentov pri ukazu --diff."
 
-#: ../meld/meldapp.py:591
+#: ../meld/meldapp.py:600
 msgid "Start with an empty window"
 msgstr "Zagon brez odprtih oken"
 
-#: ../meld/meldapp.py:592
-#: ../meld/meldapp.py:593
-#: ../meld/meldapp.py:595
+#: ../meld/meldapp.py:601
+#: ../meld/meldapp.py:602
+#: ../meld/meldapp.py:604
 msgid "file"
 msgstr "datoteka"
 
-#: ../meld/meldapp.py:592
-#: ../meld/meldapp.py:594
-#: ../meld/meldapp.py:595
+#: ../meld/meldapp.py:601
+#: ../meld/meldapp.py:603
+#: ../meld/meldapp.py:604
 msgid "dir"
 msgstr "mapa"
 
-#: ../meld/meldapp.py:592
+#: ../meld/meldapp.py:601
 msgid "Start a version control comparison"
 msgstr "Zagon primerjave nadzora razliÄ?ic"
 
-#: ../meld/meldapp.py:593
+#: ../meld/meldapp.py:602
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: ../meld/meldapp.py:594
+#: ../meld/meldapp.py:603
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo map"
 
-#: ../meld/meldapp.py:595
+#: ../meld/meldapp.py:604
 msgid "Start a comparison between file and dir/file"
 msgstr "Zagon primerjave med datoteko in mapo/datoteko"
 
-#: ../meld/meldapp.py:601
+#: ../meld/meldapp.py:610
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je orodje za primerjavo vsebine datotek in map."
 
-#: ../meld/meldapp.py:604
+#: ../meld/meldapp.py:613
 msgid "Set label to use instead of file name"
 msgstr "DoloÄ?i naslov namesto imena datoteke"
 
-#: ../meld/meldapp.py:606
+#: ../meld/meldapp.py:615
 msgid "Automatically compare all differing files on startup"
 msgstr "Ob zagonu samodejno primerjaj vse razliÄ?ne datoteke."
 
-#: ../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:613
+#: ../meld/meldapp.py:618
 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:616
+#: ../meld/meldapp.py:621
 #, python-format
 msgid "too many arguments (wanted 0-4, got %d)"
 msgstr "preveÄ? argumentov (zahtevanih 0-4, prejetih %d)"
 
-#: ../meld/melddoc.py:47
+#: ../meld/melddoc.py:51
 msgid "untitled"
 msgstr "neimenovano"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:189
+#: ../meld/misc.py:181
 msgid "[None]"
 msgstr "[noben]"
 
@@ -1005,54 +995,54 @@ msgstr "oznaka"
 msgid "pattern"
 msgstr "vzorec"
 
-#: ../meld/preferences.py:143
+#: ../meld/preferences.py:141
 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:166
-#: ../meld/preferences.py:171
+#: ../meld/preferences.py:165
+#: ../meld/preferences.py:170
 #: ../meld/vcview.py:163
 msgid "Name"
 msgstr "Ime"
 
-#: ../meld/preferences.py:166
-#: ../meld/preferences.py:171
+#: ../meld/preferences.py:165
+#: ../meld/preferences.py:170
 msgid "Active"
 msgstr "Dejavno"
 
-#: ../meld/preferences.py:166
+#: ../meld/preferences.py:165
 msgid "Pattern"
 msgstr "Vzorec"
 
-#: ../meld/preferences.py:171
+#: ../meld/preferences.py:170
 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:268
+#: ../meld/preferences.py:264
 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:270
+#: ../meld/preferences.py:266
 #, 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:272
+#: ../meld/preferences.py:268
 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:274
+#: ../meld/preferences.py:270
 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:276
+#: ../meld/preferences.py:272
 msgid ""
 "CVS keywords\t0\t\\$\\w+(:[^\\n"
 "$]+)?\\$\n"
@@ -1061,27 +1051,27 @@ msgstr ""
 "$]+)?\\$\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:278
+#: ../meld/preferences.py:274
 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:280
+#: ../meld/preferences.py:276
 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:282
+#: ../meld/preferences.py:278
 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:284
+#: ../meld/preferences.py:280
 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:286
+#: ../meld/preferences.py:282
 msgid "Script comment\t0\t#.*"
 msgstr "Opomba skripta\t0\t#.*"
 
@@ -1224,29 +1214,29 @@ msgstr "Neveljavno skladiÅ¡Ä?e"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:346
+#: ../meld/vcview.py:345
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:379
+#: ../meld/vcview.py:378
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Iskanje razlik"
 
-#: ../meld/vcview.py:386
+#: ../meld/vcview.py:385
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Pripenjanje popravka"
 
-#: ../meld/vcview.py:390
+#: ../meld/vcview.py:389
 msgid "No differences found."
 msgstr "Ni razlik."
 
-#: ../meld/vcview.py:464
+#: ../meld/vcview.py:463
 msgid "Select some files first."
 msgstr "Najprej je treba izbrati datoteke."
 
-#: ../meld/vcview.py:530
+#: ../meld/vcview.py:529
 #, python-format
 msgid ""
 "\n"
@@ -1304,38 +1294,38 @@ msgstr ""
 "Napaka v logiÄ?nem izrazu\n"
 "'%s'"
 
-#: ../meld/ui/historyentry.py:248
+#: ../meld/ui/historyentry.py:280
 msgid "_Browse..."
 msgstr "_Prebrskaj ..."
 
-#: ../meld/ui/historyentry.py:256
+#: ../meld/ui/historyentry.py:288
 msgid "Path"
 msgstr "Pot"
 
-#: ../meld/ui/historyentry.py:257
+#: ../meld/ui/historyentry.py:289
 msgid "Path to file"
 msgstr "Pot do datoteke"
 
-#: ../meld/ui/historyentry.py:258
+#: ../meld/ui/historyentry.py:290
 msgid "Pop up a file selector to choose a file"
 msgstr "Pokaži izbirnik za izbor datoteke"
 
-#: ../meld/ui/historyentry.py:379
+#: ../meld/ui/historyentry.py:419
 msgid "Select directory"
 msgstr "Izbor mape"
 
-#: ../meld/ui/historyentry.py:383
+#: ../meld/ui/historyentry.py:423
 msgid "Select file"
 msgstr "Izbor datoteke"
 
-#: ../meld/ui/notebooklabel.py:61
+#: ../meld/ui/notebooklabel.py:60
 msgid "Close tab"
 msgstr "Zapri zavihek"
 
 #. These are the possible states of files. Be sure to get the colons correct.
 #: ../meld/vc/_vc.py:40
-msgid "Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:Missing"
-msgstr "Prezrto:NedoloÄ?eno:::Napaka::Novo dodano:Spremenjeno:<b>V sporu</b>:Odstranjeno:ManjkajoÄ?e"
+msgid "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
+msgstr "Prezrto:NedoloÄ?eno:::Napaka::Novo dodano:Spremenjeno:V sporu:Odstranjeno:ManjkajoÄ?e"
 
 #: ../meld/vc/cvs.py:156
 #, python-format
@@ -1348,54 +1338,56 @@ msgstr ""
 "DoloÄ?en je bil vzorec '%s'\n"
 "Javljena napaka je '%s'"
 
+#~ 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]