"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2010-01-14 15:24+0100\n"
+"PO-Revision-Date: 2010-01-18 16:20+0100\n"
"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
"Language-Team: Slovenian <winmerge-translate@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
#: Merge.rc:75
#, c-format
msgid "&Select Line Difference"
-msgstr "&Izberi razlike vrstic"
+msgstr "&Izberi razliko vrstice"
#: Merge.rc:77
#, c-format
#: Merge.rc:593
#, c-format
msgid "&Goto..."
-msgstr "Pojdi &na..."
+msgstr "Pojdi &na ..."
#: Merge.rc:86
#, c-format
#: Merge.rc:543
#, c-format
msgid "&with..."
-msgstr "&z..."
+msgstr "&z ..."
#: Merge.rc:110
#: Merge.rc:194
#: Merge.rc:318
#, c-format
msgid "&Open...\tCtrl+O"
-msgstr "&Odpri...\tCtrl+O"
+msgstr "&Odpri ... \tCtrl+O"
#: Merge.rc:114
#: Merge.rc:198
#: Merge.rc:319
#, c-format
msgid "Op&en Conflict File..."
-msgstr "Od&pri konfliktno datoteko..."
+msgstr "Od&pri konfliktno datoteko ..."
#: Merge.rc:116
#: Merge.rc:200
#: Merge.rc:321
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
-msgstr "Odpri pro&jekt...\tCtrl+J"
+msgstr "Odpri pro&jekt ... \tCtrl+J"
#: Merge.rc:117
#: Merge.rc:201
#: Merge.rc:322
#, c-format
msgid "Sa&ve Project..."
-msgstr "S&hrani projekt..."
+msgstr "S&hrani projekt ..."
#: Merge.rc:119
#, c-format
#: Merge.rc:390
#, c-format
msgid "&Options..."
-msgstr "&Mo\9enosti..."
+msgstr "&Mo\9enosti ..."
#: Merge.rc:127
#: Merge.rc:216
#: Merge.rc:394
#, c-format
msgid "Select &Font..."
-msgstr "Izberite &pisavo..."
+msgstr "Izberite &pisavo ..."
#: Merge.rc:130
#: Merge.rc:232
#: Merge.rc:418
#, c-format
msgid "&None"
-msgstr "&Niè"
+msgstr "&Brez"
#: Merge.rc:135
#: Merge.rc:237
#: Merge.rc:427
#, c-format
msgid "&Language..."
-msgstr "&Jezik..."
+msgstr "&Jezik ..."
#: Merge.rc:143
#: Merge.rc:265
#: Merge.rc:451
#, c-format
msgid "&Filters..."
-msgstr "&Filtri..."
+msgstr "&Filtri ..."
#: Merge.rc:146
#: Merge.rc:269
#: Merge.rc:452
#, c-format
msgid "&Generate Patch..."
-msgstr "&Generiraj datoteko s popravki..."
+msgstr "&Generiraj datoteko s popravki ..."
#: Merge.rc:148
#: Merge.rc:272
#: Merge.rc:457
#, c-format
msgid "&List..."
-msgstr "&Seznam"
+msgstr "&Seznam ..."
#: Merge.rc:152
#, c-format
#: Merge.rc:473
#, c-format
msgid "&Load Config..."
-msgstr "&Nalo\9ei nastavitev..."
+msgstr "&Nalo\9ei nastavitev ..."
#: Merge.rc:165
#: Merge.rc:286
#: Merge.rc:474
#, c-format
msgid "&Reset Options"
-msgstr "&Ponastavi nastavitve"
+msgstr "&Ponastavi mo\9enosti"
#: Merge.rc:167
#: Merge.rc:288
#: Merge.rc:481
#, c-format
msgid "Change &Pane\tF6"
-msgstr "Zamenjaj &panel\tF6"
+msgstr "Preklopi &okvirja\tF6"
#: Merge.rc:174
#: Merge.rc:295
#: Merge.rc:492
#, c-format
msgid "&Translations"
-msgstr "&Prevodi..."
+msgstr "&Prevodi"
#: Merge.rc:184
#: Merge.rc:305
#: Merge.rc:494
#, c-format
msgid "A&rchive Support disabled..."
-msgstr "&Podpora arhivskim datotekam onemogoèena"
+msgstr "&Podpora arhivskim datotekam onemogoèena ..."
#: Merge.rc:187
#: Merge.rc:308
#: Merge.rc:497
#, c-format
msgid "&About WinMerge..."
-msgstr "&O orodju WinMerge"
+msgstr "&O programu WinMerge ..."
#: Merge.rc:203
#: Merge.rc:340
#: Merge.rc:206
#, c-format
msgid "File En&coding"
-msgstr "&Kodiranje datoteke"
+msgstr "&Kodiranje datotek"
#: Merge.rc:212
#: Merge.rc:366
#: Merge.rc:218
#, c-format
msgid "Show &Identical Items"
-msgstr "Prika\9ei &identiène predmete"
+msgstr "Prika\9ei &enake predmete"
#: Merge.rc:219
#, c-format
#: Merge.rc:228
#, c-format
msgid "E&xpand All Subfolders"
-msgstr "Ra&z\9airi vse mape"
+msgstr "Ra&z\9airi vse podmape"
#: Merge.rc:229
#, c-format
msgid "&Collapse All Subfolders"
-msgstr "S&krèi vse mape"
+msgstr "S&krèi vse podmape"
#: Merge.rc:242
#, c-format
msgid "Compa&re Statistics"
-msgstr "Primerjaj &statistiko"
+msgstr "&Statistika primerjave"
#: Merge.rc:246
#: Merge.rc:429
#: Merge.rc:566
#, c-format
msgid "&Customize Columns..."
-msgstr "&Prilagodi stolpce..."
+msgstr "&Prilagodi stolpce ..."
#: Merge.rc:270
#: Merge.rc:453
#, c-format
msgid "Generate &Report..."
-msgstr "Izdelaj &poroèilo"
+msgstr "Izdelaj &poroèilo ..."
#: Merge.rc:324
#, c-format
#: Merge.rc:333
#, c-format
msgid "Save &As..."
-msgstr "Shrani &kot..."
+msgstr "Shrani &kot ..."
#: Merge.rc:330
#, c-format
#: Merge.rc:336
#, c-format
msgid "&Print..."
-msgstr "&Natisni"
+msgstr "&Natisni ..."
#: Merge.rc:337
#, c-format
#: Merge.rc:352
#, c-format
msgid "&File Encoding..."
-msgstr "De&kodiranje datoteke..."
+msgstr "De&kodiranje datoteke ..."
#: Merge.rc:358
#, c-format
#: Merge.rc:365
#, c-format
msgid "Select Line &Difference\tF4"
-msgstr "Izberite vrstilno &razliko\tF4"
+msgstr "Izberi &razlièna polja\tF4"
#: Merge.rc:368
#, c-format
msgid "F&ind...\tCtrl+F"
-msgstr "&Najdi...\tCtrl+F"
+msgstr "&Najdi ... \tCtrl+F"
#: Merge.rc:369
#, c-format
msgid "Repla&ce...\tCtrl+H"
-msgstr "Zamen&jaj...\tCtrl+H"
+msgstr "Zamen&jaj ... \tCtrl+H"
#: Merge.rc:371
#, c-format
#: Merge.rc:388
#, c-format
msgid "&Go To...\tCtrl+G"
-msgstr "Pojdi &na...\tCtrl+G"
+msgstr "Pojdi &na ... \tCtrl+G"
#: Merge.rc:396
#, c-format
#: Merge.rc:407
#, c-format
msgid "&Lock Panes"
-msgstr "Za&kleni panele"
+msgstr "Za&kleni okvirja"
#: Merge.rc:408
#, c-format
msgid "&View Whitespace"
-msgstr "&Preglej prazne prostore"
+msgstr "&Prika\9ei prazne znake"
#: Merge.rc:409
#, c-format
#: Merge.rc:414
#, c-format
msgid "Sw&ap Panes"
-msgstr "Zam&enjaj panele"
+msgstr "Zam&enjaj okvirja"
#: Merge.rc:424
#, c-format
msgid "Diff &Pane"
-msgstr "Panel &razlik"
+msgstr "Okvir &razlik"
#: Merge.rc:425
#, c-format
msgid "Lo&cation Pane"
-msgstr "Panel &polo\9eaja"
+msgstr "&Polo\9eajni okvir"
#: Merge.rc:443
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "Kopiraj de&sno in nadaljuj..\tAlt+Ctrl+desno"
+msgstr "Kopiraj de&sno in nadaljuj\tAlt+Ctrl+desno"
#: Merge.rc:444
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Kopiraj le&vo in nadaljuj\tAlt+Ctrl+levo"
+msgstr "Kopiraj le&vo in nadaljuj\tAlt+Ctrl+levo"
#: Merge.rc:446
#, c-format
#: Merge.rc:515
#, c-format
msgid "L&eft to..."
-msgstr "Z l&evo na..."
+msgstr "Z l&evo na ..."
#: Merge.rc:516
#, c-format
#: Merge.rc:517
#, c-format
msgid "R&ight to..."
-msgstr "Z d&esni na..."
+msgstr "Z d&esni na ..."
#: Merge.rc:519
#, c-format
#: Merge.rc:521
#, c-format
msgid "&Left to..."
-msgstr "&Z levi na..."
+msgstr "&Z levi na ..."
#: Merge.rc:522
#, c-format
msgid "&Right to..."
-msgstr "&Z desne na..."
+msgstr "&Z desne na ..."
#: Merge.rc:524
#, c-format
#: Merge.rc:1514
#, c-format
msgid "&Left"
-msgstr "&Levo"
+msgstr "&levi okvir"
#: Merge.rc:527
#: Merge.rc:1149
#: Merge.rc:1517
#, c-format
msgid "&Right"
-msgstr "&Desno"
+msgstr "&desni okvir"
#: Merge.rc:528
#, c-format
#: Merge.rc:556
#, c-format
msgid "&Left... (%1 of %2)"
-msgstr "&Levo... (%1 od %2)"
+msgstr "&Levo ... (%1 od %2)"
#: Merge.rc:557
#, c-format
msgid "&Right... (%1 of %2)"
-msgstr "&Desno...(%1 od %2)"
+msgstr "&Desno ... (%1 od %2)"
#: Merge.rc:558
#, c-format
msgid "&Both... (%1 of %2)"
-msgstr "&Oba...(%1 od %2)"
+msgstr "&Oba ... (%1 od %2)"
#: Merge.rc:559
#, c-format
msgid "&Differences... (%1 of %2)"
-msgstr "&Razlike... (%1 od %2)"
+msgstr "&Razlike ... (%1 od %2)"
#: Merge.rc:562
#, c-format
#: Merge.rc:595
#, c-format
msgid "&No Moved Blocks"
-msgstr "Ne premikaj blokov"
+msgstr "&Brez premaknjenih blokov"
#: Merge.rc:596
#, c-format
#: Merge.rc:675
#, c-format
msgid "All rights reserved."
-msgstr "Vse pravice pridr\9eane"
+msgstr "Vse pravice pridr\9eane."
#: Merge.rc:676
#, c-format
msgid "Visit the WinMerge HomePage!"
-msgstr "Obi\9aèi domaèo stran programa WinMerge"
+msgstr "Obi\9aèi domaèo stran programa WinMerge!"
#: Merge.rc:679
#: Merge.rc:711
#: Merge.rc:1662
#, c-format
msgid "OK"
-msgstr "Vredu"
+msgstr "V redu"
#: Merge.rc:680
#, c-format
#: Merge.rc:1591
#, c-format
msgid "&Left:"
-msgstr "&Levo"
+msgstr "&Levi okvir:"
#: Merge.rc:694
#: Merge.rc:755
#: Merge.rc:1031
#, c-format
msgid "&Browse..."
-msgstr "&Brskaj..."
+msgstr "&Brskaj ..."
#: Merge.rc:695
#: Merge.rc:1595
#, c-format
msgid "&Right:"
-msgstr "&Desni panel:"
+msgstr "&Desni okvir:"
#: Merge.rc:699
#: Merge.rc:1042
#, c-format
msgid "Bro&wse..."
-msgstr "&Brskaj..."
+msgstr "&Brskaj ..."
#: Merge.rc:700
#: Merge.rc:1599
#: Merge.rc:1601
#, c-format
msgid "Select..."
-msgstr "Iz&beri..."
+msgstr "Izberi ..."
#: Merge.rc:704
#, c-format
#: Merge.rc:707
#, c-format
msgid "&Select..."
-msgstr "&Izberi..."
+msgstr "&Izberi ..."
#: Merge.rc:708
#: Merge.rc:1602
#: Merge.rc:721
#, c-format
msgid "Visual SourceSafe"
-msgstr "Vizualni izvorna varnost"
+msgstr "Visual SourceSafe"
#: Merge.rc:726
#, c-format
#: Merge.rc:877
#, c-format
msgid "Save As..."
-msgstr "Shrani kot..."
+msgstr "Shrani kot ..."
#: Merge.rc:747
#, c-format
msgid "Versioning System"
-msgstr "Izbor programa:"
+msgstr "Versioning System"
#: Merge.rc:750
#, c-format
msgid "&Versioning System:"
-msgstr "&Izbor programa:"
+msgstr "&Versioning System:"
#: Merge.rc:753
#: Merge.rc:2083
#: Merge.rc:768
#, c-format
msgid "Cl&ose windows with ESC"
-msgstr "Zapri okno z tipko &ESC"
+msgstr "Zapri okna s tipko &ESC"
#: Merge.rc:770
#, c-format
msgid "&Automatically verify paths in Open-dialog"
-msgstr "&Samodejno preveri pot v odprtem dialogu"
+msgstr "&Samodejno preverjaj pot v odprtem dialogu"
#: Merge.rc:773
#, c-format
msgid "All&ow only one instance to run"
-msgstr "Dovoli &samo en primer za izvajanje"
+msgstr "Dovoli &samo en trenutno aktiven program za izvajanje"
#: Merge.rc:775
#, c-format
msgid "As&k when closing multiple windows"
-msgstr "&Upra\9aaj predno zapre\9a veèkratna okna"
+msgstr "&Vpra\9aaj pred zapiranjem veèkratnih oken"
#: Merge.rc:777
#, c-format
#: Merge.rc:782
#, c-format
msgid "O&pen-dialog Auto-Completion:"
-msgstr "Odpri dialog samodejne &dovr\9aitve"
+msgstr "Samodejno &dopolnjevanje vrstice v Odprtem dialogu"
#: Merge.rc:785
#, c-format
msgid "Enable multiple compare windows for"
-msgstr "Omogoèi veèkratno primerjanje oken za"
+msgstr "Omogoèi veèkratna okna za primerjanje"
#: Merge.rc:787
#: Merge.rc:1614
#, c-format
msgid "&Folder compare"
-msgstr "Primerjava &map"
+msgstr "primerjavi &map"
#: Merge.rc:789
#: Merge.rc:1616
#, c-format
msgid "Fil&e compare"
-msgstr "Primerjva &datotek"
+msgstr "primerjavi &datotek"
#: Merge.rc:791
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
-"WinMerge omogoèa skrivanje skupnih sporoèilnih okvirjev.\n"
+"WinMerge omogoèa skrivanje skupnih sporoèilnih oken.\n"
"Pritisnite gumb Ponastavi, da bodo postala vsa sporoèilna okna vidna."
#: Merge.rc:793
#: Merge.rc:825
#, c-format
msgid "D&on't wrap end of file"
-msgstr "Ne prelomi konec datoteke"
+msgstr "&Po koncu datoteke ne nadaljuj na zaèetku"
#: Merge.rc:828
#, c-format
#: Merge.rc:855
#, c-format
msgid "&Don't wrap end of file"
-msgstr "&Brez preloma konca datoteke"
+msgstr "&Po koncu datoteke ne nadaljuj na zaèetku"
#: Merge.rc:858
#, c-format
#: Merge.rc:2205
#, c-format
msgid "Rational ClearCase"
-msgstr "Racionalno jasen primer"
+msgstr "Rational ClearCase"
#: Merge.rc:875
#, c-format
#: Merge.rc:966
#, c-format
msgid "Word Difference:"
-msgstr "Besedna razlika"
+msgstr "Besedne razlike:"
#: Merge.rc:976
#, c-format
#: Merge.rc:1010
#, c-format
msgid "&Filter folder:"
-msgstr "&Filter mape:"
+msgstr "&Mapa filtrov:"
#: Merge.rc:1012
#, c-format
msgid "B&rowse..."
-msgstr "B&rskaj.."
+msgstr "B&rskaj ..."
#: Merge.rc:1013
#, c-format
msgid "Temporary files folder"
-msgstr "Zaèasna datoteèna mapa"
+msgstr "Mapa za zaèasne datoteke"
#: Merge.rc:1014
#, c-format
msgid "S&ystem's temp folder"
-msgstr "S&istemska zaèasna mapa:"
+msgstr "s&istemska mapa"
#: Merge.rc:1016
#, c-format
msgid "C&ustom folder:"
-msgstr "Mapa po meri"
+msgstr "mapa po meri"
#: Merge.rc:1019
#: Merge.rc:1035
#: Merge.rc:1025
#, c-format
msgid "Patch Generator"
-msgstr "Generator datotek s popravki..."
+msgstr "Generator datotek s popravki ..."
#: Merge.rc:1028
#, c-format
#: Merge.rc:1050
#, c-format
msgid "W&hitespaces"
-msgstr "&Praznine"
+msgstr "&Prazni znaki"
#: Merge.rc:1051
#, c-format
#: Merge.rc:1085
#, c-format
msgid "Display Columns"
-msgstr "Prika\9ei kolone"
+msgstr "Prika\9ei stolpce"
#: Merge.rc:1091
#, c-format
#: Merge.rc:1133
#, c-format
msgid "Comparing items..."
-msgstr "Primerjanje predmetov..."
+msgstr "Primerjanje predmetov ..."
#: Merge.rc:1134
#, c-format
msgid "Items compared:"
-msgstr "Predmeti primerjani:"
+msgstr "Primerjanih predmetov:"
#: Merge.rc:1135
#, c-format
#: Merge.rc:1165
#, c-format
msgid "Whitespace"
-msgstr "Presledki"
+msgstr "Prazen znak"
#: Merge.rc:1166
#, c-format
#: Merge.rc:1170
#, c-format
msgid "Ignore &case"
-msgstr "Zanemari &primere"
+msgstr "Zanemari &velikost znakov"
#: Merge.rc:1171
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr "&Zanemari razliènost vrnitev oznak zakljuèka (Windows/Unix/Mac)"
+msgstr "&Prezri razliènost tipa znakov za zakljuèke vrstic (EOL)"
#: Merge.rc:1173
#, c-format
#: Merge.rc:1174
#, c-format
msgid "&Match similar lines"
-msgstr "&Oznaèi enake vrstice"
+msgstr "&Ujemanje enakih vrstic"
#: Merge.rc:1176
#, c-format
msgid "Filter Comments"
-msgstr "Filtriraj komentarje"
+msgstr "Komentarji filtrov"
#: Merge.rc:1182
#: Merge.rc:1958
#: Merge.rc:1189
#, c-format
msgid "&Preserve original EOL chars"
-msgstr "Obdr\9ei izvorni naèin znakov za konec vrstice (EOL)"
+msgstr "Obdr\9ei izvorni tip znakov za konec vrstice (EOL)"
#: Merge.rc:1191
#, c-format
#: Merge.rc:1192
#, c-format
msgid "&Tab size:"
-msgstr "&Velikost tabel"
+msgstr "&\9atevilo presledkov, ki jih tabulator nadomesti"
#: Merge.rc:1195
#, c-format
msgid "&Insert Tabs"
-msgstr "&Vstavi tabele"
+msgstr "&Vstavi tabulatorje"
#: Merge.rc:1197
#, c-format
msgid "Insert &Spaces"
-msgstr "&Vstavi presledeke"
+msgstr "&Vstavi presledke"
#: Merge.rc:1199
#, c-format
#: Merge.rc:1201
#, c-format
msgid "View line differences"
-msgstr "Poglej vrstiène razlike"
+msgstr "Poglej vrstiène razlike na"
#: Merge.rc:1203
#, c-format
msgid "&Character level"
-msgstr "&Znaèajski nivo"
+msgstr "&znakovnem nivoju"
#: Merge.rc:1205
#, c-format
msgid "&Word-level:"
-msgstr "&Nivo besede"
+msgstr "&besednem nivoju"
#: Merge.rc:1209
#, c-format
#: Merge.rc:1229
#, c-format
msgid "Install..."
-msgstr "Namesti..."
+msgstr "Namesti ..."
#: Merge.rc:1230
#, c-format
msgid "New..."
-msgstr "Nova..."
+msgstr "Nova ..."
#: Merge.rc:1231
#, c-format
msgid "Edit..."
-msgstr "Uredi..."
+msgstr "Uredi ..."
#: Merge.rc:1232
#, c-format
msgid "Delete..."
-msgstr "Izbri\9ai..."
+msgstr "Izbri\9ai ..."
#: Merge.rc:1238
#, c-format
#: Merge.rc:1265
#, c-format
msgid "Default Codepage"
-msgstr "Standardna kodna tabela"
+msgstr "Privzeta kodna tabela"
#: Merge.rc:1266
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
-msgstr "Izberi splo\9ano kodno tabelo ko se nalagajo non-Unicode datoteke:"
+msgstr "Izberite privzeto kodno tabelo za nalaganje ne-Unicode datotek:"
#: Merge.rc:1268
#, c-format
"need to restart session"
msgstr ""
"Zaznaj kodno tabelo za datoteke s konènico: .html, .rc, .xml \n"
-"potreben je ponovni zagon seje"
+"(potreben je ponovni zagon seje)"
#: Merge.rc:1271
#, c-format
#: Merge.rc:1286
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
-msgstr "Ni mogoèe zaznati 7-zip verzijo (ni name\9aèena?)"
+msgstr "Nisem mogel zaznati 7-zip verzijo (ni name\9aèena?)"
# Removed \n because of lack of space!
#: Merge.rc:1289
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
"essential components to be copied to the program directory for standalone operation."
-msgstr "Delo z arhivskimi datotekami zahteva program 7-Zip 3.11 ali njegovo novej\9ao razlièico name\9aèeno na va\9aem raèunalniku"
+msgstr ""
+"Delo z arhivskimi datotekami zahteva program 7-Zip 3.11 ali njegovo novej\9ao razlièico\n"
+"name\9aèeno na va\9aem raèunalniku ali kopijo nujnih komponent za samostojno delovanje."
#: Merge.rc:1291
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
-msgstr "Name\9aèeni morajo biti tudi prave raz\9airitve (Merge7z*.dll) na sistemski poti (PATH)."
+msgstr "Name\9aèene morajo biti tudi primerne raz\9airitve vmesnika (Merge7z*.dll) na poti (PATH)."
#: Merge.rc:1293
#, c-format
#: Merge.rc:1305
#, c-format
msgid "present"
-msgstr "Predstavlja"
+msgstr "trenutno"
#: Merge.rc:1303
#, c-format
msgid "Merge7z000U.dll"
-msgstr "Zdru\9ei 7z000U.dll"
+msgstr "Merge7z000U.dll"
#: Merge.rc:1306
#, c-format
msgid "7-Zip software installed on your computer:"
-msgstr "7-Zip programska oprema je name\9aèena na raèunalniku:"
+msgstr "7-Zip programska oprema name\9aèena na raèunalniku:"
#: Merge.rc:1308
#: Merge.rc:1313
#, c-format
msgid "none"
-msgstr "Niè"
+msgstr "Ni"
#: Merge.rc:1310
#, c-format
#: Merge.rc:1315
#, c-format
msgid "outdated"
-msgstr "Zastarelo"
+msgstr "zastarelo"
#: Merge.rc:1316
#, c-format
#: Merge.rc:1330
#, c-format
msgid "Options"
-msgstr "Opcije"
+msgstr "Mo\9enosti"
#: Merge.rc:1341
#, c-format
msgid " Categories"
-msgstr " Kategorije"
+msgstr "Kategorije"
#: Merge.rc:1343
#, c-format
msgid "Import..."
-msgstr "Uvozi..."
+msgstr "Uvozi ..."
#: Merge.rc:1344
#, c-format
msgid "Export..."
-msgstr "Izvozi..."
+msgstr "Izvozi ..."
#: Merge.rc:1352
#, c-format
#: Merge.rc:1354
#, c-format
msgid "Comments:"
-msgstr "Komentarji"
+msgstr "Komentarji:"
#: Merge.rc:1355
#, c-format
#: Merge.rc:1356
#, c-format
msgid "Operators:"
-msgstr "Operatorji"
+msgstr "Operatorji:"
#: Merge.rc:1357
#, c-format
msgid "Strings:"
-msgstr "Nizi"
+msgstr "Nizi:"
#: Merge.rc:1358
#, c-format
#: Merge.rc:1405
#, c-format
msgid "Bold"
-msgstr "Odebeljeno"
+msgstr "Krepko"
#: Merge.rc:1413
#, c-format
#: Merge.rc:1416
#, c-format
msgid "Report &File:"
-msgstr "Poroèilo &datoteke:"
+msgstr "Poroèilna &datoteka:"
#: Merge.rc:1419
#: Merge.rc:1593
#: Merge.rc:1624
#, c-format
msgid "Browse..."
-msgstr "Brskaj..."
+msgstr "Brskaj ..."
#: Merge.rc:1420
#, c-format
#: Merge.rc:1423
#, c-format
msgid "&Copy to Clipboard"
-msgstr "&Kopiraj v medpomnilnik"
+msgstr "&Kopiraj v odlo\9ei\9aèe"
#: Merge.rc:1431
#, c-format
msgid "Shared or Private Filter"
-msgstr "Skupni ali privatni filter"
+msgstr "Skupni ali zasebni filter"
#: Merge.rc:1434
#, c-format
#: Merge.rc:1454
#, c-format
msgid "&Use stand-alone 7-Zip if available"
-msgstr "&Uporabi standardni 7-zip èe je razpolo\9eljiv"
+msgstr "&Uporabi samostojni 7-zip, èe je razpolo\9eljiv"
#: Merge.rc:1457
#, c-format
#: Merge.rc:1467
#, c-format
msgid "Compare Statistics"
-msgstr "Preimerjaj statistiko"
+msgstr "Preimerjalna statistika"
#: Merge.rc:1470
#, c-format
#: Merge.rc:2353
#, c-format
msgid "Identical"
-msgstr "Identièno"
+msgstr "Enako"
#: Merge.rc:1499
#, c-format
#: Merge.rc:1513
#, c-format
msgid "Affects"
-msgstr "Vpliva"
+msgstr "Spremeni"
#: Merge.rc:1516
#: Merge.rc:1519
#, c-format
msgid "(Affects)"
-msgstr "(Vpliva)"
+msgstr "(Spremeni)"
#: Merge.rc:1520
#, c-format
msgid "Select Codepage for"
-msgstr "Izberi kodno tabelo za"
+msgstr "Izberi kodno tabelo datoteke za"
#: Merge.rc:1521
#, c-format
msgid "&File Loading:"
-msgstr "&Nalaganje datoteke:"
+msgstr "&nalaganje:"
#: Merge.rc:1523
#: Merge.rc:1526
#, c-format
msgid "..."
-msgstr "..."
+msgstr " ..."
#: Merge.rc:1524
#, c-format
msgid "File &Saving:"
-msgstr "Shranjevanje &datoteke:"
+msgstr "&shranjevanje:"
#: Merge.rc:1527
#, c-format
msgid "&Use same codepage for both"
-msgstr "&Uporabi enako kodno tabelo za oba"
+msgstr "&Uporabi enako kodno tabelo za oboje"
#: Merge.rc:1530
#, c-format
#: Merge.rc:1539
#, c-format
msgid "Testing filter ..."
-msgstr "Testiranje filtra..."
+msgstr "Testiranje filtra ..."
#: Merge.rc:1541
#, c-format
#: Merge.rc:1563
#, c-format
msgid "Whitespace:"
-msgstr "Skriti znaki in razmaki:"
+msgstr "Prazen znak:"
#: Merge.rc:1564
#, c-format
msgid "Regular text:"
-msgstr "Stalno besedilo"
+msgstr "Navadno besedilo:"
#: Merge.rc:1565
#, c-format
#: Merge.rc:1966
#, c-format
msgid "Backup Files"
-msgstr "Varnostne datoteke"
+msgstr "Arhivske datoteke"
#: Merge.rc:1613
#, c-format
msgid "Create backup files in:"
-msgstr "Ustvari varnostne datoteke v:"
+msgstr "Ustvari arhivske datoteke v:"
#: Merge.rc:1618
#, c-format
msgid "Create backup files into:"
-msgstr "Ustvari varnostne datoteke v:"
+msgstr "Ustvari arhivske datoteke v:"
#: Merge.rc:1619
#, c-format
msgid "&Original file's folder"
-msgstr "&Izvorna datoteèna mapa"
+msgstr "&mapi izvorne datoteke"
#: Merge.rc:1621
#, c-format
msgid "&Global backup folder:"
-msgstr "&Globalna varnostna mapa:"
+msgstr "&globalni arhivski mapi:"
#: Merge.rc:1625
#, c-format
msgid "Backup filename:"
-msgstr "Naziv varnostne datoteke"
+msgstr "Naziv arhivske datoteke"
#: Merge.rc:1626
#, c-format
#: Merge.rc:1654
#, c-format
msgid "Plugins"
-msgstr "&Raz\9airitve"
+msgstr "Raz\9airitve"
#: Merge.rc:1657
#, c-format
#: Merge.rc:1679
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr "Dodaj obstojeèi meni k &raz\9airjenemu meniju"
+msgstr "Dodaj meni lupine k &raz\9airjenemu meniju"
#: Merge.rc:1686
#: Merge.rc:1970
#: Merge.rc:1691
#, c-format
msgid "S&top after first difference"
-msgstr "&Ustavi na prvi razliki"
+msgstr "&Ustavi po prvi razliki"
#: Merge.rc:1693
#, c-format
#: Merge.rc:1695
#, c-format
msgid "&Include unique subfolders contents"
-msgstr "&Vkljuèi enkratne subfolders contents"
+msgstr "&Vkljuèi podmape ki obstajajo samo na eni strani"
#: Merge.rc:1697
#, c-format
"Print Preview"
msgstr ""
"Prika\9ei vse strani\n"
-"Predogledled tiskanja"
+"Predogled tiskanja"
#: Merge.rc:1784
#, c-format
#: Merge.rc:1786
#, c-format
msgid "Expand all subfolders"
-msgstr "Raz\9airi vse mape"
+msgstr "Raz\9airi vse podmape"
#: Merge.rc:1787
#, c-format
msgid "Collapse all subfolders"
-msgstr "Skrèi vse mape"
+msgstr "Skrèi vse podmape"
#: Merge.rc:1793
#, c-format
#: Merge.rc:1797
#, c-format
msgid "Project file successfully loaded."
-msgstr "Projektna datoteka uspe\9ano nalo\9eena"
+msgstr "Datoteka projekta uspe\9ano nalo\9eena."
#: Merge.rc:1798
#, c-format
msgid "Project file successfully saved."
-msgstr "Projektna datoteka uspe\9ano shranjena"
+msgstr "Datoteka projekta uspe\9ano shranjena."
#: Merge.rc:1799
#, c-format
"Save current paths and options to project file\n"
"Save Project File"
msgstr ""
-"Shrani izbrano pot in mo\9enosti v projektno datoteko\n"
-"Shrani projektno datoteko"
+"Shrani izbrano pot in mo\9enosti v datoteko projekta\n"
+"Shrani datoteko projekta"
#: Merge.rc:1804
#, c-format
"Quit the application; prompts to save documents\n"
"Exit"
msgstr ""
-"Zapri aplikacijo; opozori shranjevanje dokumentov\n"
+"Zapri aplikacijo; opozori na shranjevanje dokumentov\n"
"Izhod"
#: Merge.rc:1811
"Switch to the next window pane\n"
"Next Pane"
msgstr ""
-"Preklopi na naslednji okenski panel\n"
-"Naslednji panel"
+"Preklopi na naslednji okenski okvir\n"
+"Naslednji okvir"
#: Merge.rc:1832
#, c-format
"Switch back to the previous window pane\n"
"Previous Pane"
msgstr ""
-"Preklopi nazaj na predhodni okenski panel\n"
-"Predhodni panel"
+"Preklopi nazaj na predhodni okenski okvir\n"
+"Predhodni okvir"
#: Merge.rc:1838
#, c-format
msgid ""
"Arrange windows so they overlap\n"
"Cascade Windows"
-"Razvrsti okna kaskadno, s prekrivanjem \n"
+msgstr ""
+"Razvrsti okna kaskadno, s prekrivanjem\n"
"Kaskadno"
#: Merge.rc:1839
"Redo the previously undone action\n"
"Redo (Ctrl+Y)"
msgstr ""
-"Ponovi prej\9anjo neizvedeno akcijo\n"
-"Ponovi(Ctrl+Y)"
+"Uveljavi razveljavljeno akcijo\n"
+"Uveljavi(Ctrl+Y)"
#: Merge.rc:1860
#, c-format
"Show or hide the tab bar\n"
"Toggle TabBar"
msgstr ""
-"Skrij ali prika\9ei tabulatorsko vrstico\n"
-"Tabulatorska vrstica"
+"Skrij ali prika\9ei vrstico z listièi\n"
+"Vrstica z listièi"
#: Merge.rc:1863
#, c-format
"Automatically resize panes\n"
"Lock Panes"
msgstr ""
-"Samodejno poveèaj panel\n"
-"Zakleni panel"
+"Samodejno poveèaj okvirje\n"
+"Zakleni okvirje"
#: Merge.rc:1869
#, c-format
#: Merge.rc:1870
#, c-format
msgid "Change the window position"
-msgstr "Spremeni pozicijo okena"
+msgstr "Spremeni pozicijo okna"
#: Merge.rc:1871
#, c-format
#: Merge.rc:1875
#, c-format
msgid "Close the active window and prompts to save the documents"
-msgstr "Zapri vsa aktivna okna in opozori na shranjevanje dokumenta"
+msgstr "Zapri aktivno okno in vpra\9aaj za shranjevanje dokumenta"
#: Merge.rc:1880
#, c-format
#: Merge.rc:1881
#, c-format
msgid "Activate Task List"
-msgstr "Aktivni list opravil"
+msgstr "Aktiviraj seznam opravil"
#: Merge.rc:1882
#, c-format
"Close print preview mode\n"
"Cancel Preview"
msgstr ""
-"Zapri mo\9enost predogleda tiskanja\n"
+"Zapri predogled tiskanja\n"
"Zapri predogled"
#: Merge.rc:1895
"\n"
"\n"
"WinMerge.Primerjava datotek\n"
-"WinMerge primerjava datoteke"
+"WinMerge primerjava datotek"
#: Merge.rc:1896
#, c-format
"\n"
"\n"
"WinMerge.Primerjava map\n"
-"WinMerge primerjalna mapa"
+"WinMerge primerjava map"
#: Merge.rc:1903
#, c-format
msgid "Preserve original EOL chars"
-msgstr "Obdr\9ei izvorne znake za konec vrstice (EOL)"
+msgstr "Obdr\9ei izvorni tip znakov za konec vrstice (EOL)"
#: Merge.rc:1910
#, c-format
#: Merge.rc:1930
#, c-format
msgid "&Ok"
-msgstr "&Vredu"
+msgstr "&V redu"
#: Merge.rc:1932
#, c-format
#: Merge.rc:1950
#, c-format
msgid "Don't ask this &question again."
-msgstr "Ne vpra\9aaj veè tega."
+msgstr "Tega vpra\9aanja ne postavi veè."
#: Merge.rc:1961
#, c-format
#: Merge.rc:1963
#, c-format
msgid "Version Control"
-msgstr "Razlièica nadzora"
+msgstr "Version Control"
#: Merge.rc:1968
#: Merge.rc:2339
#: Merge.rc:1977
#, c-format
msgid "To:"
-msgstr "Do:"
+msgstr "Na:"
#: Merge.rc:1978
#, c-format
#: Merge.rc:1996
#, c-format
msgid "All message boxes are now displayed again."
-msgstr "Vsa sporoèilna okna so sedaj ponovno prikazana "
+msgstr "Vsa sporoèilna okna bodo sedaj ponovno prikazana "
#: Merge.rc:1997
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
-msgstr "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
+msgstr "V trenutni seji primerjave so bile narejene spremembe nastavitev. Nekatere nastavitve ne bodo veljale dokler ne boste ponovno zagnali primerjave."
#: Merge.rc:1998
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
-msgstr "Ta izbrana sprememba pisave ne bo uporabljena na katerikoli vidni spremembi"
+msgstr "Izbrana sprememba pisave \9ae ne bo v veljavi na trenutno vidnem panelu razlik."
#: Merge.rc:2000
#, c-format
"\n"
"Please use values 1 - %1."
msgstr ""
-"Velièina oznake ni v obsegu sprejemljivega v WinMerge .\n"
+"\8atevilo presledkov, ki jih tabulator nadomesti, ni v obsegu sprejemljivega\n"
+"za WinMerge .\n"
"\n"
-"Prosimo koristite vrednosti 1 - %1."
+"Prosimo, uporabite vrednosti 1 - %1."
#: Merge.rc:2002
#, c-format
"\n"
"Please re-start WinMerge after the reset."
msgstr ""
-"Ali ste preprièani da \9eelite resetirati vse mo\9enosti WinMerge na privzete vrednosti?\n"
+"Ali ste preprièani da \9eelite ponastaviti vse mo\9enosti WinMerge na privzete vrednosti?\n"
"\n"
-"Prosim ponovno za\9eenite WinMerge po ponastavitvi"
+"Prosimo, ponovno za\9eenite WinMerge po ponastavitvi."
#: Merge.rc:2008
#, c-format
#: Merge.rc:2009
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
-msgstr "Programi|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
+msgstr "Izvedljive datoteke|*.exe;*.bat;*.cmd|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2010
#, c-format
#: Merge.rc:2011
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
-msgstr "Datoteke WinMerge projekta(*.WinMerge)|*.WinMerge||"
+msgstr "Datoteke WinMerge projektov (*.WinMerge)|*.WinMerge||"
#: Merge.rc:2013
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
-msgstr "Mo\9ene datoteke (*.ini)|*.ini|All Files (*.*)|*.*||"
+msgstr "Datoteke nastavitev (*.ini)|*.ini|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2019
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
-msgstr "Besedilne datotke (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
+msgstr "Besedilne datoteke (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2020
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
-msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
+msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2021
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
-msgstr "XML datoteke (*.xml)|*.xml|All Files (*.*)|*.*||"
+msgstr "XML datoteke (*.xml)|*.xml|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2027
#, c-format
#: Merge.rc:2038
#, c-format
msgid "Modified Date"
-msgstr "Datum spremembe"
+msgstr "Spremenjen datum"
#: Merge.rc:2039
#, c-format
msgid "Modified Date and Size"
-msgstr "Sprememba datuma in velikosti"
+msgstr "Spremenjen datum in velikost"
#: Merge.rc:2040
#, c-format
#: Merge.rc:2051
#, c-format
msgid "Select filename for new filter"
-msgstr "Izberi ime datoteke za nov filter"
+msgstr "Izberite ime datoteke za nov filter"
#: Merge.rc:2052
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
-msgstr "Datoteke filtrov (*.flt)|*.flt|Sve datoteke (*.*)|*.*||"
+msgstr "Datoteke filtrov (*.flt)|*.flt|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2054
#, c-format
"Please copy file %1 to WinMerge/Filters -folder:\n"
"%2."
msgstr ""
-"Ne najdem filtra datoteke, datoteke predloge!\n"
+"Ne najdem datoteke predloge filtra!\n"
"\n"
-"Prosimo, kopirajte datoteko %1 v WinMerge/Filters -mapo:\n"
+"Prosimo, kopirajte datoteko %1 v \"WinMerge/Filters\" mapo:\n"
"%2."
#: Merge.rc:2056
"\n"
"Please make sure the folder exists and is writable."
msgstr ""
-"Ne morem kopirati filtra predloge datoteke v filter mapo:\n"
+"Ne morem kopirati datoteke filtra predloge v filter mapo:\n"
"%1\n"
"\n"
-"Preverite èe mapa obstaja in je zapisljiva."
+"Prosim preverite, èe mapa obstaja in je zapisljiva."
#: Merge.rc:2058
#, c-format
msgstr ""
"Uporabni\9aka filter datoteèna mapa ni definirana.\n"
"\n"
-"Prosim izberite filter mape v mo\9enosti/Sistem."
+"Prosim izberite filter mape v Mo\9enosti/Sistem."
#: Merge.rc:2060
#, c-format
"\n"
"Maybe the file is read-only?"
msgstr ""
-"Ni mogoèe izbrisati filter datoteke:\n"
+"Ni morem izbrisati filter datoteke:\n"
"%1\n"
"\n"
-"Morda je datoteka za\9aèitena - samo za brananje."
+"Morda je datoteka za\9aèitena - samo za branje."
#: Merge.rc:2061
#, c-format
msgstr ""
"Filtri so bili posodobljeni. Ali \9eelite osve\9eiti vse odprte mape za primerjavo?\n"
"\n"
-"Èe jih ne \9eelite osve\9eiti sedaj, lahko izberete Ne in osve\9eite primerjave kasneje."
+"Èe jih ne \9eelite osve\9eiti sedaj, lahko izberete Ne in osve\9eite primerjave kasneje."
#: Merge.rc:2084
#, c-format
#: Merge.rc:2092
#, c-format
msgid "Untitled left"
-msgstr "Levi neimanovan"
+msgstr "Levi neimenovan"
#: Merge.rc:2093
#, c-format
#: Merge.rc:2095
#, c-format
msgid "Mine File"
-msgstr "Moja datoteka"
+msgstr "Va\9aa datoteka"
#: Merge.rc:2101
#, c-format
msgid "Scanning files..."
-msgstr "Prei\9aèi datoteko..."
+msgstr "Pregledovanje datoteko ..."
#: Merge.rc:2102
#, c-format
msgid "Opening selection"
-msgstr "Odpiranje izbranega"
+msgstr "Odpiranje izbora"
#: Merge.rc:2103
#, c-format
#: Merge.rc:2107
#, c-format
msgid "Copying files..."
-msgstr "Kopiranje datotek..."
+msgstr "Kopiranje datotek ..."
#: Merge.rc:2108
#, c-format
msgid "Deleting files..."
-msgstr "Brisanje datotek..."
+msgstr "Brisanje datotek ..."
#: Merge.rc:2109
#, c-format
msgid "Moving files..."
-msgstr "Premikanje datotek..."
+msgstr "Premikanje datotek ..."
#: Merge.rc:2110
#, c-format
msgid "Creating the report..."
-msgstr "Izdelava poroèila..."
+msgstr "Izdelava poroèila ..."
#: Merge.rc:2111
#, c-format
msgid "Undoing the last operation..."
-msgstr "Razveljavi zadnje dejanje..."
+msgstr "Razveljavi zadnje dejanje ..."
#: Merge.rc:2112
#, c-format
msgid "Redoing the previous operation..."
-msgstr "Ponovi zadnje dejanje..."
+msgstr "Ponovi zadnje dejanje ..."
#: Merge.rc:2118
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
-msgstr "Vr: %s St: %d/%d znak: %d/%d EOL: %s"
+msgstr "Vr: %s St: %d/%d znak: %d/%d EOL: %s"
#: Merge.rc:2119
#, c-format
#: Merge.rc:2120
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
-msgstr "Vr: %s St: %d/%d Zn: %d/%d"
+msgstr "Vr: %s St: %d/%d Zn: %d/%d"
#: Merge.rc:2121
#, c-format
#: Merge.rc:2123
#, c-format
msgid "%1 Differences Found"
-msgstr "Najdena razlika: %1"
+msgstr "%1 najdenih razlik"
#: Merge.rc:2124
#, c-format
msgid "1 Difference Found"
-msgstr "Najdena razlika: 1"
+msgstr "1 najdena razlika"
#. Abbreviation from "Read Only"
#: Merge.rc:2125
#: Merge.rc:2132
#, c-format
msgid "Items: %1"
-msgstr "Predmet: %1"
+msgstr "Predmetov: %1"
#: Merge.rc:2138
#, c-format
msgid "Select two existing folders or files to compare"
-msgstr "Izberi dve obstojeèi mapi ali datoteki za primerjavo"
+msgstr "Izberite dve obstojeèi mapi ali datoteki za primerjavo"
#: Merge.rc:2139
#, c-format
#: Merge.rc:2140
#, c-format
msgid "Select two folders or two files to compare."
-msgstr "Izberi dve mapi ali dve datoteki za primerjavo."
+msgstr "Izberite dve mapi ali dve datoteki za primerjavo."
#: Merge.rc:2141
#, c-format
msgid "Left path is invalid!"
-msgstr "Leva pot je neveljavna"
+msgstr "Leva pot je neveljavna!"
#: Merge.rc:2142
#, c-format
msgid "Right path is invalid!"
-msgstr "Desna pot je neveljavna"
+msgstr "Desna pot je neveljavna!"
#: Merge.rc:2143
#, c-format
msgid "Both paths are invalid!"
-msgstr "Obe poti sta neveljavni"
+msgstr "Obe poti sta neveljavni!"
#: Merge.rc:2144
#, c-format
msgid "Choose two files to enable unpacker selection."
-msgstr "Izberi dve datoteki, da boste omogoèili izbiro pretvornika"
+msgstr "Izberite dve datoteki, da boste omogoèili izbiro pretvornika."
#: Merge.rc:2145
#, c-format
msgid "Cannot compare file and folder!"
-msgstr "Ni mogoèe primerjati datoteke in mape!"
+msgstr "Ne morem primerjati datoteke in mape!"
#: Merge.rc:2151
#, c-format
"\n"
"%2"
msgstr ""
-"Ni mogoèe odpreti datoteke\n"
+"Ne morem odpreti datotek\n"
"%1\n"
"\n"
"%2"
#: Merge.rc:2154
#, c-format
msgid "Failed to parse conflict file."
-msgstr "Spodletelo razèlenjevanje konfliktne datoteke."
+msgstr "Ne morem razèleniti konfliktne datoteke."
#: Merge.rc:2155
#, c-format
#: Merge.rc:2163
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
-msgstr "%1 je samo za branje. Ali \9eelite prepisati to datoteko? ( Ne za shranjevanje pod novim imenom)"
+msgstr "%1 je oznaèena samo za branje. Ali jo kljub temu \9eelite prepisati? ( Ne, za shranjevanje pod novim imenom)"
#: Merge.rc:2164
#, c-format
"%1\n"
"%2\n"
"Ali \9eelite:\n"
-"\t- uporabiti razlièno ime datoteke (pritisnite Vredu)\n"
+"\t- uporabiti drugaèno ime datoteke (pritisnite V redu)\n"
"\t- preklicati trenutno operacijo (pritisnite Preklièi)?"
#: Merge.rc:2169
msgstr ""
"Druga aplikacija je posodobila datoteko\n"
"%1\n"
-"odkar jo je WinMerge zadnjiè nalo\9eil.\n"
+"odkar jo je WinMerge nalo\9eil.\n"
"\n"
"Prepi\9ai spremenjeno datoteko?"
"is marked read-only. Would you like to override the read-only item?"
msgstr ""
"%1\n"
-"je oznaèena samo za branje. \8eelite prepisati predmet samo za branje?"
+"je oznaèena samo za branje. Ali jo kljub temu \9eelite prepisati?"
#: Merge.rc:2173
#, c-format
"\n"
"Refresh documents before continuing."
msgstr ""
-"Ni mogoèe povezati razlik, kadar dokumenta nista sinhronizirana.\n"
+"Ne morem zdru\9eevati razlik, èe dokumenta nista sinhronizirana.\n"
"\n"
-"Osve\9eite dokumente predno nadaljujete."
+"Prosim, osve\9eite dokumente pred nadaljujete."
#: Merge.rc:2188
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
-msgstr "Navesti morate pot SourceSafe projekta èe \9eelite nadaljevati (npr: $/MyProject)"
+msgstr "Navesti morate pot SourceSafe projekta èe \9eelite nadaljevati (npr: $/MyProject)"
#: Merge.rc:2189
#, c-format
#: Merge.rc:2190
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
-msgstr "Versioning System je vrnil napako medtem ko je posku\9aal dostopati do datoteke. Ni mogoèe nadaljevati..."
+msgstr "Versioning System je vrnil napako medtem ko je posku\9aal dostopati do datoteke. Ni mogoèe nadaljevati ..."
#: Merge.rc:2191
#, c-format
msgid "Error executing versioning system command."
-msgstr "Napaka pri izvr\9aevanju sistemskega ukaza."
+msgstr "Napaka pri izvr\9aevanju Versioning System ukaza."
#: Merge.rc:2192
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
-msgstr "VSS delovna mapa in lokacija izbrane mape se ne ujemata. Nadaljujem?"
+msgstr "VSS delovna mapa in lokacija trenutne datoteke se ne ujemata. Nadaljujem?"
#: Merge.rc:2193
#, c-format
msgid "No VSS database(s) found!"
-msgstr "VSS podatkovna baza ni najdena!"
+msgstr "Ne morem najti VSS podatkovne baze!"
#: Merge.rc:2194
#, c-format
" Please, check config spec of used view.\n"
" Undo checkout operation?"
msgstr ""
-"Versioning System je vrnil napako med preverjanjem datoteke...\n"
+"Versioning System je vrnil napako med preverjanjem datoteke ...\n"
"Prosim preverite nastavitvene specifikacije uporabljenega pogleda.\n"
"Zavrzi pregledno operacijo?"
#: Merge.rc:2556
#, c-format
msgid "None"
-msgstr "Prazno"
+msgstr "Brez"
#: Merge.rc:2203
#, c-format
#: Merge.rc:2206
#, c-format
msgid "Break at whitespace"
-msgstr "Prelom na presledku"
+msgstr "Prelom na praznem znaku"
#: Merge.rc:2207
#, c-format
msgid "Break at whitespace or punctuation"
-msgstr "Prelom na presledku ali loèilu"
+msgstr "Prelom na praznem znaku ali loèilu"
#: Merge.rc:2213
#: Merge.rc:2215
#: Merge.rc:2219
#, c-format
msgid "Delete selected item(s) on both sides"
-msgstr "Izbri\9ai izran predmet na obeh straneh"
+msgstr "Izbri\9ai izbran(e) predmet(e) na obeh straneh"
#: Merge.rc:2220
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
-msgstr "Skrij izbran predmet(e) (na filtru)"
+msgstr "Skrij izbran(e) predmet(e) (takoj\9anji filter)"
#: Merge.rc:2221
#, c-format
#: Merge.rc:2242
#, c-format
msgid "Left to... (%1)"
-msgstr "Leva do...(%1)"
+msgstr "Leva do ... (%1)"
#: Merge.rc:2227
#: Merge.rc:2243
#, c-format
msgid "Right to... (%1)"
-msgstr "Desna do...(%1)"
+msgstr "Desna do ... (%1)"
#: Merge.rc:2228
#: Merge.rc:2244
#, c-format
msgid "Left to... (%1 of %2)"
-msgstr "Leva do...(%1 od%2)"
+msgstr "Leva do ... (%1 od%2)"
#: Merge.rc:2229
#: Merge.rc:2245
#, c-format
msgid "Right to... (%1 of %2)"
-msgstr "Desna do...(%1 od%2)"
+msgstr "Desna do ... (%1 od%2)"
#: Merge.rc:2235
#, c-format
#: Merge.rc:2241
#, c-format
msgid "Select destination folder"
-msgstr "Izberi ciljno mapo"
+msgstr "Izberite ciljno mapo"
#: Merge.rc:2246
#, c-format
msgid "Left side - select destination folder:"
-msgstr "Leva stran- izberi ciljno mapo:"
+msgstr "Leva stran - izberite ciljno mapo:"
#: Merge.rc:2247
#, c-format
msgid "Right side - select destination folder:"
-msgstr "Desna stran- izberi ciljno mapo:"
+msgstr "Desna stran - izberite ciljno mapo:"
#: Merge.rc:2248
#, c-format
msgid "(%1 Files Affected)"
-msgstr "(%1 Datoteke simulirano)"
+msgstr "(%1 vpletenih datotek)"
#: Merge.rc:2249
#, c-format
msgid "(%1 of %2 Files Affected)"
-msgstr "(%1 of %2 datotek simulirano)"
+msgstr "(%1 of %2 vpletenih datotek)"
#: Merge.rc:2255
#, c-format
"\n"
"%1 ?"
msgstr ""
-"Ali ste preprièani da \9eelite\n"
+"Ali ste preprièani, da \9eelite brisati\n"
"\n"
-"%1\n"
-"Izbrisati?"
+"%1?"
#: Merge.rc:2256
#, c-format
#: Merge.rc:2257
#, c-format
msgid "Are you sure you want to copy %d items:"
-msgstr "Ali ste preprièani da \9eelite kopirati %d predmetov:"
+msgstr "Ali ste preprièani, da \9eelite kopirati %d predmetov:"
#: Merge.rc:2258
#, c-format
"\n"
"Please refresh the compare."
msgstr ""
-"Postopek zaustavljen!\n"
+"Postopek prekinjen!\n"
"\n"
-"Mapa z vsebino na disku je spremenjena , pot\n"
+"Vsebina map na disku je bila spremenjena , poti\n"
"%1\n"
-"do nje.\n"
+"do nje nisem na\9ael.\n"
"\n"
-"Osve\9eite primerjavo."
+"Prosim, osve\9eite primerjavo."
#: Merge.rc:2259
#, c-format
#: Merge.rc:2270
#, c-format
msgid "Open left file with ..."
-msgstr "Odpri levo datoteko z..."
+msgstr "Odpri levo datoteko z ..."
#: Merge.rc:2271
#, c-format
#: Merge.rc:2329
#, c-format
msgid "Left EOL"
-msgstr "Znake za konec vrstice (EOL) na levi"
+msgstr "Znake za konec vrstice (EOL) na levi datoteki"
#: Merge.rc:2330
#, c-format
msgid "Right EOL"
-msgstr "Znake za konec vrstice (EOL) na desni"
+msgstr "Znake za konec vrstice (EOL) na desni datoteki"
#: Merge.rc:2336
#, c-format
#: Merge.rc:2338
#, c-format
msgid "Ignored Diff."
-msgstr "Zanemari razlike"
+msgstr "Zanemarjene razlike."
#: Merge.rc:2340
#: Merge.rc:2552
#: Merge.rc:2346
#, c-format
msgid "Unable to compare files"
-msgstr "Ni mogoèe primerjati datotek"
+msgstr "Nisem mogel primerjati datotek"
#: Merge.rc:2347
#, c-format
msgid "Item aborted"
-msgstr "Predmet prekinjen"
+msgstr "Pregled predmeta prekinjen"
#: Merge.rc:2348
#, c-format
#: Merge.rc:2349
#, c-format
msgid "Folder skipped"
-msgstr "Skraja\9aana map"
+msgstr "Preskoèena mapa"
#: Merge.rc:2350
#, c-format
#: Merge.rc:2352
#, c-format
msgid "Binary files are identical"
-msgstr "Binarni datoteki sta identièni"
+msgstr "Binarni datoteki sta enaki"
#: Merge.rc:2354
#, c-format
#: Merge.rc:2372
#, c-format
msgid "Elapsed time: %ld ms"
-msgstr "Potekel èas: %ld ms"
+msgstr "Minilo je: %ld ms"
#: Merge.rc:2373
#, c-format
#: Merge.rc:2381
#, c-format
msgid "Subfolder name when subfolders are included."
-msgstr "Imena podmap kadar so vkljuèene podmape"
+msgstr "Imena podmap ko so vkljuèene podmape."
#: Merge.rc:2382
#, c-format
msgid "Comparison result, long form."
-msgstr "Rezultat primerjave, dolga oblika"
+msgstr "Rezultat primerjave, dolga oblika."
#: Merge.rc:2383
#, c-format
msgid "Left side modification date."
-msgstr "Leva stran datum spremembe"
+msgstr "Datum spremembe datoteke na levi strani."
#: Merge.rc:2384
#, c-format
msgid "Right side modification date."
-msgstr "Desna stran datum spremembe"
+msgstr "Datum spremembe datoteke na desni strani."
#: Merge.rc:2385
#, c-format
#: Merge.rc:2386
#, c-format
msgid "Left file size in bytes."
-msgstr "Velikost leve datoteke v bajtih"
+msgstr "Velikost leve datoteke v bajtih."
#: Merge.rc:2387
#, c-format
msgid "Right file size in bytes."
-msgstr "Velikost desne datoteke v bajtih"
+msgstr "Velikost desne datoteke v bajtih."
#: Merge.rc:2388
#, c-format
msgid "Left file size abbreviated."
-msgstr "Skraja\9aana leva datoteka"
+msgstr "Skraj\9aana velikost leve datoteke."
#: Merge.rc:2389
#, c-format
msgid "Right file size abbreviated."
-msgstr "Skraj\9aana desna datoteka"
+msgstr "Skraj\9aana velikost desne datoteke."
#: Merge.rc:2395
#, c-format
msgid "Left side creation time."
-msgstr "Leva stran datum nastanka"
+msgstr "Datum nastanka na levi strani."
#: Merge.rc:2396
#, c-format
msgid "Right side creation time."
-msgstr "Desna stran datum nastanka"
+msgstr "Datum nastanka na desni strani."
#: Merge.rc:2397
#, c-format
#: Merge.rc:2399
#, c-format
msgid "Right side file version, only for some filetypes."
-msgstr "Verzija desne datoteke, samo za nekatere datoteène tipe"
+msgstr "Verzija desne datoteke, samo za nekatere datoteène tipe."
#: Merge.rc:2400
#, c-format
msgid "Short comparison result."
-msgstr "Rezultat kratke primerjave"
+msgstr "Kratki rezultati primerjave."
#: Merge.rc:2401
#, c-format
msgid "Left side attributes."
-msgstr "Atributi leve strani"
+msgstr "Atributi leve strani."
#: Merge.rc:2402
#, c-format
msgid "Right side attributes."
-msgstr "Atributi desne strani"
+msgstr "Atributi desne strani."
#: Merge.rc:2403
#, c-format
msgid "Left side file EOL type"
-msgstr "Tip znakov za konec vrstice (EOL) na levi"
+msgstr "Tip znakov za konec vrstice (EOL) na levi datoteki"
#: Merge.rc:2404
#, c-format
msgid "Right side file EOL type"
-msgstr "Tip znakov za konec vrstice (EOL) na desni"
+msgstr "Tip znakov za konec vrstice (EOL) na desni datoteki"
#: Merge.rc:2410
#, c-format
msgid "Left side encoding."
-msgstr "Kodirana leva stran"
+msgstr "Kodna stran leve strani."
#: Merge.rc:2411
#, c-format
msgid "Right side encoding."
-msgstr "Kodirana desna stran"
+msgstr "Kodna stran desne strani."
#: Merge.rc:2412
#, c-format
msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
-msgstr "\8atevilo ignoriranih razlik v datoteki. Te razlike so ignorirane iz strani WinMerge-a in ne morejo biti zdru\9eene"
+msgstr "\8atevilo ignoriranih razlik v datoteki. Te razlike program WinMerge ignorira in ne morejo biti zdru\9eene."
#: Merge.rc:2413
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
-msgstr "\8atevilo razlik v datoteki. Ta \9atevilka na vsebuje ignoriranih razlik"
+msgstr "\8atevilo razlik v datoteki. Ta \9atevilka ne vsebuje ignoriranih razlik."
#: Merge.rc:2414
#, c-format
#: Merge.rc:2421
#, c-format
msgid "Comma-separated list"
-msgstr "Seznam loèen z vejico"
+msgstr "Seznam, loèen z vejicami"
#: Merge.rc:2422
#, c-format
msgid "Tab-separated list"
-msgstr "Seznam loèen s tabulatorjem"
+msgstr "Seznam, loèen s tabulatorji"
#: Merge.rc:2423
#, c-format
#: Merge.rc:2426
#, c-format
msgid "The report file already exists. Do you want to overwrite existing file?"
-msgstr "Poroèilo datoteke \9ee obstaja. Ali \9eelite prepisati obstojeèo datoteko?"
+msgstr "Datoteka s poroèilom \9ee obstaja. Ali jo \9eelite prepisati?"
#: Merge.rc:2427
#, c-format
#: Merge.rc:2434
#, c-format
msgid "The same file is opened in both panels."
-msgstr "Ista datoteka je odprta v obeh panelih"
+msgstr "Ista datoteka je odprta v obeh okvirih"
#: Merge.rc:2435
#, c-format
msgid "The selected files are identical."
-msgstr "Izbrani datoteki sta identièni."
+msgstr "Izbrani datoteki sta enaki."
#: Merge.rc:2436
#, c-format
"\n"
"Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
msgstr ""
-"Te datoteka so razliène pri prehodu v drugo vrsto.\n"
+"Ti datoteki imata razlièna tipa znakov za zakljuèke vrstic (EOL).\n"
"\n"
-"Ali zadr\9eujete razliène prehode v drugo vrsto?\n"
+"Ali \9eelite oba tipa obravnavati kot enaka za trenutno primerjavo?\n"
"\n"
-"Opomba: Èe \9eelite vedno obdr\9eati razliène prehode v drugo vrsto, izberite 'Prezri razliènost prehoda v drugo vrsto...' v tabulatorskem primerjanju nastavitev dialoga (dostopno pod Urajanje/Nastavitve."
+"Opomba: Èe jih \9eelite vedno obravnavati kot enake, nastavite mo\9enost 'Prezri razliènost tipa znakov za zakljuèke vrstic (EOL)' na listièu Primerjave dialoga nastavitev (dostopen pod Urejanje/Nastavitve)."
#: Merge.rc:2439
#, c-format
" With the current options, they will be unified to the main type.\n"
" Do you want to change the options and preserve the different EOL ?"
msgstr ""
-"Zakljuèki vrstic (EOL) so razliènega tipa (Windows/Unix/Mac) v datoteki '%1'.\n"
+"Znaki za zakljuèke vrstic (EOL) so razliènega tipa (Windows/Unix/Mac) v datoteki '%1'.\n"
"S trenutno nastavitvijo, bodo poenotene v glavnem tipu.\n"
-"Ali \9eelite spremeniti nastavitev in ohraniti razliène zakljuèke vrstic?"
+"Ali \9eelite spremeniti mo\9enosti in ohraniti razliène zakljuèke vrstic?"
#: Merge.rc:2440
#, c-format
#: Merge.rc:2441
#, c-format
msgid "The selected folder is invalid."
-msgstr "Izbrana mapa je napaèna"
+msgstr "Izbrana mapa ni veljavna."
#: Merge.rc:2442
#, c-format
msgid "Cannot open a binary file to editor."
-msgstr "Ni mogoèe odpreti binarne datoteke v urejevalniku"
+msgstr "V urejevalniku ne morem odpreti binarne datoteke."
#: Merge.rc:2443
#, c-format
"%1\n"
"to the other side and open these folders?"
msgstr ""
-"Datoteka obstaja samo na drugi strani in je ni mogoèe odpreti.\n"
+"Mapa obstaja samo na drugi strani, zato je ne morem odpreti.\n"
"\n"
-"ali \9eelite ustvariti ujemajoèo mapo:\n"
+"Ali jo \9eelite ustvariti:\n"
"%1\n"
-"na drugi strani in odpreti to mapo?"
+"na drugi strani in jo odpreti?"
#: Merge.rc:2449
#, c-format
"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
"Would you like to treat both files as being in the default windows codepage (recommended)?"
msgstr ""
-"Razliène kodne tabele so najdene v levi (cp%d) in desni (cp%d) datoteki. \n"
-"Prikaz posamezne datoteke v svoji kodni tabeli bo povzroèilo bol\9ai prikaz toda zdru\9eevanje/kopiranje bo nevarno.\n"
-"Ali \9eelite tretirati,da sta obe datoteka vidna v isti privzeti windows kodni tabeli (priporoèljivo)?"
+"Leva (cp%d) in desna (cp%d) datoteka sta v razliènih kodnih tabelah. \n"
+"Prikaz posamezne datoteke v svoji kodni tabeli bo omogoèilo bolj\9ai prikaz, a zdru\9eevanje/kopiranje bo nevarno.\n"
+"Ali \9eelite obravnavati obe datoteki kot da sta v isti privzeti windows kodni tabeli (priporoèljivo)?"
#: Merge.rc:2450
#, c-format
msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
-msgstr "Opozorilo: Datoteki uporabljata razlièni kodiranji, levo=%s in desno=%s, in s spajanjem je mogoèe izgubiti informacije"
+msgstr "Opozorilo: Datoteki uporabljata razlièni kodiranji, levo=%s in desno=%s. Zdru\9eevanje lahko povzroèi izgubo informacije."
#: Merge.rc:2451
#, c-format
#: Merge.rc:2460
#, c-format
msgid "Line difference"
-msgstr "Vrstiène razlike"
+msgstr "Razlika v vrstici"
#: Merge.rc:2466
#, c-format
msgid "Replaced %1 string(s)."
-msgstr "Zamenjan %1 znak(i)."
+msgstr "Zamenjan %1 niz(i)."
#: Merge.rc:2467
#, c-format
msgid "Cannot find string \"%s\""
-msgstr "Ni mogoèe najti znaka \"%s\""
+msgstr "Ne morem najti niza \"%s\""
#: Merge.rc:2473
#, c-format
#: Merge.rc:2480
#, c-format
msgid "Location Pane"
-msgstr "Polo\9eaj panela"
+msgstr "Polo\9eajni okvir"
#: Merge.rc:2481
#, c-format
msgid "Diff Pane"
-msgstr "Razlika panelov"
+msgstr "Okvir razlik"
#: Merge.rc:2487
#, c-format
#: Merge.rc:2491
#, c-format
msgid "[%1 files selected]"
-msgstr "[%1 datoteka izbrana]"
+msgstr "[%1 izbranih datotek]"
#: Merge.rc:2492
#, c-format
#: Merge.rc:2493
#, c-format
msgid "Context"
-msgstr "Sobesedilo"
+msgstr "Pomen"
#: Merge.rc:2494
#, c-format
#: Merge.rc:2495
#, c-format
msgid "Could not write to file %1."
-msgstr "Ni mogoèe zapisato v datoteko %1."
+msgstr "Ne morem pisati v datoteko %1."
#: Merge.rc:2496
#, c-format
#: Merge.rc:2498
#, c-format
msgid "Cannot create a patch file from binary files."
-msgstr "Ni mogoèe izdelati datoteke s popravki iz binarnih datotek."
+msgstr "Iz binarnih datotek ne morem izdelati datoteke s popravki."
#: Merge.rc:2499
#, c-format
msgid "Cannot create a patch file from directories."
-msgstr "Ni mogoèe izdelati datoteke s popravki iz iz map."
+msgstr "Iz map ne morem izdelati datoteke s popravki."
#: Merge.rc:2500
#, c-format
"See manual for more info about archive support and how to enable it."
msgstr ""
"Delo z arhivskimi datotekami ni omogoèeno.\n"
-"Vse rabljene komponente (7-zip in/ali Merge7z*.dll) za arhivno podporo ni mogoèe najti.\n"
-"Za veè informacij poglejte v rubriko pomoè o podpori arhivskih datotek."
+"Vseh potrebnih komponent (7-zip in/ali Merge7z*.dll) za to ne morem najti.\n"
+"Za veè informacij poglejte v rubriko pomoè o podpori arhivskih datotek in kako jo omogoèiti."
#: Merge.rc:2508
#, c-format
"Note: 7-Zip integration is restricted to standalone operation in WinMerge settings."
msgstr ""
"\n"
-"Sporoèilo: 7-Zip zdru\9eitev je omejena na samostojno operacijo v WinMerge nastavitvah."
+"Sporoèilo: 7-Zip funkcionalnost je omejena na samostojno operacijo v WinMerge nastavitvah."
#: Merge.rc:2510
#, c-format
msgid "Select file for export"
-msgstr "Izberi datoteko za izvoz"
+msgstr "Izberite datoteko za izvoz"
#: Merge.rc:2511
#, c-format
msgid "Select file for import"
-msgstr "Izberi datoteko za uvoz"
+msgstr "Izberite datoteko za uvoz"
#: Merge.rc:2512
#, c-format
#: Merge.rc:2514
#, c-format
msgid "Failed to import options from the file."
-msgstr "Ni mogoèe uvoziti mo\9enosti iz datoteke"
+msgstr "Uva\9eanje mo\9enosti iz datoteke ni uspelo"
#: Merge.rc:2515
#, c-format
msgid "Failed to write options to the file."
-msgstr "Ni mogoèe zapisati mo\9enosti v datoteko"
+msgstr "Izva\9eanje mo\9enosti v datoteko ni uspelo"
#: Merge.rc:2516
#, c-format
#: Merge.rc:2523
#, c-format
msgid "No match"
-msgstr "Ni enakosti"
+msgstr "Ni ujemanja"
#: Merge.rc:2524
#, c-format
#: Merge.rc:2525
#, c-format
msgid "Invalid collation character"
-msgstr "Neveljaven izbrani znak"
+msgstr "Neveljaven nadomestni znak"
#: Merge.rc:2526
#, c-format
#: Merge.rc:2527
#, c-format
msgid "Trailing backslash"
-msgstr "Znak \"\""
+msgstr "Leva po\9aevnica: \"\""
#: Merge.rc:2528
#, c-format
msgid "Invalid back reference"
-msgstr "Neveljavna zadnje priporoèilo"
+msgstr "Neveljavno zadnje priporoèilo"
#: Merge.rc:2529
#, c-format
msgid "Unmatched [ or [^"
-msgstr "Neujemajoèe: [ ali [^"
+msgstr "Neujemajoèe [ ali [^"
#: Merge.rc:2530
#, c-format
msgid "Unmatched ( or \\("
-msgstr "Neujemajoèe: ( ali \\("
+msgstr "Neujemajoèe ( ali \\("
#: Merge.rc:2531
#, c-format
msgid "Unmatched \\{"
-msgstr "Neujemajoèe: \\{"
+msgstr "Neujemajoèe \\{"
#: Merge.rc:2532
#, c-format
#: Merge.rc:2551
#, c-format
msgid "Mixed"
-msgstr "Pome\9aano"
+msgstr "Me\9aano"
#: Merge.rc:2553
#, c-format
#: Merge.rc:2587
#, c-format
msgid "Save the right file with name..."
-msgstr "Shrani desno datoteko z imenom..."
+msgstr "Shrani desno datoteko z imenom ..."
#: Merge.rc:2588
#, c-format
"Set program options\n"
"Options"
msgstr ""
-"Nastavi programske mo\9enosti\n"
+"Nastavi mo\9enosti programa\n"
"Mo\9enosti "
#: Merge.rc:2604
"Show Identical Items"
msgstr ""
"Prika\9ei predmete, ki so popolnoma enaki\n"
-"Prika\9ei identiène predmete"
+"Prika\9ei enake predmete"
#: Merge.rc:2617
#, c-format
"Displays items that exist in only on the right side\n"
"Show Right Unique Items"
msgstr ""
-"Prika\9ei vrstice ki obstajajo samo na desni strani\n"
-"Prika\9ei desne unikatne vrstice"
+"Prika\9ei predmete, ki obstajajo samo na desni strani\n"
+"Prika\9ei desne unikatne predmete"
#: Merge.rc:2620
#, c-format
"Select the font for the view\n"
"Select View Font"
msgstr ""
-"Izberi pisavo za pogled\n"
-"Izberi pogled pisave"
+"Izberite pisavo za pogled\n"
+"Izberite pogled pisave"
#: Merge.rc:2628
#, c-format
#: Merge.rc:2629
#, c-format
msgid "Shows whitespace characters"
-msgstr "Prika\9ei znake in praznine"
+msgstr "Prika\9ei prazne znake"
#: Merge.rc:2630
#, c-format
msgid "Toggle Diff Pane"
-msgstr "Preklopi na drug panel"
+msgstr "Preklopi na drug okvir razlik"
#: Merge.rc:2631
#, c-format
msgid "Location pane shows overall picture from files"
-msgstr "Panel prikazuje polo\9eaj razlike v datoteki"
+msgstr "Polo\9eajni okvir prikazuje polo\9eaj razlike v datoteki"
#: Merge.rc:2632
#, c-format
#: Merge.rc:2635
#, c-format
msgid "Swap the positions of the two panes"
-msgstr "Med seboj zamenjaj pozicije panelov "
+msgstr "Zamenjaj pozicije okvirov med seboj"
#: Merge.rc:2636
#, c-format
"Shows selection margins for both panes\n"
"Show Selection Margins"
msgstr ""
-"Prika\9ei izbiro robov za oba panela\n"
+"Prika\9ei izbiro robov za oba okvira\n"
"Prika\9ei izbrane robove"
#: Merge.rc:2639
"Copy difference to right and advance to next\n"
"Copy Right and Advance (Ctrl+Alt+Right)"
msgstr ""
-"Kopiraj razliko na desno in se pomakni na nasldenjo\n"
+"Kopiraj razliko na desno in se pomakni na naslednjo\n"
"Kopiraj Desno in pomakni (Ctrl+Alt+Right)"
#: Merge.rc:2655
"Copy difference to left and advance to next\n"
"Copy Left and Advance (Ctrl+Alt+Left)"
msgstr ""
-"kopiraj razliko na levo in se pomakni na naslednjo\n"
+"Kopiraj razliko na levo in se pomakni na naslednjo\n"
"Kopiraj levo in pomakni(Ctrl+Ald+left)"
#: Merge.rc:2656
"Copy all differences to the left file\n"
"All Left"
msgstr ""
-"Kopiranje vseh razlik v levo\n"
+"Kopiraj vse razlike v levo datoteko\n"
"Vse v levo"
#: Merge.rc:2658
#: Merge.rc:2659
#, c-format
msgid "Compare selected item (compare first item if multiple items selected)"
-msgstr "Primerjaj izbrani predmet ( primerjaj prvi predmet èe je izbranih veè)"
+msgstr "Primerjaj izbrane predmete (primerjaj prvega, èe jih je izbranih veè)"
#: Merge.rc:2665
#, c-format
#: Merge.rc:2668
#, c-format
msgid "Generates a report from compare results"
-msgstr "Izdelaj poroèilo iz primerjalnih rezultatov"
+msgstr "Izdelaj poroèilo iz rezultatov primerjave"
#: Merge.rc:2674
#, c-format
"Activates next visible file\n"
"Activate next File"
msgstr ""
-"Activira naslednjo vidno datoteko\n"
+"Aktivira naslednjo vidno datoteko\n"
"Aktiviraj naslednjo datoteko"
#: Merge.rc:2688
#: Merge.rc:2695
#, c-format
msgid "Outputs current WinMerge version info and configuration to text file"
-msgstr "Proizvedi trenutne informacije in nastavitve WinMerge v tekstovno datoteko "
+msgstr "Zapi\9ai verzijo programa WinMerge in nastavitve v tekstovno datoteko"
#: Merge.rc:2696
#, c-format
"Opens the release notes document\n"
"Release Notes"
msgstr ""
-"Odpri datoteko z opisom izdaje\n"
-"Opis izdaje"
+"Odpri dokument z opombami izdaje\n"
+"Opombe izdaje"
#: Merge.rc:2699
#, c-format
"Opens the translations website\n"
"Translations"
msgstr ""
-"Odpri spleno stran za prevode\n"
+"Odpri spletno stran za prevode\n"
"Prevodi"
#: Merge.rc:2705
#: Merge.rc:2725
#, c-format
msgid "Do not display moved blocks"
-msgstr "Ne prila\9ei premaknjene bloke"
+msgstr "Ne prikazuj premaknjenih blokov"
#: Merge.rc:2726
#, c-format
#: Merge.rc:2737
#, c-format
msgid "From file system"
-msgstr "Iz sistemske datoteke"
+msgstr "Iz datoteènega sistema"
#: Merge.rc:2738
#, c-format
#: Merge.rc:2746
#, c-format
msgid "Basic"
-msgstr "Osnovno"
+msgstr "Basic"
#: Merge.rc:2747
#, c-format
msgid "Batch"
-msgstr "Paketen"
+msgstr "Paket (Batch)"
#: Merge.rc:2748
#, c-format
#: Merge.rc:2763
#, c-format
msgid "Portable Object"
-msgstr "Prenosni objekti"
+msgstr "Portable Object"
#: Merge.rc:2764
#, c-format
#: Merge.rc:2767
#, c-format
msgid "Resources"
-msgstr "Viri"
+msgstr "Resources"
#: Merge.rc:2768
#, c-format