[meld] Update Slovenian translation

From: Translations User D-L <translations src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Update Slovenian translation
Date: Wed, 3 Mar 2021 20:50:28 +0000 (UTC)
commit 52093adedff7f0459a3b1a680473aa06fc9afb69
Author: Matej Urbančič <mateju src gnome org>
Date:   Wed Mar 3 20:50:25 2021 +0000

    Update Slovenian translation

 po/sl.po | 364 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 185 insertions(+), 179 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 99b2772f..cca360a9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,15 +2,15 @@
 # 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–2020.
+# Matej Urbančič <mateju src gnome org>, 2009–2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\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"
+"POT-Creation-Date: 2021-02-18 22:41+0000\n"
+"PO-Revision-Date: 2021-03-03 21:49+0100\n"
+"Last-Translator: Matej Urbančič <mateju src gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
 "Language: sl_SI\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ 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.3\n"
+"X-Generator: Poedit 2.4.1\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
 #: meld/resources/ui/appwindow.ui:9
@@ -404,7 +404,7 @@ msgstr ""
 
 #: data/styles/meld-base.style-scheme.xml.in:1
 msgid "Classic (Meld)"
-msgstr ""
+msgstr "Običajno (Meld)"
 
 #: data/styles/meld-base.style-scheme.xml.in:3
 msgid "Base color scheme for Meld highlighting"
@@ -426,17 +426,17 @@ msgstr "Splošno"
 #: meld/resources/gtk/help-overlay.ui:19
 msgctxt "shortcut window"
 msgid "New comparison"
-msgstr "Nova primerjava"
+msgstr "Začne novo primerjavo"
 
 #: meld/resources/gtk/help-overlay.ui:26
 msgctxt "shortcut window"
 msgid "Close a comparison"
-msgstr "Zapri primerjavo"
+msgstr "Zapre okno primerjave"
 
 #: meld/resources/gtk/help-overlay.ui:33
 msgctxt "shortcut window"
 msgid "Quit Meld"
-msgstr "Končaj program"
+msgstr "Konča program"
 
 #: meld/resources/gtk/help-overlay.ui:40
 msgctxt "shortcut window"
@@ -451,22 +451,22 @@ msgstr "Osveži primerjavo"
 #: meld/resources/gtk/help-overlay.ui:54
 msgctxt "shortcut window"
 msgid "Fullscreen"
-msgstr "Celozaslonski način"
+msgstr "Omogoči celozaslonski način"
 
 #: meld/resources/gtk/help-overlay.ui:63
 msgctxt "shortcut window"
 msgid "Panes"
-msgstr ""
+msgstr "Okna"
 
 #: meld/resources/gtk/help-overlay.ui:68
 msgctxt "shortcut window"
 msgid "Previous comparison pane"
-msgstr "Predhodno okno primerjave"
+msgstr "Skoči na predhodno okno primerjave"
 
 #: meld/resources/gtk/help-overlay.ui:75
 msgctxt "shortcut window"
 msgid "Next comparison pane"
-msgstr "Naslednje okno primerjave"
+msgstr "Skoči na naslednje okno primerjave"
 
 #: meld/resources/gtk/help-overlay.ui:84
 msgctxt "shortcut window"
@@ -506,12 +506,12 @@ msgstr "Preklopi na zavihek"
 #: meld/resources/gtk/help-overlay.ui:131
 msgctxt "shortcut window"
 msgid "Move tab left"
-msgstr "Premakni zavihek levo"
+msgstr "Premakne na zavihek levo"
 
 #: meld/resources/gtk/help-overlay.ui:138
 msgctxt "shortcut window"
 msgid "Move tab right"
-msgstr "Premakni zavihek desno"
+msgstr "Premakne na zavihek desno"
 
 #: meld/resources/gtk/help-overlay.ui:147
 msgctxt "shortcut window"
@@ -521,47 +521,47 @@ msgstr "Urejanje"
 #: meld/resources/gtk/help-overlay.ui:152
 msgctxt "shortcut window"
 msgid "Undo"
-msgstr "Razveljavi"
+msgstr "Razveljavi dejanje"
 
 #: meld/resources/gtk/help-overlay.ui:159
 msgctxt "shortcut window"
 msgid "Redo"
-msgstr "Ponovi"
+msgstr "Ponovno uveljavi dejanje"
 
 #: meld/resources/gtk/help-overlay.ui:166
 msgctxt "shortcut window"
 msgid "Cut"
-msgstr "Izreži"
+msgstr "Izreže izbor"
 
 #: meld/resources/gtk/help-overlay.ui:173
 msgctxt "shortcut window"
 msgid "Copy"
-msgstr "Kopiraj"
+msgstr "Kopira izbor"
 
 #: meld/resources/gtk/help-overlay.ui:180
 msgctxt "shortcut window"
 msgid "Paste"
-msgstr "Prilepi"
+msgstr "Prilepi izbor"
 
 #: meld/resources/gtk/help-overlay.ui:187
 msgctxt "shortcut window"
 msgid "Find"
-msgstr "Najdi"
+msgstr "Odpre iskalno polje"
 
 #: meld/resources/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Find Next"
-msgstr "Najdi naslednje"
+msgstr "Najde naslednjo pojavitev"
 
 #: meld/resources/gtk/help-overlay.ui:201
 msgctxt "shortcut window"
 msgid "Find Previous"
-msgstr "Najdi predhodno"
+msgstr "Najde predhodno pojavitev"
 
 #: meld/resources/gtk/help-overlay.ui:208
 msgctxt "shortcut window"
 msgid "Replace"
-msgstr "Zamenjaj"
+msgstr "Zamenja vsebino"
 
 #: meld/resources/gtk/help-overlay.ui:217
 msgctxt "shortcut window"
@@ -576,7 +576,7 @@ msgstr "Shrani trenutno datoteko"
 #: meld/resources/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Save current file to new path"
-msgstr "Shrani trenutni izbor kot novo prednastavitev"
+msgstr "Shrani trenutno datoteko na novo mesto"
 
 #: meld/resources/gtk/help-overlay.ui:236
 msgctxt "shortcut window"
@@ -586,58 +586,58 @@ msgstr "Shrani vse datoteke trenutne primerjave"
 #: meld/resources/gtk/help-overlay.ui:243
 msgctxt "shortcut window"
 msgid "Previous conflict"
-msgstr "Predhodni spor"
+msgstr "Skoči na predhodni niz v sporu"
 
 #: meld/resources/gtk/help-overlay.ui:250
 msgctxt "shortcut window"
 msgid "Next conflict"
-msgstr "Naslednji spor"
+msgstr "Skoči na naslednji niz v sporu"
 
 #: meld/resources/gtk/help-overlay.ui:257
 msgctxt "shortcut window"
 msgid "Push change to left"
-msgstr "Potisni trenutne spremembe na levo"
+msgstr "Potisne trenutne spremembe na levo"
 
 #: meld/resources/gtk/help-overlay.ui:264
 msgctxt "shortcut window"
 msgid "Push change to right"
-msgstr "Potisni trenutne spremembe na desno"
+msgstr "Potisne trenutne spremembe na desno"
 
 #: meld/resources/gtk/help-overlay.ui:271
 msgctxt "shortcut window"
 msgid "Pull change from left"
-msgstr "Potegni spremembe z leve"
+msgstr "Potegne spremembe z leve"
 
 #: meld/resources/gtk/help-overlay.ui:278
 msgctxt "shortcut window"
 msgid "Pull change from right"
-msgstr "Potegni spremembe z desne"
+msgstr "Potegne spremembe z desne"
 
 #: meld/resources/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Copy change above left"
-msgstr "Kopiraj spremembe nad levi del"
+msgstr "Kopira spremembe nad levi del"
 
 #: meld/resources/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Copy change below left"
-msgstr "Kopiraj spremembe pod levi del"
+msgstr "Kopira spremembe pod levi del"
 
 #: meld/resources/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Copy change above right"
-msgstr "Kopiraj spremembe nad desni del"
+msgstr "Kopira spremembe nad desni del"
 
 #: meld/resources/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Copy change below right"
-msgstr "Kopiraj spremembe pod desni del"
+msgstr "Kopira spremembe pod desni del"
 
 #: meld/resources/gtk/help-overlay.ui:313
 #: meld/resources/gtk/help-overlay.ui:341
 msgctxt "shortcut window"
 msgid "Delete change"
-msgstr "Izbriši spremembo"
+msgstr "Izbriše spremembo"
 
 #: meld/resources/gtk/help-overlay.ui:322
 msgctxt "shortcut window"
@@ -647,12 +647,12 @@ msgstr "Primerjava map"
 #: meld/resources/gtk/help-overlay.ui:327
 msgctxt "shortcut window"
 msgid "Copy to left"
-msgstr "Kopiraj na levo"
+msgstr "Kopira na levo"
 
 #: meld/resources/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Copy to right"
-msgstr "Kopiraj na desno"
+msgstr "Kopira na desno"
 
 #: meld/resources/gtk/help-overlay.ui:350
 msgctxt "shortcut window"
@@ -667,7 +667,7 @@ msgstr "Uveljavi spremembe v sistem za nadzor različic"
 #: meld/resources/gtk/help-overlay.ui:362
 msgctxt "shortcut window"
 msgid "Show/hide console output"
-msgstr "Pokaži/Skrij odvod konzole"
+msgstr "Pokaže/Skrije odvod konzole"
 
 #: meld/resources/gtk/menus.ui:7
 msgid "Refresh"
@@ -814,7 +814,7 @@ msgstr ""
 
 #: meld/resources/ui/about-dialog.ui:14
 msgid "translator-credits"
-msgstr "Matej Urbančič <mateju svn gnome org>"
+msgstr "Matej Urbančič <mateju src gnome org>"
 
 #: meld/resources/ui/appwindow.ui:29
 msgid "Start a new comparison"
@@ -840,15 +840,15 @@ msgstr "Skoči na predhodni niz v sporu"
 msgid "Go to the next conflict"
 msgstr "Skoči na naslednji niz v sporu"
 
-#: meld/resources/ui/appwindow.ui:191
+#: meld/resources/ui/appwindow.ui:192
 msgid "Version Filters"
 msgstr "Filtri različice"
 
-#: meld/resources/ui/appwindow.ui:206 meld/resources/ui/preferences.ui:1456
+#: meld/resources/ui/appwindow.ui:207 meld/resources/ui/preferences.ui:1456
 msgid "File Filters"
 msgstr "Filtri datotek"
 
-#: meld/resources/ui/appwindow.ui:221 meld/resources/ui/preferences.ui:1641
+#: meld/resources/ui/appwindow.ui:222 meld/resources/ui/preferences.ui:1641
 msgid "Text Filters"
 msgstr "Filtri besedila"
 
@@ -1037,7 +1037,7 @@ msgstr "Datoteka 1"
 
 #. Create icon and filename CellRenderer
 #: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:208
-#: meld/dirdiff.py:509
+#: meld/dirdiff.py:517
 msgid "Name"
 msgstr "Ime"
 
@@ -1077,7 +1077,7 @@ msgstr "Prelomljeno"
 msgid "Replace _All"
 msgstr "Zamenjaj _vse"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1042 meld/iohelpers.py:115
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1062 meld/iohelpers.py:113
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
@@ -1087,62 +1087,62 @@ msgstr ""
 
 #: meld/resources/ui/language-selector.ui:31
 msgid "Search highlight mode…"
-msgstr ""
+msgstr "Način iskanja s poudarjanjem …"
 
-#: meld/resources/ui/new-diff-tab.ui:119 meld/meldwindow.py:345
+#: meld/resources/ui/new-diff-tab.ui:20 meld/meldwindow.py:349
 #: meld/newdifftab.py:49
 msgid "New comparison"
 msgstr "Nova primerjava"
 
-#: meld/resources/ui/new-diff-tab.ui:171
+#: meld/resources/ui/new-diff-tab.ui:72
 msgid "File"
 msgstr "Datoteka"
 
-#: meld/resources/ui/new-diff-tab.ui:220
+#: meld/resources/ui/new-diff-tab.ui:121
 msgid "Folder"
 msgstr "Mapa"
 
-#: meld/resources/ui/new-diff-tab.ui:269
+#: meld/resources/ui/new-diff-tab.ui:170
 msgid "Version control"
 msgstr "Nadzor različic"
 
-#: meld/resources/ui/new-diff-tab.ui:334 meld/resources/ui/new-diff-tab.ui:454
+#: meld/resources/ui/new-diff-tab.ui:235 meld/resources/ui/new-diff-tab.ui:352
 msgid "_3-way comparison"
 msgstr "_Trojna primerjava"
 
-#: meld/resources/ui/new-diff-tab.ui:353
+#: meld/resources/ui/new-diff-tab.ui:254
 msgid "Select First File"
 msgstr "Izbor prve datoteke"
 
-#: meld/resources/ui/new-diff-tab.ui:367
+#: meld/resources/ui/new-diff-tab.ui:267
 msgid "Select Second File"
 msgstr "Izbor druge datoteke"
 
-#: meld/resources/ui/new-diff-tab.ui:383
+#: meld/resources/ui/new-diff-tab.ui:281
 msgid "Select Third File"
 msgstr "Izbor tretje datoteke"
 
-#: meld/resources/ui/new-diff-tab.ui:418
+#: meld/resources/ui/new-diff-tab.ui:316
 msgid "Select First Folder"
 msgstr "Izbor prve mape"
 
-#: meld/resources/ui/new-diff-tab.ui:431
+#: meld/resources/ui/new-diff-tab.ui:329
 msgid "Select Second Folder"
 msgstr "Izbor druge mape"
 
-#: meld/resources/ui/new-diff-tab.ui:445
+#: meld/resources/ui/new-diff-tab.ui:343
 msgid "Select Third Folder"
 msgstr "Izbor tretje mape"
 
-#: meld/resources/ui/new-diff-tab.ui:495
+#: meld/resources/ui/new-diff-tab.ui:393
 msgid "Select A Version-Controlled Folder"
 msgstr "Izbor mape nadzora različic"
 
-#: meld/resources/ui/new-diff-tab.ui:544
+#: meld/resources/ui/new-diff-tab.ui:442
 msgid "_Blank comparison"
 msgstr "_Prazna primerjava"
 
-#: meld/resources/ui/new-diff-tab.ui:561
+#: meld/resources/ui/new-diff-tab.ui:459
 msgid "C_ompare"
 msgstr "_Primerjava"
 
@@ -1372,18 +1372,16 @@ msgid "Left is local, right is remote"
 msgstr "Levo je krajevno, desno oddaljeno"
 
 #: meld/resources/ui/preferences.ui:1705
-#, fuzzy
-#| msgid "Delete change"
 msgid "Simple change map"
-msgstr "Izbriši spremembo"
+msgstr "Enostavno menjanje zemljevida"
 
 #: meld/resources/ui/preferences.ui:1709
 msgid "Compact source map"
-msgstr ""
+msgstr "Stisnjen zemljevid vira"
 
 #: meld/resources/ui/preferences.ui:1713
 msgid "Full source map"
-msgstr ""
+msgstr "Poln zemljevid vira"
 
 #: meld/resources/ui/preferences.ui:1727
 msgid "Remote, merge, local"
@@ -1455,8 +1453,8 @@ msgstr "V kolikor sprememb ne shranite, bodo te trajno izgubljene."
 msgid "Close _without Saving"
 msgstr "Zapri _brez shranjevanja"
 
-#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1041
-#: meld/iohelpers.py:56 meld/iohelpers.py:114
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1061
+#: meld/iohelpers.py:55 meld/iohelpers.py:112
 msgid "_Cancel"
 msgstr "_Prekliči"
 
@@ -1593,81 +1591,86 @@ msgid "Mac OS (CR)"
 msgstr "Mac OS (CR)"
 
 #. Create file size CellRenderer
-#: meld/dirdiff.py:530 meld/preferences.py:132
+#: meld/dirdiff.py:538 meld/preferences.py:132
 msgid "Size"
 msgstr "Velikost"
 
 #. Create date-time CellRenderer
-#: meld/dirdiff.py:538 meld/preferences.py:133
+#: meld/dirdiff.py:546 meld/preferences.py:133
 msgid "Modification time"
 msgstr "Čas spremembe"
 
 #. Create permissions CellRenderer
-#: meld/dirdiff.py:546 meld/preferences.py:134
+#: meld/dirdiff.py:554 meld/preferences.py:134
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: meld/dirdiff.py:769 meld/dirdiff.py:792
+#: meld/dirdiff.py:778 meld/dirdiff.py:801
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: meld/dirdiff.py:928
+#: meld/dirdiff.py:941
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] končano"
 
-#: meld/dirdiff.py:935
+#: meld/dirdiff.py:950
+#, python-brace-format
+msgid "Folder {duplicate_directory} is being compared to itself"
+msgstr ""
+
+#: meld/dirdiff.py:955
 msgid "Folders have no differences"
 msgstr "V mapah ni razlik"
 
-#: meld/dirdiff.py:937
+#: meld/dirdiff.py:957
 msgid "Contents of scanned files in folders are identical."
 msgstr ""
 
-#: meld/dirdiff.py:939
+#: meld/dirdiff.py:959
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 
-#: meld/dirdiff.py:942
+#: meld/dirdiff.py:962
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 
-#: meld/dirdiff.py:944
+#: meld/dirdiff.py:964
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 
-#: meld/dirdiff.py:960 meld/filediff.py:1829
+#: meld/dirdiff.py:980 meld/filediff.py:1873
 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
+#: meld/dirdiff.py:982 meld/filediff.py:1875 meld/filediff.py:1905
+#: meld/filediff.py:1907 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: meld/dirdiff.py:971
+#: meld/dirdiff.py:991
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je prišlo do več napak."
 
-#: meld/dirdiff.py:972
+#: meld/dirdiff.py:992
 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:974
+#: meld/dirdiff.py:994
 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:976
+#: meld/dirdiff.py:996
 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:978
+#: meld/dirdiff.py:998
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -1676,29 +1679,29 @@ msgstr ""
 "razlike velikosti upošteva. Nekatere datoteke so skrite:\n"
 "%s"
 
-#: meld/dirdiff.py:989
+#: meld/dirdiff.py:1009
 #, fuzzy, python-format
 #| msgid "'%s' hidden by '%s'"
 msgid "“%s” hidden by “%s”"
 msgstr "'%s' je skrit; '%s'"
 
-#: meld/dirdiff.py:1045
+#: meld/dirdiff.py:1065
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ali želite zamenjati mapo »%s«?"
 
-#: meld/dirdiff.py:1047
+#: meld/dirdiff.py:1067
 #, 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:1060
+#: meld/dirdiff.py:1080
 msgid "Error copying file"
 msgstr "Napaka kopiranja datoteke"
 
-#: meld/dirdiff.py:1061
+#: meld/dirdiff.py:1081
 #, python-format
 msgid ""
 "Couldn’t copy %s\n"
@@ -1711,87 +1714,92 @@ msgstr ""
 "\n"
 "%s"
 
-#: meld/dirdiff.py:1086 meld/vcview.py:759
+#: meld/dirdiff.py:1106 meld/vcview.py:759
 msgid "Error deleting {}"
 msgstr "Napaka med brisanjem {}"
 
-#: meld/dirdiff.py:1579
+#: meld/dirdiff.py:1599
 msgid "No folder"
 msgstr "Ni mape"
 
-#: meld/filediff.py:1119
+#: meld/filediff.py:1144
 msgid "Comparison results will be inaccurate"
 msgstr "Rezultati primerjave ne bodo natančni"
 
-#: meld/filediff.py:1121
+#: meld/filediff.py:1146
 msgid ""
 "A filter changed the number of lines in the file, which is unsupported. The "
 "comparison will not be accurate."
 msgstr ""
 
-#: meld/filediff.py:1193
+#: meld/filediff.py:1218
 msgid "Mark conflict as resolved?"
 msgstr "Ali naj se spor označi kot razrešen?"
 
-#: meld/filediff.py:1195
+#: meld/filediff.py:1220
 msgid ""
 "If the conflict was resolved successfully, you may mark it as resolved now."
 msgstr ""
 
-#: meld/filediff.py:1197
+#: meld/filediff.py:1222
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: meld/filediff.py:1198
+#: meld/filediff.py:1223
 msgid "Mark _Resolved"
 msgstr "Označi kot _razrešeno"
 
-#: meld/filediff.py:1523
+#: meld/filediff.py:1556
 #, python-format
 msgid "There was a problem opening the file “%s”."
 msgstr "Prišlo je do napake med odpiranjem datoteke “%s”."
 
-#: meld/filediff.py:1531
+#: meld/filediff.py:1564
 #, python-format
 msgid "File %s appears to be a binary file."
 msgstr "Datoteka %s je videti kot dvojiška datoteka."
 
-#: meld/filediff.py:1533
+#: meld/filediff.py:1566
 msgid "Do you want to open the file using the default application?"
 msgstr ""
 
-#: meld/filediff.py:1535
+#: meld/filediff.py:1568
 msgid "Open"
 msgstr "Odpri"
 
-#: meld/filediff.py:1549
+#: meld/filediff.py:1582
 #, python-format
 msgid "[%s] Merging files"
 msgstr "[%s] Združevanje datotek"
 
-#: meld/filediff.py:1563
+#: meld/filediff.py:1596
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Računanje razlik"
 
-#: meld/filediff.py:1624
+#: meld/filediff.py:1657
 #, python-format
 msgid "File %s has changed on disk"
 msgstr "Datoteka %s je bila na disku spremenjena."
 
-#: meld/filediff.py:1625
+#: meld/filediff.py:1658
 msgid "Do you want to reload the file?"
 msgstr "Ali želite ponovno naložiti datoteko?"
 
-#: meld/filediff.py:1627
+#: meld/filediff.py:1660
 msgid "_Reload"
 msgstr "_Ponovno naloži"
 
-#: meld/filediff.py:1794
+#: meld/filediff.py:1830
+#, python-brace-format
+msgid "File {duplicate_files[0]} is being compared to itself"
+msgstr ""
+
+#: meld/filediff.py:1838
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: meld/filediff.py:1807
+#: meld/filediff.py:1851
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1799,26 +1807,26 @@ msgstr ""
 "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
 "Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: meld/filediff.py:1812
+#: meld/filediff.py:1856
 msgid "Files differ in line endings only"
 msgstr ""
 
-#: meld/filediff.py:1814
+#: meld/filediff.py:1858
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
 "%s"
 msgstr ""
 
-#: meld/filediff.py:1834
+#: meld/filediff.py:1878
 msgid "Show without filters"
 msgstr "Pokaži brez filtrov"
 
-#: meld/filediff.py:1856
+#: meld/filediff.py:1900
 msgid "Change highlighting incomplete"
 msgstr "Spremeni označevanje kot nedokončano"
 
-#: meld/filediff.py:1857
+#: meld/filediff.py:1901
 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."
@@ -1826,54 +1834,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:1865
+#: meld/filediff.py:1909
 msgid "Keep highlighting"
 msgstr "Poudarjanje skladnje"
 
-#: meld/filediff.py:1867
+#: meld/filediff.py:1911
 msgid "_Keep highlighting"
 msgstr "_Poudarjanje skladnje"
 
-#: meld/filediff.py:1880
+#: meld/filediff.py:1924
 msgid "Saving failed"
 msgstr "Shranjevanje je spodletelo."
 
-#: meld/filediff.py:1881
+#: meld/filediff.py:1925
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
 msgstr ""
 
-#: meld/filediff.py:1890
+#: meld/filediff.py:1934
 msgid "Save Left Pane As"
 msgstr "Shrani levi pladenj kot"
 
-#: meld/filediff.py:1892
+#: meld/filediff.py:1936
 msgid "Save Middle Pane As"
 msgstr "Shrani srednji pladenj kot"
 
-#: meld/filediff.py:1894
+#: meld/filediff.py:1938
 msgid "Save Right Pane As"
 msgstr "Shrani desni pladenj kot"
 
-#: meld/filediff.py:1905
+#: meld/filediff.py:1949
 #, python-format
 msgid "File %s has changed on disk since it was opened"
 msgstr "Datoteka %s je bila po odpiranju na disku spremenjena."
 
-#: meld/filediff.py:1907
+#: meld/filediff.py:1951
 msgid "If you save it, any external changes will be lost."
 msgstr "Če datoteko shranite, bodo vse zunanje spremembe izgubljene."
 
-#: meld/filediff.py:1910
+#: meld/filediff.py:1954
 msgid "Save Anyway"
 msgstr "Vseeno shrani"
 
-#: meld/filediff.py:1911
+#: meld/filediff.py:1955
 msgid "Don’t Save"
 msgstr "Ne shrani"
 
-#: meld/filediff.py:1953
+#: meld/filediff.py:1997
 #, fuzzy
 #| msgid ""
 #| "'%s' contains characters not encodable with '%s'\n"
@@ -1885,7 +1893,7 @@ 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:1957 meld/patchdialog.py:138
+#: meld/filediff.py:2001 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1894,20 +1902,20 @@ msgstr ""
 "Ni mogoče shraniti datoteko zaradi:\n"
 "%s"
 
-#: meld/filediff.py:1961 meld/patchdialog.py:137
+#: meld/filediff.py:2005 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Ni mogoče shraniti datoteke %s."
 
-#: meld/filediff.py:2022
+#: meld/filediff.py:2066
 msgid "Open File"
 msgstr "Odpri datoteko"
 
-#: meld/filediff.py:2376
+#: meld/filediff.py:2419
 msgid "Live comparison updating disabled"
 msgstr "Živo posodabljanje ob primerjavi je onemogočeno"
 
-#: meld/filediff.py:2377
+#: meld/filediff.py:2420
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1917,135 +1925,135 @@ msgstr ""
 "Še vedno je mogoče ročno osvežiti primerjavo, živo posodabljanje pa bo spet "
 "na voljo, ko bo usklajevanje končano."
 
-#: meld/iohelpers.py:41
+#: meld/iohelpers.py:40
 msgid "Deleting remote folders is not supported"
 msgstr ""
 
-#: meld/iohelpers.py:43
+#: meld/iohelpers.py:42
 msgid "Not a file or directory"
 msgstr "Predmet ni ne datoteka ne mapa"
 
-#: meld/iohelpers.py:47
+#: meld/iohelpers.py:46
 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
 msgstr ""
 
-#: meld/iohelpers.py:52
+#: meld/iohelpers.py:51
 msgid "This remote location does not support sending items to the trash."
 msgstr ""
 
-#: meld/iohelpers.py:57
+#: meld/iohelpers.py:56
 msgid "_Delete Permanently"
 msgstr "_Trajno izbriši"
 
-#: meld/iohelpers.py:108
+#: meld/iohelpers.py:106
 #, python-format
 msgid "Replace file “%s”?"
 msgstr "Ali želite zamenjati datoteko »%s«?"
 
-#: meld/iohelpers.py:110
+#: meld/iohelpers.py:108
 #, python-format
 msgid ""
 "A file with this name already exists in “%s”.\n"
 "If you replace the existing file, its contents will be lost."
 msgstr ""
 
-#: meld/meldapp.py:179
+#: meld/meldapp.py:183
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Neveljavno število argumentov pri ukazu --diff."
 
-#: meld/meldapp.py:184
+#: meld/meldapp.py:188
 msgid "Start with an empty window"
 msgstr "Zagon brez odprtih oken"
 
-#: meld/meldapp.py:185 meld/meldapp.py:187
+#: meld/meldapp.py:189 meld/meldapp.py:191
 msgid "file"
 msgstr "datoteka"
 
-#: meld/meldapp.py:185 meld/meldapp.py:189
+#: meld/meldapp.py:189 meld/meldapp.py:193
 msgid "folder"
 msgstr "mapa"
 
-#: meld/meldapp.py:186
+#: meld/meldapp.py:190
 msgid "Start a version control comparison"
 msgstr "Zagon primerjave nadzora različic"
 
-#: meld/meldapp.py:188
+#: meld/meldapp.py:192
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: meld/meldapp.py:190
+#: meld/meldapp.py:194
 #, fuzzy
 msgid "Start a 2- or 3-way folder comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: meld/meldapp.py:233
+#: meld/meldapp.py:237
 #, python-format
 msgid "Error: %s\n"
 msgstr "Napaka: %s\n"
 
-#: meld/meldapp.py:240
+#: meld/meldapp.py:244
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je orodje za primerjavo vsebine datotek in map."
 
-#: meld/meldapp.py:244
+#: meld/meldapp.py:248
 msgid "Set label to use instead of file name"
 msgstr "Določi naslov namesto imena datoteke"
 
-#: meld/meldapp.py:247
+#: meld/meldapp.py:251
 msgid "Open a new tab in an already running instance"
 msgstr "Odpri nov zavihek v že zagnanem programu"
 
-#: meld/meldapp.py:250
+#: meld/meldapp.py:254
 msgid "Automatically compare all differing files on startup"
 msgstr "Ob zagonu samodejno primerjaj vse različne datoteke."
 
-#: meld/meldapp.py:253
+#: meld/meldapp.py:257
 msgid "Ignored for compatibility"
 msgstr "Prezrto zaradi skladnosti"
 
-#: meld/meldapp.py:257
+#: meld/meldapp.py:261
 msgid "Set the target file for saving a merge result"
 msgstr "Določitev ciljne datoteke za shranjevanje rezultatov združevanja."
 
-#: meld/meldapp.py:260
+#: meld/meldapp.py:264
 msgid "Automatically merge files"
 msgstr "Samodejno združi datoteke"
 
-#: meld/meldapp.py:264
+#: meld/meldapp.py:268
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Naloži shranjeno datoteko primerjav Meld"
 
-#: meld/meldapp.py:268
+#: meld/meldapp.py:272
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Ustvari zavihke primerjav za navedene datoteke ali mape."
 
-#: meld/meldapp.py:288
+#: meld/meldapp.py:292
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "preveč argumentov (zahtevanih 0-3, prejetih %d)"
 
-#: meld/meldapp.py:291
+#: meld/meldapp.py:295
 #, 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:293
+#: meld/meldapp.py:297
 #, fuzzy
 #| msgid "can't auto-merge directories"
 msgid "can’t auto-merge directories"
 msgstr "Ni mogoče združiti map"
 
-#: meld/meldapp.py:308
+#: meld/meldapp.py:312
 msgid "Error reading saved comparison file"
 msgstr "Napaka med branjem datoteke primerjav"
 
-#: meld/meldapp.py:325
-#, fuzzy, python-format
+#: meld/meldapp.py:329
+#, python-format
 msgid "invalid path or URI “%s”"
-msgstr "Neveljaven naslov URI mape »%s«"
+msgstr "Neveljavna pot oziroma naslov URI »%s«"
 
-#: meld/meldapp.py:331
+#: meld/meldapp.py:336
 msgid "remote folder “{}” not supported"
 msgstr ""
 
@@ -2054,20 +2062,20 @@ msgstr ""
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: meld/melddoc.py:60
+#: meld/melddoc.py:61
 msgid "untitled"
 msgstr "neimenovano"
 
-#: meld/meldwindow.py:151
+#: meld/meldwindow.py:155
 msgid "Filename"
 msgstr "Ime datoteke"
 
-#: meld/meldwindow.py:380
+#: meld/meldwindow.py:384
 #, python-format
 msgid "Need three files to auto-merge, got: %r"
 msgstr ""
 
-#: meld/meldwindow.py:402
+#: meld/meldwindow.py:406
 msgid "Cannot compare a mixture of files and directories"
 msgstr "Ni mogoče sočasno primerjati datotek in map"
 
@@ -2109,14 +2117,6 @@ msgstr "{name} ({charset})"
 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:123
 #, python-format
@@ -2158,23 +2158,23 @@ msgstr[1] "%d veja"
 msgstr[2] "%d veji"
 msgstr[3] "%d veje"
 
-#: meld/vc/git.py:333
+#: meld/vc/git.py:339
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Način je spremenjen iz %s v %s"
 
-#: meld/vc/git.py:341
+#: meld/vc/git.py:347
 #, fuzzy
 msgid "Partially staged"
 msgstr "delno označeno"
 
-#: meld/vc/git.py:341
+#: meld/vc/git.py:347
 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:38
 msgid "None"
 msgstr "Brez"
 
@@ -2328,6 +2328,12 @@ msgstr ""
 msgid "Clear"
 msgstr "Počisti"
 
+#~ msgid "Autodetect Encoding"
+#~ msgstr "Samodejno zaznaj zapis"
+
+#~ msgid "Current Locale ({})"
+#~ msgstr "Trenutne jezikovne nastavitve ({})"
+
 #~ msgid "Cannot import: "
 #~ msgstr "Ni mogoče uvoziti:"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]