[meld] Updated Slovenian translation
- From: Matej Urbančič <mateju src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Updated Slovenian translation
- Date: Mon, 23 Jun 2014 20:49:45 +0000 (UTC)
commit 9d665947ab7ea7c62cd27b587e48b42b4bf5f67a
Author: Matej Urbančič <mateju svn gnome org>
Date: Mon Jun 23 22:49:37 2014 +0200
Updated Slovenian translation
po/sl.po | 869 ++++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 508 insertions(+), 361 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 524afa2..5b60bc0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,27 +9,32 @@ 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: 2014-01-03 06:48+0000\n"
-"PO-Revision-Date: 2014-01-03 22:27+0100\n"
+"POT-Creation-Date: 2014-06-23 09:40+0000\n"
+"PO-Revision-Date: 2014-06-23 22:36+0100\n"
"Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
"Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
"Language: sl_SI\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Generator: Poedit 1.5.4\n"
-#: ../bin/meld:115
+#: ../bin/meld:134
msgid "Cannot import: "
msgstr "Ni mogoče uvoziti:"
-#: ../bin/meld:118
+#: ../bin/meld:137
#, c-format
msgid "Meld requires %s or higher."
msgstr "Program Meld zahteva najmanj različico %s."
+#: ../bin/meld:141
+msgid "Meld does not support Python 3."
+msgstr "Program Meld ne podpira okolja Python 3."
+
#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
msgid "Meld"
msgstr "Meld"
@@ -65,9 +70,8 @@ msgid "Meld comparison description"
msgstr "Opis primerjave Meld"
#: ../data/org.gnome.meld.gschema.xml.h:1
-#, fuzzy
msgid "Default window size"
-msgstr "Privzeta vodoravna velikost okna"
+msgstr "Privzeta velikost okna"
#: ../data/org.gnome.meld.gschema.xml.h:2
msgid "Show toolbar"
@@ -180,14 +184,13 @@ msgid ""
msgstr ""
#: ../data/org.gnome.meld.gschema.xml.h:24
-#, fuzzy
msgid "Custom font"
-msgstr "Pisava po meri:"
+msgstr "Pisava po meri"
#: ../data/org.gnome.meld.gschema.xml.h:25
msgid ""
"The custom font to use, stored as a string and parsed as a Pango font "
-"description"
+"description."
msgstr ""
#: ../data/org.gnome.meld.gschema.xml.h:26
@@ -232,7 +235,7 @@ msgid ""
"displayed."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:34 ../data/ui/preferences.ui.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:34 ../data/ui/preferences.ui.h:30
msgid "Ignore symbolic links"
msgstr "Prezri simbolne povezave"
@@ -268,9 +271,8 @@ msgid ""
msgstr ""
#: ../data/org.gnome.meld.gschema.xml.h:40
-#, fuzzy
msgid "File status filters"
-msgstr "Pokaži stanje datoteke ali mape"
+msgstr "Filtri stanja datotek"
#: ../data/org.gnome.meld.gschema.xml.h:41
msgid "List of statuses used to filter visible files in folder comparison."
@@ -288,74 +290,97 @@ msgid ""
msgstr ""
#: ../data/org.gnome.meld.gschema.xml.h:44
+#, fuzzy
+msgid "Version control pane position"
+msgstr "Vstavek sistema nadzora različic"
+
+#: ../data/org.gnome.meld.gschema.xml.h:45
+msgid ""
+"This is the height of the main version control tree when the console pane is "
+"shown."
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:46
msgid "Present version comparisons as left-local/right-remote"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: ../data/org.gnome.meld.gschema.xml.h:47
msgid ""
"If true, version control comparisons will use a left-is-local, right-is-"
"remote scheme to determine what order to present files in panes. Otherwise, "
"a left-is-theirs, right-is-mine scheme is used."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:48
+#, fuzzy
+msgid "Order for files in three-way version control merge comparisons"
+msgstr "Zagon primerjave nadzora različic"
+
+#: ../data/org.gnome.meld.gschema.xml.h:49
+msgid ""
+"Choices for file order are remote/merge/local and local/merged/remote. This "
+"preference only affects three-way comparisons launched from the version "
+"control view, so is used solely for merges/conflict resolution within Meld."
+msgstr ""
+
+#: ../data/org.gnome.meld.gschema.xml.h:50
#, fuzzy
msgid "Show margin in commit message editor"
msgstr "Pokaži desni rob v pogledu sporočil uveljavitev"
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:51
msgid ""
"If true, a guide will be displayed to show what column the margin is at in "
"the version control commit message editor."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:52
#, fuzzy
msgid "Margin column in commit message editor"
msgstr "Pokaži desni rob v pogledu sporočil uveljavitev"
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../data/org.gnome.meld.gschema.xml.h:53
msgid ""
"The column of the margin is at in the version control commit message editor."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:54
msgid "Automatically hard-wrap commit messages"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: ../data/org.gnome.meld.gschema.xml.h:55
msgid ""
"If true, the version control commit message editor will hard-wrap (i.e., "
"insert line breaks) at the defined commit margin before commit."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:56
#, fuzzy
msgid "Version control status filters"
msgstr "Vstavek sistema nadzora različic"
-#: ../data/org.gnome.meld.gschema.xml.h:53
+#: ../data/org.gnome.meld.gschema.xml.h:57
msgid ""
"List of statuses used to filter visible files in version control comparison."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: ../data/org.gnome.meld.gschema.xml.h:58
#, fuzzy
msgid "Filename-based filters"
msgstr "Izvoz Balsinih filtrov"
-#: ../data/org.gnome.meld.gschema.xml.h:55
+#: ../data/org.gnome.meld.gschema.xml.h:59
msgid ""
"List of predefined filename-based filters that, if active, will remove "
"matching files from a folder comparison."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:56
+#: ../data/org.gnome.meld.gschema.xml.h:60
#, fuzzy
msgid "Text-based filters"
msgstr "Izvoz Balsinih filtrov"
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: ../data/org.gnome.meld.gschema.xml.h:61
msgid ""
"List of predefined text-based regex filters that, if active, will remove "
"text from being used in a file comparison. The text will still be displayed, "
@@ -426,7 +451,7 @@ msgstr "Kopiraj na desno"
msgid "Delete selected"
msgstr "Izbriši izbor"
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1414
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1448
msgid "Hide"
msgstr "Skrij"
@@ -495,7 +520,7 @@ msgid "_Add"
msgstr "_Dodaj"
#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:678
+#: ../meld/vcview.py:747
msgid "_Remove"
msgstr "_Odstrani"
@@ -516,8 +541,8 @@ msgid "Move _Down"
msgstr "Premakni navz_dol"
#. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:366
-#: ../meld/vcview.py:188
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:363
+#: ../meld/vcview.py:203
msgid "Name"
msgstr "Ime"
@@ -563,10 +588,25 @@ msgstr ""
"drugim imenom."
#: ../data/ui/filediff.ui.h:7
+#, fuzzy
+msgid "File 3"
+msgstr "_Datoteka"
+
+#: ../data/ui/filediff.ui.h:8
+#, fuzzy
+msgid "File 2"
+msgstr "_Datoteka"
+
+#: ../data/ui/filediff.ui.h:9
+#, fuzzy
+msgid "File 1"
+msgstr "_Datoteka"
+
+#: ../data/ui/filediff.ui.h:10
msgid "Revert unsaved changes to documents?"
msgstr "Ali naj se povrnejo neshranjene spremembe dokumentov?"
-#: ../data/ui/filediff.ui.h:8
+#: ../data/ui/filediff.ui.h:11
msgid "Changes made to the following documents will be permanently lost:\n"
msgstr "Spremembe navedenih dokumentov bodo trajno izgubljene:\n"
@@ -634,7 +674,7 @@ msgstr "Obrni smer popravka"
msgid "Copy to Clipboard"
msgstr "Kopiraj v odložišče"
-#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:121
+#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:119
msgid "Save Patch"
msgstr "Shrani popravek"
@@ -647,138 +687,159 @@ msgid "Left is local, right is remote"
msgstr "Levo je krajevno, desno oddaljeno"
#: ../data/ui/preferences.ui.h:3
+#, fuzzy
+msgid "Remote, merge, local"
+msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
+
+#: ../data/ui/preferences.ui.h:4
+#, fuzzy
+msgid "Local, merge, remote"
+msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
+
+#: ../data/ui/preferences.ui.h:5
msgid "1ns (ext4)"
msgstr "1ns (ext4)"
-#: ../data/ui/preferences.ui.h:4
+#: ../data/ui/preferences.ui.h:6
msgid "100ns (NTFS)"
msgstr "100ns (NTFS)"
-#: ../data/ui/preferences.ui.h:5
+#: ../data/ui/preferences.ui.h:7
msgid "1s (ext2/ext3)"
msgstr "1s (ext2/ext3)"
-#: ../data/ui/preferences.ui.h:6
+#: ../data/ui/preferences.ui.h:8
msgid "2s (VFAT)"
msgstr "2s (VFAT)"
-#: ../data/ui/preferences.ui.h:7
+#: ../data/ui/preferences.ui.h:9
msgid "Meld Preferences"
msgstr "Možnosti Meld"
-#: ../data/ui/preferences.ui.h:8
+#: ../data/ui/preferences.ui.h:10
msgid "Font"
msgstr "Pisava"
-#: ../data/ui/preferences.ui.h:9
+#: ../data/ui/preferences.ui.h:11
msgid "_Use the system fixed width font"
msgstr "_Uporabi sistemsko pisavo določene širine"
-#: ../data/ui/preferences.ui.h:10
+#: ../data/ui/preferences.ui.h:12
msgid "_Editor font:"
msgstr "Pisava _urejevalnika:"
-#: ../data/ui/preferences.ui.h:11
+#: ../data/ui/preferences.ui.h:13
msgid "Display"
msgstr "Prikaz"
-#: ../data/ui/preferences.ui.h:12
+#: ../data/ui/preferences.ui.h:14
msgid "_Tab width:"
msgstr "Širina _tabulatorja:"
-#: ../data/ui/preferences.ui.h:13
+#: ../data/ui/preferences.ui.h:15
msgid "_Insert spaces instead of tabs"
msgstr "Vstavi _presledke namesto tabulatorjev"
-#: ../data/ui/preferences.ui.h:14
+#: ../data/ui/preferences.ui.h:16
msgid "Enable text _wrapping"
msgstr "Omogoči _prelom besedila"
-#: ../data/ui/preferences.ui.h:15
+#: ../data/ui/preferences.ui.h:17
msgid "Do not _split words over two lines"
msgstr "Ne _deli besed preko dveh vrstic"
-#: ../data/ui/preferences.ui.h:16
+#: ../data/ui/preferences.ui.h:18
msgid "Highlight _current line"
msgstr "Poudari _trenutno vrstico"
-#: ../data/ui/preferences.ui.h:17
+#: ../data/ui/preferences.ui.h:19
msgid "Show _line numbers"
msgstr "Pokaži _številke vrstic"
-#: ../data/ui/preferences.ui.h:18
+#: ../data/ui/preferences.ui.h:20
msgid "Show w_hitespace"
msgstr "Pokaži _presledne znake"
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:21
msgid "Use s_yntax highlighting"
msgstr "Uporabi _barvno poudarjanje skladnje"
-#: ../data/ui/preferences.ui.h:20
+#: ../data/ui/preferences.ui.h:22
msgid "External Editor"
msgstr "Zunanji urejevalnik"
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:23
msgid "Use _default system editor"
msgstr "Uporabi _privzet sistemski urejevalnik besedil."
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:24
msgid "Edito_r command:"
msgstr "Ukaz _urejevalnika:"
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:25
msgid "Editor"
msgstr "Urejevalnik"
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:26
msgid "Shallow Comparison"
msgstr "Groba primerjava"
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:27
msgid "C_ompare files based only on size and timestamp"
msgstr "_Primerjaj datoteke na osnovi velikosti in časovnega žiga"
-#: ../data/ui/preferences.ui.h:26
+#: ../data/ui/preferences.ui.h:28
msgid "_Timestamp resolution:"
msgstr "Ločljivost časovnega _žiga:"
-#: ../data/ui/preferences.ui.h:27
+#: ../data/ui/preferences.ui.h:29
msgid "Symbolic Links"
msgstr "Simbolne povezave"
-#: ../data/ui/preferences.ui.h:29
+#: ../data/ui/preferences.ui.h:31
msgid "Visible Columns"
msgstr "Vidni stolpci"
-#: ../data/ui/preferences.ui.h:30
+#: ../data/ui/preferences.ui.h:32
msgid "Folder Comparisons"
msgstr "Primerjava map"
-#: ../data/ui/preferences.ui.h:31
+#: ../data/ui/preferences.ui.h:33
msgid "Version Comparisons"
msgstr "Primerjave različic"
-#: ../data/ui/preferences.ui.h:32
-msgid "_When comparing file revisions:"
+#: ../data/ui/preferences.ui.h:34
+#, fuzzy
+msgid "_Order when comparing file revisions:"
msgstr "_Med primerjavo predelav datotek"
-#: ../data/ui/preferences.ui.h:33
+#: ../data/ui/preferences.ui.h:35
+#, fuzzy
+msgid "Order when _merging files:"
+msgstr "Predvajaj _glasbene datoteke, ko so povezane"
+
+#: ../data/ui/preferences.ui.h:36
msgid "Commit Messages"
msgstr "Uveljavi sporočila"
-#: ../data/ui/preferences.ui.h:34
+#: ../data/ui/preferences.ui.h:37
msgid "Show _right margin at:"
msgstr "Pokaži _desni rob pri:"
-#: ../data/ui/preferences.ui.h:35
+#: ../data/ui/preferences.ui.h:38
msgid "Automatically _break lines at right margin on commit"
msgstr "Samodejno _prelomi vrstice na desnem robu ob uveljavitvi"
-#: ../data/ui/preferences.ui.h:36
+#: ../data/ui/preferences.ui.h:39
msgid "Version Control"
msgstr "Nadzor različic"
-#: ../data/ui/preferences.ui.h:37
+#: ../data/ui/preferences.ui.h:40
+#, fuzzy
+msgid "Filename filters"
+msgstr "Balsini filtri"
+
+#: ../data/ui/preferences.ui.h:41
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -788,11 +849,25 @@ msgstr ""
"vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), ločenimi s "
"presledki."
-#: ../data/ui/preferences.ui.h:38 ../meld/meldwindow.py:106
+#: ../data/ui/preferences.ui.h:42 ../meld/meldwindow.py:103
msgid "File Filters"
msgstr "Filtri datotek"
-#: ../data/ui/preferences.ui.h:39
+#: ../data/ui/preferences.ui.h:43
+#, fuzzy
+msgid "Change trimming"
+msgstr "Spremeni opazovanje"
+
+#: ../data/ui/preferences.ui.h:44
+msgid "Trim blank line differences from the start and end of changes"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:45
+#, fuzzy
+msgid "Text filters"
+msgstr "Filtri besedila"
+
+#: ../data/ui/preferences.ui.h:46
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -806,15 +881,11 @@ msgstr ""
"izraz vključuje skupine, so zamenjane le te. Več podrobnosti je zapisanih v "
"priročniku."
-#: ../data/ui/preferences.ui.h:40
-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:41
+#: ../data/ui/preferences.ui.h:47
msgid "Text Filters"
msgstr "Filtri besedila"
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:618
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:583
msgid "New comparison"
msgstr "Nova primerjava"
@@ -923,127 +994,142 @@ msgid "Delete from working copy"
msgstr "Izbriši iz delovne kopije"
#: ../data/ui/vcview.ui.h:18
+#, fuzzy
+msgid "Console"
+msgstr "Konzola"
+
+#: ../data/ui/vcview.ui.h:19
+#, fuzzy
+msgid "Show or hide the version control console output pane"
+msgstr "Izbor različice sistema za nadzor različic za uporabo"
+
+#: ../data/ui/vcview.ui.h:20
msgid "_Flatten"
msgstr "_Razpni"
-#: ../data/ui/vcview.ui.h:19
+#: ../data/ui/vcview.ui.h:21
msgid "Flatten directories"
msgstr "_Razpni mape"
-#: ../data/ui/vcview.ui.h:20
+#: ../data/ui/vcview.ui.h:22
msgid "_Modified"
msgstr "_Spremenjeno"
-#: ../data/ui/vcview.ui.h:21
+#: ../data/ui/vcview.ui.h:23
msgid "Show modified files"
msgstr "Pokaži spremenjene datoteke"
-#: ../data/ui/vcview.ui.h:22
+#: ../data/ui/vcview.ui.h:24
msgid "_Normal"
msgstr "_Običajno"
-#: ../data/ui/vcview.ui.h:23
+#: ../data/ui/vcview.ui.h:25
msgid "Show normal files"
msgstr "Pokaži običajne datoteke"
-#: ../data/ui/vcview.ui.h:24
+#: ../data/ui/vcview.ui.h:26
msgid "Un_versioned"
msgstr "Brez določene _različice"
-#: ../data/ui/vcview.ui.h:25
+#: ../data/ui/vcview.ui.h:27
msgid "Show unversioned files"
msgstr "Pokaži datoteke z nedoločenimi različicami"
-#: ../data/ui/vcview.ui.h:26 ../meld/vc/_vc.py:64
+#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:64
msgid "Ignored"
msgstr "Prezrto"
-#: ../data/ui/vcview.ui.h:27
+#: ../data/ui/vcview.ui.h:29
msgid "Show ignored files"
msgstr "Pokaži prezrte datoteke"
-#: ../data/ui/vcview.ui.h:28
+#: ../data/ui/vcview.ui.h:30
msgid "Commit"
msgstr "Uveljavi"
-#: ../data/ui/vcview.ui.h:29
+#: ../data/ui/vcview.ui.h:31
msgid "Commit Files"
msgstr "Uveljavi datoteke"
-#: ../data/ui/vcview.ui.h:30
+#: ../data/ui/vcview.ui.h:32
msgid "Log Message"
msgstr "Sporočilo beleženja"
-#: ../data/ui/vcview.ui.h:31
+#: ../data/ui/vcview.ui.h:33
msgid "Previous logs:"
msgstr "Predhodni dnevniki:"
-#: ../data/ui/vcview.ui.h:32
+#: ../data/ui/vcview.ui.h:34
msgid "Co_mmit"
msgstr "_Uveljavi"
-#: ../data/ui/vcview.ui.h:33
+#: ../data/ui/vcview.ui.h:35
+#, fuzzy
+msgid "Console output"
+msgstr "Pokaži odvod konzole"
+
+#: ../data/ui/vcview.ui.h:36
msgid "Push local commits to remote?"
msgstr "Ali naj se objavijo krajevne uveljavitve v oddaljeno skladišče?"
-#: ../data/ui/vcview.ui.h:34
+#: ../data/ui/vcview.ui.h:37
msgid "The commits to be pushed are determined by your version control system."
msgstr "Uveljavitve za objavo določa sistem za nadzor različic."
-#: ../data/ui/vcview.ui.h:35
+#: ../data/ui/vcview.ui.h:38
msgid "_Push commits"
msgstr "_Objavi uveljavitve"
#. Create file size CellRenderer
-#: ../meld/dirdiff.py:384
+#: ../meld/dirdiff.py:381 ../meld/preferences.py:82
msgid "Size"
msgstr "Velikost"
#. Create date-time CellRenderer
-#: ../meld/dirdiff.py:392
+#: ../meld/dirdiff.py:389 ../meld/preferences.py:83
msgid "Modification time"
msgstr "Čas spremembe"
#. Create permissions CellRenderer
-#: ../meld/dirdiff.py:400
+#: ../meld/dirdiff.py:397 ../meld/preferences.py:84
msgid "Permissions"
msgstr "Dovoljenja"
-#: ../meld/dirdiff.py:559
+#: ../meld/dirdiff.py:543
#, python-format
msgid "Hide %s"
msgstr "Skrij %s"
-#: ../meld/dirdiff.py:688 ../meld/dirdiff.py:710
+#: ../meld/dirdiff.py:672 ../meld/dirdiff.py:694
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] Preiskovanje %s"
-#: ../meld/dirdiff.py:810
+#: ../meld/dirdiff.py:823
#, python-format
msgid "[%s] Done"
msgstr "[%s] končano"
-#: ../meld/dirdiff.py:817
+#: ../meld/dirdiff.py:830
msgid "Multiple errors occurred while scanning this folder"
msgstr "Med preiskovanjem mape, je prišlo do več napak."
-#: ../meld/dirdiff.py:818
+#: ../meld/dirdiff.py:831
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:820
+#: ../meld/dirdiff.py:833
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:822
+#: ../meld/dirdiff.py:835
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:824
+#: ../meld/dirdiff.py:837
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -1052,17 +1138,17 @@ msgstr ""
"razlike velikosti upošteva. Nekatere datoteke so skrite:\n"
"%s"
-#: ../meld/dirdiff.py:835
+#: ../meld/dirdiff.py:848
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "'%s' je skrit; '%s'"
-#: ../meld/dirdiff.py:860 ../meld/filediff.py:1107 ../meld/filediff.py:1245
-#: ../meld/filediff.py:1416 ../meld/filediff.py:1446 ../meld/filediff.py:1448
+#: ../meld/dirdiff.py:873 ../meld/filediff.py:1123 ../meld/filediff.py:1274
+#: ../meld/filediff.py:1450 ../meld/filediff.py:1480 ../meld/filediff.py:1482
msgid "Hi_de"
msgstr "S_krij"
-#: ../meld/dirdiff.py:891
+#: ../meld/dirdiff.py:904
#, python-format
msgid ""
"'%s' exists.\n"
@@ -1071,11 +1157,11 @@ msgstr ""
"'%s' že obstaja.\n"
"Ali naj bo prepisana?"
-#: ../meld/dirdiff.py:899
+#: ../meld/dirdiff.py:912
msgid "Error copying file"
msgstr "Napaka kopiranja datoteke"
-#: ../meld/dirdiff.py:900
+#: ../meld/dirdiff.py:913
#, python-format
msgid ""
"Couldn't copy %s\n"
@@ -1088,254 +1174,191 @@ msgstr ""
"\n"
"%s"
-#: ../meld/dirdiff.py:923
+#: ../meld/dirdiff.py:936
#, python-format
msgid "Error deleting %s"
msgstr "Napaka med brisanjem %s"
-#: ../meld/dirdiff.py:1054
-#, python-format
-msgid "%i second"
-msgid_plural "%i seconds"
-msgstr[0] "%i sekund"
-msgstr[1] "%i sekunda"
-msgstr[2] "%i sekundi"
-msgstr[3] "%i sekunde"
-
-#: ../meld/dirdiff.py:1055
-#, python-format
-msgid "%i minute"
-msgid_plural "%i minutes"
-msgstr[0] "%i minut"
-msgstr[1] "%i minuta"
-msgstr[2] "%i minuti"
-msgstr[3] "%i minute"
-
-#: ../meld/dirdiff.py:1056
-#, python-format
-msgid "%i hour"
-msgid_plural "%i hours"
-msgstr[0] "%i ur"
-msgstr[1] "%i ura"
-msgstr[2] "%i uri"
-msgstr[3] "%i ure"
-
-#: ../meld/dirdiff.py:1057
-#, python-format
-msgid "%i day"
-msgid_plural "%i days"
-msgstr[0] "%i dni"
-msgstr[1] "%i dan"
-msgstr[2] "%i dni"
-msgstr[3] "%i dni"
-
-#: ../meld/dirdiff.py:1058
-#, python-format
-msgid "%i week"
-msgid_plural "%i weeks"
-msgstr[0] "%i tednov"
-msgstr[1] "%i teden"
-msgstr[2] "%i tedna"
-msgstr[3] "%i tedni"
-
-#: ../meld/dirdiff.py:1059
-#, python-format
-msgid "%i month"
-msgid_plural "%i months"
-msgstr[0] "%i mesecev"
-msgstr[1] "%i mesec"
-msgstr[2] "%i meseca"
-msgstr[3] "%i meseci"
-
-#: ../meld/dirdiff.py:1060
-#, python-format
-msgid "%i year"
-msgid_plural "%i years"
-msgstr[0] "%i let"
-msgstr[1] "%i leto"
-msgstr[2] "%i leti"
-msgstr[3] "%i leta"
-
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:243
msgid "Format as Patch..."
msgstr "Oblikuj kot popravek ..."
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:244
msgid "Create a patch using differences between files"
msgstr "Ustvari popravek z razlikovanjem med datotekami"
-#: ../meld/filediff.py:232
+#: ../meld/filediff.py:246
msgid "Save A_ll"
msgstr "Shrani _vse"
-#: ../meld/filediff.py:233
+#: ../meld/filediff.py:247
msgid "Save all files in the current comparison"
msgstr "Shrani vse datoteke trenutne primerjave"
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:250
msgid "Revert files to their saved versions"
msgstr "Povrni datoteke na shranjene različice"
-#: ../meld/filediff.py:238
+#: ../meld/filediff.py:252
msgid "Add Synchronization Point"
msgstr "Dodaj točko usklajevanja"
-#: ../meld/filediff.py:239
+#: ../meld/filediff.py:253
msgid "Add a manual point for synchronization of changes between files"
msgstr "Dodaj ročno točko usklajevanja sprememb med datotekami"
-#: ../meld/filediff.py:242
+#: ../meld/filediff.py:256
msgid "Clear Synchronization Points"
msgstr "Počisti točke usklajevanja"
-#: ../meld/filediff.py:243
+#: ../meld/filediff.py:257
msgid "Clear manual change sychronization points"
msgstr "Počisti ročno spremenjene točke usklajevanja"
-#: ../meld/filediff.py:245
+#: ../meld/filediff.py:259
msgid "Previous Conflict"
msgstr "Predhodni spor"
-#: ../meld/filediff.py:246
+#: ../meld/filediff.py:260
msgid "Go to the previous conflict"
msgstr "Skoči na predhodni niz v sporu"
-#: ../meld/filediff.py:248
+#: ../meld/filediff.py:262
msgid "Next Conflict"
msgstr "Naslednji spor"
-#: ../meld/filediff.py:249
+#: ../meld/filediff.py:263
msgid "Go to the next conflict"
msgstr "Skoči na naslednji niz v sporu"
-#: ../meld/filediff.py:251
+#: ../meld/filediff.py:265
msgid "Push to Left"
msgstr "Potisni levo"
-#: ../meld/filediff.py:252
+#: ../meld/filediff.py:266
msgid "Push current change to the left"
msgstr "Potisni trenutne spremembe na levo"
-#: ../meld/filediff.py:255
+#: ../meld/filediff.py:269
msgid "Push to Right"
msgstr "Potisni desno"
-#: ../meld/filediff.py:256
+#: ../meld/filediff.py:270
msgid "Push current change to the right"
msgstr "Potisni trenutne spremembe na desno"
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:274
msgid "Pull from Left"
msgstr "Potegni z leve"
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:275
msgid "Pull change from the left"
msgstr "Potegni spremembe z leve"
-#: ../meld/filediff.py:264
+#: ../meld/filediff.py:278
msgid "Pull from Right"
msgstr "Potegni z desne"
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:279
msgid "Pull change from the right"
msgstr "Potegni spremembe z desne"
-#: ../meld/filediff.py:267
+#: ../meld/filediff.py:281
msgid "Copy Above Left"
msgstr "Kopiraj nad levo"
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:282
msgid "Copy change above the left chunk"
msgstr "Kopiraj spremembe nad levi del"
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:284
msgid "Copy Below Left"
msgstr "Kopiraj pod levo"
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:285
msgid "Copy change below the left chunk"
msgstr "Kopiraj spremembe pod levi del"
-#: ../meld/filediff.py:273
+#: ../meld/filediff.py:287
msgid "Copy Above Right"
msgstr "Kopiraj nad desno"
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:288
msgid "Copy change above the right chunk"
msgstr "Kopiraj spremembe nad desni del"
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:290
msgid "Copy Below Right"
msgstr "Kopiraj pod desno"
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:291
msgid "Copy change below the right chunk"
msgstr "Kopiraj spremembe pod desni del"
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:293
msgid "Delete"
msgstr "Izbriši"
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:294
msgid "Delete change"
msgstr "Izbriši spremembo"
-#: ../meld/filediff.py:282
+#: ../meld/filediff.py:296
msgid "Merge All from Left"
msgstr "Združi vse spremembe z leve"
-#: ../meld/filediff.py:283
+#: ../meld/filediff.py:297
msgid "Merge all non-conflicting changes from the left"
msgstr "Združi vse spremembe brez sporov z leve"
-#: ../meld/filediff.py:285
+#: ../meld/filediff.py:299
msgid "Merge All from Right"
msgstr "Združi vse spremembe z desne"
-#: ../meld/filediff.py:286
+#: ../meld/filediff.py:300
msgid "Merge all non-conflicting changes from the right"
msgstr "Združi vse spremembe brez sporov z desne"
-#: ../meld/filediff.py:288
+#: ../meld/filediff.py:302
msgid "Merge All"
msgstr "Združi vse"
-#: ../meld/filediff.py:289
+#: ../meld/filediff.py:303
msgid "Merge all non-conflicting changes from left and right panes"
msgstr "Združi vse spremembe brez sporov z leve in z desne"
-#: ../meld/filediff.py:293
+#: ../meld/filediff.py:307
msgid "Cycle Through Documents"
msgstr "Preklopi med dokumenti"
-#: ../meld/filediff.py:294
+#: ../meld/filediff.py:308
msgid "Move keyboard focus to the next document in this comparison"
msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
-#: ../meld/filediff.py:300
+#: ../meld/filediff.py:314
msgid "Lock Scrolling"
msgstr "Zakleni drsenje"
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:315
msgid "Lock scrolling of all panes"
msgstr "Zakleni drsenje vseh pladnjev"
#. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:486
+#: ../meld/filediff.py:472
msgid "INS"
msgstr "VST"
-#: ../meld/filediff.py:486
+#: ../meld/filediff.py:472
msgid "OVR"
msgstr "PRE"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:488
+#: ../meld/filediff.py:474
#, python-format
msgid "Ln %i, Col %i"
msgstr "Vr. %i, St. %i"
-#: ../meld/filediff.py:825
+#: ../meld/filediff.py:821
#, python-format
msgid ""
"Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -1344,55 +1367,75 @@ msgstr ""
"Po uporabi filtra '%s' se je spremenilo število vrstic v datoteki, zato "
"primerjava ne bo natančna. Za več podrobnosti si oglejte priročnik."
-#: ../meld/filediff.py:1095
+#: ../meld/filediff.py:890
+#, fuzzy
+msgid "Mark conflict as resolved?"
+msgstr "Označi kot razrešeno v VC"
+
+#: ../meld/filediff.py:892
+msgid ""
+"If the conflict was resolved successfully, you may mark it as resolved now."
+msgstr ""
+
+#: ../meld/filediff.py:894
+#, fuzzy
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: ../meld/filediff.py:895
+#, fuzzy
+msgid "Mark _Resolved"
+msgstr "Razrešen psevdonim \"%s\" -> %s\n"
+
+#: ../meld/filediff.py:1111
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] Določi okna"
-#: ../meld/filediff.py:1101
+#: ../meld/filediff.py:1117
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] Odpiranje datotek"
-#: ../meld/filediff.py:1124 ../meld/filediff.py:1134 ../meld/filediff.py:1147
-#: ../meld/filediff.py:1153
+#: ../meld/filediff.py:1140 ../meld/filediff.py:1150 ../meld/filediff.py:1163
+#: ../meld/filediff.py:1169
msgid "Could not read file"
msgstr "Ni mogoče prebrati datoteke"
-#: ../meld/filediff.py:1125
+#: ../meld/filediff.py:1141
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] Branje datotek"
-#: ../meld/filediff.py:1135
+#: ../meld/filediff.py:1151
#, python-format
msgid "%s appears to be a binary file."
msgstr "%s je videti kot dvojiška datoteka."
-#: ../meld/filediff.py:1148
+#: ../meld/filediff.py:1164
#, python-format
msgid "%s is not in encodings: %s"
msgstr "%s ni zapisan v naboru: %s"
-#: ../meld/filediff.py:1183
+#: ../meld/filediff.py:1202
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Računanje razlik"
-#: ../meld/filediff.py:1240
+#: ../meld/filediff.py:1269
#, python-format
msgid "File %s has changed on disk"
msgstr "Datoteka %s je bila na disku spremenjena."
-#: ../meld/filediff.py:1241
+#: ../meld/filediff.py:1270
msgid "Do you want to reload the file?"
msgstr "Ali želite ponovno naložiti datoteko?"
-#: ../meld/filediff.py:1244
+#: ../meld/filediff.py:1273
msgid "_Reload"
msgstr "_Ponovno naloži"
-#: ../meld/filediff.py:1405
+#: ../meld/filediff.py:1439
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1400,19 +1443,19 @@ msgstr ""
"Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
"Ali naj se primerja vsebina brez dejavnih filtrov?"
-#: ../meld/filediff.py:1411
+#: ../meld/filediff.py:1445
msgid "Files are identical"
msgstr "Datoteki sta enaki"
-#: ../meld/filediff.py:1419
+#: ../meld/filediff.py:1453
msgid "Show without filters"
msgstr "Pokaži brez filtrov"
-#: ../meld/filediff.py:1441
+#: ../meld/filediff.py:1475
msgid "Change highlighting incomplete"
msgstr "Spremeni označevanje kot nedokončano"
-#: ../meld/filediff.py:1442
+#: ../meld/filediff.py:1476
msgid ""
"Some changes were not highlighted because they were too large. You can force "
"Meld to take longer to highlight larger changes, though this may be slow."
@@ -1420,15 +1463,15 @@ msgstr ""
"Nekaterih sprememb ni mogoče poudariti, ker so prevelike. Označevanje je "
"mogoče vsiliti, vendar je postopek lahko zelo dolgotrajen."
-#: ../meld/filediff.py:1450
+#: ../meld/filediff.py:1484
msgid "Keep highlighting"
msgstr "Poudarjanje skladnje"
-#: ../meld/filediff.py:1452
+#: ../meld/filediff.py:1486
msgid "_Keep highlighting"
msgstr "_Poudarjanje skladnje"
-#: ../meld/filediff.py:1583
+#: ../meld/filediff.py:1617
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -1437,7 +1480,7 @@ msgstr ""
"\"%s\" že obstaja!\n"
"Ali naj bo datoteka prepisana?"
-#: ../meld/filediff.py:1596
+#: ../meld/filediff.py:1630
#, python-format
msgid ""
"Error writing to %s\n"
@@ -1448,39 +1491,39 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1607
+#: ../meld/filediff.py:1641
msgid "Save Left Pane As"
msgstr "Shrani levi pladenj kot"
-#: ../meld/filediff.py:1609
+#: ../meld/filediff.py:1643
msgid "Save Middle Pane As"
msgstr "Shrani srednji pladenj kot"
-#: ../meld/filediff.py:1611
+#: ../meld/filediff.py:1645
msgid "Save Right Pane As"
msgstr "Shrani desni pladenj kot"
-#: ../meld/filediff.py:1622
+#: ../meld/filediff.py:1658
#, python-format
msgid "File %s has changed on disk since it was opened"
msgstr ""
-#: ../meld/filediff.py:1624
+#: ../meld/filediff.py:1660
#, fuzzy
msgid "If you save it, any external changes will be lost."
msgstr ""
"V primeru, da datoteko shranite, bodo vse zunanje spremembe izgubljene. Ali "
"jo želite vseeno shraniti?"
-#: ../meld/filediff.py:1627
+#: ../meld/filediff.py:1663
msgid "Save Anyway"
msgstr "Vseeno shrani"
-#: ../meld/filediff.py:1628
+#: ../meld/filediff.py:1664
msgid "Don't Save"
msgstr "Ne shrani"
-#: ../meld/filediff.py:1652
+#: ../meld/filediff.py:1688
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -1491,7 +1534,7 @@ msgstr ""
"\n"
"Kateri zapis želite uporabiti?"
-#: ../meld/filediff.py:1668
+#: ../meld/filediff.py:1704
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -1500,11 +1543,11 @@ 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:2032
+#: ../meld/filediff.py:2065
msgid "Live comparison updating disabled"
msgstr "Živo posodabljanje ob primerjavi je onemogočeno"
-#: ../meld/filediff.py:2033
+#: ../meld/filediff.py:2066
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
@@ -1514,102 +1557,109 @@ msgstr ""
"Še vedno je mogoče ročno osvežiti primerjavo, živo posodabljanje pa bo spet "
"na voljo, ko bo usklajevanje končano."
-#: ../meld/filemerge.py:51
+#: ../meld/filemerge.py:48
#, python-format
msgid "[%s] Merging files"
msgstr "[%s] Združevanje datotek"
-#: ../meld/gutterrendererchunk.py:92
+#: ../meld/gutterrendererchunk.py:90
msgid "Copy _up"
msgstr "Kopiraj _navzgor"
-#: ../meld/gutterrendererchunk.py:93
+#: ../meld/gutterrendererchunk.py:91
msgid "Copy _down"
msgstr "Kopiraj _navzdol"
-#: ../meld/meldapp.py:134
+#: ../meld/meldapp.py:170
msgid "wrong number of arguments supplied to --diff"
msgstr "Neveljavno število argumentov pri ukazu --diff."
-#: ../meld/meldapp.py:139
+#: ../meld/meldapp.py:175
msgid "Start with an empty window"
msgstr "Zagon brez odprtih oken"
-#: ../meld/meldapp.py:140 ../meld/meldapp.py:142
+#: ../meld/meldapp.py:176 ../meld/meldapp.py:178
msgid "file"
msgstr "datoteka"
-#: ../meld/meldapp.py:140 ../meld/meldapp.py:144
-msgid "dir"
+#: ../meld/meldapp.py:176 ../meld/meldapp.py:180
+#, fuzzy
+msgid "folder"
msgstr "mapa"
-#: ../meld/meldapp.py:141
+#: ../meld/meldapp.py:177
msgid "Start a version control comparison"
msgstr "Zagon primerjave nadzora različic"
-#: ../meld/meldapp.py:143
+#: ../meld/meldapp.py:179
msgid "Start a 2- or 3-way file comparison"
msgstr "Zagon z dvojno ali trojno primerjavo datotek"
-#: ../meld/meldapp.py:145
-msgid "Start a 2- or 3-way directory comparison"
-msgstr "Zagon z dvojno ali trojno primerjavo map"
+#: ../meld/meldapp.py:181
+#, fuzzy
+msgid "Start a 2- or 3-way folder comparison"
+msgstr "Zagon z dvojno ali trojno primerjavo datotek"
+
+#: ../meld/meldapp.py:224
+#, fuzzy, python-format
+msgid "Error: %s\n"
+msgstr "Napaka: %s\n"
-#: ../meld/meldapp.py:153
+#: ../meld/meldapp.py:231
msgid "Meld is a file and directory comparison tool."
msgstr "Meld je orodje za primerjavo vsebine datotek in map."
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:235
msgid "Set label to use instead of file name"
msgstr "Določi naslov namesto imena datoteke"
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:238
msgid "Open a new tab in an already running instance"
msgstr "Odpri nov zavihek v že zagnanem programu"
-#: ../meld/meldapp.py:161
+#: ../meld/meldapp.py:241
msgid "Automatically compare all differing files on startup"
msgstr "Ob zagonu samodejno primerjaj vse različne datoteke."
-#: ../meld/meldapp.py:163
+#: ../meld/meldapp.py:244
msgid "Ignored for compatibility"
msgstr "Prezrto zaradi skladnosti"
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:248
msgid "Set the target file for saving a merge result"
msgstr "Določitev ciljne datoteke za shranjevanje rezultatov združevanja."
-#: ../meld/meldapp.py:168
+#: ../meld/meldapp.py:251
msgid "Automatically merge files"
msgstr "Samodejno združi datoteke"
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:255
msgid "Load a saved comparison from a Meld comparison file"
msgstr "Naloži shranjeno datoteko primerjav Meld"
-#: ../meld/meldapp.py:174
+#: ../meld/meldapp.py:259
msgid "Create a diff tab for the supplied files or folders"
msgstr "Ustvari zavihke primerjav za navedene datoteke ali mape."
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:279
#, python-format
msgid "too many arguments (wanted 0-3, got %d)"
msgstr "preveč argumentov (zahtevanih 0-3, prejetih %d)"
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:282
msgid "can't auto-merge less than 3 files"
msgstr "manj kot treh datotek ni mogoče samodejno združevati"
-#: ../meld/meldapp.py:182
+#: ../meld/meldapp.py:284
msgid "can't auto-merge directories"
msgstr "map ni mogoče samodejno združevati"
-#: ../meld/meldapp.py:192
+#: ../meld/meldapp.py:298
msgid "Error reading saved comparison file"
msgstr "Napaka med branjem datoteke primerjav"
#. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:107
+#: ../meld/meldbuffer.py:131
msgid "<unnamed>"
msgstr "<neimenovano>"
@@ -1617,240 +1667,232 @@ msgstr "<neimenovano>"
msgid "untitled"
msgstr "neimenovano"
-#: ../meld/meldwindow.py:51
+#: ../meld/meldwindow.py:48
msgid "_File"
msgstr "_Datoteka"
-#: ../meld/meldwindow.py:52
+#: ../meld/meldwindow.py:49
msgid "_New Comparison..."
msgstr "_Nova primerjava ..."
-#: ../meld/meldwindow.py:53
+#: ../meld/meldwindow.py:50
msgid "Start a new comparison"
msgstr "Nova primerjava"
-#: ../meld/meldwindow.py:56
+#: ../meld/meldwindow.py:53
msgid "Save the current file"
msgstr "Shrani trenutno datoteko"
-#: ../meld/meldwindow.py:58
+#: ../meld/meldwindow.py:55
msgid "Save As..."
msgstr "Shrani kot ..."
-#: ../meld/meldwindow.py:59
+#: ../meld/meldwindow.py:56
msgid "Save the current file with a different name"
msgstr "Shrani trenutno datoteko z drugim imenom"
-#: ../meld/meldwindow.py:62
+#: ../meld/meldwindow.py:59
msgid "Close the current file"
msgstr "Zapri trenutno datoteko"
-#: ../meld/meldwindow.py:65
+#: ../meld/meldwindow.py:62
msgid "_Edit"
msgstr "_Uredi"
-#: ../meld/meldwindow.py:67
+#: ../meld/meldwindow.py:64
msgid "Undo the last action"
msgstr "Razveljavi zadnje dejanje"
-#: ../meld/meldwindow.py:70
+#: ../meld/meldwindow.py:67
msgid "Redo the last undone action"
msgstr "Obnovi zadnje razveljavljeno dejanje"
-#: ../meld/meldwindow.py:72
+#: ../meld/meldwindow.py:69
msgid "Cut the selection"
msgstr "Izreži izbrano"
-#: ../meld/meldwindow.py:74
+#: ../meld/meldwindow.py:71
msgid "Copy the selection"
msgstr "Kopiraj izbrano"
-#: ../meld/meldwindow.py:76
+#: ../meld/meldwindow.py:73
msgid "Paste the clipboard"
msgstr "Prilepi iz odložišča"
-#: ../meld/meldwindow.py:78
+#: ../meld/meldwindow.py:75
msgid "Find..."
msgstr "Najdi ..."
-#: ../meld/meldwindow.py:78
+#: ../meld/meldwindow.py:75
msgid "Search for text"
msgstr "Poišči besedilo"
-#: ../meld/meldwindow.py:80
+#: ../meld/meldwindow.py:77
msgid "Find Ne_xt"
msgstr "Najdi _naslednje"
-#: ../meld/meldwindow.py:81
+#: ../meld/meldwindow.py:78
msgid "Search forwards for the same text"
msgstr "Poišči niz naprej po besedilu"
-#: ../meld/meldwindow.py:83
+#: ../meld/meldwindow.py:80
msgid "Find _Previous"
msgstr "Najdi _predhodne"
-#: ../meld/meldwindow.py:84
+#: ../meld/meldwindow.py:81
msgid "Search backwards for the same text"
msgstr "Besedilo najdi nazaj po besedilu"
-#: ../meld/meldwindow.py:87
+#: ../meld/meldwindow.py:84
msgid "_Replace..."
msgstr "_Zamenjaj ..."
-#: ../meld/meldwindow.py:88
+#: ../meld/meldwindow.py:85
msgid "Find and replace text"
msgstr "Poišči in zamenjaj besedilo"
-#: ../meld/meldwindow.py:91
+#: ../meld/meldwindow.py:88
msgid "_Changes"
msgstr "_Spremembe"
-#: ../meld/meldwindow.py:92
+#: ../meld/meldwindow.py:89
msgid "Next Change"
msgstr "Naslednja sprememba"
-#: ../meld/meldwindow.py:93
+#: ../meld/meldwindow.py:90
msgid "Go to the next change"
msgstr "Skoči na naslednjo spremembo"
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:92
msgid "Previous Change"
msgstr "Predhodna sprememba"
-#: ../meld/meldwindow.py:96
+#: ../meld/meldwindow.py:93
msgid "Go to the previous change"
msgstr "Skoči na predhodno spremembo"
-#: ../meld/meldwindow.py:98
+#: ../meld/meldwindow.py:95
msgid "Open Externally"
msgstr "Odpri v zunanjem programu"
-#: ../meld/meldwindow.py:99
+#: ../meld/meldwindow.py:96
msgid "Open selected file or directory in the default external application"
msgstr "Odpri zbrano datoteko ali mapo v privzetem zunanjem programu"
-#: ../meld/meldwindow.py:103
+#: ../meld/meldwindow.py:100
msgid "_View"
msgstr "_Pogled"
-#: ../meld/meldwindow.py:104
+#: ../meld/meldwindow.py:101
msgid "File Status"
msgstr "Stanje datoteke"
-#: ../meld/meldwindow.py:105
+#: ../meld/meldwindow.py:102
msgid "Version Status"
msgstr "Stanje različice"
-#: ../meld/meldwindow.py:108
+#: ../meld/meldwindow.py:105
msgid "Stop the current action"
msgstr "Ustavi trenutno dejanje"
-#: ../meld/meldwindow.py:111
+#: ../meld/meldwindow.py:108
msgid "Refresh the view"
msgstr "Osveži pogled"
-#: ../meld/meldwindow.py:114
+#: ../meld/meldwindow.py:111
msgid "_Tabs"
msgstr "_Zavihki"
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:112
msgid "_Previous Tab"
msgstr "_Predhodni zavihek"
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:113
msgid "Activate previous tab"
msgstr "Pokaži predhodni zavihek"
-#: ../meld/meldwindow.py:118
+#: ../meld/meldwindow.py:115
msgid "_Next Tab"
msgstr "_Naslednji zavihek"
-#: ../meld/meldwindow.py:119
+#: ../meld/meldwindow.py:116
msgid "Activate next tab"
msgstr "Pokaži naslednji zavihek"
-#: ../meld/meldwindow.py:122
+#: ../meld/meldwindow.py:119
msgid "Move Tab _Left"
msgstr "Premakni zavihek _levo"
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:120
msgid "Move current tab to left"
msgstr "Premakni trenutni zavihek na levo"
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:123
msgid "Move Tab _Right"
msgstr "Premakni zavihek _desno"
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:124
msgid "Move current tab to right"
msgstr "Premakni trenutni zavihek na desno"
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:128
msgid "Fullscreen"
msgstr "Celozaslonski način"
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:129
msgid "View the comparison in fullscreen"
msgstr "Pokaži primerjavo v celozaslonskem načinu"
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:131
msgid "_Toolbar"
msgstr "_Orodna vrstica"
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:132
msgid "Show or hide the toolbar"
msgstr "Pokaži ali skrij orodno vrstico"
-#: ../meld/meldwindow.py:137
-msgid "_Statusbar"
-msgstr "_Vrstica stanja"
-
-#: ../meld/meldwindow.py:138
-msgid "Show or hide the statusbar"
-msgstr "Pokaži ali skrij vrstico stanja"
-
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:141
msgid "Open Recent"
msgstr "Odpri nedavno"
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:142
msgid "Open recent files"
msgstr "Odpri nedavne datoteke"
-#: ../meld/meldwindow.py:539
+#: ../meld/meldwindow.py:506
msgid "Switch to this tab"
msgstr "Preklopi na ta zavihek"
-#: ../meld/meldwindow.py:662
+#: ../meld/meldwindow.py:629
msgid "Cannot compare a mixture of files and directories"
msgstr "Ni mogoče sočasno primerjati datotek in map"
#. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:180
+#: ../meld/misc.py:213
msgid "[None]"
msgstr "[noben]"
-#: ../meld/preferences.py:36
+#: ../meld/preferences.py:33
msgid "label"
msgstr "oznaka"
-#: ../meld/preferences.py:36
+#: ../meld/preferences.py:33
msgid "pattern"
msgstr "vzorec"
-#: ../meld/recent.py:107
+#: ../meld/recent.py:114
msgid "Version control:"
msgstr "Nadzor različic:"
-#: ../meld/ui/findbar.py:143
+#: ../meld/ui/findbar.py:144
msgid "Regular expression error"
msgstr "Napaka v logičnem izrazu"
-#: ../meld/ui/notebooklabel.py:68
+#: ../meld/ui/notebooklabel.py:65
msgid "Close tab"
msgstr "Zapri zavihek"
-#: ../meld/ui/vcdialogs.py:63
+#: ../meld/ui/vcdialogs.py:61
msgid "No files will be committed"
msgstr "Ni pripravljenih datotek za uveljavitev"
@@ -1881,7 +1923,7 @@ msgstr[1] "%d veja"
msgstr[2] "%d veji"
msgstr[3] "%d veje"
-#: ../meld/vc/git.py:341
+#: ../meld/vc/git.py:348
#, python-format
msgid "Mode changed from %s to %s"
msgstr "Način je spremenjen iz %s v %s"
@@ -1915,91 +1957,131 @@ msgid "Newly added"
msgstr "Nedavno dodano"
#: ../meld/vc/_vc.py:72
+#, fuzzy
+msgid "Renamed"
+msgstr "<neimenovano>"
+
+#: ../meld/vc/_vc.py:73
msgid "Conflict"
msgstr "V sporu"
-#: ../meld/vc/_vc.py:73
+#: ../meld/vc/_vc.py:74
msgid "Removed"
msgstr "Odstranjeno"
-#: ../meld/vc/_vc.py:74
+#: ../meld/vc/_vc.py:75
msgid "Missing"
msgstr "Manjkajoče"
-#: ../meld/vc/_vc.py:75
+#: ../meld/vc/_vc.py:76
msgid "Not present"
msgstr "Ni na voljo"
-#: ../meld/vcview.py:218 ../meld/vcview.py:393
+#: ../meld/vcview.py:233 ../meld/vcview.py:417
msgid "Location"
msgstr "Mesto"
-#: ../meld/vcview.py:219
+#: ../meld/vcview.py:234
msgid "Status"
msgstr "Stanje"
-#: ../meld/vcview.py:220
+#: ../meld/vcview.py:235
msgid "Revision"
msgstr "Predelava"
-#: ../meld/vcview.py:221
+#: ../meld/vcview.py:236
msgid "Options"
msgstr "Možnosti"
#. TRANSLATORS: this is an error message when a version control
#. application isn't installed or can't be found
-#: ../meld/vcview.py:304
+#: ../meld/vcview.py:324
#, python-format
msgid "%s not installed"
msgstr "Program %s ni nameščen"
#. TRANSLATORS: this is an error message when a version
#. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:308
+#: ../meld/vcview.py:328
msgid "Invalid repository"
msgstr "Neveljavno skladišče"
-#: ../meld/vcview.py:317
+#: ../meld/vcview.py:337
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../meld/vcview.py:319 ../meld/vcview.py:327
+#: ../meld/vcview.py:339 ../meld/vcview.py:347
msgid "None"
msgstr "Brez"
-#: ../meld/vcview.py:338
+#: ../meld/vcview.py:358
msgid "No valid version control system found in this folder"
msgstr "Ni veljavnega sistema za nadzor različic v tej mapi"
-#: ../meld/vcview.py:340
+#: ../meld/vcview.py:360
msgid "Only one version control system found in this folder"
msgstr "V tej mapi je le en sistem nadzora različic"
-#: ../meld/vcview.py:342
+#: ../meld/vcview.py:362
msgid "Choose which version control system to use"
msgstr "Izbor različice sistema za nadzor različic za uporabo"
#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:393
+#: ../meld/vcview.py:417
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
-#: ../meld/vcview.py:407 ../meld/vcview.py:415
+#: ../meld/vcview.py:431 ../meld/vcview.py:439
#, python-format
msgid "Scanning %s"
msgstr "Preiskovanje %s"
-#: ../meld/vcview.py:449
+#: ../meld/vcview.py:479
msgid "(Empty)"
msgstr "(Prazno)"
-#: ../meld/vcview.py:672
+#: ../meld/vcview.py:522
+#, fuzzy, python-format
+msgid "%s — local"
+msgstr "Krajevno"
+
+#: ../meld/vcview.py:523
+#, fuzzy, python-format
+msgid "%s — remote"
+msgstr "<b>Oddaljeno:</b> %s"
+
+#: ../meld/vcview.py:531
+#, fuzzy, python-format
+msgid "%s (local, merge, remote)"
+msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
+
+#: ../meld/vcview.py:536
+#, fuzzy, python-format
+msgid "%s (remote, merge, local)"
+msgstr "Objavljanje krajevne veje <%s> na oddaljeno vejo <%s>"
+
+#: ../meld/vcview.py:547
+#, fuzzy, python-format
+msgid "%s — repository"
+msgstr "Skladišče:"
+
+#: ../meld/vcview.py:553
+#, fuzzy, python-format
+msgid "%s (working, repository)"
+msgstr "Stanje skladišča"
+
+#: ../meld/vcview.py:557
+#, fuzzy, python-format
+msgid "%s (repository, working)"
+msgstr "Delovna mapa:"
+
+#: ../meld/vcview.py:741
msgid "Remove folder and all its files?"
msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
-#: ../meld/vcview.py:674
+#: ../meld/vcview.py:743
msgid ""
"This will remove all selected files and folders, and all files within any "
"selected folders, from version control."
@@ -2007,11 +2089,76 @@ msgstr ""
"S tem dejanjem bodo odstranjene vse izbrane datoteke in mape in vse "
"podrejene datoteke iz sistema za nadzor različic"
-#: ../meld/vcview.py:708
+#: ../meld/vcview.py:777
#, python-format
msgid "Error removing %s"
msgstr "Napaka med odstranjevanjem %s"
+#~ msgid "Ignore changes which insert or delete blank lines"
+#~ msgstr ""
+#~ "Prezri spremembe, s katerimi se vstavijo ali izbrišejo prazne vrstice"
+
+#~ msgid "%i second"
+#~ msgid_plural "%i seconds"
+#~ msgstr[0] "%i sekund"
+#~ msgstr[1] "%i sekunda"
+#~ msgstr[2] "%i sekundi"
+#~ msgstr[3] "%i sekunde"
+
+#~ msgid "%i minute"
+#~ msgid_plural "%i minutes"
+#~ msgstr[0] "%i minut"
+#~ msgstr[1] "%i minuta"
+#~ msgstr[2] "%i minuti"
+#~ msgstr[3] "%i minute"
+
+#~ msgid "%i hour"
+#~ msgid_plural "%i hours"
+#~ msgstr[0] "%i ur"
+#~ msgstr[1] "%i ura"
+#~ msgstr[2] "%i uri"
+#~ msgstr[3] "%i ure"
+
+#~ msgid "%i day"
+#~ msgid_plural "%i days"
+#~ msgstr[0] "%i dni"
+#~ msgstr[1] "%i dan"
+#~ msgstr[2] "%i dni"
+#~ msgstr[3] "%i dni"
+
+#~ msgid "%i week"
+#~ msgid_plural "%i weeks"
+#~ msgstr[0] "%i tednov"
+#~ msgstr[1] "%i teden"
+#~ msgstr[2] "%i tedna"
+#~ msgstr[3] "%i tedni"
+
+#~ msgid "%i month"
+#~ msgid_plural "%i months"
+#~ msgstr[0] "%i mesecev"
+#~ msgstr[1] "%i mesec"
+#~ msgstr[2] "%i meseca"
+#~ msgstr[3] "%i meseci"
+
+#~ msgid "%i year"
+#~ msgid_plural "%i years"
+#~ msgstr[0] "%i let"
+#~ msgstr[1] "%i leto"
+#~ msgstr[2] "%i leti"
+#~ msgstr[3] "%i leta"
+
+#~ msgid "dir"
+#~ msgstr "mapa"
+
+#~ msgid "Start a 2- or 3-way directory comparison"
+#~ msgstr "Zagon z dvojno ali trojno primerjavo map"
+
+#~ msgid "_Statusbar"
+#~ msgstr "_Vrstica stanja"
+
+#~ msgid "Show or hide the statusbar"
+#~ msgstr "Pokaži ali skrij vrstico stanja"
+
#~ msgid ""
#~ "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:"
#~ "Missing:Not present"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]