[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: Sun, 25 Sep 2022 19:26:17 +0000 (UTC)
commit dc7b1abb4ddc80fa59a7889aec2fc9a46418fb4e
Author: Martin <miles filmsi net>
Date: Sun Sep 25 19:26:15 2022 +0000
Update Slovenian translation
po/sl.po | 1321 +++++++++++++++-----------------------------------------------
1 file changed, 320 insertions(+), 1001 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index b83a3702..e258b2f6 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: meld master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\n";
-"POT-Creation-Date: 2022-01-17 21:20+0000\n"
-"PO-Revision-Date: 2022-02-07 20:48+0100\n"
-"Last-Translator: Matej Urbančič <mateju src gnome org>\n"
+"POT-Creation-Date: 2022-09-06 06:29+0000\n"
+"PO-Revision-Date: 2022-09-25 21:25+0200\n"
+"Last-Translator: Martin Srebotnjak <miles filmsi net>\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 3.0\n"
+"X-Generator: Poedit 3.1.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 meld/resources/ui/appwindow.ui:17
@@ -53,13 +53,12 @@ msgstr ""
"in Subversion."
#: data/org.gnome.meld.appdata.xml.in.in:21
-#, fuzzy
msgid ""
"Meld helps you review code changes, understand patches, and makes enormous "
"merge conflicts slightly less painful."
msgstr ""
-"Meld vam pomaga pregledati spremembe kode, razumeti obliže in naredi ogromne "
-"spajanje konfliktov nekoliko manj boleče."
+"Meld vam pomaga pregledati spremembe kode, razumeti popravke in naredi spore "
+"pri gromozanskem spajanju nekoliko manj boleče."
#: data/org.gnome.meld.appdata.xml.in.in:51
msgid "The GNOME Project"
@@ -95,8 +94,8 @@ msgid ""
"If true, the GTK dark theme variant will be used, if available. Note that "
"this is separate from the syntax highlighting scheme."
msgstr ""
-"Če je res, bo uporabljena različica temne teme GTK, če je na voljo. "
-"Upoštevajte, da je to ločeno od sheme za označevanje sintakse."
+"Če je res, bo uporabljena temna različica teme GTK, če je na voljo. "
+"Upoštevajte, da je to ločeno od sheme za poudarjanje skladnje."
#: data/org.gnome.meld.gschema.xml:65
msgid "Additional automatically detected text encodings"
@@ -110,10 +109,11 @@ msgid ""
"and the current locale-default encoding will always be used; other encodings "
"may also be tried, depending on the user’s locale."
msgstr ""
-"Meld bo s temi kodiranje besedila poskušal dekodirati naložene besedilne "
+"Meld bo s temi kodiranji besedila poskušal dekodirati naložene besedilne "
"datoteke, preden poskusite katero koli drugo kodiranje. Poleg kodiranja na "
-"tem seznamu bosta vedno uporabljena UTF-8 in trenutno kodiranje na lokalni "
-"ravni; lahko tudi druge kodiranje, odvisno od uporabnikovega lokala."
+"tem seznamu bosta vedno uporabljena UTF-8 in trenutno kodiranje na krajevni "
+"ravni; preizkusi se lahko tudi drugo kodiranje, odvisno od uporabnikovih "
+"krajevnih nastavitev."
#: data/org.gnome.meld.gschema.xml:73
msgid "Width of an indentation step"
@@ -141,20 +141,20 @@ msgstr "Pokaži številke vrstic"
#: data/org.gnome.meld.gschema.xml:84
#, fuzzy
msgid "If true, line numbers will be shown in the gutter of file comparisons."
-msgstr "Če je res, bodo številke vrstice prikazane v čreh primerjave datotek."
+msgstr ""
+"Če je res, bodo številke vrstic prikazane v vmesnem robu primerjave datotek."
#: data/org.gnome.meld.gschema.xml:88
msgid "Highlight syntax"
msgstr "Poudarjanje skladnje"
#: data/org.gnome.meld.gschema.xml:89
-#, fuzzy
msgid ""
"Whether to highlight syntax in comparisons. Because of Meld’s own color "
"highlighting, this is off by default."
msgstr ""
-"Ali poudariti sintakso v primerjavah. Zaradi Meld-ovega označevanje barv je "
-"to privzeto izklopljeno."
+"Ali naj bo skladnja v primerjavah poudarjena. Zaradi Meldovega poudarjanja z "
+"barvami je to privzeto izklopljeno."
#: data/org.gnome.meld.gschema.xml:93
msgid "Color scheme to use for syntax highlighting"
@@ -174,7 +174,7 @@ msgid ""
"If true, whitespace characters will be drawn in comparisons even if they are "
"not in a changed area."
msgstr ""
-"Če je res, bodo znaki belega prostora narisani v primerjavah, tudi če niso v "
+"Če je res, bodo znaki za presledek izrisani v primerjavah, tudi če niso v "
"spremenjenem območju."
#: data/org.gnome.meld.gschema.xml:108
@@ -196,7 +196,6 @@ msgid "Highlight current line"
msgstr "Poudari trenutno vrstico"
#: data/org.gnome.meld.gschema.xml:117
-#, fuzzy
msgid ""
"If true, the line containing the cursor will be highlighted in file "
"comparisons."
@@ -212,8 +211,8 @@ msgstr "Uporabi privzeto sistemsko pisavo stalne širine"
msgid ""
"If false, custom-font will be used instead of the system monospace font."
msgstr ""
-"Če je napačna, bo namesto pisave v enoprostornem sistemu uporabljena pisava "
-"po meri."
+"Če je napačna, bo namesto sistemske enoširne pisave uporabljena pisava po "
+"meri."
#: data/org.gnome.meld.gschema.xml:126
msgid "Custom font"
@@ -236,7 +235,7 @@ msgstr "Pokaži izvorni predogledni zemljevid"
msgid ""
"If true, file comparisons will have paired source maps for compared files."
msgstr ""
-"Če je res, bodo primerjave datotek imele združene izvorne zemljevide za "
+"Če je res, bodo imele primerjave datotek združene izvorne zemljevide za "
"primerjane datoteke."
#: data/org.gnome.meld.gschema.xml:139
@@ -252,12 +251,11 @@ msgid "Ignore blank lines when comparing files"
msgstr "Prezri prazne vrstice med primerjavo datotek"
#: data/org.gnome.meld.gschema.xml:147
-#, fuzzy
msgid ""
"If true, blank lines will be trimmed when highlighting changes between files."
msgstr ""
-"Če je res, bodo prazne vrstice pri označevanje sprememb med datotekami "
-"ošiljene."
+"Če je res, bodo prazne vrstice pri označevanju sprememb med datotekami "
+"obrezane."
#: data/org.gnome.meld.gschema.xml:154
msgid "Use the system default editor"
@@ -289,24 +287,21 @@ msgid "Columns to display"
msgstr "Prikazani stolpci"
#: data/org.gnome.meld.gschema.xml:167
-#, fuzzy
msgid ""
"List of column names in folder comparison and whether they should be "
"displayed."
-msgstr ""
-"Seznam imen stolpcev v primerjavi z mapami in ali jih je treba prikazati."
+msgstr "Seznam imen stolpcev v primerjavi map in ali jih je treba prikazati."
#: data/org.gnome.meld.gschema.xml:171 meld/resources/ui/preferences.ui:951
msgid "Ignore symbolic links"
msgstr "Prezri simbolne povezave"
#: data/org.gnome.meld.gschema.xml:172
-#, fuzzy
msgid ""
"If true, folder comparisons do not follow symbolic links when traversing the "
"folder tree."
msgstr ""
-"Če je res, primerjave map pri prehodu drevesa mape ne sledijo simbolnim "
+"Če je res, primerjave map pri prehajanju drevesa map ne sledijo simbolnim "
"povezavam."
#: data/org.gnome.meld.gschema.xml:176
@@ -321,8 +316,8 @@ msgid ""
"different otherwise."
msgstr ""
"Če je res, primerjave map primerjajo datoteke, ki temeljijo samo na "
-"velikosti in mtime, glede na to, da so datoteke enake, če se njihova "
-"velikost in mtime ujemata, in drugače."
+"velikosti in mtime, glede na to, da sta datoteki enaki, če se njuna velikost "
+"in mtime ujemata, sicer pa sta različni."
#: data/org.gnome.meld.gschema.xml:181
msgid "File timestamp resolution"
@@ -336,9 +331,9 @@ msgid ""
"is useful when comparing files between filesystems with different timestamp "
"resolution."
msgstr ""
-"Pri primerjavi na podlagi mtime je to najmanjša razlika v nanosekondih med "
-"dvema datotekama, preden se šteje, da imajo različne mtimes. To je uporabno "
-"pri primerjanju datotek med datotečnimi stemi z različno ločljivostjo "
+"Pri primerjavi na podlagi mtime je to najmanjša razlika v nanosekundah med "
+"dvema datotekama, preden velja, da imata različne mtimes. To je uporabno pri "
+"primerjanju datotek med datotečnimi sistemi z različno ločljivostjo "
"časovnega žiga."
#: data/org.gnome.meld.gschema.xml:186 meld/resources/ui/preferences.ui:852
@@ -353,8 +348,8 @@ msgid ""
"differences."
msgstr ""
"Če je res, primerjave map, ki primerjajo vsebino datoteke, uporabljajo tudi "
-"aktivne filtre besedila in možnost prazna črta za obrezovanje in prezrejo "
-"razlike v novi vrstici."
+"dejavne filtre besedila in možnost obrezave praznih vrstic ter prezre "
+"razlike v prelomih vrstic."
#: data/org.gnome.meld.gschema.xml:191
msgid "File status filters"
@@ -380,10 +375,13 @@ msgid "Version control pane position"
msgstr "Položaj okna nadzora različic"
#: data/org.gnome.meld.gschema.xml:204
+#, fuzzy
msgid ""
"This is the height of the main version control tree when the console pane is "
"shown."
msgstr ""
+"To je višina glavnega drevesa nadzora nad različicami, ko je prikazano "
+"podokno konzole."
#: data/org.gnome.meld.gschema.xml:208
msgid "Present version comparisons as left-local/right-remote"
@@ -401,7 +399,8 @@ msgstr ""
#: data/org.gnome.meld.gschema.xml:213
#, fuzzy
msgid "Order for files in three-way version control merge comparisons"
-msgstr "Zagon primerjave nadzora različic"
+msgstr ""
+"Vrstni red datotek v tristranih primerjavah spajanja nadzorovanih različic"
#: data/org.gnome.meld.gschema.xml:214
msgid ""
@@ -462,6 +461,8 @@ msgid ""
"List of predefined filename-based filters that, if active, will remove "
"matching files from a folder comparison."
msgstr ""
+"Seznam vnaprej določenih filtrov, ki temeljijo na datotečnih imenih, ki "
+"bodo, če so dejavni, odstranili ujemajoče se datoteke iz primerjave map."
#: data/org.gnome.meld.gschema.xml:263
msgid "Text-based filters"
@@ -473,6 +474,9 @@ msgid ""
"text from being used in a file comparison. The text will still be displayed, "
"but won’t contribute to the comparison itself."
msgstr ""
+"Seznam vnaprej določenih filtrov regularnih izrazov, ki bodo, če so dejavni, "
+"odstranili uporabo besedila pri primerjavi datotek. Besedilo bo še vedno "
+"prikazano, vendar ne bo prispevalo k sami primerjavi."
#: data/styles/meld-base.style-scheme.xml.in:1
msgid "Classic (Meld)"
@@ -522,365 +526,375 @@ msgstr "Osveži primerjavo"
#: meld/resources/gtk/help-overlay.ui:54
msgctxt "shortcut window"
+msgid "Open externally"
+msgstr "Odpri v zunanjem programu"
+
+#: meld/resources/gtk/help-overlay.ui:61
+msgctxt "shortcut window"
msgid "Fullscreen"
msgstr "Omogoči celozaslonski način"
-#: meld/resources/gtk/help-overlay.ui:63
+#: meld/resources/gtk/help-overlay.ui:68
+msgctxt "shortcut window"
+msgid "Swap left and right panes"
+msgstr "Zamenjaj levi in desni pladenj"
+
+#: meld/resources/gtk/help-overlay.ui:77
msgctxt "shortcut window"
msgid "Panes"
msgstr "Okna"
-#: meld/resources/gtk/help-overlay.ui:68
+#: meld/resources/gtk/help-overlay.ui:82
msgctxt "shortcut window"
msgid "Previous comparison pane"
msgstr "Skoči na predhodno okno primerjave"
-#: meld/resources/gtk/help-overlay.ui:75
+#: meld/resources/gtk/help-overlay.ui:89
msgctxt "shortcut window"
msgid "Next comparison pane"
msgstr "Skoči na naslednje okno primerjave"
-#: meld/resources/gtk/help-overlay.ui:84
+#: meld/resources/gtk/help-overlay.ui:98
msgctxt "shortcut window"
msgid "Changes"
msgstr "Spremembe"
-#: meld/resources/gtk/help-overlay.ui:89
+#: meld/resources/gtk/help-overlay.ui:103
msgctxt "shortcut window"
msgid "Go to previous change"
msgstr "Skoči na predhodno spremembo"
-#: meld/resources/gtk/help-overlay.ui:96
+#: meld/resources/gtk/help-overlay.ui:110
msgctxt "shortcut window"
msgid "Go to next change"
msgstr "Skoči na naslednjo spremembo"
-#: meld/resources/gtk/help-overlay.ui:105
+#: meld/resources/gtk/help-overlay.ui:119
msgctxt "shortcut window"
msgid "Tabs"
msgstr "Zavihki"
-#: meld/resources/gtk/help-overlay.ui:110
+#: meld/resources/gtk/help-overlay.ui:124
msgctxt "shortcut window"
msgid "Go to previous tab"
msgstr "Skoči na predhodni zavihek"
-#: meld/resources/gtk/help-overlay.ui:117
+#: meld/resources/gtk/help-overlay.ui:131
msgctxt "shortcut window"
msgid "Go to next tab"
msgstr "Skoči na naslednji zavihek"
-#: meld/resources/gtk/help-overlay.ui:124
+#: meld/resources/gtk/help-overlay.ui:138
msgctxt "shortcut window"
msgid "Switch to tab"
msgstr "Preklopi na zavihek"
-#: meld/resources/gtk/help-overlay.ui:131
+#: meld/resources/gtk/help-overlay.ui:145
msgctxt "shortcut window"
msgid "Move tab left"
msgstr "Premakne na zavihek levo"
-#: meld/resources/gtk/help-overlay.ui:138
+#: meld/resources/gtk/help-overlay.ui:152
msgctxt "shortcut window"
msgid "Move tab right"
msgstr "Premakne na zavihek desno"
-#: meld/resources/gtk/help-overlay.ui:147
+#: meld/resources/gtk/help-overlay.ui:161
msgctxt "shortcut window"
msgid "Editing"
msgstr "Urejanje"
-#: meld/resources/gtk/help-overlay.ui:152
+#: meld/resources/gtk/help-overlay.ui:166
msgctxt "shortcut window"
msgid "Undo"
msgstr "Razveljavi dejanje"
-#: meld/resources/gtk/help-overlay.ui:159
+#: meld/resources/gtk/help-overlay.ui:173
msgctxt "shortcut window"
msgid "Redo"
msgstr "Ponovno uveljavi dejanje"
-#: meld/resources/gtk/help-overlay.ui:166
+#: meld/resources/gtk/help-overlay.ui:180
msgctxt "shortcut window"
msgid "Cut"
msgstr "Izreže izbor"
-#: meld/resources/gtk/help-overlay.ui:173
+#: meld/resources/gtk/help-overlay.ui:187
msgctxt "shortcut window"
msgid "Copy"
msgstr "Kopira izbor"
-#: meld/resources/gtk/help-overlay.ui:180
+#: meld/resources/gtk/help-overlay.ui:194
msgctxt "shortcut window"
msgid "Paste"
msgstr "Prilepi izbor"
-#: meld/resources/gtk/help-overlay.ui:187
+#: meld/resources/gtk/help-overlay.ui:201
msgctxt "shortcut window"
msgid "Find"
msgstr "Odpre iskalno polje"
-#: meld/resources/gtk/help-overlay.ui:194
+#: meld/resources/gtk/help-overlay.ui:208
msgctxt "shortcut window"
msgid "Find Next"
msgstr "Najde naslednjo pojavitev"
-#: meld/resources/gtk/help-overlay.ui:201
+#: meld/resources/gtk/help-overlay.ui:215
msgctxt "shortcut window"
msgid "Find Previous"
msgstr "Najde predhodno pojavitev"
-#: meld/resources/gtk/help-overlay.ui:208
+#: meld/resources/gtk/help-overlay.ui:222
msgctxt "shortcut window"
msgid "Replace"
msgstr "Zamenja vsebino"
-#: meld/resources/gtk/help-overlay.ui:217
+#: meld/resources/gtk/help-overlay.ui:231
msgctxt "shortcut window"
msgid "File comparison"
msgstr "Primerjava datotek"
-#: meld/resources/gtk/help-overlay.ui:222
+#: meld/resources/gtk/help-overlay.ui:236
msgctxt "shortcut window"
msgid "Save current file"
msgstr "Shrani trenutno datoteko"
-#: meld/resources/gtk/help-overlay.ui:229
+#: meld/resources/gtk/help-overlay.ui:243
msgctxt "shortcut window"
msgid "Save current file to new path"
msgstr "Shrani trenutno datoteko na novo mesto"
-#: meld/resources/gtk/help-overlay.ui:236
+#: meld/resources/gtk/help-overlay.ui:250
msgctxt "shortcut window"
msgid "Save all files in comparison"
msgstr "Shrani vse datoteke trenutne primerjave"
-#: meld/resources/gtk/help-overlay.ui:243
+#: meld/resources/gtk/help-overlay.ui:257
msgctxt "shortcut window"
msgid "Previous conflict"
msgstr "Skoči na predhodni niz v sporu"
-#: meld/resources/gtk/help-overlay.ui:250
+#: meld/resources/gtk/help-overlay.ui:264
msgctxt "shortcut window"
msgid "Next conflict"
msgstr "Skoči na naslednji niz v sporu"
-#: meld/resources/gtk/help-overlay.ui:257
+#: meld/resources/gtk/help-overlay.ui:271
msgctxt "shortcut window"
msgid "Push change to left"
msgstr "Potisne trenutne spremembe na levo"
-#: meld/resources/gtk/help-overlay.ui:264
+#: meld/resources/gtk/help-overlay.ui:278
msgctxt "shortcut window"
msgid "Push change to right"
msgstr "Potisne trenutne spremembe na desno"
-#: meld/resources/gtk/help-overlay.ui:271
+#: meld/resources/gtk/help-overlay.ui:285
msgctxt "shortcut window"
msgid "Pull change from left"
msgstr "Potegne spremembe z leve"
-#: meld/resources/gtk/help-overlay.ui:278
+#: meld/resources/gtk/help-overlay.ui:292
msgctxt "shortcut window"
msgid "Pull change from right"
msgstr "Potegne spremembe z desne"
-#: meld/resources/gtk/help-overlay.ui:285
+#: meld/resources/gtk/help-overlay.ui:299
msgctxt "shortcut window"
msgid "Copy change above left"
msgstr "Kopira spremembe nad levi del"
-#: meld/resources/gtk/help-overlay.ui:292
+#: meld/resources/gtk/help-overlay.ui:306
msgctxt "shortcut window"
msgid "Copy change below left"
msgstr "Kopira spremembe pod levi del"
-#: meld/resources/gtk/help-overlay.ui:299
+#: meld/resources/gtk/help-overlay.ui:313
msgctxt "shortcut window"
msgid "Copy change above right"
msgstr "Kopira spremembe nad desni del"
-#: meld/resources/gtk/help-overlay.ui:306
+#: meld/resources/gtk/help-overlay.ui:320
msgctxt "shortcut window"
msgid "Copy change below right"
msgstr "Kopira spremembe pod desni del"
-#: meld/resources/gtk/help-overlay.ui:313
-#: meld/resources/gtk/help-overlay.ui:341
+#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:355
msgctxt "shortcut window"
msgid "Delete change"
msgstr "Izbriše spremembo"
-#: meld/resources/gtk/help-overlay.ui:322
+#: meld/resources/gtk/help-overlay.ui:336
msgctxt "shortcut window"
msgid "Folder comparison"
msgstr "Primerjava map"
-#: meld/resources/gtk/help-overlay.ui:327
+#: meld/resources/gtk/help-overlay.ui:341
msgctxt "shortcut window"
msgid "Copy to left"
msgstr "Kopira na levo"
-#: meld/resources/gtk/help-overlay.ui:334
+#: meld/resources/gtk/help-overlay.ui:348
msgctxt "shortcut window"
msgid "Copy to right"
msgstr "Kopira na desno"
-#: meld/resources/gtk/help-overlay.ui:350
+#: meld/resources/gtk/help-overlay.ui:364
msgctxt "shortcut window"
msgid "Version control comparison"
msgstr "Primerjava nadzora različic"
-#: meld/resources/gtk/help-overlay.ui:355
+#: meld/resources/gtk/help-overlay.ui:369
msgctxt "shortcut window"
msgid "Commit to version control"
msgstr "Uveljavi spremembe v sistem za nadzor različic"
-#: meld/resources/gtk/help-overlay.ui:362
+#: meld/resources/gtk/help-overlay.ui:376
msgctxt "shortcut window"
msgid "Show/hide console output"
msgstr "Pokaže/Skrije odvod konzole"
#: 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
+#: meld/resources/gtk/menus.ui:11
msgid "Save A_ll"
msgstr "Shrani _vse"
-#: meld/resources/gtk/menus.ui:34
+#: meld/resources/gtk/menus.ui:15
msgid "Revert files…"
msgstr "Povrni datoteke …"
-#: meld/resources/gtk/menus.ui:38
+#: meld/resources/gtk/menus.ui:19
msgid "Open Externally"
msgstr "Odpri v zunanjem programu"
-#: meld/resources/gtk/menus.ui:45
+#: meld/resources/gtk/menus.ui:26
+msgid "Refresh Comparison"
+msgstr "Osveži primerjavo"
+
+#: meld/resources/gtk/menus.ui:33
msgid "_Find…"
msgstr "_Najdi …"
-#: meld/resources/gtk/menus.ui:49
+#: meld/resources/gtk/menus.ui:37
msgid "_Replace…"
msgstr "_Zamenjaj …"
-#: meld/resources/gtk/menus.ui:55
+#: meld/resources/gtk/menus.ui:43
msgid "View"
msgstr "Pogled"
-#: meld/resources/gtk/menus.ui:59
+#: meld/resources/gtk/menus.ui:47
+msgid "Fullscreen"
+msgstr "Celozaslonski način"
+
+#: meld/resources/gtk/menus.ui:52
msgid "Overview Map"
msgstr "Predogledni zemljevid"
-#: meld/resources/gtk/menus.ui:63
+#: meld/resources/gtk/menus.ui:56
msgid "Version control console"
msgstr "Konzola nadzora različic"
-#: meld/resources/gtk/menus.ui:67
+#: meld/resources/gtk/menus.ui:60
msgid "Lock scrolling"
msgstr "Zakleni drsenje"
+#: meld/resources/gtk/menus.ui:67
+msgid "Swap left and right panes"
+msgstr "Zamenjaj levi in desni pladenj"
+
#: meld/resources/gtk/menus.ui:73
msgid "Comparison"
msgstr "Primerjava"
-#: meld/resources/gtk/menus.ui:77
+#: meld/resources/gtk/menus.ui:75
+msgid "Stop"
+msgstr "Zaustavi"
+
+#: meld/resources/gtk/menus.ui:81
msgid "Merge All from Left"
msgstr "Združi vse spremembe z leve"
-#: meld/resources/gtk/menus.ui:81
+#: meld/resources/gtk/menus.ui:85
msgid "Merge All from Right"
msgstr "Združi vse spremembe z desne"
-#: meld/resources/gtk/menus.ui:85
+#: meld/resources/gtk/menus.ui:89
msgid "Merge All"
msgstr "Združi vse"
-#: meld/resources/gtk/menus.ui:92 meld/resources/ui/filediff-menus.ui:65
-msgid "Add Synchronization Point"
-msgstr "Dodaj točko usklajevanja"
-
-#: meld/resources/gtk/menus.ui:96 meld/resources/ui/filediff-menus.ui:69
-msgid "Clear Synchronization Points"
-msgstr "Počisti točke usklajevanja"
-
-#: meld/resources/gtk/menus.ui:103
+#: meld/resources/gtk/menus.ui:96
msgid "Format as Patch…"
msgstr "Zapiši kot programski popravek …"
-#: meld/resources/gtk/menus.ui:112
+#: meld/resources/gtk/menus.ui:105
msgid "_Preferences"
msgstr "_Možnosti"
-#: meld/resources/gtk/menus.ui:116
+#: meld/resources/gtk/menus.ui:109
msgid "Keyboard Shortcuts"
msgstr "Tipkovne bližnjice"
-#: meld/resources/gtk/menus.ui:120
+#: meld/resources/gtk/menus.ui:113
msgid "_Help"
msgstr "Pomo_č"
-#: meld/resources/gtk/menus.ui:125
+#: meld/resources/gtk/menus.ui:118
msgid "_About Meld"
msgstr "_O programu"
-#: meld/resources/gtk/menus.ui:138
+#: meld/resources/gtk/menus.ui:131
msgid "File status"
msgstr "Stanje datoteke"
-#: meld/resources/gtk/menus.ui:140
+#: meld/resources/gtk/menus.ui:133
msgid "Same"
msgstr "Enako"
-#: meld/resources/gtk/menus.ui:144
+#: meld/resources/gtk/menus.ui:137
msgid "New"
msgstr "Novo"
-#: meld/resources/gtk/menus.ui:148 meld/resources/gtk/menus.ui:167
-#: meld/vc/_vc.py:76
+#: meld/resources/gtk/menus.ui:141 meld/resources/gtk/menus.ui:164
+#: meld/vc/_vc.py:77
msgid "Modified"
msgstr "Spremenjeno"
-#: meld/resources/gtk/menus.ui:158
+#: meld/resources/gtk/menus.ui:151
msgid "Ignore filename case"
msgstr "Prezri velikost črk v imenih datotek"
-#: meld/resources/gtk/menus.ui:171
+#: meld/resources/gtk/menus.ui:155
+msgid "Normalize Unicode paths"
+msgstr "Normaliziraj poti Unicode"
+
+#: meld/resources/gtk/menus.ui:168
msgid "Normal"
msgstr "Običajno"
-#: meld/resources/gtk/menus.ui:175 meld/vc/_vc.py:70
+#: meld/resources/gtk/menus.ui:172 meld/vc/_vc.py:71
msgid "Unversioned"
msgstr "Brez določene različice"
-#: meld/resources/gtk/menus.ui:179 meld/vc/_vc.py:69
+#: meld/resources/gtk/menus.ui:176 meld/vc/_vc.py:70
msgid "Ignored"
msgstr "Prezrto"
-#: meld/resources/gtk/menus.ui:186
+#: meld/resources/gtk/menus.ui:183
msgid "Flatten folders"
msgstr "Splošči mape"
#: meld/resources/ui/about-dialog.ui:8
msgid ""
"Copyright © 2002-2009 Stephen Kennedy\n"
-"Copyright © 2009-2021 Kai Willadsen"
+"Copyright © 2009-2022 Kai Willadsen"
msgstr ""
"Avtorske pravice © 2002-2009 Stephen Kennedy\n"
-"Avtorske pravice © 2009-2021 Kai Willadsen"
+"Avtorske pravice © 2009-2022 Kai Willadsen"
#: meld/resources/ui/about-dialog.ui:14
msgid "translator-credits"
@@ -931,7 +945,7 @@ msgid "Column Name"
msgstr "Ime stolpca"
#: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:128
-#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:741
+#: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:745
msgid "_Remove"
msgstr "_Odstrani"
@@ -988,30 +1002,38 @@ msgid "_Compare selected files"
msgstr "_Primerjaj izbrane datoteke"
#: meld/resources/ui/dirdiff-menus.ui:14
+msgid "_Mark selected file"
+msgstr "_Označi izbrano datoteko"
+
+#: meld/resources/ui/dirdiff-menus.ui:18
+msgid "Compare _with marked file"
+msgstr "Primerjaj _z označeno datoteko"
+
+#: meld/resources/ui/dirdiff-menus.ui:25
msgid "Copy to _left"
msgstr "Kopiraj na _levo"
-#: meld/resources/ui/dirdiff-menus.ui:18
+#: meld/resources/ui/dirdiff-menus.ui:29
msgid "Copy to _right"
msgstr "Kopiraj na _desno"
-#: meld/resources/ui/dirdiff-menus.ui:22
+#: meld/resources/ui/dirdiff-menus.ui:33
msgid "_Delete selected"
msgstr "_Izbriši izbrano"
-#: meld/resources/ui/dirdiff-menus.ui:29
+#: meld/resources/ui/dirdiff-menus.ui:40
msgid "Collapse Recursively"
msgstr "Zloži"
-#: meld/resources/ui/dirdiff-menus.ui:33
+#: meld/resources/ui/dirdiff-menus.ui:44
msgid "Expand Recursively"
msgstr "Razširi"
-#: meld/resources/ui/dirdiff-menus.ui:40
+#: meld/resources/ui/dirdiff-menus.ui:51
msgid "_Open Externally"
msgstr "_Odpri v zunanjem programu"
-#: meld/resources/ui/dirdiff-menus.ui:44
+#: meld/resources/ui/dirdiff-menus.ui:55
msgid "_Copy File Paths"
msgstr "_Kopiraj poti datoteke"
@@ -1045,10 +1067,8 @@ msgid "Push current change to the right"
msgstr "Potisni trenutne spremembe na desno"
#: meld/resources/ui/filediff-actions.ui:65
-#, fuzzy
-#| msgid "Copy _up"
msgid "Copy chunks"
-msgstr "Kopiraj _navzgor"
+msgstr "Kopiraj koščke"
#: meld/resources/ui/filediff-actions.ui:87
msgid "Delete change"
@@ -1132,7 +1152,7 @@ msgstr "Datoteka 1"
#. Create icon and filename CellRenderer
#: meld/resources/ui/filter-list.ui:54 meld/resources/ui/vcview.ui:217
-#: meld/dirdiff.py:537
+#: meld/dirdiff.py:603
msgid "Name"
msgstr "Ime"
@@ -1172,7 +1192,7 @@ msgstr "Prelomljeno"
msgid "Replace _All"
msgstr "Zamenjaj _vse"
-#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1157 meld/iohelpers.py:114
+#: meld/resources/ui/findbar.ui:208 meld/dirdiff.py:1231 meld/iohelpers.py:117
msgid "_Replace"
msgstr "_Zamenjaj"
@@ -1390,6 +1410,8 @@ msgstr "Ločljivost časovnega _žiga:"
#: meld/resources/ui/preferences.ui:871
msgid "Note: enabling text filters may make comparing large files much slower"
msgstr ""
+"Opomba: omogočanje besedilnih filtrov lahko naredi primerjavo velikih "
+"datotek precej počasnejšo"
#: meld/resources/ui/preferences.ui:920
msgid "Symbolic Links"
@@ -1451,7 +1473,7 @@ msgstr "Spremeni obrezovanje"
#: meld/resources/ui/preferences.ui:1530
msgid "Trim blank line differences from the start and end of changes"
-msgstr ""
+msgstr "Obreži spremembe praznih vrstic od začetka in konca sprememb"
#: meld/resources/ui/preferences.ui:1574
msgid "Text filters"
@@ -1555,12 +1577,12 @@ 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:1156
-#: meld/iohelpers.py:56 meld/iohelpers.py:113
+#: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1229
+#: meld/iohelpers.py:56 meld/iohelpers.py:116
msgid "_Cancel"
msgstr "_Prekliči"
-#: meld/resources/ui/save-confirm-dialog.ui:52
+#: meld/resources/ui/save-confirm-dialog.ui:55
msgid "_Save"
msgstr "_Shrani"
@@ -1601,10 +1623,8 @@ msgid "Commit…"
msgstr "Uveljavi …"
#: meld/resources/ui/vcview.ui:38
-#, fuzzy
-#| msgid "Push current change to the left"
msgid "Pull remote changes to the local repository"
-msgstr "Potisni trenutne spremembe na levo"
+msgstr "Potegni oddaljene spremembe v krajevno skladišče"
#: meld/resources/ui/vcview.ui:51
msgid "Push local changes to remote"
@@ -1646,11 +1666,11 @@ msgstr "Dodatno"
msgid "Console output"
msgstr "Odvod konzole"
-#: meld/actiongutter.py:247
+#: meld/actiongutter.py:254
msgid "Copy _up"
msgstr "Kopiraj _navzgor"
-#: meld/actiongutter.py:248
+#: meld/actiongutter.py:255
msgid "Copy _down"
msgstr "Kopiraj _navzdol"
@@ -1667,95 +1687,98 @@ msgid "Mac OS (CR)"
msgstr "Mac OS (CR)"
#. Create file size CellRenderer
-#: meld/dirdiff.py:558 meld/preferences.py:132
+#: meld/dirdiff.py:624 meld/preferences.py:132
msgid "Size"
msgstr "Velikost"
#. Create date-time CellRenderer
-#: meld/dirdiff.py:566 meld/preferences.py:133
+#: meld/dirdiff.py:632 meld/preferences.py:133
msgid "Modification time"
msgstr "Čas spremembe"
#. Create ISO-format date-time CellRenderer
-#: meld/dirdiff.py:574 meld/preferences.py:134
+#: meld/dirdiff.py:640 meld/preferences.py:134
msgid "Modification time (ISO)"
msgstr "Čas spremembe (ISO)"
#. Create permissions CellRenderer
-#: meld/dirdiff.py:582 meld/preferences.py:135
+#: meld/dirdiff.py:648 meld/preferences.py:135
msgid "Permissions"
msgstr "Dovoljenja"
-#: meld/dirdiff.py:832
+#: meld/dirdiff.py:901
#, python-brace-format
msgid "{filename} (scanning…)"
msgstr "{filename} (poteka preiskovanje …)"
-#: meld/dirdiff.py:864 meld/dirdiff.py:888
+#: meld/dirdiff.py:933 meld/dirdiff.py:965
#, python-brace-format
msgid "[{label}] Scanning {folder}"
msgstr "[{label}] Prebiranje mape {folder}"
-#: meld/dirdiff.py:1028
+#: meld/dirdiff.py:1101
#, python-brace-format
msgid "[{label}] Done"
msgstr "[{label}] končano"
-#: meld/dirdiff.py:1041
+#: meld/dirdiff.py:1114
msgid "Folder {} is being compared to itself"
msgstr "Mapo {} primerjate samo s seboj"
-#: meld/dirdiff.py:1047
+#: meld/dirdiff.py:1120
msgid "Folders have no differences"
msgstr "V mapah ni razlik"
-#: meld/dirdiff.py:1049
+#: meld/dirdiff.py:1122
msgid "Contents of scanned files in folders are identical."
msgstr "Vsebina preiskanih datotek v mapah je enaka."
-#: meld/dirdiff.py:1051
+#: meld/dirdiff.py:1124
msgid ""
"Scanned files in folders appear identical, but contents have not been "
"scanned."
msgstr ""
+"Optično prebrane datoteke v mapah se zdijo enake, vendar vsebina ni bila "
+"optično prebrana."
-#: meld/dirdiff.py:1054
+#: meld/dirdiff.py:1127
msgid "File filters are in use, so not all files have been scanned."
msgstr ""
+"Filtri datotek so v uporabi, zato niso bile optično prebrane vse datoteke."
-#: meld/dirdiff.py:1056
+#: meld/dirdiff.py:1129
msgid "Text filters are in use and may be masking content differences."
-msgstr ""
+msgstr "Filtri za besedilo so v uporabi in lahko prikrijejo razlike v vsebini."
-#: meld/dirdiff.py:1072 meld/filediff.py:1917
+#: meld/dirdiff.py:1145 meld/filediff.py:1997
msgid "Hide"
msgstr "Skrij"
-#: meld/dirdiff.py:1074 meld/filediff.py:1919 meld/filediff.py:1949
-#: meld/filediff.py:1951 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
+#: meld/dirdiff.py:1147 meld/filediff.py:1999 meld/filediff.py:2029
+#: meld/filediff.py:2031 meld/ui/msgarea.py:114 meld/ui/msgarea.py:127
msgid "Hi_de"
msgstr "S_krij"
-#: meld/dirdiff.py:1083
+#: meld/dirdiff.py:1156
msgid "Multiple errors occurred while scanning this folder"
msgstr "Med preiskovanjem mape je prišlo do več napak."
-#: meld/dirdiff.py:1084
+#: meld/dirdiff.py:1157
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:1086
+#: meld/dirdiff.py:1159
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:1088
+#: meld/dirdiff.py:1161
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:1090
+#: meld/dirdiff.py:1163
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -1763,29 +1786,30 @@ msgstr ""
"Zagnan je način primerjave brez upoštevanja velikosti črk na sistemu, ki "
"razlike velikosti upošteva. Nekatere datoteke so skrite:"
-#: meld/dirdiff.py:1101
-#, fuzzy, python-brace-format
-#| msgid "'%s' hidden by '%s'"
+#: meld/dirdiff.py:1174
+#, python-brace-format
msgid "“{first_file}” hidden by “{second_file}”"
-msgstr "'%s' je skrit; '%s'"
+msgstr "»{first_file}« skrito s »{second_file}«"
-#: meld/dirdiff.py:1160
+#: meld/dirdiff.py:1236
#, python-format
msgid "Replace folder “%s”?"
msgstr "Ali želite zamenjati mapo »%s«?"
-#: meld/dirdiff.py:1162
+#: meld/dirdiff.py:1238
#, 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 ""
+"Druga mapa z istim imenom že obstaja v »%s«.\n"
+"Če zamenjate obstoječo mapo, bodo vse datoteke v tej mapi izgubljene."
-#: meld/dirdiff.py:1175
+#: meld/dirdiff.py:1251
msgid "Error copying file"
msgstr "Napaka kopiranja datoteke"
-#: meld/dirdiff.py:1176
+#: meld/dirdiff.py:1252
#, python-brace-format
msgid ""
"Couldn’t copy {source}\n"
@@ -1798,91 +1822,121 @@ msgstr ""
"\n"
"{error}"
-#: meld/dirdiff.py:1201 meld/vcview.py:764
+#: meld/dirdiff.py:1277 meld/vcview.py:768
msgid "Error deleting {}"
msgstr "Napaka med brisanjem {}"
-#: meld/dirdiff.py:1692
+#: meld/dirdiff.py:1825
msgid "No folder"
msgstr "Ni mape"
-#: meld/filediff.py:1149
+#: meld/dirdiff.py:1838
+msgid "Folder comparison:"
+msgstr "Primerjava map:"
+
+#: meld/filediff.py:1168
msgid "Comparison results will be inaccurate"
msgstr "Rezultati primerjave ne bodo natančni"
-#: meld/filediff.py:1151
+#: meld/filediff.py:1170
msgid ""
"A filter changed the number of lines in the file, which is unsupported. The "
"comparison will not be accurate."
msgstr ""
+"Filter je spremenil število vrstic v datoteki, ki ni podprta. Primerjava ne "
+"bo natančna."
-#: meld/filediff.py:1223
+#: meld/filediff.py:1242
msgid "Mark conflict as resolved?"
msgstr "Ali naj se spor označi kot razrešen?"
-#: meld/filediff.py:1225
+#: meld/filediff.py:1244
msgid ""
"If the conflict was resolved successfully, you may mark it as resolved now."
-msgstr ""
+msgstr "Če je bil spor uspešno rešen, ga lahko označite kot razrešenega."
-#: meld/filediff.py:1227
+#: meld/filediff.py:1247
msgid "Cancel"
msgstr "Prekliči"
-#: meld/filediff.py:1228
+#: meld/filediff.py:1248
msgid "Mark _Resolved"
msgstr "Označi kot _razrešeno"
-#: meld/filediff.py:1591
+#: meld/filediff.py:1439 meld/filediff.py:1455
+msgid "Add Synchronization Point"
+msgstr "Dodaj točko usklajevanja"
+
+#: meld/filediff.py:1443
+msgid "Remove Synchronization Point"
+msgstr "Odstrani točko usklajevanja"
+
+#: meld/filediff.py:1447
+msgid "Move Synchronization Point"
+msgstr "Premakni točko usklajevanja"
+
+#: meld/filediff.py:1451
+msgid "Match Synchronization Point"
+msgstr "Ujemi točko usklajevanja"
+
+#: meld/filediff.py:1475
+msgid "Clear Synchronization Points"
+msgstr "Počisti točke usklajevanja"
+
+#: meld/filediff.py:1535
+msgid "File comparison:"
+msgstr "Primerjava datotek:"
+
+#: meld/filediff.py:1671
#, python-format
msgid "There was a problem opening the file “%s”."
msgstr "Prišlo je do napake med odpiranjem datoteke “%s”."
-#: meld/filediff.py:1600
+#: meld/filediff.py:1680
#, python-format
msgid "File %s appears to be a binary file."
msgstr "Datoteka %s je videti kot dvojiška datoteka."
-#: meld/filediff.py:1602
+#: meld/filediff.py:1682
msgid "Do you want to open the file using the default application?"
msgstr "Ali želite odpreti datoteko z uporabo privzetega programa?"
-#: meld/filediff.py:1604
+#: meld/filediff.py:1684
msgid "Open"
msgstr "Odpri"
-#: meld/filediff.py:1626
+#: meld/filediff.py:1706
#, python-format
msgid "[%s] Merging files"
msgstr "[%s] Združevanje datotek"
-#: meld/filediff.py:1640
+#: meld/filediff.py:1720
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] Računanje razlik"
-#: meld/filediff.py:1700
+#: meld/filediff.py:1780
#, python-format
msgid "File %s has changed on disk"
msgstr "Datoteka %s je bila na disku spremenjena."
-#: meld/filediff.py:1701
+#: meld/filediff.py:1781
msgid "Do you want to reload the file?"
msgstr "Ali želite ponovno naložiti datoteko?"
-#: meld/filediff.py:1703
+#: meld/filediff.py:1783
msgid "_Reload"
msgstr "_Ponovno naloži"
-#: meld/filediff.py:1873
+#: meld/filediff.py:1953
msgid "File {} is being compared to itself"
msgstr "Datoteko {} primerjate samo s seboj"
-#: meld/filediff.py:1882
+#: meld/filediff.py:1962
msgid "Files are identical"
msgstr "Datoteki sta enaki"
-#: meld/filediff.py:1895
+#: meld/filediff.py:1975
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -1890,11 +1944,11 @@ msgstr ""
"Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
"Ali naj se primerja vsebina brez dejavnih filtrov?"
-#: meld/filediff.py:1900
+#: meld/filediff.py:1980
msgid "Files differ in line endings only"
msgstr "Datoteki se razlikujeta le v končnih vrstičnih oznakah"
-#: meld/filediff.py:1902
+#: meld/filediff.py:1982
#, python-format
msgid ""
"Files are identical except for differing line endings:\n"
@@ -1903,15 +1957,15 @@ msgstr ""
"Datoteki sta enaki, razlikujeta se le v končnih vrstičnih oznakah:\n"
"%s"
-#: meld/filediff.py:1922
+#: meld/filediff.py:2002
msgid "Show without filters"
msgstr "Pokaži brez filtrov"
-#: meld/filediff.py:1944
+#: meld/filediff.py:2024
msgid "Change highlighting incomplete"
msgstr "Spremeni označevanje kot nedokončano"
-#: meld/filediff.py:1945
+#: meld/filediff.py:2025
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."
@@ -1919,60 +1973,62 @@ 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:1953
+#: meld/filediff.py:2033
msgid "Keep highlighting"
msgstr "Poudarjanje skladnje"
-#: meld/filediff.py:1955
+#: meld/filediff.py:2035
msgid "_Keep highlighting"
msgstr "_Poudarjanje skladnje"
-#: meld/filediff.py:1968
+#: meld/filediff.py:2048
msgid "Saving failed"
msgstr "Shranjevanje je spodletelo."
-#: meld/filediff.py:1969
+#: meld/filediff.py:2049
msgid ""
"Please consider copying any critical changes to another program or file to "
"avoid data loss."
msgstr ""
+"Razmislite o kopiranju kritičnih sprememb v drug program ali datoteko, da se "
+"izognete izgubi podatkov."
-#: meld/filediff.py:1978
+#: meld/filediff.py:2058
msgid "Save Left Pane As"
msgstr "Shrani levi pladenj kot"
-#: meld/filediff.py:1980
+#: meld/filediff.py:2060
msgid "Save Middle Pane As"
msgstr "Shrani srednji pladenj kot"
-#: meld/filediff.py:1982
+#: meld/filediff.py:2062
msgid "Save Right Pane As"
msgstr "Shrani desni pladenj kot"
-#: meld/filediff.py:1993
+#: meld/filediff.py:2073
#, 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:1995
+#: meld/filediff.py:2075
msgid "If you save it, any external changes will be lost."
msgstr "Če datoteko shranite, bodo vse zunanje spremembe izgubljene."
-#: meld/filediff.py:1998
+#: meld/filediff.py:2078
msgid "Save Anyway"
msgstr "Vseeno shrani"
-#: meld/filediff.py:1999
+#: meld/filediff.py:2079
msgid "Don’t Save"
msgstr "Ne shrani"
-#: meld/filediff.py:2041
+#: meld/filediff.py:2121
msgid ""
"File “{}” contains characters that can’t be encoded using its current "
"encoding “{}”."
msgstr "Datoteka »{}« vsebuje znake, ki jih ni mogoče kodirati v naboru »{}«."
-#: meld/filediff.py:2045 meld/patchdialog.py:138
+#: meld/filediff.py:2125 meld/patchdialog.py:138
#, python-format
msgid ""
"Couldn’t save file due to:\n"
@@ -1981,16 +2037,16 @@ msgstr ""
"Ni mogoče shraniti datoteko zaradi:\n"
"%s"
-#: meld/filediff.py:2049 meld/patchdialog.py:137
+#: meld/filediff.py:2129 meld/patchdialog.py:137
#, python-format
msgid "Could not save file %s."
msgstr "Ni mogoče shraniti datoteke %s."
-#: meld/filediff.py:2450
+#: meld/filediff.py:2539
msgid "Live comparison updating disabled"
msgstr "Živo posodabljanje ob primerjavi je onemogočeno"
-#: meld/filediff.py:2451
+#: meld/filediff.py:2540
msgid ""
"Live updating of comparisons is disabled when synchronization points are "
"active. You can still manually refresh the comparison, and live updates will "
@@ -2010,22 +2066,22 @@ msgstr "Predmet ni ne datoteka ne mapa"
#: meld/iohelpers.py:47
msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?"
-msgstr ""
+msgstr "»{}« ni mogoče postaviti v smeti. Ali ga želite takoj izbrisati?"
#: meld/iohelpers.py:52
msgid "This remote location does not support sending items to the trash."
-msgstr ""
+msgstr "To oddaljeno mesto ne podpira pošiljanja elementov v smeti."
-#: meld/iohelpers.py:57
+#: meld/iohelpers.py:58
msgid "_Delete Permanently"
msgstr "_Trajno izbriši"
-#: meld/iohelpers.py:107
+#: meld/iohelpers.py:110
#, python-format
msgid "Replace file “%s”?"
msgstr "Ali želite zamenjati datoteko »%s«?"
-#: meld/iohelpers.py:109
+#: meld/iohelpers.py:112
#, python-format
msgid ""
"A file with this name already exists in “%s”.\n"
@@ -2151,15 +2207,19 @@ msgstr "Za samodejno združevanje morajo biti navedene tri datoteke (ne %r)"
msgid "Cannot compare a mixture of files and directories"
msgstr "Ni mogoče sočasno primerjati datotek in map"
-#: meld/misc.py:150
+#: meld/misc.py:154
msgid ""
"{}\n"
"\n"
"Meld encountered a critical error while running:\n"
"<tt>{}</tt>"
msgstr ""
+"{}\n"
+"\n"
+"Meld je med delovanjem naletel na kritično napako:\n"
+"<tt>{}</tt>"
-#: meld/misc.py:201
+#: meld/misc.py:205
msgid "[None]"
msgstr "[noben]"
@@ -2257,51 +2317,51 @@ msgstr "Brez"
msgid "Rev %s"
msgstr "Predelava %s"
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
msgid "Merged"
msgstr "Združeno"
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
msgid "Base"
msgstr "Osnova"
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
msgid "Local"
msgstr "Krajevno"
-#: meld/vc/_vc.py:54
+#: meld/vc/_vc.py:55
msgid "Remote"
msgstr "Oddaljeno"
-#: meld/vc/_vc.py:73
+#: meld/vc/_vc.py:74
msgid "Error"
msgstr "Napaka"
-#: meld/vc/_vc.py:75
+#: meld/vc/_vc.py:76
msgid "Newly added"
msgstr "Nedavno dodano"
-#: meld/vc/_vc.py:77
+#: meld/vc/_vc.py:78
msgid "Renamed"
msgstr "Preimenovano"
-#: meld/vc/_vc.py:78
+#: meld/vc/_vc.py:79
msgid "Conflict"
msgstr "V sporu"
-#: meld/vc/_vc.py:79
+#: meld/vc/_vc.py:80
msgid "Removed"
msgstr "Odstranjeno"
-#: meld/vc/_vc.py:80
+#: meld/vc/_vc.py:81
msgid "Missing"
msgstr "Manjkajoče"
-#: meld/vc/_vc.py:81
+#: meld/vc/_vc.py:82
msgid "Not present"
msgstr "Ni na voljo"
-#: meld/vc/_vc.py:82
+#: meld/vc/_vc.py:83
msgid "Scanning…"
msgstr "Poteka preiskovanje …"
@@ -2334,67 +2394,68 @@ msgstr "Ni veljavnega sistema za nadzor različic v tej mapi"
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:412
+#. TRANSLATORS: This is the name of the version control
+#. system being used, e.g., "Git" or "Subversion"
+#: meld/vcview.py:414
#, python-brace-format
-msgid "Location: {path}"
-msgstr "Mesto: {path}"
+msgid "{vc} comparison:"
+msgstr "Primerjava {vc}:"
#. Initial yield so when we add this to our tasks, we don't
#. create iterators that may be invalidated.
-#: meld/vcview.py:419
+#: meld/vcview.py:423
msgid "Scanning repository"
msgstr "Poteka preiskovanje skladišča"
-#: meld/vcview.py:448
+#: meld/vcview.py:452
#, python-format
msgid "Scanning %s"
msgstr "Preiskovanje %s"
-#: meld/vcview.py:487
+#: meld/vcview.py:491
msgid "(Empty)"
msgstr "(Prazno)"
-#: meld/vcview.py:535
+#: meld/vcview.py:539
#, python-format
msgid "%s — local"
msgstr "%s — krajevno"
-#: meld/vcview.py:536
+#: meld/vcview.py:540
#, python-format
msgid "%s — remote"
msgstr "%s — oddaljeno"
-#: meld/vcview.py:544
+#: meld/vcview.py:548
#, python-format
msgid "%s (local, merge, remote)"
msgstr "%s (krajevno, združi, oddaljeno)"
-#: meld/vcview.py:549
+#: meld/vcview.py:553
#, python-format
msgid "%s (remote, merge, local)"
msgstr "%s (oddaljeno, združi, krajevno)"
-#: meld/vcview.py:560
+#: meld/vcview.py:564
#, python-format
msgid "%s — repository"
msgstr "%s — skladišče"
-#: meld/vcview.py:566
+#: meld/vcview.py:570
#, python-format
msgid "%s (working, repository)"
msgstr "%s (delovno, skladišče)"
-#: meld/vcview.py:570
+#: meld/vcview.py:574
#, python-format
msgid "%s (repository, working)"
msgstr "%s (skladišče, delovno)"
-#: meld/vcview.py:735
+#: meld/vcview.py:739
msgid "Remove folder and all its files?"
msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
-#: meld/vcview.py:737
+#: meld/vcview.py:741
msgid ""
"This will remove all selected files and folders, and all files within any "
"selected folders, from version control."
@@ -2402,748 +2463,6 @@ msgstr ""
"S tem dejanjem bodo odstranjene vse izbrane datoteke in mape in vse "
"podrejene datoteke iz sistema za nadzor različic"
-#: meld/vcview.py:850
+#: meld/vcview.py:854
msgid "Clear"
msgstr "Počisti"
-
-#~ msgid "_Update"
-#~ msgstr "_Posodobi"
-
-#~ msgid "Mar_k as Resolved"
-#~ msgstr "Označi kot _razrešeno"
-
-#~ msgid "Update"
-#~ msgstr "Posodobi"
-
-#~ msgid "Update working copy from version control"
-#~ msgstr "Posodobi delovno kopijo preko nadzora različic"
-
-#~ msgid "Push"
-#~ msgstr "Objavi"
-
-#~ msgid "Add"
-#~ msgstr "Dodaj"
-
-#~ msgid "Remove"
-#~ msgstr "Odstrani"
-
-#~ msgid "Mark as Resolved"
-#~ msgstr "Označi kot razrešeno"
-
-#~ msgid "Revert"
-#~ msgstr "Povrni"
-
-#~ msgid "Delete from working copy"
-#~ msgstr "Izbriši iz delovne kopije"
-
-#, 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"
-
-#~ msgid "Current Locale ({})"
-#~ msgstr "Trenutne jezikovne nastavitve ({})"
-
-#~ 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"
-
-#, fuzzy
-#~ msgid "If true, the window toolbar is visible."
-#~ msgstr "Ali naj bo orodna vrstica vidna."
-
-#~ msgid "Show statusbar"
-#~ msgstr "Pokaži vrstico stanja"
-
-#, fuzzy
-#~ msgid "If true, the window statusbar is visible."
-#~ msgstr "Vrstica stanja je vidna"
-
-#~ msgid "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 "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 "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 "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"
-
-#~ msgid "Show or hide the toolbar"
-#~ msgstr "Pokaži ali skrij orodno vrstico"
-
-#~ msgid "Open Recent"
-#~ msgstr "Odpri nedavno"
-
-#~ msgid "_Meld"
-#~ msgstr "_Meld"
-
-#~ msgid "Quit the program"
-#~ msgstr "Končaj program"
-
-#~ msgid "Prefere_nces"
-#~ msgstr "Mož_nosti"
-
-#~ msgid "Configure the application"
-#~ msgstr "Spremeni nastavitve programa"
-
-#~ msgid "_Contents"
-#~ msgstr "_Vsebina"
-
-#~ msgid "Open the Meld manual"
-#~ msgstr "Odpri priročnik Meld"
-
-#~ msgid "About this application"
-#~ msgstr "O programu"
-
-#~ msgid "_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"
-
-#~ msgid "OVR"
-#~ msgstr "PRE"
-
-#~ msgid "Error removing %s"
-#~ msgstr "Napaka med odstranjevanjem %s"
-
-#~ msgid "Format as Patch..."
-#~ msgstr "Oblikuj kot popravek ..."
-
-#~ msgid "Co_mmit..."
-#~ msgstr "U_veljavi ..."
-
-#~ msgid "Find..."
-#~ msgstr "Najdi ..."
-
-#~ msgid "_Replace..."
-#~ msgstr "_Zamenjaj ..."
-
-#~ msgid "Meld does not support Python 3."
-#~ msgstr "Program Meld ne podpira okolja Python 3."
-
-#~ msgid "Copy _Left"
-#~ msgstr "Kopiraj _levo"
-
-#~ msgid "Copy _Right"
-#~ msgstr "Kopiraj _desno"
-
-#~ msgid ""
-#~ "'%s' exists.\n"
-#~ "Overwrite?"
-#~ msgstr ""
-#~ "'%s' že obstaja.\n"
-#~ "Ali naj bo prepisana?"
-
-#~ msgid "Add a manual point for synchronization of changes between files"
-#~ msgstr "Dodaj ročno točko usklajevanja sprememb med datotekami"
-
-#~ msgid "Clear manual change sychronization points"
-#~ msgstr "Počisti ročno spremenjene točke usklajevanja"
-
-#~ msgid "Cycle Through Documents"
-#~ msgstr "Preklopi med dokumenti"
-
-#~ msgid ""
-#~ "Filter '%s' changed the number of lines in the file. Comparison will be "
-#~ "incorrect. See the user manual for more details."
-#~ msgstr ""
-#~ "Po uporabi filtra '%s' se je spremenilo število vrstic v datoteki, zato "
-#~ "primerjava ne bo natančna. Za več podrobnosti si oglejte priročnik."
-
-#~ msgid "[%s] Set num panes"
-#~ msgstr "[%s] Določi okna"
-
-#~ msgid "[%s] Opening files"
-#~ msgstr "[%s] Odpiranje datotek"
-
-#~ msgid "Could not read file"
-#~ msgstr "Ni mogoče prebrati datoteke"
-
-#~ msgid "[%s] Reading files"
-#~ msgstr "[%s] Branje datotek"
-
-#~ msgid "%s appears to be a binary file."
-#~ msgstr "%s je videti kot dvojiška datoteka."
-
-#~ msgid "%s is not in encodings: %s"
-#~ msgstr "%s ni zapisan v naboru: %s"
-
-#~ msgid ""
-#~ "\"%s\" exists!\n"
-#~ "Overwrite?"
-#~ msgstr ""
-#~ "\"%s\" že obstaja!\n"
-#~ "Ali naj bo datoteka prepisana?"
-
-#~ msgid ""
-#~ "Error writing to %s\n"
-#~ "\n"
-#~ "%s."
-#~ msgstr ""
-#~ "Napaka med pisanjem na %s\n"
-#~ "\n"
-#~ "%s."
-
-#~ msgid ""
-#~ "This file '%s' contains a mixture of line endings.\n"
-#~ "\n"
-#~ "Which format would you like to use?"
-#~ msgstr ""
-#~ "Datoteka '%s' vsebuje različne zaključne znake vrstic.\n"
-#~ "\n"
-#~ "Kateri zapis želite uporabiti?"
-
-#~ msgid "_Tabs"
-#~ msgstr "_Zavihki"
-
-#~ msgid "_Previous Tab"
-#~ msgstr "_Predhodni zavihek"
-
-#~ msgid "Activate previous tab"
-#~ msgstr "Pokaži predhodni zavihek"
-
-#~ msgid "_Next Tab"
-#~ msgstr "_Naslednji zavihek"
-
-#~ msgid "Activate next tab"
-#~ msgstr "Pokaži naslednji zavihek"
-
-#~ msgid "Move Tab _Left"
-#~ msgstr "Premakni zavihek _levo"
-
-#~ msgid "Move current tab to left"
-#~ msgstr "Premakni trenutni zavihek na levo"
-
-#~ msgid "Move Tab _Right"
-#~ msgstr "Premakni zavihek _desno"
-
-#~ msgid "Move current tab to right"
-#~ msgstr "Premakni trenutni zavihek na desno"
-
-#~ msgid "Switch to this tab"
-#~ msgstr "Preklopi na ta zavihek"
-
-#~ msgid "Regular expression error"
-#~ msgstr "Napaka v logičnem izrazu"
-
-#~ msgid "Revision"
-#~ msgstr "Predelava"
-
-#~ msgid "Options"
-#~ msgstr "Možnosti"
-
-#~ msgid "%s not installed"
-#~ msgstr "Program %s ni nameščen"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Ignore changes which insert or delete blank lines"
-#~ msgstr ""
-#~ "Prezri spremembe, s katerimi se vstavijo ali izbrišejo prazne vrstice"
-
-#~ msgid "%i second"
-#~ msgid_plural "%i seconds"
-#~ msgstr[0] "%i sekund"
-#~ msgstr[1] "%i sekunda"
-#~ msgstr[2] "%i sekundi"
-#~ msgstr[3] "%i sekunde"
-
-#~ msgid "%i minute"
-#~ msgid_plural "%i minutes"
-#~ msgstr[0] "%i minut"
-#~ msgstr[1] "%i minuta"
-#~ msgstr[2] "%i minuti"
-#~ msgstr[3] "%i minute"
-
-#~ msgid "%i hour"
-#~ msgid_plural "%i hours"
-#~ msgstr[0] "%i ur"
-#~ msgstr[1] "%i ura"
-#~ msgstr[2] "%i uri"
-#~ msgstr[3] "%i ure"
-
-#~ msgid "%i day"
-#~ msgid_plural "%i days"
-#~ msgstr[0] "%i dni"
-#~ msgstr[1] "%i dan"
-#~ msgstr[2] "%i dni"
-#~ msgstr[3] "%i dni"
-
-#~ msgid "%i week"
-#~ msgid_plural "%i weeks"
-#~ msgstr[0] "%i tednov"
-#~ msgstr[1] "%i teden"
-#~ msgstr[2] "%i tedna"
-#~ msgstr[3] "%i tedni"
-
-#~ msgid "%i month"
-#~ msgid_plural "%i months"
-#~ msgstr[0] "%i mesecev"
-#~ msgstr[1] "%i mesec"
-#~ msgstr[2] "%i meseca"
-#~ msgstr[3] "%i meseci"
-
-#~ msgid "%i year"
-#~ msgid_plural "%i years"
-#~ msgstr[0] "%i let"
-#~ msgstr[1] "%i leto"
-#~ msgstr[2] "%i leti"
-#~ msgstr[3] "%i leta"
-
-#~ msgid "dir"
-#~ msgstr "mapa"
-
-#~ msgid "Start a 2- or 3-way directory comparison"
-#~ msgstr "Zagon z dvojno ali trojno primerjavo map"
-
-#~ msgid "_Statusbar"
-#~ msgstr "_Vrstica stanja"
-
-#~ msgid "Show or hide the statusbar"
-#~ msgstr "Pokaži ali skrij vrstico stanja"
-
-#~ msgid ""
-#~ "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:"
-#~ "Missing:Not present"
-#~ msgstr ""
-#~ "Prezrto:Nedoločeno:::Napaka::Novo dodano:Spremenjeno:V sporu:Odstranjeno:"
-#~ "Manjkajoče:Nedostopno"
-
-#~ msgid "http://meldmerge.org/";
-#~ msgstr "http://meldmerge.org/";
-
-#~ msgid "Loading"
-#~ msgstr "Nalaganje"
-
-#~ msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-#~ msgstr ""
-#~ "Med nalaganjem naj bodo preverjeni nabori v vrsti (na primer: utf8, "
-#~ "iso1250)"
-
-#~ msgid "Encoding"
-#~ msgstr "Nabor znakov"
-
-#~ msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-#~ msgstr "Varnostne kopije\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-
-#~ msgid ""
-#~ "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
-#~ "Desktop.ini\n"
-#~ msgstr ""
-#~ "Značilni metapodatki OS\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs."
-#~ "db Desktop.ini\n"
-
-#~ msgid "Version Control\t1\t%s\n"
-#~ msgstr "Nadzor različic\t1\t%s\n"
-
-#~ msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
-#~ msgstr "Binarne datoteke\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
-
-#~ msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
-#~ msgstr ""
-#~ "Predstavne datoteke\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,"
-#~ "xpm}"
-
-#~ msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
-#~ msgstr "Ključne besede CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
-
-#~ msgid "C++ comment\t0\t//.*\n"
-#~ msgstr "C++ opombe\t0\t//.*\n"
-
-#~ msgid "C comment\t0\t/\\*.*?\\*/\n"
-#~ msgstr "C opombe\t0\t/\\*.*?\\*/\n"
-
-#~ msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
-#~ msgstr "Vsi presledni znaki\t0\t[ \\t\\r\\f\\v]*\n"
-
-#~ msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
-#~ msgstr "Začetni presledni znaki\t0\t^[ \\t\\r\\f\\v]*\n"
-
-#~ msgid "Script comment\t0\t#.*"
-#~ msgstr "Opomba skripta\t0\t#.*"
-
-#~ msgid ""
-#~ "Meld is free software: you can redistribute it and/or modify it under the "
-#~ "terms of the GNU General Public License as published by the Free Software "
-#~ "Foundation, either version 2 of the License, or (at your option) any "
-#~ "later version.\n"
-#~ "\n"
-#~ "Meld is distributed in the hope that it will be useful, but WITHOUT ANY "
-#~ "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-#~ "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more "
-#~ "details. \n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License along "
-#~ "with this program. If not, see <http://www.gnu.org/licenses/>."
-#~ msgstr ""
-#~ "Meld je prosta programska oprema; lahko jo razširjate in/ali spreminjate "
-#~ "pod pogoji Splošnega javnega dovoljenja GNU (GNU General Public License), "
-#~ "kot ga je objavila ustanova Free Software Foundation; bodisi različice 2 "
-#~ "ali (po vaši izbiri) katerekoli poznejše različice.\n"
-#~ "\n"
-#~ "Program Meld se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA "
-#~ "JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI "
-#~ "ZA DOLOČEN NAMEN. Za podrobnosti glejte besedilo Javnega dovoljenja GNU.\n"
-#~ "\n"
-#~ "Skupaj s programom bi morali prejeti izvod splošnega javnega dovoljenja "
-#~ "GNU (GNU General Public License); če ga niste si oglejte spletno stran "
-#~ "<http://www.gnu.org/licenses/>."
-
-#~ msgid "Start a comparison between file and dir/file"
-#~ msgstr "Zagon primerjave med datoteko in mapo/datoteko"
-
-#~ msgid "D-Bus error; comparisons will open in a new window."
-#~ msgstr "Napaka vodila D-Bus; primerjave se odprejo v novem oknu."
-
-#~ msgid "Report _Bug"
-#~ msgstr "Pošlji poročilo o _hrošču"
-
-#~ msgid "Report a bug in Meld"
-#~ msgstr "Poročilo o hrošču programa Meld"
-
-#~ msgid "About this program"
-#~ msgstr "O programu"
-
-#~ msgid "Only available if you have PyGtkSourceView 2 installed"
-#~ msgstr "Na voljo le, če je nameščen paket PyGtkSourceView"
-
-#~ msgid "_Browse..."
-#~ msgstr "_Prebrskaj ..."
-
-#~ msgid "Path to file"
-#~ msgstr "Pot do datoteke"
-
-#~ msgid "Pop up a file selector to choose a file"
-#~ msgstr "Pokaži izbirnik za izbor datoteke"
-
-#~ msgid "Compare selected"
-#~ msgstr "Primerjaj izbrano"
-
-#~ msgid ""
-#~ "'%s' is a directory.\n"
-#~ "Remove recursively?"
-#~ msgstr ""
-#~ "'%s' je mapa.\n"
-#~ "Ali naj bo odstranjena vsa vsebina?"
-
-#~ msgid ""
-#~ "Error converting to a regular expression\n"
-#~ "The pattern was '%s'\n"
-#~ "The error was '%s'"
-#~ msgstr ""
-#~ "Napaka med pretvarjanjem logičnega izraza\n"
-#~ "Določen je bil vzorec '%s'\n"
-#~ "Javljena napaka je '%s'"
-
-#~ msgid "[%s] Fetching differences"
-#~ msgstr "[%s] Iskanje razlik"
-
-#~ msgid "[%s] Applying patch"
-#~ msgstr "[%s] Pripenjanje popravka"
-
-#~ msgid "Patch tool not found"
-#~ msgstr "Orodja za uveljavljanje popravkov ni mogoče najti"
-
-#~ msgid ""
-#~ "Meld needs the <i>patch</i> tool to be installed to perform comparisons "
-#~ "in %s repositories. Please install <i>patch</i> and try again."
-#~ msgstr ""
-#~ "Program Meld zahteva namestitev orodja <i>patch</i> za uveljavljanje "
-#~ "popravkov pri izvajanju primerjav v skladiščih %s. Namestite orodje "
-#~ "<i>patch</i> in poskusite znova."
-
-#~ msgid "Error fetching original comparison file"
-#~ msgstr "Napaka pridobivanja izvorne datoteke za primerjavo"
-
-#~ msgid ""
-#~ "Meld couldn't obtain the original version of your comparison file. If you "
-#~ "are using the most recent version of Meld, please report a bug, including "
-#~ "as many details as possible."
-#~ msgstr ""
-#~ "Ni mogoče pridobiti izvorne različice datoteke za primerjavo. V primeru, "
-#~ "da uporabljate najnovejšo različico programa, pošljite poročilo o hrošču "
-#~ "s čim več podrobnostmi."
-
-#~ msgid "Report a bug"
-#~ msgstr "Pošlji poročilo o hrošču"
-
-#~ msgid "Tag"
-#~ msgstr "Oznaka"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
