[meld] Updated Slovenian translation
- From: Matej Urbančič <mateju src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Updated Slovenian translation
- Date: Tue, 12 Feb 2019 11:35:13 +0000 (UTC)
commit 87ddf8a42b15033a2eb3975471bebe58d7d644f7
Author: Matej Urbančič <mateju svn gnome org>
Date: Tue Feb 12 12:34:54 2019 +0100
Updated Slovenian translation
po/sl.po | 2051 +++++++++++++++++++++++++++++++-------------------------------
1 file changed, 1027 insertions(+), 1024 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 92f346e2..ea318357 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,14 +2,14 @@
# Copyright (C) 2009 meld's COPYRIGHT HOLDER
# This file is distributed under the same license as the meld package.
#
-# Matej Urbančič <mateju svn gnome org>, 2009–2018.
+# Matej Urbančič <mateju svn gnome org>, 2009–2019.
#
msgid ""
msgstr ""
"Project-Id-Version: meld master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
-"POT-Creation-Date: 2018-10-13 21:05+0000\n"
-"PO-Revision-Date: 2018-10-23 15:15+0200\n"
+"POT-Creation-Date: 2019-01-25 12:24+0000\n"
+"PO-Revision-Date: 2019-01-26 15:50+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"
@@ -21,16 +21,16 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n"
"X-Generator: Poedit 2.1.1\n"
-#: ../bin/meld:194
+#: ../bin/meld:190
msgid "Cannot import: "
msgstr "Ni mogoče uvoziti:"
-#: ../bin/meld:197
+#: ../bin/meld:193
#, c-format
msgid "Meld requires %s or higher."
msgstr "Program Meld zahteva najmanj različico %s."
-#: ../bin/meld:243
+#: ../bin/meld:262
#, c-format
msgid ""
"Couldn’t load Meld-specific CSS (%s)\n"
@@ -40,7 +40,8 @@ msgstr ""
"%s"
#: ../data/org.gnome.meld.desktop.in.h:1
-#: ../data/org.gnome.meld.appdata.xml.in.h:1 ../data/ui/meldapp.ui.h:1
+#: ../data/org.gnome.meld.appdata.xml.in.h:1
+#: ../meld/resources/ui/appwindow.ui.h:1
msgid "Meld"
msgstr "Meld"
@@ -105,28 +106,10 @@ msgid "Default window fullscreen state"
msgstr "Postavi okno v celozaslonski način."
#: ../data/org.gnome.meld.gschema.xml.h:5
-msgid "Show toolbar"
-msgstr "Pokaži orodno vrstico"
-
-#: ../data/org.gnome.meld.gschema.xml.h:6
-#, fuzzy
-msgid "If true, the window toolbar is visible."
-msgstr "Ali naj bo orodna vrstica vidna."
-
-#: ../data/org.gnome.meld.gschema.xml.h:7
-msgid "Show statusbar"
-msgstr "Pokaži vrstico stanja"
-
-#: ../data/org.gnome.meld.gschema.xml.h:8
-#, fuzzy
-msgid "If true, the window statusbar is visible."
-msgstr "Vrstica stanja je vidna"
-
-#: ../data/org.gnome.meld.gschema.xml.h:9
msgid "Additional automatically detected text encodings"
msgstr "Dodatna samodejno zaznana kodiranja"
-#: ../data/org.gnome.meld.gschema.xml.h:10
+#: ../data/org.gnome.meld.gschema.xml.h:6
msgid ""
"Meld will use these text encodings to try to decode loaded text files before "
"trying any other encodings. In addition to the encodings in this list, UTF-8 "
@@ -134,173 +117,176 @@ msgid ""
"may also be tried, depending on the user’s locale."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:11
+#: ../data/org.gnome.meld.gschema.xml.h:7
#, fuzzy
msgid "Width of an indentation step"
msgstr "Število presledkov posamezne ravni zamikanja"
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: ../data/org.gnome.meld.gschema.xml.h:8
#, fuzzy
msgid "The number of spaces to use for a single indent step"
msgstr "Število presledkov za vsak korak zamika"
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: ../data/org.gnome.meld.gschema.xml.h:9
#, fuzzy
msgid "Whether to indent using spaces or tabs"
msgstr "Ali naj gedit vstavlja presledke namesto zamikov (tabulatorjev)."
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: ../data/org.gnome.meld.gschema.xml.h:10
msgid "If true, any new indentation will use spaces instead of tabs."
msgstr ""
"Izbrana možnost določa, da bo vsako novo zamikanje uporabljalo presledke "
"namesto tabulatorja."
-#: ../data/org.gnome.meld.gschema.xml.h:15
+#: ../data/org.gnome.meld.gschema.xml.h:11
+#: ../meld/resources/ui/statusbar-menu.ui.h:1
msgid "Show line numbers"
msgstr "Pokaži številke vrstic"
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: ../data/org.gnome.meld.gschema.xml.h:12
msgid "If true, line numbers will be shown in the gutter of file comparisons."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:17
+#: ../data/org.gnome.meld.gschema.xml.h:13
msgid "Highlight syntax"
msgstr "Poudarjanje skladnje"
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: ../data/org.gnome.meld.gschema.xml.h:14
msgid ""
"Whether to highlight syntax in comparisons. Because of Meld’s own color "
"highlighting, this is off by default."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: ../data/org.gnome.meld.gschema.xml.h:15
#, fuzzy
msgid "Color scheme to use for syntax highlighting"
msgstr "Ime barvne sheme gtksourceview za poudarjanje skladnje."
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: ../data/org.gnome.meld.gschema.xml.h:16
msgid "Used by GtkSourceView to determine colors for syntax highlighting"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:21
+#: ../data/org.gnome.meld.gschema.xml.h:17
msgid "Displayed whitespace"
msgstr "Vidni presledni znaki"
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:18
msgid ""
"Selector for individual whitespace character types to be shown. Possible "
"values are 'space', 'tab', 'newline' and 'nbsp'."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:23
+#: ../data/org.gnome.meld.gschema.xml.h:19
msgid "Wrap mode"
msgstr "Način preloma"
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: ../data/org.gnome.meld.gschema.xml.h:20
msgid ""
"Lines in file comparisons will be wrapped according to this setting, either "
"not at all ('none'), at any character ('char') or only at the end of words "
"('word')."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:21
+#: ../meld/resources/ui/statusbar-menu.ui.h:3
msgid "Highlight current line"
msgstr "Poudari trenutno vrstico"
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: ../data/org.gnome.meld.gschema.xml.h:22
msgid ""
"If true, the line containing the cursor will be highlighted in file "
"comparisons."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:27
+#: ../data/org.gnome.meld.gschema.xml.h:23
#, fuzzy
msgid "Use the system default monospace font"
msgstr "Ali naj se uporabi privzeta sistemska pisava enake širine znakov"
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: ../data/org.gnome.meld.gschema.xml.h:24
msgid ""
"If false, custom-font will be used instead of the system monospace font."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:29
+#: ../data/org.gnome.meld.gschema.xml.h:25
msgid "Custom font"
msgstr "Pisava po meri"
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: ../data/org.gnome.meld.gschema.xml.h:26
msgid ""
"The custom font to use, stored as a string and parsed as a Pango font "
"description."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:31
+#: ../data/org.gnome.meld.gschema.xml.h:27
msgid "Ignore blank lines when comparing files"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: ../data/org.gnome.meld.gschema.xml.h:28
msgid ""
"If true, blank lines will be trimmed when highlighting changes between files."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:33
+#: ../data/org.gnome.meld.gschema.xml.h:29
#, fuzzy
msgid "Use the system default editor"
msgstr "Uporabi _privzet sistemski urejevalnik besedil."
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: ../data/org.gnome.meld.gschema.xml.h:30
msgid ""
"If false, custom-editor-command will be used instead of the system editor "
"when opening files externally."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:35
+#: ../data/org.gnome.meld.gschema.xml.h:31
#, fuzzy
msgid "The custom editor launch command"
msgstr "Ukaz za zagon urejevalnika: "
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: ../data/org.gnome.meld.gschema.xml.h:32
msgid ""
"The command used to launch a custom editor. Some limited templating is "
"supported here; at the moment '{file}' and '{line}' are recognised tokens."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: ../data/org.gnome.meld.gschema.xml.h:33
msgid "Columns to display"
msgstr "Prikazani stolpci"
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: ../data/org.gnome.meld.gschema.xml.h:34
msgid ""
"List of column names in folder comparison and whether they should be "
"displayed."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:39 ../data/ui/preferences.ui.h:25
+#: ../data/org.gnome.meld.gschema.xml.h:35
+#: ../meld/resources/ui/preferences.ui.h:25
msgid "Ignore symbolic links"
msgstr "Prezri simbolne povezave"
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: ../data/org.gnome.meld.gschema.xml.h:36
msgid ""
"If true, folder comparisons do not follow symbolic links when traversing the "
"folder tree."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:41
+#: ../data/org.gnome.meld.gschema.xml.h:37
msgid "Use shallow comparison"
msgstr "Uporabi grobo primerjavo"
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: ../data/org.gnome.meld.gschema.xml.h:38
msgid ""
"If true, folder comparisons compare files based solely on size and mtime, "
"considering files to be identical if their size and mtime match, and "
"different otherwise."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:43
+#: ../data/org.gnome.meld.gschema.xml.h:39
#, fuzzy
msgid "File timestamp resolution"
msgstr "Ločljivost časovnega _žiga:"
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: ../data/org.gnome.meld.gschema.xml.h:40
msgid ""
"When comparing based on mtime, this is the minimum difference in nanoseconds "
"between two files before they’re considered to have different mtimes. This "
@@ -308,129 +294,127 @@ msgid ""
"resolution."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:45 ../data/ui/preferences.ui.h:22
+#: ../data/org.gnome.meld.gschema.xml.h:41
+#: ../meld/resources/ui/preferences.ui.h:22
msgid "Apply text filters during folder comparisons"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: ../data/org.gnome.meld.gschema.xml.h:42
msgid ""
"If true, folder comparisons that compare file contents also apply active "
"text filters and the blank line trimming option, and ignore newline "
"differences."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:47
+#: ../data/org.gnome.meld.gschema.xml.h:43
msgid "File status filters"
msgstr "Filtri stanja datotek"
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: ../data/org.gnome.meld.gschema.xml.h:44
msgid "List of statuses used to filter visible files in folder comparison."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:49
+#: ../data/org.gnome.meld.gschema.xml.h:45
#, fuzzy
msgid "Show the version control console output"
msgstr "Pokaži/Skrij odvod konzole"
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: ../data/org.gnome.meld.gschema.xml.h:46
msgid ""
"If true, a console output section will be shown in version control views, "
"showing the commands run for version control operations."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:51
+#: ../data/org.gnome.meld.gschema.xml.h:47
#, fuzzy
msgid "Version control pane position"
msgstr "Nadzor različic"
-#: ../data/org.gnome.meld.gschema.xml.h:52
+#: ../data/org.gnome.meld.gschema.xml.h:48
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:53
+#: ../data/org.gnome.meld.gschema.xml.h:49
msgid "Present version comparisons as left-local/right-remote"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:54
+#: ../data/org.gnome.meld.gschema.xml.h:50
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:55
+#: ../data/org.gnome.meld.gschema.xml.h:51
#, 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:56
+#: ../data/org.gnome.meld.gschema.xml.h:52
msgid ""
"Choices for file order are remote/merged/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:57
+#: ../data/org.gnome.meld.gschema.xml.h:53
#, 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:58
+#: ../data/org.gnome.meld.gschema.xml.h:54
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:59
+#: ../data/org.gnome.meld.gschema.xml.h:55
#, 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:60
+#: ../data/org.gnome.meld.gschema.xml.h:56
msgid ""
"The column at which to show the margin in the version control commit message "
"editor."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: ../data/org.gnome.meld.gschema.xml.h:57
msgid "Automatically hard-wrap commit messages"
msgstr "Samodejno na silo prelomi sporočila uveljavitve"
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: ../data/org.gnome.meld.gschema.xml.h:58
msgid ""
"If true, the version control commit message editor will hard-wrap (i.e., "
"insert line breaks) at the commit margin before commit."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:63
-#, fuzzy
+#: ../data/org.gnome.meld.gschema.xml.h:59
msgid "Version control status filters"
-msgstr "Filtri stanja datotek"
+msgstr "Filtri nadzora različic"
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: ../data/org.gnome.meld.gschema.xml.h:60
msgid ""
"List of statuses used to filter visible files in version control comparison."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:65
-#, fuzzy
+#: ../data/org.gnome.meld.gschema.xml.h:61
msgid "Filename-based filters"
-msgstr "Datotečni filtri"
+msgstr "Filtri poimenovanja datotek"
-#: ../data/org.gnome.meld.gschema.xml.h:66
+#: ../data/org.gnome.meld.gschema.xml.h:62
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:67
-#, fuzzy
+#: ../data/org.gnome.meld.gschema.xml.h:63
msgid "Text-based filters"
msgstr "Filtri besedila"
-#: ../data/org.gnome.meld.gschema.xml.h:68
+#: ../data/org.gnome.meld.gschema.xml.h:64
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, "
@@ -438,1188 +422,1204 @@ msgid ""
msgstr ""
#: ../data/styles/meld-base.xml.h:1
-#, fuzzy
msgid "Meld base scheme"
-msgstr "SHEMA"
+msgstr "Osnovna shema"
#: ../data/styles/meld-base.xml.h:2
-#, fuzzy
msgid "Base color scheme for Meld highlighting"
-msgstr "Ime barvne sheme gtksourceview za poudarjanje skladnje."
+msgstr "Osnovna barvna shema za poudarjanje skladnje"
#: ../data/styles/meld-dark.xml.h:1
-#, fuzzy
msgid "Meld dark scheme"
-msgstr "Meld"
+msgstr "Temna shema"
#: ../data/styles/meld-dark.xml.h:2
-#, fuzzy
msgid "Dark color scheme for Meld highlighting"
-msgstr "Temna barvna shema z barvno paleto tango"
+msgstr "Temna barvna shema za poudarjanje skladnje"
-#: ../data/ui/application.ui.h:1
-msgid "About Meld"
-msgstr "O programu"
+#: ../meld/resources/gtk/help-overlay.ui.h:1
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Splošno"
-#: ../data/ui/application.ui.h:2
-msgid ""
-"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
-msgstr ""
-"Avtorske pravice © 2002-2009 Stephen Kennedy\n"
-"Avtorske pravice © 2009-2018 Kai Willadsen"
+#: ../meld/resources/gtk/help-overlay.ui.h:2
+msgctxt "shortcut window"
+msgid "New comparison"
+msgstr "Nova primerjava"
-#: ../data/ui/application.ui.h:4
-msgid "Website"
-msgstr "Spletišče"
+#: ../meld/resources/gtk/help-overlay.ui.h:3
+msgctxt "shortcut window"
+msgid "Close a comparison"
+msgstr "Zapri primerjavo"
-#: ../data/ui/application.ui.h:5
-msgid "translator-credits"
-msgstr "Matej Urbančič <mateju svn gnome org>"
+#: ../meld/resources/gtk/help-overlay.ui.h:4
+msgctxt "shortcut window"
+msgid "Quit Meld"
+msgstr "Končaj program"
-#: ../data/ui/application.ui.h:6
-msgid "_Preferences"
-msgstr "_Možnosti"
+#: ../meld/resources/gtk/help-overlay.ui.h:5
+msgctxt "shortcut window"
+msgid "Stop the current action"
+msgstr "Ustavi trenutno dejanje"
-#: ../data/ui/application.ui.h:7
-msgid "_Help"
-msgstr "Pomo_č"
+#: ../meld/resources/gtk/help-overlay.ui.h:6
+msgctxt "shortcut window"
+msgid "Refresh comparison"
+msgstr "Osveži primerjavo"
-#: ../data/ui/application.ui.h:8
-msgid "Keyboard Shortcuts"
-msgstr "Tipkovne bližnjice"
+#: ../meld/resources/gtk/help-overlay.ui.h:7
+msgctxt "shortcut window"
+msgid "Fullscreen"
+msgstr "Celozaslonski način"
-#: ../data/ui/application.ui.h:9
-msgid "_About"
-msgstr "_O programu"
+#: ../meld/resources/gtk/help-overlay.ui.h:8
+msgctxt "shortcut window"
+msgid "Tabs"
+msgstr "Zavihki"
-#: ../data/ui/application.ui.h:10
-msgid "_Quit"
-msgstr "_Končaj"
+#: ../meld/resources/gtk/help-overlay.ui.h:9
+msgctxt "shortcut window"
+msgid "Go to previous tab"
+msgstr "Skoči na predhodni zavihek"
-#: ../data/ui/dirdiff.ui.h:1 ../data/ui/vcview.ui.h:1
-msgid "_Compare"
-msgstr "_Primerjava"
+#: ../meld/resources/gtk/help-overlay.ui.h:10
+msgctxt "shortcut window"
+msgid "Go to next tab"
+msgstr "Skoči na naslednji zavihek"
-#: ../data/ui/dirdiff.ui.h:2 ../data/ui/vcview.ui.h:2
-msgid "Compare selected files"
-msgstr "Primerjajo izbrane datoteke"
+#: ../meld/resources/gtk/help-overlay.ui.h:11
+msgctxt "shortcut window"
+msgid "Switch to tab"
+msgstr "Preklopi na zavihek"
-#: ../data/ui/dirdiff.ui.h:3
-msgid "Collapse Recursively"
-msgstr ""
+#: ../meld/resources/gtk/help-overlay.ui.h:12
+msgctxt "shortcut window"
+msgid "Move tab left"
+msgstr "Premakni zavihek levo"
-#: ../data/ui/dirdiff.ui.h:4
-#, fuzzy
-#| msgid "Remove folder and all its files?"
-msgid "Collapse selected folder and all subfolders"
-msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
+#: ../meld/resources/gtk/help-overlay.ui.h:13
+msgctxt "shortcut window"
+msgid "Move tab right"
+msgstr "Premakni zavihek desno"
-#: ../data/ui/dirdiff.ui.h:5
-msgid "Expand Recursively"
-msgstr ""
+#: ../meld/resources/gtk/help-overlay.ui.h:14
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Spremembe"
-#: ../data/ui/dirdiff.ui.h:6
-#, fuzzy
-#| msgid "Remove folder and all its files?"
-msgid "Expand selected folder and all subfolders"
-msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
+#: ../meld/resources/gtk/help-overlay.ui.h:15
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Skoči na predhodno spremembo"
-#: ../data/ui/dirdiff.ui.h:7
-msgid "Copy to _Left"
-msgstr "Kopiraj na _levo"
+#: ../meld/resources/gtk/help-overlay.ui.h:16
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Skoči na naslednjo spremembo"
-#: ../data/ui/dirdiff.ui.h:8
-msgid "Copy to left"
-msgstr "Kopiraj na levo"
+#: ../meld/resources/gtk/help-overlay.ui.h:17
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Urejanje"
-#: ../data/ui/dirdiff.ui.h:9
-msgid "Copy to _Right"
-msgstr "Kopiraj na _desno"
+#: ../meld/resources/gtk/help-overlay.ui.h:18
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "Razveljavi"
-#: ../data/ui/dirdiff.ui.h:10
-msgid "Copy to right"
-msgstr "Kopiraj na desno"
+#: ../meld/resources/gtk/help-overlay.ui.h:19
+msgctxt "shortcut window"
+msgid "Redo"
+msgstr "Ponovi"
-#: ../data/ui/dirdiff.ui.h:11
-msgid "Delete selected"
-msgstr "Izbriši izbor"
+#: ../meld/resources/gtk/help-overlay.ui.h:20
+msgctxt "shortcut window"
+msgid "Cut"
+msgstr "Izreži"
-#: ../data/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:920 ../meld/filediff.py:1489
-msgid "Hide"
-msgstr "Skrij"
+#: ../meld/resources/gtk/help-overlay.ui.h:21
+msgctxt "shortcut window"
+msgid "Copy"
+msgstr "Kopiraj"
-#: ../data/ui/dirdiff.ui.h:13
-msgid "Hide selected"
-msgstr "Skrij izbrano"
+#: ../meld/resources/gtk/help-overlay.ui.h:22
+msgctxt "shortcut window"
+msgid "Paste"
+msgstr "Prilepi"
-#: ../data/ui/dirdiff.ui.h:14
-msgid "Ignore Filename Case"
-msgstr "Prezri velikost črk imen datotek"
+#: ../meld/resources/gtk/help-overlay.ui.h:23
+msgctxt "shortcut window"
+msgid "Find"
+msgstr "Najdi"
-#: ../data/ui/dirdiff.ui.h:15
-msgid ""
-"Consider differently-cased filenames that are otherwise-identical to be the "
-"same"
-msgstr ""
-"Obravnavaj datoteke, ki imajo v imenu črke različne velikosti, vendar so "
-"sicer enake, kot da so enake."
+#: ../meld/resources/gtk/help-overlay.ui.h:24
+msgctxt "shortcut window"
+msgid "Find Next"
+msgstr "Najdi naslednje"
-#: ../data/ui/dirdiff.ui.h:16
-msgid "Same"
-msgstr "Enako"
+#: ../meld/resources/gtk/help-overlay.ui.h:25
+msgctxt "shortcut window"
+msgid "Find Previous"
+msgstr "Najdi predhodno"
-#: ../data/ui/dirdiff.ui.h:17
-msgid "Show identical"
-msgstr "Pokaži enako"
+#: ../meld/resources/gtk/help-overlay.ui.h:26
+msgctxt "shortcut window"
+msgid "Replace"
+msgstr "Zamenjaj"
-#: ../data/ui/dirdiff.ui.h:18
-msgid "New"
-msgstr "Novo"
+#: ../meld/resources/gtk/help-overlay.ui.h:27
+msgctxt "shortcut window"
+msgid "File comparison"
+msgstr "Primerjava datotek"
-#: ../data/ui/dirdiff.ui.h:19
-msgid "Show new"
-msgstr "Pokaži novejše"
+#: ../meld/resources/gtk/help-overlay.ui.h:28
+msgctxt "shortcut window"
+msgid "Save current file"
+msgstr "Shrani trenutno datoteko"
-#: ../data/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:76
-msgid "Modified"
-msgstr "Spremenjeno"
+#: ../meld/resources/gtk/help-overlay.ui.h:29
+msgctxt "shortcut window"
+msgid "Save current file to new path"
+msgstr "Shrani trenutni izbor kot novo prednastavitev"
-#: ../data/ui/dirdiff.ui.h:21
-msgid "Show modified"
-msgstr "Pokaži spremenjeno"
+#: ../meld/resources/gtk/help-overlay.ui.h:30
+msgctxt "shortcut window"
+msgid "Save all files in comparison"
+msgstr "Shrani vse datoteke trenutne primerjave"
-#: ../data/ui/dirdiff.ui.h:22
-msgid "Filters"
-msgstr "Filtri"
+#: ../meld/resources/gtk/help-overlay.ui.h:31
+msgctxt "shortcut window"
+msgid "Previous conflict"
+msgstr "Predhodni spor"
-#: ../data/ui/dirdiff.ui.h:23
-msgid "Set active filters"
-msgstr "Določi dejavne filtre"
+#: ../meld/resources/gtk/help-overlay.ui.h:32
+msgctxt "shortcut window"
+msgid "Next conflict"
+msgstr "Naslednji spor"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:33
+msgctxt "shortcut window"
+msgid "Push change to left"
+msgstr "Potisni trenutne spremembe na levo"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:34
+msgctxt "shortcut window"
+msgid "Push change to right"
+msgstr "Potisni trenutne spremembe na desno"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:35
+msgctxt "shortcut window"
+msgid "Pull change from left"
+msgstr "Potegni spremembe z leve"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:36
+msgctxt "shortcut window"
+msgid "Pull change from right"
+msgstr "Potegni spremembe z desne"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:37
+msgctxt "shortcut window"
+msgid "Copy change above left"
+msgstr "Kopiraj spremembe nad levi del"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:38
+msgctxt "shortcut window"
+msgid "Copy change below left"
+msgstr "Kopiraj spremembe pod levi del"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:39
+msgctxt "shortcut window"
+msgid "Copy change above right"
+msgstr "Kopiraj spremembe nad desni del"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:40
+msgctxt "shortcut window"
+msgid "Copy change below right"
+msgstr "Kopiraj spremembe pod desni del"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:41
+msgctxt "shortcut window"
+msgid "Delete change"
+msgstr "Izbriši spremembo"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:42
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Predhodno okno primerjave"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:43
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Naslednje okno primerjave"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:44
+msgctxt "shortcut window"
+msgid "Folder comparison"
+msgstr "Primerjava map"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:45
+msgctxt "shortcut window"
+msgid "Copy to left"
+msgstr "Kopiraj na levo"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:46
+msgctxt "shortcut window"
+msgid "Copy to right"
+msgstr "Kopiraj na desno"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:47
+msgctxt "shortcut window"
+msgid "Version control comparison"
+msgstr "Primerjava nadzora različic"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:48
+msgctxt "shortcut window"
+msgid "Commit to version control"
+msgstr "Uveljavi spremembe v sistem za nadzor različic"
+
+#: ../meld/resources/gtk/help-overlay.ui.h:49
+msgctxt "shortcut window"
+msgid "Show/hide console output"
+msgstr "Pokaži/Skrij odvod konzole"
+
+#: ../meld/resources/gtk/menus.ui.h:1
+msgid "_Preferences"
+msgstr "_Možnosti"
+
+#: ../meld/resources/gtk/menus.ui.h:2
+msgid "_Help"
+msgstr "Pomo_č"
+
+#: ../meld/resources/gtk/menus.ui.h:3
+msgid "Keyboard Shortcuts"
+msgstr "Tipkovne bližnjice"
+
+#: ../meld/resources/gtk/menus.ui.h:4
+msgid "_About"
+msgstr "_O programu"
+
+#: ../meld/resources/gtk/menus.ui.h:5
+msgid "_Quit"
+msgstr "_Končaj"
+
+#: ../meld/resources/ui/about-dialog.ui.h:1
+msgid "About Meld"
+msgstr "O programu"
+
+#: ../meld/resources/ui/about-dialog.ui.h:2
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2017 Kai Willadsen"
+msgstr ""
+"Avtorske pravice © 2002-2009 Stephen Kennedy\n"
+"Avtorske pravice © 2009-2018 Kai Willadsen"
-#: ../data/ui/EditableList.ui.h:1
-msgid "Editable List"
-msgstr "Uredljiv seznam"
+#: ../meld/resources/ui/about-dialog.ui.h:4
+msgid "Website"
+msgstr "Spletišče"
+
+#: ../meld/resources/ui/about-dialog.ui.h:5
+msgid "translator-credits"
+msgstr "Matej Urbančič <mateju svn gnome org>"
-#: ../data/ui/EditableList.ui.h:2
+#: ../meld/resources/ui/column-list.ui.h:1
+#: ../meld/resources/ui/filter-list.ui.h:1
msgid "Active"
msgstr "Dejavno"
-#: ../data/ui/EditableList.ui.h:3
+#: ../meld/resources/ui/column-list.ui.h:2
msgid "Column Name"
msgstr "Ime stolpca"
-#: ../data/ui/EditableList.ui.h:4 ../data/ui/vcview.ui.h:9
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:680
+#: ../meld/resources/ui/column-list.ui.h:3
+#: ../meld/resources/ui/filter-list.ui.h:7 ../meld/resources/ui/vcview.ui.h:11
+#: ../meld/vcview.py:694
msgid "_Remove"
msgstr "_Odstrani"
-#: ../data/ui/EditableList.ui.h:6
+#: ../meld/resources/ui/column-list.ui.h:4
+#: ../meld/resources/ui/filter-list.ui.h:8
msgid "Move item up"
msgstr "Premakni predmet navzgor"
-#: ../data/ui/EditableList.ui.h:7
+#: ../meld/resources/ui/column-list.ui.h:5
+#: ../meld/resources/ui/filter-list.ui.h:9
msgid "Move _Up"
msgstr "Premakni _navzgor"
-#: ../data/ui/EditableList.ui.h:8
+#: ../meld/resources/ui/column-list.ui.h:6
+#: ../meld/resources/ui/filter-list.ui.h:10
msgid "Move item down"
msgstr "Premakni predmet navzdol"
-#: ../data/ui/EditableList.ui.h:9
+#: ../meld/resources/ui/column-list.ui.h:7
+#: ../meld/resources/ui/filter-list.ui.h:11
msgid "Move _Down"
msgstr "Premakni navz_dol"
-#. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../data/ui/vcview.ui.h:35
-#: ../meld/dirdiff.py:416
-msgid "Name"
-msgstr "Ime"
+#: ../meld/resources/ui/commit-dialog.ui.h:1
+msgid "Commit"
+msgstr "Uveljavi"
-#: ../data/ui/EditableList.ui.h:11
-msgid "Pattern"
-msgstr "Vzorec"
+#: ../meld/resources/ui/commit-dialog.ui.h:2
+msgid "Commit Files"
+msgstr "Uveljavi datoteke"
-#: ../data/ui/EditableList.ui.h:12
-msgid "Add new filter"
-msgstr "Dodaj nov filter"
+#: ../meld/resources/ui/commit-dialog.ui.h:3
+msgid "Log Message"
+msgstr "Sporočilo beleženja"
-#: ../data/ui/EditableList.ui.h:13
-msgid "Remove selected filter"
-msgstr "Odstrani izbrani filter"
+#: ../meld/resources/ui/commit-dialog.ui.h:4
+msgid "Previous logs:"
+msgstr "Predhodni dnevniki:"
+
+#: ../meld/resources/ui/commit-dialog.ui.h:5
+msgid "Co_mmit"
+msgstr "_Uveljavi"
+
+#: ../meld/resources/ui/dirdiff.ui.h:1 ../meld/resources/ui/vcview.ui.h:1
+msgid "_Compare"
+msgstr "_Primerjava"
+
+#: ../meld/resources/ui/dirdiff.ui.h:2 ../meld/resources/ui/vcview.ui.h:2
+msgid "Compare selected files"
+msgstr "Primerjajo izbrane datoteke"
+
+#: ../meld/resources/ui/dirdiff.ui.h:3
+msgid "Collapse Recursively"
+msgstr ""
+
+#: ../meld/resources/ui/dirdiff.ui.h:4
+#, fuzzy
+#| msgid "Remove folder and all its files?"
+msgid "Collapse selected folder and all subfolders"
+msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
+
+#: ../meld/resources/ui/dirdiff.ui.h:5
+msgid "Expand Recursively"
+msgstr ""
+
+#: ../meld/resources/ui/dirdiff.ui.h:6
+#, fuzzy
+#| msgid "Remove folder and all its files?"
+msgid "Expand selected folder and all subfolders"
+msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
+
+#: ../meld/resources/ui/dirdiff.ui.h:7
+msgid "Copy to _Left"
+msgstr "Kopiraj na _levo"
+
+#: ../meld/resources/ui/dirdiff.ui.h:8
+msgid "Copy to left"
+msgstr "Kopiraj na levo"
+
+#: ../meld/resources/ui/dirdiff.ui.h:9
+msgid "Copy to _Right"
+msgstr "Kopiraj na _desno"
+
+#: ../meld/resources/ui/dirdiff.ui.h:10
+msgid "Copy to right"
+msgstr "Kopiraj na desno"
+
+#: ../meld/resources/ui/dirdiff.ui.h:11
+msgid "Delete selected"
+msgstr "Izbriši izbor"
+
+#: ../meld/resources/ui/dirdiff.ui.h:12 ../meld/dirdiff.py:959
+#: ../meld/filediff.py:1601
+msgid "Hide"
+msgstr "Skrij"
+
+#: ../meld/resources/ui/dirdiff.ui.h:13
+msgid "Hide selected"
+msgstr "Skrij izbrano"
+
+#: ../meld/resources/ui/dirdiff.ui.h:14
+msgid "Ignore Filename Case"
+msgstr "Prezri velikost črk imen datotek"
+
+#: ../meld/resources/ui/dirdiff.ui.h:15
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr ""
+"Obravnavaj datoteke, ki imajo v imenu črke različne velikosti, vendar so "
+"sicer enake, kot da so enake."
+
+#: ../meld/resources/ui/dirdiff.ui.h:16
+msgid "Same"
+msgstr "Enako"
-#: ../data/ui/encoding-selector.ui.h:1
+#: ../meld/resources/ui/dirdiff.ui.h:17
+msgid "Show identical"
+msgstr "Pokaži enako"
+
+#: ../meld/resources/ui/dirdiff.ui.h:18
+msgid "New"
+msgstr "Novo"
+
+#: ../meld/resources/ui/dirdiff.ui.h:19
+msgid "Show new"
+msgstr "Pokaži novejše"
+
+#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77
+msgid "Modified"
+msgstr "Spremenjeno"
+
+#: ../meld/resources/ui/dirdiff.ui.h:21
+msgid "Show modified"
+msgstr "Pokaži spremenjeno"
+
+#: ../meld/resources/ui/dirdiff.ui.h:22
+msgid "Filters"
+msgstr "Filtri"
+
+#: ../meld/resources/ui/dirdiff.ui.h:23
+msgid "Set active filters"
+msgstr "Določi dejavne filtre"
+
+#: ../meld/resources/ui/encoding-selector.ui.h:1
msgid "Search text encoding…"
msgstr ""
-#: ../data/ui/filediff.ui.h:1
+#: ../meld/resources/ui/filediff.ui.h:1
msgid "Format as Patch…"
msgstr "Zapiši kot programski popravek ..."
-#: ../data/ui/filediff.ui.h:2
+#: ../meld/resources/ui/filediff.ui.h:2
msgid "Create a patch using differences between files"
msgstr "Ustvari popravek z razlikovanjem med datotekami"
-#: ../data/ui/filediff.ui.h:3
+#: ../meld/resources/ui/filediff.ui.h:3
msgid "Save A_ll"
msgstr "Shrani _vse"
-#: ../data/ui/filediff.ui.h:4
+#: ../meld/resources/ui/filediff.ui.h:4
msgid "Save all files in the current comparison"
msgstr "Shrani vse datoteke trenutne primerjave"
-#: ../data/ui/filediff.ui.h:5
+#: ../meld/resources/ui/filediff.ui.h:5
msgid "Revert files to their saved versions"
msgstr "Povrni datoteke na shranjene različice"
-#: ../data/ui/filediff.ui.h:6
+#: ../meld/resources/ui/filediff.ui.h:6
msgid "Add Synchronization Point"
msgstr "Dodaj točko usklajevanja"
-#: ../data/ui/filediff.ui.h:7
+#: ../meld/resources/ui/filediff.ui.h:7
msgid "Add a synchronization point for changes between files"
msgstr ""
-#: ../data/ui/filediff.ui.h:8
+#: ../meld/resources/ui/filediff.ui.h:8
msgid "Clear Synchronization Points"
msgstr "Počisti točke usklajevanja"
-#: ../data/ui/filediff.ui.h:9
+#: ../meld/resources/ui/filediff.ui.h:9
msgid "Clear sychronization points for changes between files"
msgstr ""
-#: ../data/ui/filediff.ui.h:10
+#: ../meld/resources/ui/filediff.ui.h:10
msgid "Previous Conflict"
msgstr "Predhodni spor"
-#: ../data/ui/filediff.ui.h:11
+#: ../meld/resources/ui/filediff.ui.h:11
msgid "Go to the previous conflict"
msgstr "Skoči na predhodni niz v sporu"
-#: ../data/ui/filediff.ui.h:12
+#: ../meld/resources/ui/filediff.ui.h:12
msgid "Next Conflict"
msgstr "Naslednji spor"
-#: ../data/ui/filediff.ui.h:13
+#: ../meld/resources/ui/filediff.ui.h:13
msgid "Go to the next conflict"
msgstr "Skoči na naslednji niz v sporu"
-#: ../data/ui/filediff.ui.h:14
+#: ../meld/resources/ui/filediff.ui.h:14
msgid "Push to Left"
msgstr "Potisni levo"
-#: ../data/ui/filediff.ui.h:15
+#: ../meld/resources/ui/filediff.ui.h:15
msgid "Push current change to the left"
msgstr "Potisni trenutne spremembe na levo"
-#: ../data/ui/filediff.ui.h:16
+#: ../meld/resources/ui/filediff.ui.h:16
msgid "Push to Right"
msgstr "Potisni desno"
-#: ../data/ui/filediff.ui.h:17
+#: ../meld/resources/ui/filediff.ui.h:17
msgid "Push current change to the right"
msgstr "Potisni trenutne spremembe na desno"
-#: ../data/ui/filediff.ui.h:18
+#: ../meld/resources/ui/filediff.ui.h:18
msgid "Pull from Left"
msgstr "Potegni z leve"
-#: ../data/ui/filediff.ui.h:19
+#: ../meld/resources/ui/filediff.ui.h:19
msgid "Pull change from the left"
msgstr "Potegni spremembe z leve"
-#: ../data/ui/filediff.ui.h:20
+#: ../meld/resources/ui/filediff.ui.h:20
msgid "Pull from Right"
msgstr "Potegni z desne"
-#: ../data/ui/filediff.ui.h:21
+#: ../meld/resources/ui/filediff.ui.h:21
msgid "Pull change from the right"
msgstr "Potegni spremembe z desne"
-#: ../data/ui/filediff.ui.h:22
+#: ../meld/resources/ui/filediff.ui.h:22
msgid "Copy Above Left"
msgstr "Kopiraj nad levo"
-#: ../data/ui/filediff.ui.h:23
+#: ../meld/resources/ui/filediff.ui.h:23
msgid "Copy change above the left chunk"
msgstr "Kopiraj spremembe nad levi del"
-#: ../data/ui/filediff.ui.h:24
+#: ../meld/resources/ui/filediff.ui.h:24
msgid "Copy Below Left"
msgstr "Kopiraj pod levo"
-#: ../data/ui/filediff.ui.h:25
+#: ../meld/resources/ui/filediff.ui.h:25
msgid "Copy change below the left chunk"
msgstr "Kopiraj spremembe pod levi del"
-#: ../data/ui/filediff.ui.h:26
+#: ../meld/resources/ui/filediff.ui.h:26
msgid "Copy Above Right"
msgstr "Kopiraj nad desno"
-#: ../data/ui/filediff.ui.h:27
+#: ../meld/resources/ui/filediff.ui.h:27
msgid "Copy change above the right chunk"
msgstr "Kopiraj spremembe nad desni del"
-#: ../data/ui/filediff.ui.h:28
+#: ../meld/resources/ui/filediff.ui.h:28
msgid "Copy Below Right"
msgstr "Kopiraj pod desno"
-#: ../data/ui/filediff.ui.h:29
+#: ../meld/resources/ui/filediff.ui.h:29
msgid "Copy change below the right chunk"
msgstr "Kopiraj spremembe pod desni del"
-#: ../data/ui/filediff.ui.h:30
+#: ../meld/resources/ui/filediff.ui.h:30
msgid "Delete"
msgstr "Izbriši"
-#: ../data/ui/filediff.ui.h:31
+#: ../meld/resources/ui/filediff.ui.h:31
msgid "Delete change"
msgstr "Izbriši spremembo"
-#: ../data/ui/filediff.ui.h:32
+#: ../meld/resources/ui/filediff.ui.h:32
msgid "Merge All from Left"
msgstr "Združi vse spremembe z leve"
-#: ../data/ui/filediff.ui.h:33
+#: ../meld/resources/ui/filediff.ui.h:33
msgid "Merge all non-conflicting changes from the left"
msgstr "Združi vse spremembe brez sporov z leve"
-#: ../data/ui/filediff.ui.h:34
+#: ../meld/resources/ui/filediff.ui.h:34
msgid "Merge All from Right"
msgstr "Združi vse spremembe z desne"
-#: ../data/ui/filediff.ui.h:35
+#: ../meld/resources/ui/filediff.ui.h:35
msgid "Merge all non-conflicting changes from the right"
msgstr "Združi vse spremembe brez sporov z desne"
-#: ../data/ui/filediff.ui.h:36
+#: ../meld/resources/ui/filediff.ui.h:36
msgid "Merge All"
msgstr "Združi vse"
-#: ../data/ui/filediff.ui.h:37
+#: ../meld/resources/ui/filediff.ui.h:37
msgid "Merge all non-conflicting changes from left and right panes"
msgstr "Združi vse spremembe brez sporov z leve in z desne"
-#: ../data/ui/filediff.ui.h:38
+#: ../meld/resources/ui/filediff.ui.h:38
msgid "Previous Pane"
msgstr "Predhodno okno"
-#: ../data/ui/filediff.ui.h:39
+#: ../meld/resources/ui/filediff.ui.h:39
msgid "Move keyboard focus to the previous document in this comparison"
msgstr "Premakne žarišče tipkovnice na naslednji dokument primerjave"
-#: ../data/ui/filediff.ui.h:40
+#: ../meld/resources/ui/filediff.ui.h:40
msgid "Next Pane"
msgstr "Naslednje okno"
-#: ../data/ui/filediff.ui.h:41
+#: ../meld/resources/ui/filediff.ui.h:41
msgid "Move keyboard focus to the next document in this comparison"
msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
-#: ../data/ui/filediff.ui.h:42
+#: ../meld/resources/ui/filediff.ui.h:42
msgid "Lock Scrolling"
msgstr "Zakleni drsenje"
-#: ../data/ui/filediff.ui.h:43
+#: ../meld/resources/ui/filediff.ui.h:43
msgid "Lock scrolling of all panes"
msgstr "Zakleni drsenje vseh pladnjev"
-#: ../data/ui/filediff.ui.h:44
-msgid "Save changes to documents before closing?"
-msgstr "Ali želite shraniti spremembe dokumenta pred zapiranjem?"
+#: ../meld/resources/ui/filediff.ui.h:44
+msgid ""
+"This file can not be written to. You may click here to unlock this file and "
+"make changes anyway, but these changes must be saved to a new file."
+msgstr ""
+"V datoteko ni mogoče pisati. S klikom na to mesto lahko odklenete datoteko "
+"in vsebino spreminjate, vendar pa je treba spremembe shraniti v datoteko z "
+"drugim imenom."
-#: ../data/ui/filediff.ui.h:45
-msgid "If you don’t save, changes will be permanently lost."
-msgstr "V kolikor sprememb ne shranite, bodo te trajno izgubljene."
-
-#: ../data/ui/filediff.ui.h:46
-msgid "Close _without Saving"
-msgstr "Zapri _brez shranjevanja"
-
-#: ../data/ui/filediff.ui.h:47 ../meld/dirdiff.py:1001 ../meld/filediff.py:1598
-#: ../meld/iohelpers.py:50 ../meld/iohelpers.py:100
-msgid "_Cancel"
-msgstr "_Prekliči"
-
-#: ../data/ui/filediff.ui.h:48
-msgid "_Save"
-msgstr "_Shrani"
-
-#: ../data/ui/filediff.ui.h:49
-msgid ""
-"This file can not be written to. You may click here to unlock this file and "
-"make changes anyway, but these changes must be saved to a new file."
-msgstr ""
-"V datoteko ni mogoče pisati. S klikom na to mesto lahko odklenete datoteko "
-"in vsebino spreminjate, vendar pa je treba spremembe shraniti v datoteko z "
-"drugim imenom."
-
-#: ../data/ui/filediff.ui.h:50
+#: ../meld/resources/ui/filediff.ui.h:45
msgid "File 3"
msgstr "Datoteka 3"
-#: ../data/ui/filediff.ui.h:51
+#: ../meld/resources/ui/filediff.ui.h:46
msgid "File 2"
msgstr "Datoteka 2"
-#: ../data/ui/filediff.ui.h:52
+#: ../meld/resources/ui/filediff.ui.h:47
msgid "File 1"
msgstr "Datoteka 1"
-#: ../data/ui/filediff.ui.h:53
-#, fuzzy
-#| msgid "Revert unsaved changes to documents?"
-msgid "Discard unsaved changes to documents?"
-msgstr "Ali naj se povrnejo neshranjene spremembe dokumentov?"
+#. Create icon and filename CellRenderer
+#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30
+#: ../meld/dirdiff.py:455
+msgid "Name"
+msgstr "Ime"
-#: ../data/ui/filediff.ui.h:54
-#, fuzzy
-#| msgid "Changes made to the following documents will be permanently lost:\n"
-msgid "Changes made to the following documents will be permanently lost:"
-msgstr "Spremembe navedenih dokumentov bodo trajno izgubljene:\n"
+#: ../meld/resources/ui/filter-list.ui.h:3
+msgid "Pattern"
+msgstr "Vzorec"
-#: ../data/ui/filediff.ui.h:55
-msgid "_Discard"
-msgstr "_Zavrzi"
+#: ../meld/resources/ui/filter-list.ui.h:4
+msgid "Add new filter"
+msgstr "Dodaj nov filter"
-#: ../data/ui/findbar.ui.h:1 ../meld/dirdiff.py:1002 ../meld/iohelpers.py:101
+#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: ../meld/resources/ui/filter-list.ui.h:6
+msgid "Remove selected filter"
+msgstr "Odstrani izbrani filter"
+
+#: ../meld/resources/ui/findbar.ui.h:1 ../meld/dirdiff.py:1041
+#: ../meld/iohelpers.py:113
msgid "_Replace"
msgstr "_Zamenjaj"
-#: ../data/ui/findbar.ui.h:2
+#: ../meld/resources/ui/findbar.ui.h:2
msgid "Replace _All"
msgstr "Zamenjaj _vse"
-#: ../data/ui/findbar.ui.h:3
+#: ../meld/resources/ui/findbar.ui.h:3
msgid "_Previous"
msgstr "_Predhodni"
-#: ../data/ui/findbar.ui.h:4
+#: ../meld/resources/ui/findbar.ui.h:4
msgid "_Next"
msgstr "_Naslednji"
-#: ../data/ui/findbar.ui.h:5
+#: ../meld/resources/ui/findbar.ui.h:5
msgid "Find:"
msgstr "Najdi:"
-#: ../data/ui/findbar.ui.h:6
+#: ../meld/resources/ui/findbar.ui.h:6
msgid "Replace _with:"
msgstr "Zamenjaj _z:"
-#: ../data/ui/findbar.ui.h:7
+#: ../meld/resources/ui/findbar.ui.h:7
msgid "_Match case"
msgstr "_Upoštevaj velikost črk"
-#: ../data/ui/findbar.ui.h:8
+#: ../meld/resources/ui/findbar.ui.h:8
msgid "Who_le word"
msgstr "Cele _besede"
-#: ../data/ui/findbar.ui.h:9
+#: ../meld/resources/ui/findbar.ui.h:9
msgid "Regular e_xpression"
msgstr "_Logični izraz"
-#: ../data/ui/findbar.ui.h:10
+#: ../meld/resources/ui/findbar.ui.h:10
msgid "Wrapped"
msgstr "Prelomljeno"
-#: ../data/ui/language-selector.ui.h:1
+#: ../meld/resources/ui/language-selector.ui.h:1
msgid "Search highlight mode…"
msgstr ""
-#: ../data/ui/patch-dialog.ui.h:1
+#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532
+#: ../meld/newdifftab.py:53
+msgid "New comparison"
+msgstr "Nova primerjava"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:2
+msgid "File comparison"
+msgstr "Primerjava datotek"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:3
+msgid "Directory comparison"
+msgstr "Primerjava vsebine map"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:4
+msgid "Version control view"
+msgstr "Pogled nadzora različic"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:5
+msgid "_3-way comparison"
+msgstr "_Trojna primerjava"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:6
+msgid "Select Third File"
+msgstr "Izbor tretje datoteke"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:7
+msgid "Select Second File"
+msgstr "Izbor druge datoteke"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:8
+msgid "Select First File"
+msgstr "Izbor prve datoteke"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:9
+msgid "Select First Folder"
+msgstr "Izbor prve mape"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:10
+msgid "Select Second Folder"
+msgstr "Izbor druge mape"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:11
+msgid "Select Third Folder"
+msgstr "Izbor tretje mape"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:12
+msgid "Select A Version-Controlled Folder"
+msgstr "Izbor mape nadzora različic"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:13
+msgid "_Blank comparison"
+msgstr "_Prazna primerjava"
+
+#: ../meld/resources/ui/new-diff-tab.ui.h:14
+msgid "C_ompare"
+msgstr "_Primerjava"
+
+#: ../meld/resources/ui/notebook-label.ui.h:1
+msgid "Close Tab"
+msgstr "Zapri zavihek"
+
+#: ../meld/resources/ui/patch-dialog.ui.h:1
msgid "Format as Patch"
msgstr "Oblikuj kot popravek"
-#: ../data/ui/patch-dialog.ui.h:2
+#: ../meld/resources/ui/patch-dialog.ui.h:2
msgid "Copy to Clipboard"
msgstr "Kopiraj v odložišče"
-#: ../data/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:152
+#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165
msgid "Save Patch"
msgstr "Shrani popravek"
-#: ../data/ui/patch-dialog.ui.h:4
+#: ../meld/resources/ui/patch-dialog.ui.h:4
msgid "Use differences between:"
msgstr "Uporabi razlike med:"
-#: ../data/ui/patch-dialog.ui.h:5
+#: ../meld/resources/ui/patch-dialog.ui.h:5
msgid "Left and middle panes"
msgstr "Levi in srednji pladenj"
-#: ../data/ui/patch-dialog.ui.h:6
+#: ../meld/resources/ui/patch-dialog.ui.h:6
msgid "Middle and right panes"
msgstr "Srednji in desni pladenj"
-#: ../data/ui/patch-dialog.ui.h:7
+#: ../meld/resources/ui/patch-dialog.ui.h:7
msgid "_Reverse patch direction"
msgstr "Obrni smer popravka"
-#: ../data/ui/preferences.ui.h:1
-msgid "Meld Preferences"
-msgstr "Možnosti Meld"
+#: ../meld/resources/ui/preferences.ui.h:1
+msgid "Preferences"
+msgstr "Možnosti"
-#: ../data/ui/preferences.ui.h:2
+#: ../meld/resources/ui/preferences.ui.h:2
msgid "Font"
msgstr "Pisava"
-#: ../data/ui/preferences.ui.h:3
+#: ../meld/resources/ui/preferences.ui.h:3
msgid "_Use the system fixed width font"
msgstr "_Uporabi sistemsko pisavo določene širine"
-#: ../data/ui/preferences.ui.h:4
+#: ../meld/resources/ui/preferences.ui.h:4
msgid "_Editor font:"
msgstr "Pisava _urejevalnika:"
-#: ../data/ui/preferences.ui.h:5
+#. TRANSLATORS: This is the status bar label for a group of settings,
+#. such as text wrapping, show line numbers, whitespace, etc.
+#: ../meld/resources/ui/preferences.ui.h:5 ../meld/ui/statusbar.py:282
msgid "Display"
msgstr "Prikaz"
-#: ../data/ui/preferences.ui.h:6
+#: ../meld/resources/ui/preferences.ui.h:6
msgid "_Tab width:"
msgstr "Širina _tabulatorja:"
-#: ../data/ui/preferences.ui.h:7
+#: ../meld/resources/ui/preferences.ui.h:7
msgid "_Insert spaces instead of tabs"
msgstr "Vstavi _presledke namesto tabulatorjev"
-#: ../data/ui/preferences.ui.h:8
+#: ../meld/resources/ui/preferences.ui.h:8
msgid "Enable text _wrapping"
msgstr "Omogoči _prelom besedila"
-#: ../data/ui/preferences.ui.h:9
+#: ../meld/resources/ui/preferences.ui.h:9
msgid "Do not _split words over two lines"
msgstr "Ne _deli besed preko dveh vrstic"
-#: ../data/ui/preferences.ui.h:10
+#: ../meld/resources/ui/preferences.ui.h:10
msgid "Highlight _current line"
msgstr "Poudari _trenutno vrstico"
-#: ../data/ui/preferences.ui.h:11
+#: ../meld/resources/ui/preferences.ui.h:11
msgid "Show _line numbers"
msgstr "Pokaži _številke vrstic"
-#: ../data/ui/preferences.ui.h:12
+#: ../meld/resources/ui/preferences.ui.h:12
msgid "Show w_hitespace"
msgstr "Pokaži _presledne znake"
-#: ../data/ui/preferences.ui.h:13
+#: ../meld/resources/ui/preferences.ui.h:13
msgid "Use s_yntax highlighting"
msgstr "Uporabi _barvno poudarjanje skladnje"
-#: ../data/ui/preferences.ui.h:14
+#: ../meld/resources/ui/preferences.ui.h:14
msgid "Syntax highlighting color scheme:"
msgstr "Barvna shema poudarjanja skladnje:"
-#: ../data/ui/preferences.ui.h:15
+#: ../meld/resources/ui/preferences.ui.h:15
msgid "External Editor"
msgstr "Zunanji urejevalnik"
-#: ../data/ui/preferences.ui.h:16
+#: ../meld/resources/ui/preferences.ui.h:16
msgid "Use _default system editor"
msgstr "Uporabi _privzet sistemski urejevalnik besedil."
-#: ../data/ui/preferences.ui.h:17
+#: ../meld/resources/ui/preferences.ui.h:17
msgid "Edito_r command:"
msgstr "Ukaz _urejevalnika:"
-#: ../data/ui/preferences.ui.h:18
+#: ../meld/resources/ui/preferences.ui.h:18
msgid "Editor"
msgstr "Urejevalnik"
-#: ../data/ui/preferences.ui.h:19
+#: ../meld/resources/ui/preferences.ui.h:19
msgid "Shallow Comparison"
msgstr "Groba primerjava"
-#: ../data/ui/preferences.ui.h:20
+#: ../meld/resources/ui/preferences.ui.h:20
msgid "C_ompare files based only on size and timestamp"
msgstr "_Primerjaj datoteke na osnovi velikosti in časovnega žiga"
-#: ../data/ui/preferences.ui.h:21
+#: ../meld/resources/ui/preferences.ui.h:21
msgid "_Timestamp resolution:"
msgstr "Ločljivost časovnega _žiga:"
-#: ../data/ui/preferences.ui.h:23
+#: ../meld/resources/ui/preferences.ui.h:23
msgid "Note: enabling text filters may make comparing large files much slower"
msgstr ""
-#: ../data/ui/preferences.ui.h:24
+#: ../meld/resources/ui/preferences.ui.h:24
msgid "Symbolic Links"
msgstr "Simbolne povezave"
-#: ../data/ui/preferences.ui.h:26
+#: ../meld/resources/ui/preferences.ui.h:26
msgid "Visible Columns"
msgstr "Vidni stolpci"
-#: ../data/ui/preferences.ui.h:27
+#: ../meld/resources/ui/preferences.ui.h:27
msgid "Folder Comparisons"
msgstr "Primerjava map"
-#: ../data/ui/preferences.ui.h:28
+#: ../meld/resources/ui/preferences.ui.h:28
msgid "Version Comparisons"
msgstr "Primerjave različic"
-#: ../data/ui/preferences.ui.h:29
+#: ../meld/resources/ui/preferences.ui.h:29
#, fuzzy
msgid "_Order when comparing file revisions:"
msgstr "_Med primerjavo predelav datotek"
-#: ../data/ui/preferences.ui.h:30
+#: ../meld/resources/ui/preferences.ui.h:30
#, fuzzy
msgid "Order when _merging files:"
msgstr "[%s] Združevanje datotek"
-#: ../data/ui/preferences.ui.h:31
+#: ../meld/resources/ui/preferences.ui.h:31
msgid "Commit Messages"
msgstr "Uveljavi sporočila"
-#: ../data/ui/preferences.ui.h:32
+#: ../meld/resources/ui/preferences.ui.h:32
msgid "Show _right margin at:"
msgstr "Pokaži _desni rob pri:"
-#: ../data/ui/preferences.ui.h:33
+#: ../meld/resources/ui/preferences.ui.h:33
msgid "Automatically _break lines at right margin on commit"
msgstr "Samodejno _prelomi vrstice na desnem robu ob uveljavitvi"
-#: ../data/ui/preferences.ui.h:34
+#: ../meld/resources/ui/preferences.ui.h:34
msgid "Version Control"
msgstr "Nadzor različic"
-#: ../data/ui/preferences.ui.h:35
+#: ../meld/resources/ui/preferences.ui.h:35
msgid "Filename filters"
msgstr "Datotečni filtri"
-#: ../data/ui/preferences.ui.h:36
-msgid ""
-"When performing directory comparisons, you may filter out files and "
-"directories by name. Each pattern is a list of shell style wildcards "
-"separated by spaces."
-msgstr ""
-"Pri primerjavi map je mogoče filtrirati datoteke in mape po imenu. Vsak "
-"vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), ločenimi s "
-"presledki."
-
-#: ../data/ui/preferences.ui.h:37 ../meld/meldwindow.py:105
-msgid "File Filters"
-msgstr "Filtri datotek"
-
-#: ../data/ui/preferences.ui.h:38
-#, fuzzy
-msgid "Change trimming"
-msgstr "Spremeni _v:"
-
-#: ../data/ui/preferences.ui.h:39
-msgid "Trim blank line differences from the start and end of changes"
-msgstr ""
-
-#: ../data/ui/preferences.ui.h:40
-msgid "Text filters"
-msgstr "Filtri besedila"
-
-#: ../data/ui/preferences.ui.h:41
+#: ../meld/resources/ui/preferences.ui.h:36
msgid ""
-"When performing file comparisons, you may ignore certain types of changes. "
-"Each pattern here is a python regular expression which replaces matching "
-"text with the empty string before comparison is performed. If the expression "
-"contains groups, only the groups are replaced. See the user manual for more "
-"details."
-msgstr ""
-"Pri primerjavi datotek je mogoče prezreti nekatere vrste sprememb. Vsak "
-"vzorec na seznamu je zapisan z logičnimi izrazi, s katerimi se zamenja "
-"želeno besedilo s praznim nizom, preden je primerjava izvede. V primeru, da "
-"izraz vključuje skupine, so zamenjane le te. Več podrobnosti je zapisanih v "
-"priročniku."
-
-#: ../data/ui/preferences.ui.h:42
-msgid "Text Filters"
-msgstr "Filtri besedila"
-
-#: ../data/ui/preferences.ui.h:43
-msgid "Left is remote, right is local"
-msgstr "Levo je oddaljeno, desno krajevno"
-
-#: ../data/ui/preferences.ui.h:44
-msgid "Left is local, right is remote"
-msgstr "Levo je krajevno, desno oddaljeno"
-
-#: ../data/ui/preferences.ui.h:45
-msgid "Remote, merge, local"
-msgstr "Oddaljeno, združi, krajevno"
-
-#: ../data/ui/preferences.ui.h:46
-msgid "Local, merge, remote"
-msgstr "Krajevno, združi, oddaljeno"
-
-#: ../data/ui/preferences.ui.h:47
-msgid "1ns (ext4)"
-msgstr "1ns (ext4)"
-
-#: ../data/ui/preferences.ui.h:48
-msgid "100ns (NTFS)"
-msgstr "100ns (NTFS)"
-
-#: ../data/ui/preferences.ui.h:49
-msgid "1s (ext2/ext3)"
-msgstr "1s (ext2/ext3)"
-
-#: ../data/ui/preferences.ui.h:50
-msgid "2s (VFAT)"
-msgstr "2s (VFAT)"
-
-#: ../data/ui/shortcuts.ui.h:1
-msgctxt "shortcut window"
-msgid "General"
-msgstr "Splošno"
-
-#: ../data/ui/shortcuts.ui.h:2
-msgctxt "shortcut window"
-msgid "New comparison"
-msgstr "Nova primerjava"
-
-#: ../data/ui/shortcuts.ui.h:3
-msgctxt "shortcut window"
-msgid "Close a comparison"
-msgstr "Zapri primerjavo"
-
-#: ../data/ui/shortcuts.ui.h:4
-msgctxt "shortcut window"
-msgid "Quit Meld"
-msgstr "Končaj program"
-
-#: ../data/ui/shortcuts.ui.h:5
-msgctxt "shortcut window"
-msgid "Stop the current action"
-msgstr "Ustavi trenutno dejanje"
-
-#: ../data/ui/shortcuts.ui.h:6
-msgctxt "shortcut window"
-msgid "Refresh comparison"
-msgstr "Osveži primerjavo"
-
-#: ../data/ui/shortcuts.ui.h:7
-msgctxt "shortcut window"
-msgid "Fullscreen"
-msgstr "Celozaslonski način"
-
-#: ../data/ui/shortcuts.ui.h:8
-msgctxt "shortcut window"
-msgid "Tabs"
-msgstr "Zavihki"
-
-#: ../data/ui/shortcuts.ui.h:9
-msgctxt "shortcut window"
-msgid "Go to previous tab"
-msgstr "Skoči na predhodni zavihek"
-
-#: ../data/ui/shortcuts.ui.h:10
-msgctxt "shortcut window"
-msgid "Go to next tab"
-msgstr "Skoči na naslednji zavihek"
-
-#: ../data/ui/shortcuts.ui.h:11
-msgctxt "shortcut window"
-msgid "Switch to tab"
-msgstr "Preklopi na zavihek"
-
-#: ../data/ui/shortcuts.ui.h:12
-msgctxt "shortcut window"
-msgid "Move tab left"
-msgstr "Premakni zavihek levo"
-
-#: ../data/ui/shortcuts.ui.h:13
-msgctxt "shortcut window"
-msgid "Move tab right"
-msgstr "Premakni zavihek desno"
-
-#: ../data/ui/shortcuts.ui.h:14
-msgctxt "shortcut window"
-msgid "Changes"
-msgstr "Spremembe"
-
-#: ../data/ui/shortcuts.ui.h:15
-msgctxt "shortcut window"
-msgid "Go to previous change"
-msgstr "Skoči na predhodno spremembo"
-
-#: ../data/ui/shortcuts.ui.h:16
-msgctxt "shortcut window"
-msgid "Go to next change"
-msgstr "Skoči na naslednjo spremembo"
-
-#: ../data/ui/shortcuts.ui.h:17
-msgctxt "shortcut window"
-msgid "Editing"
-msgstr "Urejanje"
-
-#: ../data/ui/shortcuts.ui.h:18
-msgctxt "shortcut window"
-msgid "Undo"
-msgstr "Razveljavi"
-
-#: ../data/ui/shortcuts.ui.h:19
-msgctxt "shortcut window"
-msgid "Redo"
-msgstr "Ponovi"
-
-#: ../data/ui/shortcuts.ui.h:20
-msgctxt "shortcut window"
-msgid "Cut"
-msgstr "Izreži"
-
-#: ../data/ui/shortcuts.ui.h:21
-msgctxt "shortcut window"
-msgid "Copy"
-msgstr "Kopiraj"
-
-#: ../data/ui/shortcuts.ui.h:22
-msgctxt "shortcut window"
-msgid "Paste"
-msgstr "Prilepi"
-
-#: ../data/ui/shortcuts.ui.h:23
-msgctxt "shortcut window"
-msgid "Find"
-msgstr "Najdi"
-
-#: ../data/ui/shortcuts.ui.h:24
-msgctxt "shortcut window"
-msgid "Find Next"
-msgstr "Najdi naslednje"
-
-#: ../data/ui/shortcuts.ui.h:25
-msgctxt "shortcut window"
-msgid "Find Previous"
-msgstr "Najdi predhodno"
-
-#: ../data/ui/shortcuts.ui.h:26
-msgctxt "shortcut window"
-msgid "Replace"
-msgstr "Zamenjaj"
-
-#: ../data/ui/shortcuts.ui.h:27
-msgctxt "shortcut window"
-msgid "File comparison"
-msgstr "Primerjava datotek"
-
-#: ../data/ui/shortcuts.ui.h:28
-msgctxt "shortcut window"
-msgid "Save current file"
-msgstr "Shrani trenutno datoteko"
-
-#: ../data/ui/shortcuts.ui.h:29
-msgctxt "shortcut window"
-msgid "Save current file to new path"
-msgstr "Shrani trenutni izbor kot novo prednastavitev"
-
-#: ../data/ui/shortcuts.ui.h:30
-msgctxt "shortcut window"
-msgid "Save all files in comparison"
-msgstr "Shrani vse datoteke trenutne primerjave"
-
-#: ../data/ui/shortcuts.ui.h:31
-msgctxt "shortcut window"
-msgid "Previous conflict"
-msgstr "Predhodni spor"
-
-#: ../data/ui/shortcuts.ui.h:32
-msgctxt "shortcut window"
-msgid "Next conflict"
-msgstr "Naslednji spor"
-
-#: ../data/ui/shortcuts.ui.h:33
-msgctxt "shortcut window"
-msgid "Push change to left"
-msgstr "Potisni trenutne spremembe na levo"
-
-#: ../data/ui/shortcuts.ui.h:34
-msgctxt "shortcut window"
-msgid "Push change to right"
-msgstr "Potisni trenutne spremembe na desno"
-
-#: ../data/ui/shortcuts.ui.h:35
-msgctxt "shortcut window"
-msgid "Pull change from left"
-msgstr "Potegni spremembe z leve"
-
-#: ../data/ui/shortcuts.ui.h:36
-msgctxt "shortcut window"
-msgid "Pull change from right"
-msgstr "Potegni spremembe z desne"
+"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/shortcuts.ui.h:37
-msgctxt "shortcut window"
-msgid "Copy change above left"
-msgstr "Kopiraj spremembe nad levi del"
+#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114
+msgid "File Filters"
+msgstr "Filtri datotek"
-#: ../data/ui/shortcuts.ui.h:38
-msgctxt "shortcut window"
-msgid "Copy change below left"
-msgstr "Kopiraj spremembe pod levi del"
+#: ../meld/resources/ui/preferences.ui.h:38
+#, fuzzy
+msgid "Change trimming"
+msgstr "Spremeni _v:"
-#: ../data/ui/shortcuts.ui.h:39
-msgctxt "shortcut window"
-msgid "Copy change above right"
-msgstr "Kopiraj spremembe nad desni del"
+#: ../meld/resources/ui/preferences.ui.h:39
+msgid "Trim blank line differences from the start and end of changes"
+msgstr ""
-#: ../data/ui/shortcuts.ui.h:40
-msgctxt "shortcut window"
-msgid "Copy change below right"
-msgstr "Kopiraj spremembe pod desni del"
+#: ../meld/resources/ui/preferences.ui.h:40
+msgid "Text filters"
+msgstr "Filtri besedila"
-#: ../data/ui/shortcuts.ui.h:41
-msgctxt "shortcut window"
-msgid "Delete change"
-msgstr "Izbriši spremembo"
+#: ../meld/resources/ui/preferences.ui.h:41
+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/shortcuts.ui.h:42
-msgctxt "shortcut window"
-msgid "Previous comparison pane"
-msgstr "Predhodno okno primerjave"
+#: ../meld/resources/ui/preferences.ui.h:42
+msgid "Text Filters"
+msgstr "Filtri besedila"
-#: ../data/ui/shortcuts.ui.h:43
-msgctxt "shortcut window"
-msgid "Next comparison pane"
-msgstr "Naslednje okno primerjave"
+#: ../meld/resources/ui/preferences.ui.h:43
+msgid "Left is remote, right is local"
+msgstr "Levo je oddaljeno, desno krajevno"
-#: ../data/ui/shortcuts.ui.h:44
-msgctxt "shortcut window"
-msgid "Folder comparison"
-msgstr "Primerjava map"
+#: ../meld/resources/ui/preferences.ui.h:44
+msgid "Left is local, right is remote"
+msgstr "Levo je krajevno, desno oddaljeno"
-#: ../data/ui/shortcuts.ui.h:45
-msgctxt "shortcut window"
-msgid "Copy to left"
-msgstr "Kopiraj na levo"
+#: ../meld/resources/ui/preferences.ui.h:45
+msgid "Remote, merge, local"
+msgstr "Oddaljeno, združi, krajevno"
-#: ../data/ui/shortcuts.ui.h:46
-msgctxt "shortcut window"
-msgid "Copy to right"
-msgstr "Kopiraj na desno"
+#: ../meld/resources/ui/preferences.ui.h:46
+msgid "Local, merge, remote"
+msgstr "Krajevno, združi, oddaljeno"
-#: ../data/ui/shortcuts.ui.h:47
-msgctxt "shortcut window"
-msgid "Version control comparison"
-msgstr "Primerjava nadzora različic"
+#: ../meld/resources/ui/preferences.ui.h:47
+msgid "1ns (ext4)"
+msgstr "1ns (ext4)"
-#: ../data/ui/shortcuts.ui.h:48
-msgctxt "shortcut window"
-msgid "Commit to version control"
-msgstr "Uveljavi spremembe v sistem za nadzor različic"
+#: ../meld/resources/ui/preferences.ui.h:48
+msgid "100ns (NTFS)"
+msgstr "100ns (NTFS)"
-#: ../data/ui/shortcuts.ui.h:49
-msgctxt "shortcut window"
-msgid "Show/hide console output"
-msgstr "Pokaži/Skrij odvod konzole"
+#: ../meld/resources/ui/preferences.ui.h:49
+msgid "1s (ext2/ext3)"
+msgstr "1s (ext2/ext3)"
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:567
-#: ../meld/newdifftab.py:49
-msgid "New comparison"
-msgstr "Nova primerjava"
+#: ../meld/resources/ui/preferences.ui.h:50
+msgid "2s (VFAT)"
+msgstr "2s (VFAT)"
-#: ../data/ui/tab-placeholder.ui.h:2
-msgid "File comparison"
-msgstr "Primerjava datotek"
+#: ../meld/resources/ui/push-dialog.ui.h:1
+msgid "Push local commits to remote?"
+msgstr "Ali naj se objavijo krajevne uveljavitve v oddaljeno skladišče?"
-#: ../data/ui/tab-placeholder.ui.h:3
-msgid "Directory comparison"
-msgstr "Primerjava vsebine map"
+#: ../meld/resources/ui/push-dialog.ui.h:2
+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/tab-placeholder.ui.h:4
-msgid "Version control view"
-msgstr "Pogled nadzora različic"
+#: ../meld/resources/ui/push-dialog.ui.h:3
+msgid "_Push commits"
+msgstr "_Objavi uveljavitve"
-#: ../data/ui/tab-placeholder.ui.h:5
-msgid "_3-way comparison"
-msgstr "_Trojna primerjava"
+#: ../meld/resources/ui/revert-dialog.ui.h:1
+#, fuzzy
+#| msgid "Revert unsaved changes to documents?"
+msgid "Discard unsaved changes to documents?"
+msgstr "Ali naj se povrnejo neshranjene spremembe dokumentov?"
-#: ../data/ui/tab-placeholder.ui.h:6
-msgid "Select Third File"
-msgstr "Izbor tretje datoteke"
+#: ../meld/resources/ui/revert-dialog.ui.h:2
+#, fuzzy
+#| msgid "Changes made to the following documents will be permanently lost:\n"
+msgid "Changes made to the following documents will be permanently lost:"
+msgstr "Spremembe navedenih dokumentov bodo trajno izgubljene:\n"
-#: ../data/ui/tab-placeholder.ui.h:7
-msgid "Select Second File"
-msgstr "Izbor druge datoteke"
+#: ../meld/resources/ui/revert-dialog.ui.h:3
+msgid "_Discard"
+msgstr "_Zavrzi"
-#: ../data/ui/tab-placeholder.ui.h:8
-msgid "Select First File"
-msgstr "Izbor prve datoteke"
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:1
+msgid "Save changes to documents before closing?"
+msgstr "Ali želite shraniti spremembe dokumenta pred zapiranjem?"
-#: ../data/ui/tab-placeholder.ui.h:9
-msgid "Select First Folder"
-msgstr "Izbor prve mape"
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:2
+msgid "If you don’t save, changes will be permanently lost."
+msgstr "V kolikor sprememb ne shranite, bodo te trajno izgubljene."
-#: ../data/ui/tab-placeholder.ui.h:10
-msgid "Select Second Folder"
-msgstr "Izbor druge mape"
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:3
+msgid "Close _without Saving"
+msgstr "Zapri _brez shranjevanja"
-#: ../data/ui/tab-placeholder.ui.h:11
-msgid "Select Third Folder"
-msgstr "Izbor tretje mape"
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040
+#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112
+msgid "_Cancel"
+msgstr "_Prekliči"
-#: ../data/ui/tab-placeholder.ui.h:12
-msgid "Select A Version-Controlled Folder"
-msgstr "Izbor mape nadzora različic"
+#: ../meld/resources/ui/save-confirm-dialog.ui.h:5
+msgid "_Save"
+msgstr "_Shrani"
-#: ../data/ui/tab-placeholder.ui.h:13
-msgid "_Blank comparison"
-msgstr "_Prazna primerjava"
+#: ../meld/resources/ui/statusbar-menu.ui.h:2
+#, fuzzy
+#| msgid "Show w_hitespace"
+msgid "Show whitespace"
+msgstr "Pokaži _presledne znake"
-#: ../data/ui/tab-placeholder.ui.h:14
-msgid "C_ompare"
-msgstr "_Primerjava"
+#: ../meld/resources/ui/statusbar-menu.ui.h:4
+msgid "Text wrapping"
+msgstr "Prelom besedila"
-#: ../data/ui/vcview.ui.h:3
+#: ../meld/resources/ui/vcview.ui.h:3
msgid "Co_mmit…"
msgstr "U_veljavi ..."
-#: ../data/ui/vcview.ui.h:4
+#: ../meld/resources/ui/vcview.ui.h:4
msgid "Commit changes to version control"
msgstr "Uveljavi spremembe v sistem za nadzor različic"
-#: ../data/ui/vcview.ui.h:5
+#: ../meld/resources/ui/vcview.ui.h:5
msgid "_Update"
msgstr "_Posodobi"
-#: ../data/ui/vcview.ui.h:6
+#: ../meld/resources/ui/vcview.ui.h:6
msgid "Update working copy from version control"
msgstr "Posodobi delovno kopijo preko nadzora različic"
-#: ../data/ui/vcview.ui.h:7
+#: ../meld/resources/ui/vcview.ui.h:7
msgid "_Push"
msgstr "_Objavi"
-#: ../data/ui/vcview.ui.h:8
+#: ../meld/resources/ui/vcview.ui.h:8
msgid "Push local changes to remote"
msgstr "Objavi spremembe v oddaljeno skladišče"
-#: ../data/ui/vcview.ui.h:10
+#: ../meld/resources/ui/vcview.ui.h:10
msgid "Add to version control"
msgstr "Dodaj v sistem nadzora različic"
-#: ../data/ui/vcview.ui.h:12
+#: ../meld/resources/ui/vcview.ui.h:12
msgid "Remove from version control"
msgstr "Odstrani iz sistema nadzora različic"
-#: ../data/ui/vcview.ui.h:13
+#: ../meld/resources/ui/vcview.ui.h:13
msgid "Mar_k as Resolved"
msgstr "Označi kot _razrešeno"
-#: ../data/ui/vcview.ui.h:14
+#: ../meld/resources/ui/vcview.ui.h:14
msgid "Mark as resolved in version control"
msgstr "Označi kot razrešeno v sistemu nadzora različic"
-#: ../data/ui/vcview.ui.h:15
+#: ../meld/resources/ui/vcview.ui.h:15
msgid "Re_vert"
msgstr "Po&vrni"
-#: ../data/ui/vcview.ui.h:16
+#: ../meld/resources/ui/vcview.ui.h:16
msgid "Revert working copy to original state"
msgstr "Povrni delovno kopijo na izvorno stanje"
-#: ../data/ui/vcview.ui.h:17
+#: ../meld/resources/ui/vcview.ui.h:17
msgid "Delete from working copy"
msgstr "Izbriši iz delovne kopije"
-#: ../data/ui/vcview.ui.h:18
+#: ../meld/resources/ui/vcview.ui.h:18
msgid "Console"
msgstr "Konzola"
-#: ../data/ui/vcview.ui.h:19
+#: ../meld/resources/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
+#: ../meld/resources/ui/vcview.ui.h:20
msgid "_Flatten"
msgstr "_Razpni"
-#: ../data/ui/vcview.ui.h:21
+#: ../meld/resources/ui/vcview.ui.h:21
msgid "Flatten directories"
msgstr "_Razpni mape"
-#: ../data/ui/vcview.ui.h:22
+#: ../meld/resources/ui/vcview.ui.h:22
msgid "_Modified"
msgstr "_Spremenjeno"
-#: ../data/ui/vcview.ui.h:23
+#: ../meld/resources/ui/vcview.ui.h:23
msgid "Show modified files"
msgstr "Pokaži spremenjene datoteke"
-#: ../data/ui/vcview.ui.h:24
+#: ../meld/resources/ui/vcview.ui.h:24
msgid "_Normal"
msgstr "_Običajno"
-#: ../data/ui/vcview.ui.h:25
+#: ../meld/resources/ui/vcview.ui.h:25
msgid "Show normal files"
msgstr "Pokaži običajne datoteke"
-#: ../data/ui/vcview.ui.h:26
+#: ../meld/resources/ui/vcview.ui.h:26
msgid "Un_versioned"
msgstr "Brez določene _različice"
-#: ../data/ui/vcview.ui.h:27
+#: ../meld/resources/ui/vcview.ui.h:27
msgid "Show unversioned files"
msgstr "Pokaži datoteke z nedoločenimi različicami"
-#: ../data/ui/vcview.ui.h:28 ../meld/vc/_vc.py:69
+#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70
msgid "Ignored"
msgstr "Prezrto"
-#: ../data/ui/vcview.ui.h:29
+#: ../meld/resources/ui/vcview.ui.h:29
msgid "Show ignored files"
msgstr "Pokaži prezrte datoteke"
-#: ../data/ui/vcview.ui.h:30
-msgid "Commit"
-msgstr "Uveljavi"
-
-#: ../data/ui/vcview.ui.h:31
-msgid "Commit Files"
-msgstr "Uveljavi datoteke"
-
-#: ../data/ui/vcview.ui.h:32
-msgid "Log Message"
-msgstr "Sporočilo beleženja"
-
-#: ../data/ui/vcview.ui.h:33
-msgid "Previous logs:"
-msgstr "Predhodni dnevniki:"
-
-#: ../data/ui/vcview.ui.h:34
-msgid "Co_mmit"
-msgstr "_Uveljavi"
-
-#: ../data/ui/vcview.ui.h:36 ../meld/vcview.py:331
+#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366
msgid "Location"
msgstr "Mesto"
-#: ../data/ui/vcview.ui.h:37
+#: ../meld/resources/ui/vcview.ui.h:32
msgid "Status"
msgstr "Stanje"
-#: ../data/ui/vcview.ui.h:38
+#: ../meld/resources/ui/vcview.ui.h:33
msgid "Extra"
msgstr "Dodatno"
-#: ../data/ui/vcview.ui.h:39
+#: ../meld/resources/ui/vcview.ui.h:34
msgid "Console output"
msgstr "Odvod konzole"
-#: ../data/ui/vcview.ui.h:40
-msgid "Push local commits to remote?"
-msgstr "Ali naj se objavijo krajevne uveljavitve v oddaljeno skladišče?"
-
-#: ../data/ui/vcview.ui.h:41
-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:42
-msgid "_Push commits"
-msgstr "_Objavi uveljavitve"
-
#: ../meld/const.py:12
msgid "UNIX (LF)"
msgstr "UNIX (LF)"
@@ -1633,82 +1633,82 @@ msgid "Mac OS (CR)"
msgstr "Mac OS (CR)"
#. Create file size CellRenderer
-#: ../meld/dirdiff.py:437 ../meld/preferences.py:82
+#: ../meld/dirdiff.py:476 ../meld/preferences.py:138
msgid "Size"
msgstr "Velikost"
#. Create date-time CellRenderer
-#: ../meld/dirdiff.py:445 ../meld/preferences.py:83
+#: ../meld/dirdiff.py:484 ../meld/preferences.py:139
msgid "Modification time"
msgstr "Čas spremembe"
#. Create permissions CellRenderer
-#: ../meld/dirdiff.py:453 ../meld/preferences.py:84
+#: ../meld/dirdiff.py:492 ../meld/preferences.py:140
msgid "Permissions"
msgstr "Dovoljenja"
-#: ../meld/dirdiff.py:588
+#: ../meld/dirdiff.py:626
#, python-format
msgid "Hide %s"
msgstr "Skrij %s"
-#: ../meld/dirdiff.py:729 ../meld/dirdiff.py:752
+#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] Preiskovanje %s"
-#: ../meld/dirdiff.py:887
+#: ../meld/dirdiff.py:926
#, python-format
msgid "[%s] Done"
msgstr "[%s] končano"
-#: ../meld/dirdiff.py:895
+#: ../meld/dirdiff.py:934
msgid "Folders have no differences"
msgstr "V mapah ni razlik"
-#: ../meld/dirdiff.py:897
+#: ../meld/dirdiff.py:936
msgid "Contents of scanned files in folders are identical."
msgstr ""
-#: ../meld/dirdiff.py:899
+#: ../meld/dirdiff.py:938
msgid ""
"Scanned files in folders appear identical, but contents have not been "
"scanned."
msgstr ""
-#: ../meld/dirdiff.py:902
+#: ../meld/dirdiff.py:941
msgid "File filters are in use, so not all files have been scanned."
msgstr ""
-#: ../meld/dirdiff.py:904
+#: ../meld/dirdiff.py:943
msgid "Text filters are in use and may be masking content differences."
msgstr ""
-#: ../meld/dirdiff.py:922 ../meld/filediff.py:1491 ../meld/filediff.py:1521
-#: ../meld/filediff.py:1523 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
+#: ../meld/dirdiff.py:961 ../meld/filediff.py:1603 ../meld/filediff.py:1633
+#: ../meld/filediff.py:1635 ../meld/ui/msgarea.py:106 ../meld/ui/msgarea.py:119
msgid "Hi_de"
msgstr "S_krij"
-#: ../meld/dirdiff.py:931
+#: ../meld/dirdiff.py:970
msgid "Multiple errors occurred while scanning this folder"
msgstr "Med preiskovanjem mape, je prišlo do več napak."
-#: ../meld/dirdiff.py:932
+#: ../meld/dirdiff.py:971
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:934
+#: ../meld/dirdiff.py:973
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:936
+#: ../meld/dirdiff.py:975
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:938
+#: ../meld/dirdiff.py:977
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -1717,29 +1717,29 @@ msgstr ""
"razlike velikosti upošteva. Nekatere datoteke so skrite:\n"
"%s"
-#: ../meld/dirdiff.py:949
+#: ../meld/dirdiff.py:988
#, fuzzy, python-format
#| msgid "'%s' hidden by '%s'"
msgid "“%s” hidden by “%s”"
msgstr "'%s' je skrit; '%s'"
-#: ../meld/dirdiff.py:1005
+#: ../meld/dirdiff.py:1044
#, python-format
msgid "Replace folder “%s”?"
msgstr "Ali želite zamenjati mapo »%s«?"
-#: ../meld/dirdiff.py:1007
+#: ../meld/dirdiff.py:1046
#, python-format
msgid ""
"Another folder with the same name already exists in “%s”.\n"
"If you replace the existing folder, all files in it will be lost."
msgstr ""
-#: ../meld/dirdiff.py:1020
+#: ../meld/dirdiff.py:1059
msgid "Error copying file"
msgstr "Napaka kopiranja datoteke"
-#: ../meld/dirdiff.py:1021
+#: ../meld/dirdiff.py:1060
#, python-format
msgid ""
"Couldn’t copy %s\n"
@@ -1752,84 +1752,82 @@ msgstr ""
"\n"
"%s"
-#: ../meld/dirdiff.py:1046 ../meld/vcview.py:703
-#, fuzzy
-#| msgid "Error deleting %s"
+#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720
msgid "Error deleting {}"
-msgstr "Napaka med brisanjem %s"
+msgstr "Napaka med brisanjem {}"
-#: ../meld/dirdiff.py:1577
+#: ../meld/dirdiff.py:1597
msgid "No folder"
msgstr "Ni mape"
-#: ../meld/filediff.py:834
+#: ../meld/filediff.py:920
msgid "Comparison results will be inaccurate"
msgstr "Rezultati primerjave ne bodo natančni"
-#: ../meld/filediff.py:836
+#: ../meld/filediff.py:922
msgid ""
"A filter changed the number of lines in the file, which is unsupported. The "
"comparison will not be accurate."
msgstr ""
-#: ../meld/filediff.py:893
+#: ../meld/filediff.py:994
msgid "Mark conflict as resolved?"
msgstr "Ali naj se spor označi kot razrešen?"
-#: ../meld/filediff.py:895
+#: ../meld/filediff.py:996
msgid ""
"If the conflict was resolved successfully, you may mark it as resolved now."
msgstr ""
-#: ../meld/filediff.py:897
+#: ../meld/filediff.py:998
msgid "Cancel"
msgstr "Prekliči"
-#: ../meld/filediff.py:898
+#: ../meld/filediff.py:999
msgid "Mark _Resolved"
msgstr "Označi kot _razrešeno"
-#: ../meld/filediff.py:1206
+#: ../meld/filediff.py:1318
#, python-format
msgid "There was a problem opening the file “%s”."
msgstr "Prišlo je do napake med odpiranjem datoteke “%s”."
-#: ../meld/filediff.py:1214
+#: ../meld/filediff.py:1326
#, fuzzy, python-format
msgid "File %s appears to be a binary file."
msgstr "Datoteka je videti kot besedilna datoteka"
-#: ../meld/filediff.py:1216
+#: ../meld/filediff.py:1328
msgid "Do you want to open the file using the default application?"
msgstr ""
-#: ../meld/filediff.py:1218
+#: ../meld/filediff.py:1330
msgid "Open"
msgstr "Odpri"
-#: ../meld/filediff.py:1234
+#: ../meld/filediff.py:1346
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Računanje razlik"
-#: ../meld/filediff.py:1295
+#: ../meld/filediff.py:1407
#, python-format
msgid "File %s has changed on disk"
msgstr "Datoteka %s je bila na disku spremenjena."
-#: ../meld/filediff.py:1296
+#: ../meld/filediff.py:1408
msgid "Do you want to reload the file?"
msgstr "Ali želite ponovno naložiti datoteko?"
-#: ../meld/filediff.py:1298
+#: ../meld/filediff.py:1410
msgid "_Reload"
msgstr "_Ponovno naloži"
-#: ../meld/filediff.py:1454
+#: ../meld/filediff.py:1566
msgid "Files are identical"
msgstr "Datoteki sta enaki"
-#: ../meld/filediff.py:1467
+#: ../meld/filediff.py:1579
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1837,26 +1835,26 @@ msgstr ""
"Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
"Ali naj se primerja vsebina brez dejavnih filtrov?"
-#: ../meld/filediff.py:1472
+#: ../meld/filediff.py:1584
msgid "Files differ in line endings only"
msgstr ""
-#: ../meld/filediff.py:1474
+#: ../meld/filediff.py:1586
#, python-format
msgid ""
"Files are identical except for differing line endings:\n"
"%s"
msgstr ""
-#: ../meld/filediff.py:1494
+#: ../meld/filediff.py:1606
msgid "Show without filters"
msgstr "Pokaži brez filtrov"
-#: ../meld/filediff.py:1516
+#: ../meld/filediff.py:1628
msgid "Change highlighting incomplete"
msgstr "Spremeni označevanje kot nedokončano"
-#: ../meld/filediff.py:1517
+#: ../meld/filediff.py:1629
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."
@@ -1864,92 +1862,83 @@ 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:1525
+#: ../meld/filediff.py:1637
msgid "Keep highlighting"
msgstr "Poudarjanje skladnje"
-#: ../meld/filediff.py:1527
+#: ../meld/filediff.py:1639
msgid "_Keep highlighting"
msgstr "_Poudarjanje skladnje"
-#: ../meld/filediff.py:1540
+#: ../meld/filediff.py:1652
msgid "Saving failed"
msgstr "Shranjevanje je spodletelo."
-#: ../meld/filediff.py:1541
+#: ../meld/filediff.py:1653
msgid ""
"Please consider copying any critical changes to another program or file to "
"avoid data loss."
msgstr ""
-#: ../meld/filediff.py:1550
+#: ../meld/filediff.py:1662
msgid "Save Left Pane As"
msgstr "Shrani levi pladenj kot"
-#: ../meld/filediff.py:1552
+#: ../meld/filediff.py:1664
msgid "Save Middle Pane As"
msgstr "Shrani srednji pladenj kot"
-#: ../meld/filediff.py:1554
+#: ../meld/filediff.py:1666
msgid "Save Right Pane As"
msgstr "Shrani desni pladenj kot"
-#: ../meld/filediff.py:1567
+#: ../meld/filediff.py:1679
#, fuzzy, python-format
msgid "File %s has changed on disk since it was opened"
msgstr "Datoteka %s je bila na disku spremenjena."
-#: ../meld/filediff.py:1569
+#: ../meld/filediff.py:1681
#, fuzzy
msgid "If you save it, any external changes will be lost."
msgstr "V primeru, da datoteke ne shranite, bodo izgubljene vse spremembe."
-#: ../meld/filediff.py:1572
+#: ../meld/filediff.py:1684
msgid "Save Anyway"
msgstr "Vseeno shrani"
-#: ../meld/filediff.py:1573
+#: ../meld/filediff.py:1685
msgid "Don’t Save"
msgstr "Ne shrani"
-#: ../meld/filediff.py:1599
-msgid "_Save as UTF-8"
-msgstr "_Shrani kot UTF-8"
-
-#: ../meld/filediff.py:1602
-#, fuzzy, python-format
-msgid "Couldn’t encode text as “%s”"
-msgstr "Ni mogoče zagnati zalednega programa »%s«."
-
-#: ../meld/filediff.py:1604
-#, fuzzy, python-format
+#: ../meld/filediff.py:1727
+#, fuzzy
#| msgid ""
#| "'%s' contains characters not encodable with '%s'\n"
#| "Would you like to save as UTF-8?"
msgid ""
-"File “%s” contains characters that can’t be encoded using encoding “%s”.\n"
-"Would you like to save as UTF-8?"
+"File “{}” contains characters that can’t be encoded using its current "
+"encoding “{}”."
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:1644 ../meld/patchdialog.py:130
-#, python-format
-msgid "Could not save file %s."
-msgstr "Ni mogoče shraniti datoteke %s."
-
-#: ../meld/filediff.py:1645 ../meld/patchdialog.py:131
+#: ../meld/filediff.py:1731 ../meld/patchdialog.py:144
#, fuzzy, python-format
msgid ""
"Couldn’t save file due to:\n"
"%s"
msgstr "Ni mogoče shraniti slike v datoteko"
-#: ../meld/filediff.py:2020
+#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143
+#, python-format
+msgid "Could not save file %s."
+msgstr "Ni mogoče shraniti datoteke %s."
+
+#: ../meld/filediff.py:2128
msgid "Live comparison updating disabled"
msgstr "Živo posodabljanje ob primerjavi je onemogočeno"
-#: ../meld/filediff.py:2021
+#: ../meld/filediff.py:2129
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
@@ -1964,357 +1953,321 @@ msgstr ""
msgid "[%s] Merging files"
msgstr "[%s] Združevanje datotek"
-#: ../meld/gutterrendererchunk.py:216
+#: ../meld/gutterrendererchunk.py:220
msgid "Copy _up"
msgstr "Kopiraj _navzgor"
-#: ../meld/gutterrendererchunk.py:217
+#: ../meld/gutterrendererchunk.py:221
msgid "Copy _down"
msgstr "Kopiraj _navzdol"
-#: ../meld/iohelpers.py:35
+#: ../meld/iohelpers.py:43
msgid "Deleting remote folders is not supported"
msgstr ""
-#: ../meld/iohelpers.py:37
+#: ../meld/iohelpers.py:45
msgid "Not a file or directory"
msgstr "Predmet ni ne datoteka ne mapa"
-#: ../meld/iohelpers.py:41
+#: ../meld/iohelpers.py:49
msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
msgstr ""
-#: ../meld/iohelpers.py:46
+#: ../meld/iohelpers.py:54
msgid "This remote location does not support sending items to the trash."
msgstr ""
-#: ../meld/iohelpers.py:51
+#: ../meld/iohelpers.py:59
msgid "_Delete Permanently"
msgstr "_Trajno izbriši"
-#: ../meld/iohelpers.py:94
+#: ../meld/iohelpers.py:106
#, python-format
msgid "Replace file “%s”?"
msgstr "Ali želite zamenjati datoteko »%s«?"
-#: ../meld/iohelpers.py:96
+#: ../meld/iohelpers.py:108
#, python-format
msgid ""
"A file with this name already exists in “%s”.\n"
"If you replace the existing file, its contents will be lost."
msgstr ""
-#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:169
msgid "wrong number of arguments supplied to --diff"
msgstr "Neveljavno število argumentov pri ukazu --diff."
-#: ../meld/meldapp.py:186
+#: ../meld/meldapp.py:174
msgid "Start with an empty window"
msgstr "Zagon brez odprtih oken"
-#: ../meld/meldapp.py:187 ../meld/meldapp.py:189
+#: ../meld/meldapp.py:175 ../meld/meldapp.py:177
msgid "file"
msgstr "datoteka"
-#: ../meld/meldapp.py:187 ../meld/meldapp.py:191
+#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
msgid "folder"
msgstr "mapa"
-#: ../meld/meldapp.py:188
+#: ../meld/meldapp.py:176
msgid "Start a version control comparison"
msgstr "Zagon primerjave nadzora različic"
-#: ../meld/meldapp.py:190
+#: ../meld/meldapp.py:178
msgid "Start a 2- or 3-way file comparison"
msgstr "Zagon z dvojno ali trojno primerjavo datotek"
-#: ../meld/meldapp.py:192
+#: ../meld/meldapp.py:180
#, fuzzy
msgid "Start a 2- or 3-way folder comparison"
msgstr "Zagon z dvojno ali trojno primerjavo datotek"
-#: ../meld/meldapp.py:235
+#: ../meld/meldapp.py:223
#, python-format
msgid "Error: %s\n"
msgstr "Napaka: %s\n"
-#: ../meld/meldapp.py:242
+#: ../meld/meldapp.py:230
msgid "Meld is a file and directory comparison tool."
msgstr "Meld je orodje za primerjavo vsebine datotek in map."
-#: ../meld/meldapp.py:246
+#: ../meld/meldapp.py:234
msgid "Set label to use instead of file name"
msgstr "Določi naslov namesto imena datoteke"
-#: ../meld/meldapp.py:249
+#: ../meld/meldapp.py:237
msgid "Open a new tab in an already running instance"
msgstr "Odpri nov zavihek v že zagnanem programu"
-#: ../meld/meldapp.py:252
+#: ../meld/meldapp.py:240
msgid "Automatically compare all differing files on startup"
msgstr "Ob zagonu samodejno primerjaj vse različne datoteke."
-#: ../meld/meldapp.py:255
+#: ../meld/meldapp.py:243
msgid "Ignored for compatibility"
msgstr "Prezrto zaradi skladnosti"
-#: ../meld/meldapp.py:259
+#: ../meld/meldapp.py:247
msgid "Set the target file for saving a merge result"
msgstr "Določitev ciljne datoteke za shranjevanje rezultatov združevanja."
-#: ../meld/meldapp.py:262
+#: ../meld/meldapp.py:250
msgid "Automatically merge files"
msgstr "Samodejno združi datoteke"
-#: ../meld/meldapp.py:266
+#: ../meld/meldapp.py:254
msgid "Load a saved comparison from a Meld comparison file"
msgstr "Naloži shranjeno datoteko primerjav Meld"
-#: ../meld/meldapp.py:270
+#: ../meld/meldapp.py:258
msgid "Create a diff tab for the supplied files or folders"
msgstr "Ustvari zavihke primerjav za navedene datoteke ali mape."
-#: ../meld/meldapp.py:290
+#: ../meld/meldapp.py:278
#, python-format
msgid "too many arguments (wanted 0-3, got %d)"
msgstr "preveč argumentov (zahtevanih 0-3, prejetih %d)"
-#: ../meld/meldapp.py:293
+#: ../meld/meldapp.py:281
#, fuzzy
#| msgid "can't auto-merge less than 3 files"
msgid "can’t auto-merge less than 3 files"
msgstr "manj kot treh datotek ni mogoče samodejno združevati"
-#: ../meld/meldapp.py:295
+#: ../meld/meldapp.py:283
#, fuzzy
#| msgid "can't auto-merge directories"
msgid "can’t auto-merge directories"
msgstr "Ni mogoče združiti map"
-#: ../meld/meldapp.py:309
+#: ../meld/meldapp.py:297
msgid "Error reading saved comparison file"
msgstr "Napaka med branjem datoteke primerjav"
-#: ../meld/meldapp.py:326
+#: ../meld/meldapp.py:314
#, fuzzy, python-format
msgid "invalid path or URI “%s”"
msgstr "Neveljaven naslov URI mape »%s«"
-#: ../meld/meldapp.py:332
+#: ../meld/meldapp.py:320
msgid "remote folder “{}” not supported"
msgstr ""
#. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:124
+#: ../meld/meldbuffer.py:123
msgid "<unnamed>"
msgstr "<neimenovano>"
-#: ../meld/melddoc.py:68
+#: ../meld/melddoc.py:63
msgid "untitled"
msgstr "neimenovano"
-#: ../meld/meldwindow.py:47
+#: ../meld/meldwindow.py:56
msgid "_File"
msgstr "_Datoteka"
-#: ../meld/meldwindow.py:48
+#: ../meld/meldwindow.py:57
msgid "_New Comparison…"
msgstr "_Nova primerjava ..."
-#: ../meld/meldwindow.py:49
+#: ../meld/meldwindow.py:58
msgid "Start a new comparison"
msgstr "Nova primerjava"
-#: ../meld/meldwindow.py:52
+#: ../meld/meldwindow.py:61
msgid "Save the current file"
msgstr "Shrani trenutno datoteko"
-#: ../meld/meldwindow.py:54
+#: ../meld/meldwindow.py:63
msgid "Save As…"
msgstr "Shrani kot ..."
-#: ../meld/meldwindow.py:55
+#: ../meld/meldwindow.py:64
msgid "Save the current file with a different name"
msgstr "Shrani trenutno datoteko z drugim imenom"
-#: ../meld/meldwindow.py:58
+#: ../meld/meldwindow.py:67
msgid "Close the current file"
msgstr "Zapri trenutno datoteko"
-#: ../meld/meldwindow.py:61
+#: ../meld/meldwindow.py:70
msgid "_Edit"
msgstr "_Uredi"
-#: ../meld/meldwindow.py:63
+#: ../meld/meldwindow.py:72
msgid "Undo the last action"
msgstr "Razveljavi zadnje dejanje"
-#: ../meld/meldwindow.py:66
+#: ../meld/meldwindow.py:75
msgid "Redo the last undone action"
msgstr "Obnovi zadnje razveljavljeno dejanje"
-#: ../meld/meldwindow.py:68
+#: ../meld/meldwindow.py:77
msgid "Cut the selection"
msgstr "Izreži izbrano"
-#: ../meld/meldwindow.py:70
+#: ../meld/meldwindow.py:79
msgid "Copy the selection"
msgstr "Kopiraj izbrano"
-#: ../meld/meldwindow.py:72
+#: ../meld/meldwindow.py:81
msgid "Paste the clipboard"
msgstr "Prilepi iz odložišča"
-#: ../meld/meldwindow.py:74
+#: ../meld/meldwindow.py:83
msgid "Find…"
msgstr "Najdi ..."
-#: ../meld/meldwindow.py:74
+#: ../meld/meldwindow.py:83
msgid "Search for text"
msgstr "Poišči besedilo"
-#: ../meld/meldwindow.py:76
+#: ../meld/meldwindow.py:85
msgid "Find Ne_xt"
msgstr "Najdi _naslednje"
-#: ../meld/meldwindow.py:77
+#: ../meld/meldwindow.py:86
msgid "Search forwards for the same text"
msgstr "Poišči niz naprej po besedilu"
-#: ../meld/meldwindow.py:79
+#: ../meld/meldwindow.py:88
msgid "Find _Previous"
msgstr "Najdi _predhodne"
-#: ../meld/meldwindow.py:80
+#: ../meld/meldwindow.py:89
msgid "Search backwards for the same text"
msgstr "Besedilo najdi nazaj po besedilu"
-#: ../meld/meldwindow.py:83
+#: ../meld/meldwindow.py:92
msgid "_Replace…"
msgstr "_Zamenjaj ..."
-#: ../meld/meldwindow.py:84
+#: ../meld/meldwindow.py:93
msgid "Find and replace text"
msgstr "Poišči in zamenjaj besedilo"
-#: ../meld/meldwindow.py:86
+#: ../meld/meldwindow.py:95
msgid "Go to _Line"
msgstr "Skoči v _vrstico"
-#: ../meld/meldwindow.py:87
+#: ../meld/meldwindow.py:96
msgid "Go to a specific line"
msgstr ""
-#: ../meld/meldwindow.py:90
+#: ../meld/meldwindow.py:99
msgid "_Changes"
msgstr "_Spremembe"
-#: ../meld/meldwindow.py:91
+#: ../meld/meldwindow.py:100
msgid "Next Change"
msgstr "Naslednja sprememba"
-#: ../meld/meldwindow.py:92
+#: ../meld/meldwindow.py:101
msgid "Go to the next change"
msgstr "Skoči na naslednjo spremembo"
-#: ../meld/meldwindow.py:94
+#: ../meld/meldwindow.py:103
msgid "Previous Change"
msgstr "Predhodna sprememba"
-#: ../meld/meldwindow.py:95
+#: ../meld/meldwindow.py:104
msgid "Go to the previous change"
msgstr "Skoči na predhodno spremembo"
-#: ../meld/meldwindow.py:97
+#: ../meld/meldwindow.py:106
msgid "Open Externally"
msgstr "Odpri v zunanjem programu"
-#: ../meld/meldwindow.py:98
+#: ../meld/meldwindow.py:107
msgid "Open selected file or directory in the default external application"
msgstr "Odpri zbrano datoteko ali mapo v privzetem zunanjem programu"
-#: ../meld/meldwindow.py:102
+#: ../meld/meldwindow.py:111
msgid "_View"
msgstr "_Pogled"
-#: ../meld/meldwindow.py:103
+#: ../meld/meldwindow.py:112
msgid "File Status"
msgstr "Stanje datoteke"
-#: ../meld/meldwindow.py:104
+#: ../meld/meldwindow.py:113
msgid "Version Status"
msgstr "Stanje različice"
-#: ../meld/meldwindow.py:107
+#: ../meld/meldwindow.py:116
msgid "Stop the current action"
msgstr "Ustavi trenutno dejanje"
-#: ../meld/meldwindow.py:110
+#: ../meld/meldwindow.py:119
msgid "Refresh the view"
msgstr "Osveži pogled"
-#: ../meld/meldwindow.py:114
+#: ../meld/meldwindow.py:123
msgid "Fullscreen"
msgstr "Celozaslonski način"
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:124
msgid "View the comparison in fullscreen"
msgstr "Pokaži primerjavo v celozaslonskem načinu"
-#: ../meld/meldwindow.py:117
-msgid "_Toolbar"
-msgstr "_Orodna vrstica"
-
-#: ../meld/meldwindow.py:118
-msgid "Show or hide the toolbar"
-msgstr "Pokaži ali skrij orodno vrstico"
-
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:133
msgid "Open Recent"
msgstr "Odpri nedavno"
-#: ../meld/meldwindow.py:128
+#: ../meld/meldwindow.py:134
msgid "Open recent files"
msgstr "Odpri nedavne datoteke"
-#: ../meld/meldwindow.py:150
-msgid "_Meld"
-msgstr "_Meld"
-
-#: ../meld/meldwindow.py:151
-msgid "Quit the program"
-msgstr "Končaj program"
-
-#: ../meld/meldwindow.py:153
-msgid "Prefere_nces"
-msgstr "Mož_nosti"
-
-#: ../meld/meldwindow.py:154
-msgid "Configure the application"
-msgstr "Spremeni nastavitve programa"
-
-#: ../meld/meldwindow.py:156
-msgid "_Contents"
-msgstr "_Vsebina"
-
-#: ../meld/meldwindow.py:157
-msgid "Open the Meld manual"
-msgstr "Odpri priročnik Meld"
-
-#: ../meld/meldwindow.py:159
-msgid "About this application"
-msgstr "O programu"
-
-#: ../meld/meldwindow.py:602
+#: ../meld/meldwindow.py:567
#, python-format
msgid "Need three files to auto-merge, got: %r"
msgstr ""
-#: ../meld/meldwindow.py:623
+#: ../meld/meldwindow.py:588
msgid "Cannot compare a mixture of files and directories"
msgstr "Ni mogoče sočasno primerjati datotek in map"
-#: ../meld/misc.py:136
+#: ../meld/misc.py:155
msgid ""
"{}\n"
"\n"
@@ -2322,51 +2275,47 @@ msgid ""
"<tt>{}</tt>"
msgstr ""
-#: ../meld/misc.py:255
+#: ../meld/misc.py:237
#, python-format
msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
msgstr ""
-#: ../meld/misc.py:326
+#: ../meld/misc.py:311
msgid "[None]"
msgstr "[noben]"
-#: ../meld/preferences.py:33
+#: ../meld/preferences.py:42 ../meld/preferences.py:135
msgid "label"
msgstr "oznaka"
-#: ../meld/preferences.py:33
+#: ../meld/preferences.py:42 ../meld/preferences.py:135
msgid "pattern"
msgstr "vzorec"
-#: ../meld/recent.py:105
+#: ../meld/recent.py:106
msgid "Version control:"
msgstr "Nadzor različic:"
-#: ../meld/ui/bufferselectors.py:32
+#: ../meld/ui/bufferselectors.py:114
#, python-brace-format
msgid "{name} ({charset})"
msgstr "{name} ({charset})"
-#: ../meld/ui/bufferselectors.py:65 ../meld/ui/bufferselectors.py:73
+#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152
msgid "Plain Text"
msgstr "Običajno besedilo"
-#: ../meld/ui/notebooklabel.py:63
-msgid "Close tab"
-msgstr "Zapri zavihek"
-
#. Abbreviation for line, column so that it will fit in the status bar
#: ../meld/ui/statusbar.py:124
#, python-format
msgid "Ln %i, Col %i"
msgstr "Vr. %i, St. %i"
-#: ../meld/ui/statusbar.py:177
+#: ../meld/ui/statusbar.py:182
msgid "Line you want to move the cursor to"
msgstr ""
-#: ../meld/ui/vcdialogs.py:48
+#: ../meld/ui/vcdialogs.py:55
msgid "No files will be committed"
msgstr "Ni pripravljenih datotek za uveljavitev"
@@ -2422,141 +2371,141 @@ msgstr "Brez"
msgid "Rev %s"
msgstr "Za '%s':"
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
msgid "Merged"
msgstr "Združeno"
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
msgid "Base"
msgstr "Osnova"
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
msgid "Local"
msgstr "Krajevno"
-#: ../meld/vc/_vc.py:54
+#: ../meld/vc/_vc.py:55
msgid "Remote"
msgstr "Oddaljeno"
-#: ../meld/vc/_vc.py:70
+#: ../meld/vc/_vc.py:71
msgid "Unversioned"
msgstr "Brez določene različice"
-#: ../meld/vc/_vc.py:73
+#: ../meld/vc/_vc.py:74
msgid "Error"
msgstr "Napaka"
-#: ../meld/vc/_vc.py:75
+#: ../meld/vc/_vc.py:76
msgid "Newly added"
msgstr "Nedavno dodano"
-#: ../meld/vc/_vc.py:77
+#: ../meld/vc/_vc.py:78
msgid "Renamed"
msgstr "Preimenovano"
-#: ../meld/vc/_vc.py:78
+#: ../meld/vc/_vc.py:79
msgid "Conflict"
msgstr "V sporu"
-#: ../meld/vc/_vc.py:79
+#: ../meld/vc/_vc.py:80
msgid "Removed"
msgstr "Odstranjeno"
-#: ../meld/vc/_vc.py:80
+#: ../meld/vc/_vc.py:81
msgid "Missing"
msgstr "Manjkajoče"
-#: ../meld/vc/_vc.py:81
+#: ../meld/vc/_vc.py:82
msgid "Not present"
msgstr "Ni na voljo"
#. Translators: This error message is shown when a version
#. control binary isn't installed.
-#: ../meld/vcview.py:248
+#: ../meld/vcview.py:282
#, fuzzy, python-format
msgid "%(name)s (%(cmd)s not installed)"
msgstr "Nameščena različica %s %s"
#. Translators: This error message is shown when a version
#. controlled repository is invalid.
-#: ../meld/vcview.py:252
+#: ../meld/vcview.py:286
#, fuzzy, python-format
msgid "%(name)s (Invalid repository)"
msgstr "Neveljavno ime skupine: %s"
-#: ../meld/vcview.py:273
+#: ../meld/vcview.py:307
msgid "No valid version control system found in this folder"
msgstr "Ni veljavnega sistema za nadzor različic v tej mapi"
-#: ../meld/vcview.py:275
+#: ../meld/vcview.py:309
msgid "Only one version control system found in this folder"
msgstr "V tej mapi je le en sistem nadzora različic"
-#: ../meld/vcview.py:277
+#: ../meld/vcview.py:311
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 being viewed
-#: ../meld/vcview.py:331
+#: ../meld/vcview.py:366
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
#. Initial yield so when we add this to our tasks, we don't
#. create iterators that may be invalidated.
-#: ../meld/vcview.py:338
+#: ../meld/vcview.py:373
msgid "Scanning repository"
msgstr "Poteka preiskovanje skladišča"
-#: ../meld/vcview.py:367
+#: ../meld/vcview.py:402
#, python-format
msgid "Scanning %s"
msgstr "Preiskovanje %s"
-#: ../meld/vcview.py:406
+#: ../meld/vcview.py:441
msgid "(Empty)"
msgstr "(Prazno)"
-#: ../meld/vcview.py:450
+#: ../meld/vcview.py:487
#, python-format
msgid "%s — local"
msgstr "%s — krajevno"
-#: ../meld/vcview.py:451
+#: ../meld/vcview.py:488
#, python-format
msgid "%s — remote"
msgstr "%s — oddaljeno"
-#: ../meld/vcview.py:459
+#: ../meld/vcview.py:496
#, python-format
msgid "%s (local, merge, remote)"
msgstr "%s (krajevno, združi, oddaljeno)"
-#: ../meld/vcview.py:464
+#: ../meld/vcview.py:501
#, python-format
msgid "%s (remote, merge, local)"
msgstr "%s (oddaljeno, združi, krajevno)"
-#: ../meld/vcview.py:475
+#: ../meld/vcview.py:512
#, python-format
msgid "%s — repository"
msgstr "%s — skladišče"
-#: ../meld/vcview.py:481
+#: ../meld/vcview.py:518
#, python-format
msgid "%s (working, repository)"
msgstr "%s (delovno, skladišče)"
-#: ../meld/vcview.py:485
+#: ../meld/vcview.py:522
#, python-format
msgid "%s (repository, working)"
msgstr "%s (skladišče, delovno)"
-#: ../meld/vcview.py:674
+#: ../meld/vcview.py:688
msgid "Remove folder and all its files?"
msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
-#: ../meld/vcview.py:676
+#: ../meld/vcview.py:690
msgid ""
"This will remove all selected files and folders, and all files within any "
"selected folders, from version control."
@@ -2564,10 +2513,64 @@ msgstr ""
"S tem dejanjem bodo odstranjene vse izbrane datoteke in mape in vse "
"podrejene datoteke iz sistema za nadzor različic"
-#: ../meld/vcview.py:785
+#: ../meld/vcview.py:804
msgid "Clear"
msgstr "Počisti"
+#~ msgid "Show toolbar"
+#~ msgstr "Pokaži orodno vrstico"
+
+#, fuzzy
+#~ msgid "If true, the window toolbar is visible."
+#~ msgstr "Ali naj bo orodna vrstica vidna."
+
+#~ msgid "Show statusbar"
+#~ msgstr "Pokaži vrstico stanja"
+
+#, fuzzy
+#~ msgid "If true, the window statusbar is visible."
+#~ msgstr "Vrstica stanja je vidna"
+
+#~ msgid "Editable List"
+#~ msgstr "Uredljiv seznam"
+
+#~ msgid "Meld Preferences"
+#~ msgstr "Možnosti Meld"
+
+#~ msgid "_Save as UTF-8"
+#~ msgstr "_Shrani kot UTF-8"
+
+#, fuzzy
+#~ msgid "Couldn’t encode text as “%s”"
+#~ msgstr "Ni mogoče zagnati zalednega programa »%s«."
+
+#~ msgid "_Toolbar"
+#~ msgstr "_Orodna vrstica"
+
+#~ msgid "Show or hide the toolbar"
+#~ msgstr "Pokaži ali skrij orodno vrstico"
+
+#~ msgid "_Meld"
+#~ msgstr "_Meld"
+
+#~ msgid "Quit the program"
+#~ msgstr "Končaj program"
+
+#~ msgid "Prefere_nces"
+#~ msgstr "Mož_nosti"
+
+#~ msgid "Configure the application"
+#~ msgstr "Spremeni nastavitve programa"
+
+#~ msgid "_Contents"
+#~ msgstr "_Vsebina"
+
+#~ msgid "Open the Meld manual"
+#~ msgstr "Odpri priročnik Meld"
+
+#~ msgid "About this application"
+#~ msgstr "O programu"
+
#~ msgid "INS"
#~ msgstr "VST"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
