[meld] Updated Slovenian translation
- From: Matej Urbančič <mateju src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Updated Slovenian translation
- Date: Fri, 5 Jun 2020 07:17:38 +0000 (UTC)
commit b1365a3ae34353d6c746f312227cf08e5fc3a467
Author: Matej Urbančič <mateju svn gnome org>
Date: Fri Jun 5 09:17:29 2020 +0200
Updated Slovenian translation
po/sl.po | 2180 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 1126 insertions(+), 1054 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index ea318357..99b2772f 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–2019.
+# Matej Urbančič <mateju svn gnome org>, 2009–2020.
#
msgid ""
msgstr ""
"Project-Id-Version: meld master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
-"POT-Creation-Date: 2019-01-25 12:24+0000\n"
-"PO-Revision-Date: 2019-01-26 15:50+0100\n"
+"POT-Creation-Date: 2020-05-24 20:55+0000\n"
+"PO-Revision-Date: 2020-06-04 18:30+0200\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"
@@ -19,51 +19,27 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
"%100==4 ? 3 : 0);\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.3\n"
-#: ../bin/meld:190
-msgid "Cannot import: "
-msgstr "Ni mogoče uvoziti:"
-
-#: ../bin/meld:193
-#, c-format
-msgid "Meld requires %s or higher."
-msgstr "Program Meld zahteva najmanj različico %s."
-
-#: ../bin/meld:262
-#, c-format
-msgid ""
-"Couldn’t load Meld-specific CSS (%s)\n"
-"%s"
-msgstr ""
-"Ni mogoče naložiti posebnega oblikovanja CSS za Meld (%s)\n"
-"%s"
-
-#: ../data/org.gnome.meld.desktop.in.h:1
-#: ../data/org.gnome.meld.appdata.xml.in.h:1
-#: ../meld/resources/ui/appwindow.ui.h:1
+#: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
+#: meld/resources/ui/appwindow.ui:9
msgid "Meld"
msgstr "Meld"
-#: ../data/org.gnome.meld.desktop.in.h:2
+#: data/org.gnome.meld.desktop.in.in:4
msgid "Diff Viewer"
msgstr "Pregledovalnik sprememb"
-#: ../data/org.gnome.meld.desktop.in.h:3
-msgid "Meld Diff Viewer"
-msgstr "Meld pregledovalnik različic"
-
-#: ../data/org.gnome.meld.desktop.in.h:4
-#: ../data/org.gnome.meld.appdata.xml.in.h:2
+#: data/org.gnome.meld.desktop.in.in:5 data/org.gnome.meld.appdata.xml.in.in:12
msgid "Compare and merge your files"
msgstr "Primerjava in združevanje datotek"
#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list
MUST also end with a semicolon!
-#: ../data/org.gnome.meld.desktop.in.h:6
+#: data/org.gnome.meld.desktop.in.in:7
msgid "diff;merge;"
msgstr "diff;merge;primerjava;usklajevanje;"
-#: ../data/org.gnome.meld.appdata.xml.in.h:3
+#: data/org.gnome.meld.appdata.xml.in.in:14
msgid ""
"Meld is a visual diff and merge tool targeted at developers. Meld helps you "
"compare files, directories, and version controlled projects. It provides "
@@ -71,45 +47,41 @@ msgid ""
"many version control systems including Git, Mercurial, Bazaar and Subversion."
msgstr ""
-#: ../data/org.gnome.meld.appdata.xml.in.h:4
+#: data/org.gnome.meld.appdata.xml.in.in:21
msgid ""
"Meld helps you review code changes, understand patches, and makes enormous "
"merge conflicts slightly less painful."
msgstr ""
-#: ../data/org.gnome.meld.appdata.xml.in.h:5
+#: data/org.gnome.meld.appdata.xml.in.in:51
msgid "The GNOME Project"
msgstr "Projekt GNOME"
-#: ../data/mime/org.gnome.meld.xml.in.h:1
+#: data/mime/org.gnome.meld.xml.in:4
msgid "Meld comparison description"
msgstr "Opis primerjave Meld"
-#: ../data/org.gnome.meld.gschema.xml.h:1
+#: data/org.gnome.meld.gschema.xml:37
msgid "Default window width"
msgstr "Privzeta širina okna"
-#: ../data/org.gnome.meld.gschema.xml.h:2
+#: data/org.gnome.meld.gschema.xml:41
msgid "Default window height"
msgstr "Privzeta višina okna"
-#: ../data/org.gnome.meld.gschema.xml.h:3
-#, fuzzy
-#| msgid "Default window state"
+#: data/org.gnome.meld.gschema.xml:45
msgid "Default window maximised state"
-msgstr "Privzeto stanje okna"
+msgstr "Privzeto razpeto stanje okna"
-#: ../data/org.gnome.meld.gschema.xml.h:4
-#, fuzzy
-#| msgid "Default window state"
+#: data/org.gnome.meld.gschema.xml:49
msgid "Default window fullscreen state"
-msgstr "Postavi okno v celozaslonski način."
+msgstr "Privzeto celozaslonsko stanje okna"
-#: ../data/org.gnome.meld.gschema.xml.h:5
+#: data/org.gnome.meld.gschema.xml:58
msgid "Additional automatically detected text encodings"
msgstr "Dodatna samodejno zaznana kodiranja"
-#: ../data/org.gnome.meld.gschema.xml.h:6
+#: data/org.gnome.meld.gschema.xml:59
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 "
@@ -117,176 +89,186 @@ msgid ""
"may also be tried, depending on the user’s locale."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:7
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:66
msgid "Width of an indentation step"
-msgstr "Število presledkov posamezne ravni zamikanja"
+msgstr "Širina zamika"
-#: ../data/org.gnome.meld.gschema.xml.h:8
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:67
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:9
+#: data/org.gnome.meld.gschema.xml:71
#, 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:10
+#: data/org.gnome.meld.gschema.xml:72
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:11
-#: ../meld/resources/ui/statusbar-menu.ui.h:1
+#: data/org.gnome.meld.gschema.xml:76 meld/resources/ui/statusbar-menu.ui:5
msgid "Show line numbers"
msgstr "Pokaži številke vrstic"
-#: ../data/org.gnome.meld.gschema.xml.h:12
+#: data/org.gnome.meld.gschema.xml:77
msgid "If true, line numbers will be shown in the gutter of file comparisons."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:13
+#: data/org.gnome.meld.gschema.xml:81
msgid "Highlight syntax"
msgstr "Poudarjanje skladnje"
-#: ../data/org.gnome.meld.gschema.xml.h:14
+#: data/org.gnome.meld.gschema.xml:82
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:15
+#: data/org.gnome.meld.gschema.xml:86
#, fuzzy
msgid "Color scheme to use for syntax highlighting"
msgstr "Ime barvne sheme gtksourceview za poudarjanje skladnje."
-#: ../data/org.gnome.meld.gschema.xml.h:16
+#: data/org.gnome.meld.gschema.xml:87
msgid "Used by GtkSourceView to determine colors for syntax highlighting"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:17
-msgid "Displayed whitespace"
-msgstr "Vidni presledni znaki"
+#: data/org.gnome.meld.gschema.xml:91
+msgid "Draw whitespace"
+msgstr "Pokaži presledne znake"
-#: ../data/org.gnome.meld.gschema.xml.h:18
+#: data/org.gnome.meld.gschema.xml:92
msgid ""
-"Selector for individual whitespace character types to be shown. Possible "
-"values are 'space', 'tab', 'newline' and 'nbsp'."
+"If true, whitespace characters will be drawn in comparisons even if they are "
+"not in a changed area."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:19
+#: data/org.gnome.meld.gschema.xml:101
msgid "Wrap mode"
msgstr "Način preloma"
-#: ../data/org.gnome.meld.gschema.xml.h:20
+#: data/org.gnome.meld.gschema.xml:102
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:21
-#: ../meld/resources/ui/statusbar-menu.ui.h:3
+#: data/org.gnome.meld.gschema.xml:109 meld/resources/ui/statusbar-menu.ui:13
msgid "Highlight current line"
msgstr "Poudari trenutno vrstico"
-#: ../data/org.gnome.meld.gschema.xml.h:22
+#: data/org.gnome.meld.gschema.xml:110
msgid ""
"If true, the line containing the cursor will be highlighted in file "
"comparisons."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:23
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:114
msgid "Use the system default monospace font"
-msgstr "Ali naj se uporabi privzeta sistemska pisava enake širine znakov"
+msgstr "Uporabi privzeto sistemsko pisavo stalne širine"
-#: ../data/org.gnome.meld.gschema.xml.h:24
+#: data/org.gnome.meld.gschema.xml:115
msgid ""
"If false, custom-font will be used instead of the system monospace font."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:25
+#: data/org.gnome.meld.gschema.xml:119
msgid "Custom font"
msgstr "Pisava po meri"
-#: ../data/org.gnome.meld.gschema.xml.h:26
+#: data/org.gnome.meld.gschema.xml:120
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:27
+#: data/org.gnome.meld.gschema.xml:126
+msgid "Show overview source map"
+msgstr ""
+
+#: data/org.gnome.meld.gschema.xml:127
+msgid ""
+"If true, file comparisons will have paired source maps for compared files."
+msgstr ""
+
+#: data/org.gnome.meld.gschema.xml:132
+msgid "Style of overview map"
+msgstr ""
+
+#: data/org.gnome.meld.gschema.xml:133
+msgid "Style options for how the overview map is displayed."
+msgstr ""
+
+#: data/org.gnome.meld.gschema.xml:139
msgid "Ignore blank lines when comparing files"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:28
+#: data/org.gnome.meld.gschema.xml:140
msgid ""
"If true, blank lines will be trimmed when highlighting changes between files."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:29
-#, fuzzy
+#: data/org.gnome.meld.gschema.xml:147
msgid "Use the system default editor"
-msgstr "Uporabi _privzet sistemski urejevalnik besedil."
+msgstr "Uporabi privzet sistemski urejevalnik besedil"
-#: ../data/org.gnome.meld.gschema.xml.h:30
+#: data/org.gnome.meld.gschema.xml:148
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:31
+#: data/org.gnome.meld.gschema.xml:152
#, fuzzy
msgid "The custom editor launch command"
msgstr "Ukaz za zagon urejevalnika: "
-#: ../data/org.gnome.meld.gschema.xml.h:32
+#: data/org.gnome.meld.gschema.xml:153
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:33
+#: data/org.gnome.meld.gschema.xml:159
msgid "Columns to display"
msgstr "Prikazani stolpci"
-#: ../data/org.gnome.meld.gschema.xml.h:34
+#: data/org.gnome.meld.gschema.xml:160
msgid ""
"List of column names in folder comparison and whether they should be "
"displayed."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:35
-#: ../meld/resources/ui/preferences.ui.h:25
+#: data/org.gnome.meld.gschema.xml:164 meld/resources/ui/preferences.ui:935
msgid "Ignore symbolic links"
msgstr "Prezri simbolne povezave"
-#: ../data/org.gnome.meld.gschema.xml.h:36
+#: data/org.gnome.meld.gschema.xml:165
msgid ""
"If true, folder comparisons do not follow symbolic links when traversing the "
"folder tree."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:37
+#: data/org.gnome.meld.gschema.xml:169
msgid "Use shallow comparison"
msgstr "Uporabi grobo primerjavo"
-#: ../data/org.gnome.meld.gschema.xml.h:38
+#: data/org.gnome.meld.gschema.xml:170
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:39
+#: data/org.gnome.meld.gschema.xml:174
#, fuzzy
msgid "File timestamp resolution"
msgstr "Ločljivost časovnega _žiga:"
-#: ../data/org.gnome.meld.gschema.xml.h:40
+#: data/org.gnome.meld.gschema.xml:175
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 "
@@ -294,767 +276,735 @@ msgid ""
"resolution."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:41
-#: ../meld/resources/ui/preferences.ui.h:22
+#: data/org.gnome.meld.gschema.xml:179 meld/resources/ui/preferences.ui:836
msgid "Apply text filters during folder comparisons"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:42
+#: data/org.gnome.meld.gschema.xml:180
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:43
+#: data/org.gnome.meld.gschema.xml:184
msgid "File status filters"
msgstr "Filtri stanja datotek"
-#: ../data/org.gnome.meld.gschema.xml.h:44
+#: data/org.gnome.meld.gschema.xml:185
msgid "List of statuses used to filter visible files in folder comparison."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:45
+#: data/org.gnome.meld.gschema.xml:191
#, fuzzy
msgid "Show the version control console output"
msgstr "Pokaži/Skrij odvod konzole"
-#: ../data/org.gnome.meld.gschema.xml.h:46
+#: data/org.gnome.meld.gschema.xml:192
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:47
+#: data/org.gnome.meld.gschema.xml:196
#, fuzzy
msgid "Version control pane position"
msgstr "Nadzor različic"
-#: ../data/org.gnome.meld.gschema.xml.h:48
+#: data/org.gnome.meld.gschema.xml:197
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:49
+#: data/org.gnome.meld.gschema.xml:201
msgid "Present version comparisons as left-local/right-remote"
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:50
+#: data/org.gnome.meld.gschema.xml:202
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:51
+#: data/org.gnome.meld.gschema.xml:206
#, 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:52
+#: data/org.gnome.meld.gschema.xml:207
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:53
+#: data/org.gnome.meld.gschema.xml:211
#, 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:54
+#: data/org.gnome.meld.gschema.xml:212
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:55
+#: data/org.gnome.meld.gschema.xml:216
#, 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:56
+#: data/org.gnome.meld.gschema.xml:217
msgid ""
"The column at which to show the margin in the version control commit message "
"editor."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:57
+#: data/org.gnome.meld.gschema.xml:221
msgid "Automatically hard-wrap commit messages"
msgstr "Samodejno na silo prelomi sporočila uveljavitve"
-#: ../data/org.gnome.meld.gschema.xml.h:58
+#: data/org.gnome.meld.gschema.xml:222
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:59
+#: data/org.gnome.meld.gschema.xml:226
msgid "Version control status filters"
msgstr "Filtri nadzora različic"
-#: ../data/org.gnome.meld.gschema.xml.h:60
+#: data/org.gnome.meld.gschema.xml:227
msgid ""
"List of statuses used to filter visible files in version control comparison."
msgstr ""
-#: ../data/org.gnome.meld.gschema.xml.h:61
+#: data/org.gnome.meld.gschema.xml:241
msgid "Filename-based filters"
msgstr "Filtri poimenovanja datotek"
-#: ../data/org.gnome.meld.gschema.xml.h:62
+#: data/org.gnome.meld.gschema.xml:242
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:63
+#: data/org.gnome.meld.gschema.xml:256
msgid "Text-based filters"
msgstr "Filtri besedila"
-#: ../data/org.gnome.meld.gschema.xml.h:64
+#: data/org.gnome.meld.gschema.xml:257
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, "
"but won’t contribute to the comparison itself."
msgstr ""
-#: ../data/styles/meld-base.xml.h:1
-msgid "Meld base scheme"
-msgstr "Osnovna shema"
+#: data/styles/meld-base.style-scheme.xml.in:1
+msgid "Classic (Meld)"
+msgstr ""
-#: ../data/styles/meld-base.xml.h:2
+#: data/styles/meld-base.style-scheme.xml.in:3
msgid "Base color scheme for Meld highlighting"
msgstr "Osnovna barvna shema za poudarjanje skladnje"
-#: ../data/styles/meld-dark.xml.h:1
+#: data/styles/meld-dark.style-scheme.xml.in:1
msgid "Meld dark scheme"
msgstr "Temna shema"
-#: ../data/styles/meld-dark.xml.h:2
+#: data/styles/meld-dark.style-scheme.xml.in:3
msgid "Dark color scheme for Meld highlighting"
msgstr "Temna barvna shema za poudarjanje skladnje"
-#: ../meld/resources/gtk/help-overlay.ui.h:1
+#: meld/resources/gtk/help-overlay.ui:14
msgctxt "shortcut window"
msgid "General"
msgstr "Splošno"
-#: ../meld/resources/gtk/help-overlay.ui.h:2
+#: meld/resources/gtk/help-overlay.ui:19
msgctxt "shortcut window"
msgid "New comparison"
msgstr "Nova primerjava"
-#: ../meld/resources/gtk/help-overlay.ui.h:3
+#: meld/resources/gtk/help-overlay.ui:26
msgctxt "shortcut window"
msgid "Close a comparison"
msgstr "Zapri primerjavo"
-#: ../meld/resources/gtk/help-overlay.ui.h:4
+#: meld/resources/gtk/help-overlay.ui:33
msgctxt "shortcut window"
msgid "Quit Meld"
msgstr "Končaj program"
-#: ../meld/resources/gtk/help-overlay.ui.h:5
+#: meld/resources/gtk/help-overlay.ui:40
msgctxt "shortcut window"
msgid "Stop the current action"
msgstr "Ustavi trenutno dejanje"
-#: ../meld/resources/gtk/help-overlay.ui.h:6
+#: meld/resources/gtk/help-overlay.ui:47
msgctxt "shortcut window"
msgid "Refresh comparison"
msgstr "Osveži primerjavo"
-#: ../meld/resources/gtk/help-overlay.ui.h:7
+#: meld/resources/gtk/help-overlay.ui:54
msgctxt "shortcut window"
msgid "Fullscreen"
msgstr "Celozaslonski način"
-#: ../meld/resources/gtk/help-overlay.ui.h:8
+#: meld/resources/gtk/help-overlay.ui:63
+msgctxt "shortcut window"
+msgid "Panes"
+msgstr ""
+
+#: meld/resources/gtk/help-overlay.ui:68
+msgctxt "shortcut window"
+msgid "Previous comparison pane"
+msgstr "Predhodno okno primerjave"
+
+#: meld/resources/gtk/help-overlay.ui:75
+msgctxt "shortcut window"
+msgid "Next comparison pane"
+msgstr "Naslednje okno primerjave"
+
+#: meld/resources/gtk/help-overlay.ui:84
+msgctxt "shortcut window"
+msgid "Changes"
+msgstr "Spremembe"
+
+#: meld/resources/gtk/help-overlay.ui:89
+msgctxt "shortcut window"
+msgid "Go to previous change"
+msgstr "Skoči na predhodno spremembo"
+
+#: meld/resources/gtk/help-overlay.ui:96
+msgctxt "shortcut window"
+msgid "Go to next change"
+msgstr "Skoči na naslednjo spremembo"
+
+#: meld/resources/gtk/help-overlay.ui:105
msgctxt "shortcut window"
msgid "Tabs"
msgstr "Zavihki"
-#: ../meld/resources/gtk/help-overlay.ui.h:9
+#: meld/resources/gtk/help-overlay.ui:110
msgctxt "shortcut window"
msgid "Go to previous tab"
msgstr "Skoči na predhodni zavihek"
-#: ../meld/resources/gtk/help-overlay.ui.h:10
+#: meld/resources/gtk/help-overlay.ui:117
msgctxt "shortcut window"
msgid "Go to next tab"
msgstr "Skoči na naslednji zavihek"
-#: ../meld/resources/gtk/help-overlay.ui.h:11
+#: meld/resources/gtk/help-overlay.ui:124
msgctxt "shortcut window"
msgid "Switch to tab"
msgstr "Preklopi na zavihek"
-#: ../meld/resources/gtk/help-overlay.ui.h:12
+#: meld/resources/gtk/help-overlay.ui:131
msgctxt "shortcut window"
msgid "Move tab left"
msgstr "Premakni zavihek levo"
-#: ../meld/resources/gtk/help-overlay.ui.h:13
+#: meld/resources/gtk/help-overlay.ui:138
msgctxt "shortcut window"
msgid "Move tab right"
msgstr "Premakni zavihek desno"
-#: ../meld/resources/gtk/help-overlay.ui.h:14
-msgctxt "shortcut window"
-msgid "Changes"
-msgstr "Spremembe"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:15
-msgctxt "shortcut window"
-msgid "Go to previous change"
-msgstr "Skoči na predhodno spremembo"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:16
-msgctxt "shortcut window"
-msgid "Go to next change"
-msgstr "Skoči na naslednjo spremembo"
-
-#: ../meld/resources/gtk/help-overlay.ui.h:17
+#: meld/resources/gtk/help-overlay.ui:147
msgctxt "shortcut window"
msgid "Editing"
msgstr "Urejanje"
-#: ../meld/resources/gtk/help-overlay.ui.h:18
+#: meld/resources/gtk/help-overlay.ui:152
msgctxt "shortcut window"
msgid "Undo"
msgstr "Razveljavi"
-#: ../meld/resources/gtk/help-overlay.ui.h:19
+#: meld/resources/gtk/help-overlay.ui:159
msgctxt "shortcut window"
msgid "Redo"
msgstr "Ponovi"
-#: ../meld/resources/gtk/help-overlay.ui.h:20
+#: meld/resources/gtk/help-overlay.ui:166
msgctxt "shortcut window"
msgid "Cut"
msgstr "Izreži"
-#: ../meld/resources/gtk/help-overlay.ui.h:21
+#: meld/resources/gtk/help-overlay.ui:173
msgctxt "shortcut window"
msgid "Copy"
msgstr "Kopiraj"
-#: ../meld/resources/gtk/help-overlay.ui.h:22
+#: meld/resources/gtk/help-overlay.ui:180
msgctxt "shortcut window"
msgid "Paste"
msgstr "Prilepi"
-#: ../meld/resources/gtk/help-overlay.ui.h:23
+#: meld/resources/gtk/help-overlay.ui:187
msgctxt "shortcut window"
msgid "Find"
msgstr "Najdi"
-#: ../meld/resources/gtk/help-overlay.ui.h:24
+#: meld/resources/gtk/help-overlay.ui:194
msgctxt "shortcut window"
msgid "Find Next"
msgstr "Najdi naslednje"
-#: ../meld/resources/gtk/help-overlay.ui.h:25
+#: meld/resources/gtk/help-overlay.ui:201
msgctxt "shortcut window"
msgid "Find Previous"
msgstr "Najdi predhodno"
-#: ../meld/resources/gtk/help-overlay.ui.h:26
+#: meld/resources/gtk/help-overlay.ui:208
msgctxt "shortcut window"
msgid "Replace"
msgstr "Zamenjaj"
-#: ../meld/resources/gtk/help-overlay.ui.h:27
+#: meld/resources/gtk/help-overlay.ui:217
msgctxt "shortcut window"
msgid "File comparison"
msgstr "Primerjava datotek"
-#: ../meld/resources/gtk/help-overlay.ui.h:28
+#: meld/resources/gtk/help-overlay.ui:222
msgctxt "shortcut window"
msgid "Save current file"
msgstr "Shrani trenutno datoteko"
-#: ../meld/resources/gtk/help-overlay.ui.h:29
+#: meld/resources/gtk/help-overlay.ui:229
msgctxt "shortcut window"
msgid "Save current file to new path"
msgstr "Shrani trenutni izbor kot novo prednastavitev"
-#: ../meld/resources/gtk/help-overlay.ui.h:30
+#: meld/resources/gtk/help-overlay.ui:236
msgctxt "shortcut window"
msgid "Save all files in comparison"
msgstr "Shrani vse datoteke trenutne primerjave"
-#: ../meld/resources/gtk/help-overlay.ui.h:31
+#: meld/resources/gtk/help-overlay.ui:243
msgctxt "shortcut window"
msgid "Previous conflict"
msgstr "Predhodni spor"
-#: ../meld/resources/gtk/help-overlay.ui.h:32
+#: meld/resources/gtk/help-overlay.ui:250
msgctxt "shortcut window"
msgid "Next conflict"
msgstr "Naslednji spor"
-#: ../meld/resources/gtk/help-overlay.ui.h:33
+#: meld/resources/gtk/help-overlay.ui:257
msgctxt "shortcut window"
msgid "Push change to left"
msgstr "Potisni trenutne spremembe na levo"
-#: ../meld/resources/gtk/help-overlay.ui.h:34
+#: meld/resources/gtk/help-overlay.ui:264
msgctxt "shortcut window"
msgid "Push change to right"
msgstr "Potisni trenutne spremembe na desno"
-#: ../meld/resources/gtk/help-overlay.ui.h:35
+#: meld/resources/gtk/help-overlay.ui:271
msgctxt "shortcut window"
msgid "Pull change from left"
msgstr "Potegni spremembe z leve"
-#: ../meld/resources/gtk/help-overlay.ui.h:36
+#: meld/resources/gtk/help-overlay.ui:278
msgctxt "shortcut window"
msgid "Pull change from right"
msgstr "Potegni spremembe z desne"
-#: ../meld/resources/gtk/help-overlay.ui.h:37
+#: meld/resources/gtk/help-overlay.ui:285
msgctxt "shortcut window"
msgid "Copy change above left"
msgstr "Kopiraj spremembe nad levi del"
-#: ../meld/resources/gtk/help-overlay.ui.h:38
+#: meld/resources/gtk/help-overlay.ui:292
msgctxt "shortcut window"
msgid "Copy change below left"
msgstr "Kopiraj spremembe pod levi del"
-#: ../meld/resources/gtk/help-overlay.ui.h:39
+#: meld/resources/gtk/help-overlay.ui:299
msgctxt "shortcut window"
msgid "Copy change above right"
msgstr "Kopiraj spremembe nad desni del"
-#: ../meld/resources/gtk/help-overlay.ui.h:40
+#: meld/resources/gtk/help-overlay.ui:306
msgctxt "shortcut window"
msgid "Copy change below right"
msgstr "Kopiraj spremembe pod desni del"
-#: ../meld/resources/gtk/help-overlay.ui.h:41
+#: meld/resources/gtk/help-overlay.ui:313
+#: meld/resources/gtk/help-overlay.ui:341
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
+#: meld/resources/gtk/help-overlay.ui:322
msgctxt "shortcut window"
msgid "Folder comparison"
msgstr "Primerjava map"
-#: ../meld/resources/gtk/help-overlay.ui.h:45
+#: meld/resources/gtk/help-overlay.ui:327
msgctxt "shortcut window"
msgid "Copy to left"
msgstr "Kopiraj na levo"
-#: ../meld/resources/gtk/help-overlay.ui.h:46
+#: meld/resources/gtk/help-overlay.ui:334
msgctxt "shortcut window"
msgid "Copy to right"
msgstr "Kopiraj na desno"
-#: ../meld/resources/gtk/help-overlay.ui.h:47
+#: meld/resources/gtk/help-overlay.ui:350
msgctxt "shortcut window"
msgid "Version control comparison"
msgstr "Primerjava nadzora različic"
-#: ../meld/resources/gtk/help-overlay.ui.h:48
+#: meld/resources/gtk/help-overlay.ui:355
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
+#: meld/resources/gtk/help-overlay.ui:362
msgctxt "shortcut window"
msgid "Show/hide console output"
msgstr "Pokaži/Skrij odvod konzole"
-#: ../meld/resources/gtk/menus.ui.h:1
+#: meld/resources/gtk/menus.ui:7
+msgid "Refresh"
+msgstr "Osveži"
+
+#: meld/resources/gtk/menus.ui:12
+msgid "Stop"
+msgstr "Zaustavi"
+
+#: meld/resources/gtk/menus.ui:17
+msgid "Fullscreen"
+msgstr "Celozaslonski način"
+
+#: meld/resources/gtk/menus.ui:26
+msgid "Save As…"
+msgstr "Shrani kot …"
+
+#: meld/resources/gtk/menus.ui:30
+msgid "Save A_ll"
+msgstr "Shrani _vse"
+
+#: meld/resources/gtk/menus.ui:34
+msgid "Revert files…"
+msgstr "Povrni datoteke …"
+
+#: meld/resources/gtk/menus.ui:38
+msgid "Open Externally"
+msgstr "Odpri v zunanjem programu"
+
+#: meld/resources/gtk/menus.ui:45
+msgid "_Find…"
+msgstr "_Najdi …"
+
+#: meld/resources/gtk/menus.ui:49
+msgid "_Replace…"
+msgstr "_Zamenjaj …"
+
+#: meld/resources/gtk/menus.ui:55
+msgid "View"
+msgstr "Pogled"
+
+#: meld/resources/gtk/menus.ui:59
+msgid "Overview Map"
+msgstr "Predogledni zemljevid"
+
+#: meld/resources/gtk/menus.ui:63
+msgid "Version control console"
+msgstr "Konzola nadzora različic"
+
+#: meld/resources/gtk/menus.ui:67
+msgid "Lock scrolling"
+msgstr "Zakleni drsenje"
+
+#: meld/resources/gtk/menus.ui:73
+msgid "Comparison"
+msgstr "Primerjava"
+
+#: meld/resources/gtk/menus.ui:77
+msgid "Merge All from Left"
+msgstr "Združi vse spremembe z leve"
+
+#: meld/resources/gtk/menus.ui:81
+msgid "Merge All from Right"
+msgstr "Združi vse spremembe z desne"
+
+#: meld/resources/gtk/menus.ui:85
+msgid "Merge All"
+msgstr "Združi vse"
+
+#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:54
+msgid "Add Synchronization Point"
+msgstr "Dodaj točko usklajevanja"
+
+#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:58
+msgid "Clear Synchronization Points"
+msgstr "Počisti točke usklajevanja"
+
+#: meld/resources/gtk/menus.ui:103
+msgid "Format as Patch…"
+msgstr "Zapiši kot programski popravek …"
+
+#: meld/resources/gtk/menus.ui:112
msgid "_Preferences"
msgstr "_Možnosti"
-#: ../meld/resources/gtk/menus.ui.h:2
-msgid "_Help"
-msgstr "Pomo_č"
-
-#: ../meld/resources/gtk/menus.ui.h:3
+#: meld/resources/gtk/menus.ui:116
msgid "Keyboard Shortcuts"
msgstr "Tipkovne bližnjice"
-#: ../meld/resources/gtk/menus.ui.h:4
-msgid "_About"
+#: meld/resources/gtk/menus.ui:120
+msgid "_Help"
+msgstr "Pomo_č"
+
+#: meld/resources/gtk/menus.ui:125
+msgid "_About Meld"
msgstr "_O programu"
-#: ../meld/resources/gtk/menus.ui.h:5
-msgid "_Quit"
-msgstr "_Končaj"
+#: meld/resources/gtk/menus.ui:138
+msgid "File status"
+msgstr "Stanje datoteke"
+
+#: meld/resources/gtk/menus.ui:140
+msgid "Same"
+msgstr "Enako"
+
+#: meld/resources/gtk/menus.ui:144
+msgid "New"
+msgstr "Novo"
-#: ../meld/resources/ui/about-dialog.ui.h:1
-msgid "About Meld"
-msgstr "O programu"
+#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
+#: meld/vc/_vc.py:76
+msgid "Modified"
+msgstr "Spremenjeno"
-#: ../meld/resources/ui/about-dialog.ui.h:2
+#: meld/resources/gtk/menus.ui:158
+msgid "Ignore filename case"
+msgstr "Prezri velikost črk v imenih datotek"
+
+#: meld/resources/gtk/menus.ui:171
+msgid "Normal"
+msgstr "Običajno"
+
+#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+msgid "Unversioned"
+msgstr "Brez določene različice"
+
+#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+msgid "Ignored"
+msgstr "Prezrto"
+
+#: meld/resources/gtk/menus.ui:186
+#, fuzzy
+#| msgid "Flatten directories"
+msgid "Flatten folders"
+msgstr "_Razpni mape"
+
+#: meld/resources/ui/about-dialog.ui:8
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2017 Kai Willadsen"
+"Copyright © 2009-2019 Kai Willadsen"
msgstr ""
"Avtorske pravice © 2002-2009 Stephen Kennedy\n"
-"Avtorske pravice © 2009-2018 Kai Willadsen"
-
-#: ../meld/resources/ui/about-dialog.ui.h:4
-msgid "Website"
-msgstr "Spletišče"
+"Avtorske pravice © 2009-2019 Kai Willadsen"
-#: ../meld/resources/ui/about-dialog.ui.h:5
+#: meld/resources/ui/about-dialog.ui:14
msgid "translator-credits"
msgstr "Matej Urbančič <mateju svn gnome org>"
-#: ../meld/resources/ui/column-list.ui.h:1
-#: ../meld/resources/ui/filter-list.ui.h:1
+#: meld/resources/ui/appwindow.ui:29
+msgid "Start a new comparison"
+msgstr "Nova primerjava"
+
+#: meld/resources/ui/appwindow.ui:45
+msgid "Open a recent comparison"
+msgstr "Odpri nedavno primerjavo"
+
+#: meld/resources/ui/appwindow.ui:73
+msgid "Go to the previous change"
+msgstr "Skoči na predhodno spremembo"
+
+#: meld/resources/ui/appwindow.ui:93
+msgid "Go to the next change"
+msgstr "Skoči na naslednjo spremembo"
+
+#: meld/resources/ui/appwindow.ui:123
+msgid "Go to the previous conflict"
+msgstr "Skoči na predhodni niz v sporu"
+
+#: meld/resources/ui/appwindow.ui:143
+msgid "Go to the next conflict"
+msgstr "Skoči na naslednji niz v sporu"
+
+#: meld/resources/ui/appwindow.ui:191
+msgid "Version Filters"
+msgstr "Filtri različice"
+
+#: meld/resources/ui/appwindow.ui:206 meld/resources/ui/preferences.ui:1456
+msgid "File Filters"
+msgstr "Filtri datotek"
+
+#: meld/resources/ui/appwindow.ui:221 meld/resources/ui/preferences.ui:1641
+msgid "Text Filters"
+msgstr "Filtri besedila"
+
+#: meld/resources/ui/column-list.ui:37 meld/resources/ui/filter-list.ui:40
msgid "Active"
msgstr "Dejavno"
-#: ../meld/resources/ui/column-list.ui.h:2
+#: meld/resources/ui/column-list.ui:50
msgid "Column Name"
msgstr "Ime stolpca"
-#: ../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
+#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
+#: meld/resources/ui/vcview-menus.ui:26 meld/vcview.py:736
msgid "_Remove"
msgstr "_Odstrani"
-#: ../meld/resources/ui/column-list.ui.h:4
-#: ../meld/resources/ui/filter-list.ui.h:8
+#: meld/resources/ui/column-list.ui:96 meld/resources/ui/filter-list.ui:152
msgid "Move item up"
msgstr "Premakni predmet navzgor"
-#: ../meld/resources/ui/column-list.ui.h:5
-#: ../meld/resources/ui/filter-list.ui.h:9
+#: meld/resources/ui/column-list.ui:98 meld/resources/ui/filter-list.ui:154
msgid "Move _Up"
msgstr "Premakni _navzgor"
-#: ../meld/resources/ui/column-list.ui.h:6
-#: ../meld/resources/ui/filter-list.ui.h:10
+#: meld/resources/ui/column-list.ui:112 meld/resources/ui/filter-list.ui:168
msgid "Move item down"
msgstr "Premakni predmet navzdol"
-#: ../meld/resources/ui/column-list.ui.h:7
-#: ../meld/resources/ui/filter-list.ui.h:11
+#: meld/resources/ui/column-list.ui:114 meld/resources/ui/filter-list.ui:170
msgid "Move _Down"
msgstr "Premakni navz_dol"
-#: ../meld/resources/ui/commit-dialog.ui.h:1
+#: meld/resources/ui/commit-dialog.ui:8
msgid "Commit"
msgstr "Uveljavi"
-#: ../meld/resources/ui/commit-dialog.ui.h:2
+#: meld/resources/ui/commit-dialog.ui:36
msgid "Commit Files"
msgstr "Uveljavi datoteke"
-#: ../meld/resources/ui/commit-dialog.ui.h:3
+#: meld/resources/ui/commit-dialog.ui:117
msgid "Log Message"
msgstr "Sporočilo beleženja"
-#: ../meld/resources/ui/commit-dialog.ui.h:4
+#: meld/resources/ui/commit-dialog.ui:181
msgid "Previous logs:"
msgstr "Predhodni dnevniki:"
-#: ../meld/resources/ui/commit-dialog.ui.h:5
+#: meld/resources/ui/commit-dialog.ui:259
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
+#: meld/resources/ui/dirdiff-actions.ui:20
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
+#: meld/resources/ui/dirdiff-actions.ui:42
msgid "Copy to right"
msgstr "Kopiraj na desno"
-#: ../meld/resources/ui/dirdiff.ui.h:11
+#: meld/resources/ui/dirdiff-actions.ui:66
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-menus.ui:7
+msgid "_Compare selected files"
+msgstr "_Primerjaj izbrane datoteke"
-#: ../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"
-
-#: ../meld/resources/ui/dirdiff.ui.h:17
-msgid "Show identical"
-msgstr "Pokaži enako"
+#: meld/resources/ui/dirdiff-menus.ui:14
+msgid "Copy to _left"
+msgstr "Kopiraj na _levo"
-#: ../meld/resources/ui/dirdiff.ui.h:18
-msgid "New"
-msgstr "Novo"
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Copy to _right"
+msgstr "Kopiraj na _desno"
-#: ../meld/resources/ui/dirdiff.ui.h:19
-msgid "Show new"
-msgstr "Pokaži novejše"
+#: meld/resources/ui/dirdiff-menus.ui:22
+msgid "_Delete selected"
+msgstr "_Izbriši izbrano"
-#: ../meld/resources/ui/dirdiff.ui.h:20 ../meld/vc/_vc.py:77
-msgid "Modified"
-msgstr "Spremenjeno"
+#: meld/resources/ui/dirdiff-menus.ui:29
+msgid "Collapse Recursively"
+msgstr "Zloži"
-#: ../meld/resources/ui/dirdiff.ui.h:21
-msgid "Show modified"
-msgstr "Pokaži spremenjeno"
+#: meld/resources/ui/dirdiff-menus.ui:33
+msgid "Expand Recursively"
+msgstr "Razširi"
-#: ../meld/resources/ui/dirdiff.ui.h:22
-msgid "Filters"
-msgstr "Filtri"
+#: meld/resources/ui/dirdiff-menus.ui:40
+msgid "_Open Externally"
+msgstr "_Odpri v zunanjem programu"
-#: ../meld/resources/ui/dirdiff.ui.h:23
-msgid "Set active filters"
-msgstr "Določi dejavne filtre"
+#: meld/resources/ui/dirdiff-menus.ui:44
+msgid "_Copy File Paths"
+msgstr "_Kopiraj poti datoteke"
-#: ../meld/resources/ui/encoding-selector.ui.h:1
+#: meld/resources/ui/encoding-selector.ui:31
msgid "Search text encoding…"
-msgstr ""
-
-#: ../meld/resources/ui/filediff.ui.h:1
-msgid "Format as Patch…"
-msgstr "Zapiši kot programski popravek ..."
+msgstr "Iskanje kodiranja besedila …"
-#: ../meld/resources/ui/filediff.ui.h:2
-msgid "Create a patch using differences between files"
-msgstr "Ustvari popravek z razlikovanjem med datotekami"
-
-#: ../meld/resources/ui/filediff.ui.h:3
-msgid "Save A_ll"
-msgstr "Shrani _vse"
-
-#: ../meld/resources/ui/filediff.ui.h:4
-msgid "Save all files in the current comparison"
-msgstr "Shrani vse datoteke trenutne primerjave"
-
-#: ../meld/resources/ui/filediff.ui.h:5
-msgid "Revert files to their saved versions"
-msgstr "Povrni datoteke na shranjene različice"
-
-#: ../meld/resources/ui/filediff.ui.h:6
-msgid "Add Synchronization Point"
-msgstr "Dodaj točko usklajevanja"
-
-#: ../meld/resources/ui/filediff.ui.h:7
-msgid "Add a synchronization point for changes between files"
-msgstr ""
-
-#: ../meld/resources/ui/filediff.ui.h:8
-msgid "Clear Synchronization Points"
-msgstr "Počisti točke usklajevanja"
-
-#: ../meld/resources/ui/filediff.ui.h:9
-msgid "Clear sychronization points for changes between files"
-msgstr ""
-
-#: ../meld/resources/ui/filediff.ui.h:10
-msgid "Previous Conflict"
-msgstr "Predhodni spor"
-
-#: ../meld/resources/ui/filediff.ui.h:11
-msgid "Go to the previous conflict"
-msgstr "Skoči na predhodni niz v sporu"
-
-#: ../meld/resources/ui/filediff.ui.h:12
-msgid "Next Conflict"
-msgstr "Naslednji spor"
-
-#: ../meld/resources/ui/filediff.ui.h:13
-msgid "Go to the next conflict"
-msgstr "Skoči na naslednji niz v sporu"
-
-#: ../meld/resources/ui/filediff.ui.h:14
-msgid "Push to Left"
-msgstr "Potisni levo"
-
-#: ../meld/resources/ui/filediff.ui.h:15
+#: meld/resources/ui/filediff-actions.ui:20
msgid "Push current change to the left"
msgstr "Potisni trenutne spremembe na levo"
-#: ../meld/resources/ui/filediff.ui.h:16
-msgid "Push to Right"
-msgstr "Potisni desno"
-
-#: ../meld/resources/ui/filediff.ui.h:17
+#: meld/resources/ui/filediff-actions.ui:42
msgid "Push current change to the right"
msgstr "Potisni trenutne spremembe na desno"
-#: ../meld/resources/ui/filediff.ui.h:18
-msgid "Pull from Left"
-msgstr "Potegni z leve"
-
-#: ../meld/resources/ui/filediff.ui.h:19
-msgid "Pull change from the left"
-msgstr "Potegni spremembe z leve"
-
-#: ../meld/resources/ui/filediff.ui.h:20
-msgid "Pull from Right"
-msgstr "Potegni z desne"
-
-#: ../meld/resources/ui/filediff.ui.h:21
-msgid "Pull change from the right"
-msgstr "Potegni spremembe z desne"
+#: meld/resources/ui/filediff-actions.ui:65
+#, fuzzy
+#| msgid "Copy _up"
+msgid "Copy chunks"
+msgstr "Kopiraj _navzgor"
-#: ../meld/resources/ui/filediff.ui.h:22
-msgid "Copy Above Left"
-msgstr "Kopiraj nad levo"
+#: meld/resources/ui/filediff-actions.ui:87
+msgid "Delete change"
+msgstr "Izbriši spremembo"
-#: ../meld/resources/ui/filediff.ui.h:23
+#: meld/resources/ui/filediff-menus.ui:7
msgid "Copy change above the left chunk"
msgstr "Kopiraj spremembe nad levi del"
-#: ../meld/resources/ui/filediff.ui.h:24
-msgid "Copy Below Left"
-msgstr "Kopiraj pod levo"
-
-#: ../meld/resources/ui/filediff.ui.h:25
+#: meld/resources/ui/filediff-menus.ui:11
msgid "Copy change below the left chunk"
msgstr "Kopiraj spremembe pod levi del"
-#: ../meld/resources/ui/filediff.ui.h:26
-msgid "Copy Above Right"
-msgstr "Kopiraj nad desno"
-
-#: ../meld/resources/ui/filediff.ui.h:27
+#: meld/resources/ui/filediff-menus.ui:15
msgid "Copy change above the right chunk"
msgstr "Kopiraj spremembe nad desni del"
-#: ../meld/resources/ui/filediff.ui.h:28
-msgid "Copy Below Right"
-msgstr "Kopiraj pod desno"
-
-#: ../meld/resources/ui/filediff.ui.h:29
+#: meld/resources/ui/filediff-menus.ui:19
msgid "Copy change below the right chunk"
msgstr "Kopiraj spremembe pod desni del"
-#: ../meld/resources/ui/filediff.ui.h:30
-msgid "Delete"
-msgstr "Izbriši"
+#: meld/resources/ui/filediff-menus.ui:28
+msgid "_Undo"
+msgstr "_Razveljavi"
-#: ../meld/resources/ui/filediff.ui.h:31
-msgid "Delete change"
-msgstr "Izbriši spremembo"
+#: meld/resources/ui/filediff-menus.ui:32
+msgid "_Redo"
+msgstr "_Ponovno uveljavi"
-#: ../meld/resources/ui/filediff.ui.h:32
-msgid "Merge All from Left"
-msgstr "Združi vse spremembe z leve"
-
-#: ../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"
-
-#: ../meld/resources/ui/filediff.ui.h:34
-msgid "Merge All from Right"
-msgstr "Združi vse spremembe z desne"
-
-#: ../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"
-
-#: ../meld/resources/ui/filediff.ui.h:36
-msgid "Merge All"
-msgstr "Združi vse"
+#: meld/resources/ui/filediff-menus.ui:39
+msgid "Cu_t"
+msgstr "Iz_reži"
-#: ../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"
+#: meld/resources/ui/filediff-menus.ui:43
+msgid "_Copy"
+msgstr "_Kopiraj"
-#: ../meld/resources/ui/filediff.ui.h:38
-msgid "Previous Pane"
-msgstr "Predhodno okno"
+#: meld/resources/ui/filediff-menus.ui:47
+msgid "_Paste"
+msgstr "Pr_ilepi"
-#: ../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"
-
-#: ../meld/resources/ui/filediff.ui.h:40
-msgid "Next Pane"
-msgstr "Naslednje okno"
-
-#: ../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"
-
-#: ../meld/resources/ui/filediff.ui.h:42
-msgid "Lock Scrolling"
-msgstr "Zakleni drsenje"
-
-#: ../meld/resources/ui/filediff.ui.h:43
-msgid "Lock scrolling of all panes"
-msgstr "Zakleni drsenje vseh pladnjev"
-
-#: ../meld/resources/ui/filediff.ui.h:44
+#: meld/resources/ui/filediff.ui:33 meld/resources/ui/filediff.ui:102
+#: meld/resources/ui/filediff.ui:171
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."
@@ -1063,311 +1013,320 @@ msgstr ""
"in vsebino spreminjate, vendar pa je treba spremembe shraniti v datoteko z "
"drugim imenom."
-#: ../meld/resources/ui/filediff.ui.h:45
+#: meld/resources/ui/filediff.ui:47 meld/resources/ui/filediff.ui:116
+#: meld/resources/ui/filediff.ui:185
+msgid "Open file in this pane"
+msgstr "Odpri datoteko v tem oknu"
+
+#: meld/resources/ui/filediff.ui:56 meld/resources/ui/filediff.ui:125
+#: meld/resources/ui/filediff.ui:194
+msgid "Save file in this pane"
+msgstr "Shrani datoteko v tem oknu"
+
+#: meld/resources/ui/filediff.ui:73
msgid "File 3"
msgstr "Datoteka 3"
-#: ../meld/resources/ui/filediff.ui.h:46
+#: meld/resources/ui/filediff.ui:142
msgid "File 2"
msgstr "Datoteka 2"
-#: ../meld/resources/ui/filediff.ui.h:47
+#: meld/resources/ui/filediff.ui:207
msgid "File 1"
msgstr "Datoteka 1"
#. Create icon and filename CellRenderer
-#: ../meld/resources/ui/filter-list.ui.h:2 ../meld/resources/ui/vcview.ui.h:30
-#: ../meld/dirdiff.py:455
+#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
+#: meld/dirdiff.py:509
msgid "Name"
msgstr "Ime"
-#: ../meld/resources/ui/filter-list.ui.h:3
+#: meld/resources/ui/filter-list.ui:68
msgid "Pattern"
msgstr "Vzorec"
-#: ../meld/resources/ui/filter-list.ui.h:4
+#: meld/resources/ui/filter-list.ui:110
msgid "Add new filter"
msgstr "Dodaj nov filter"
-#: ../meld/resources/ui/filter-list.ui.h:5 ../meld/resources/ui/vcview.ui.h:9
+#: meld/resources/ui/filter-list.ui:112 meld/resources/ui/vcview-menus.ui:22
msgid "_Add"
msgstr "_Dodaj"
-#: ../meld/resources/ui/filter-list.ui.h:6
+#: meld/resources/ui/filter-list.ui:126
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"
-
-#: ../meld/resources/ui/findbar.ui.h:2
-msgid "Replace _All"
-msgstr "Zamenjaj _vse"
-
-#: ../meld/resources/ui/findbar.ui.h:3
-msgid "_Previous"
-msgstr "_Predhodni"
-
-#: ../meld/resources/ui/findbar.ui.h:4
-msgid "_Next"
-msgstr "_Naslednji"
-
-#: ../meld/resources/ui/findbar.ui.h:5
-msgid "Find:"
-msgstr "Najdi:"
-
-#: ../meld/resources/ui/findbar.ui.h:6
-msgid "Replace _with:"
-msgstr "Zamenjaj _z:"
-
-#: ../meld/resources/ui/findbar.ui.h:7
+#: meld/resources/ui/findbar.ui:103
msgid "_Match case"
msgstr "_Upoštevaj velikost črk"
-#: ../meld/resources/ui/findbar.ui.h:8
+#: meld/resources/ui/findbar.ui:119
msgid "Who_le word"
msgstr "Cele _besede"
-#: ../meld/resources/ui/findbar.ui.h:9
+#: meld/resources/ui/findbar.ui:135
msgid "Regular e_xpression"
msgstr "_Logični izraz"
-#: ../meld/resources/ui/findbar.ui.h:10
+#: meld/resources/ui/findbar.ui:175
msgid "Wrapped"
msgstr "Prelomljeno"
-#: ../meld/resources/ui/language-selector.ui.h:1
+#: meld/resources/ui/findbar.ui:193
+msgid "Replace _All"
+msgstr "Zamenjaj _vse"
+
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1042 meld/iohelpers.py:115
+msgid "_Replace"
+msgstr "_Zamenjaj"
+
+#: meld/resources/ui/findbar.ui:226
+msgid "Switch between Find and Find-and-Replace"
+msgstr ""
+
+#: meld/resources/ui/language-selector.ui:31
msgid "Search highlight mode…"
msgstr ""
-#: ../meld/resources/ui/new-diff-tab.ui.h:1 ../meld/meldwindow.py:532
-#: ../meld/newdifftab.py:53
+#: meld/resources/ui/new-diff-tab.ui:119 meld/meldwindow.py:345
+#: meld/newdifftab.py:49
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:171
+msgid "File"
+msgstr "Datoteka"
-#: ../meld/resources/ui/new-diff-tab.ui.h:3
-msgid "Directory comparison"
-msgstr "Primerjava vsebine map"
+#: meld/resources/ui/new-diff-tab.ui:220
+msgid "Folder"
+msgstr "Mapa"
-#: ../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:269
+msgid "Version control"
+msgstr "Nadzor različic"
-#: ../meld/resources/ui/new-diff-tab.ui.h:5
+#: meld/resources/ui/new-diff-tab.ui:334 meld/resources/ui/new-diff-tab.ui:454
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:353
+msgid "Select First File"
+msgstr "Izbor prve datoteke"
-#: ../meld/resources/ui/new-diff-tab.ui.h:7
+#: meld/resources/ui/new-diff-tab.ui:367
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:383
+msgid "Select Third File"
+msgstr "Izbor tretje datoteke"
-#: ../meld/resources/ui/new-diff-tab.ui.h:9
+#: meld/resources/ui/new-diff-tab.ui:418
msgid "Select First Folder"
msgstr "Izbor prve mape"
-#: ../meld/resources/ui/new-diff-tab.ui.h:10
+#: meld/resources/ui/new-diff-tab.ui:431
msgid "Select Second Folder"
msgstr "Izbor druge mape"
-#: ../meld/resources/ui/new-diff-tab.ui.h:11
+#: meld/resources/ui/new-diff-tab.ui:445
msgid "Select Third Folder"
msgstr "Izbor tretje mape"
-#: ../meld/resources/ui/new-diff-tab.ui.h:12
+#: meld/resources/ui/new-diff-tab.ui:495
msgid "Select A Version-Controlled Folder"
msgstr "Izbor mape nadzora različic"
-#: ../meld/resources/ui/new-diff-tab.ui.h:13
+#: meld/resources/ui/new-diff-tab.ui:544
msgid "_Blank comparison"
msgstr "_Prazna primerjava"
-#: ../meld/resources/ui/new-diff-tab.ui.h:14
+#: meld/resources/ui/new-diff-tab.ui:561
msgid "C_ompare"
msgstr "_Primerjava"
-#: ../meld/resources/ui/notebook-label.ui.h:1
+#: meld/resources/ui/notebook-label.ui:24
msgid "Close Tab"
msgstr "Zapri zavihek"
-#: ../meld/resources/ui/patch-dialog.ui.h:1
+#: meld/resources/ui/patch-dialog.ui:9
msgid "Format as Patch"
msgstr "Oblikuj kot popravek"
-#: ../meld/resources/ui/patch-dialog.ui.h:2
+#: meld/resources/ui/patch-dialog.ui:26
msgid "Copy to Clipboard"
msgstr "Kopiraj v odložišče"
-#: ../meld/resources/ui/patch-dialog.ui.h:3 ../meld/patchdialog.py:165
+#: meld/resources/ui/patch-dialog.ui:57 meld/patchdialog.py:159
msgid "Save Patch"
msgstr "Shrani popravek"
-#: ../meld/resources/ui/patch-dialog.ui.h:4
+#: meld/resources/ui/patch-dialog.ui:88
msgid "Use differences between:"
msgstr "Uporabi razlike med:"
-#: ../meld/resources/ui/patch-dialog.ui.h:5
+#: meld/resources/ui/patch-dialog.ui:105
msgid "Left and middle panes"
msgstr "Levi in srednji pladenj"
-#: ../meld/resources/ui/patch-dialog.ui.h:6
+#: meld/resources/ui/patch-dialog.ui:123
msgid "Middle and right panes"
msgstr "Srednji in desni pladenj"
-#: ../meld/resources/ui/patch-dialog.ui.h:7
+#: meld/resources/ui/patch-dialog.ui:149
msgid "_Reverse patch direction"
msgstr "Obrni smer popravka"
-#: ../meld/resources/ui/preferences.ui.h:1
+#: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31
msgid "Preferences"
msgstr "Možnosti"
-#: ../meld/resources/ui/preferences.ui.h:2
+#: meld/resources/ui/preferences.ui:75
msgid "Font"
msgstr "Pisava"
-#: ../meld/resources/ui/preferences.ui.h:3
+#: meld/resources/ui/preferences.ui:112
msgid "_Use the system fixed width font"
msgstr "_Uporabi sistemsko pisavo določene širine"
-#: ../meld/resources/ui/preferences.ui.h:4
+#: meld/resources/ui/preferences.ui:136
msgid "_Editor font:"
msgstr "Pisava _urejevalnika:"
#. 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
+#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:288
msgid "Display"
msgstr "Prikaz"
-#: ../meld/resources/ui/preferences.ui.h:6
+#: meld/resources/ui/preferences.ui:241
msgid "_Tab width:"
msgstr "Širina _tabulatorja:"
-#: ../meld/resources/ui/preferences.ui.h:7
+#: meld/resources/ui/preferences.ui:274
msgid "_Insert spaces instead of tabs"
msgstr "Vstavi _presledke namesto tabulatorjev"
-#: ../meld/resources/ui/preferences.ui.h:8
+#: meld/resources/ui/preferences.ui:290
msgid "Enable text _wrapping"
msgstr "Omogoči _prelom besedila"
-#: ../meld/resources/ui/preferences.ui.h:9
+#: meld/resources/ui/preferences.ui:312
msgid "Do not _split words over two lines"
msgstr "Ne _deli besed preko dveh vrstic"
-#: ../meld/resources/ui/preferences.ui.h:10
+#: meld/resources/ui/preferences.ui:333
msgid "Highlight _current line"
msgstr "Poudari _trenutno vrstico"
-#: ../meld/resources/ui/preferences.ui.h:11
+#: meld/resources/ui/preferences.ui:349
msgid "Show _line numbers"
msgstr "Pokaži _številke vrstic"
-#: ../meld/resources/ui/preferences.ui.h:12
+#: meld/resources/ui/preferences.ui:365
msgid "Show w_hitespace"
msgstr "Pokaži _presledne znake"
-#: ../meld/resources/ui/preferences.ui.h:13
+#: meld/resources/ui/preferences.ui:381
msgid "Use s_yntax highlighting"
msgstr "Uporabi _barvno poudarjanje skladnje"
-#: ../meld/resources/ui/preferences.ui.h:14
+#: meld/resources/ui/preferences.ui:404
msgid "Syntax highlighting color scheme:"
msgstr "Barvna shema poudarjanja skladnje:"
-#: ../meld/resources/ui/preferences.ui.h:15
+#: meld/resources/ui/preferences.ui:469
+msgid "Code Overview"
+msgstr "Pregled kode"
+
+#: meld/resources/ui/preferences.ui:506
+msgid "Show overview map"
+msgstr "Pokaži predogledni zemljevid"
+
+#: meld/resources/ui/preferences.ui:529
+msgid "Overview map style:"
+msgstr "Slog predoglednega zemljevida:"
+
+#: meld/resources/ui/preferences.ui:596
msgid "External Editor"
msgstr "Zunanji urejevalnik"
-#: ../meld/resources/ui/preferences.ui.h:16
+#: meld/resources/ui/preferences.ui:632
msgid "Use _default system editor"
-msgstr "Uporabi _privzet sistemski urejevalnik besedil."
+msgstr "Uporabi _privzet sistemski urejevalnik besedil"
-#: ../meld/resources/ui/preferences.ui.h:17
+#: meld/resources/ui/preferences.ui:655
msgid "Edito_r command:"
msgstr "Ukaz _urejevalnika:"
-#: ../meld/resources/ui/preferences.ui.h:18
+#: meld/resources/ui/preferences.ui:711
msgid "Editor"
msgstr "Urejevalnik"
-#: ../meld/resources/ui/preferences.ui.h:19
+#: meld/resources/ui/preferences.ui:732
msgid "Shallow Comparison"
msgstr "Groba primerjava"
-#: ../meld/resources/ui/preferences.ui.h:20
+#: meld/resources/ui/preferences.ui:768
msgid "C_ompare files based only on size and timestamp"
msgstr "_Primerjaj datoteke na osnovi velikosti in časovnega žiga"
-#: ../meld/resources/ui/preferences.ui.h:21
+#: meld/resources/ui/preferences.ui:791
msgid "_Timestamp resolution:"
msgstr "Ločljivost časovnega _žiga:"
-#: ../meld/resources/ui/preferences.ui.h:23
+#: meld/resources/ui/preferences.ui:855
msgid "Note: enabling text filters may make comparing large files much slower"
msgstr ""
-#: ../meld/resources/ui/preferences.ui.h:24
+#: meld/resources/ui/preferences.ui:904
msgid "Symbolic Links"
msgstr "Simbolne povezave"
-#: ../meld/resources/ui/preferences.ui.h:26
+#: meld/resources/ui/preferences.ui:972
msgid "Visible Columns"
msgstr "Vidni stolpci"
-#: ../meld/resources/ui/preferences.ui.h:27
+#: meld/resources/ui/preferences.ui:1039
msgid "Folder Comparisons"
msgstr "Primerjava map"
-#: ../meld/resources/ui/preferences.ui.h:28
+#: meld/resources/ui/preferences.ui:1061
msgid "Version Comparisons"
msgstr "Primerjave različic"
-#: ../meld/resources/ui/preferences.ui.h:29
+#: meld/resources/ui/preferences.ui:1104
#, fuzzy
msgid "_Order when comparing file revisions:"
msgstr "_Med primerjavo predelav datotek"
-#: ../meld/resources/ui/preferences.ui.h:30
+#: meld/resources/ui/preferences.ui:1151
#, fuzzy
msgid "Order when _merging files:"
msgstr "[%s] Združevanje datotek"
-#: ../meld/resources/ui/preferences.ui.h:31
+#: meld/resources/ui/preferences.ui:1219
msgid "Commit Messages"
msgstr "Uveljavi sporočila"
-#: ../meld/resources/ui/preferences.ui.h:32
+#: meld/resources/ui/preferences.ui:1260
msgid "Show _right margin at:"
msgstr "Pokaži _desni rob pri:"
-#: ../meld/resources/ui/preferences.ui.h:33
+#: meld/resources/ui/preferences.ui:1301
msgid "Automatically _break lines at right margin on commit"
msgstr "Samodejno _prelomi vrstice na desnem robu ob uveljavitvi"
-#: ../meld/resources/ui/preferences.ui.h:34
+#: meld/resources/ui/preferences.ui:1351
msgid "Version Control"
msgstr "Nadzor različic"
-#: ../meld/resources/ui/preferences.ui.h:35
+#: meld/resources/ui/preferences.ui:1373
msgid "Filename filters"
msgstr "Datotečni filtri"
-#: ../meld/resources/ui/preferences.ui.h:36
+#: meld/resources/ui/preferences.ui:1411
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -1377,24 +1336,20 @@ msgstr ""
"vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), ločenimi s "
"presledki."
-#: ../meld/resources/ui/preferences.ui.h:37 ../meld/meldwindow.py:114
-msgid "File Filters"
-msgstr "Filtri datotek"
-
-#: ../meld/resources/ui/preferences.ui.h:38
+#: meld/resources/ui/preferences.ui:1478
#, fuzzy
msgid "Change trimming"
msgstr "Spremeni _v:"
-#: ../meld/resources/ui/preferences.ui.h:39
+#: meld/resources/ui/preferences.ui:1514
msgid "Trim blank line differences from the start and end of changes"
msgstr ""
-#: ../meld/resources/ui/preferences.ui.h:40
+#: meld/resources/ui/preferences.ui:1558
msgid "Text filters"
msgstr "Filtri besedila"
-#: ../meld/resources/ui/preferences.ui.h:41
+#: meld/resources/ui/preferences.ui:1596
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -1408,307 +1363,311 @@ msgstr ""
"izraz vključuje skupine, so zamenjane le te. Več podrobnosti je zapisanih v "
"priročniku."
-#: ../meld/resources/ui/preferences.ui.h:42
-msgid "Text Filters"
-msgstr "Filtri besedila"
-
-#: ../meld/resources/ui/preferences.ui.h:43
+#: meld/resources/ui/preferences.ui:1687
msgid "Left is remote, right is local"
msgstr "Levo je oddaljeno, desno krajevno"
-#: ../meld/resources/ui/preferences.ui.h:44
+#: meld/resources/ui/preferences.ui:1691
msgid "Left is local, right is remote"
msgstr "Levo je krajevno, desno oddaljeno"
-#: ../meld/resources/ui/preferences.ui.h:45
+#: meld/resources/ui/preferences.ui:1705
+#, fuzzy
+#| msgid "Delete change"
+msgid "Simple change map"
+msgstr "Izbriši spremembo"
+
+#: meld/resources/ui/preferences.ui:1709
+msgid "Compact source map"
+msgstr ""
+
+#: meld/resources/ui/preferences.ui:1713
+msgid "Full source map"
+msgstr ""
+
+#: meld/resources/ui/preferences.ui:1727
msgid "Remote, merge, local"
msgstr "Oddaljeno, združi, krajevno"
-#: ../meld/resources/ui/preferences.ui.h:46
+#: meld/resources/ui/preferences.ui:1731
msgid "Local, merge, remote"
msgstr "Krajevno, združi, oddaljeno"
-#: ../meld/resources/ui/preferences.ui.h:47
+#: meld/resources/ui/preferences.ui:1753
msgid "1ns (ext4)"
msgstr "1ns (ext4)"
-#: ../meld/resources/ui/preferences.ui.h:48
+#: meld/resources/ui/preferences.ui:1757
msgid "100ns (NTFS)"
msgstr "100ns (NTFS)"
-#: ../meld/resources/ui/preferences.ui.h:49
+#: meld/resources/ui/preferences.ui:1761
msgid "1s (ext2/ext3)"
msgstr "1s (ext2/ext3)"
-#: ../meld/resources/ui/preferences.ui.h:50
+#: meld/resources/ui/preferences.ui:1765
msgid "2s (VFAT)"
msgstr "2s (VFAT)"
-#: ../meld/resources/ui/push-dialog.ui.h:1
+#: meld/resources/ui/push-dialog.ui:9
msgid "Push local commits to remote?"
msgstr "Ali naj se objavijo krajevne uveljavitve v oddaljeno skladišče?"
-#: ../meld/resources/ui/push-dialog.ui.h:2
+#: meld/resources/ui/push-dialog.ui:10
msgid "The commits to be pushed are determined by your version control system."
msgstr "Uveljavitve za objavo določa sistem za nadzor različic."
-#: ../meld/resources/ui/push-dialog.ui.h:3
+#: meld/resources/ui/push-dialog.ui:38
msgid "_Push commits"
msgstr "_Objavi uveljavitve"
-#: ../meld/resources/ui/revert-dialog.ui.h:1
+#: meld/resources/ui/recent-selector.ui:16
+#, fuzzy
+#| msgid "Search text encoding…"
+msgid "Search recent comparisons…"
+msgstr "Iskanje kodiranja besedila …"
+
+#: meld/resources/ui/revert-dialog.ui:9
#, fuzzy
#| msgid "Revert unsaved changes to documents?"
msgid "Discard unsaved changes to documents?"
msgstr "Ali naj se povrnejo neshranjene spremembe dokumentov?"
-#: ../meld/resources/ui/revert-dialog.ui.h:2
+#: meld/resources/ui/revert-dialog.ui:10
#, 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/revert-dialog.ui.h:3
+#: meld/resources/ui/revert-dialog.ui:39
msgid "_Discard"
msgstr "_Zavrzi"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:1
+#: meld/resources/ui/save-confirm-dialog.ui:9
msgid "Save changes to documents before closing?"
msgstr "Ali želite shraniti spremembe dokumenta pred zapiranjem?"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:2
+#: meld/resources/ui/save-confirm-dialog.ui:10
msgid "If you don’t save, changes will be permanently lost."
msgstr "V kolikor sprememb ne shranite, bodo te trajno izgubljene."
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:3
+#: meld/resources/ui/save-confirm-dialog.ui:24
msgid "Close _without Saving"
msgstr "Zapri _brez shranjevanja"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:4 ../meld/dirdiff.py:1040
-#: ../meld/iohelpers.py:58 ../meld/iohelpers.py:112
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1041
+#: meld/iohelpers.py:56 meld/iohelpers.py:114
msgid "_Cancel"
msgstr "_Prekliči"
-#: ../meld/resources/ui/save-confirm-dialog.ui.h:5
-msgid "_Save"
-msgstr "_Shrani"
+#: meld/resources/ui/save-confirm-dialog.ui:52
+msgid "_Save"
+msgstr "_Shrani"
+
+#: meld/resources/ui/statusbar-menu.ui:9
+msgid "Show whitespace"
+msgstr "Pokaži presledne znake"
+
+#: meld/resources/ui/statusbar-menu.ui:17
+msgid "Text wrapping"
+msgstr "Prelom besedila"
+
+#: meld/resources/ui/vcview-menus.ui:7
+msgid "_Compare"
+msgstr "_Primerjava"
+
+#: meld/resources/ui/vcview-menus.ui:11
+msgid "Co_mmit…"
+msgstr "U_veljavi …"
+
+#: meld/resources/ui/vcview-menus.ui:15
+msgid "_Update"
+msgstr "_Posodobi"
+
+#: meld/resources/ui/vcview-menus.ui:30
+msgid "Re_vert"
+msgstr "Po&vrni"
-#: ../meld/resources/ui/statusbar-menu.ui.h:2
-#, fuzzy
-#| msgid "Show w_hitespace"
-msgid "Show whitespace"
-msgstr "Pokaži _presledne znake"
+#: meld/resources/ui/vcview-menus.ui:34 meld/resources/ui/vcview.ui:164
+msgid "Delete"
+msgstr "Izbriši"
-#: ../meld/resources/ui/statusbar-menu.ui.h:4
-msgid "Text wrapping"
-msgstr "Prelom besedila"
+#: meld/resources/ui/vcview-menus.ui:41
+msgid "Mar_k as Resolved"
+msgstr "Označi kot _razrešeno"
-#: ../meld/resources/ui/vcview.ui.h:3
-msgid "Co_mmit…"
-msgstr "U_veljavi ..."
+#: meld/resources/ui/vcview.ui:73
+msgid "Commit…"
+msgstr "Uveljavi …"
-#: ../meld/resources/ui/vcview.ui.h:4
+#: meld/resources/ui/vcview.ui:74
msgid "Commit changes to version control"
msgstr "Uveljavi spremembe v sistem za nadzor različic"
-#: ../meld/resources/ui/vcview.ui.h:5
-msgid "_Update"
-msgstr "_Posodobi"
+#: meld/resources/ui/vcview.ui:86
+msgid "Update"
+msgstr "Posodobi"
-#: ../meld/resources/ui/vcview.ui.h:6
+#: meld/resources/ui/vcview.ui:87
msgid "Update working copy from version control"
msgstr "Posodobi delovno kopijo preko nadzora različic"
-#: ../meld/resources/ui/vcview.ui.h:7
-msgid "_Push"
-msgstr "_Objavi"
+#: meld/resources/ui/vcview.ui:99
+msgid "Push"
+msgstr "Objavi"
-#: ../meld/resources/ui/vcview.ui.h:8
+#: meld/resources/ui/vcview.ui:100
msgid "Push local changes to remote"
msgstr "Objavi spremembe v oddaljeno skladišče"
-#: ../meld/resources/ui/vcview.ui.h:10
+#: meld/resources/ui/vcview.ui:112
+msgid "Add"
+msgstr "Dodaj"
+
+#: meld/resources/ui/vcview.ui:113
msgid "Add to version control"
msgstr "Dodaj v sistem nadzora različic"
-#: ../meld/resources/ui/vcview.ui.h:12
+#: meld/resources/ui/vcview.ui:125
+msgid "Remove"
+msgstr "Odstrani"
+
+#: meld/resources/ui/vcview.ui:126
msgid "Remove from version control"
msgstr "Odstrani iz sistema nadzora različic"
-#: ../meld/resources/ui/vcview.ui.h:13
-msgid "Mar_k as Resolved"
-msgstr "Označi kot _razrešeno"
+#: meld/resources/ui/vcview.ui:138
+msgid "Mark as Resolved"
+msgstr "Označi kot razrešeno"
-#: ../meld/resources/ui/vcview.ui.h:14
+#: meld/resources/ui/vcview.ui:139
msgid "Mark as resolved in version control"
msgstr "Označi kot razrešeno v sistemu nadzora različic"
-#: ../meld/resources/ui/vcview.ui.h:15
-msgid "Re_vert"
-msgstr "Po&vrni"
+#: meld/resources/ui/vcview.ui:151
+msgid "Revert"
+msgstr "Povrni"
-#: ../meld/resources/ui/vcview.ui.h:16
+#: meld/resources/ui/vcview.ui:152
msgid "Revert working copy to original state"
msgstr "Povrni delovno kopijo na izvorno stanje"
-#: ../meld/resources/ui/vcview.ui.h:17
+#: meld/resources/ui/vcview.ui:165
msgid "Delete from working copy"
msgstr "Izbriši iz delovne kopije"
-#: ../meld/resources/ui/vcview.ui.h:18
-msgid "Console"
-msgstr "Konzola"
-
-#: ../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"
-
-#: ../meld/resources/ui/vcview.ui.h:20
-msgid "_Flatten"
-msgstr "_Razpni"
-
-#: ../meld/resources/ui/vcview.ui.h:21
-msgid "Flatten directories"
-msgstr "_Razpni mape"
-
-#: ../meld/resources/ui/vcview.ui.h:22
-msgid "_Modified"
-msgstr "_Spremenjeno"
-
-#: ../meld/resources/ui/vcview.ui.h:23
-msgid "Show modified files"
-msgstr "Pokaži spremenjene datoteke"
-
-#: ../meld/resources/ui/vcview.ui.h:24
-msgid "_Normal"
-msgstr "_Običajno"
-
-#: ../meld/resources/ui/vcview.ui.h:25
-msgid "Show normal files"
-msgstr "Pokaži običajne datoteke"
-
-#: ../meld/resources/ui/vcview.ui.h:26
-msgid "Un_versioned"
-msgstr "Brez določene _različice"
-
-#: ../meld/resources/ui/vcview.ui.h:27
-msgid "Show unversioned files"
-msgstr "Pokaži datoteke z nedoločenimi različicami"
-
-#: ../meld/resources/ui/vcview.ui.h:28 ../meld/vc/_vc.py:70
-msgid "Ignored"
-msgstr "Prezrto"
-
-#: ../meld/resources/ui/vcview.ui.h:29
-msgid "Show ignored files"
-msgstr "Pokaži prezrte datoteke"
-
-#: ../meld/resources/ui/vcview.ui.h:31 ../meld/vcview.py:366
+#: meld/resources/ui/vcview.ui:220 meld/vcview.py:411
msgid "Location"
msgstr "Mesto"
-#: ../meld/resources/ui/vcview.ui.h:32
+#: meld/resources/ui/vcview.ui:229
msgid "Status"
msgstr "Stanje"
-#: ../meld/resources/ui/vcview.ui.h:33
+#: meld/resources/ui/vcview.ui:238
msgid "Extra"
msgstr "Dodatno"
-#: ../meld/resources/ui/vcview.ui.h:34
+#: meld/resources/ui/vcview.ui:270
msgid "Console output"
msgstr "Odvod konzole"
-#: ../meld/const.py:12
+#: meld/actiongutter.py:247
+msgid "Copy _up"
+msgstr "Kopiraj _navzgor"
+
+#: meld/actiongutter.py:248
+msgid "Copy _down"
+msgstr "Kopiraj _navzdol"
+
+#: meld/const.py:30
msgid "UNIX (LF)"
msgstr "UNIX (LF)"
-#: ../meld/const.py:13
+#: meld/const.py:31
msgid "DOS/Windows (CR-LF)"
msgstr "DOS/Windows (CR-LF)"
-#: ../meld/const.py:14
+#: meld/const.py:32
msgid "Mac OS (CR)"
msgstr "Mac OS (CR)"
#. Create file size CellRenderer
-#: ../meld/dirdiff.py:476 ../meld/preferences.py:138
+#: meld/dirdiff.py:530 meld/preferences.py:132
msgid "Size"
msgstr "Velikost"
#. Create date-time CellRenderer
-#: ../meld/dirdiff.py:484 ../meld/preferences.py:139
+#: meld/dirdiff.py:538 meld/preferences.py:133
msgid "Modification time"
msgstr "Čas spremembe"
#. Create permissions CellRenderer
-#: ../meld/dirdiff.py:492 ../meld/preferences.py:140
+#: meld/dirdiff.py:546 meld/preferences.py:134
msgid "Permissions"
msgstr "Dovoljenja"
-#: ../meld/dirdiff.py:626
-#, python-format
-msgid "Hide %s"
-msgstr "Skrij %s"
-
-#: ../meld/dirdiff.py:768 ../meld/dirdiff.py:791
+#: meld/dirdiff.py:769 meld/dirdiff.py:792
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] Preiskovanje %s"
-#: ../meld/dirdiff.py:926
+#: meld/dirdiff.py:928
#, python-format
msgid "[%s] Done"
msgstr "[%s] končano"
-#: ../meld/dirdiff.py:934
+#: meld/dirdiff.py:935
msgid "Folders have no differences"
msgstr "V mapah ni razlik"
-#: ../meld/dirdiff.py:936
+#: meld/dirdiff.py:937
msgid "Contents of scanned files in folders are identical."
msgstr ""
-#: ../meld/dirdiff.py:938
+#: meld/dirdiff.py:939
msgid ""
"Scanned files in folders appear identical, but contents have not been "
"scanned."
msgstr ""
-#: ../meld/dirdiff.py:941
+#: meld/dirdiff.py:942
msgid "File filters are in use, so not all files have been scanned."
msgstr ""
-#: ../meld/dirdiff.py:943
+#: meld/dirdiff.py:944
msgid "Text filters are in use and may be masking content differences."
msgstr ""
-#: ../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
+#: meld/dirdiff.py:960 meld/filediff.py:1829
+msgid "Hide"
+msgstr "Skrij"
+
+#: meld/dirdiff.py:962 meld/filediff.py:1831 meld/filediff.py:1861
+#: meld/filediff.py:1863 meld/ui/msgarea.py:108 meld/ui/msgarea.py:121
msgid "Hi_de"
msgstr "S_krij"
-#: ../meld/dirdiff.py:970
+#: meld/dirdiff.py:971
msgid "Multiple errors occurred while scanning this folder"
msgstr "Med preiskovanjem mape, je prišlo do več napak."
-#: ../meld/dirdiff.py:971
+#: meld/dirdiff.py:972
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:973
+#: meld/dirdiff.py:974
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:975
+#: meld/dirdiff.py:976
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:977
+#: meld/dirdiff.py:978
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -1717,29 +1676,29 @@ msgstr ""
"razlike velikosti upošteva. Nekatere datoteke so skrite:\n"
"%s"
-#: ../meld/dirdiff.py:988
+#: meld/dirdiff.py:989
#, fuzzy, python-format
#| msgid "'%s' hidden by '%s'"
msgid "“%s” hidden by “%s”"
msgstr "'%s' je skrit; '%s'"
-#: ../meld/dirdiff.py:1044
+#: meld/dirdiff.py:1045
#, python-format
msgid "Replace folder “%s”?"
msgstr "Ali želite zamenjati mapo »%s«?"
-#: ../meld/dirdiff.py:1046
+#: meld/dirdiff.py:1047
#, 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:1059
+#: meld/dirdiff.py:1060
msgid "Error copying file"
msgstr "Napaka kopiranja datoteke"
-#: ../meld/dirdiff.py:1060
+#: meld/dirdiff.py:1061
#, python-format
msgid ""
"Couldn’t copy %s\n"
@@ -1752,82 +1711,87 @@ msgstr ""
"\n"
"%s"
-#: ../meld/dirdiff.py:1085 ../meld/vcview.py:720
+#: meld/dirdiff.py:1086 meld/vcview.py:759
msgid "Error deleting {}"
msgstr "Napaka med brisanjem {}"
-#: ../meld/dirdiff.py:1597
+#: meld/dirdiff.py:1579
msgid "No folder"
msgstr "Ni mape"
-#: ../meld/filediff.py:920
+#: meld/filediff.py:1119
msgid "Comparison results will be inaccurate"
msgstr "Rezultati primerjave ne bodo natančni"
-#: ../meld/filediff.py:922
+#: meld/filediff.py:1121
msgid ""
"A filter changed the number of lines in the file, which is unsupported. The "
"comparison will not be accurate."
msgstr ""
-#: ../meld/filediff.py:994
+#: meld/filediff.py:1193
msgid "Mark conflict as resolved?"
msgstr "Ali naj se spor označi kot razrešen?"
-#: ../meld/filediff.py:996
+#: meld/filediff.py:1195
msgid ""
"If the conflict was resolved successfully, you may mark it as resolved now."
msgstr ""
-#: ../meld/filediff.py:998
+#: meld/filediff.py:1197
msgid "Cancel"
msgstr "Prekliči"
-#: ../meld/filediff.py:999
+#: meld/filediff.py:1198
msgid "Mark _Resolved"
msgstr "Označi kot _razrešeno"
-#: ../meld/filediff.py:1318
+#: meld/filediff.py:1523
#, python-format
msgid "There was a problem opening the file “%s”."
msgstr "Prišlo je do napake med odpiranjem datoteke “%s”."
-#: ../meld/filediff.py:1326
-#, fuzzy, python-format
+#: meld/filediff.py:1531
+#, python-format
msgid "File %s appears to be a binary file."
-msgstr "Datoteka je videti kot besedilna datoteka"
+msgstr "Datoteka %s je videti kot dvojiška datoteka."
-#: ../meld/filediff.py:1328
+#: meld/filediff.py:1533
msgid "Do you want to open the file using the default application?"
msgstr ""
-#: ../meld/filediff.py:1330
+#: meld/filediff.py:1535
msgid "Open"
msgstr "Odpri"
-#: ../meld/filediff.py:1346
+#: meld/filediff.py:1549
+#, python-format
+msgid "[%s] Merging files"
+msgstr "[%s] Združevanje datotek"
+
+#: meld/filediff.py:1563
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Računanje razlik"
-#: ../meld/filediff.py:1407
+#: meld/filediff.py:1624
#, python-format
msgid "File %s has changed on disk"
msgstr "Datoteka %s je bila na disku spremenjena."
-#: ../meld/filediff.py:1408
+#: meld/filediff.py:1625
msgid "Do you want to reload the file?"
msgstr "Ali želite ponovno naložiti datoteko?"
-#: ../meld/filediff.py:1410
+#: meld/filediff.py:1627
msgid "_Reload"
msgstr "_Ponovno naloži"
-#: ../meld/filediff.py:1566
+#: meld/filediff.py:1794
msgid "Files are identical"
msgstr "Datoteki sta enaki"
-#: ../meld/filediff.py:1579
+#: meld/filediff.py:1807
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1835,26 +1799,26 @@ msgstr ""
"Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
"Ali naj se primerja vsebina brez dejavnih filtrov?"
-#: ../meld/filediff.py:1584
+#: meld/filediff.py:1812
msgid "Files differ in line endings only"
msgstr ""
-#: ../meld/filediff.py:1586
+#: meld/filediff.py:1814
#, python-format
msgid ""
"Files are identical except for differing line endings:\n"
"%s"
msgstr ""
-#: ../meld/filediff.py:1606
+#: meld/filediff.py:1834
msgid "Show without filters"
msgstr "Pokaži brez filtrov"
-#: ../meld/filediff.py:1628
+#: meld/filediff.py:1856
msgid "Change highlighting incomplete"
msgstr "Spremeni označevanje kot nedokončano"
-#: ../meld/filediff.py:1629
+#: meld/filediff.py:1857
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."
@@ -1862,55 +1826,54 @@ 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:1637
+#: meld/filediff.py:1865
msgid "Keep highlighting"
msgstr "Poudarjanje skladnje"
-#: ../meld/filediff.py:1639
+#: meld/filediff.py:1867
msgid "_Keep highlighting"
msgstr "_Poudarjanje skladnje"
-#: ../meld/filediff.py:1652
+#: meld/filediff.py:1880
msgid "Saving failed"
msgstr "Shranjevanje je spodletelo."
-#: ../meld/filediff.py:1653
+#: meld/filediff.py:1881
msgid ""
"Please consider copying any critical changes to another program or file to "
"avoid data loss."
msgstr ""
-#: ../meld/filediff.py:1662
+#: meld/filediff.py:1890
msgid "Save Left Pane As"
msgstr "Shrani levi pladenj kot"
-#: ../meld/filediff.py:1664
+#: meld/filediff.py:1892
msgid "Save Middle Pane As"
msgstr "Shrani srednji pladenj kot"
-#: ../meld/filediff.py:1666
+#: meld/filediff.py:1894
msgid "Save Right Pane As"
msgstr "Shrani desni pladenj kot"
-#: ../meld/filediff.py:1679
-#, fuzzy, python-format
+#: meld/filediff.py:1905
+#, python-format
msgid "File %s has changed on disk since it was opened"
-msgstr "Datoteka %s je bila na disku spremenjena."
+msgstr "Datoteka %s je bila po odpiranju na disku spremenjena."
-#: ../meld/filediff.py:1681
-#, fuzzy
+#: meld/filediff.py:1907
msgid "If you save it, any external changes will be lost."
-msgstr "V primeru, da datoteke ne shranite, bodo izgubljene vse spremembe."
+msgstr "Če datoteko shranite, bodo vse zunanje spremembe izgubljene."
-#: ../meld/filediff.py:1684
+#: meld/filediff.py:1910
msgid "Save Anyway"
msgstr "Vseeno shrani"
-#: ../meld/filediff.py:1685
+#: meld/filediff.py:1911
msgid "Don’t Save"
msgstr "Ne shrani"
-#: ../meld/filediff.py:1727
+#: meld/filediff.py:1953
#, fuzzy
#| msgid ""
#| "'%s' contains characters not encodable with '%s'\n"
@@ -1922,23 +1885,29 @@ 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:1731 ../meld/patchdialog.py:144
-#, fuzzy, python-format
+#: meld/filediff.py:1957 meld/patchdialog.py:138
+#, python-format
msgid ""
"Couldn’t save file due to:\n"
"%s"
-msgstr "Ni mogoče shraniti slike v datoteko"
+msgstr ""
+"Ni mogoče shraniti datoteko zaradi:\n"
+"%s"
-#: ../meld/filediff.py:1735 ../meld/patchdialog.py:143
+#: meld/filediff.py:1961 meld/patchdialog.py:137
#, python-format
msgid "Could not save file %s."
msgstr "Ni mogoče shraniti datoteke %s."
-#: ../meld/filediff.py:2128
+#: meld/filediff.py:2022
+msgid "Open File"
+msgstr "Odpri datoteko"
+
+#: meld/filediff.py:2376
msgid "Live comparison updating disabled"
msgstr "Živo posodabljanje ob primerjavi je onemogočeno"
-#: ../meld/filediff.py:2129
+#: meld/filediff.py:2377
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
@@ -1948,326 +1917,161 @@ msgstr ""
"Še vedno je mogoče ročno osvežiti primerjavo, živo posodabljanje pa bo spet "
"na voljo, ko bo usklajevanje končano."
-#: ../meld/filemerge.py:37
-#, python-format
-msgid "[%s] Merging files"
-msgstr "[%s] Združevanje datotek"
-
-#: ../meld/gutterrendererchunk.py:220
-msgid "Copy _up"
-msgstr "Kopiraj _navzgor"
-
-#: ../meld/gutterrendererchunk.py:221
-msgid "Copy _down"
-msgstr "Kopiraj _navzdol"
-
-#: ../meld/iohelpers.py:43
+#: meld/iohelpers.py:41
msgid "Deleting remote folders is not supported"
msgstr ""
-#: ../meld/iohelpers.py:45
+#: meld/iohelpers.py:43
msgid "Not a file or directory"
msgstr "Predmet ni ne datoteka ne mapa"
-#: ../meld/iohelpers.py:49
+#: meld/iohelpers.py:47
msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
msgstr ""
-#: ../meld/iohelpers.py:54
+#: meld/iohelpers.py:52
msgid "This remote location does not support sending items to the trash."
msgstr ""
-#: ../meld/iohelpers.py:59
+#: meld/iohelpers.py:57
msgid "_Delete Permanently"
msgstr "_Trajno izbriši"
-#: ../meld/iohelpers.py:106
+#: meld/iohelpers.py:108
#, python-format
msgid "Replace file “%s”?"
msgstr "Ali želite zamenjati datoteko »%s«?"
-#: ../meld/iohelpers.py:108
+#: meld/iohelpers.py:110
#, 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:169
+#: meld/meldapp.py:179
msgid "wrong number of arguments supplied to --diff"
msgstr "Neveljavno število argumentov pri ukazu --diff."
-#: ../meld/meldapp.py:174
+#: meld/meldapp.py:184
msgid "Start with an empty window"
msgstr "Zagon brez odprtih oken"
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:177
+#: meld/meldapp.py:185 meld/meldapp.py:187
msgid "file"
msgstr "datoteka"
-#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
+#: meld/meldapp.py:185 meld/meldapp.py:189
msgid "folder"
msgstr "mapa"
-#: ../meld/meldapp.py:176
+#: meld/meldapp.py:186
msgid "Start a version control comparison"
msgstr "Zagon primerjave nadzora različic"
-#: ../meld/meldapp.py:178
+#: meld/meldapp.py:188
msgid "Start a 2- or 3-way file comparison"
msgstr "Zagon z dvojno ali trojno primerjavo datotek"
-#: ../meld/meldapp.py:180
+#: meld/meldapp.py:190
#, fuzzy
msgid "Start a 2- or 3-way folder comparison"
msgstr "Zagon z dvojno ali trojno primerjavo datotek"
-#: ../meld/meldapp.py:223
+#: meld/meldapp.py:233
#, python-format
msgid "Error: %s\n"
msgstr "Napaka: %s\n"
-#: ../meld/meldapp.py:230
+#: meld/meldapp.py:240
msgid "Meld is a file and directory comparison tool."
msgstr "Meld je orodje za primerjavo vsebine datotek in map."
-#: ../meld/meldapp.py:234
+#: meld/meldapp.py:244
msgid "Set label to use instead of file name"
msgstr "Določi naslov namesto imena datoteke"
-#: ../meld/meldapp.py:237
+#: meld/meldapp.py:247
msgid "Open a new tab in an already running instance"
msgstr "Odpri nov zavihek v že zagnanem programu"
-#: ../meld/meldapp.py:240
+#: meld/meldapp.py:250
msgid "Automatically compare all differing files on startup"
msgstr "Ob zagonu samodejno primerjaj vse različne datoteke."
-#: ../meld/meldapp.py:243
+#: meld/meldapp.py:253
msgid "Ignored for compatibility"
msgstr "Prezrto zaradi skladnosti"
-#: ../meld/meldapp.py:247
+#: meld/meldapp.py:257
msgid "Set the target file for saving a merge result"
msgstr "Določitev ciljne datoteke za shranjevanje rezultatov združevanja."
-#: ../meld/meldapp.py:250
+#: meld/meldapp.py:260
msgid "Automatically merge files"
msgstr "Samodejno združi datoteke"
-#: ../meld/meldapp.py:254
+#: meld/meldapp.py:264
msgid "Load a saved comparison from a Meld comparison file"
msgstr "Naloži shranjeno datoteko primerjav Meld"
-#: ../meld/meldapp.py:258
+#: meld/meldapp.py:268
msgid "Create a diff tab for the supplied files or folders"
msgstr "Ustvari zavihke primerjav za navedene datoteke ali mape."
-#: ../meld/meldapp.py:278
+#: meld/meldapp.py:288
#, python-format
msgid "too many arguments (wanted 0-3, got %d)"
msgstr "preveč argumentov (zahtevanih 0-3, prejetih %d)"
-#: ../meld/meldapp.py:281
+#: meld/meldapp.py:291
#, 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:283
+#: meld/meldapp.py:293
#, fuzzy
#| msgid "can't auto-merge directories"
msgid "can’t auto-merge directories"
msgstr "Ni mogoče združiti map"
-#: ../meld/meldapp.py:297
+#: meld/meldapp.py:308
msgid "Error reading saved comparison file"
msgstr "Napaka med branjem datoteke primerjav"
-#: ../meld/meldapp.py:314
+#: meld/meldapp.py:325
#, fuzzy, python-format
msgid "invalid path or URI “%s”"
msgstr "Neveljaven naslov URI mape »%s«"
-#: ../meld/meldapp.py:320
+#: meld/meldapp.py:331
msgid "remote folder “{}” not supported"
msgstr ""
#. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:123
+#: meld/meldbuffer.py:114
msgid "<unnamed>"
msgstr "<neimenovano>"
-#: ../meld/melddoc.py:63
+#: meld/melddoc.py:60
msgid "untitled"
msgstr "neimenovano"
-#: ../meld/meldwindow.py:56
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../meld/meldwindow.py:57
-msgid "_New Comparison…"
-msgstr "_Nova primerjava ..."
-
-#: ../meld/meldwindow.py:58
-msgid "Start a new comparison"
-msgstr "Nova primerjava"
-
-#: ../meld/meldwindow.py:61
-msgid "Save the current file"
-msgstr "Shrani trenutno datoteko"
-
-#: ../meld/meldwindow.py:63
-msgid "Save As…"
-msgstr "Shrani kot ..."
-
-#: ../meld/meldwindow.py:64
-msgid "Save the current file with a different name"
-msgstr "Shrani trenutno datoteko z drugim imenom"
-
-#: ../meld/meldwindow.py:67
-msgid "Close the current file"
-msgstr "Zapri trenutno datoteko"
-
-#: ../meld/meldwindow.py:70
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: ../meld/meldwindow.py:72
-msgid "Undo the last action"
-msgstr "Razveljavi zadnje dejanje"
-
-#: ../meld/meldwindow.py:75
-msgid "Redo the last undone action"
-msgstr "Obnovi zadnje razveljavljeno dejanje"
-
-#: ../meld/meldwindow.py:77
-msgid "Cut the selection"
-msgstr "Izreži izbrano"
-
-#: ../meld/meldwindow.py:79
-msgid "Copy the selection"
-msgstr "Kopiraj izbrano"
-
-#: ../meld/meldwindow.py:81
-msgid "Paste the clipboard"
-msgstr "Prilepi iz odložišča"
-
-#: ../meld/meldwindow.py:83
-msgid "Find…"
-msgstr "Najdi ..."
-
-#: ../meld/meldwindow.py:83
-msgid "Search for text"
-msgstr "Poišči besedilo"
-
-#: ../meld/meldwindow.py:85
-msgid "Find Ne_xt"
-msgstr "Najdi _naslednje"
-
-#: ../meld/meldwindow.py:86
-msgid "Search forwards for the same text"
-msgstr "Poišči niz naprej po besedilu"
-
-#: ../meld/meldwindow.py:88
-msgid "Find _Previous"
-msgstr "Najdi _predhodne"
-
-#: ../meld/meldwindow.py:89
-msgid "Search backwards for the same text"
-msgstr "Besedilo najdi nazaj po besedilu"
-
-#: ../meld/meldwindow.py:92
-msgid "_Replace…"
-msgstr "_Zamenjaj ..."
-
-#: ../meld/meldwindow.py:93
-msgid "Find and replace text"
-msgstr "Poišči in zamenjaj besedilo"
-
-#: ../meld/meldwindow.py:95
-msgid "Go to _Line"
-msgstr "Skoči v _vrstico"
-
-#: ../meld/meldwindow.py:96
-msgid "Go to a specific line"
-msgstr ""
-
-#: ../meld/meldwindow.py:99
-msgid "_Changes"
-msgstr "_Spremembe"
-
-#: ../meld/meldwindow.py:100
-msgid "Next Change"
-msgstr "Naslednja sprememba"
-
-#: ../meld/meldwindow.py:101
-msgid "Go to the next change"
-msgstr "Skoči na naslednjo spremembo"
-
-#: ../meld/meldwindow.py:103
-msgid "Previous Change"
-msgstr "Predhodna sprememba"
-
-#: ../meld/meldwindow.py:104
-msgid "Go to the previous change"
-msgstr "Skoči na predhodno spremembo"
-
-#: ../meld/meldwindow.py:106
-msgid "Open Externally"
-msgstr "Odpri v zunanjem programu"
-
-#: ../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:111
-msgid "_View"
-msgstr "_Pogled"
-
-#: ../meld/meldwindow.py:112
-msgid "File Status"
-msgstr "Stanje datoteke"
-
-#: ../meld/meldwindow.py:113
-msgid "Version Status"
-msgstr "Stanje različice"
-
-#: ../meld/meldwindow.py:116
-msgid "Stop the current action"
-msgstr "Ustavi trenutno dejanje"
-
-#: ../meld/meldwindow.py:119
-msgid "Refresh the view"
-msgstr "Osveži pogled"
-
-#: ../meld/meldwindow.py:123
-msgid "Fullscreen"
-msgstr "Celozaslonski način"
-
-#: ../meld/meldwindow.py:124
-msgid "View the comparison in fullscreen"
-msgstr "Pokaži primerjavo v celozaslonskem načinu"
-
-#: ../meld/meldwindow.py:133
-msgid "Open Recent"
-msgstr "Odpri nedavno"
+#: meld/meldwindow.py:151
+msgid "Filename"
+msgstr "Ime datoteke"
-#: ../meld/meldwindow.py:134
-msgid "Open recent files"
-msgstr "Odpri nedavne datoteke"
-
-#: ../meld/meldwindow.py:567
+#: meld/meldwindow.py:380
#, python-format
msgid "Need three files to auto-merge, got: %r"
msgstr ""
-#: ../meld/meldwindow.py:588
+#: meld/meldwindow.py:402
msgid "Cannot compare a mixture of files and directories"
msgstr "Ni mogoče sočasno primerjati datotek in map"
-#: ../meld/misc.py:155
+#: meld/misc.py:150
msgid ""
"{}\n"
"\n"
@@ -2275,60 +2079,68 @@ msgid ""
"<tt>{}</tt>"
msgstr ""
-#: ../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:311
+#: meld/misc.py:201
msgid "[None]"
msgstr "[noben]"
-#: ../meld/preferences.py:42 ../meld/preferences.py:135
+#: meld/preferences.py:37 meld/preferences.py:129
msgid "label"
msgstr "oznaka"
-#: ../meld/preferences.py:42 ../meld/preferences.py:135
+#: meld/preferences.py:37 meld/preferences.py:129
msgid "pattern"
msgstr "vzorec"
-#: ../meld/recent.py:106
+#: meld/recent.py:104
msgid "Version control:"
msgstr "Nadzor različic:"
-#: ../meld/ui/bufferselectors.py:114
+#: meld/style.py:90
+#, python-format
+msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
+msgstr ""
+
+#: meld/ui/bufferselectors.py:110
#, python-brace-format
msgid "{name} ({charset})"
msgstr "{name} ({charset})"
-#: ../meld/ui/bufferselectors.py:144 ../meld/ui/bufferselectors.py:152
+#: meld/ui/bufferselectors.py:140 meld/ui/bufferselectors.py:148
msgid "Plain Text"
msgstr "Običajno besedilo"
+#: meld/ui/filechooser.py:68
+msgid "Autodetect Encoding"
+msgstr "Samodejno zaznaj zapis"
+
+#: meld/ui/filechooser.py:71
+msgid "Current Locale ({})"
+msgstr "Trenutne jezikovne nastavitve ({})"
+
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/ui/statusbar.py:124
+#: meld/ui/statusbar.py:123
#, python-format
msgid "Ln %i, Col %i"
msgstr "Vr. %i, St. %i"
-#: ../meld/ui/statusbar.py:182
+#: meld/ui/statusbar.py:183
msgid "Line you want to move the cursor to"
msgstr ""
-#: ../meld/ui/vcdialogs.py:55
+#: meld/ui/vcdialogs.py:50
msgid "No files will be committed"
msgstr "Ni pripravljenih datotek za uveljavitev"
#. Translators: First %s is replaced by translated "%d unpushed
#. commits", second %s is replaced by translated "%d branches"
-#: ../meld/vc/git.py:92
+#: meld/vc/git.py:91
#, python-format
msgid "%s in %s"
msgstr "%s v %s"
#. Translators: These messages cover the case where there is
#. only one branch, and are not part of another message.
-#: ../meld/vc/git.py:93 ../meld/vc/git.py:100
+#: meld/vc/git.py:92 meld/vc/git.py:99
#, python-format
msgid "%d unpushed commit"
msgid_plural "%d unpushed commits"
@@ -2337,7 +2149,7 @@ msgstr[1] "%d neobjavljena uveljavitev"
msgstr[2] "%d neobjavljeni uveljavitvi"
msgstr[3] "%d neobjavljene uveljavitve"
-#: ../meld/vc/git.py:95
+#: meld/vc/git.py:94
#, python-format
msgid "%d branch"
msgid_plural "%d branches"
@@ -2346,166 +2158,165 @@ msgstr[1] "%d veja"
msgstr[2] "%d veji"
msgstr[3] "%d veje"
-#: ../meld/vc/git.py:334
+#: meld/vc/git.py:333
#, python-format
msgid "Mode changed from %s to %s"
msgstr "Način je spremenjen iz %s v %s"
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:341
#, fuzzy
msgid "Partially staged"
msgstr "delno označeno"
-#: ../meld/vc/git.py:342
+#: meld/vc/git.py:341
msgid "Staged"
msgstr "V pripravljenosti"
#. Translators: This is the displayed name of a version control system
#. when no version control system is actually found.
-#: ../meld/vc/_null.py:37
+#: meld/vc/_null.py:37
msgid "None"
msgstr "Brez"
-#: ../meld/vc/svn.py:203
-#, fuzzy, python-format
+#: meld/vc/svn.py:203
+#, python-format
msgid "Rev %s"
-msgstr "Za '%s':"
+msgstr "Predelava %s"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Merged"
msgstr "Združeno"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Base"
msgstr "Osnova"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Local"
msgstr "Krajevno"
-#: ../meld/vc/_vc.py:55
+#: meld/vc/_vc.py:54
msgid "Remote"
msgstr "Oddaljeno"
-#: ../meld/vc/_vc.py:71
-msgid "Unversioned"
-msgstr "Brez določene različice"
-
-#: ../meld/vc/_vc.py:74
+#: meld/vc/_vc.py:73
msgid "Error"
msgstr "Napaka"
-#: ../meld/vc/_vc.py:76
+#: meld/vc/_vc.py:75
msgid "Newly added"
msgstr "Nedavno dodano"
-#: ../meld/vc/_vc.py:78
+#: meld/vc/_vc.py:77
msgid "Renamed"
msgstr "Preimenovano"
-#: ../meld/vc/_vc.py:79
+#: meld/vc/_vc.py:78
msgid "Conflict"
msgstr "V sporu"
-#: ../meld/vc/_vc.py:80
+#: meld/vc/_vc.py:79
msgid "Removed"
msgstr "Odstranjeno"
-#: ../meld/vc/_vc.py:81
+#: meld/vc/_vc.py:80
msgid "Missing"
msgstr "Manjkajoče"
-#: ../meld/vc/_vc.py:82
+#: meld/vc/_vc.py:81
msgid "Not present"
msgstr "Ni na voljo"
+#. Translators: This error message is shown when no
+#. repository of this type is found.
+#: meld/vcview.py:333
+#, python-format
+msgid "%(name)s (not found)"
+msgstr "%(name)s (ni mogoče najti)"
+
#. Translators: This error message is shown when a version
#. control binary isn't installed.
-#: ../meld/vcview.py:282
-#, fuzzy, python-format
+#: meld/vcview.py:337
+#, python-format
msgid "%(name)s (%(cmd)s not installed)"
-msgstr "Nameščena različica %s %s"
+msgstr "%(name)s (ukaz %(cmd)s ni nameščen)"
#. Translators: This error message is shown when a version
#. controlled repository is invalid.
-#: ../meld/vcview.py:286
-#, fuzzy, python-format
-msgid "%(name)s (Invalid repository)"
-msgstr "Neveljavno ime skupine: %s"
+#: meld/vcview.py:341
+#, python-format
+msgid "%(name)s (invalid repository)"
+msgstr "%(name)s (neveljavno skladišče)"
-#: ../meld/vcview.py:307
+#: meld/vcview.py:355
msgid "No valid version control system found in this folder"
msgstr "Ni veljavnega sistema za nadzor različic v tej mapi"
-#: ../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:311
+#: meld/vcview.py:357
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:366
+#: meld/vcview.py:411
#, 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:373
+#: meld/vcview.py:418
msgid "Scanning repository"
msgstr "Poteka preiskovanje skladišča"
-#: ../meld/vcview.py:402
+#: meld/vcview.py:447
#, python-format
msgid "Scanning %s"
msgstr "Preiskovanje %s"
-#: ../meld/vcview.py:441
+#: meld/vcview.py:486
msgid "(Empty)"
msgstr "(Prazno)"
-#: ../meld/vcview.py:487
+#: meld/vcview.py:533
#, python-format
msgid "%s — local"
msgstr "%s — krajevno"
-#: ../meld/vcview.py:488
+#: meld/vcview.py:534
#, python-format
msgid "%s — remote"
msgstr "%s — oddaljeno"
-#: ../meld/vcview.py:496
+#: meld/vcview.py:542
#, python-format
msgid "%s (local, merge, remote)"
msgstr "%s (krajevno, združi, oddaljeno)"
-#: ../meld/vcview.py:501
+#: meld/vcview.py:547
#, python-format
msgid "%s (remote, merge, local)"
msgstr "%s (oddaljeno, združi, krajevno)"
-#: ../meld/vcview.py:512
+#: meld/vcview.py:558
#, python-format
msgid "%s — repository"
msgstr "%s — skladišče"
-#: ../meld/vcview.py:518
+#: meld/vcview.py:564
#, python-format
msgid "%s (working, repository)"
msgstr "%s (delovno, skladišče)"
-#: ../meld/vcview.py:522
+#: meld/vcview.py:568
#, python-format
msgid "%s (repository, working)"
msgstr "%s (skladišče, delovno)"
-#: ../meld/vcview.py:688
+#: meld/vcview.py:730
msgid "Remove folder and all its files?"
msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
-#: ../meld/vcview.py:690
+#: meld/vcview.py:732
msgid ""
"This will remove all selected files and folders, and all files within any "
"selected folders, from version control."
@@ -2513,10 +2324,26 @@ msgstr ""
"S tem dejanjem bodo odstranjene vse izbrane datoteke in mape in vse "
"podrejene datoteke iz sistema za nadzor različic"
-#: ../meld/vcview.py:804
+#: meld/vcview.py:845
msgid "Clear"
msgstr "Počisti"
+#~ msgid "Cannot import: "
+#~ msgstr "Ni mogoče uvoziti:"
+
+#~ msgid "Meld requires %s or higher."
+#~ msgstr "Program Meld zahteva najmanj različico %s."
+
+#~ msgid ""
+#~ "Couldn’t load Meld-specific CSS (%s)\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ni mogoče naložiti posebnega oblikovanja CSS za Meld (%s)\n"
+#~ "%s"
+
+#~ msgid "Meld Diff Viewer"
+#~ msgstr "Meld pregledovalnik različic"
+
#~ msgid "Show toolbar"
#~ msgstr "Pokaži orodno vrstico"
@@ -2531,18 +2358,257 @@ msgstr "Počisti"
#~ msgid "If true, the window statusbar is visible."
#~ msgstr "Vrstica stanja je vidna"
+#~ msgid "Displayed whitespace"
+#~ msgstr "Vidni presledni znaki"
+
+#~ msgid "Meld base scheme"
+#~ msgstr "Osnovna shema"
+
+#~ msgid "Website"
+#~ msgstr "Spletišče"
+
+#~ msgid "_About"
+#~ msgstr "_O programu"
+
+#~ msgid "_Quit"
+#~ msgstr "_Končaj"
+
+#, fuzzy
+#~| msgid "Remove folder and all its files?"
+#~ msgid "Collapse selected folder and all subfolders"
+#~ msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
+
+#, fuzzy
+#~| msgid "Remove folder and all its files?"
+#~ msgid "Expand selected folder and all subfolders"
+#~ msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
+
+#~ msgid "Copy to _Left"
+#~ msgstr "Kopiraj na _levo"
+
+#~ msgid "Copy to _Right"
+#~ msgstr "Kopiraj na _desno"
+
+#~ msgid "Hide selected"
+#~ msgstr "Skrij izbrano"
+
+#~ 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."
+
+#~ msgid "Show identical"
+#~ msgstr "Pokaži enako"
+
+#~ msgid "Show new"
+#~ msgstr "Pokaži novejše"
+
+#~ msgid "Show modified"
+#~ msgstr "Pokaži spremenjeno"
+
+#~ msgid "Filters"
+#~ msgstr "Filtri"
+
+#~ msgid "Set active filters"
+#~ msgstr "Določi dejavne filtre"
+
#~ msgid "Editable List"
#~ msgstr "Uredljiv seznam"
+#~ msgid "Create a patch using differences between files"
+#~ msgstr "Ustvari popravek z razlikovanjem med datotekami"
+
+#~ msgid "Save all files in the current comparison"
+#~ msgstr "Shrani vse datoteke trenutne primerjave"
+
+#~ msgid "Revert files to their saved versions"
+#~ msgstr "Povrni datoteke na shranjene različice"
+
+#~ msgid "Previous Conflict"
+#~ msgstr "Predhodni spor"
+
+#~ msgid "Next Conflict"
+#~ msgstr "Naslednji spor"
+
+#~ msgid "Push to Left"
+#~ msgstr "Potisni levo"
+
+#~ msgid "Push to Right"
+#~ msgstr "Potisni desno"
+
+#~ msgid "Pull from Left"
+#~ msgstr "Potegni z leve"
+
+#~ msgid "Pull change from the left"
+#~ msgstr "Potegni spremembe z leve"
+
+#~ msgid "Pull from Right"
+#~ msgstr "Potegni z desne"
+
+#~ msgid "Pull change from the right"
+#~ msgstr "Potegni spremembe z desne"
+
+#~ msgid "Copy Above Left"
+#~ msgstr "Kopiraj nad levo"
+
+#~ msgid "Copy Below Left"
+#~ msgstr "Kopiraj pod levo"
+
+#~ msgid "Copy Above Right"
+#~ msgstr "Kopiraj nad desno"
+
+#~ msgid "Copy Below Right"
+#~ msgstr "Kopiraj pod desno"
+
+#~ msgid "Merge all non-conflicting changes from the left"
+#~ msgstr "Združi vse spremembe brez sporov z leve"
+
+#~ msgid "Merge all non-conflicting changes from the right"
+#~ msgstr "Združi vse spremembe brez sporov z desne"
+
+#~ msgid "Merge all non-conflicting changes from left and right panes"
+#~ msgstr "Združi vse spremembe brez sporov z leve in z desne"
+
+#~ msgid "Previous Pane"
+#~ msgstr "Predhodno okno"
+
+#~ msgid "Move keyboard focus to the previous document in this comparison"
+#~ msgstr "Premakne žarišče tipkovnice na naslednji dokument primerjave"
+
+#~ msgid "Next Pane"
+#~ msgstr "Naslednje okno"
+
+#~ msgid "Move keyboard focus to the next document in this comparison"
+#~ msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
+
+#~ msgid "Lock scrolling of all panes"
+#~ msgstr "Zakleni drsenje vseh pladnjev"
+
+#~ msgid "_Previous"
+#~ msgstr "_Predhodni"
+
+#~ msgid "_Next"
+#~ msgstr "_Naslednji"
+
+#~ msgid "Find:"
+#~ msgstr "Najdi:"
+
+#~ msgid "Replace _with:"
+#~ msgstr "Zamenjaj _z:"
+
#~ msgid "Meld Preferences"
#~ msgstr "Možnosti Meld"
-#~ msgid "_Save as UTF-8"
-#~ msgstr "_Shrani kot UTF-8"
+#~ msgid "File comparison"
+#~ msgstr "Primerjava datotek"
+
+#~ msgid "Directory comparison"
+#~ msgstr "Primerjava vsebine map"
+
+#~ msgid "Version control view"
+#~ msgstr "Pogled nadzora različic"
+
+#~ msgid "Console"
+#~ msgstr "Konzola"
#, fuzzy
-#~ msgid "Couldn’t encode text as “%s”"
-#~ msgstr "Ni mogoče zagnati zalednega programa »%s«."
+#~ msgid "Show or hide the version control console output pane"
+#~ msgstr "Izbor različice sistema za nadzor različic za uporabo"
+
+#~ msgid "_Flatten"
+#~ msgstr "_Razpni"
+
+#~ msgid "_Modified"
+#~ msgstr "_Spremenjeno"
+
+#~ msgid "Show modified files"
+#~ msgstr "Pokaži spremenjene datoteke"
+
+#~ msgid "Show normal files"
+#~ msgstr "Pokaži običajne datoteke"
+
+#~ msgid "Un_versioned"
+#~ msgstr "Brez določene _različice"
+
+#~ msgid "Show unversioned files"
+#~ msgstr "Pokaži datoteke z nedoločenimi različicami"
+
+#~ msgid "Show ignored files"
+#~ msgstr "Pokaži prezrte datoteke"
+
+#~ msgid "Hide %s"
+#~ msgstr "Skrij %s"
+
+#~ msgid "_New Comparison…"
+#~ msgstr "_Nova primerjava ..."
+
+#~ msgid "Save the current file"
+#~ msgstr "Shrani trenutno datoteko"
+
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Shrani trenutno datoteko z drugim imenom"
+
+#~ msgid "Close the current file"
+#~ msgstr "Zapri trenutno datoteko"
+
+#~ msgid "_Edit"
+#~ msgstr "_Uredi"
+
+#~ msgid "Undo the last action"
+#~ msgstr "Razveljavi zadnje dejanje"
+
+#~ msgid "Redo the last undone action"
+#~ msgstr "Obnovi zadnje razveljavljeno dejanje"
+
+#~ msgid "Cut the selection"
+#~ msgstr "Izreži izbrano"
+
+#~ msgid "Copy the selection"
+#~ msgstr "Kopiraj izbrano"
+
+#~ msgid "Paste the clipboard"
+#~ msgstr "Prilepi iz odložišča"
+
+#~ msgid "Search for text"
+#~ msgstr "Poišči besedilo"
+
+#~ msgid "Find Ne_xt"
+#~ msgstr "Najdi _naslednje"
+
+#~ msgid "Search forwards for the same text"
+#~ msgstr "Poišči niz naprej po besedilu"
+
+#~ msgid "Find _Previous"
+#~ msgstr "Najdi _predhodne"
+
+#~ msgid "Search backwards for the same text"
+#~ msgstr "Besedilo najdi nazaj po besedilu"
+
+#~ msgid "Find and replace text"
+#~ msgstr "Poišči in zamenjaj besedilo"
+
+#~ msgid "Go to _Line"
+#~ msgstr "Skoči v _vrstico"
+
+#~ msgid "_Changes"
+#~ msgstr "_Spremembe"
+
+#~ msgid "Next Change"
+#~ msgstr "Naslednja sprememba"
+
+#~ msgid "Previous Change"
+#~ msgstr "Predhodna sprememba"
+
+#~ msgid "Open selected file or directory in the default external application"
+#~ msgstr "Odpri zbrano datoteko ali mapo v privzetem zunanjem programu"
+
+#~ msgid "Stop the current action"
+#~ msgstr "Ustavi trenutno dejanje"
+
+#~ msgid "View the comparison in fullscreen"
+#~ msgstr "Pokaži primerjavo v celozaslonskem načinu"
#~ msgid "_Toolbar"
#~ msgstr "_Orodna vrstica"
@@ -2550,6 +2616,9 @@ msgstr "Počisti"
#~ msgid "Show or hide the toolbar"
#~ msgstr "Pokaži ali skrij orodno vrstico"
+#~ msgid "Open Recent"
+#~ msgstr "Odpri nedavno"
+
#~ msgid "_Meld"
#~ msgstr "_Meld"
@@ -2571,6 +2640,16 @@ msgstr "Počisti"
#~ msgid "About this application"
#~ msgstr "O programu"
+#~ msgid "Only one version control system found in this folder"
+#~ msgstr "V tej mapi je le en sistem nadzora različic"
+
+#~ 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 "INS"
#~ msgstr "VST"
@@ -2595,10 +2674,6 @@ msgstr "Počisti"
#~ msgid "Meld does not support Python 3."
#~ msgstr "Program Meld ne podpira okolja Python 3."
-#, fuzzy
-#~ msgid "Automatically detected text encodings"
-#~ msgstr "Dovoli samodejno skrčenje besedila ob združevanju"
-
#~ msgid "Copy _Left"
#~ msgstr "Kopiraj _levo"
@@ -2898,9 +2973,6 @@ msgstr "Počisti"
#~ msgid "Pop up a file selector to choose a file"
#~ msgstr "Pokaži izbirnik za izbor datoteke"
-#~ msgid "Select file"
-#~ msgstr "Izbor datoteke"
-
#~ msgid "Compare selected"
#~ msgstr "Primerjaj izbrano"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
