[meld] Update Slovenian translation

[Translations User D-L <translations src gnome org>]

commit 5e72b6c1607fee3dd605ed4b3ecd1eb4371271d2
Author: Matej Urbančič <mateju src gnome org>
Date:   Thu May 13 08:04:20 2021 +0000

    Update Slovenian translation

 po/sl.po | 321 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 162 insertions(+), 159 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index cca360a9..63d3876a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
-"POT-Creation-Date: 2021-02-18 22:41+0000\n"
-"PO-Revision-Date: 2021-03-03 21:49+0100\n"
+"POT-Creation-Date: 2021-05-11 10:00+0000\n"
+"PO-Revision-Date: 2021-05-13 10:02+0200\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"
@@ -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.4.1\n"
+"X-Generator: Poedit 2.4.2\n"
 
 #: data/org.gnome.meld.desktop.in.in:3 data/org.gnome.meld.appdata.xml.in.in:11
 #: meld/resources/ui/appwindow.ui:9
@@ -187,7 +187,7 @@ msgstr ""
 
 #: data/org.gnome.meld.gschema.xml:126
 msgid "Show overview source map"
-msgstr ""
+msgstr "Pokaži izvorni predogledni zemljevid"
 
 #: data/org.gnome.meld.gschema.xml:127
 msgid ""
@@ -196,7 +196,7 @@ msgstr ""
 
 #: data/org.gnome.meld.gschema.xml:132
 msgid "Style of overview map"
-msgstr ""
+msgstr "Slog preglednega zemljevida"
 
 #: data/org.gnome.meld.gschema.xml:133
 msgid "Style options for how the overview map is displayed."
@@ -204,7 +204,7 @@ msgstr ""
 
 #: data/org.gnome.meld.gschema.xml:139
 msgid "Ignore blank lines when comparing files"
-msgstr ""
+msgstr "Prezri prazne vrstice med primerjavo datotek"
 
 #: data/org.gnome.meld.gschema.xml:140
 msgid ""
@@ -307,9 +307,8 @@ msgid ""
 msgstr ""
 
 #: data/org.gnome.meld.gschema.xml:196
-#, fuzzy
 msgid "Version control pane position"
-msgstr "Nadzor različic"
+msgstr "Položaj okna nadzora različic"
 
 #: data/org.gnome.meld.gschema.xml:197
 msgid ""
@@ -799,10 +798,8 @@ msgid "Ignored"
 msgstr "Prezrto"
 
 #: meld/resources/gtk/menus.ui:186
-#, fuzzy
-#| msgid "Flatten directories"
 msgid "Flatten folders"
-msgstr "_Razpni mape"
+msgstr "Splošči mape"
 
 #: meld/resources/ui/about-dialog.ui:8
 msgid ""
@@ -1077,7 +1074,7 @@ msgstr "Prelomljeno"
 msgid "Replace _All"
 msgstr "Zamenjaj _vse"
 
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1062 meld/iohelpers.py:113
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1067 meld/iohelpers.py:113
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
@@ -1106,43 +1103,43 @@ msgstr "Mapa"
 msgid "Version control"
 msgstr "Nadzor različic"
 
-#: meld/resources/ui/new-diff-tab.ui:235 meld/resources/ui/new-diff-tab.ui:352
+#: meld/resources/ui/new-diff-tab.ui:235 meld/resources/ui/new-diff-tab.ui:355
 msgid "_3-way comparison"
 msgstr "_Trojna primerjava"
 
-#: meld/resources/ui/new-diff-tab.ui:254
+#: meld/resources/ui/new-diff-tab.ui:255
 msgid "Select First File"
 msgstr "Izbor prve datoteke"
 
-#: meld/resources/ui/new-diff-tab.ui:267
+#: meld/resources/ui/new-diff-tab.ui:269
 msgid "Select Second File"
 msgstr "Izbor druge datoteke"
 
-#: meld/resources/ui/new-diff-tab.ui:281
+#: meld/resources/ui/new-diff-tab.ui:284
 msgid "Select Third File"
 msgstr "Izbor tretje datoteke"
 
-#: meld/resources/ui/new-diff-tab.ui:316
+#: meld/resources/ui/new-diff-tab.ui:319
 msgid "Select First Folder"
 msgstr "Izbor prve mape"
 
-#: meld/resources/ui/new-diff-tab.ui:329
+#: meld/resources/ui/new-diff-tab.ui:332
 msgid "Select Second Folder"
 msgstr "Izbor druge mape"
 
-#: meld/resources/ui/new-diff-tab.ui:343
+#: meld/resources/ui/new-diff-tab.ui:346
 msgid "Select Third Folder"
 msgstr "Izbor tretje mape"
 
-#: meld/resources/ui/new-diff-tab.ui:393
+#: meld/resources/ui/new-diff-tab.ui:396
 msgid "Select A Version-Controlled Folder"
 msgstr "Izbor mape nadzora različic"
 
-#: meld/resources/ui/new-diff-tab.ui:442
+#: meld/resources/ui/new-diff-tab.ui:445
 msgid "_Blank comparison"
 msgstr "_Prazna primerjava"
 
-#: meld/resources/ui/new-diff-tab.ui:459
+#: meld/resources/ui/new-diff-tab.ui:462
 msgid "C_ompare"
 msgstr "_Primerjava"
 
@@ -1196,7 +1193,7 @@ 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:198 meld/ui/statusbar.py:288
+#: meld/resources/ui/preferences.ui:198 meld/ui/statusbar.py:291
 msgid "Display"
 msgstr "Prikaz"
 
@@ -1420,22 +1417,16 @@ msgid "_Push commits"
 msgstr "_Objavi uveljavitve"
 
 #: meld/resources/ui/recent-selector.ui:16
-#, fuzzy
-#| msgid "Search text encoding…"
 msgid "Search recent comparisons…"
-msgstr "Iskanje kodiranja besedila …"
+msgstr "Iskanje nedavnih primerjav …"
 
 #: 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?"
+msgstr "Ali želite zavreči neshranjene spremembe dokumentov?"
 
 #: 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"
+msgstr "Spremembe navedenih dokumentov bodo trajno izgubljene:"
 
 #: meld/resources/ui/revert-dialog.ui:39
 msgid "_Discard"
@@ -1453,7 +1444,7 @@ 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:1061
+#: meld/resources/ui/save-confirm-dialog.ui:38 meld/dirdiff.py:1066
 #: meld/iohelpers.py:55 meld/iohelpers.py:112
 msgid "_Cancel"
 msgstr "_Prekliči"
@@ -1554,7 +1545,7 @@ msgstr "Povrni delovno kopijo na izvorno stanje"
 msgid "Delete from working copy"
 msgstr "Izbriši iz delovne kopije"
 
-#: meld/resources/ui/vcview.ui:220 meld/vcview.py:411
+#: meld/resources/ui/vcview.ui:220
 msgid "Location"
 msgstr "Mesto"
 
@@ -1605,120 +1596,124 @@ msgstr "Čas spremembe"
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: meld/dirdiff.py:778 meld/dirdiff.py:801
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr "[%s] Preiskovanje %s"
-
-#: meld/dirdiff.py:941
-#, python-format
-msgid "[%s] Done"
-msgstr "[%s] končano"
+#: meld/dirdiff.py:778 meld/dirdiff.py:802
+#, python-brace-format
+msgid "[{label}] Scanning {folder}"
+msgstr ""
 
-#: meld/dirdiff.py:950
+#: meld/dirdiff.py:942
 #, python-brace-format
-msgid "Folder {duplicate_directory} is being compared to itself"
+#| msgid "[%s] Done"
+msgid "[{label}] Done"
+msgstr "[{label}] končano"
+
+#: meld/dirdiff.py:951
+msgid "Folder {} is being compared to itself"
 msgstr ""
 
-#: meld/dirdiff.py:955
+#: meld/dirdiff.py:957
 msgid "Folders have no differences"
 msgstr "V mapah ni razlik"
 
-#: meld/dirdiff.py:957
+#: meld/dirdiff.py:959
 msgid "Contents of scanned files in folders are identical."
 msgstr ""
 
-#: meld/dirdiff.py:959
+#: meld/dirdiff.py:961
 msgid ""
 "Scanned files in folders appear identical, but contents have not been "
 "scanned."
 msgstr ""
 
-#: meld/dirdiff.py:962
+#: meld/dirdiff.py:964
 msgid "File filters are in use, so not all files have been scanned."
 msgstr ""
 
-#: meld/dirdiff.py:964
+#: meld/dirdiff.py:966
 msgid "Text filters are in use and may be masking content differences."
 msgstr ""
 
-#: meld/dirdiff.py:980 meld/filediff.py:1873
+#: meld/dirdiff.py:982 meld/filediff.py:1874
 msgid "Hide"
 msgstr "Skrij"
 
-#: 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
+#: meld/dirdiff.py:984 meld/filediff.py:1876 meld/filediff.py:1906
+#: meld/filediff.py:1908 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: meld/dirdiff.py:991
+#: meld/dirdiff.py:993
 msgid "Multiple errors occurred while scanning this folder"
-msgstr "Med preiskovanjem mape, je prišlo do več napak."
+msgstr "Med preiskovanjem mape je prišlo do več napak."
 
-#: meld/dirdiff.py:992
+#: meld/dirdiff.py:994
 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:994
+#: meld/dirdiff.py:996
 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:996
+#: meld/dirdiff.py:998
 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:998
+#: meld/dirdiff.py:1000
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
 msgstr ""
 "Zagnan je način primerjave brez upoštevanja velikosti črk na sistemu, ki "
-"razlike velikosti upošteva. Nekatere datoteke so skrite:\n"
-"%s"
+"razlike velikosti upošteva. Nekatere datoteke so skrite:"
 
-#: meld/dirdiff.py:1009
-#, fuzzy, python-format
+#: meld/dirdiff.py:1011
+#, fuzzy, python-brace-format
 #| msgid "'%s' hidden by '%s'"
-msgid "“%s” hidden by “%s”"
+msgid "“{first_file}” hidden by “{second_file}”"
 msgstr "'%s' je skrit; '%s'"
 
-#: meld/dirdiff.py:1065
+#: meld/dirdiff.py:1070
 #, python-format
 msgid "Replace folder “%s”?"
 msgstr "Ali želite zamenjati mapo »%s«?"
 
-#: meld/dirdiff.py:1067
+#: meld/dirdiff.py:1072
 #, 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:1080
+#: meld/dirdiff.py:1085
 msgid "Error copying file"
 msgstr "Napaka kopiranja datoteke"
 
-#: meld/dirdiff.py:1081
-#, python-format
+#: meld/dirdiff.py:1086
+#, fuzzy, python-brace-format
+#| msgid ""
+#| "Couldn’t copy %s\n"
+#| "to %s.\n"
+#| "\n"
+#| "%s"
 msgid ""
-"Couldn’t copy %s\n"
-"to %s.\n"
+"Couldn’t copy {source}\n"
+"to {dest}.\n"
 "\n"
-"%s"
+"{error}"
 msgstr ""
 "Ni mogoče kopirati %s\n"
 "v %s\n"
 "\n"
 "%s"
 
-#: meld/dirdiff.py:1106 meld/vcview.py:759
+#: meld/dirdiff.py:1111 meld/vcview.py:759
 msgid "Error deleting {}"
 msgstr "Napaka med brisanjem {}"
 
-#: meld/dirdiff.py:1599
+#: meld/dirdiff.py:1604
 msgid "No folder"
 msgstr "Ni mape"
 
@@ -1791,15 +1786,14 @@ msgid "_Reload"
 msgstr "_Ponovno naloži"
 
 #: meld/filediff.py:1830
-#, python-brace-format
-msgid "File {duplicate_files[0]} is being compared to itself"
+msgid "File {} is being compared to itself"
 msgstr ""
 
-#: meld/filediff.py:1838
+#: meld/filediff.py:1839
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: meld/filediff.py:1851
+#: meld/filediff.py:1852
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1807,26 +1801,26 @@ msgstr ""
 "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
 "Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: meld/filediff.py:1856
+#: meld/filediff.py:1857
 msgid "Files differ in line endings only"
 msgstr ""
 
-#: meld/filediff.py:1858
+#: meld/filediff.py:1859
 #, python-format
 msgid ""
 "Files are identical except for differing line endings:\n"
 "%s"
 msgstr ""
 
-#: meld/filediff.py:1878
+#: meld/filediff.py:1879
 msgid "Show without filters"
 msgstr "Pokaži brez filtrov"
 
-#: meld/filediff.py:1900
+#: meld/filediff.py:1901
 msgid "Change highlighting incomplete"
 msgstr "Spremeni označevanje kot nedokončano"
 
-#: meld/filediff.py:1901
+#: meld/filediff.py:1902
 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."
@@ -1834,66 +1828,60 @@ 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:1909
+#: meld/filediff.py:1910
 msgid "Keep highlighting"
 msgstr "Poudarjanje skladnje"
 
-#: meld/filediff.py:1911
+#: meld/filediff.py:1912
 msgid "_Keep highlighting"
 msgstr "_Poudarjanje skladnje"
 
-#: meld/filediff.py:1924
+#: meld/filediff.py:1925
 msgid "Saving failed"
 msgstr "Shranjevanje je spodletelo."
 
-#: meld/filediff.py:1925
+#: meld/filediff.py:1926
 msgid ""
 "Please consider copying any critical changes to another program or file to "
 "avoid data loss."
 msgstr ""
 
-#: meld/filediff.py:1934
+#: meld/filediff.py:1935
 msgid "Save Left Pane As"
 msgstr "Shrani levi pladenj kot"
 
-#: meld/filediff.py:1936
+#: meld/filediff.py:1937
 msgid "Save Middle Pane As"
 msgstr "Shrani srednji pladenj kot"
 
-#: meld/filediff.py:1938
+#: meld/filediff.py:1939
 msgid "Save Right Pane As"
 msgstr "Shrani desni pladenj kot"
 
-#: meld/filediff.py:1949
+#: meld/filediff.py:1950
 #, 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:1951
+#: meld/filediff.py:1952
 msgid "If you save it, any external changes will be lost."
 msgstr "Če datoteko shranite, bodo vse zunanje spremembe izgubljene."
 
-#: meld/filediff.py:1954
+#: meld/filediff.py:1955
 msgid "Save Anyway"
 msgstr "Vseeno shrani"
 
-#: meld/filediff.py:1955
+#: meld/filediff.py:1956
 msgid "Don’t Save"
 msgstr "Ne shrani"
 
-#: meld/filediff.py:1997
-#, fuzzy
-#| msgid ""
-#| "'%s' contains characters not encodable with '%s'\n"
-#| "Would you like to save as UTF-8?"
+#: meld/filediff.py:1998
 msgid ""
 "File “{}” contains characters that can’t be encoded using its current "
 "encoding “{}”."
-msgstr ""
-"'%s' vsebuje znake, ki jih ni mogoče kodirati v naboru '%s'\n"
-"Ali naj se datoteka shrani v naboru UTF-8?"
+msgstr "Datoteka »{}« vsebuje znake, ki jih ni mogoče kodirati v naboru »{}«."
 
-#: meld/filediff.py:2001 meld/patchdialog.py:138
+#: meld/filediff.py:2002 meld/patchdialog.py:138
 #, python-format
 msgid ""
 "Couldn’t save file due to:\n"
@@ -1902,20 +1890,20 @@ msgstr ""
 "Ni mogoče shraniti datoteko zaradi:\n"
 "%s"
 
-#: meld/filediff.py:2005 meld/patchdialog.py:137
+#: meld/filediff.py:2006 meld/patchdialog.py:137
 #, python-format
 msgid "Could not save file %s."
 msgstr "Ni mogoče shraniti datoteke %s."
 
-#: meld/filediff.py:2066
+#: meld/filediff.py:2067
 msgid "Open File"
 msgstr "Odpri datoteko"
 
-#: meld/filediff.py:2419
+#: meld/filediff.py:2421
 msgid "Live comparison updating disabled"
 msgstr "Živo posodabljanje ob primerjavi je onemogočeno"
 
-#: meld/filediff.py:2420
+#: meld/filediff.py:2422
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1957,103 +1945,102 @@ msgid ""
 "If you replace the existing file, its contents will be lost."
 msgstr ""
 
-#: meld/meldapp.py:183
+#: meld/meldapp.py:188
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Neveljavno število argumentov pri ukazu --diff."
 
-#: meld/meldapp.py:188
+#: meld/meldapp.py:193
 msgid "Start with an empty window"
 msgstr "Zagon brez odprtih oken"
 
-#: meld/meldapp.py:189 meld/meldapp.py:191
+#: meld/meldapp.py:194 meld/meldapp.py:196
 msgid "file"
 msgstr "datoteka"
 
-#: meld/meldapp.py:189 meld/meldapp.py:193
+#: meld/meldapp.py:194 meld/meldapp.py:198
 msgid "folder"
 msgstr "mapa"
 
-#: meld/meldapp.py:190
+#: meld/meldapp.py:195
 msgid "Start a version control comparison"
 msgstr "Zagon primerjave nadzora različic"
 
-#: meld/meldapp.py:192
+#: meld/meldapp.py:197
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: meld/meldapp.py:194
-#, fuzzy
+#: meld/meldapp.py:199
 msgid "Start a 2- or 3-way folder comparison"
-msgstr "Zagon z dvojno ali trojno primerjavo datotek"
+msgstr "Zagon z dvojno ali trojno primerjavo map"
 
-#: meld/meldapp.py:237
+#: meld/meldapp.py:242
 #, python-format
 msgid "Error: %s\n"
 msgstr "Napaka: %s\n"
 
-#: meld/meldapp.py:244
+#: meld/meldapp.py:249
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je orodje za primerjavo vsebine datotek in map."
 
-#: meld/meldapp.py:248
+#: meld/meldapp.py:253
 msgid "Set label to use instead of file name"
 msgstr "Določi naslov namesto imena datoteke"
 
-#: meld/meldapp.py:251
+#: meld/meldapp.py:256
 msgid "Open a new tab in an already running instance"
 msgstr "Odpri nov zavihek v že zagnanem programu"
 
-#: meld/meldapp.py:254
+#: meld/meldapp.py:259
 msgid "Automatically compare all differing files on startup"
 msgstr "Ob zagonu samodejno primerjaj vse različne datoteke."
 
-#: meld/meldapp.py:257
+#: meld/meldapp.py:262
 msgid "Ignored for compatibility"
 msgstr "Prezrto zaradi skladnosti"
 
-#: meld/meldapp.py:261
+#: meld/meldapp.py:266
 msgid "Set the target file for saving a merge result"
 msgstr "Določitev ciljne datoteke za shranjevanje rezultatov združevanja."
 
-#: meld/meldapp.py:264
+#: meld/meldapp.py:269
 msgid "Automatically merge files"
 msgstr "Samodejno združi datoteke"
 
-#: meld/meldapp.py:268
+#: meld/meldapp.py:273
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Naloži shranjeno datoteko primerjav Meld"
 
-#: meld/meldapp.py:272
+#: meld/meldapp.py:277
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Ustvari zavihke primerjav za navedene datoteke ali mape."
 
-#: meld/meldapp.py:292
+#: meld/meldapp.py:297
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "preveč argumentov (zahtevanih 0-3, prejetih %d)"
 
-#: meld/meldapp.py:295
+#: meld/meldapp.py:300
 #, 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:297
+#: meld/meldapp.py:302
 #, fuzzy
 #| msgid "can't auto-merge directories"
 msgid "can’t auto-merge directories"
 msgstr "Ni mogoče združiti map"
 
-#: meld/meldapp.py:312
+#: meld/meldapp.py:317
 msgid "Error reading saved comparison file"
 msgstr "Napaka med branjem datoteke primerjav"
 
-#: meld/meldapp.py:329
+#: meld/meldapp.py:334
 #, python-format
 msgid "invalid path or URI “%s”"
 msgstr "Neveljavna pot oziroma naslov URI »%s«"
 
-#: meld/meldapp.py:336
+#: meld/meldapp.py:341
 msgid "remote folder “{}” not supported"
 msgstr ""
 
@@ -2103,9 +2090,8 @@ msgstr "vzorec"
 msgid "Version control:"
 msgstr "Nadzor različic:"
 
-#: meld/style.py:90
-#, python-format
-msgid "Couldn’t find colour scheme details for %s-%s; this is a bad install"
+#: meld/style.py:91
+msgid "Couldn’t find colour scheme details for {}; this is a bad install"
 msgstr ""
 
 #: meld/ui/bufferselectors.py:110
@@ -2118,12 +2104,12 @@ msgid "Plain Text"
 msgstr "Običajno besedilo"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: meld/ui/statusbar.py:123
-#, python-format
-msgid "Ln %i, Col %i"
-msgstr "Vr. %i, St. %i"
+#: meld/ui/statusbar.py:125
+#, python-brace-format
+msgid "Ln {line}, Col {column}"
+msgstr ""
 
-#: meld/ui/statusbar.py:183
+#: meld/ui/statusbar.py:185
 msgid "Line you want to move the cursor to"
 msgstr ""
 
@@ -2131,16 +2117,18 @@ msgstr ""
 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:91
-#, python-format
-msgid "%s in %s"
-msgstr "%s v %s"
+#. Translators: First element is replaced by translated "%d
+#. unpushed commits", second element is replaced by translated
+#. "%d branches"
+#: meld/vc/git.py:92
+#, fuzzy, python-brace-format
+#| msgid "%d unpushed commits in %d branches"
+msgid "{unpushed_commits} in {unpushed_branches}"
+msgstr "%d neobjavljenih uveljavitev v %d vejah"
 
 #. Translators: These messages cover the case where there is
 #. only one branch, and are not part of another message.
-#: meld/vc/git.py:92 meld/vc/git.py:99
+#: meld/vc/git.py:94 meld/vc/git.py:103
 #, python-format
 msgid "%d unpushed commit"
 msgid_plural "%d unpushed commits"
@@ -2149,7 +2137,7 @@ msgstr[1] "%d neobjavljena uveljavitev"
 msgstr[2] "%d neobjavljeni uveljavitvi"
 msgstr[3] "%d neobjavljene uveljavitve"
 
-#: meld/vc/git.py:94
+#: meld/vc/git.py:97
 #, python-format
 msgid "%d branch"
 msgid_plural "%d branches"
@@ -2158,17 +2146,18 @@ msgstr[1] "%d veja"
 msgstr[2] "%d veji"
 msgstr[3] "%d veje"
 
-#: meld/vc/git.py:339
-#, python-format
-msgid "Mode changed from %s to %s"
+#: meld/vc/git.py:344
+#, fuzzy, python-brace-format
+#| msgid "Mode changed from %s to %s"
+msgid "Mode changed from {old_mode} to {new_mode}"
 msgstr "Način je spremenjen iz %s v %s"
 
-#: meld/vc/git.py:347
+#: meld/vc/git.py:352
 #, fuzzy
 msgid "Partially staged"
 msgstr "delno označeno"
 
-#: meld/vc/git.py:347
+#: meld/vc/git.py:352
 msgid "Staged"
 msgstr "V pripravljenosti"
 
@@ -2258,9 +2247,10 @@ msgstr "Izbor različice sistema za nadzor različic za uporabo"
 
 #. TRANSLATORS: This is the location of the directory being viewed
 #: meld/vcview.py:411
-#, python-format
-msgid "%s: %s"
-msgstr "%s: %s"
+#, python-brace-format
+#| msgid "Location"
+msgid "Location: {path}"
+msgstr "Mesto: {path}"
 
 #. Initial yield so when we add this to our tasks, we don't
 #. create iterators that may be invalidated.
@@ -2328,6 +2318,22 @@ msgstr ""
 msgid "Clear"
 msgstr "Počisti"
 
+#, python-format
+#~ msgid "[%s] Scanning %s"
+#~ msgstr "[%s] Preiskovanje %s"
+
+#, python-format
+#~ msgid "Ln %i, Col %i"
+#~ msgstr "Vr. %i, St. %i"
+
+#, python-format
+#~ msgid "%s in %s"
+#~ msgstr "%s v %s"
+
+#, python-format
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
 #~ msgid "Autodetect Encoding"
 #~ msgstr "Samodejno zaznaj zapis"
 
@@ -3030,8 +3036,5 @@ msgstr "Počisti"
 #~ msgid "Report a bug"
 #~ msgstr "Pošlji poročilo o hrošču"
 
-#~ msgid "%d unpushed commits in %d branches"
-#~ msgstr "%d neobjavljenih uveljavitev v %d vejah"
-
 #~ msgid "Tag"
 #~ msgstr "Oznaka"