msgstr "Èñ&åöè"
#: Merge.rc:85
-#: Merge.rc:617
+#: Merge.rc:619
#, c-format
msgid "&Copy"
msgstr "&Óìíîæè"
msgstr "&Íàëåïè"
#: Merge.rc:88
-#: Merge.rc:729
+#: Merge.rc:731
#, c-format
msgid "&Goto..."
msgstr "&Èäè íà..."
msgstr "&Îòâîðè"
#: Merge.rc:92
-#: Merge.rc:648
-#: Merge.rc:654
-#: Merge.rc:660
+#: Merge.rc:650
+#: Merge.rc:656
+#: Merge.rc:662
#, c-format
msgid "with &Registered Application"
msgstr "ñà èíñ&òàëèðàíèì ïðîãðàìîì"
#: Merge.rc:93
-#: Merge.rc:649
-#: Merge.rc:655
-#: Merge.rc:661
+#: Merge.rc:651
+#: Merge.rc:657
+#: Merge.rc:663
#, c-format
msgid "with &External Editor"
msgstr "ñà äð&óãèì óðå\90èâà÷åì"
#: Merge.rc:94
-#: Merge.rc:650
-#: Merge.rc:656
-#: Merge.rc:662
+#: Merge.rc:652
+#: Merge.rc:658
+#: Merge.rc:664
#, c-format
msgid "&with..."
msgstr "&ñà"
msgstr ""
#: Merge.rc:132
-#: Merge.rc:451
+#: Merge.rc:453
#, c-format
msgid "&Zoom"
msgstr "&Ïîâå\9eà¼"
#: Merge.rc:143
#: Merge.rc:179
-#: Merge.rc:283
-#: Merge.rc:485
+#: Merge.rc:285
+#: Merge.rc:487
#, c-format
msgid "&None"
msgstr "&Íèøòà"
#: Merge.rc:153
#: Merge.rc:230
-#: Merge.rc:357
+#: Merge.rc:359
#, c-format
msgid "&File"
msgstr "&Äàòîòåêà"
#: Merge.rc:155
#: Merge.rc:232
-#: Merge.rc:359
+#: Merge.rc:361
#, c-format
msgid "&New\tCtrl+N"
msgstr "&Íîâà\tCtrl+N"
#: Merge.rc:156
#: Merge.rc:233
-#: Merge.rc:360
+#: Merge.rc:362
#, c-format
msgid "New (&3 panes)"
msgstr ""
#: Merge.rc:157
#: Merge.rc:234
-#: Merge.rc:361
+#: Merge.rc:363
#, c-format
msgid "&Open...\tCtrl+O"
msgstr "&Óïîðåäè...\tCtrl+O"
#: Merge.rc:158
#: Merge.rc:235
-#: Merge.rc:362
+#: Merge.rc:364
#, c-format
msgid "Op&en Conflict File..."
msgstr "Îòâîðè ïðîáë&åìàòè÷íå..."
#: Merge.rc:160
#: Merge.rc:237
-#: Merge.rc:364
+#: Merge.rc:366
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Îòâîðè ïîðå&\90å\9cå...\tCtrl+J"
#: Merge.rc:161
#: Merge.rc:238
-#: Merge.rc:365
+#: Merge.rc:367
#, c-format
msgid "Sa&ve Project..."
msgstr "Ñà÷ó&â༠ïîðå\90å\9cå..."
#: Merge.rc:164
#: Merge.rc:249
-#: Merge.rc:409
+#: Merge.rc:411
#, c-format
msgid "Recent F&iles Or Folders"
msgstr ""
#: Merge.rc:166
#: Merge.rc:251
-#: Merge.rc:411
-#: Merge.rc:571
-#: Merge.rc:2694
+#: Merge.rc:413
+#: Merge.rc:573
+#: Merge.rc:2696
#, c-format
msgid "< Empty >"
msgstr "< Ïðàçàí >"
#: Merge.rc:169
#: Merge.rc:254
-#: Merge.rc:414
+#: Merge.rc:416
#, c-format
msgid "E&xit"
msgstr "Èçëà&ç"
#: Merge.rc:171
#: Merge.rc:256
-#: Merge.rc:416
+#: Merge.rc:418
#, c-format
msgid "&Edit"
msgstr "Óð&åäè"
#: Merge.rc:173
#: Merge.rc:260
-#: Merge.rc:445
+#: Merge.rc:447
#, c-format
msgid "&Options..."
msgstr "Èçá&îð..."
#: Merge.rc:175
#: Merge.rc:262
-#: Merge.rc:447
+#: Merge.rc:449
#, c-format
msgid "&View"
msgstr "Ïðè&êàç"
#: Merge.rc:177
-#: Merge.rc:281
-#: Merge.rc:483
+#: Merge.rc:283
+#: Merge.rc:485
#, c-format
msgid "&Toolbar"
msgstr "&Òðàêà àëàòà"
#: Merge.rc:180
-#: Merge.rc:284
-#: Merge.rc:486
+#: Merge.rc:286
+#: Merge.rc:488
#, c-format
msgid "&Small"
msgstr "&Ìàëà"
#: Merge.rc:181
-#: Merge.rc:285
-#: Merge.rc:487
+#: Merge.rc:287
+#: Merge.rc:489
#, c-format
msgid "&Big"
msgstr "&Âåëèêà"
#: Merge.rc:183
-#: Merge.rc:287
-#: Merge.rc:489
+#: Merge.rc:289
+#: Merge.rc:491
#, c-format
msgid "&Status Bar"
msgstr "&Ñòàòóñíà òðàêà"
#: Merge.rc:184
-#: Merge.rc:288
-#: Merge.rc:490
+#: Merge.rc:290
+#: Merge.rc:492
#, c-format
msgid "Ta&b Bar"
msgstr "Òðà&êà ¼åçè÷àêà"
#: Merge.rc:186
-#: Merge.rc:311
-#: Merge.rc:546
+#: Merge.rc:313
+#: Merge.rc:548
#, c-format
msgid "&Tools"
msgstr "Àëàòêå"
#: Merge.rc:188
-#: Merge.rc:314
-#: Merge.rc:548
+#: Merge.rc:316
+#: Merge.rc:550
#, c-format
msgid "&Filters..."
msgstr "&Ôèëòåðè..."
#: Merge.rc:189
-#: Merge.rc:315
-#: Merge.rc:549
+#: Merge.rc:317
+#: Merge.rc:551
#, c-format
msgid "&Generate Patch..."
msgstr "Ñà÷óâ༠ðà&çëèêå..."
#: Merge.rc:191
-#: Merge.rc:318
-#: Merge.rc:552
+#: Merge.rc:320
+#: Merge.rc:554
#, c-format
msgid "&Plugins"
msgstr "Äîäà&öè"
#: Merge.rc:193
-#: Merge.rc:320
-#: Merge.rc:554
-#: Merge.rc:1852
+#: Merge.rc:322
+#: Merge.rc:556
+#: Merge.rc:1854
#, c-format
msgid "P&lugin Settings..."
msgstr ""
#: Merge.rc:195
-#: Merge.rc:322
-#: Merge.rc:556
+#: Merge.rc:324
+#: Merge.rc:558
#, c-format
msgid "Ma&nual Prediffer"
msgstr ""
#: Merge.rc:196
-#: Merge.rc:323
-#: Merge.rc:557
+#: Merge.rc:325
+#: Merge.rc:559
#, c-format
msgid "A&utomatic Prediffer"
msgstr ""
#: Merge.rc:198
-#: Merge.rc:325
-#: Merge.rc:559
+#: Merge.rc:327
+#: Merge.rc:561
#, c-format
msgid "&Manual Unpacking"
msgstr "&Ðàñïàêó¼ ðó÷íî"
#: Merge.rc:199
-#: Merge.rc:326
-#: Merge.rc:560
+#: Merge.rc:328
+#: Merge.rc:562
#, c-format
msgid "&Automatic Unpacking"
msgstr "Ðàñïàêó¼ &àóòîìàòñêè"
#: Merge.rc:201
-#: Merge.rc:328
-#: Merge.rc:562
-#: Merge.rc:1924
+#: Merge.rc:330
+#: Merge.rc:564
+#: Merge.rc:1926
#, c-format
msgid "&Edit with Unpacker..."
msgstr ""
#: Merge.rc:203
-#: Merge.rc:330
-#: Merge.rc:574
+#: Merge.rc:332
+#: Merge.rc:576
#, c-format
msgid "&Reload plugins"
msgstr "Ïîíîâî &ó÷èò༠äîäàòêå"
#: Merge.rc:205
-#: Merge.rc:332
-#: Merge.rc:576
+#: Merge.rc:334
+#: Merge.rc:578
#, c-format
msgid "&Window"
msgstr "Ïð&îçîð"
#: Merge.rc:207
-#: Merge.rc:334
-#: Merge.rc:578
+#: Merge.rc:336
+#: Merge.rc:580
#, c-format
msgid "Cl&ose"
msgstr "&Çàòâîðè"
#: Merge.rc:208
-#: Merge.rc:335
-#: Merge.rc:579
+#: Merge.rc:337
+#: Merge.rc:581
#, c-format
msgid "Clo&se All"
msgstr "Çàòâîðè &ñâå"
#: Merge.rc:210
-#: Merge.rc:337
-#: Merge.rc:581
+#: Merge.rc:339
+#: Merge.rc:583
#, c-format
msgid "Change &Pane\tF6"
msgstr "Çàìåíè &òàáëå\tF6"
#: Merge.rc:212
-#: Merge.rc:339
-#: Merge.rc:583
+#: Merge.rc:341
+#: Merge.rc:585
#, c-format
msgid "Tile &Horizontally"
msgstr "Ïðîçîðå &âîäîðàâíî"
#: Merge.rc:213
-#: Merge.rc:340
-#: Merge.rc:584
+#: Merge.rc:342
+#: Merge.rc:586
#, c-format
msgid "Tile &Vertically"
msgstr "Ïðîçîðå &óñïðàâíî"
#: Merge.rc:214
-#: Merge.rc:341
-#: Merge.rc:585
+#: Merge.rc:343
+#: Merge.rc:587
#, c-format
msgid "&Cascade"
msgstr "Ïðîçîðå ïîðå&\90àíî"
#: Merge.rc:216
-#: Merge.rc:343
-#: Merge.rc:587
-#: Merge.rc:2055
+#: Merge.rc:345
+#: Merge.rc:589
+#: Merge.rc:2057
#, c-format
msgid "&Help"
msgstr "Ïîìî&\9e"
#: Merge.rc:218
-#: Merge.rc:345
-#: Merge.rc:589
+#: Merge.rc:347
+#: Merge.rc:591
#, c-format
msgid "&WinMerge Help\tF1"
msgstr "&WinMerge Ïîìî\9e\tF1"
#: Merge.rc:220
-#: Merge.rc:347
-#: Merge.rc:591
+#: Merge.rc:349
+#: Merge.rc:593
#, c-format
msgid "&Check For Updates"
msgstr ""
#: Merge.rc:221
-#: Merge.rc:348
-#: Merge.rc:592
+#: Merge.rc:350
+#: Merge.rc:594
#, c-format
msgid "C&onfiguration"
msgstr "&Ïîñòàâêå"
#: Merge.rc:223
-#: Merge.rc:350
-#: Merge.rc:594
+#: Merge.rc:352
+#: Merge.rc:596
#, c-format
msgid "&GNU General Public License"
msgstr "&GNU ¼àâíà ëèöåíöà"
#: Merge.rc:224
-#: Merge.rc:351
-#: Merge.rc:595
+#: Merge.rc:353
+#: Merge.rc:597
#, c-format
msgid "&About WinMerge..."
msgstr "&Î WinMerge..."
#: Merge.rc:240
-#: Merge.rc:385
+#: Merge.rc:387
#, c-format
msgid "&Read-only"
msgstr ""
#: Merge.rc:242
-#: Merge.rc:387
+#: Merge.rc:389
#, c-format
msgid "L&eft Read-only"
msgstr "Ñàìî çà ÷èòà\9cå - ë&åâà"
#: Merge.rc:243
-#: Merge.rc:388
+#: Merge.rc:390
#, c-format
msgid "M&iddle Read-only"
msgstr ""
#: Merge.rc:244
-#: Merge.rc:389
+#: Merge.rc:391
#, c-format
msgid "Ri&ght Read-only"
msgstr "Ñàìî çà ÷èòà\9cå - ä&åñíà"
msgstr ""
#: Merge.rc:258
-#: Merge.rc:426
+#: Merge.rc:428
#, c-format
msgid "Select &All\tCtrl+A"
msgstr "Èçàáåðè &ñâå\tCtrl+A"
msgstr "Çàòâîðè ñâå ïîòôàñöèêëå"
#: Merge.rc:278
-#: Merge.rc:449
+#: Merge.rc:451
#, c-format
msgid "Select &Font..."
msgstr "Èçàáåðè &ñëîâà..."
#: Merge.rc:279
-#: Merge.rc:450
+#: Merge.rc:452
#, c-format
msgid "Use Default F&ont"
msgstr "Êîðèñòè ïîäðàçóìåâàíà ñëîâà"
-#: Merge.rc:290
+#: Merge.rc:281
+#: Merge.rc:482
+#, c-format
+msgid "Sw&ap Panes"
+msgstr "Ç&àìåíè òàáëå"
+
+#: Merge.rc:292
#, c-format
msgid "Compa&re Statistics"
msgstr "Óïîðåäè ñòàòèñòèêó"
-#: Merge.rc:292
-#: Merge.rc:494
+#: Merge.rc:294
+#: Merge.rc:496
#, c-format
msgid "Refre&sh\tF5"
msgstr "Î&ñâåæè\tF5"
-#: Merge.rc:293
+#: Merge.rc:295
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr "Îñâå&æè îäàáðàíî\tCtrl+F5"
-#: Merge.rc:295
-#: Merge.rc:496
+#: Merge.rc:297
+#: Merge.rc:498
#, c-format
msgid "&Merge"
msgstr "Ïîðå&\90å\9cå"
-#: Merge.rc:297
+#: Merge.rc:299
#, c-format
msgid "Co&mpare\tEnter"
msgstr "&Óïîðåäèòè\tEnter"
-#: Merge.rc:299
-#: Merge.rc:498
+#: Merge.rc:301
+#: Merge.rc:500
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "&Ñëåäå\9eà ðàçëèêà\tAlt+Down"
-#: Merge.rc:300
-#: Merge.rc:499
+#: Merge.rc:302
+#: Merge.rc:501
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "&Ïðåòõîäíà ðàçëèêà\tAlt+Up"
-#: Merge.rc:302
-#: Merge.rc:525
+#: Merge.rc:304
+#: Merge.rc:527
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "Ïð&âà ðàçëèêà\tAlt+Home"
-#: Merge.rc:303
-#: Merge.rc:526
+#: Merge.rc:305
+#: Merge.rc:528
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "&Òðåíóòíà ðàçëèêà\tAlt+Enter"
-#: Merge.rc:304
-#: Merge.rc:527
+#: Merge.rc:306
+#: Merge.rc:529
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "&Çàä\9cà ðàçëèêà\tAlt+End"
-#: Merge.rc:306
-#: Merge.rc:529
+#: Merge.rc:308
+#: Merge.rc:531
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "Óìíîæè ó &äåñíó\tAlt+Right"
-#: Merge.rc:307
-#: Merge.rc:530
+#: Merge.rc:309
+#: Merge.rc:532
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "Óìíîæè ó ë&åâó\tAlt+Left"
-#: Merge.rc:309
+#: Merge.rc:311
#, c-format
msgid "&Delete\tDel"
msgstr "&Èçáðèøè\tDel"
-#: Merge.rc:313
-#: Merge.rc:701
+#: Merge.rc:315
+#: Merge.rc:703
#, c-format
msgid "&Customize Columns..."
msgstr "Ïîäåñè &ñòóáöå..."
-#: Merge.rc:316
-#: Merge.rc:550
+#: Merge.rc:318
+#: Merge.rc:552
#, c-format
msgid "Generate &Report..."
msgstr "Íàï&ðàâè èçâåøòà¼..."
-#: Merge.rc:367
+#: Merge.rc:369
#, c-format
msgid "&Save\tCtrl+S"
msgstr "&Ñà÷óâà¼\tCtrl+S"
-#: Merge.rc:368
+#: Merge.rc:370
#, c-format
msgid "Sav&e"
msgstr ""
-#: Merge.rc:370
+#: Merge.rc:372
#, c-format
msgid "Save &Left"
msgstr "Ñà÷óâ༠&ëåâó"
-#: Merge.rc:371
+#: Merge.rc:373
#, c-format
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:372
+#: Merge.rc:374
#, c-format
msgid "Save &Right"
msgstr "Ñà÷óâ༠&äåñíó"
-#: Merge.rc:374
+#: Merge.rc:376
#, c-format
msgid "Save &As"
msgstr ""
-#: Merge.rc:376
+#: Merge.rc:378
#, c-format
msgid "Save &Left As..."
msgstr ""
-#: Merge.rc:377
+#: Merge.rc:379
#, c-format
msgid "Save &Middle As..."
msgstr ""
-#: Merge.rc:378
+#: Merge.rc:380
#, c-format
msgid "Save &Right As..."
msgstr ""
-#: Merge.rc:381
+#: Merge.rc:383
#, c-format
msgid "&Print..."
msgstr "&Îäøòàìïà¼..."
-#: Merge.rc:382
+#: Merge.rc:384
#, c-format
msgid "Page Se&tup"
msgstr "Ïîäåñè ñ&òðàíèöó"
-#: Merge.rc:383
+#: Merge.rc:385
#, c-format
msgid "Print Previe&w"
msgstr "Ïðåãëåä ïðå øòàìïà&\9cà"
-#: Merge.rc:392
+#: Merge.rc:394
#, c-format
msgid "&Convert Line Endings to"
msgstr "Çàâðøè ðåä ïðåìà"
-#: Merge.rc:399
+#: Merge.rc:401
#, c-format
msgid "&Merge Mode\tF9"
msgstr "&Íà÷èí ïîðå\90å\9cà\tF9"
-#: Merge.rc:401
+#: Merge.rc:403
#, c-format
msgid "Re&load\tCtrl+F5"
msgstr ""
-#: Merge.rc:402
-#: Merge.rc:1923
+#: Merge.rc:404
+#: Merge.rc:1925
#, c-format
msgid "&File Encoding..."
msgstr "Äå&êîäèðà\9cå äàòîòåêå..."
-#: Merge.rc:403
+#: Merge.rc:405
#, c-format
msgid "Recompare As"
msgstr ""
-#: Merge.rc:405
-#: Merge.rc:613
+#: Merge.rc:407
+#: Merge.rc:615
#, c-format
msgid "&XML"
msgstr "&XML"
-#: Merge.rc:406
-#: Merge.rc:614
+#: Merge.rc:408
+#: Merge.rc:616
#, c-format
msgid "&Binary"
msgstr ""
-#: Merge.rc:418
+#: Merge.rc:420
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "Îïî&çîâè\tCtrl+Z"
-#: Merge.rc:419
+#: Merge.rc:421
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "&Ïîíîâè\tCtrl+Y"
-#: Merge.rc:421
+#: Merge.rc:423
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "Èñå&öè\tCtrl+X"
-#: Merge.rc:422
+#: Merge.rc:424
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "Óìíî&æè\tCtrl+C"
-#: Merge.rc:423
+#: Merge.rc:425
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "&Íàëåïè\tCtrl+V"
-#: Merge.rc:425
+#: Merge.rc:427
#, c-format
msgid "Select Line &Difference\tF4"
msgstr "Èñòàêíè &ðàçëèêó ðåäà\tF4"
-#: Merge.rc:428
+#: Merge.rc:430
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "Ïðåòðàæ&è...\tCtrl+F"
-#: Merge.rc:429
+#: Merge.rc:431
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "Çàìåíè...\tCtrl+H"
-#: Merge.rc:431
+#: Merge.rc:433
#, c-format
msgid "Advanced"
msgstr "Íàïðåäíî"
-#: Merge.rc:433
+#: Merge.rc:435
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Óìíîæè ðåäîâå ñà áðî¼åâèìà\tCtrl+Shift+C"
-#: Merge.rc:436
+#: Merge.rc:438
#, c-format
msgid "&Bookmarks"
msgstr "Ç&àáåëåøêå"
-#: Merge.rc:438
+#: Merge.rc:440
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "&Çàìåíè çàáåëåøêå\tCtrl+F2"
-#: Merge.rc:439
+#: Merge.rc:441
#, c-format
msgid "&Next Bookmark\tF2"
msgstr "&Ñëåäå\9eà çàáåëåøêà\tF2"
-#: Merge.rc:440
+#: Merge.rc:442
#, c-format
msgid "&Previous bookmark\tShift+F2"
msgstr "&Ïðåòõîäíà çàáåëåøêà\tShift+F2"
-#: Merge.rc:441
+#: Merge.rc:443
#, c-format
msgid "&Clear All Bookmarks"
msgstr "Î÷èñòè ñâå çàáåëåøêå"
-#: Merge.rc:443
+#: Merge.rc:445
#, c-format
msgid "&Go To...\tCtrl+G"
msgstr "&Èäè íà...\tCtrl+G"
-#: Merge.rc:453
+#: Merge.rc:455
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr "Óâå&\9eà¼\tCtrl++"
-#: Merge.rc:454
+#: Merge.rc:456
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr "Óìà&\9cè\tCtrl+-"
#. Zoom to normal
-#: Merge.rc:455
+#: Merge.rc:457
#, c-format
msgid "&Normal\tCtrl+*"
msgstr "Èçâîðíî\tCtrl+*"
-#: Merge.rc:457
+#: Merge.rc:459
#, c-format
msgid "Syntax Highlight"
msgstr "Íàãëàñèòå ñêëîï ðå÷è"
-#: Merge.rc:462
+#: Merge.rc:464
#, c-format
msgid "&Diff Context"
msgstr ""
-#: Merge.rc:464
-#: Merge.rc:641
+#: Merge.rc:466
+#: Merge.rc:643
#, c-format
msgid "&All"
msgstr ""
-#: Merge.rc:473
+#: Merge.rc:475
#, c-format
msgid "&Lock Panes"
msgstr "Çàê\9aó÷༠òàáëå"
-#: Merge.rc:474
+#: Merge.rc:476
#, c-format
msgid "&View Whitespace"
msgstr "Ïðèêà&ç ðàçìàêà"
-#: Merge.rc:475
+#: Merge.rc:477
#, c-format
msgid "Vie&w Line Differences"
msgstr "Ïðèêàç ðàçëè&÷èòèõ ðåäîâà"
-#: Merge.rc:476
+#: Merge.rc:478
#, c-format
msgid "View Line &Numbers"
msgstr "Ïðèêàç áðî¼à ðå&äîâà"
-#: Merge.rc:477
+#: Merge.rc:479
#, c-format
msgid "View &Margins"
msgstr "Ïðèêàç èâè&öà"
-#: Merge.rc:478
+#: Merge.rc:480
#, c-format
msgid "W&rap Lines"
msgstr "Çàâðøåòàê ðåäîâà"
-#: Merge.rc:480
-#, c-format
-msgid "Sw&ap Panes"
-msgstr "Ç&àìåíè òàáëå"
-
-#: Merge.rc:481
+#: Merge.rc:483
#, c-format
msgid "Split V&ertically"
msgstr ""
-#: Merge.rc:491
+#: Merge.rc:493
#, c-format
msgid "Diff &Pane"
msgstr "&Ðàçëèêà òàáëè"
-#: Merge.rc:492
+#: Merge.rc:494
#, c-format
msgid "Lo&cation Pane"
msgstr "Ïîëî&æ༠òàáëå"
-#: Merge.rc:501
+#: Merge.rc:503
#, c-format
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr ""
-#: Merge.rc:502
+#: Merge.rc:504
#, c-format
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr ""
-#: Merge.rc:504
+#: Merge.rc:506
#, c-format
msgid "A&dvanced"
msgstr ""
-#: Merge.rc:506
+#: Merge.rc:508
#, c-format
msgid "Next Difference Between Left and Middle\tAlt+1"
msgstr ""
-#: Merge.rc:507
+#: Merge.rc:509
#, c-format
msgid "Previous Difference Between Left And Middle\tAlt+Shift+1"
msgstr ""
-#: Merge.rc:509
+#: Merge.rc:511
#, c-format
msgid "Next Difference Between Left and Right\tAlt+2"
msgstr ""
-#: Merge.rc:510
+#: Merge.rc:512
#, c-format
msgid "Previous Difference Between Left And Right\tAlt+Shift+2"
msgstr ""
-#: Merge.rc:512
+#: Merge.rc:514
#, c-format
msgid "Next Difference Between Middle and Right\tAlt+3"
msgstr ""
-#: Merge.rc:513
+#: Merge.rc:515
#, c-format
msgid "Previous Difference Between Middle And Right\tAlt+Shift+3"
msgstr ""
-#: Merge.rc:515
+#: Merge.rc:517
#, c-format
msgid "Next Left Only Difference\tAlt+7"
msgstr ""
-#: Merge.rc:516
+#: Merge.rc:518
#, c-format
msgid "Previous Left Only Difference\tAlt+Shift+7"
msgstr ""
-#: Merge.rc:518
+#: Merge.rc:520
#, c-format
msgid "Next Middle Only Difference\tAlt+8"
msgstr ""
-#: Merge.rc:519
+#: Merge.rc:521
#, c-format
msgid "Previous Middle Only Difference\tAlt+Shift+8"
msgstr ""
-#: Merge.rc:521
+#: Merge.rc:523
#, c-format
msgid "Next Right Only Difference\tAlt+9"
msgstr ""
-#: Merge.rc:522
+#: Merge.rc:524
#, c-format
msgid "Previous Right Only Difference\tAlt+Shift+9"
msgstr ""
-#: Merge.rc:532
+#: Merge.rc:534
#, c-format
msgid "Copy from Left\tAlt+Shift+Right"
msgstr ""
-#: Merge.rc:533
+#: Merge.rc:535
#, c-format
msgid "Copy from Right\tAlt+Shift+Left"
msgstr ""
-#: Merge.rc:535
+#: Merge.rc:537
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
msgstr "Óìíîæè ó äåñí&î è íàñòàâè\tAlt+Ctrl+Right"
-#: Merge.rc:536
+#: Merge.rc:538
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
msgstr "Óì&íîæè ó ëåâî è íàñòàâè\tAlt+Ctrl+Left"
-#: Merge.rc:538
+#: Merge.rc:540
#, c-format
msgid "Copy &All to Right"
msgstr "Óìíî&æè ñâå ó äåñíî"
-#: Merge.rc:539
+#: Merge.rc:541
#, c-format
msgid "Cop&y All to Left"
msgstr "Óìíîæ&è ñâå ó ëåâî"
-#: Merge.rc:541
+#: Merge.rc:543
#, c-format
msgid "A&uto Merge\tAlt+Ctrl+M"
msgstr ""
-#: Merge.rc:543
+#: Merge.rc:545
#, c-format
msgid "Add &Synchronization Point\tAlt+S"
msgstr ""
-#: Merge.rc:544
+#: Merge.rc:546
#, c-format
msgid "Clear Sync&hronization Points"
msgstr ""
-#: Merge.rc:564
+#: Merge.rc:566
#, c-format
msgid "&Prediffer"
msgstr "&Äåôèíèñàíî ïîðå\90å\9cå"
-#: Merge.rc:569
+#: Merge.rc:571
#, c-format
msgid "&Scripts"
msgstr "&Ñêðèïòå "
-#: Merge.rc:603
+#: Merge.rc:605
#, c-format
msgid "Comp&are"
msgstr "&Óïîðåäè"
-#: Merge.rc:604
+#: Merge.rc:606
#, c-format
msgid "Compare Non-hor&izontally"
msgstr ""
-#: Merge.rc:606
+#: Merge.rc:608
#, c-format
msgid "First &left item with second left item"
msgstr ""
-#: Merge.rc:607
+#: Merge.rc:609
#, c-format
msgid "First &right item with second right item"
msgstr ""
-#: Merge.rc:608
+#: Merge.rc:610
#, c-format
msgid "&First left item with second right item"
msgstr ""
-#: Merge.rc:609
+#: Merge.rc:611
#, c-format
msgid "&Second left item with first right item"
msgstr ""
-#: Merge.rc:611
+#: Merge.rc:613
#, c-format
msgid "Co&mpare As"
msgstr ""
-#: Merge.rc:619
-#: Merge.rc:2310
+#: Merge.rc:621
+#: Merge.rc:2312
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr ""
-#: Merge.rc:620
-#: Merge.rc:2309
+#: Merge.rc:622
+#: Merge.rc:2311
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Ëåâà ó äåñíî (%1 îä %2)"
-#: Merge.rc:621
-#: Merge.rc:631
-#: Merge.rc:685
-#: Merge.rc:2317
-#: Merge.rc:2341
+#: Merge.rc:623
+#: Merge.rc:633
+#: Merge.rc:687
+#: Merge.rc:2319
+#: Merge.rc:2343
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Ëåâà ó... (%1 îä %2)"
-#: Merge.rc:622
-#: Merge.rc:2307
+#: Merge.rc:624
+#: Merge.rc:2309
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr ""
-#: Merge.rc:623
-#: Merge.rc:2308
+#: Merge.rc:625
+#: Merge.rc:2310
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr ""
-#: Merge.rc:624
-#: Merge.rc:632
-#: Merge.rc:686
-#: Merge.rc:2318
-#: Merge.rc:2342
+#: Merge.rc:626
+#: Merge.rc:634
+#: Merge.rc:688
+#: Merge.rc:2320
+#: Merge.rc:2344
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr ""
-#: Merge.rc:625
-#: Merge.rc:2306
+#: Merge.rc:627
+#: Merge.rc:2308
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr ""
-#: Merge.rc:626
-#: Merge.rc:2305
+#: Merge.rc:628
+#: Merge.rc:2307
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Äåñíà ó ëåâî (%1 îä %2)"
-#: Merge.rc:627
-#: Merge.rc:633
-#: Merge.rc:687
-#: Merge.rc:2319
-#: Merge.rc:2343
+#: Merge.rc:629
+#: Merge.rc:635
+#: Merge.rc:689
+#: Merge.rc:2321
+#: Merge.rc:2345
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Äåñíà ó... (%1 îä %2)"
-#: Merge.rc:629
+#: Merge.rc:631
#, c-format
msgid "&Move"
msgstr "Ïî&ìåðè"
-#: Merge.rc:635
+#: Merge.rc:637
#, c-format
msgid "&Delete"
msgstr "&Èçáðèøè"
-#: Merge.rc:637
-#: Merge.rc:1366
-#: Merge.rc:1701
+#: Merge.rc:639
+#: Merge.rc:1368
+#: Merge.rc:1703
#, c-format
msgid "&Left"
msgstr "&Ëåâà"
-#: Merge.rc:638
-#: Merge.rc:1368
-#: Merge.rc:1704
+#: Merge.rc:640
+#: Merge.rc:1370
+#: Merge.rc:1706
#, c-format
msgid "&Middle"
msgstr ""
-#: Merge.rc:639
-#: Merge.rc:1370
-#: Merge.rc:1707
+#: Merge.rc:641
+#: Merge.rc:1372
+#: Merge.rc:1709
#, c-format
msgid "&Right"
msgstr "&Äåñíà"
-#: Merge.rc:640
+#: Merge.rc:642
#, c-format
msgid "&Both"
msgstr "Îáå "
-#: Merge.rc:643
+#: Merge.rc:645
#, c-format
msgid "Re&name"
msgstr "Ïðåèìå&íó¼"
-#: Merge.rc:644
+#: Merge.rc:646
#, c-format
msgid "&Hide Items"
msgstr "&Ñàêðè¼ ñòàâêå"
-#: Merge.rc:646
+#: Merge.rc:648
#, c-format
msgid "&Open Left"
msgstr "&Îòâîðè ëåâó"
-#: Merge.rc:652
+#: Merge.rc:654
#, c-format
msgid "Open Midd&le"
msgstr ""
-#: Merge.rc:658
+#: Merge.rc:660
#, c-format
msgid "O&pen Right"
msgstr "Îòâî&ðè äåñíó"
-#: Merge.rc:665
+#: Merge.rc:667
#, c-format
msgid "Cop&y Pathnames"
msgstr "Óìíîæè ïóòà&\9có"
-#: Merge.rc:667
-#: Merge.rc:676
-#: Merge.rc:2333
+#: Merge.rc:669
+#: Merge.rc:678
+#: Merge.rc:2335
#, c-format
msgid "Left (%1 of %2)"
msgstr "Ëåâà (%1 îä %2)"
-#: Merge.rc:668
-#: Merge.rc:677
-#: Merge.rc:2334
+#: Merge.rc:670
+#: Merge.rc:679
+#: Merge.rc:2336
#, c-format
msgid "Middle (%1 of %2)"
msgstr ""
-#: Merge.rc:669
-#: Merge.rc:678
-#: Merge.rc:2335
+#: Merge.rc:671
+#: Merge.rc:680
+#: Merge.rc:2337
#, c-format
msgid "Right (%1 of %2)"
msgstr "Äåñíà (%1 îä %2)"
-#: Merge.rc:670
-#: Merge.rc:679
-#: Merge.rc:2336
+#: Merge.rc:672
+#: Merge.rc:681
+#: Merge.rc:2338
#, c-format
msgid "Both (%1 of %2)"
msgstr "Îáå(%1 îä %2)"
-#: Merge.rc:671
-#: Merge.rc:680
-#: Merge.rc:2337
+#: Merge.rc:673
+#: Merge.rc:682
+#: Merge.rc:2339
#, c-format
msgid "All (%1 of %2)"
msgstr ""
-#: Merge.rc:673
+#: Merge.rc:675
#, c-format
msgid "Copy &Filenames"
msgstr "Óìíîæè íàçèâå äàòîòåêà"
-#: Merge.rc:674
+#: Merge.rc:676
#, c-format
msgid "Copy Items To Clip&board"
msgstr ""
-#: Merge.rc:683
+#: Merge.rc:685
#, c-format
msgid "&Zip"
msgstr "&Çèï"
-#: Merge.rc:688
-#: Merge.rc:2320
+#: Merge.rc:690
+#: Merge.rc:2322
#, c-format
msgid "Both to... (%1 of %2)"
msgstr ""
-#: Merge.rc:689
-#: Merge.rc:2321
+#: Merge.rc:691
+#: Merge.rc:2323
#, c-format
msgid "All to... (%1 of %2)"
msgstr ""
-#: Merge.rc:690
-#: Merge.rc:2322
+#: Merge.rc:692
+#: Merge.rc:2324
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr ""
-#: Merge.rc:693
+#: Merge.rc:695
#, c-format
msgid "&Refresh"
msgstr "&Îñâåæè"
-#: Merge.rc:695
+#: Merge.rc:697
#, c-format
msgid "Left Shell menu"
msgstr "Ëåâè èçáîðíèê /\9aóñêå/"
-#: Merge.rc:696
+#: Merge.rc:698
#, c-format
msgid "Middle Shell menu"
msgstr ""
-#: Merge.rc:697
+#: Merge.rc:699
#, c-format
msgid "Right Shell menu"
msgstr "Äåñíè èçáîðíèê /\9aóñêå/"
-#: Merge.rc:709
+#: Merge.rc:711
#, c-format
msgid "Copy"
msgstr ""
-#: Merge.rc:710
+#: Merge.rc:712
#, c-format
msgid "&Copy Full Path"
msgstr "&Óìíîæè ïóòà\9có"
-#: Merge.rc:711
+#: Merge.rc:713
#, c-format
msgid "Copy &Filename"
msgstr "Óìíîæè íà&çèâ äàòîòåêå"
-#: Merge.rc:717
+#: Merge.rc:719
#, c-format
msgid "Prediffer Settings"
msgstr "Ñâî¼ñòâà äåôèíèñàíîã ïîðå\90å\9cà"
-#: Merge.rc:719
+#: Merge.rc:721
#, c-format
msgid "&No prediffer"
msgstr "Íåìà äåôèíèñàíîã ïîðå\90å\9cà"
-#: Merge.rc:720
+#: Merge.rc:722
#, c-format
msgid "Auto prediffer"
msgstr "Àóòîìàòñêè äåôèíèøè ïîðå\90å\9cå"
-#: Merge.rc:728
+#: Merge.rc:730
#, c-format
msgid "G&oto Diff"
msgstr "Èäè &íà ðàçëèêó"
-#: Merge.rc:731
+#: Merge.rc:733
#, c-format
msgid "&No Moved Blocks"
msgstr "&Íå ïðåìåøò༠ãðóïå"
-#: Merge.rc:732
+#: Merge.rc:734
#, c-format
msgid "&All Moved Blocks"
msgstr "Ïðåìåñòè &ñâå ãðóïå"
-#: Merge.rc:733
+#: Merge.rc:735
#, c-format
msgid "Moved Block for &Current Diff"
msgstr "Ïðåìåñòè òðåíóòíå ðàçëèêå &ãðóïå"
-#: Merge.rc:741
-#: Merge.rc:1265
+#: Merge.rc:743
+#: Merge.rc:1267
#, c-format
msgid "W&hitespaces"
msgstr "Ð&àçìàê"
-#: Merge.rc:743
-#: Merge.rc:1266
+#: Merge.rc:745
+#: Merge.rc:1268
#, c-format
msgid "Com&pare"
msgstr "Ó&ïîðåäè"
-#: Merge.rc:744
-#: Merge.rc:1268
+#: Merge.rc:746
+#: Merge.rc:1270
#, c-format
msgid "I&gnore changes"
msgstr "&Çàíåìàðè èçìåíå"
-#: Merge.rc:745
-#: Merge.rc:1270
+#: Merge.rc:747
+#: Merge.rc:1272
#, c-format
msgid "Ig&nore all"
msgstr "Çà&íåìàðè ñâå"
-#: Merge.rc:747
-#: Merge.rc:1274
+#: Merge.rc:749
+#: Merge.rc:1276
#, c-format
msgid "Case sensi&tive"
msgstr "Ïîäóäàðà&\9cå ñëîâà"
-#: Merge.rc:748
-#: Merge.rc:1276
-#: Merge.rc:1392
+#: Merge.rc:750
+#: Merge.rc:1278
+#: Merge.rc:1394
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "Çàíåìàðè &ðàçëèêå îçíàêà çàâðøåòêà ðåäà (Windows/Unix/Mac)"
-#: Merge.rc:750
-#: Merge.rc:896
-#: Merge.rc:1792
+#: Merge.rc:752
+#: Merge.rc:898
+#: Merge.rc:1794
#, c-format
msgid "&Include Subfolders"
msgstr "Óê\9aó÷è è ïîòôàñöèêëå"
-#: Merge.rc:751
-#: Merge.rc:1876
+#: Merge.rc:753
+#: Merge.rc:1878
#, c-format
msgid "&Compare method:"
msgstr ""
-#: Merge.rc:753
-#: Merge.rc:2132
+#: Merge.rc:755
+#: Merge.rc:2134
#, c-format
msgid "Full Contents"
msgstr "Öåî ñàäðæà¼"
-#: Merge.rc:754
-#: Merge.rc:2133
+#: Merge.rc:756
+#: Merge.rc:2135
#, c-format
msgid "Quick Contents"
msgstr "Ñêðà\9eåíè ñàäðæà¼"
-#: Merge.rc:755
-#: Merge.rc:2134
+#: Merge.rc:757
+#: Merge.rc:2136
#, c-format
msgid "Binary Contents"
msgstr ""
-#: Merge.rc:756
-#: Merge.rc:2135
+#: Merge.rc:758
+#: Merge.rc:2137
#, c-format
msgid "Modified Date"
msgstr "Äàòóì ïðîìåíå"
-#: Merge.rc:757
-#: Merge.rc:2136
+#: Merge.rc:759
+#: Merge.rc:2138
#, c-format
msgid "Modified Date and Size"
msgstr "Èçìå\9cåí äàòóì è âåëè÷èíà"
-#: Merge.rc:758
-#: Merge.rc:2137
+#: Merge.rc:760
+#: Merge.rc:2139
#, c-format
msgid "Size"
msgstr "Âåëè÷èíà"
-#: Merge.rc:852
+#: Merge.rc:854
#, c-format
msgid "About WinMerge"
msgstr "Î WinMerge"
-#: Merge.rc:858
+#: Merge.rc:860
#, c-format
msgid "(Private Build)"
msgstr "(Ëè÷íè èçðàäàê)"
-#: Merge.rc:859
+#: Merge.rc:861
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr "Ïîñåòèòå WinMerge-îâ ñà¼ò"
-#: Merge.rc:861
-#: Merge.rc:899
-#: Merge.rc:1284
-#: Merge.rc:1316
-#: Merge.rc:1326
-#: Merge.rc:1485
-#: Merge.rc:1521
-#: Merge.rc:1615
-#: Merge.rc:1630
-#: Merge.rc:1853
-#: Merge.rc:1922
+#: Merge.rc:863
+#: Merge.rc:901
+#: Merge.rc:1286
+#: Merge.rc:1318
+#: Merge.rc:1328
+#: Merge.rc:1487
+#: Merge.rc:1523
+#: Merge.rc:1617
+#: Merge.rc:1632
+#: Merge.rc:1855
+#: Merge.rc:1924
#, c-format
msgid "OK"
msgstr "Ó ðåäó"
-#: Merge.rc:862
+#: Merge.rc:864
#, c-format
msgid "Contributors"
msgstr "Ñàðàäíèöè"
-#: Merge.rc:867
+#: Merge.rc:869
#, c-format
msgid "Select Files or Folders"
msgstr "Èçàáåðè äàòîòåêå èëè ôàñöèêëå"
-#: Merge.rc:875
-#: Merge.rc:943
-#: Merge.rc:1224
-#: Merge.rc:1246
+#: Merge.rc:877
+#: Merge.rc:945
+#: Merge.rc:1226
+#: Merge.rc:1248
#, c-format
msgid "&Browse..."
msgstr "&Ïðåãëåäà¼..."
-#: Merge.rc:881
-#: Merge.rc:1227
+#: Merge.rc:883
+#: Merge.rc:1229
#, c-format
msgid "B&rowse..."
msgstr "Ï&ðåãëåäà¼..."
-#: Merge.rc:882
+#: Merge.rc:884
#, c-format
msgid "&3(Optional):"
msgstr ""
-#: Merge.rc:887
-#: Merge.rc:1234
-#: Merge.rc:1250
+#: Merge.rc:889
+#: Merge.rc:1236
+#: Merge.rc:1252
#, c-format
msgid "Br&owse..."
msgstr "Ïð&åãëåäà¼..."
-#: Merge.rc:888
+#: Merge.rc:890
#, c-format
msgid "Fi<er:"
msgstr ""
-#: Merge.rc:891
-#: Merge.rc:1791
+#: Merge.rc:893
+#: Merge.rc:1793
#, c-format
msgid "Select..."
msgstr "Èçàáåðè..."
-#: Merge.rc:892
+#: Merge.rc:894
#, c-format
msgid "&Unpacker:"
msgstr "&Àðõèâåð:"
-#: Merge.rc:895
+#: Merge.rc:897
#, c-format
msgid "&Select..."
msgstr "&Èçàáåðè..."
-#: Merge.rc:898
+#: Merge.rc:900
#, c-format
msgid "Status:"
msgstr "Ñòà\9cå"
-#: Merge.rc:900
-#: Merge.rc:930
-#: Merge.rc:1005
-#: Merge.rc:1024
-#: Merge.rc:1056
-#: Merge.rc:1066
-#: Merge.rc:1285
-#: Merge.rc:1317
-#: Merge.rc:1327
-#: Merge.rc:1378
-#: Merge.rc:1486
-#: Merge.rc:1522
-#: Merge.rc:1616
-#: Merge.rc:1631
-#: Merge.rc:1854
+#: Merge.rc:902
+#: Merge.rc:932
+#: Merge.rc:1007
+#: Merge.rc:1026
+#: Merge.rc:1058
+#: Merge.rc:1068
+#: Merge.rc:1287
+#: Merge.rc:1319
+#: Merge.rc:1329
+#: Merge.rc:1380
+#: Merge.rc:1488
+#: Merge.rc:1524
+#: Merge.rc:1618
+#: Merge.rc:1633
+#: Merge.rc:1856
#, c-format
msgid "Cancel"
msgstr "Îòêàæè"
-#: Merge.rc:901
-#: Merge.rc:1523
+#: Merge.rc:903
+#: Merge.rc:1525
#, c-format
msgid "Help"
msgstr "Ïîìî\9e"
-#: Merge.rc:902
+#: Merge.rc:904
#, c-format
msgid "Files or Folders to Compare"
msgstr "Óïîðåäè äàòîòåêå èëè ôàñöèêëå"
-#: Merge.rc:914
+#: Merge.rc:916
#, c-format
msgid "Database:"
msgstr "Áàçà ïîäàòàêà:"
-#: Merge.rc:917
+#: Merge.rc:919
#, c-format
msgid "Project:"
msgstr "Ïîðå\90å\9cå:"
-#: Merge.rc:920
+#: Merge.rc:922
#, c-format
msgid "User:"
msgstr "Êîðèñíèê:"
-#: Merge.rc:922
+#: Merge.rc:924
#, c-format
msgid "Password:"
msgstr "Ëîçèíêà:"
-#: Merge.rc:924
+#: Merge.rc:926
#, c-format
msgid "Link to Destination VSS project"
msgstr "Âåçà äî îäðåäèøòà VSS ïðî¼åêòà"
-#: Merge.rc:926
-#: Merge.rc:1071
+#: Merge.rc:928
+#: Merge.rc:1073
#, c-format
msgid "Apply to all items"
msgstr "Ïðèìåíè íà ñâå ñòàâêå"
-#: Merge.rc:928
+#: Merge.rc:930
#, c-format
msgid "Check Out"
msgstr "Ïðîâåðà"
-#: Merge.rc:929
-#: Merge.rc:1067
+#: Merge.rc:931
+#: Merge.rc:1069
#, c-format
msgid "Save As..."
msgstr "Ñà÷óâ༠êàî..."
-#: Merge.rc:935
+#: Merge.rc:937
#, c-format
msgid "Versioning System"
msgstr "Èçäà\9cå ïðîãðàìà"
-#: Merge.rc:938
+#: Merge.rc:940
#, c-format
msgid "&Versioning System:"
msgstr "&Èçáîð ïðîãðàìà"
-#: Merge.rc:941
-#: Merge.rc:2180
+#: Merge.rc:943
+#: Merge.rc:2182
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "&Ïóòà\9cà äî cleartool.exe"
-#: Merge.rc:948
-#: Merge.rc:2063
-#: Merge.rc:2076
+#: Merge.rc:950
+#: Merge.rc:2065
+#: Merge.rc:2078
#, c-format
msgid "General"
msgstr "Îïøòè èçáîð"
-#: Merge.rc:951
+#: Merge.rc:953
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "Óâåê êðåíè îä &ïðâå ðàçëèêå"
-#: Merge.rc:954
+#: Merge.rc:956
#, c-format
msgid "Cl&ose windows with ESC"
msgstr "Çàòâîðè ïð&îçîð ñà ESC"
-#: Merge.rc:956
+#: Merge.rc:958
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr "Ïðîâåðèòå ïóòà\9cå ó èçáîðíîì äè¼àëîãó "
-#: Merge.rc:959
+#: Merge.rc:961
#, c-format
msgid "All&ow only one instance to run"
msgstr "Äîçâîëè ñàìî ¼åäíó ïîêðåíóòó íàäëåæíîñò"
-#: Merge.rc:961
+#: Merge.rc:963
#, c-format
msgid "As&k when closing multiple windows"
msgstr "Óïèò༠&êàä çàòâàðàø âèøå ïðîçîðà"
-#: Merge.rc:963
+#: Merge.rc:965
#, c-format
msgid "&Preserve file time in file compare"
msgstr "&Çàäðæè îçíàêå âðåìåíà è äàòóìà ó ïîðå\90å\9có "
-#: Merge.rc:966
+#: Merge.rc:968
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
msgstr "Ïðèêàæè \"Îäàáðàíå äàòîòåêå èëè ôàñöèêëå\" äè¼àëîã ïðè ïîêðåòà\9có."
-#: Merge.rc:968
+#: Merge.rc:970
#, c-format
msgid "Close \"Select Files or Folders\" Dialog on clicking OK button"
msgstr ""
-#: Merge.rc:970
+#: Merge.rc:972
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr "Îòâîðè äè¼àëîã ñàìîäîâðøå\9cà"
-#: Merge.rc:973
+#: Merge.rc:975
#, c-format
msgid "Language:"
msgstr ""
-#: Merge.rc:976
+#: Merge.rc:978
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr "WinMerge îìîãó\9eàâà ñêðèâà\9cå íåêèõ óîáè÷à¼åíèõ ïîðóêà.Ïðèòèñíèòå 'Ïî÷åòíè'äà ïîðóêå îïåò áóäó âèä\9aèâå"
-#: Merge.rc:978
+#: Merge.rc:980
#, c-format
msgid "Reset"
msgstr "Ïî÷åòíè"
-#: Merge.rc:985
-#: Merge.rc:1011
+#: Merge.rc:987
+#: Merge.rc:1013
#, c-format
msgid "Find"
msgstr "Íà\90è"
-#: Merge.rc:988
-#: Merge.rc:1014
-#: Merge.rc:1033
+#: Merge.rc:990
+#: Merge.rc:1016
+#: Merge.rc:1035
#, c-format
msgid "Fi&nd what:"
msgstr "Ïðåòðà&æè:"
-#: Merge.rc:991
-#: Merge.rc:1017
-#: Merge.rc:1039
-#, c-format
-msgid "Match &whole word only"
-msgstr "Óïîðåäè &öåî èçðàç"
-
#: Merge.rc:993
#: Merge.rc:1019
#: Merge.rc:1041
#, c-format
-msgid "Match &case"
-msgstr "Óïîðåäè ñòà&\9cå"
+msgid "Match &whole word only"
+msgstr "Óïîðåäè &öåî èçðàç"
#: Merge.rc:995
#: Merge.rc:1021
#: Merge.rc:1043
#, c-format
+msgid "Match &case"
+msgstr "Óïîðåäè ñòà&\9cå"
+
+#: Merge.rc:997
+#: Merge.rc:1023
+#: Merge.rc:1045
+#, c-format
msgid "Regular &expression"
msgstr "Ïðàâèëàí èçðàç"
-#: Merge.rc:997
+#: Merge.rc:999
#, c-format
msgid "D&on't wrap end of file"
msgstr "Áåç ïðåë&îìà òåêñòà"
-#: Merge.rc:1000
+#: Merge.rc:1002
#, c-format
msgid "&Don't close this dialog box"
msgstr ""
-#: Merge.rc:1003
+#: Merge.rc:1005
#, c-format
msgid "Find &Prev"
msgstr ""
-#: Merge.rc:1004
-#: Merge.rc:1053
+#: Merge.rc:1006
+#: Merge.rc:1055
#, c-format
msgid "&Find Next"
msgstr "&Íà\90è ñëåäå\9eå"
-#: Merge.rc:1023
-#: Merge.rc:2037
+#: Merge.rc:1025
+#: Merge.rc:2039
#, c-format
msgid "&Ok"
msgstr "&Ó ðåäó"
-#: Merge.rc:1030
+#: Merge.rc:1032
#, c-format
msgid "Replace"
msgstr "Çàìåíè"
-#: Merge.rc:1036
+#: Merge.rc:1038
#, c-format
msgid "Re&place with:"
msgstr "Çà&ìåíè ñà:"
-#: Merge.rc:1045
+#: Merge.rc:1047
#, c-format
msgid "&Don't wrap end of file"
msgstr "&Áåç ïðåëîìà òåêñòà"
-#: Merge.rc:1048
+#: Merge.rc:1050
#, c-format
msgid "Replace in"
msgstr "Çàìåíè ó"
-#: Merge.rc:1049
+#: Merge.rc:1051
#, c-format
msgid "&Selection"
msgstr "Èçàáðàíèì"
-#: Merge.rc:1051
+#: Merge.rc:1053
#, c-format
msgid "Wh&ole file"
msgstr "Öåëî¼ äàò&îòåöè"
-#: Merge.rc:1054
+#: Merge.rc:1056
#, c-format
msgid "&Replace"
msgstr "&Çàìåíè"
-#: Merge.rc:1055
+#: Merge.rc:1057
#, c-format
msgid "Replace &All"
msgstr "Çàìåíè ñâ&å"
-#: Merge.rc:1065
+#: Merge.rc:1067
#, c-format
msgid "CheckOut"
msgstr "Ïðîâåðà"
-#: Merge.rc:1070
-#: Merge.rc:1396
+#: Merge.rc:1072
+#: Merge.rc:1398
#, c-format
msgid "Comments"
msgstr "Íàïîìåíå"
-#: Merge.rc:1073
+#: Merge.rc:1075
#, c-format
msgid "CheckIn after checkout"
msgstr "Ïðîâåðèòå ïîíîâî"
-#: Merge.rc:1079
+#: Merge.rc:1081
#, c-format
msgid "Linefilters"
msgstr "Ôèëòåð ðåäîâà"
-#: Merge.rc:1082
+#: Merge.rc:1084
#, c-format
msgid "Enable Line Filters"
msgstr "Îìîãó\9eè ôèëòðèðà\9cå ðåäà"
-#: Merge.rc:1085
+#: Merge.rc:1087
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Èñïðàâàí èçðàç (¼åäàí ïî ðåäó):"
-#: Merge.rc:1090
+#: Merge.rc:1092
#, c-format
msgid "New"
msgstr "Íîâè"
-#: Merge.rc:1091
+#: Merge.rc:1093
#, c-format
msgid "Edit"
msgstr "Óðåäè"
-#: Merge.rc:1092
+#: Merge.rc:1094
#, c-format
msgid "Remove"
msgstr "Óêëîíè"
-#: Merge.rc:1097
-#: Merge.rc:2066
+#: Merge.rc:1099
+#: Merge.rc:2068
#, c-format
msgid "Colors"
msgstr "Áî¼å"
-#: Merge.rc:1100
+#: Merge.rc:1102
#, c-format
msgid "Difference:"
msgstr "Ðàçëèêå"
-#: Merge.rc:1104
+#: Merge.rc:1106
#, c-format
msgid "Selected Difference:"
msgstr "Îáåëåæè ðàçëèêå"
-#: Merge.rc:1108
-#: Merge.rc:1756
+#: Merge.rc:1110
+#: Merge.rc:1758
#, c-format
msgid "Background"
msgstr "Ïîçàäèíà"
-#: Merge.rc:1109
+#: Merge.rc:1111
#, c-format
msgid "Deleted"
msgstr "Èçáðèñàíî"
-#: Merge.rc:1126
-#: Merge.rc:1549
-#: Merge.rc:1757
-#: Merge.rc:2067
+#: Merge.rc:1128
+#: Merge.rc:1551
+#: Merge.rc:1759
+#: Merge.rc:2069
#, c-format
msgid "Text"
msgstr "Òåêñò"
-#: Merge.rc:1130
+#: Merge.rc:1132
#, c-format
msgid "Ignored Difference:"
msgstr "Çàíåìàðè ðàçëèêå"
-#: Merge.rc:1142
+#: Merge.rc:1144
#, c-format
msgid "Moved:"
msgstr "Ïðåìåøòåíî:"
-#: Merge.rc:1154
+#: Merge.rc:1156
#, c-format
msgid "Selected Moved:"
msgstr "Ïðåìåøòà\9cå èçàáðàíîã"
-#: Merge.rc:1163
+#: Merge.rc:1165
#, c-format
msgid "Same As The Next(3 panes):"
msgstr ""
-#: Merge.rc:1175
+#: Merge.rc:1177
#, c-format
msgid "Same As The Next(Selected):"
msgstr ""
-#: Merge.rc:1187
+#: Merge.rc:1189
#, c-format
msgid "Word Difference:"
msgstr "Ðàçëè÷èòå ðå÷è:"
-#: Merge.rc:1199
+#: Merge.rc:1201
#, c-format
msgid "Selected Word Diff:"
msgstr "Îäàáåðè ðàçëè÷èòå ðå÷è:"
-#: Merge.rc:1212
-#: Merge.rc:1283
-#: Merge.rc:1315
-#: Merge.rc:1399
-#: Merge.rc:1595
-#: Merge.rc:1890
-#: Merge.rc:1904
-#: Merge.rc:1914
+#: Merge.rc:1214
+#: Merge.rc:1285
+#: Merge.rc:1317
+#: Merge.rc:1401
+#: Merge.rc:1597
+#: Merge.rc:1892
+#: Merge.rc:1906
+#: Merge.rc:1916
#, c-format
msgid "Defaults"
msgstr "Ïîäðàçóìåâàíî"
-#: Merge.rc:1217
-#: Merge.rc:2069
+#: Merge.rc:1219
+#: Merge.rc:2071
#, c-format
msgid "System"
msgstr "Ñèñòåì"
-#: Merge.rc:1220
+#: Merge.rc:1222
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr "Ïîøà\9aè èçáðè&ñàíî ó êîðïó"
-#: Merge.rc:1222
+#: Merge.rc:1224
#, c-format
msgid "&External editor:"
msgstr "Ñïî\9a\9cè óð&å\90èâà÷:"
-#: Merge.rc:1225
+#: Merge.rc:1227
#, c-format
msgid "&Filter folder:"
msgstr "Ôàñöèêëà ôèëòåðà:"
-#: Merge.rc:1228
+#: Merge.rc:1230
#, c-format
msgid "Temporary files folder"
msgstr "Ôàñöèêëà ïðèâðåìåíèõ äàòîòåêà"
-#: Merge.rc:1229
+#: Merge.rc:1231
#, c-format
msgid "S&ystem's temp folder"
msgstr "Ïðèâðåìåíà ñèñòåìñêà ôàñöèêëà"
-#: Merge.rc:1231
+#: Merge.rc:1233
#, c-format
msgid "C&ustom folder:"
msgstr "Ïîäåøåíà ôàñöèêëà"
-#: Merge.rc:1240
+#: Merge.rc:1242
#, c-format
msgid "Patch Generator"
msgstr "Ñòâîðåíå ðàçëèêå"
-#: Merge.rc:1243
+#: Merge.rc:1245
#, c-format
msgid "File&1:"
msgstr "Äàòîòåêà&1:"
-#: Merge.rc:1247
+#: Merge.rc:1249
#, c-format
msgid "File&2:"
msgstr "Äàòîòåêà&2:"
-#: Merge.rc:1251
+#: Merge.rc:1253
#, c-format
msgid "&Swap"
msgstr "&Çàìåíè"
-#: Merge.rc:1252
+#: Merge.rc:1254
#, c-format
msgid "&Append to existing file"
msgstr "Ïðèê\9aó÷è ïîñòî¼å\9eî¼ äàòîòåöè"
-#: Merge.rc:1254
+#: Merge.rc:1256
#, c-format
msgid "&Result:"
msgstr "&Èçõîä:"
-#: Merge.rc:1257
+#: Merge.rc:1259
#, c-format
msgid "Bro&wse..."
msgstr "Ïðå&ãëåäà¼..."
-#: Merge.rc:1258
+#: Merge.rc:1260
#, c-format
msgid "&Format"
msgstr "&Îáëèê"
-#: Merge.rc:1259
+#: Merge.rc:1261
#, c-format
msgid "St&yle:"
msgstr "Íà&÷èí"
-#: Merge.rc:1262
+#: Merge.rc:1264
#, c-format
msgid "&Context:"
msgstr "Ó &îêâèðó"
-#: Merge.rc:1272
+#: Merge.rc:1274
#, c-format
msgid "Ignor&e blank lines"
msgstr "Çàí&åìàðè ïðàçíå ðåäîâå"
-#: Merge.rc:1279
+#: Merge.rc:1281
#, c-format
msgid "Inclu&de command line"
msgstr "Óê\9aó÷è íàðåäáåíè ðåä"
-#: Merge.rc:1281
+#: Merge.rc:1283
#, c-format
msgid "Open to e&xternal editor"
msgstr "Îòâîðè ó äðóãîì óðå&\90èâà÷ó"
-#: Merge.rc:1306
+#: Merge.rc:1308
#, c-format
msgid "Display Columns"
msgstr "Ïðèêàæè ñòóáöå"
-#: Merge.rc:1312
+#: Merge.rc:1314
#, c-format
msgid "Move &Up"
msgstr "Ïîìåðè &ãîðå"
-#: Merge.rc:1313
+#: Merge.rc:1315
#, c-format
msgid "Move &Down"
msgstr "Ïîìåðè &äîëå"
-#: Merge.rc:1323
+#: Merge.rc:1325
#, c-format
msgid "Select Unpacker"
msgstr "Èçáîð àðõèâåðà"
-#: Merge.rc:1328
+#: Merge.rc:1330
#, c-format
msgid "File unpacker:"
msgstr "Àðõèâåð äàòîòåêà"
-#: Merge.rc:1331
+#: Merge.rc:1333
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr "Ïðèêàæè ñâå àðõèâåðå áåç ïðîâåðå íàñòàâêà"
-#: Merge.rc:1334
+#: Merge.rc:1336
#, c-format
msgid "Extensions list:"
msgstr "Ïîïèñ íàñòàâàêà:"
-#: Merge.rc:1335
+#: Merge.rc:1337
#, c-format
msgid "Description:"
msgstr "Îïèñ:"
-#: Merge.rc:1346
+#: Merge.rc:1348
#, c-format
msgid "Stop"
msgstr "Ñòàíè"
-#: Merge.rc:1351
+#: Merge.rc:1353
#, c-format
msgid "Comparing items..."
msgstr "Óïîðå\90èâà\9cå ñòàâêè..."
-#: Merge.rc:1352
+#: Merge.rc:1354
#, c-format
msgid "Items compared:"
msgstr "Ïîðå\90å\9cå ñòàâêè:"
-#: Merge.rc:1353
+#: Merge.rc:1355
#, c-format
msgid "Items total:"
msgstr "Óêóïíî ñòàâêè :"
-#: Merge.rc:1360
+#: Merge.rc:1362
#, c-format
msgid "Go To"
msgstr "Èäè íà"
-#: Merge.rc:1363
+#: Merge.rc:1365
#, c-format
msgid "G&oto:"
msgstr "Èäè &íà:"
-#: Merge.rc:1365
+#: Merge.rc:1367
#, c-format
msgid "File"
msgstr "Äàòîòåêà"
-#: Merge.rc:1372
+#: Merge.rc:1374
#, c-format
msgid "Goto what"
msgstr "Ó äàòîòåöè"
-#: Merge.rc:1373
+#: Merge.rc:1375
#, c-format
msgid "Li&ne"
msgstr "Ðå&ä"
-#: Merge.rc:1375
+#: Merge.rc:1377
#, c-format
msgid "&Difference"
msgstr "Ðàç&ëèêà"
-#: Merge.rc:1377
+#: Merge.rc:1379
#, c-format
msgid "&Go To"
msgstr "&Èäè íà"
-#: Merge.rc:1383
-#: Merge.rc:2064
+#: Merge.rc:1385
+#: Merge.rc:2066
#, c-format
msgid "Compare"
msgstr "Óïîðå\90èâà\9cå"
-#: Merge.rc:1386
+#: Merge.rc:1388
#, c-format
msgid "Whitespace"
msgstr "Ðàçìàê"
-#: Merge.rc:1387
+#: Merge.rc:1389
#, c-format
msgid "&Compare"
msgstr "&Óïîðåäè"
-#: Merge.rc:1388
+#: Merge.rc:1390
#, c-format
msgid "&Ignore change"
msgstr "Çàíåìàð&è ïðîìåíå"
-#: Merge.rc:1389
+#: Merge.rc:1391
#, c-format
msgid "I&gnore all"
msgstr "Çàíå&ìàðè ñâå"
-#: Merge.rc:1390
+#: Merge.rc:1392
#, c-format
msgid "Ignore blan&k lines"
msgstr "Çàíåìàðè ïðà&çíå ðåäîâå"
-#: Merge.rc:1391
+#: Merge.rc:1393
#, c-format
msgid "Ignore &case"
msgstr "Çàíåìàðè ïîä&óäàðíîñò"
-#: Merge.rc:1394
+#: Merge.rc:1396
#, c-format
msgid "E&nable moved block detection"
msgstr "Îìîãó\9eè îòêðèâà\9cå ïðåìåøòåíèõ ãðóïà"
-#: Merge.rc:1395
+#: Merge.rc:1397
#, c-format
msgid "&Match similar lines"
msgstr "Óïîðåäè ñëè÷íå ðåäîâå"
-#: Merge.rc:1397
+#: Merge.rc:1399
#, c-format
msgid "Filter Comments"
msgstr "Ôèëòðèð༠íàïîìåíå"
-#: Merge.rc:1404
-#: Merge.rc:2065
+#: Merge.rc:1406
+#: Merge.rc:2067
#, c-format
msgid "Editor"
msgstr "Óðå\90èâà÷"
-#: Merge.rc:1407
+#: Merge.rc:1409
#, c-format
msgid "&Highlight syntax"
msgstr "Íàãëàñè ñêëîï ðå÷è"
-#: Merge.rc:1409
+#: Merge.rc:1411
#, c-format
msgid "&Automatic rescan"
msgstr "&Àóòîìàòñêè ïîíîâî ïðåòðàæè"
-#: Merge.rc:1411
+#: Merge.rc:1413
#, c-format
msgid "&Preserve original EOL chars"
msgstr "Çàäð&æè èçâîðíî îçíà÷àâà\9cå êðà¼à ðåäà"
-#: Merge.rc:1413
+#: Merge.rc:1415
#, c-format
msgid "Tabs"
msgstr "£åçè÷öè"
-#: Merge.rc:1414
+#: Merge.rc:1416
#, c-format
msgid "&Tab size:"
msgstr "Âåëè÷èíà &¼åçè÷àêà"
-#: Merge.rc:1417
+#: Merge.rc:1419
#, c-format
msgid "&Insert Tabs"
msgstr "Óìåòíè ¼åçè÷êå"
-#: Merge.rc:1419
+#: Merge.rc:1421
#, c-format
msgid "Insert &Spaces"
msgstr "Óìåòíè ðàçìàê"
-#: Merge.rc:1421
+#: Merge.rc:1423
#, c-format
msgid "Line Difference Coloring"
msgstr "Îáî¼è ðàçëè÷èòå ðåäîâå "
-#: Merge.rc:1423
+#: Merge.rc:1425
#, c-format
msgid "View line differences"
msgstr "Ïðèêàç ðàçëè÷èòèõ ðåäîâà"
-#: Merge.rc:1425
+#: Merge.rc:1427
#, c-format
msgid "&Character level"
msgstr "Ðàíã &çíàêà"
-#: Merge.rc:1427
+#: Merge.rc:1429
#, c-format
msgid "&Word-level:"
msgstr "Ðàíã ðå&÷è:"
-#: Merge.rc:1431
+#: Merge.rc:1433
#, c-format
msgid "W&ord break characters:"
msgstr ""
-#: Merge.rc:1444
+#: Merge.rc:1446
#, c-format
msgid "Filefilters"
msgstr "Ôèëòåð äàòîòåêà"
-#: Merge.rc:1450
+#: Merge.rc:1452
#, c-format
msgid "Test"
msgstr "Ïðîâåðà"
-#: Merge.rc:1451
+#: Merge.rc:1453
#, c-format
msgid "Install..."
msgstr "Èíñòàëèðà¼..."
-#: Merge.rc:1452
+#: Merge.rc:1454
#, c-format
msgid "New..."
msgstr "Íîâè..."
-#: Merge.rc:1453
+#: Merge.rc:1455
#, c-format
msgid "Edit..."
msgstr "Óðåäè..."
-#: Merge.rc:1454
+#: Merge.rc:1456
#, c-format
msgid "Delete..."
msgstr "Èçáðèøè..."
-#: Merge.rc:1460
+#: Merge.rc:1462
#, c-format
msgid "Save modified files?"
msgstr "Ñà÷óâ༠èçìå\9cåíó äàòîòåêó?"
-#: Merge.rc:1463
+#: Merge.rc:1465
#, c-format
msgid "Left side file"
msgstr "Ëåâà äàòîòåêà"
-#: Merge.rc:1466
+#: Merge.rc:1468
#, c-format
msgid "&Save changes"
msgstr "&Ñà÷óâ༠ïðîìåíå"
-#: Merge.rc:1468
+#: Merge.rc:1470
#, c-format
msgid "&Discard changes"
msgstr "&Îäóñòàíè îä èçìåíà"
-#: Merge.rc:1470
+#: Merge.rc:1472
#, c-format
msgid "Middle side file"
msgstr ""
-#: Merge.rc:1473
+#: Merge.rc:1475
#, c-format
msgid "Sa&ve changes"
msgstr ""
-#: Merge.rc:1475
+#: Merge.rc:1477
#, c-format
msgid "Disca&rd changes"
msgstr ""
-#: Merge.rc:1477
+#: Merge.rc:1479
#, c-format
msgid "Right side file"
msgstr "Äåñíà äàòîòåêà"
-#: Merge.rc:1480
+#: Merge.rc:1482
#, c-format
msgid "S&ave changes"
msgstr "Ñ&à÷óâ༠ïðîìåíå"
-#: Merge.rc:1482
+#: Merge.rc:1484
#, c-format
msgid "Dis&card changes"
msgstr "Îäóñ&òàíè îä èçìåíà"
-#: Merge.rc:1484
+#: Merge.rc:1486
#, c-format
msgid "Disca&rd All"
msgstr ""
-#: Merge.rc:1491
-#: Merge.rc:1697
-#: Merge.rc:2071
+#: Merge.rc:1493
+#: Merge.rc:1699
+#: Merge.rc:2073
#, c-format
msgid "Codepage"
msgstr "Êîäíà ñòðàíèöà"
-#: Merge.rc:1494
+#: Merge.rc:1496
#, c-format
msgid "Default Codepage"
msgstr "Ïîäðàçóìåâàíà êîäíà ñòðàíèöà"
-#: Merge.rc:1495
+#: Merge.rc:1497
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "Îäàáåðè ïîäðàçóìåâàíó êîäíó ñòðàíèöó êàä ó÷èòàíà Óíèêîä äàòîòåêà íè¼å ïðèõâà\9eåíà"
-#: Merge.rc:1497
+#: Merge.rc:1499
#, c-format
msgid ""
"Detect codepage info for these files: .html, .rc, .xml \n"
"Ä༠îáàâåøòå\9cà êîäíå ñòðàíå çà îâå äàòîòåêå:.html, .rc, .xml \n"
" Íè¼å ïîòðåáíî ïîíîâî ïîêðåòà\9cå ñåñè¼å"
-#: Merge.rc:1500
+#: Merge.rc:1502
#, c-format
msgid "Detect codepage for text files using mlang.dll\nneed to restart session"
msgstr ""
-#: Merge.rc:1505
+#: Merge.rc:1507
#, c-format
msgid "System codepage"
msgstr "Êîäíà ñòðàíèöà ñèñòåìà"
-#: Merge.rc:1507
+#: Merge.rc:1509
#, c-format
msgid "According to WinMerge User Interface"
msgstr "Ïðåìà êîðèñíè÷êîì ñó÷å\9aó WinMerge-à"
-#: Merge.rc:1509
+#: Merge.rc:1511
#, c-format
msgid "Custom codepage:"
msgstr "Ïîäåøåíà êîäíà ñòðàíèöà"
-#: Merge.rc:1518
+#: Merge.rc:1520
#, c-format
msgid "Options"
msgstr "Ïîñòàâêå"
-#: Merge.rc:1529
+#: Merge.rc:1531
#, c-format
msgid " Categories"
msgstr "Êàòåãîðè¼å"
-#: Merge.rc:1531
+#: Merge.rc:1533
#, c-format
msgid "Import..."
msgstr "Óâåçè..."
-#: Merge.rc:1532
+#: Merge.rc:1534
#, c-format
msgid "Export..."
msgstr "Èçâåçè..."
-#: Merge.rc:1537
-#: Merge.rc:1745
+#: Merge.rc:1539
+#: Merge.rc:1747
#, c-format
msgid "Dialog"
msgstr "Ðàçãîâîð"
-#: Merge.rc:1540
+#: Merge.rc:1542
#, c-format
msgid "Keywords:"
msgstr "Ê\9aó÷íå ðå÷è:"
-#: Merge.rc:1541
+#: Merge.rc:1543
#, c-format
msgid "Function names:"
msgstr "Èìåíà ôóíêöè¼à:"
-#: Merge.rc:1542
+#: Merge.rc:1544
#, c-format
msgid "Comments:"
msgstr "Íàïîìåíå:"
-#: Merge.rc:1543
+#: Merge.rc:1545
#, c-format
msgid "Numbers:"
msgstr "Áðî¼åâè:"
-#: Merge.rc:1544
+#: Merge.rc:1546
#, c-format
msgid "Operators:"
msgstr "Îïåðàòåðè:"
-#: Merge.rc:1545
+#: Merge.rc:1547
#, c-format
msgid "Strings:"
msgstr "Ïî¼ìîâè:"
-#: Merge.rc:1546
+#: Merge.rc:1548
#, c-format
msgid "Preprocessor:"
msgstr "Ïðåòïðîöåñîð:"
-#: Merge.rc:1547
+#: Merge.rc:1549
#, c-format
msgid "User 1:"
msgstr "Êîðèñíèê 1:"
-#: Merge.rc:1548
+#: Merge.rc:1550
#, c-format
msgid "User 2:"
msgstr "Êîðèñíèê 2:"
-#: Merge.rc:1553
-#: Merge.rc:1558
-#: Merge.rc:1563
-#: Merge.rc:1568
-#: Merge.rc:1573
-#: Merge.rc:1578
-#: Merge.rc:1583
-#: Merge.rc:1588
-#: Merge.rc:1593
+#: Merge.rc:1555
+#: Merge.rc:1560
+#: Merge.rc:1565
+#: Merge.rc:1570
+#: Merge.rc:1575
+#: Merge.rc:1580
+#: Merge.rc:1585
+#: Merge.rc:1590
+#: Merge.rc:1595
#, c-format
msgid "Bold"
msgstr "Ïîäåá\9aàíî"
-#: Merge.rc:1601
+#: Merge.rc:1603
#, c-format
msgid "Folder Compare Report"
msgstr "Èçâåøò༠óïîðå\90åíèõ ôàñöèêëè"
-#: Merge.rc:1604
+#: Merge.rc:1606
#, c-format
msgid "Report &File:"
msgstr "Äàòîòåêà èçâå&øòà¼à:"
-#: Merge.rc:1607
-#: Merge.rc:1783
-#: Merge.rc:1787
-#: Merge.rc:1814
+#: Merge.rc:1609
+#: Merge.rc:1785
+#: Merge.rc:1789
+#: Merge.rc:1816
#, c-format
msgid "Browse..."
msgstr "Ïðåãëåä..."
-#: Merge.rc:1608
+#: Merge.rc:1610
#, c-format
msgid "&Style:"
msgstr "&Íà÷èí"
-#: Merge.rc:1611
+#: Merge.rc:1613
#, c-format
msgid "&Include File Compare Report"
msgstr ""
-#: Merge.rc:1613
+#: Merge.rc:1615
#, c-format
msgid "&Copy to Clipboard"
msgstr "Ñà÷óâ༠ó îñòàâè"
-#: Merge.rc:1621
+#: Merge.rc:1623
#, c-format
msgid "Shared or Private Filter"
msgstr "Çà¼åäíè÷êè èëè ëè÷íè ôèëòåð"
-#: Merge.rc:1624
+#: Merge.rc:1626
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "Êî¼ó âðñòó ôèëòåðà æåëèòå äà èìàòå?"
-#: Merge.rc:1626
+#: Merge.rc:1628
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "Çà¼åäíè÷êè ôèëòåð (çà ñâå êîðèñíèêå ðà÷óíàðà)"
-#: Merge.rc:1628
+#: Merge.rc:1630
#, c-format
msgid "Private Filter (only for current user)"
msgstr "Ëè÷íè ôèëòåð (ñàìî çà òðåíóòíîã êîðèñíèêà)"
-#: Merge.rc:1636
-#: Merge.rc:2072
+#: Merge.rc:1638
+#: Merge.rc:2074
#, c-format
msgid "Archive Support"
msgstr "Ðàä ñà àðõèâàìà"
-#: Merge.rc:1639
+#: Merge.rc:1641
#, c-format
msgid "&Enable archive file support"
msgstr "&Îìîãó\9eè ïîäðøêó àðõèâè"
-#: Merge.rc:1641
+#: Merge.rc:1643
#, c-format
msgid "&Detect archive type from file signature"
msgstr "Îòêðè¼ âðñòó àðõèâå èç çàãëàâ\9aà äàòîòåêå"
-#: Merge.rc:1649
+#: Merge.rc:1651
#, c-format
msgid "Compare Statistics"
msgstr "Óïîðåäíà ñòàòèñòèêà"
-#: Merge.rc:1652
+#: Merge.rc:1654
#, c-format
msgid "Folders:"
msgstr "Ôàñöèêëå"
-#: Merge.rc:1653
+#: Merge.rc:1655
#, c-format
msgid "Files:"
msgstr "Äàòîòåêå"
-#: Merge.rc:1654
-#: Merge.rc:2447
+#: Merge.rc:1656
+#: Merge.rc:2449
#, c-format
msgid "Different"
msgstr "Ðàçëèêà"
-#: Merge.rc:1655
+#: Merge.rc:1657
#, c-format
msgid "Text:"
msgstr "Òåêñò"
-#: Merge.rc:1658
-#: Merge.rc:1682
+#: Merge.rc:1660
+#: Merge.rc:1684
#, c-format
msgid "Binary:"
msgstr "Áèíàðíè"
-#: Merge.rc:1661
+#: Merge.rc:1663
#, c-format
msgid "Unique"
msgstr "£åäèíñòâåí"
-#: Merge.rc:1662
+#: Merge.rc:1664
#, c-format
msgid "Left:"
msgstr "Ëåâà:"
-#: Merge.rc:1667
+#: Merge.rc:1669
#, c-format
msgid "Middle:"
msgstr ""
-#: Merge.rc:1672
+#: Merge.rc:1674
#, c-format
msgid "Right:"
msgstr "Äåñíà:"
-#: Merge.rc:1677
-#: Merge.rc:2437
+#: Merge.rc:1679
+#: Merge.rc:2439
#, c-format
msgid "Identical"
msgstr "Èñòå"
-#: Merge.rc:1686
+#: Merge.rc:1688
#, c-format
msgid "Total:"
msgstr "Óêóïíî:"
-#: Merge.rc:1691
+#: Merge.rc:1693
#, c-format
msgid "Close"
msgstr "Çàòâîðè"
-#: Merge.rc:1700
+#: Merge.rc:1702
#, c-format
msgid "Affects"
msgstr "Óñìåðèòå"
-#: Merge.rc:1703
-#: Merge.rc:1706
-#: Merge.rc:1709
+#: Merge.rc:1705
+#: Merge.rc:1708
+#: Merge.rc:1711
#, c-format
msgid "(Affects)"
msgstr "(Óñìåðèòå)"
-#: Merge.rc:1710
+#: Merge.rc:1712
#, c-format
msgid "Select Codepage for"
msgstr "Îäàáåðè êîäíó ñòðàíó çà"
-#: Merge.rc:1711
+#: Merge.rc:1713
#, c-format
msgid "&File Loading:"
msgstr "Ó&÷èòàâà\9cå äàòîòåêå:"
-#: Merge.rc:1714
+#: Merge.rc:1716
#, c-format
msgid "File &Saving:"
msgstr "Äàòîòåêà ¼å &ñà÷óâàíà:"
-#: Merge.rc:1717
+#: Merge.rc:1719
#, c-format
msgid "&Use same codepage for both"
msgstr "Êîðèñòè èñò&ó êîäíó ñòðàíó çà îáå"
-#: Merge.rc:1720
+#: Merge.rc:1722
#, c-format
msgid "&Apply"
msgstr "Ï&ðèìåíè"
-#: Merge.rc:1721
-#: Merge.rc:2038
+#: Merge.rc:1723
+#: Merge.rc:2040
#, c-format
msgid "&Cancel"
msgstr "Îòêàæè"
-#: Merge.rc:1726
+#: Merge.rc:1728
#, c-format
msgid "Test Filter"
msgstr "Ïðîâåðà ôèëòåðà"
-#: Merge.rc:1729
+#: Merge.rc:1731
#, c-format
msgid "Testing filter ..."
msgstr "Ïðîâåðàâà\9cå ôèëòåðà..."
-#: Merge.rc:1731
+#: Merge.rc:1733
#, c-format
msgid "&Enter text to test:"
msgstr "Óí&åñè òåêñò çà ïðîâåðó"
-#: Merge.rc:1733
+#: Merge.rc:1735
#, c-format
msgid "&Folder Name"
msgstr "Èìå &ôàñöèêëå"
-#: Merge.rc:1735
+#: Merge.rc:1737
#, c-format
msgid "Result:"
msgstr "Èñõîä:"
-#: Merge.rc:1739
+#: Merge.rc:1741
#, c-format
msgid "&Test"
msgstr "&Ïðîâåðà"
-#: Merge.rc:1740
+#: Merge.rc:1742
#, c-format
msgid "&Close"
msgstr "&Çàòâîðè"
-#: Merge.rc:1748
+#: Merge.rc:1750
#, c-format
msgid "&Use customized text colors"
msgstr "Êîðèñòè æå\9aåíå áî¼å òåêñòà"
-#: Merge.rc:1751
+#: Merge.rc:1753
#, c-format
msgid "Custom text colors"
msgstr "Æå\9aåíå áî¼å òåêñòà"
-#: Merge.rc:1753
+#: Merge.rc:1755
#, c-format
msgid "Whitespace:"
msgstr "Ðàçìàê:"
-#: Merge.rc:1754
+#: Merge.rc:1756
#, c-format
msgid "Regular text:"
msgstr "Ïðàâèëàí òåêñò:"
-#: Merge.rc:1755
+#: Merge.rc:1757
#, c-format
msgid "Selection:"
msgstr "Èçàáåðè:"
-#: Merge.rc:1778
+#: Merge.rc:1780
#, c-format
msgid "Paths"
msgstr "Ïóòà\9cå"
-#: Merge.rc:1781
+#: Merge.rc:1783
#, c-format
msgid "&Left:"
msgstr "&Ëåâa:"
-#: Merge.rc:1784
+#: Merge.rc:1786
#, c-format
msgid "R&ead-only"
msgstr "Ñàìî çà ÷èòà\9c&å"
-#: Merge.rc:1785
+#: Merge.rc:1787
#, c-format
msgid "&Right:"
msgstr "&Äåñía:"
-#: Merge.rc:1788
+#: Merge.rc:1790
#, c-format
msgid "Re&ad-only"
msgstr "Ñ&àìî çà ÷èòà\9cå"
-#: Merge.rc:1789
+#: Merge.rc:1791
#, c-format
msgid "&Filter:"
msgstr "&Ôèëòåð:"
-#: Merge.rc:1794
+#: Merge.rc:1796
#, c-format
msgid "Open..."
msgstr "Îòâîðè..."
-#: Merge.rc:1795
+#: Merge.rc:1797
#, c-format
msgid "Save..."
msgstr "Ñà÷óâà¼..."
-#: Merge.rc:1800
-#: Merge.rc:2073
+#: Merge.rc:1802
+#: Merge.rc:2075
#, c-format
msgid "Backup Files"
msgstr "Ðåçåðâíå äàòîòåêå"
-#: Merge.rc:1803
+#: Merge.rc:1805
#, c-format
msgid "Create backup files in:"
msgstr "Íàïðàâè ðåçåðâíå äàòîòåêå ó:"
-#: Merge.rc:1804
+#: Merge.rc:1806
#, c-format
msgid "&Folder compare"
msgstr "Óïîðåäè &ôàñöèêëó"
-#: Merge.rc:1806
+#: Merge.rc:1808
#, c-format
msgid "Fil&e compare"
msgstr "Óïîð&åäè äàòîòåêå"
-#: Merge.rc:1808
+#: Merge.rc:1810
#, c-format
msgid "Create backup files into:"
msgstr "Íàïðàâè ðåçåðâíå äàòîòåêå ó:"
-#: Merge.rc:1809
+#: Merge.rc:1811
#, c-format
msgid "&Original file's folder"
msgstr "Èçâ&îðíà ôàñöèêëà äàòîòåêå"
-#: Merge.rc:1811
+#: Merge.rc:1813
#, c-format
msgid "&Global backup folder:"
msgstr "Îïøòà ðåçåðâíà ôàñöèêëà "
-#: Merge.rc:1815
+#: Merge.rc:1817
#, c-format
msgid "Backup filename:"
msgstr "Èìå ðåçåðâíå äàòîòåêå"
-#: Merge.rc:1816
+#: Merge.rc:1818
#, c-format
msgid "&Append .bak -extension"
msgstr "Äîä&༠.bak íàñòàâàê"
-#: Merge.rc:1818
+#: Merge.rc:1820
#, c-format
msgid "A&ppend timestamp"
msgstr "Äî&ä༠äàòóì/âðåìå"
-#: Merge.rc:1825
-#: Merge.rc:2360
+#: Merge.rc:1827
+#: Merge.rc:2362
#, c-format
msgid "Confirm Copy"
msgstr "Ïîòâðäè êîïèðà\9cå"
-#: Merge.rc:1829
+#: Merge.rc:1831
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå êîïèðàòè XXX ñòàâêè"
-#: Merge.rc:1831
+#: Merge.rc:1833
#, c-format
msgid "From left"
msgstr "Ñ ëåâà"
-#: Merge.rc:1834
+#: Merge.rc:1836
#, c-format
msgid "To right"
msgstr "Ó äåñíî"
-#: Merge.rc:1837
+#: Merge.rc:1839
#, c-format
msgid "Yes"
msgstr "Äà"
-#: Merge.rc:1838
+#: Merge.rc:1840
#, c-format
msgid "No"
msgstr "Íå"
-#: Merge.rc:1844
+#: Merge.rc:1846
#, c-format
msgid "Plugins"
msgstr "Äîäàöè"
-#: Merge.rc:1847
+#: Merge.rc:1849
#, c-format
msgid "&Enable plugins"
msgstr "Îìîãó\9eè äîäàòê&å"
-#: Merge.rc:1859
-#: Merge.rc:2074
+#: Merge.rc:1861
+#: Merge.rc:2076
#, c-format
msgid "Shell Integration"
msgstr "Èíòåãðèøè ó '\9aóñêó'"
-#: Merge.rc:1862
+#: Merge.rc:1864
#, c-format
msgid "Explorer"
msgstr "Èñòðàæèâà÷"
-#: Merge.rc:1863
+#: Merge.rc:1865
#, c-format
msgid "E&nable advanced menu"
msgstr "Îìîãó\9eè &íàïðåäíè èçáîð"
-#: Merge.rc:1865
+#: Merge.rc:1867
#, c-format
msgid "&Add to context menu"
msgstr "Äîä༠ó 'èçáîðíè îêâèð'"
-#: Merge.rc:1867
+#: Merge.rc:1869
#, c-format
msgid "&Register shell extension"
msgstr ""
-#: Merge.rc:1868
+#: Merge.rc:1870
#, c-format
msgid "&Unregister shell extension"
msgstr ""
-#: Merge.rc:1873
-#: Merge.rc:2077
-#: Merge.rc:2381
+#: Merge.rc:1875
+#: Merge.rc:2079
+#: Merge.rc:2383
#, c-format
msgid "Folder"
msgstr "Ôàñöèêëà"
-#: Merge.rc:1878
+#: Merge.rc:1880
#, c-format
msgid "S&top after first difference"
msgstr "Ñ&òàíè ïîñëå ïðâå ðàçëèêå"
-#: Merge.rc:1880
+#: Merge.rc:1882
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Çàíåìàðè ðàçëèêå âðåìåíà ìà\9cå &îä 3 ñåêóíäå"
-#: Merge.rc:1882
+#: Merge.rc:1884
#, c-format
msgid "&Include unique subfolders contents"
msgstr ""
-#: Merge.rc:1884
+#: Merge.rc:1886
#, c-format
msgid "&Automatically expand all subfolders"
msgstr ""
-#: Merge.rc:1886
+#: Merge.rc:1888
#, c-format
msgid "Ignore &Reparse Points"
msgstr ""
-#: Merge.rc:1888
+#: Merge.rc:1890
#, c-format
msgid "&Quick compare limit (MB):"
msgstr ""
-#: Merge.rc:1895
-#: Merge.rc:2079
-#: Merge.rc:2422
-#: Merge.rc:2628
+#: Merge.rc:1897
+#: Merge.rc:2081
+#: Merge.rc:2424
+#: Merge.rc:2630
#, c-format
msgid "Binary"
msgstr "Áèíàðíè"
-#: Merge.rc:1898
+#: Merge.rc:1900
#, c-format
msgid "Binary File &Patterns:"
msgstr ""
-#: Merge.rc:1900
+#: Merge.rc:1902
#, c-format
msgid "Frhed settings"
msgstr ""
-#: Merge.rc:1901
+#: Merge.rc:1903
#, c-format
msgid "View &Settings..."
msgstr ""
-#: Merge.rc:1902
+#: Merge.rc:1904
#, c-format
msgid "&Binary Mode..."
msgstr ""
-#: Merge.rc:1903
+#: Merge.rc:1905
#, c-format
msgid "&Character Set..."
msgstr ""
-#: Merge.rc:1909
-#: Merge.rc:2078
+#: Merge.rc:1911
+#: Merge.rc:2080
#, c-format
msgid "Image"
msgstr ""
-#: Merge.rc:1912
+#: Merge.rc:1914
#, c-format
msgid "Image File &Patterns:"
msgstr ""
-#: Merge.rc:1925
+#: Merge.rc:1927
#, c-format
msgid "&Hex View"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1950
+#: Merge.rc:1952
#, c-format
msgid "040904e4"
msgstr "041904e3"
#. VarFileInfo.Translation
-#: Merge.rc:1966
+#: Merge.rc:1968
#, c-format
msgid "0x409, 1252"
msgstr "0x419, 1251"
-#: Merge.rc:1986
+#: Merge.rc:1988
#, c-format
msgid "EXT"
msgstr "EXT"
-#: Merge.rc:1987
+#: Merge.rc:1989
#, c-format
msgid "CAP"
msgstr "CAP"
-#: Merge.rc:1988
+#: Merge.rc:1990
#, c-format
msgid "NUM"
msgstr "NUM"
-#: Merge.rc:1989
+#: Merge.rc:1991
#, c-format
msgid "SCRL"
msgstr "SCRL"
-#: Merge.rc:1990
+#: Merge.rc:1992
#, c-format
msgid "OVR"
msgstr "OVR"
-#: Merge.rc:1991
+#: Merge.rc:1993
#, c-format
msgid "REC"
msgstr "REC"
-#: Merge.rc:1997
+#: Merge.rc:1999
#, c-format
msgid "\nNew Documents (Ctrl+N)"
msgstr ""
-#: Merge.rc:1998
+#: Merge.rc:2000
#, c-format
msgid "\nOpen (Ctrl+O)"
msgstr ""
-#: Merge.rc:1999
+#: Merge.rc:2001
#, c-format
msgid "\nSave (Ctrl+S)"
msgstr ""
-#: Merge.rc:2005
+#: Merge.rc:2007
#, c-format
msgid "Unknown error attempting to open project file"
msgstr "Íåïîçíàòà ãðåøêà ïðè îòâàðà\9có ïîðå\90å\9cà"
-#: Merge.rc:2006
+#: Merge.rc:2008
#, c-format
msgid "Unknown error attempting to save project file"
msgstr "Íåïîçíàòà ãðåøêà ïðè ïîêóøà¼ó ÷óâà\9cà ïîðå\90å\9cà"
-#: Merge.rc:2007
+#: Merge.rc:2009
#, c-format
msgid "Project File"
msgstr "Ïîðå\90å\9cå"
-#: Merge.rc:2008
+#: Merge.rc:2010
#, c-format
msgid "Project file successfully loaded."
msgstr "Ïîðå\90å\9cå ¼å óñïåøíî ó÷èòàíî"
-#: Merge.rc:2009
+#: Merge.rc:2011
#, c-format
msgid "Project file successfully saved."
msgstr "Ïîðå\90å\9cå ¼å óñïåøíî ñà÷óâàíî"
-#: Merge.rc:2015
+#: Merge.rc:2017
#, c-format
msgid "\nUndo (Ctrl+Z)"
msgstr ""
-#: Merge.rc:2016
+#: Merge.rc:2018
#, c-format
msgid "\nRedo (Ctrl+Y)"
msgstr ""
-#: Merge.rc:2023
+#: Merge.rc:2025
#, c-format
msgid ""
"\n"
"WinMerge.Óïîðåäè äàòîòåêó\n"
"WinMerge óïîðåäè äàòîòåêó"
-#: Merge.rc:2024
+#: Merge.rc:2026
#, c-format
msgid ""
"\n"
"WinMerge.Óïîðåäè ôàñöèêëó\n"
"WinMerge óïîðåäè ôàñöèêëó"
-#: Merge.rc:2030
+#: Merge.rc:2032
#, c-format
msgid ""
"Developers:\n"
"Ïðîãðàìåðè:\n"
"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-#: Merge.rc:2031
+#: Merge.rc:2033
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr "WinMerge ¼å ïðîãðàì ÁÅÇ ÃÀÐÀÍÖÈ£Å.Îâî ¼å áåñïëàòàí ïðîãðàì êî¼è ìîæåòå äà\9aå äåëèòè ïðåìà GNU ¼àâíî¼ ëèöåíöè êî¼ó ïîãëåäà¼òå ó äàòîòåöè /Ïîìî\9e/"
-#: Merge.rc:2039
+#: Merge.rc:2041
#, c-format
msgid "&Abort"
msgstr "&Ïðåêèíè"
-#: Merge.rc:2040
+#: Merge.rc:2042
#, c-format
msgid "&Retry"
msgstr "Ï&îíîâè"
-#: Merge.rc:2041
+#: Merge.rc:2043
#, c-format
msgid "&Ignore"
msgstr "Çàíåìàð&è"
-#: Merge.rc:2042
+#: Merge.rc:2044
#, c-format
msgid "Ignore &all"
msgstr "Ç&àíåìàðè ñâå"
-#: Merge.rc:2043
+#: Merge.rc:2045
#, c-format
msgid "&Yes"
msgstr "&Äà"
-#: Merge.rc:2049
+#: Merge.rc:2051
#, c-format
msgid "Yes to &all"
msgstr "Ä&à çà ñâå"
-#: Merge.rc:2050
+#: Merge.rc:2052
#, c-format
msgid "&No"
msgstr "&Íå"
-#: Merge.rc:2051
+#: Merge.rc:2053
#, c-format
msgid "No to a&ll"
msgstr "Íå çà ñ&âå"
-#: Merge.rc:2052
+#: Merge.rc:2054
#, c-format
msgid "&Continue"
msgstr "Íàñòà&âè"
-#: Merge.rc:2053
+#: Merge.rc:2055
#, c-format
msgid "&Skip"
msgstr "Èçî&ñòàâè"
-#: Merge.rc:2054
+#: Merge.rc:2056
#, c-format
msgid "Skip &all"
msgstr "Èçîñò&àâè ñâå"
-#: Merge.rc:2056
+#: Merge.rc:2058
#, c-format
msgid "Don't display this &message again."
msgstr "Íå ïðèêàçó¼ îâó ïîðóêó ïîíîâî"
-#: Merge.rc:2057
+#: Merge.rc:2059
#, c-format
msgid "Don't ask this &question again."
msgstr "Íå ïèò༠ïîíîâî"
-#: Merge.rc:2068
+#: Merge.rc:2070
#, c-format
msgid "Syntax"
msgstr ""
-#: Merge.rc:2070
+#: Merge.rc:2072
#, c-format
msgid "Version Control"
msgstr "Ïðîãðàìè"
-#: Merge.rc:2075
-#: Merge.rc:2421
+#: Merge.rc:2077
+#: Merge.rc:2423
#, c-format
msgid "Differences"
msgstr "Ðàçëèêå"
-#: Merge.rc:2086
+#: Merge.rc:2088
#, c-format
msgid "To:"
msgstr "Äî:"
-#: Merge.rc:2087
+#: Merge.rc:2089
#, c-format
msgid "From left:"
msgstr "Ñ ëåâà:"
-#: Merge.rc:2088
+#: Merge.rc:2090
#, c-format
msgid "To left:"
msgstr "Ó ëåâî:"
-#: Merge.rc:2089
+#: Merge.rc:2091
#, c-format
msgid "From right:"
msgstr "Ñ äåñíà:"
-#: Merge.rc:2090
+#: Merge.rc:2092
#, c-format
msgid "To right:"
msgstr "Ó äåñíî:"
-#: Merge.rc:2096
+#: Merge.rc:2098
#, c-format
msgid "Version %1"
msgstr "Èçäà\9cå %1"
-#: Merge.rc:2097
+#: Merge.rc:2099
#, c-format
msgid "Unicode"
msgstr "Óíèêîä"
-#: Merge.rc:2098
+#: Merge.rc:2100
#, c-format
msgid "X64"
msgstr "X64"
-#: Merge.rc:2104
+#: Merge.rc:2106
#, c-format
msgid "Options (%1)"
msgstr "Ïîñòàâêå (%1)"
-#: Merge.rc:2105
+#: Merge.rc:2107
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Ïîíîâè ïðèêàç ñâèõ ïîðóêà"
-#: Merge.rc:2107
+#: Merge.rc:2109
#, c-format
msgid ""
"Value in Tab size -field is not in range WinMerge accepts.\n"
"\n"
"Ìîëèìî êîðèñòèòå âðåäíîñòè 1 - %1"
-#: Merge.rc:2113
+#: Merge.rc:2115
#, c-format
msgid "Open"
msgstr "Îòâîðè"
-#: Merge.rc:2114
+#: Merge.rc:2116
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Ïðîãðàìè |*.exe;*.bat;*.cmd|Ñâå äàòîòåêå (*.*)|*.*||"
-#: Merge.rc:2115
+#: Merge.rc:2117
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Ñâå äàòîòåêå(*.*)|*.*||"
-#: Merge.rc:2116
+#: Merge.rc:2118
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge äàòîòåêå (*.WinMerge)|*.WinMerge||"
-#: Merge.rc:2118
+#: Merge.rc:2120
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Ïîñòàâêå äàòîòåêà (*.ini)|*.ini|All Files (*.*)|*.*||"
-#: Merge.rc:2124
+#: Merge.rc:2126
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Òåêñò äàòîòåêå (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Ñâå äàòîòåêå (*.*)|*.*||"
-#: Merge.rc:2125
+#: Merge.rc:2127
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML äàòîòåêå (*.htm,*.html)|*.htm;*.html|Ñâå äàòîòåêå (*.*)|*.*||"
-#: Merge.rc:2126
+#: Merge.rc:2128
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML äàòîòåêå (*.xml)|*.xml|Ñâå äàòîòåêå (*.*)|*.*||"
-#: Merge.rc:2143
-#: Merge.rc:2637
+#: Merge.rc:2145
+#: Merge.rc:2639
#, c-format
msgid "Name"
msgstr "Èìå"
-#: Merge.rc:2144
+#: Merge.rc:2146
#, c-format
msgid "Location"
msgstr "Ïîëîæà¼"
-#: Merge.rc:2145
+#: Merge.rc:2147
#, c-format
msgid "Filters"
msgstr "Ôèëòåðè"
-#: Merge.rc:2146
+#: Merge.rc:2148
#, c-format
msgid "[F] "
msgstr "[F]"
-#: Merge.rc:2147
-#: Merge.rc:2639
+#: Merge.rc:2149
+#: Merge.rc:2641
#, c-format
msgid "Description"
msgstr "Îïèñ"
-#: Merge.rc:2148
+#: Merge.rc:2150
#, c-format
msgid "Select filename for new filter"
msgstr "Èçàáåðè äàòîòåêó çà íîâè ôèëòåð"
-#: Merge.rc:2149
+#: Merge.rc:2151
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Äàòîòåêà ôèëòåðà (*.flt)|*.flt|All Files (*.*)|*.*||"
-#: Merge.rc:2151
+#: Merge.rc:2153
#, c-format
msgid ""
"Cannot find file filter template file!\n"
"Ìîëèì óìíîæèòå äàòîòåêó %1 ó WinMerge/Ôèëòåð -ôàñöèêëó:\n"
"%2."
-#: Merge.rc:2153
+#: Merge.rc:2155
#, c-format
msgid ""
"Cannot copy filter template file to filter folder:\n"
"\n"
"Ìîëèì, ïðîâåðèòå äà ëè ïîñòî¼è ôàñöèêëà è \9cåíó äîñòóïíîñò"
-#: Merge.rc:2155
+#: Merge.rc:2157
#, c-format
msgid ""
"User's filter file folder is not defined!\n"
"\n"
"Ìîëèì, èçàáåðèòå ôàñöèêëó ôèëòåðà ó /Ïîñòàâêå/Ñèñòåì/"
-#: Merge.rc:2157
+#: Merge.rc:2159
#, c-format
msgid ""
"Failed to delete the filter file:\n"
"\n"
"Ìîæäà ¼å äàòîòåêà ñàìî çà ÷èòà\9cå?"
-#: Merge.rc:2158
+#: Merge.rc:2160
#, c-format
msgid "Locate filter file to install"
msgstr "Ïðîíà\90è ôàñöèêëó ôèëòåðà çà èíñòàëàöè¼ó"
-#: Merge.rc:2160
+#: Merge.rc:2162
#, c-format
msgid ""
"Installing filter file failed.\n"
"\n"
"Íå ìîãó óìíîæèòè íîâè ôèëòåð ó ôàñöèêëè ôèëòåðà"
-#: Merge.rc:2162
+#: Merge.rc:2164
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr "Ôèëòåð âå\9e ïîñòî¼è.Çàìåíè ïîñòî¼å\9eè ôèëòåð"
-#: Merge.rc:2168
+#: Merge.rc:2170
#, c-format
msgid "Regular expression"
msgstr "Ïðàâèëàí èçðàç"
-#: Merge.rc:2174
+#: Merge.rc:2176
#, c-format
msgid ""
"Filters were updated. Do you want to refresh all open folder compares?\n"
"\n"
"Àêî èçàáåðåòå /Íå/ òî ìîæåòå è êàñíè¼å óðàäèòè"
-#: Merge.rc:2181
+#: Merge.rc:2183
#, c-format
msgid "&Path to SS.EXE:"
msgstr "&Ïóòà\9cà äî SS.EXE:"
-#: Merge.rc:2187
+#: Merge.rc:2189
#, c-format
msgid "Folder Comparison Results"
msgstr "Èñõîäè ïîðå\90å\9cà ôàñöèêëè"
-#: Merge.rc:2188
+#: Merge.rc:2190
#, c-format
msgid "File Comparison"
msgstr "Óïîðåäè äàòîòåêå"
-#: Merge.rc:2189
+#: Merge.rc:2191
#, c-format
msgid "Untitled left"
msgstr "Íåèìåíîâàíà ëåâà"
-#: Merge.rc:2190
+#: Merge.rc:2192
#, c-format
msgid "Untitled middle"
msgstr ""
-#: Merge.rc:2191
+#: Merge.rc:2193
#, c-format
msgid "Untitled right"
msgstr "Íåèìåíîâàíà äåñíà"
-#: Merge.rc:2192
+#: Merge.rc:2194
#, c-format
msgid "Theirs File"
msgstr "\8cèõîâå äàòîòåêå"
-#: Merge.rc:2193
+#: Merge.rc:2195
#, c-format
msgid "Mine File"
msgstr "Ìî¼å äàòîòåêå"
-#: Merge.rc:2199
+#: Merge.rc:2201
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)"
msgstr ""
-#: Merge.rc:2200
+#: Merge.rc:2202
#, c-format
msgid "Line: %s"
msgstr "Ðåä: %s"
-#: Merge.rc:2201
+#: Merge.rc:2203
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)"
msgstr ""
-#: Merge.rc:2202
+#: Merge.rc:2204
#, c-format
msgid "Merge"
msgstr "Óïîðåäè"
-#: Merge.rc:2203
+#: Merge.rc:2205
#, c-format
msgid "Difference %1 of %2"
msgstr "Ðàçëèêå %1 îä %2"
-#: Merge.rc:2204
+#: Merge.rc:2206
#, c-format
msgid "%1 Differences Found"
msgstr "Íà\90åíî ðàçëèêà %1"
-#: Merge.rc:2205
+#: Merge.rc:2207
#, c-format
msgid "1 Difference Found"
msgstr "Íà\90åíî ðàçëèêà 1"
#. Abbreviation from "Read Only"
-#: Merge.rc:2206
+#: Merge.rc:2208
#, c-format
msgid "RO"
msgstr "RO"
-#: Merge.rc:2212
+#: Merge.rc:2214
#, c-format
msgid "Item %1 of %2"
msgstr "Ñòàâêå %1 îä %2"
-#: Merge.rc:2213
+#: Merge.rc:2215
#, c-format
msgid "Items: %1"
msgstr "Ñòàâêå: %1"
-#: Merge.rc:2219
+#: Merge.rc:2221
#, c-format
msgid "Select two existing folders or files to compare"
msgstr "Îäàáåðè äâå ïîñòî¼å\9eå äàòîòåêå èëè ôàñöèêëå çà ïîðå\90å\9cå"
-#: Merge.rc:2220
+#: Merge.rc:2222
#, c-format
msgid "Folder Selection"
msgstr "Èçàáåðè ôàñöèêëó"
-#: Merge.rc:2221
+#: Merge.rc:2223
#, c-format
msgid "Select two folders or two files to compare."
msgstr "Îäàáåðè äâå ôàñöèêëå èëè äàòîòåêå çà ïîðå\90å\9cå"
-#: Merge.rc:2222
+#: Merge.rc:2224
#, c-format
msgid "Left path is invalid!"
msgstr "Ëåâà ïóòà\9cà ¼å íåâàæå\9eà!"
-#: Merge.rc:2223
+#: Merge.rc:2225
#, c-format
msgid "Middle path is invalid!"
msgstr ""
-#: Merge.rc:2224
+#: Merge.rc:2226
#, c-format
msgid "Right path is invalid!"
msgstr "Äåñíà ïóòà\9cà ¼å íåâàæå\9eà!"
-#: Merge.rc:2225
+#: Merge.rc:2227
#, c-format
msgid "Both paths are invalid!"
msgstr "Îáå ïóòà\9cå ñó íåâàæå\9eå!"
-#: Merge.rc:2226
+#: Merge.rc:2228
#, c-format
msgid "Left and middle path is invalid!"
msgstr ""
-#: Merge.rc:2227
+#: Merge.rc:2229
#, c-format
msgid "Left and right path is invalid!"
msgstr ""
-#: Merge.rc:2228
+#: Merge.rc:2230
#, c-format
msgid "Middle and right path is invalid!"
msgstr ""
-#: Merge.rc:2229
+#: Merge.rc:2231
#, c-format
msgid "All paths are invalid!"
msgstr ""
-#: Merge.rc:2230
+#: Merge.rc:2232
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr "Îäàáåðèòå äâå äàòîòåêå êî¼å ïðèõâàòà àðõèâåð"
-#: Merge.rc:2231
+#: Merge.rc:2233
#, c-format
msgid "Cannot compare file and folder!"
msgstr "Íå ìîãó óïîðåäèòè äàòîòåêó è ôàñöèêëó!"
-#: Merge.rc:2237
+#: Merge.rc:2239
#, c-format
msgid "File not found: %1"
msgstr "Äàòîòåêà íè¼å ïðîíà\90åíà"
-#: Merge.rc:2238
+#: Merge.rc:2240
#, c-format
msgid "File not unpacked: %1"
msgstr "Äàòîòåêà íè¼å ðàñïàêîâàíà: %1"
-#: Merge.rc:2239
+#: Merge.rc:2241
#, c-format
msgid ""
"Cannot open file\n"
"\n"
"%2"
-#: Merge.rc:2240
+#: Merge.rc:2242
#, c-format
msgid "Failed to parse conflict file."
msgstr "Íå ìîãó ðàø÷ëàíèòè ïðîáëåìàòè÷íó äàòîòåêó"
-#: Merge.rc:2241
+#: Merge.rc:2243
#, c-format
msgid ""
"The file\n"
"%1\n"
"íè¼å ïðîáëåìàòè÷íà"
-#: Merge.rc:2247
+#: Merge.rc:2249
#, c-format
msgid "Save As"
msgstr "Ñà÷óâ༠êàî"
-#: Merge.rc:2248
+#: Merge.rc:2250
#, c-format
msgid "Save changes to %1?"
msgstr "Ñà÷óâ༠èçìåíå %1? "
-#: Merge.rc:2249
+#: Merge.rc:2251
#, 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 ¼å îçíà÷åíà ñàìî çà ÷èòà\9cå.Æåëèòå ëè äà ¼å ïîíèøòèòå?(Íå, ñà÷óâàíà ¼å ïîä íîâèì èìåíîì)"
-#: Merge.rc:2250
+#: Merge.rc:2252
#, c-format
msgid "Error backing up file"
msgstr "Ãðåøêà ïðè ïðàâ\9aå\9có ðåçåðâíå äàòîòåêå"
-#: Merge.rc:2252
+#: Merge.rc:2254
#, c-format
msgid ""
"Unable to backup original file:\n"
"\n"
"Íàñòàâèòe?"
-#: Merge.rc:2253
+#: Merge.rc:2255
#, c-format
msgid ""
"Saving file failed.\n"
"\t-je çàïàìòèòå ïîä äðóãèì èìåíîì, ïðèòèñíèòå /Ó ðåäó/\n"
"\t- èëè ïðèòèñíèòå /Èçà\90è/çà ïðåêèä ïîñòóïêà?"
-#: Merge.rc:2254
+#: Merge.rc:2256
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
"\n"
"Äà ëè æåëèòå äà ñà÷óâàòå íåðàñïàêîâàíî èçäà\9cå êàî äàòîòåêó?"
-#: Merge.rc:2255
+#: Merge.rc:2257
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
"\n"
"Äà ëè æåëèòå äà ñà÷óâàòå íåðàñïàêîâàíî èçäà\9cå êàî äàòîòåêó?"
-#: Merge.rc:2256
+#: Merge.rc:2258
#, c-format
msgid ""
"Another application has updated file\n"
"\n"
"Çàìåíèòå èçìå\9cåíó äàòîòåêó?"
-#: Merge.rc:2257
+#: Merge.rc:2259
#, c-format
msgid ""
"%1\n"
"%1\n"
"¼å îçíà÷åíà ñàìî çà ÷èòà\9cå.Æåëèòå ëè äà ¼å çàìåíèòå?"
-#: Merge.rc:2258
+#: Merge.rc:2260
#, c-format
msgid ""
"Another application has updated file\n"
"%1\n"
"îä çàä\9cåã ïðåãëåäà WinMerge-à.Æåëèòå ëè ïîíîâî ó÷èòàòè äàòîòåêó?"
-#: Merge.rc:2259
+#: Merge.rc:2261
#, c-format
msgid "Save Left File As"
msgstr "Ñà÷óâ༠ëåâó äàòîòåêó êàî"
-#: Merge.rc:2260
+#: Merge.rc:2262
#, c-format
msgid "Save Middle File As"
msgstr ""
-#: Merge.rc:2261
+#: Merge.rc:2263
#, c-format
msgid "Save Right File As"
msgstr "Ñà÷óâ༠äåñíó äàòîòåêó êàî"
-#: Merge.rc:2262
+#: Merge.rc:2264
#, c-format
msgid ""
"The file\n"
"%1\n"
"¼å íåñòàëà.Ìîëèìî Âàñ äà ñà÷óâàòå óìíîæåíó äàòîòåêó äà áèñòå íàñòàâèëè"
-#: Merge.rc:2268
+#: Merge.rc:2270
#, c-format
msgid ""
"Cannot merge differences when documents are not in synch.\n"
"\n"
"Îñâåæè äîêóìåíòå ïðå íàñòàâêà"
-#: Merge.rc:2274
+#: Merge.rc:2276
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr "Ìîðàòå îäðåäèòè ñèãóðíó èçâîðíó ïóòà\9có àêî æåëèòå íàñòàâèòè (ie: $/MyProject)"
-#: Merge.rc:2275
+#: Merge.rc:2277
#, c-format
msgid "Checkout files from VSS..."
msgstr "Ïîâåðà äàòîòåêà íà VSS..."
-#: Merge.rc:2276
+#: Merge.rc:2278
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr "Ñèñòåì ¼å ïîêàçàî ãðåøêó äîê ¼å ïîêóøàâàî äà ïðîâåðè äàòîòåêó.Íå ìîæå äà íàñòàâè..."
-#: Merge.rc:2277
+#: Merge.rc:2279
#, c-format
msgid "Error executing versioning system command."
msgstr "Ãðåøêà ïðè èçâðøå\9có ñèñòåìñêå íàðåäáå"
-#: Merge.rc:2278
+#: Merge.rc:2280
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr "VSS ðàäíà ôàñöèêëa è ïîëîæ༠òðåíóòå äàòîòåêå ñå íå ïîêëàïà¼ó.Íàñòàâèòå?"
-#: Merge.rc:2279
+#: Merge.rc:2281
#, c-format
msgid "No VSS database(s) found!"
msgstr "Íåìà VSS áàçå ïîäàòàêà"
-#: Merge.rc:2280
+#: Merge.rc:2282
#, c-format
msgid "Error from VSS:"
msgstr "Ãðåøêà èç VSS"
-#: Merge.rc:2281
+#: Merge.rc:2283
#, c-format
msgid ""
"Versioning System returned an error while attempting to check in the file.\n"
"Ìîëèìî, ïîãëåäà¼òå ïîäåøåíîñò êîðèñíè÷êîã èçãëåäà.\n"
"Îïîçîâè ïðîâåðó?"
-#: Merge.rc:2282
+#: Merge.rc:2284
#, c-format
msgid ""
"Versioning System returned an error while attempting to undo checkout the file.\n"
"Ñèñòåì ïðèêàçó¼å ãðåøêó äîê ïîêóøàâà äà îïîçîâå ïðîâåðó äàòîòåêå.\n"
"Ìîëèìî, ïîãëåäà¼òå ïîäåøåíîñò êîðèñíè÷êîã èçãëåäà"
-#: Merge.rc:2288
-#: Merge.rc:2632
+#: Merge.rc:2290
+#: Merge.rc:2634
#, c-format
msgid "None"
msgstr "Íèøòà"
-#: Merge.rc:2289
+#: Merge.rc:2291
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr "Visual SourceSafe (ìà\9cè îä 5.0)"
-#: Merge.rc:2290
+#: Merge.rc:2292
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr "Visual SourceSafe (5.0 è âèøè)"
-#: Merge.rc:2292
+#: Merge.rc:2294
#, c-format
msgid "Break at whitespace"
msgstr "Ñòàíè íà ðàçìàêó"
-#: Merge.rc:2293
+#: Merge.rc:2295
#, c-format
msgid "Break at whitespace or punctuation"
msgstr "Ñòàíè íà ðàçìàêó èëè èíòåðïóêöè¼è"
-#: Merge.rc:2299
+#: Merge.rc:2301
#, c-format
msgid "Right to Left (%1)"
msgstr "Äåñíà ó ëåâî (%1)"
-#: Merge.rc:2300
+#: Merge.rc:2302
#, c-format
msgid "Right to Middle (%1)"
msgstr ""
-#: Merge.rc:2301
+#: Merge.rc:2303
#, c-format
msgid "Middle to Left (%1)"
msgstr ""
-#: Merge.rc:2302
+#: Merge.rc:2304
#, c-format
msgid "Middle to Right (%1)"
msgstr ""
-#: Merge.rc:2303
+#: Merge.rc:2305
#, c-format
msgid "Left to Right (%1)"
msgstr "Ëåâà ó äåñíî (%1)"
-#: Merge.rc:2304
+#: Merge.rc:2306
#, c-format
msgid "Left to Middle (%1)"
msgstr ""
-#: Merge.rc:2311
-#: Merge.rc:2338
+#: Merge.rc:2313
+#: Merge.rc:2340
#, c-format
msgid "Left to... (%1)"
msgstr "Ëåâà ó... (%1)"
-#: Merge.rc:2312
-#: Merge.rc:2339
+#: Merge.rc:2314
+#: Merge.rc:2341
#, c-format
msgid "Middle to... (%1)"
msgstr ""
-#: Merge.rc:2313
-#: Merge.rc:2340
+#: Merge.rc:2315
+#: Merge.rc:2342
#, c-format
msgid "Right to... (%1)"
msgstr "Äåñíà ó... (%1)"
-#: Merge.rc:2314
+#: Merge.rc:2316
#, c-format
msgid "Both to... (%1)"
msgstr ""
-#: Merge.rc:2315
+#: Merge.rc:2317
#, c-format
msgid "All to... (%1)"
msgstr ""
-#: Merge.rc:2316
+#: Merge.rc:2318
#, c-format
msgid "Differences to... (%1)"
msgstr ""
-#: Merge.rc:2328
+#: Merge.rc:2330
#, c-format
msgid "Left (%1)"
msgstr "Ëåâà (%1)"
-#: Merge.rc:2329
+#: Merge.rc:2331
#, c-format
msgid "Middle (%1)"
msgstr ""
-#: Merge.rc:2330
+#: Merge.rc:2332
#, c-format
msgid "Right (%1)"
msgstr "Äåñíà (%1)"
-#: Merge.rc:2331
+#: Merge.rc:2333
#, c-format
msgid "Both (%1)"
msgstr "Îáå (%1)"
-#: Merge.rc:2332
+#: Merge.rc:2334
#, c-format
msgid "All (%1)"
msgstr ""
-#: Merge.rc:2344
+#: Merge.rc:2346
#, c-format
msgid "Left side - select destination folder:"
msgstr "Ëåâà ñòðàíà - îäàáåðè ôàñöèêëó îäðåäèøòà:"
-#: Merge.rc:2345
+#: Merge.rc:2347
#, c-format
msgid "Middle side - select destination folder:"
msgstr ""
-#: Merge.rc:2346
+#: Merge.rc:2348
#, c-format
msgid "Right side - select destination folder:"
msgstr "Äåñíà ñòðàíà - îäàáåðè ôàñöèêëó îäðåäèøòà:"
-#: Merge.rc:2347
+#: Merge.rc:2349
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 óñìåðåíèõ äàòîòåêà)"
-#: Merge.rc:2348
+#: Merge.rc:2350
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 îä %2 óñìåðåíèõ äàòîòåêà)"
-#: Merge.rc:2354
+#: Merge.rc:2356
#, c-format
msgid ""
"Are you sure you want to delete\n"
"\n"
"%1 ?"
-#: Merge.rc:2355
+#: Merge.rc:2357
#, c-format
msgid "Are you sure you want to copy:"
msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà óìíîæèòå:"
-#: Merge.rc:2356
+#: Merge.rc:2358
#, c-format
msgid "Are you sure you want to copy %d items:"
msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà óìíîæèòå %d ñòàâêè:"
-#: Merge.rc:2357
+#: Merge.rc:2359
#, c-format
msgid ""
"Operation aborted!\n"
"\n"
"Ìîëèì, îñâåæèòå ïîðå\90å\9cå."
-#: Merge.rc:2358
+#: Merge.rc:2360
#, c-format
msgid "Are you sure you want to move:"
msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà ¼å ïðåìåñòèòå:"
-#: Merge.rc:2359
+#: Merge.rc:2361
#, c-format
msgid "Are you sure you want to move %d items:"
msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà ïðåìåñòèòå %d ñòàâêè:"
-#: Merge.rc:2361
+#: Merge.rc:2363
#, c-format
msgid "Confirm Move"
msgstr "Ïîòâðäè ïðåìåøòà¼"
-#: Merge.rc:2362
+#: Merge.rc:2364
#, c-format
msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
msgstr ""
-#: Merge.rc:2368
+#: Merge.rc:2370
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Íè¼å óñïåëî ïîêðåòà\9cå äðóãîã óðå\90èâà÷à: %1"
-#: Merge.rc:2374
+#: Merge.rc:2376
#, c-format
msgid "Unknown archive format"
msgstr "Íåïîçíàò îáëèê àðõèâå"
-#: Merge.rc:2380
+#: Merge.rc:2382
#, c-format
msgid "Filename"
msgstr "Èìå äàòîòåêå"
-#: Merge.rc:2382
+#: Merge.rc:2384
#, c-format
msgid "Comparison result"
msgstr "Ðåçóëòàò ïîðå\90å\9cà"
-#: Merge.rc:2383
+#: Merge.rc:2385
#, c-format
msgid "Left Date"
msgstr "Äàòóì ëåâî"
-#: Merge.rc:2384
+#: Merge.rc:2386
#, c-format
msgid "Right Date"
msgstr "Äàòóì äåñíî"
-#: Merge.rc:2385
+#: Merge.rc:2387
#, c-format
msgid "Middle Date"
msgstr ""
-#: Merge.rc:2386
+#: Merge.rc:2388
#, c-format
msgid "Extension"
msgstr "Íàñòàâàê"
-#: Merge.rc:2387
+#: Merge.rc:2389
#, c-format
msgid "Left Size"
msgstr "Âåëè÷èíà ëåâî"
-#: Merge.rc:2388
+#: Merge.rc:2390
#, c-format
msgid "Right Size"
msgstr "Âåëè÷èíà äåñíî"
-#: Merge.rc:2389
+#: Merge.rc:2391
#, c-format
msgid "Middle Size"
msgstr ""
-#: Merge.rc:2390
+#: Merge.rc:2392
#, c-format
msgid "Right Size (Short)"
msgstr "Âåëè÷èíà äåñíî (ñêðà\9eåíî)"
-#: Merge.rc:2391
+#: Merge.rc:2393
#, c-format
msgid "Left Size (Short)"
msgstr "Âåëè÷èíà ëåâî (ñêðà\9eåíî)"
-#: Merge.rc:2392
+#: Merge.rc:2394
#, c-format
msgid "Middle Size (Short)"
msgstr ""
-#: Merge.rc:2398
+#: Merge.rc:2400
#, c-format
msgid "Left Creation Time"
msgstr "Âðåìå ñòâàðà\9cà ëåâå"
-#: Merge.rc:2399
+#: Merge.rc:2401
#, c-format
msgid "Right Creation Time"
msgstr "Âðåìå ñòâàðà\9cà äåñíå"
-#: Merge.rc:2400
+#: Merge.rc:2402
#, c-format
msgid "Middle Creation Time"
msgstr ""
-#: Merge.rc:2401
+#: Merge.rc:2403
#, c-format
msgid "Newer File"
msgstr "Íîâè¼à äàòîòåêà"
-#: Merge.rc:2402
+#: Merge.rc:2404
#, c-format
msgid "Left File Version"
msgstr "Èçäà\9cå ëåâå äàòîòåêå"
-#: Merge.rc:2403
+#: Merge.rc:2405
#, c-format
msgid "Right File Version"
msgstr "Èçäà\9cå äåñíå äàòîòåêå"
-#: Merge.rc:2404
+#: Merge.rc:2406
#, c-format
msgid "Middle File Version"
msgstr ""
-#: Merge.rc:2405
+#: Merge.rc:2407
#, c-format
msgid "Short Result"
msgstr "Ñêðà\9eåíè èñõîä"
-#: Merge.rc:2406
+#: Merge.rc:2408
#, c-format
msgid "Left Attributes"
msgstr "Îñîáèíå ëåâå"
-#: Merge.rc:2407
+#: Merge.rc:2409
#, c-format
msgid "Right Attributes"
msgstr "Îñîáèíå äåñíå"
-#: Merge.rc:2408
+#: Merge.rc:2410
#, c-format
msgid "Middle Attributes"
msgstr ""
-#: Merge.rc:2409
+#: Merge.rc:2411
#, c-format
msgid "Left EOL"
msgstr "Çàâðøåòàê ðåäà ëåâå äàòîòåêå"
-#: Merge.rc:2410
+#: Merge.rc:2412
#, c-format
msgid "Middle EOL"
msgstr ""
-#: Merge.rc:2411
+#: Merge.rc:2413
#, c-format
msgid "Right EOL"
msgstr "Çàâðøåòàê ðåäà äåñíå äàòîòåêå"
-#: Merge.rc:2417
+#: Merge.rc:2419
#, c-format
msgid "Left Encoding"
msgstr "Êîäèðà\9cå ëåâå"
-#: Merge.rc:2418
+#: Merge.rc:2420
#, c-format
msgid "Right Encoding"
msgstr "Êîäèðà\9cå äåñíå"
-#: Merge.rc:2419
+#: Merge.rc:2421
#, c-format
msgid "Middle Encoding"
msgstr ""
-#: Merge.rc:2420
+#: Merge.rc:2422
#, c-format
msgid "Ignored Diff."
msgstr "Çàíåìàðè ðàçëèêå"
-#: Merge.rc:2428
+#: Merge.rc:2430
#, c-format
msgid "Unable to compare files"
msgstr "Íå ìîãó óïîðåäèòè äàòîòåêå"
-#: Merge.rc:2429
+#: Merge.rc:2431
#, c-format
msgid "Item aborted"
msgstr "Îäáà÷åíà ñòàâêà"
-#: Merge.rc:2430
+#: Merge.rc:2432
#, c-format
msgid "File skipped"
msgstr "Èçîñòàâ\9aåíà äàòîòåêà"
-#: Merge.rc:2431
+#: Merge.rc:2433
#, c-format
msgid "Folder skipped"
msgstr "Èçîñòàâ\9aåíà ôàñöèêëà"
-#: Merge.rc:2432
+#: Merge.rc:2434
#, c-format
msgid "Left only: %1"
msgstr "Ñàìî ëåâà: %1"
-#: Merge.rc:2433
+#: Merge.rc:2435
#, c-format
msgid "Middle only: %1"
msgstr ""
-#: Merge.rc:2434
+#: Merge.rc:2436
#, c-format
msgid "Right only: %1"
msgstr "Ñàìî äåñíà: %"
-#: Merge.rc:2435
+#: Merge.rc:2437
#, c-format
msgid "Does not exist in %1"
msgstr ""
-#: Merge.rc:2436
+#: Merge.rc:2438
#, c-format
msgid "Binary files are identical"
msgstr "Áèíàðíå äàòîòåêå ñó èñòå"
-#: Merge.rc:2438
+#: Merge.rc:2440
#, c-format
msgid "Binary files are different"
msgstr "Áèíàðíå äàòîòåêå ñó ðàçëè÷èòå"
-#: Merge.rc:2439
+#: Merge.rc:2441
#, c-format
msgid "Files are different"
msgstr "Äàòîòåêå ñó ðàçëè÷èòå"
-#: Merge.rc:2440
+#: Merge.rc:2442
#, c-format
msgid "Folders are different"
msgstr "Ôàñöèêëå ñó ðàçëè÷èòå"
-#: Merge.rc:2441
+#: Merge.rc:2443
#, c-format
msgid "Left Only"
msgstr "Ñàìî ëåâà"
-#: Merge.rc:2442
+#: Merge.rc:2444
#, c-format
msgid "Right Only"
msgstr "Ñàìî äåñíà"
-#: Merge.rc:2443
+#: Merge.rc:2445
#, c-format
msgid "Middle Only"
msgstr ""
-#: Merge.rc:2444
+#: Merge.rc:2446
#, c-format
msgid "No item in left"
msgstr ""
-#: Merge.rc:2445
+#: Merge.rc:2447
#, c-format
msgid "No item in right"
msgstr ""
-#: Merge.rc:2446
+#: Merge.rc:2448
#, c-format
msgid "No item in middle"
msgstr ""
-#: Merge.rc:2448
+#: Merge.rc:2450
#, c-format
msgid "Error"
msgstr "Ãðåøêà"
-#: Merge.rc:2449
+#: Merge.rc:2451
#, c-format
msgid "Text files are identical"
msgstr "Òåêñòîâè äàòîòåêà ñó èñòè"
-#: Merge.rc:2454
+#: Merge.rc:2456
#, c-format
msgid "Text files are different"
msgstr "Òåêñòîâè äàòîòåêà ñó ðàçëè÷èòè"
-#: Merge.rc:2460
+#: Merge.rc:2462
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Ïðîòåêëî âðåìå: %ld ms"
-#: Merge.rc:2461
+#: Merge.rc:2463
#, c-format
msgid "1 item selected"
msgstr "1 ñòàâêà ¼å îäàáðàíà"
-#: Merge.rc:2462
+#: Merge.rc:2464
#, c-format
msgid "%1 items selected"
msgstr "%1 ñòàâêà ¼å îäàáðàíà"
-#: Merge.rc:2468
+#: Merge.rc:2470
#, c-format
msgid "Filename or folder name."
msgstr "Èìå äàòîòåêå èëè ôàñöèêëå"
-#: Merge.rc:2469
+#: Merge.rc:2471
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr "Èìå ïîòôàñöèêëå êàä ñó ïîòôàñöèêëå óê\9aó÷åíå"
-#: Merge.rc:2470
+#: Merge.rc:2472
#, c-format
msgid "Comparison result, long form."
msgstr "Èçõîä ïîðå\90å\9cà,äóæè îáëèê"
-#: Merge.rc:2471
+#: Merge.rc:2473
#, c-format
msgid "Left side modification date."
msgstr "Äàòóì ïðîìåíå ëåâå ñòðàíå"
-#: Merge.rc:2472
+#: Merge.rc:2474
#, c-format
msgid "Right side modification date."
msgstr "Äàòóì ïðîìåíå äåñíå ñòðàíå"
-#: Merge.rc:2473
+#: Merge.rc:2475
#, c-format
msgid "Middle side modification date."
msgstr ""
-#: Merge.rc:2474
+#: Merge.rc:2476
#, c-format
msgid "File's extension."
msgstr "/Íàñòàâàê/ äàòîòåêå"
-#: Merge.rc:2475
+#: Merge.rc:2477
#, c-format
msgid "Left file size in bytes."
msgstr "Âåëè÷èíà ëåâå äàòîòåêå ó áà¼òèìà"
-#: Merge.rc:2476
+#: Merge.rc:2478
#, c-format
msgid "Right file size in bytes."
msgstr "Âåëè÷èíà äåñíå äàòîòåêå ó áà¼òèìà"
-#: Merge.rc:2477
+#: Merge.rc:2479
#, c-format
msgid "Middle file size in bytes."
msgstr ""
-#: Merge.rc:2478
+#: Merge.rc:2480
#, c-format
msgid "Left file size abbreviated."
msgstr "Ñêðà\9eåíà ëåâà äàòîòåêà"
-#: Merge.rc:2479
+#: Merge.rc:2481
#, c-format
msgid "Right file size abbreviated."
msgstr "Ñêðà\9eåíà äåñíà äàòîòåêà"
-#: Merge.rc:2480
+#: Merge.rc:2482
#, c-format
msgid "Middle file size abbreviated."
msgstr ""
-#: Merge.rc:2486
+#: Merge.rc:2488
#, c-format
msgid "Left side creation time."
msgstr "Âðåìå ñòâàðà\9cà ëåâå ñòðàíå"
-#: Merge.rc:2487
+#: Merge.rc:2489
#, c-format
msgid "Right side creation time."
msgstr "Âðåìå ñòâàðà\9cà äåñíå ñòðàíå"
-#: Merge.rc:2488
+#: Merge.rc:2490
#, c-format
msgid "Middle side creation time."
msgstr ""
-#: Merge.rc:2489
+#: Merge.rc:2491
#, c-format
msgid "Tells which side has newer modification date."
msgstr "Êî¼à ñòðàíà èìà íîâè¼è äàòóì ïðîìåíå"
-#: Merge.rc:2490
+#: Merge.rc:2492
#, c-format
msgid "Left side file version, only for some filetypes."
msgstr "Èçäà\9cå íà ëåâî¼ ñòðàíè ¼å ñàìî çà íåêå âðñòå äàòîòåêå"
-#: Merge.rc:2491
+#: Merge.rc:2493
#, c-format
msgid "Right side file version, only for some filetypes."
msgstr "Èçäà\9cå íà äåñíî¼ ñòðàíè ¼å ñàìî çà íåêå âðñòå äàòîòåêå"
-#: Merge.rc:2492
+#: Merge.rc:2494
#, c-format
msgid "Middle side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2493
+#: Merge.rc:2495
#, c-format
msgid "Short comparison result."
msgstr "Êðà\9eè ðåçóëòàò ïîðå\90å\9cà"
-#: Merge.rc:2494
+#: Merge.rc:2496
#, c-format
msgid "Left side attributes."
msgstr "Îñîáèíå ëåâå ñòðàíå"
-#: Merge.rc:2495
+#: Merge.rc:2497
#, c-format
msgid "Right side attributes."
msgstr "Îñîáèíå äåñíå ñòðàíå"
-#: Merge.rc:2496
+#: Merge.rc:2498
#, c-format
msgid "Middle side attributes."
msgstr ""
-#: Merge.rc:2497
+#: Merge.rc:2499
#, c-format
msgid "Left side file EOL type"
msgstr "Íà÷èí çàâðøåòêà ðåäà ëåâå äàòîòåêå"
-#: Merge.rc:2498
+#: Merge.rc:2500
#, c-format
msgid "Right side file EOL type"
msgstr "Íà÷èí çàâðøåòêà ðåäà äåñíå äàòîòåêå"
-#: Merge.rc:2499
+#: Merge.rc:2501
#, c-format
msgid "Middle side file EOL type"
msgstr ""
-#: Merge.rc:2505
+#: Merge.rc:2507
#, c-format
msgid "Left side encoding."
msgstr "Êîäèðà\9cå ëåâå ñòðàíå"
-#: Merge.rc:2506
+#: Merge.rc:2508
#, c-format
msgid "Right side encoding."
msgstr "Êîäèðà\9cå äåñíå ñòðàíå"
-#: Merge.rc:2507
+#: Merge.rc:2509
#, c-format
msgid "Middle side encoding."
msgstr ""
-#: Merge.rc:2508
+#: Merge.rc:2510
#, c-format
msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
msgstr "Áðî¼ çàíåìàðåíèõ ðàçëèêà ó äàòîòåöè.Îâå ðàçëèêå ¼å çàíåìàðèî WinMerge è íå ìîãó áèòè îá¼åäè\9cåíå"
-#: Merge.rc:2509
+#: Merge.rc:2511
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
msgstr "Áðî¼ ðàçëèêà ó äàòîòåöè.Îâ༠áðî¼ íå óê\9aó÷ó¼å çàíåìàðåíå ðàçëèêå"
-#: Merge.rc:2510
+#: Merge.rc:2512
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Ïðèêàçó¼å çâåçäèöó (*), àêî ¼å äàòîòåêà áèíàðíà"
-#: Merge.rc:2516
+#: Merge.rc:2518
#, c-format
msgid "Compare %1 with %2"
msgstr "Óïîðåäè %1 ñà %2"
-#: Merge.rc:2517
+#: Merge.rc:2519
#, c-format
msgid "Comma-separated list"
msgstr "Ñïèñàê ¼å îäâî¼åí çàðåçîì"
-#: Merge.rc:2518
+#: Merge.rc:2520
#, c-format
msgid "Tab-separated list"
msgstr "Ñïèñàê ¼å îäâî¼åí ¼åçè÷êîì"
-#: Merge.rc:2519
+#: Merge.rc:2521
#, c-format
msgid "Simple HTML"
msgstr "£åäíîñòàâíè HTML"
-#: Merge.rc:2520
+#: Merge.rc:2522
#, c-format
msgid "Simple XML"
msgstr "£åäíîñòàâíè XML"
-#: Merge.rc:2522
+#: Merge.rc:2524
#, c-format
msgid "The report file already exists. Do you want to overwrite existing file?"
msgstr "Äàòîòåêà èçâåøòà¼à âå\9e ïîñòî¼è.Äà ëè æåëèòå çàìåíèòè ïîñòî¼å\9eó äàòîòåêó"
-#: Merge.rc:2523
+#: Merge.rc:2525
#, c-format
msgid ""
"Error creating the report:\n"
"Ãðåøêà ïðè ïðàâ\9aå\9có èçâåøòà¼à:\n"
"%1"
-#: Merge.rc:2524
+#: Merge.rc:2526
#, c-format
msgid "The report has been created successfully."
msgstr "Èçâåøò༠¼å óñïåøíî íàïðàâ\9aåí"
-#: Merge.rc:2530
+#: Merge.rc:2532
#, c-format
msgid "The same file is opened in both panels."
msgstr "Èñòà äàòîòåêà ¼å îòâîðåíà ó îáå òàáëå"
-#: Merge.rc:2531
+#: Merge.rc:2533
#, c-format
msgid "The selected files are identical."
msgstr "Èçàáðàíå äàòîòåêå ñó èñòå"
-#: Merge.rc:2532
+#: Merge.rc:2534
#, c-format
msgid "An error occurred while comparing the files."
msgstr "Äîøëî ¼å äî ãðåøêå ïðè ïîðå\90å\9có"
-#: Merge.rc:2533
+#: Merge.rc:2535
#, c-format
msgid "Temporary files could not be created. Check your temporary path settings."
msgstr "Ïðèâðåìåíà äàòîòåêà íå ìîæå áèòè ñòâîðåíà.Ïðîâåðèòå è ïîäåñèòå ïðèâðåìåíó ïóòà\9có"
-#: Merge.rc:2534
+#: Merge.rc:2536
#, c-format
msgid ""
"These files use different carriage return types.\n"
"\n"
"Íàïîìåíà:Æåëèòå ëè óâåê çàäðæàòè ðàçëè÷èòå ïðåëàñêà ó äðóãè ðåä, îäàáåðèòå 'Çàíåìàðè ðàçëè÷èòå ïðåëàñêå ó äðóãè ðåä..' ó äè¼àëîøêî¼ êàðòèöè ïîðå\90å\9cå ïðîçîðà (Óðå\90èâà\9cå/Ïîñòàâêå)"
-#: Merge.rc:2535
+#: Merge.rc:2537
#, c-format
msgid "The selected folder is invalid."
msgstr "Îäàáðàíà ôàñöèêëà ¼å íåóïîòðåá\9aèâà"
-#: Merge.rc:2536
+#: Merge.rc:2538
#, c-format
msgid "Cannot open a binary file to editor."
msgstr "Íå ìîãó îòâîðèòè áèíàðíó äàòîòåêó ó óðå\90èâà÷ó"
-#: Merge.rc:2537
+#: Merge.rc:2539
#, c-format
msgid ""
"The folder exists only in other side and cannot be opened.\n"
"%1\n"
"íà äðóãî¼ ñòðàíè è îòâîðèòè ¼å?"
-#: Merge.rc:2543
+#: Merge.rc:2545
#, c-format
msgid ""
"Different codepages found in left (cp%d) and right (cp%d) files. \n"
"Ïðèêàç ñâàêå äàòîòåêå ó êîäíî¼ ñòðàíèöè ¼å áî\9aè àëè ñïà¼à\9cå/óìíîæàâà\9cå íîñè îïàñíîñò.\n"
"Æåëèòå ëè äà óçìåòå îáå äàòîòåêå êàî ó ïîäðàçóìåâàíîì ïðîçîðó êîäíå ñòðàíèöå (ïðåïîðó÷åíî)?"
-#: Merge.rc:2544
+#: Merge.rc:2546
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr "Ïîäàöè ñó èçãóá\9aåíè çáîã ãðåøêå ïðè êîäèðà\9có: îáå äàòîòåêå"
-#: Merge.rc:2545
+#: Merge.rc:2547
#, c-format
msgid "Information lost due to encoding errors: first file"
msgstr ""
-#: Merge.rc:2546
+#: Merge.rc:2548
#, c-format
msgid "Information lost due to encoding errors: second file"
msgstr ""
-#: Merge.rc:2547
+#: Merge.rc:2549
#, c-format
msgid "Information lost due to encoding errors: third file"
msgstr ""
-#: Merge.rc:2553
+#: Merge.rc:2555
#, c-format
msgid "No difference"
msgstr "Íåìà ðàçëèêå"
-#: Merge.rc:2554
+#: Merge.rc:2556
#, c-format
msgid "Line difference"
msgstr "Ðàçëè÷èòè ðåä"
-#: Merge.rc:2560
+#: Merge.rc:2562
#, c-format
msgid "Replaced %1 string(s)."
msgstr "Çàìå\9cåí %1 ïî¼àì(à)"
-#: Merge.rc:2561
+#: Merge.rc:2563
#, c-format
msgid "Cannot find string \"%s\""
msgstr "Íå ìîãó íà\9eè ïî¼àì \"%s\""
-#: Merge.rc:2567
+#: Merge.rc:2569
#, c-format
msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
msgstr ""
-#: Merge.rc:2574
+#: Merge.rc:2576
#, c-format
msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"
msgstr ""
-#: Merge.rc:2575
+#: Merge.rc:2577
#, c-format
msgid "The change of codepage has been merged"
msgstr ""
-#: Merge.rc:2576
+#: Merge.rc:2578
#, c-format
msgid "The changes of codepage are conflicting"
msgstr ""
-#: Merge.rc:2577
+#: Merge.rc:2579
#, c-format
msgid "The change of EOL has been merged"
msgstr ""
-#: Merge.rc:2578
+#: Merge.rc:2580
#, c-format
msgid "The changes of EOL are conflicting"
msgstr ""
-#: Merge.rc:2584
+#: Merge.rc:2586
#, c-format
msgid "Location Pane"
msgstr "Ïîëîæ༠òàáëè"
-#: Merge.rc:2585
+#: Merge.rc:2587
#, c-format
msgid "Diff Pane"
msgstr "Ðàçëè÷èòå òàáëå"
-#: Merge.rc:2591
+#: Merge.rc:2593
#, c-format
msgid "Patch file successfully written."
msgstr "Äàòîòåêà ðàçëèêà ¼å óñïåøíî ñà÷óâàíà"
-#: Merge.rc:2592
+#: Merge.rc:2594
#, c-format
msgid "1. item is not found or is directory!"
msgstr "1. ñòàâêà èëè ôàñöèêëà íè¼å ïðîíà\90åíà!"
-#: Merge.rc:2593
+#: Merge.rc:2595
#, c-format
msgid "2. item is not found or is directory!"
msgstr "2. ñòàâêà èëè ôàñöèêëà íè¼å ïðîíà\90åíà!"
-#: Merge.rc:2594
+#: Merge.rc:2596
#, c-format
msgid "The patch file already exists. Do you want to overwrite it?"
msgstr "Äàòîòåêà ðàçëèêà âå\9e ïîñòî¼è.Äà ëè æåëèòå äà je çàìåíèòå?"
-#: Merge.rc:2595
+#: Merge.rc:2597
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 îäàáðàíà äàòîòåêà"
-#: Merge.rc:2596
+#: Merge.rc:2598
#, c-format
msgid "Normal"
msgstr "Óîáè÷à¼åí"
-#: Merge.rc:2597
+#: Merge.rc:2599
#, c-format
msgid "Context"
msgstr "Ó îêâèðó"
-#: Merge.rc:2598
+#: Merge.rc:2600
#, c-format
msgid "Unified"
msgstr "Îá¼åäè\9cåí"
-#: Merge.rc:2600
+#: Merge.rc:2602
#, c-format
msgid "Could not write to file %1."
msgstr "Íå ìîãó ñà÷óâàòè ó äàòîòåöè %1"
-#: Merge.rc:2601
+#: Merge.rc:2603
#, c-format
msgid "The specified output path is not an absolute path: %1"
msgstr "Íàâåäåíà èçëàçíà ïóòà\9cà íè¼å ïîòïóíà ïóòà\9cà: %1"
-#: Merge.rc:2602
+#: Merge.rc:2604
#, c-format
msgid "Specify an output file"
msgstr "Îäðåäèòå èçëàçíó äàòîòåêó"
-#: Merge.rc:2603
+#: Merge.rc:2605
#, c-format
msgid "Cannot create a patch file from binary files."
msgstr "Íå ìîæå ñòâîðèòè äàòîòåêó ðàçëèêà èç áèíàðíèõ äàòîòåêà"
-#: Merge.rc:2604
+#: Merge.rc:2606
#, c-format
msgid "Cannot create a patch file from directories."
msgstr "Íå ìîæå ïîïðàâèòè äàòîòåêó èç ôàñöèêëè"
-#: Merge.rc:2605
+#: Merge.rc:2607
#, c-format
msgid ""
"Please save all files first.\n"
"\n"
"Ñòâàðà\9cå äàòîòåêå ðàçëèêà çàõòåâà äà ïîñòî¼å ïðîìåíå êî¼å íèñó ñà÷óâàíå ó äàòîòåêàìà"
-#: Merge.rc:2606
+#: Merge.rc:2608
#, c-format
msgid "Folder does not exist."
msgstr "Ôàñöèêëà íå ïîñòî¼è"
-#: Merge.rc:2611
+#: Merge.rc:2613
#, c-format
msgid ""
"Archive support is not enabled.\n"
"Ñâå ïîòðåáíå êîìïîíåíòå (7-zip è/èëè Merge7z*.dll)çà àðõèâó íå ìîãó áèòè íà\90åíå.\n"
"Ïîãëåäà¼òå óïóòñòâî êàêî îìîãó\9eèòè ðàä ñà àðõèâàìà"
-#: Merge.rc:2612
+#: Merge.rc:2614
#, c-format
msgid "Select file for export"
msgstr "Îäàáåðè äàòîòåêó çà èçâîç"
-#: Merge.rc:2613
+#: Merge.rc:2615
#, c-format
msgid "Select file for import"
msgstr "Îäàáåðè äàòîòåêó çà óâîç"
-#: Merge.rc:2614
+#: Merge.rc:2616
#, c-format
msgid "Options imported from the file."
msgstr "Óâîç ïîñòàâêè ó äàòîòåêó"
-#: Merge.rc:2615
+#: Merge.rc:2617
#, c-format
msgid "Options exported to the file."
msgstr "Èçâîç ïîñòàâêè ó äàòîòåêó"
-#: Merge.rc:2616
+#: Merge.rc:2618
#, c-format
msgid "Failed to import options from the file."
msgstr "Íè¼å óñïåî äà óâåçå ïîñòàâêå èç äàòîòåêå"
-#: Merge.rc:2617
+#: Merge.rc:2619
#, c-format
msgid "Failed to write options to the file."
msgstr "Íè¼å óñïåî äà çàïàìòè ïîñòàâêå ó äàòîòåöè"
-#: Merge.rc:2618
+#: Merge.rc:2620
#, c-format
msgid ""
"You are about to close several compare windows.\n"
"\n"
"Äà ëè æåëèòå íàñòàâèòè?"
-#: Merge.rc:2627
+#: Merge.rc:2629
#, c-format
msgid "Mixed"
msgstr "Mixed"
-#: Merge.rc:2638
+#: Merge.rc:2640
#, c-format
msgid "Type"
msgstr "Âðñòà"
-#: Merge.rc:2640
+#: Merge.rc:2642
#, c-format
msgid "Unpacker"
msgstr "Ðàñïàêèâà\9cå"
-#: Merge.rc:2641
+#: Merge.rc:2643
#, c-format
msgid "Prediffer"
msgstr "Äåôèíèñàíî ïîðå\90å\9cå"
-#: Merge.rc:2642
+#: Merge.rc:2644
#, c-format
msgid "Editor script"
msgstr "Óðå\90èâà÷ ðóêîïèñà"
-#: Merge.rc:2648
+#: Merge.rc:2650
#, c-format
msgid "\nDifference in the Current Line"
msgstr ""
-#: Merge.rc:2649
+#: Merge.rc:2651
#, c-format
msgid "\nOptions"
msgstr ""
-#: Merge.rc:2650
+#: Merge.rc:2652
#, c-format
msgid "\nRefresh (F5)"
msgstr ""
-#: Merge.rc:2656
+#: Merge.rc:2658
#, c-format
msgid "\nPrevious Difference (Alt+Up)"
msgstr ""
-#: Merge.rc:2657
+#: Merge.rc:2659
#, c-format
msgid "\nNext Difference (Alt+Down)"
msgstr ""
-#: Merge.rc:2658
+#: Merge.rc:2660
#, c-format
msgid "\nPrevious Conflict (Alt+Shift+Up)"
msgstr ""
-#: Merge.rc:2659
+#: Merge.rc:2661
#, c-format
msgid "\nNext Conflict (Alt+Shift+Down)"
msgstr ""
-#: Merge.rc:2660
+#: Merge.rc:2662
#, c-format
msgid "\nFirst Difference (Alt+Home)"
msgstr ""
-#: Merge.rc:2661
+#: Merge.rc:2663
#, c-format
msgid "\nCurrent Difference (Alt+Enter)"
msgstr ""
-#: Merge.rc:2662
+#: Merge.rc:2664
#, c-format
msgid "\nLast Difference (Alt+End)"
msgstr ""
-#: Merge.rc:2663
+#: Merge.rc:2665
#, c-format
msgid "\nCopy Right (Alt+Right)"
msgstr ""
-#: Merge.rc:2664
+#: Merge.rc:2666
#, c-format
msgid "\nCopy Left (Alt+Left)"
msgstr ""
-#: Merge.rc:2665
+#: Merge.rc:2667
#, c-format
msgid "\nCopy Right and Advance (Ctrl+Alt+Right)"
msgstr ""
-#: Merge.rc:2666
+#: Merge.rc:2668
#, c-format
msgid "\nCopy Left and Advance (Ctrl+Alt+Left)"
msgstr ""
-#: Merge.rc:2667
+#: Merge.rc:2669
#, c-format
msgid "\nAll Right"
msgstr ""
-#: Merge.rc:2668
+#: Merge.rc:2670
#, c-format
msgid "\nAll Left"
msgstr ""
-#: Merge.rc:2669
+#: Merge.rc:2671
#, c-format
msgid "\nAuto Merge (Ctrl+Alt+M)"
msgstr ""
-#: Merge.rc:2675
+#: Merge.rc:2677
#, c-format
msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
msgstr "Ïðèëàãî\90åíî ðàñïàêèâà\9cå \9eå ñå êîðèñòèòè çà îáå äàòîòåêå (¼åäíà äàòîòåêà òðåáà íàñòàâàê)"
-#: Merge.rc:2676
+#: Merge.rc:2678
#, c-format
msgid "No prediffer (normal)"
msgstr "Íåìà äåôèíèñàíîã ïîðå\90å\9cà (óîáè÷à¼åíî)"
-#: Merge.rc:2677
+#: Merge.rc:2679
#, c-format
msgid "Suggested plugins"
msgstr "Ïðåïîðó÷åíè äîäàöè"
-#: Merge.rc:2678
+#: Merge.rc:2680
#, c-format
msgid "Other plugins"
msgstr "Îñòàëè äîäàöè"
-#: Merge.rc:2684
+#: Merge.rc:2686
#, c-format
msgid "Private Build: %1"
msgstr "Ëè÷íà èçðàäà: %1"
-#: Merge.rc:2685
+#: Merge.rc:2687
#, c-format
msgid "Your software is up to date"
msgstr ""
-#: Merge.rc:2686
+#: Merge.rc:2688
#, c-format
msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?"
msgstr ""
-#: Merge.rc:2687
+#: Merge.rc:2689
#, c-format
msgid "Failed to download latest version information"
msgstr ""
-#: Merge.rc:2693
+#: Merge.rc:2695
#, c-format
msgid "Plugin Settings"
msgstr "Ïîäåøàâà\9cà äîäàòàêà"
-#: Merge.rc:2695
+#: Merge.rc:2697
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH íè¼å íà\90åí - .sct ñêðèïòå ñó îíåìîãó\9eåíå"
-#: Merge.rc:2696
+#: Merge.rc:2698
#, c-format
msgid "<None>"
msgstr "<Íèøòà>"
-#: Merge.rc:2697
+#: Merge.rc:2699
#, c-format
msgid "<Automatic>"
msgstr "<Àóòîìàòñêè>"
-#: Merge.rc:2703
+#: Merge.rc:2705
#, c-format
msgid "G&oto Line %1"
msgstr "È&äè íà ðåä %1"
-#: Merge.rc:2709
+#: Merge.rc:2711
#, c-format
msgid "Disabled"
msgstr "Îíåìîãó\9eè"
-#: Merge.rc:2710
+#: Merge.rc:2712
#, c-format
msgid "From file system"
msgstr "Îä ñèñòåìà"
-#: Merge.rc:2711
+#: Merge.rc:2713
#, c-format
msgid "From MRU list"
msgstr "Èç MRU ñïèñêà"
-#: Merge.rc:2717
+#: Merge.rc:2719
#, c-format
msgid "No Highlighting"
msgstr "Íè¼å îçíà÷åíî"
-#: Merge.rc:2720
+#: Merge.rc:2722
#, c-format
msgid "Batch"
msgstr "Batch"
-#: Merge.rc:2736
+#: Merge.rc:2738
#, c-format
msgid "Portable Object"
msgstr "Ïðåíîñíè îá¼åêàò"
-#: Merge.rc:2740
+#: Merge.rc:2742
#, c-format
msgid "Resources"
msgstr "Resources"
-#: Merge.rc:2743
+#: Merge.rc:2745
#, c-format
msgid "Shell"
msgstr "Shell"
-#: Merge.rc:2754
+#: Merge.rc:2756
#, c-format
msgid "Close &Left Tabs"
msgstr ""
-#: Merge.rc:2755
+#: Merge.rc:2757
#, c-format
msgid "Close R&ight Tabs"
msgstr ""
-#: Merge.rc:2756
+#: Merge.rc:2758
#, c-format
msgid "Close &Other Tabs"
msgstr ""
-#: Merge.rc:2757
+#: Merge.rc:2759
#, c-format
msgid "Enable &Auto Max Width"
msgstr ""
-#: Merge.rc:2762
+#: Merge.rc:2764
#, c-format
msgid "&Image"
msgstr ""
-#: Merge.rc:2767
+#: Merge.rc:2769
#, c-format
msgid "frhed(http://frhed.sourceforge.net/) not installed"
msgstr ""
msgstr "V&ystrihnú\9d"
#: Merge.rc:85
-#: Merge.rc:617
+#: Merge.rc:619
#, c-format
msgid "&Copy"
msgstr "&Kopírova\9d"
msgstr "V&lo\9ei\9d"
#: Merge.rc:88
-#: Merge.rc:729
+#: Merge.rc:731
#, c-format
msgid "&Goto..."
msgstr "&Prejs\9d na..."
msgstr "&Otvori\9d"
#: Merge.rc:92
-#: Merge.rc:648
-#: Merge.rc:654
-#: Merge.rc:660
+#: Merge.rc:650
+#: Merge.rc:656
+#: Merge.rc:662
#, c-format
msgid "with &Registered Application"
msgstr "®istrovanou aplikáciou"
#: Merge.rc:93
-#: Merge.rc:649
-#: Merge.rc:655
-#: Merge.rc:661
+#: Merge.rc:651
+#: Merge.rc:657
+#: Merge.rc:663
#, c-format
msgid "with &External Editor"
msgstr "&externým editorom"
#: Merge.rc:94
-#: Merge.rc:650
-#: Merge.rc:656
-#: Merge.rc:662
+#: Merge.rc:652
+#: Merge.rc:658
+#: Merge.rc:664
#, c-format
msgid "&with..."
msgstr "èí&m..."
msgstr ""
#: Merge.rc:132
-#: Merge.rc:451
+#: Merge.rc:453
#, c-format
msgid "&Zoom"
msgstr "&Priblí\9eenie"
#: Merge.rc:143
#: Merge.rc:179
-#: Merge.rc:283
-#: Merge.rc:485
+#: Merge.rc:285
+#: Merge.rc:487
#, c-format
msgid "&None"
msgstr "\8e&iadny"
#: Merge.rc:153
#: Merge.rc:230
-#: Merge.rc:357
+#: Merge.rc:359
#, c-format
msgid "&File"
msgstr "&Súbor"
#: Merge.rc:155
#: Merge.rc:232
-#: Merge.rc:359
+#: Merge.rc:361
#, c-format
msgid "&New\tCtrl+N"
msgstr "&Nový\tCtrl+N"
#: Merge.rc:156
#: Merge.rc:233
-#: Merge.rc:360
+#: Merge.rc:362
#, c-format
msgid "New (&3 panes)"
msgstr ""
#: Merge.rc:157
#: Merge.rc:234
-#: Merge.rc:361
+#: Merge.rc:363
#, c-format
msgid "&Open...\tCtrl+O"
msgstr "&Otvori\9d...\tCtrl+O"
#: Merge.rc:158
#: Merge.rc:235
-#: Merge.rc:362
+#: Merge.rc:364
#, c-format
msgid "Op&en Conflict File..."
msgstr "&Otvori\9d konfliktný súbor..."
#: Merge.rc:160
#: Merge.rc:237
-#: Merge.rc:364
+#: Merge.rc:366
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "O&tvori\9d projekt...\tCtrl+J"
#: Merge.rc:161
#: Merge.rc:238
-#: Merge.rc:365
+#: Merge.rc:367
#, c-format
msgid "Sa&ve Project..."
msgstr "Ulo\9ei\9d &projekt..."
#: Merge.rc:164
#: Merge.rc:249
-#: Merge.rc:409
+#: Merge.rc:411
#, c-format
msgid "Recent F&iles Or Folders"
msgstr ""
#: Merge.rc:166
#: Merge.rc:251
-#: Merge.rc:411
-#: Merge.rc:571
-#: Merge.rc:2694
+#: Merge.rc:413
+#: Merge.rc:573
+#: Merge.rc:2696
#, c-format
msgid "< Empty >"
msgstr "< Prázdne >"
#: Merge.rc:169
#: Merge.rc:254
-#: Merge.rc:414
+#: Merge.rc:416
#, c-format
msgid "E&xit"
msgstr "&Koniec"
#: Merge.rc:171
#: Merge.rc:256
-#: Merge.rc:416
+#: Merge.rc:418
#, c-format
msgid "&Edit"
msgstr "Úpr&avy"
#: Merge.rc:173
#: Merge.rc:260
-#: Merge.rc:445
+#: Merge.rc:447
#, c-format
msgid "&Options..."
msgstr "&Nastavenia"
#: Merge.rc:175
#: Merge.rc:262
-#: Merge.rc:447
+#: Merge.rc:449
#, c-format
msgid "&View"
msgstr "&Poh¾ad"
#: Merge.rc:177
-#: Merge.rc:281
-#: Merge.rc:483
+#: Merge.rc:283
+#: Merge.rc:485
#, c-format
msgid "&Toolbar"
msgstr "&Panel nástrojov"
#: Merge.rc:180
-#: Merge.rc:284
-#: Merge.rc:486
+#: Merge.rc:286
+#: Merge.rc:488
#, c-format
msgid "&Small"
msgstr "&Malý"
#: Merge.rc:181
-#: Merge.rc:285
-#: Merge.rc:487
+#: Merge.rc:287
+#: Merge.rc:489
#, c-format
msgid "&Big"
msgstr "&Ve¾ký"
#: Merge.rc:183
-#: Merge.rc:287
-#: Merge.rc:489
+#: Merge.rc:289
+#: Merge.rc:491
#, c-format
msgid "&Status Bar"
msgstr "&Stavový riadok"
#: Merge.rc:184
-#: Merge.rc:288
-#: Merge.rc:490
+#: Merge.rc:290
+#: Merge.rc:492
#, c-format
msgid "Ta&b Bar"
msgstr "Panel &zálo\9eiek"
#: Merge.rc:186
-#: Merge.rc:311
-#: Merge.rc:546
+#: Merge.rc:313
+#: Merge.rc:548
#, c-format
msgid "&Tools"
msgstr "&Nástroje"
#: Merge.rc:188
-#: Merge.rc:314
-#: Merge.rc:548
+#: Merge.rc:316
+#: Merge.rc:550
#, c-format
msgid "&Filters..."
msgstr "&Filtre..."
#: Merge.rc:189
-#: Merge.rc:315
-#: Merge.rc:549
+#: Merge.rc:317
+#: Merge.rc:551
#, c-format
msgid "&Generate Patch..."
msgstr "&Vytvori\9d záplatu..."
#: Merge.rc:191
-#: Merge.rc:318
-#: Merge.rc:552
+#: Merge.rc:320
+#: Merge.rc:554
#, c-format
msgid "&Plugins"
msgstr "&Zásuvné moduly"
#: Merge.rc:193
-#: Merge.rc:320
-#: Merge.rc:554
-#: Merge.rc:1852
+#: Merge.rc:322
+#: Merge.rc:556
+#: Merge.rc:1854
#, c-format
msgid "P&lugin Settings..."
msgstr ""
#: Merge.rc:195
-#: Merge.rc:322
-#: Merge.rc:556
+#: Merge.rc:324
+#: Merge.rc:558
#, c-format
msgid "Ma&nual Prediffer"
msgstr ""
#: Merge.rc:196
-#: Merge.rc:323
-#: Merge.rc:557
+#: Merge.rc:325
+#: Merge.rc:559
#, c-format
msgid "A&utomatic Prediffer"
msgstr ""
#: Merge.rc:198
-#: Merge.rc:325
-#: Merge.rc:559
+#: Merge.rc:327
+#: Merge.rc:561
#, c-format
msgid "&Manual Unpacking"
msgstr "&Manuálne rozbalenie"
#: Merge.rc:199
-#: Merge.rc:326
-#: Merge.rc:560
+#: Merge.rc:328
+#: Merge.rc:562
#, c-format
msgid "&Automatic Unpacking"
msgstr "&Automatické rozbalenie"
#: Merge.rc:201
-#: Merge.rc:328
-#: Merge.rc:562
-#: Merge.rc:1924
+#: Merge.rc:330
+#: Merge.rc:564
+#: Merge.rc:1926
#, c-format
msgid "&Edit with Unpacker..."
msgstr ""
#: Merge.rc:203
-#: Merge.rc:330
-#: Merge.rc:574
+#: Merge.rc:332
+#: Merge.rc:576
#, c-format
msgid "&Reload plugins"
msgstr "&Znovu naèíta\9d zásuvné moduly"
#: Merge.rc:205
-#: Merge.rc:332
-#: Merge.rc:576
+#: Merge.rc:334
+#: Merge.rc:578
#, c-format
msgid "&Window"
msgstr "&Okno"
#: Merge.rc:207
-#: Merge.rc:334
-#: Merge.rc:578
+#: Merge.rc:336
+#: Merge.rc:580
#, c-format
msgid "Cl&ose"
msgstr "&Zatvori\9d"
#: Merge.rc:208
-#: Merge.rc:335
-#: Merge.rc:579
+#: Merge.rc:337
+#: Merge.rc:581
#, c-format
msgid "Clo&se All"
msgstr "Zatvori\9d &v\9aetky"
#: Merge.rc:210
-#: Merge.rc:337
-#: Merge.rc:581
+#: Merge.rc:339
+#: Merge.rc:583
#, c-format
msgid "Change &Pane\tF6"
msgstr "Zmeni\9d &panel\tF6"
#: Merge.rc:212
-#: Merge.rc:339
-#: Merge.rc:583
+#: Merge.rc:341
+#: Merge.rc:585
#, c-format
msgid "Tile &Horizontally"
msgstr "Dla\9edice &vodorovne"
#: Merge.rc:213
-#: Merge.rc:340
-#: Merge.rc:584
+#: Merge.rc:342
+#: Merge.rc:586
#, c-format
msgid "Tile &Vertically"
msgstr "Dla\9edice &zvisle"
#: Merge.rc:214
-#: Merge.rc:341
-#: Merge.rc:585
+#: Merge.rc:343
+#: Merge.rc:587
#, c-format
msgid "&Cascade"
msgstr "&Kaskáda"
#: Merge.rc:216
-#: Merge.rc:343
-#: Merge.rc:587
-#: Merge.rc:2055
+#: Merge.rc:345
+#: Merge.rc:589
+#: Merge.rc:2057
#, c-format
msgid "&Help"
msgstr "Po&moc"
#: Merge.rc:218
-#: Merge.rc:345
-#: Merge.rc:589
+#: Merge.rc:347
+#: Merge.rc:591
#, c-format
msgid "&WinMerge Help\tF1"
msgstr "Pomocník &WinMerge\tF1"
#: Merge.rc:220
-#: Merge.rc:347
-#: Merge.rc:591
+#: Merge.rc:349
+#: Merge.rc:593
#, c-format
msgid "&Check For Updates"
msgstr ""
#: Merge.rc:221
-#: Merge.rc:348
-#: Merge.rc:592
+#: Merge.rc:350
+#: Merge.rc:594
#, c-format
msgid "C&onfiguration"
msgstr ""
#: Merge.rc:223
-#: Merge.rc:350
-#: Merge.rc:594
+#: Merge.rc:352
+#: Merge.rc:596
#, c-format
msgid "&GNU General Public License"
msgstr ""
#: Merge.rc:224
-#: Merge.rc:351
-#: Merge.rc:595
+#: Merge.rc:353
+#: Merge.rc:597
#, c-format
msgid "&About WinMerge..."
msgstr "&O aplikácii..."
#: Merge.rc:240
-#: Merge.rc:385
+#: Merge.rc:387
#, c-format
msgid "&Read-only"
msgstr ""
#: Merge.rc:242
-#: Merge.rc:387
+#: Merge.rc:389
#, c-format
msgid "L&eft Read-only"
msgstr "¼&avý len na èítanie"
#: Merge.rc:243
-#: Merge.rc:388
+#: Merge.rc:390
#, c-format
msgid "M&iddle Read-only"
msgstr ""
#: Merge.rc:244
-#: Merge.rc:389
+#: Merge.rc:391
#, c-format
msgid "Ri&ght Read-only"
msgstr "&Pravý len na èítanie"
msgstr ""
#: Merge.rc:258
-#: Merge.rc:426
+#: Merge.rc:428
#, c-format
msgid "Select &All\tCtrl+A"
msgstr "Vybr&a\9d v\9aetko\tCtrl+A"
msgstr ""
#: Merge.rc:278
-#: Merge.rc:449
+#: Merge.rc:451
#, c-format
msgid "Select &Font..."
msgstr "&Zvoli\9d písmo..."
#: Merge.rc:279
-#: Merge.rc:450
+#: Merge.rc:452
#, c-format
msgid "Use Default F&ont"
msgstr "Pou\9ei\9d základné písm&o"
-#: Merge.rc:290
+#: Merge.rc:281
+#: Merge.rc:482
+#, c-format
+msgid "Sw&ap Panes"
+msgstr "&Vymeni\9d panely"
+
+#: Merge.rc:292
#, c-format
msgid "Compa&re Statistics"
msgstr "\8atatistika po&rovnania"
-#: Merge.rc:292
-#: Merge.rc:494
+#: Merge.rc:294
+#: Merge.rc:496
#, c-format
msgid "Refre&sh\tF5"
msgstr "&Obnovi\9d\tF5"
-#: Merge.rc:293
+#: Merge.rc:295
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr "O&bnovi\9d vybrané\tCtrl+F5"
-#: Merge.rc:295
-#: Merge.rc:496
+#: Merge.rc:297
+#: Merge.rc:498
#, c-format
msgid "&Merge"
msgstr "&Zlúèi\9d"
-#: Merge.rc:297
+#: Merge.rc:299
#, c-format
msgid "Co&mpare\tEnter"
msgstr "Po&rovna\9d\tEnter"
-#: Merge.rc:299
-#: Merge.rc:498
+#: Merge.rc:301
+#: Merge.rc:500
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "&Nasledujúci rozdiel\tTAlt+Down"
-#: Merge.rc:300
-#: Merge.rc:499
+#: Merge.rc:302
+#: Merge.rc:501
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "&Predchádzajúci rozdiel\tAlt+Up"
-#: Merge.rc:302
-#: Merge.rc:525
+#: Merge.rc:304
+#: Merge.rc:527
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "Pr&vý rozdiel\tAlt+Home"
-#: Merge.rc:303
-#: Merge.rc:526
+#: Merge.rc:305
+#: Merge.rc:528
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "&Aktuány rozdiel\tAlt+Enter"
-#: Merge.rc:304
-#: Merge.rc:527
+#: Merge.rc:306
+#: Merge.rc:529
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "Posledný &rozdiel\tAlt+End"
-#: Merge.rc:306
-#: Merge.rc:529
+#: Merge.rc:308
+#: Merge.rc:531
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "Skopírova\9d v&pravo\tAlt+Right"
-#: Merge.rc:307
-#: Merge.rc:530
+#: Merge.rc:309
+#: Merge.rc:532
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "Skopírova\9d &v¾avo\tAlt+Left"
-#: Merge.rc:309
+#: Merge.rc:311
#, c-format
msgid "&Delete\tDel"
msgstr "&Zmaza\9d\tDel"
-#: Merge.rc:313
-#: Merge.rc:701
+#: Merge.rc:315
+#: Merge.rc:703
#, c-format
msgid "&Customize Columns..."
msgstr "&Prispôsobi\9d ståpce..."
-#: Merge.rc:316
-#: Merge.rc:550
+#: Merge.rc:318
+#: Merge.rc:552
#, c-format
msgid "Generate &Report..."
msgstr "Vystvori\9d &správu..."
-#: Merge.rc:367
+#: Merge.rc:369
#, c-format
msgid "&Save\tCtrl+S"
msgstr "&Ulo\9ei\9d\tCtrl+S"
-#: Merge.rc:368
+#: Merge.rc:370
#, c-format
msgid "Sav&e"
msgstr ""
-#: Merge.rc:370
+#: Merge.rc:372
#, c-format
msgid "Save &Left"
msgstr "Ulo\9ei\9d ¾&avý"
-#: Merge.rc:371
+#: Merge.rc:373
#, c-format
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:372
+#: Merge.rc:374
#, c-format
msgid "Save &Right"
msgstr "Ulo\9ei\9d &pravý"
-#: Merge.rc:374
+#: Merge.rc:376
#, c-format
msgid "Save &As"
msgstr ""
-#: Merge.rc:376
+#: Merge.rc:378
#, c-format
msgid "Save &Left As..."
msgstr ""
-#: Merge.rc:377
+#: Merge.rc:379
#, c-format
msgid "Save &Middle As..."
msgstr ""
-#: Merge.rc:378
+#: Merge.rc:380
#, c-format
msgid "Save &Right As..."
msgstr ""
-#: Merge.rc:381
+#: Merge.rc:383
#, c-format
msgid "&Print..."
msgstr "&Tlaèi\9d..."
-#: Merge.rc:382
+#: Merge.rc:384
#, c-format
msgid "Page Se&tup"
msgstr "Nastavenie s&tránky"
-#: Merge.rc:383
+#: Merge.rc:385
#, c-format
msgid "Print Previe&w"
msgstr "Náh¾ad p&red tlaèou"
-#: Merge.rc:392
+#: Merge.rc:394
#, c-format
msgid "&Convert Line Endings to"
msgstr "&Konvertova\9d konce riadkov na"
-#: Merge.rc:399
+#: Merge.rc:401
#, c-format
msgid "&Merge Mode\tF9"
msgstr "&Zluèovací re\9eim\tF9"
-#: Merge.rc:401
+#: Merge.rc:403
#, c-format
msgid "Re&load\tCtrl+F5"
msgstr ""
-#: Merge.rc:402
-#: Merge.rc:1923
+#: Merge.rc:404
+#: Merge.rc:1925
#, c-format
msgid "&File Encoding..."
msgstr "&Kódovanie súboru..."
-#: Merge.rc:403
+#: Merge.rc:405
#, c-format
msgid "Recompare As"
msgstr ""
-#: Merge.rc:405
-#: Merge.rc:613
+#: Merge.rc:407
+#: Merge.rc:615
#, c-format
msgid "&XML"
msgstr "&XML"
-#: Merge.rc:406
-#: Merge.rc:614
+#: Merge.rc:408
+#: Merge.rc:616
#, c-format
msgid "&Binary"
msgstr ""
-#: Merge.rc:418
+#: Merge.rc:420
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "&Vráti\9d\tCtrl+Z"
-#: Merge.rc:419
+#: Merge.rc:421
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "&Opakova\9d\tCtrl+Y"
-#: Merge.rc:421
+#: Merge.rc:423
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "V&ystrihnú\9d\tCtrl+X"
-#: Merge.rc:422
+#: Merge.rc:424
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "&Kopírova\9d\tCtrl+C"
-#: Merge.rc:423
+#: Merge.rc:425
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "V&lo\9ei\9d\tCtrl+V"
-#: Merge.rc:425
+#: Merge.rc:427
#, c-format
msgid "Select Line &Difference\tF4"
msgstr "Oznaèi\9d roz&diel v riadku\tF4"
-#: Merge.rc:428
+#: Merge.rc:430
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "&H¾ada\9d...\tCtrl+F"
-#: Merge.rc:429
+#: Merge.rc:431
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "Nahradi\9d...\tCtrl+H"
-#: Merge.rc:431
+#: Merge.rc:433
#, c-format
msgid "Advanced"
msgstr "Roz\9aírené"
-#: Merge.rc:433
+#: Merge.rc:435
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Kopírova\9d s èíslami riadkov\tCtrl+Shift+C"
-#: Merge.rc:436
+#: Merge.rc:438
#, c-format
msgid "&Bookmarks"
msgstr "&Zálo\9eky"
-#: Merge.rc:438
+#: Merge.rc:440
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "&Prepnú\9d zálo\9eku\tCtrl+F2"
-#: Merge.rc:439
+#: Merge.rc:441
#, c-format
msgid "&Next Bookmark\tF2"
msgstr "&Ïal\9aia zálo\9eka\tF2"
-#: Merge.rc:440
+#: Merge.rc:442
#, c-format
msgid "&Previous bookmark\tShift+F2"
msgstr "&Predo\9alá zálo\9eka\tShift+F2"
-#: Merge.rc:441
+#: Merge.rc:443
#, c-format
msgid "&Clear All Bookmarks"
msgstr "&Zmaza\9d v\9aetky zálo\9eky"
-#: Merge.rc:443
+#: Merge.rc:445
#, c-format
msgid "&Go To...\tCtrl+G"
msgstr "&Prejs\9d na...\tCtrl+G"
-#: Merge.rc:453
+#: Merge.rc:455
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr "&Priblí\9ei\9d\tCtrl++"
-#: Merge.rc:454
+#: Merge.rc:456
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr "&Oddiali\9d\tCtrl+-"
#. Zoom to normal
-#: Merge.rc:455
+#: Merge.rc:457
#, c-format
msgid "&Normal\tCtrl+*"
msgstr "&Normálna ve¾kos\9d\tCtrl+*"
-#: Merge.rc:457
+#: Merge.rc:459
#, c-format
msgid "Syntax Highlight"
msgstr "Zvýrazòovanie syntaxe"
-#: Merge.rc:462
+#: Merge.rc:464
#, c-format
msgid "&Diff Context"
msgstr ""
-#: Merge.rc:464
-#: Merge.rc:641
+#: Merge.rc:466
+#: Merge.rc:643
#, c-format
msgid "&All"
msgstr ""
-#: Merge.rc:473
+#: Merge.rc:475
#, c-format
msgid "&Lock Panes"
msgstr "&Zamknú\9d panely"
-#: Merge.rc:474
+#: Merge.rc:476
#, c-format
msgid "&View Whitespace"
msgstr "&Zobrazi\9d prázdne miesto"
-#: Merge.rc:475
+#: Merge.rc:477
#, c-format
msgid "Vie&w Line Differences"
msgstr "Zobraz&i\9d rozdiely riadkov"
-#: Merge.rc:476
+#: Merge.rc:478
#, c-format
msgid "View Line &Numbers"
msgstr "Zobrazi\9d èísla &riadkov"
-#: Merge.rc:477
+#: Merge.rc:479
#, c-format
msgid "View &Margins"
msgstr "Zobrazi\9d &okraje"
-#: Merge.rc:478
+#: Merge.rc:480
#, c-format
msgid "W&rap Lines"
msgstr "&Zalamova\9d riadky"
-#: Merge.rc:480
-#, c-format
-msgid "Sw&ap Panes"
-msgstr "&Vymeni\9d panely"
-
-#: Merge.rc:481
+#: Merge.rc:483
#, c-format
msgid "Split V&ertically"
msgstr ""
-#: Merge.rc:491
+#: Merge.rc:493
#, c-format
msgid "Diff &Pane"
msgstr "&Panel s rozdielom"
-#: Merge.rc:492
+#: Merge.rc:494
#, c-format
msgid "Lo&cation Pane"
msgstr "&Lokaèný panel"
-#: Merge.rc:501
+#: Merge.rc:503
#, c-format
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr ""
-#: Merge.rc:502
+#: Merge.rc:504
#, c-format
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr ""
-#: Merge.rc:504
+#: Merge.rc:506
#, c-format
msgid "A&dvanced"
msgstr ""
-#: Merge.rc:506
+#: Merge.rc:508
#, c-format
msgid "Next Difference Between Left and Middle\tAlt+1"
msgstr ""
-#: Merge.rc:507
+#: Merge.rc:509
#, c-format
msgid "Previous Difference Between Left And Middle\tAlt+Shift+1"
msgstr ""
-#: Merge.rc:509
+#: Merge.rc:511
#, c-format
msgid "Next Difference Between Left and Right\tAlt+2"
msgstr ""
-#: Merge.rc:510
+#: Merge.rc:512
#, c-format
msgid "Previous Difference Between Left And Right\tAlt+Shift+2"
msgstr ""
-#: Merge.rc:512
+#: Merge.rc:514
#, c-format
msgid "Next Difference Between Middle and Right\tAlt+3"
msgstr ""
-#: Merge.rc:513
+#: Merge.rc:515
#, c-format
msgid "Previous Difference Between Middle And Right\tAlt+Shift+3"
msgstr ""
-#: Merge.rc:515
+#: Merge.rc:517
#, c-format
msgid "Next Left Only Difference\tAlt+7"
msgstr ""
-#: Merge.rc:516
+#: Merge.rc:518
#, c-format
msgid "Previous Left Only Difference\tAlt+Shift+7"
msgstr ""
-#: Merge.rc:518
+#: Merge.rc:520
#, c-format
msgid "Next Middle Only Difference\tAlt+8"
msgstr ""
-#: Merge.rc:519
+#: Merge.rc:521
#, c-format
msgid "Previous Middle Only Difference\tAlt+Shift+8"
msgstr ""
-#: Merge.rc:521
+#: Merge.rc:523
#, c-format
msgid "Next Right Only Difference\tAlt+9"
msgstr ""
-#: Merge.rc:522
+#: Merge.rc:524
#, c-format
msgid "Previous Right Only Difference\tAlt+Shift+9"
msgstr ""
-#: Merge.rc:532
+#: Merge.rc:534
#, c-format
msgid "Copy from Left\tAlt+Shift+Right"
msgstr ""
-#: Merge.rc:533
+#: Merge.rc:535
#, c-format
msgid "Copy from Right\tAlt+Shift+Left"
msgstr ""
-#: Merge.rc:535
+#: Merge.rc:537
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
msgstr "Kopírova\9d vpravo a ís\9d ïalej\tAlt+Ctrl+Right"
-#: Merge.rc:536
+#: Merge.rc:538
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
msgstr "Kopírova\9d v¾avo a ís\9d ïalej\tAlt+Ctrl+Left"
-#: Merge.rc:538
+#: Merge.rc:540
#, c-format
msgid "Copy &All to Right"
msgstr "Kopírova\9d v\9aetko vpravo"
-#: Merge.rc:539
+#: Merge.rc:541
#, c-format
msgid "Cop&y All to Left"
msgstr "Kopírova\9d v\9aetko v¾avo"
-#: Merge.rc:541
+#: Merge.rc:543
#, c-format
msgid "A&uto Merge\tAlt+Ctrl+M"
msgstr ""
-#: Merge.rc:543
+#: Merge.rc:545
#, c-format
msgid "Add &Synchronization Point\tAlt+S"
msgstr ""
-#: Merge.rc:544
+#: Merge.rc:546
#, c-format
msgid "Clear Sync&hronization Points"
msgstr ""
-#: Merge.rc:564
+#: Merge.rc:566
#, c-format
msgid "&Prediffer"
msgstr "&Predspracovanie"
-#: Merge.rc:569
+#: Merge.rc:571
#, c-format
msgid "&Scripts"
msgstr "&Skripty"
-#: Merge.rc:603
+#: Merge.rc:605
#, c-format
msgid "Comp&are"
msgstr "Porovn&a\9d"
-#: Merge.rc:604
+#: Merge.rc:606
#, c-format
msgid "Compare Non-hor&izontally"
msgstr ""
-#: Merge.rc:606
+#: Merge.rc:608
#, c-format
msgid "First &left item with second left item"
msgstr ""
-#: Merge.rc:607
+#: Merge.rc:609
#, c-format
msgid "First &right item with second right item"
msgstr ""
-#: Merge.rc:608
+#: Merge.rc:610
#, c-format
msgid "&First left item with second right item"
msgstr ""
-#: Merge.rc:609
+#: Merge.rc:611
#, c-format
msgid "&Second left item with first right item"
msgstr ""
-#: Merge.rc:611
+#: Merge.rc:613
#, c-format
msgid "Co&mpare As"
msgstr ""
-#: Merge.rc:619
-#: Merge.rc:2310
+#: Merge.rc:621
+#: Merge.rc:2312
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr ""
-#: Merge.rc:620
-#: Merge.rc:2309
+#: Merge.rc:622
+#: Merge.rc:2311
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Z¾ava doprava (%1 z %2)"
-#: Merge.rc:621
-#: Merge.rc:631
-#: Merge.rc:685
-#: Merge.rc:2317
-#: Merge.rc:2341
+#: Merge.rc:623
+#: Merge.rc:633
+#: Merge.rc:687
+#: Merge.rc:2319
+#: Merge.rc:2343
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Z¾ava... (%1 z %2)"
-#: Merge.rc:622
-#: Merge.rc:2307
+#: Merge.rc:624
+#: Merge.rc:2309
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr ""
-#: Merge.rc:623
-#: Merge.rc:2308
+#: Merge.rc:625
+#: Merge.rc:2310
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr ""
-#: Merge.rc:624
-#: Merge.rc:632
-#: Merge.rc:686
-#: Merge.rc:2318
-#: Merge.rc:2342
+#: Merge.rc:626
+#: Merge.rc:634
+#: Merge.rc:688
+#: Merge.rc:2320
+#: Merge.rc:2344
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr ""
-#: Merge.rc:625
-#: Merge.rc:2306
+#: Merge.rc:627
+#: Merge.rc:2308
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr ""
-#: Merge.rc:626
-#: Merge.rc:2305
+#: Merge.rc:628
+#: Merge.rc:2307
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Sprava do¾ava (%1 z %2)"
-#: Merge.rc:627
-#: Merge.rc:633
-#: Merge.rc:687
-#: Merge.rc:2319
-#: Merge.rc:2343
+#: Merge.rc:629
+#: Merge.rc:635
+#: Merge.rc:689
+#: Merge.rc:2321
+#: Merge.rc:2345
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Sprava... (%1 z %2)"
-#: Merge.rc:629
+#: Merge.rc:631
#, c-format
msgid "&Move"
msgstr "&Presunú\9d"
-#: Merge.rc:635
+#: Merge.rc:637
#, c-format
msgid "&Delete"
msgstr "&Zmaza\9d"
-#: Merge.rc:637
-#: Merge.rc:1366
-#: Merge.rc:1701
+#: Merge.rc:639
+#: Merge.rc:1368
+#: Merge.rc:1703
#, c-format
msgid "&Left"
msgstr "¼&avý"
-#: Merge.rc:638
-#: Merge.rc:1368
-#: Merge.rc:1704
+#: Merge.rc:640
+#: Merge.rc:1370
+#: Merge.rc:1706
#, c-format
msgid "&Middle"
msgstr ""
-#: Merge.rc:639
-#: Merge.rc:1370
-#: Merge.rc:1707
+#: Merge.rc:641
+#: Merge.rc:1372
+#: Merge.rc:1709
#, c-format
msgid "&Right"
msgstr "&Pravý"
-#: Merge.rc:640
+#: Merge.rc:642
#, c-format
msgid "&Both"
msgstr "&Oba"
-#: Merge.rc:643
+#: Merge.rc:645
#, c-format
msgid "Re&name"
msgstr "Preme&nova\9d"
-#: Merge.rc:644
+#: Merge.rc:646
#, c-format
msgid "&Hide Items"
msgstr "&Skry\9d polo\9eky"
-#: Merge.rc:646
+#: Merge.rc:648
#, c-format
msgid "&Open Left"
msgstr "&Otvori\9d ¾avý"
-#: Merge.rc:652
+#: Merge.rc:654
#, c-format
msgid "Open Midd&le"
msgstr ""
-#: Merge.rc:658
+#: Merge.rc:660
#, c-format
msgid "O&pen Right"
msgstr "O&tvori\9d pravý"
-#: Merge.rc:665
+#: Merge.rc:667
#, c-format
msgid "Cop&y Pathnames"
msgstr "Skopírova\9d názvy &ciest"
-#: Merge.rc:667
-#: Merge.rc:676
-#: Merge.rc:2333
+#: Merge.rc:669
+#: Merge.rc:678
+#: Merge.rc:2335
#, c-format
msgid "Left (%1 of %2)"
msgstr "¼avý (%1 z %2)"
-#: Merge.rc:668
-#: Merge.rc:677
-#: Merge.rc:2334
+#: Merge.rc:670
+#: Merge.rc:679
+#: Merge.rc:2336
#, c-format
msgid "Middle (%1 of %2)"
msgstr ""
-#: Merge.rc:669
-#: Merge.rc:678
-#: Merge.rc:2335
+#: Merge.rc:671
+#: Merge.rc:680
+#: Merge.rc:2337
#, c-format
msgid "Right (%1 of %2)"
msgstr "Pravý (%1 z %2)"
-#: Merge.rc:670
-#: Merge.rc:679
-#: Merge.rc:2336
+#: Merge.rc:672
+#: Merge.rc:681
+#: Merge.rc:2338
#, c-format
msgid "Both (%1 of %2)"
msgstr "Oba (%1 z %2)"
-#: Merge.rc:671
-#: Merge.rc:680
-#: Merge.rc:2337
+#: Merge.rc:673
+#: Merge.rc:682
+#: Merge.rc:2339
#, c-format
msgid "All (%1 of %2)"
msgstr ""
-#: Merge.rc:673
+#: Merge.rc:675
#, c-format
msgid "Copy &Filenames"
msgstr "Skopírova\9d názvy &súborov"
-#: Merge.rc:674
+#: Merge.rc:676
#, c-format
msgid "Copy Items To Clip&board"
msgstr ""
-#: Merge.rc:683
+#: Merge.rc:685
#, c-format
msgid "&Zip"
msgstr "&Zipova\9d"
-#: Merge.rc:688
-#: Merge.rc:2320
+#: Merge.rc:690
+#: Merge.rc:2322
#, c-format
msgid "Both to... (%1 of %2)"
msgstr ""
-#: Merge.rc:689
-#: Merge.rc:2321
+#: Merge.rc:691
+#: Merge.rc:2323
#, c-format
msgid "All to... (%1 of %2)"
msgstr ""
-#: Merge.rc:690
-#: Merge.rc:2322
+#: Merge.rc:692
+#: Merge.rc:2324
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr ""
-#: Merge.rc:693
+#: Merge.rc:695
#, c-format
msgid "&Refresh"
msgstr "&Obnovi\9d"
-#: Merge.rc:695
+#: Merge.rc:697
#, c-format
msgid "Left Shell menu"
msgstr ""
-#: Merge.rc:696
+#: Merge.rc:698
#, c-format
msgid "Middle Shell menu"
msgstr ""
-#: Merge.rc:697
+#: Merge.rc:699
#, c-format
msgid "Right Shell menu"
msgstr ""
-#: Merge.rc:709
+#: Merge.rc:711
#, c-format
msgid "Copy"
msgstr ""
-#: Merge.rc:710
+#: Merge.rc:712
#, c-format
msgid "&Copy Full Path"
msgstr "&Kopírova\9d plnú cestu"
-#: Merge.rc:711
+#: Merge.rc:713
#, c-format
msgid "Copy &Filename"
msgstr "Kopírova\9d názov &súboru"
-#: Merge.rc:717
+#: Merge.rc:719
#, c-format
msgid "Prediffer Settings"
msgstr "Nastavenia preprocesora"
-#: Merge.rc:719
+#: Merge.rc:721
#, c-format
msgid "&No prediffer"
msgstr "&Bez preprocesora"
-#: Merge.rc:720
+#: Merge.rc:722
#, c-format
msgid "Auto prediffer"
msgstr "&Auto preprocesor"
-#: Merge.rc:728
+#: Merge.rc:730
#, c-format
msgid "G&oto Diff"
msgstr "Ch&oï na rozdiel"
-#: Merge.rc:731
+#: Merge.rc:733
#, c-format
msgid "&No Moved Blocks"
msgstr "&Bez presunutých blokov"
-#: Merge.rc:732
+#: Merge.rc:734
#, c-format
msgid "&All Moved Blocks"
msgstr "&V\9aetky presunuté bloky"
-#: Merge.rc:733
+#: Merge.rc:735
#, c-format
msgid "Moved Block for &Current Diff"
msgstr "Presunutý blok pre &aktuálny rozdiel"
-#: Merge.rc:741
-#: Merge.rc:1265
+#: Merge.rc:743
+#: Merge.rc:1267
#, c-format
msgid "W&hitespaces"
msgstr "&Netlaèite¾né znaky:"
-#: Merge.rc:743
-#: Merge.rc:1266
+#: Merge.rc:745
+#: Merge.rc:1268
#, c-format
msgid "Com&pare"
msgstr "&Porovna\9d"
-#: Merge.rc:744
-#: Merge.rc:1268
+#: Merge.rc:746
+#: Merge.rc:1270
#, c-format
msgid "I&gnore changes"
msgstr "I&gnorova\9d zmeny"
-#: Merge.rc:745
-#: Merge.rc:1270
+#: Merge.rc:747
+#: Merge.rc:1272
#, c-format
msgid "Ig&nore all"
msgstr "Ig&norova\9d v\9aetko"
-#: Merge.rc:747
-#: Merge.rc:1274
+#: Merge.rc:749
+#: Merge.rc:1276
#, c-format
msgid "Case sensi&tive"
msgstr "&Zoh¾adòova\9d ve¾kos\9d písmen"
-#: Merge.rc:748
-#: Merge.rc:1276
-#: Merge.rc:1392
+#: Merge.rc:750
+#: Merge.rc:1278
+#: Merge.rc:1394
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr ""
-#: Merge.rc:750
-#: Merge.rc:896
-#: Merge.rc:1792
+#: Merge.rc:752
+#: Merge.rc:898
+#: Merge.rc:1794
#, c-format
msgid "&Include Subfolders"
msgstr "&Zahrnú\9d podadresáre"
-#: Merge.rc:751
-#: Merge.rc:1876
+#: Merge.rc:753
+#: Merge.rc:1878
#, c-format
msgid "&Compare method:"
msgstr ""
-#: Merge.rc:753
-#: Merge.rc:2132
+#: Merge.rc:755
+#: Merge.rc:2134
#, c-format
msgid "Full Contents"
msgstr "Plný obsah"
-#: Merge.rc:754
-#: Merge.rc:2133
+#: Merge.rc:756
+#: Merge.rc:2135
#, c-format
msgid "Quick Contents"
msgstr "Rýchly obsah"
-#: Merge.rc:755
-#: Merge.rc:2134
+#: Merge.rc:757
+#: Merge.rc:2136
#, c-format
msgid "Binary Contents"
msgstr ""
-#: Merge.rc:756
-#: Merge.rc:2135
+#: Merge.rc:758
+#: Merge.rc:2137
#, c-format
msgid "Modified Date"
msgstr "Dátum zmeny"
-#: Merge.rc:757
-#: Merge.rc:2136
+#: Merge.rc:759
+#: Merge.rc:2138
#, c-format
msgid "Modified Date and Size"
msgstr "Dátum zmeny a ve¾kos\9d"
-#: Merge.rc:758
-#: Merge.rc:2137
+#: Merge.rc:760
+#: Merge.rc:2139
#, c-format
msgid "Size"
msgstr "Ve¾kos\9d"
-#: Merge.rc:852
+#: Merge.rc:854
#, c-format
msgid "About WinMerge"
msgstr "O aplikácii"
-#: Merge.rc:858
+#: Merge.rc:860
#, c-format
msgid "(Private Build)"
msgstr "(Súkromné zostavenie)"
-#: Merge.rc:859
+#: Merge.rc:861
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr "Nav\9atívte www stránku programu WinMerge!"
-#: Merge.rc:861
-#: Merge.rc:899
-#: Merge.rc:1284
-#: Merge.rc:1316
-#: Merge.rc:1326
-#: Merge.rc:1485
-#: Merge.rc:1521
-#: Merge.rc:1615
-#: Merge.rc:1630
-#: Merge.rc:1853
-#: Merge.rc:1922
+#: Merge.rc:863
+#: Merge.rc:901
+#: Merge.rc:1286
+#: Merge.rc:1318
+#: Merge.rc:1328
+#: Merge.rc:1487
+#: Merge.rc:1523
+#: Merge.rc:1617
+#: Merge.rc:1632
+#: Merge.rc:1855
+#: Merge.rc:1924
#, c-format
msgid "OK"
msgstr "OK"
-#: Merge.rc:862
+#: Merge.rc:864
#, c-format
msgid "Contributors"
msgstr "Prispievatelia"
-#: Merge.rc:867
+#: Merge.rc:869
#, c-format
msgid "Select Files or Folders"
msgstr "Výber súborov a adresárov..."
-#: Merge.rc:875
-#: Merge.rc:943
-#: Merge.rc:1224
-#: Merge.rc:1246
+#: Merge.rc:877
+#: Merge.rc:945
+#: Merge.rc:1226
+#: Merge.rc:1248
#, c-format
msgid "&Browse..."
msgstr "&Prechádza\9d..."
-#: Merge.rc:881
-#: Merge.rc:1227
+#: Merge.rc:883
+#: Merge.rc:1229
#, c-format
msgid "B&rowse..."
msgstr ""
-#: Merge.rc:882
+#: Merge.rc:884
#, c-format
msgid "&3(Optional):"
msgstr ""
-#: Merge.rc:887
-#: Merge.rc:1234
-#: Merge.rc:1250
+#: Merge.rc:889
+#: Merge.rc:1236
+#: Merge.rc:1252
#, c-format
msgid "Br&owse..."
msgstr "Preh¾adáva\9d"
-#: Merge.rc:888
+#: Merge.rc:890
#, c-format
msgid "Fi<er:"
msgstr ""
-#: Merge.rc:891
-#: Merge.rc:1791
+#: Merge.rc:893
+#: Merge.rc:1793
#, c-format
msgid "Select..."
msgstr "&Vybra\9d..."
-#: Merge.rc:892
+#: Merge.rc:894
#, c-format
msgid "&Unpacker:"
msgstr "&Rozba¾ovací program:"
-#: Merge.rc:895
+#: Merge.rc:897
#, c-format
msgid "&Select..."
msgstr "&Vybra\9d..."
-#: Merge.rc:898
+#: Merge.rc:900
#, c-format
msgid "Status:"
msgstr "Stav:"
-#: Merge.rc:900
-#: Merge.rc:930
-#: Merge.rc:1005
-#: Merge.rc:1024
-#: Merge.rc:1056
-#: Merge.rc:1066
-#: Merge.rc:1285
-#: Merge.rc:1317
-#: Merge.rc:1327
-#: Merge.rc:1378
-#: Merge.rc:1486
-#: Merge.rc:1522
-#: Merge.rc:1616
-#: Merge.rc:1631
-#: Merge.rc:1854
+#: Merge.rc:902
+#: Merge.rc:932
+#: Merge.rc:1007
+#: Merge.rc:1026
+#: Merge.rc:1058
+#: Merge.rc:1068
+#: Merge.rc:1287
+#: Merge.rc:1319
+#: Merge.rc:1329
+#: Merge.rc:1380
+#: Merge.rc:1488
+#: Merge.rc:1524
+#: Merge.rc:1618
+#: Merge.rc:1633
+#: Merge.rc:1856
#, c-format
msgid "Cancel"
msgstr "Zru\9ai\9d"
-#: Merge.rc:901
-#: Merge.rc:1523
+#: Merge.rc:903
+#: Merge.rc:1525
#, c-format
msgid "Help"
msgstr "Pomoc"
-#: Merge.rc:902
+#: Merge.rc:904
#, c-format
msgid "Files or Folders to Compare"
msgstr "Súbory alebo adresáre pre porovnanie"
-#: Merge.rc:914
+#: Merge.rc:916
#, c-format
msgid "Database:"
msgstr "Databáza:"
-#: Merge.rc:917
+#: Merge.rc:919
#, c-format
msgid "Project:"
msgstr "Projekt:"
-#: Merge.rc:920
+#: Merge.rc:922
#, c-format
msgid "User:"
msgstr "Pou\9eívate¾:"
-#: Merge.rc:922
+#: Merge.rc:924
#, c-format
msgid "Password:"
msgstr "Heslo:"
-#: Merge.rc:924
+#: Merge.rc:926
#, c-format
msgid "Link to Destination VSS project"
msgstr "Odkaz na Cie¾ový VSS projekt"
-#: Merge.rc:926
-#: Merge.rc:1071
+#: Merge.rc:928
+#: Merge.rc:1073
#, c-format
msgid "Apply to all items"
msgstr "Pou\9ei\9d na v\9aetky polo\9eky"
-#: Merge.rc:928
+#: Merge.rc:930
#, c-format
msgid "Check Out"
msgstr ""
-#: Merge.rc:929
-#: Merge.rc:1067
+#: Merge.rc:931
+#: Merge.rc:1069
#, c-format
msgid "Save As..."
msgstr "Ulo\9ei\9d ako..."
-#: Merge.rc:935
+#: Merge.rc:937
#, c-format
msgid "Versioning System"
msgstr "Systém pre spávu verzií"
-#: Merge.rc:938
+#: Merge.rc:940
#, c-format
msgid "&Versioning System:"
msgstr "Systém pre správu &verzií:"
-#: Merge.rc:941
-#: Merge.rc:2180
+#: Merge.rc:943
+#: Merge.rc:2182
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "&Cesta ku cleartool.exe:"
-#: Merge.rc:948
-#: Merge.rc:2063
-#: Merge.rc:2076
+#: Merge.rc:950
+#: Merge.rc:2065
+#: Merge.rc:2078
#, c-format
msgid "General"
msgstr "Hlavné nastavenia"
-#: Merge.rc:951
+#: Merge.rc:953
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "Automatický &skok na prvý rozdiel"
-#: Merge.rc:954
+#: Merge.rc:956
#, c-format
msgid "Cl&ose windows with ESC"
msgstr "Zat&vára\9d okná klávesom ESC"
-#: Merge.rc:956
+#: Merge.rc:958
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr "&Automaticky overova\9d cestu v dialógu Otvori\9d"
-#: Merge.rc:959
+#: Merge.rc:961
#, c-format
msgid "All&ow only one instance to run"
msgstr "Um&o\9eni\9d beh iba jednej in\9atancie"
-#: Merge.rc:961
+#: Merge.rc:963
#, c-format
msgid "As&k when closing multiple windows"
msgstr "&Pýta\9d sa pred zatvorením viacerých okien"
-#: Merge.rc:963
+#: Merge.rc:965
#, c-format
msgid "&Preserve file time in file compare"
msgstr "&Zachováva\9d èas súboru pri porovnaní"
-#: Merge.rc:966
+#: Merge.rc:968
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
msgstr ""
-#: Merge.rc:968
+#: Merge.rc:970
#, c-format
msgid "Close \"Select Files or Folders\" Dialog on clicking OK button"
msgstr ""
-#: Merge.rc:970
+#: Merge.rc:972
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr "A&utomatické dopåòanie v dialógu Otvori\9d:"
-#: Merge.rc:973
+#: Merge.rc:975
#, c-format
msgid "Language:"
msgstr ""
-#: Merge.rc:976
+#: Merge.rc:978
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr "WinMerge umo\9eòuje zamedzi\9d zobrazovaniu be\9ených správ. Stlaèením tlaèidla Reset sa znova správy zobrazia."
-#: Merge.rc:978
+#: Merge.rc:980
#, c-format
msgid "Reset"
msgstr "Reset"
-#: Merge.rc:985
-#: Merge.rc:1011
+#: Merge.rc:987
+#: Merge.rc:1013
#, c-format
msgid "Find"
msgstr "H¾ada\9d"
-#: Merge.rc:988
-#: Merge.rc:1014
-#: Merge.rc:1033
+#: Merge.rc:990
+#: Merge.rc:1016
+#: Merge.rc:1035
#, c-format
msgid "Fi&nd what:"
msgstr "&H¾ada\9d:"
-#: Merge.rc:991
-#: Merge.rc:1017
-#: Merge.rc:1039
-#, c-format
-msgid "Match &whole word only"
-msgstr "Iba celé &slová"
-
#: Merge.rc:993
#: Merge.rc:1019
#: Merge.rc:1041
#, c-format
-msgid "Match &case"
-msgstr "Rozli\9auj &ve¾ké/malé"
+msgid "Match &whole word only"
+msgstr "Iba celé &slová"
#: Merge.rc:995
#: Merge.rc:1021
#: Merge.rc:1043
#, c-format
+msgid "Match &case"
+msgstr "Rozli\9auj &ve¾ké/malé"
+
+#: Merge.rc:997
+#: Merge.rc:1023
+#: Merge.rc:1045
+#, c-format
msgid "Regular &expression"
msgstr "&Regulárny výraz"
-#: Merge.rc:997
+#: Merge.rc:999
#, c-format
msgid "D&on't wrap end of file"
msgstr "&Nezalamova\9d koniec súboru"
-#: Merge.rc:1000
+#: Merge.rc:1002
#, c-format
msgid "&Don't close this dialog box"
msgstr ""
-#: Merge.rc:1003
+#: Merge.rc:1005
#, c-format
msgid "Find &Prev"
msgstr ""
-#: Merge.rc:1004
-#: Merge.rc:1053
+#: Merge.rc:1006
+#: Merge.rc:1055
#, c-format
msgid "&Find Next"
msgstr "&Nájdi ïal\9aí"
-#: Merge.rc:1023
-#: Merge.rc:2037
+#: Merge.rc:1025
+#: Merge.rc:2039
#, c-format
msgid "&Ok"
msgstr "&OK"
-#: Merge.rc:1030
+#: Merge.rc:1032
#, c-format
msgid "Replace"
msgstr "Nahradi\9d"
-#: Merge.rc:1036
+#: Merge.rc:1038
#, c-format
msgid "Re&place with:"
msgstr "Nahradi\9d:"
-#: Merge.rc:1045
+#: Merge.rc:1047
#, c-format
msgid "&Don't wrap end of file"
msgstr "&Nezalamova\9d koniec súboru"
-#: Merge.rc:1048
+#: Merge.rc:1050
#, c-format
msgid "Replace in"
msgstr "Nahradi\9d vo"
-#: Merge.rc:1049
+#: Merge.rc:1051
#, c-format
msgid "&Selection"
msgstr "Výbere"
-#: Merge.rc:1051
+#: Merge.rc:1053
#, c-format
msgid "Wh&ole file"
msgstr "Celom súbore"
-#: Merge.rc:1054
+#: Merge.rc:1056
#, c-format
msgid "&Replace"
msgstr "Nahraïi\9d"
-#: Merge.rc:1055
+#: Merge.rc:1057
#, c-format
msgid "Replace &All"
msgstr "Nahraïi\9d v\9aetko"
-#: Merge.rc:1065
+#: Merge.rc:1067
#, c-format
msgid "CheckOut"
msgstr ""
-#: Merge.rc:1070
-#: Merge.rc:1396
+#: Merge.rc:1072
+#: Merge.rc:1398
#, c-format
msgid "Comments"
msgstr "Komentáre"
-#: Merge.rc:1073
+#: Merge.rc:1075
#, c-format
msgid "CheckIn after checkout"
msgstr "Check in po checkout-e"
-#: Merge.rc:1079
+#: Merge.rc:1081
#, c-format
msgid "Linefilters"
msgstr "Riadkové filtre"
-#: Merge.rc:1082
+#: Merge.rc:1084
#, c-format
msgid "Enable Line Filters"
msgstr "Zapnú\9d riadkové filtre"
-#: Merge.rc:1085
+#: Merge.rc:1087
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Regulárne výrazy (jeden na riadok):"
-#: Merge.rc:1090
+#: Merge.rc:1092
#, c-format
msgid "New"
msgstr "Nový"
-#: Merge.rc:1091
+#: Merge.rc:1093
#, c-format
msgid "Edit"
msgstr "Upravi\9d"
-#: Merge.rc:1092
+#: Merge.rc:1094
#, c-format
msgid "Remove"
msgstr "Odstráni\9d"
-#: Merge.rc:1097
-#: Merge.rc:2066
+#: Merge.rc:1099
+#: Merge.rc:2068
#, c-format
msgid "Colors"
msgstr "Farby"
-#: Merge.rc:1100
+#: Merge.rc:1102
#, c-format
msgid "Difference:"
msgstr "Rozdiel:"
-#: Merge.rc:1104
+#: Merge.rc:1106
#, c-format
msgid "Selected Difference:"
msgstr "Rozdiel vo výbere:"
-#: Merge.rc:1108
-#: Merge.rc:1756
+#: Merge.rc:1110
+#: Merge.rc:1758
#, c-format
msgid "Background"
msgstr "Pozadie"
-#: Merge.rc:1109
+#: Merge.rc:1111
#, c-format
msgid "Deleted"
msgstr "Zmazané"
-#: Merge.rc:1126
-#: Merge.rc:1549
-#: Merge.rc:1757
-#: Merge.rc:2067
+#: Merge.rc:1128
+#: Merge.rc:1551
+#: Merge.rc:1759
+#: Merge.rc:2069
#, c-format
msgid "Text"
msgstr "Text"
-#: Merge.rc:1130
+#: Merge.rc:1132
#, c-format
msgid "Ignored Difference:"
msgstr "Ignorovaný rozdiel:"
-#: Merge.rc:1142
+#: Merge.rc:1144
#, c-format
msgid "Moved:"
msgstr "Presunutý:"
-#: Merge.rc:1154
+#: Merge.rc:1156
#, c-format
msgid "Selected Moved:"
msgstr "Výber presunutý:"
-#: Merge.rc:1163
+#: Merge.rc:1165
#, c-format
msgid "Same As The Next(3 panes):"
msgstr ""
-#: Merge.rc:1175
+#: Merge.rc:1177
#, c-format
msgid "Same As The Next(Selected):"
msgstr ""
-#: Merge.rc:1187
+#: Merge.rc:1189
#, c-format
msgid "Word Difference:"
msgstr "Rozdiel v slove:"
-#: Merge.rc:1199
+#: Merge.rc:1201
#, c-format
msgid "Selected Word Diff:"
msgstr "Rozdiel vo vybranom slove:"
-#: Merge.rc:1212
-#: Merge.rc:1283
-#: Merge.rc:1315
-#: Merge.rc:1399
-#: Merge.rc:1595
-#: Merge.rc:1890
-#: Merge.rc:1904
-#: Merge.rc:1914
+#: Merge.rc:1214
+#: Merge.rc:1285
+#: Merge.rc:1317
+#: Merge.rc:1401
+#: Merge.rc:1597
+#: Merge.rc:1892
+#: Merge.rc:1906
+#: Merge.rc:1916
#, c-format
msgid "Defaults"
msgstr "Predvolené"
-#: Merge.rc:1217
-#: Merge.rc:2069
+#: Merge.rc:1219
+#: Merge.rc:2071
#, c-format
msgid "System"
msgstr "Systém"
-#: Merge.rc:1220
+#: Merge.rc:1222
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr "&Posiela\9d zmazané súbory do ko\9aa"
-#: Merge.rc:1222
+#: Merge.rc:1224
#, c-format
msgid "&External editor:"
msgstr "&Externý editor:"
-#: Merge.rc:1225
+#: Merge.rc:1227
#, c-format
msgid "&Filter folder:"
msgstr "Adresár s &filtrami:"
-#: Merge.rc:1228
+#: Merge.rc:1230
#, c-format
msgid "Temporary files folder"
msgstr ""
-#: Merge.rc:1229
+#: Merge.rc:1231
#, c-format
msgid "S&ystem's temp folder"
msgstr ""
-#: Merge.rc:1231
+#: Merge.rc:1233
#, c-format
msgid "C&ustom folder:"
msgstr ""
-#: Merge.rc:1240
+#: Merge.rc:1242
#, c-format
msgid "Patch Generator"
msgstr "Generátor záplat"
-#: Merge.rc:1243
+#: Merge.rc:1245
#, c-format
msgid "File&1:"
msgstr "Súbor&1:"
-#: Merge.rc:1247
+#: Merge.rc:1249
#, c-format
msgid "File&2:"
msgstr "Súbor&2:"
-#: Merge.rc:1251
+#: Merge.rc:1253
#, c-format
msgid "&Swap"
msgstr "&Vymeni\9d navzájom"
-#: Merge.rc:1252
+#: Merge.rc:1254
#, c-format
msgid "&Append to existing file"
msgstr "&Roz\9aíri\9d existujúci súbor"
-#: Merge.rc:1254
+#: Merge.rc:1256
#, c-format
msgid "&Result:"
msgstr "&Výsledok:"
-#: Merge.rc:1257
+#: Merge.rc:1259
#, c-format
msgid "Bro&wse..."
msgstr "&Prechádza\9d..."
-#: Merge.rc:1258
+#: Merge.rc:1260
#, c-format
msgid "&Format"
msgstr "&Formát"
-#: Merge.rc:1259
+#: Merge.rc:1261
#, c-format
msgid "St&yle:"
msgstr "\8a&týl:"
-#: Merge.rc:1262
+#: Merge.rc:1264
#, c-format
msgid "&Context:"
msgstr "&Kontext:"
-#: Merge.rc:1272
+#: Merge.rc:1274
#, c-format
msgid "Ignor&e blank lines"
msgstr "Ignor&ova\9d prázdne riadky"
-#: Merge.rc:1279
+#: Merge.rc:1281
#, c-format
msgid "Inclu&de command line"
msgstr "Zahrnú\9d príkazový ria&dok"
-#: Merge.rc:1281
+#: Merge.rc:1283
#, c-format
msgid "Open to e&xternal editor"
msgstr "Otvori\9d v e&xternom editore"
-#: Merge.rc:1306
+#: Merge.rc:1308
#, c-format
msgid "Display Columns"
msgstr "Zobrazova\9d ståpce"
-#: Merge.rc:1312
+#: Merge.rc:1314
#, c-format
msgid "Move &Up"
msgstr "Presunú\9d &hore"
-#: Merge.rc:1313
+#: Merge.rc:1315
#, c-format
msgid "Move &Down"
msgstr "Presunú\9d &dolu"
-#: Merge.rc:1323
+#: Merge.rc:1325
#, c-format
msgid "Select Unpacker"
msgstr "Vyber rozba¾ovací program"
-#: Merge.rc:1328
+#: Merge.rc:1330
#, c-format
msgid "File unpacker:"
msgstr "Rozba¾ovací program:"
-#: Merge.rc:1331
+#: Merge.rc:1333
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr "Zobrazi\9d v\9aetky rozba¾ovacie programy, nekontrolova\9d príponu"
-#: Merge.rc:1334
+#: Merge.rc:1336
#, c-format
msgid "Extensions list:"
msgstr "Zoznam prípon:"
-#: Merge.rc:1335
+#: Merge.rc:1337
#, c-format
msgid "Description:"
msgstr "Popis:"
-#: Merge.rc:1346
+#: Merge.rc:1348
#, c-format
msgid "Stop"
msgstr "Zastavi\9d"
-#: Merge.rc:1351
+#: Merge.rc:1353
#, c-format
msgid "Comparing items..."
msgstr "Porovnávam polo\9eky..."
-#: Merge.rc:1352
+#: Merge.rc:1354
#, c-format
msgid "Items compared:"
msgstr "Porovnaných polo\9eiek:"
-#: Merge.rc:1353
+#: Merge.rc:1355
#, c-format
msgid "Items total:"
msgstr "Polo\9eiek celkom:"
-#: Merge.rc:1360
+#: Merge.rc:1362
#, c-format
msgid "Go To"
msgstr "Prejs\9d na"
-#: Merge.rc:1363
+#: Merge.rc:1365
#, c-format
msgid "G&oto:"
msgstr "Ch&oï na:"
-#: Merge.rc:1365
+#: Merge.rc:1367
#, c-format
msgid "File"
msgstr "Súbor"
-#: Merge.rc:1372
+#: Merge.rc:1374
#, c-format
msgid "Goto what"
msgstr "Prejs\9d na..."
-#: Merge.rc:1373
+#: Merge.rc:1375
#, c-format
msgid "Li&ne"
msgstr "Riad&ok"
-#: Merge.rc:1375
+#: Merge.rc:1377
#, c-format
msgid "&Difference"
msgstr "&Rozdiel"
-#: Merge.rc:1377
+#: Merge.rc:1379
#, c-format
msgid "&Go To"
msgstr "&Prejs\9d na"
-#: Merge.rc:1383
-#: Merge.rc:2064
+#: Merge.rc:1385
+#: Merge.rc:2066
#, c-format
msgid "Compare"
msgstr "Porovnávanie"
-#: Merge.rc:1386
+#: Merge.rc:1388
#, c-format
msgid "Whitespace"
msgstr "Netlaèite¾né znaky"
-#: Merge.rc:1387
+#: Merge.rc:1389
#, c-format
msgid "&Compare"
msgstr "Porovnáva\9d &netlaèite¾né znaky"
-#: Merge.rc:1388
+#: Merge.rc:1390
#, c-format
msgid "&Ignore change"
msgstr "Ignorova\9d &zmeny v prázdnom mieste"
-#: Merge.rc:1389
+#: Merge.rc:1391
#, c-format
msgid "I&gnore all"
msgstr "Ignorova\9d &celé prázdne miesto"
-#: Merge.rc:1390
+#: Merge.rc:1392
#, c-format
msgid "Ignore blan&k lines"
msgstr "Ignorova\9d prázdne riad&ky"
-#: Merge.rc:1391
+#: Merge.rc:1393
#, c-format
msgid "Ignore &case"
msgstr "Ignorova\9d m&alé/VE¼KÉ"
-#: Merge.rc:1394
+#: Merge.rc:1396
#, c-format
msgid "E&nable moved block detection"
msgstr "Zapnú\9d &detekciu pohyblivého bloku"
-#: Merge.rc:1395
+#: Merge.rc:1397
#, c-format
msgid "&Match similar lines"
msgstr "&Podobné riadky ako zhodné"
-#: Merge.rc:1397
+#: Merge.rc:1399
#, c-format
msgid "Filter Comments"
msgstr "Filtrova\9d komentáre"
-#: Merge.rc:1404
-#: Merge.rc:2065
+#: Merge.rc:1406
+#: Merge.rc:2067
#, c-format
msgid "Editor"
msgstr "Editor"
-#: Merge.rc:1407
+#: Merge.rc:1409
#, c-format
msgid "&Highlight syntax"
msgstr "Zvýrazòovanie syntaxe"
-#: Merge.rc:1409
+#: Merge.rc:1411
#, c-format
msgid "&Automatic rescan"
msgstr "Automatické p&reskenovanie"
-#: Merge.rc:1411
+#: Merge.rc:1413
#, c-format
msgid "&Preserve original EOL chars"
msgstr "&Zachováva\9d pôvodné zakonèenie riadkov"
-#: Merge.rc:1413
+#: Merge.rc:1415
#, c-format
msgid "Tabs"
msgstr "Tabulátory"
-#: Merge.rc:1414
+#: Merge.rc:1416
#, c-format
msgid "&Tab size:"
msgstr "&Nastavenie tabulátorov:"
-#: Merge.rc:1417
+#: Merge.rc:1419
#, c-format
msgid "&Insert Tabs"
msgstr "Vklada\9d tabulátory"
-#: Merge.rc:1419
+#: Merge.rc:1421
#, c-format
msgid "Insert &Spaces"
msgstr "Vklada\9d medzery"
-#: Merge.rc:1421
+#: Merge.rc:1423
#, c-format
msgid "Line Difference Coloring"
msgstr "Farebné odlí\9aenie riadkových rozdielov"
-#: Merge.rc:1423
+#: Merge.rc:1425
#, c-format
msgid "View line differences"
msgstr "Zobrazova\9d riadkové rozdiely"
-#: Merge.rc:1425
+#: Merge.rc:1427
#, c-format
msgid "&Character level"
msgstr "Úroveò &znaku"
-#: Merge.rc:1427
+#: Merge.rc:1429
#, c-format
msgid "&Word-level:"
msgstr "Úroveò &slova:"
-#: Merge.rc:1431
+#: Merge.rc:1433
#, c-format
msgid "W&ord break characters:"
msgstr ""
-#: Merge.rc:1444
+#: Merge.rc:1446
#, c-format
msgid "Filefilters"
msgstr "Filtre súborov"
-#: Merge.rc:1450
+#: Merge.rc:1452
#, c-format
msgid "Test"
msgstr "Testova\9d"
-#: Merge.rc:1451
+#: Merge.rc:1453
#, c-format
msgid "Install..."
msgstr "In\9atalova\9d..."
-#: Merge.rc:1452
+#: Merge.rc:1454
#, c-format
msgid "New..."
msgstr "Nový..."
-#: Merge.rc:1453
+#: Merge.rc:1455
#, c-format
msgid "Edit..."
msgstr "Upravova\9d..."
-#: Merge.rc:1454
+#: Merge.rc:1456
#, c-format
msgid "Delete..."
msgstr "Zmaza\9d..."
-#: Merge.rc:1460
+#: Merge.rc:1462
#, c-format
msgid "Save modified files?"
msgstr "Ulo\9ei\9d zmenené súbory?"
-#: Merge.rc:1463
+#: Merge.rc:1465
#, c-format
msgid "Left side file"
msgstr "Súbor na ¾avej strane"
-#: Merge.rc:1466
+#: Merge.rc:1468
#, c-format
msgid "&Save changes"
msgstr "&Ulo\9ei\9d zmeny"
-#: Merge.rc:1468
+#: Merge.rc:1470
#, c-format
msgid "&Discard changes"
msgstr "&Zahodi\9d zmeny"
-#: Merge.rc:1470
+#: Merge.rc:1472
#, c-format
msgid "Middle side file"
msgstr ""
-#: Merge.rc:1473
+#: Merge.rc:1475
#, c-format
msgid "Sa&ve changes"
msgstr ""
-#: Merge.rc:1475
+#: Merge.rc:1477
#, c-format
msgid "Disca&rd changes"
msgstr ""
-#: Merge.rc:1477
+#: Merge.rc:1479
#, c-format
msgid "Right side file"
msgstr "Súbor na pravej strane"
-#: Merge.rc:1480
+#: Merge.rc:1482
#, c-format
msgid "S&ave changes"
msgstr "U&lo\9ei\9d zmeny"
-#: Merge.rc:1482
+#: Merge.rc:1484
#, c-format
msgid "Dis&card changes"
msgstr "Z&ahodi\9d zmeny"
-#: Merge.rc:1484
+#: Merge.rc:1486
#, c-format
msgid "Disca&rd All"
msgstr ""
-#: Merge.rc:1491
-#: Merge.rc:1697
-#: Merge.rc:2071
+#: Merge.rc:1493
+#: Merge.rc:1699
+#: Merge.rc:2073
#, c-format
msgid "Codepage"
msgstr "Kódová stránka"
-#: Merge.rc:1494
+#: Merge.rc:1496
#, c-format
msgid "Default Codepage"
msgstr "Predvolená kódová stránka"
-#: Merge.rc:1495
+#: Merge.rc:1497
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "Zvo¾te predvolenú kódovú stránku, ktorá sa pou\9eije pri naèítaní ne-Unicode súborov:"
-#: Merge.rc:1497
+#: Merge.rc:1499
#, c-format
msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
msgstr ""
-#: Merge.rc:1500
+#: Merge.rc:1502
#, c-format
msgid "Detect codepage for text files using mlang.dll\nneed to restart session"
msgstr ""
-#: Merge.rc:1505
+#: Merge.rc:1507
#, c-format
msgid "System codepage"
msgstr "Systémová kódová stránka"
-#: Merge.rc:1507
+#: Merge.rc:1509
#, c-format
msgid "According to WinMerge User Interface"
msgstr "Pod¾a pou\9eívate¾ského rozhrania WinMerge"
-#: Merge.rc:1509
+#: Merge.rc:1511
#, c-format
msgid "Custom codepage:"
msgstr ""
-#: Merge.rc:1518
+#: Merge.rc:1520
#, c-format
msgid "Options"
msgstr "Nastavenia"
-#: Merge.rc:1529
+#: Merge.rc:1531
#, c-format
msgid " Categories"
msgstr " Kategórie"
-#: Merge.rc:1531
+#: Merge.rc:1533
#, c-format
msgid "Import..."
msgstr "Importova\9d..."
-#: Merge.rc:1532
+#: Merge.rc:1534
#, c-format
msgid "Export..."
msgstr "Exportova\9d..."
-#: Merge.rc:1537
-#: Merge.rc:1745
+#: Merge.rc:1539
+#: Merge.rc:1747
#, c-format
msgid "Dialog"
msgstr "Dialóg"
-#: Merge.rc:1540
+#: Merge.rc:1542
#, c-format
msgid "Keywords:"
msgstr "K¾úèové slová:"
-#: Merge.rc:1541
+#: Merge.rc:1543
#, c-format
msgid "Function names:"
msgstr "Názvy funkcií:"
-#: Merge.rc:1542
+#: Merge.rc:1544
#, c-format
msgid "Comments:"
msgstr "Komentáre:"
-#: Merge.rc:1543
+#: Merge.rc:1545
#, c-format
msgid "Numbers:"
msgstr "Èísla:"
-#: Merge.rc:1544
+#: Merge.rc:1546
#, c-format
msgid "Operators:"
msgstr "Operátory:"
-#: Merge.rc:1545
+#: Merge.rc:1547
#, c-format
msgid "Strings:"
msgstr "Re\9dazce:"
-#: Merge.rc:1546
+#: Merge.rc:1548
#, c-format
msgid "Preprocessor:"
msgstr "Preprocesor:"
-#: Merge.rc:1547
+#: Merge.rc:1549
#, c-format
msgid "User 1:"
msgstr "Pou\9eívate¾ 1:"
-#: Merge.rc:1548
+#: Merge.rc:1550
#, c-format
msgid "User 2:"
msgstr "Pou\9eívate¾ 2:"
-#: Merge.rc:1553
-#: Merge.rc:1558
-#: Merge.rc:1563
-#: Merge.rc:1568
-#: Merge.rc:1573
-#: Merge.rc:1578
-#: Merge.rc:1583
-#: Merge.rc:1588
-#: Merge.rc:1593
+#: Merge.rc:1555
+#: Merge.rc:1560
+#: Merge.rc:1565
+#: Merge.rc:1570
+#: Merge.rc:1575
+#: Merge.rc:1580
+#: Merge.rc:1585
+#: Merge.rc:1590
+#: Merge.rc:1595
#, c-format
msgid "Bold"
msgstr "Hrubo"
-#: Merge.rc:1601
+#: Merge.rc:1603
#, c-format
msgid "Folder Compare Report"
msgstr "Správa o porovnaní adresárov"
-#: Merge.rc:1604
+#: Merge.rc:1606
#, c-format
msgid "Report &File:"
msgstr "&Súbor správy:"
-#: Merge.rc:1607
-#: Merge.rc:1783
-#: Merge.rc:1787
-#: Merge.rc:1814
+#: Merge.rc:1609
+#: Merge.rc:1785
+#: Merge.rc:1789
+#: Merge.rc:1816
#, c-format
msgid "Browse..."
msgstr "Preh¾adáva\9d..."
-#: Merge.rc:1608
+#: Merge.rc:1610
#, c-format
msgid "&Style:"
msgstr "&\8atýl:"
-#: Merge.rc:1611
+#: Merge.rc:1613
#, c-format
msgid "&Include File Compare Report"
msgstr ""
-#: Merge.rc:1613
+#: Merge.rc:1615
#, c-format
msgid "&Copy to Clipboard"
msgstr "&Kopírova\9d do schránky"
-#: Merge.rc:1621
+#: Merge.rc:1623
#, c-format
msgid "Shared or Private Filter"
msgstr "Zdie¾aný alebo súkromný filter"
-#: Merge.rc:1624
+#: Merge.rc:1626
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "Aký typ filtra chcete vytvori\9d?"
-#: Merge.rc:1626
+#: Merge.rc:1628
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "Zdie¾aný filter (pre v\9aetkých pou\9eívate¾ov tohoto poèítaèa)"
-#: Merge.rc:1628
+#: Merge.rc:1630
#, c-format
msgid "Private Filter (only for current user)"
msgstr "Súkromný filter (len pre aktuálneho pou\9eívate¾a)"
-#: Merge.rc:1636
-#: Merge.rc:2072
+#: Merge.rc:1638
+#: Merge.rc:2074
#, c-format
msgid "Archive Support"
msgstr "Podpora archívov"
-#: Merge.rc:1639
+#: Merge.rc:1641
#, c-format
msgid "&Enable archive file support"
msgstr "&Zapnú\9d podporu archívov"
-#: Merge.rc:1641
+#: Merge.rc:1643
#, c-format
msgid "&Detect archive type from file signature"
msgstr "&Detekova\9d typ archívu z hlavièky súboru"
-#: Merge.rc:1649
+#: Merge.rc:1651
#, c-format
msgid "Compare Statistics"
msgstr "\8atatistika porovnania"
-#: Merge.rc:1652
+#: Merge.rc:1654
#, c-format
msgid "Folders:"
msgstr "Adresáre:"
-#: Merge.rc:1653
+#: Merge.rc:1655
#, c-format
msgid "Files:"
msgstr "Súbory:"
-#: Merge.rc:1654
-#: Merge.rc:2447
+#: Merge.rc:1656
+#: Merge.rc:2449
#, c-format
msgid "Different"
msgstr "Odli\9ané"
-#: Merge.rc:1655
+#: Merge.rc:1657
#, c-format
msgid "Text:"
msgstr "Text:"
-#: Merge.rc:1658
-#: Merge.rc:1682
+#: Merge.rc:1660
+#: Merge.rc:1684
#, c-format
msgid "Binary:"
msgstr "Binárne:"
-#: Merge.rc:1661
+#: Merge.rc:1663
#, c-format
msgid "Unique"
msgstr "Jedineèné"
-#: Merge.rc:1662
+#: Merge.rc:1664
#, c-format
msgid "Left:"
msgstr "V¾avo:"
-#: Merge.rc:1667
+#: Merge.rc:1669
#, c-format
msgid "Middle:"
msgstr ""
-#: Merge.rc:1672
+#: Merge.rc:1674
#, c-format
msgid "Right:"
msgstr "Vpravo:"
-#: Merge.rc:1677
-#: Merge.rc:2437
+#: Merge.rc:1679
+#: Merge.rc:2439
#, c-format
msgid "Identical"
msgstr "Identické"
-#: Merge.rc:1686
+#: Merge.rc:1688
#, c-format
msgid "Total:"
msgstr "Celkom:"
-#: Merge.rc:1691
+#: Merge.rc:1693
#, c-format
msgid "Close"
msgstr "Zatvori\9d"
-#: Merge.rc:1700
+#: Merge.rc:1702
#, c-format
msgid "Affects"
msgstr "Ovplyvòuje"
-#: Merge.rc:1703
-#: Merge.rc:1706
-#: Merge.rc:1709
+#: Merge.rc:1705
+#: Merge.rc:1708
+#: Merge.rc:1711
#, c-format
msgid "(Affects)"
msgstr "(Ovplyvòuje)"
-#: Merge.rc:1710
+#: Merge.rc:1712
#, c-format
msgid "Select Codepage for"
msgstr "Zvo¾te kódovú stránku pre"
-#: Merge.rc:1711
+#: Merge.rc:1713
#, c-format
msgid "&File Loading:"
msgstr "&Naèítanie súboru:"
-#: Merge.rc:1714
+#: Merge.rc:1716
#, c-format
msgid "File &Saving:"
msgstr "&Ukladanie súboru:"
-#: Merge.rc:1717
+#: Merge.rc:1719
#, c-format
msgid "&Use same codepage for both"
msgstr "&Pou\9ei\9d pre obe rovnakú kódovú stránku"
-#: Merge.rc:1720
+#: Merge.rc:1722
#, c-format
msgid "&Apply"
msgstr "&Pou\9ei\9d"
-#: Merge.rc:1721
-#: Merge.rc:2038
+#: Merge.rc:1723
+#: Merge.rc:2040
#, c-format
msgid "&Cancel"
msgstr "&Zru\9ai\9d"
-#: Merge.rc:1726
+#: Merge.rc:1728
#, c-format
msgid "Test Filter"
msgstr "Test filtra"
-#: Merge.rc:1729
+#: Merge.rc:1731
#, c-format
msgid "Testing filter ..."
msgstr "Testujem filter ..."
-#: Merge.rc:1731
+#: Merge.rc:1733
#, c-format
msgid "&Enter text to test:"
msgstr "&Zadajte testovací re\9dazec:"
-#: Merge.rc:1733
+#: Merge.rc:1735
#, c-format
msgid "&Folder Name"
msgstr "&Názov adresára"
-#: Merge.rc:1735
+#: Merge.rc:1737
#, c-format
msgid "Result:"
msgstr "Výsledok:"
-#: Merge.rc:1739
+#: Merge.rc:1741
#, c-format
msgid "&Test"
msgstr "&Testova\9d"
-#: Merge.rc:1740
+#: Merge.rc:1742
#, c-format
msgid "&Close"
msgstr "&Zatvori\9d"
-#: Merge.rc:1748
+#: Merge.rc:1750
#, c-format
msgid "&Use customized text colors"
msgstr "&Pou\9eíva\9d \9atandardné farby textu"
-#: Merge.rc:1751
+#: Merge.rc:1753
#, c-format
msgid "Custom text colors"
msgstr "Vlastné farby textu"
-#: Merge.rc:1753
+#: Merge.rc:1755
#, c-format
msgid "Whitespace:"
msgstr "Netlaèite¾né znaky:"
-#: Merge.rc:1754
+#: Merge.rc:1756
#, c-format
msgid "Regular text:"
msgstr "Be\9ený text:"
-#: Merge.rc:1755
+#: Merge.rc:1757
#, c-format
msgid "Selection:"
msgstr "Výber:"
-#: Merge.rc:1778
+#: Merge.rc:1780
#, c-format
msgid "Paths"
msgstr "Cesty"
-#: Merge.rc:1781
+#: Merge.rc:1783
#, c-format
msgid "&Left:"
msgstr "&¼avý:"
-#: Merge.rc:1784
+#: Merge.rc:1786
#, c-format
msgid "R&ead-only"
msgstr "&Len na èítanie"
-#: Merge.rc:1785
+#: Merge.rc:1787
#, c-format
msgid "&Right:"
msgstr "P&ravý:"
-#: Merge.rc:1788
+#: Merge.rc:1790
#, c-format
msgid "Re&ad-only"
msgstr "Len na èít&anie"
-#: Merge.rc:1789
+#: Merge.rc:1791
#, c-format
msgid "&Filter:"
msgstr "Pr&ípony:"
-#: Merge.rc:1794
+#: Merge.rc:1796
#, c-format
msgid "Open..."
msgstr "Otvori\9d..."
-#: Merge.rc:1795
+#: Merge.rc:1797
#, c-format
msgid "Save..."
msgstr "Ulo\9ei\9d..."
-#: Merge.rc:1800
-#: Merge.rc:2073
+#: Merge.rc:1802
+#: Merge.rc:2075
#, c-format
msgid "Backup Files"
msgstr "Zálo\9ené súbory"
-#: Merge.rc:1803
+#: Merge.rc:1805
#, c-format
msgid "Create backup files in:"
msgstr "Vytvára\9d zálo\9ené súbory v:"
-#: Merge.rc:1804
+#: Merge.rc:1806
#, c-format
msgid "&Folder compare"
msgstr "Porovnávanie &adresárov"
-#: Merge.rc:1806
+#: Merge.rc:1808
#, c-format
msgid "Fil&e compare"
msgstr "Porovnávanie &súborov"
-#: Merge.rc:1808
+#: Merge.rc:1810
#, c-format
msgid "Create backup files into:"
msgstr "Vytvára\9d zálo\9ené súbory do:"
-#: Merge.rc:1809
+#: Merge.rc:1811
#, c-format
msgid "&Original file's folder"
msgstr "Adresár &originálneho súboru"
-#: Merge.rc:1811
+#: Merge.rc:1813
#, c-format
msgid "&Global backup folder:"
msgstr "&Globálny adresár pre zálohy:"
-#: Merge.rc:1815
+#: Merge.rc:1817
#, c-format
msgid "Backup filename:"
msgstr "Názov zálo\9eného súboru:"
-#: Merge.rc:1816
+#: Merge.rc:1818
#, c-format
msgid "&Append .bak -extension"
msgstr "&Prida\9d roz\9aírenie .bak"
-#: Merge.rc:1818
+#: Merge.rc:1820
#, c-format
msgid "A&ppend timestamp"
msgstr "P&rida\9d èasovú známku"
-#: Merge.rc:1825
-#: Merge.rc:2360
+#: Merge.rc:1827
+#: Merge.rc:2362
#, c-format
msgid "Confirm Copy"
msgstr "Potvrdi\9d kopírovanie"
-#: Merge.rc:1829
+#: Merge.rc:1831
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Ste si istý, \9ee chcete skopírova\9d XXX polo\9eiek?"
-#: Merge.rc:1831
+#: Merge.rc:1833
#, c-format
msgid "From left"
msgstr "Z¾ava"
-#: Merge.rc:1834
+#: Merge.rc:1836
#, c-format
msgid "To right"
msgstr "Doprava"
-#: Merge.rc:1837
+#: Merge.rc:1839
#, c-format
msgid "Yes"
msgstr "Áno"
-#: Merge.rc:1838
+#: Merge.rc:1840
#, c-format
msgid "No"
msgstr "Nie"
-#: Merge.rc:1844
+#: Merge.rc:1846
#, c-format
msgid "Plugins"
msgstr ""
-#: Merge.rc:1847
+#: Merge.rc:1849
#, c-format
msgid "&Enable plugins"
msgstr ""
-#: Merge.rc:1859
-#: Merge.rc:2074
+#: Merge.rc:1861
+#: Merge.rc:2076
#, c-format
msgid "Shell Integration"
msgstr ""
-#: Merge.rc:1862
+#: Merge.rc:1864
#, c-format
msgid "Explorer"
msgstr ""
-#: Merge.rc:1863
+#: Merge.rc:1865
#, c-format
msgid "E&nable advanced menu"
msgstr "Zap&nú\9d roz\9aírenú ponuku"
-#: Merge.rc:1865
+#: Merge.rc:1867
#, c-format
msgid "&Add to context menu"
msgstr ""
-#: Merge.rc:1867
+#: Merge.rc:1869
#, c-format
msgid "&Register shell extension"
msgstr ""
-#: Merge.rc:1868
+#: Merge.rc:1870
#, c-format
msgid "&Unregister shell extension"
msgstr ""
-#: Merge.rc:1873
-#: Merge.rc:2077
-#: Merge.rc:2381
+#: Merge.rc:1875
+#: Merge.rc:2079
+#: Merge.rc:2383
#, c-format
msgid "Folder"
msgstr "Adresár"
-#: Merge.rc:1878
+#: Merge.rc:1880
#, c-format
msgid "S&top after first difference"
msgstr "&Stop po prvom rozdiele"
-#: Merge.rc:1880
+#: Merge.rc:1882
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "Ign&orova\9d èasové rozdiely men\9aie ako 3 sekundy"
-#: Merge.rc:1882
+#: Merge.rc:1884
#, c-format
msgid "&Include unique subfolders contents"
msgstr ""
-#: Merge.rc:1884
+#: Merge.rc:1886
#, c-format
msgid "&Automatically expand all subfolders"
msgstr ""
-#: Merge.rc:1886
+#: Merge.rc:1888
#, c-format
msgid "Ignore &Reparse Points"
msgstr ""
-#: Merge.rc:1888
+#: Merge.rc:1890
#, c-format
msgid "&Quick compare limit (MB):"
msgstr ""
-#: Merge.rc:1895
-#: Merge.rc:2079
-#: Merge.rc:2422
-#: Merge.rc:2628
+#: Merge.rc:1897
+#: Merge.rc:2081
+#: Merge.rc:2424
+#: Merge.rc:2630
#, c-format
msgid "Binary"
msgstr "Binárny"
-#: Merge.rc:1898
+#: Merge.rc:1900
#, c-format
msgid "Binary File &Patterns:"
msgstr ""
-#: Merge.rc:1900
+#: Merge.rc:1902
#, c-format
msgid "Frhed settings"
msgstr ""
-#: Merge.rc:1901
+#: Merge.rc:1903
#, c-format
msgid "View &Settings..."
msgstr ""
-#: Merge.rc:1902
+#: Merge.rc:1904
#, c-format
msgid "&Binary Mode..."
msgstr ""
-#: Merge.rc:1903
+#: Merge.rc:1905
#, c-format
msgid "&Character Set..."
msgstr ""
-#: Merge.rc:1909
-#: Merge.rc:2078
+#: Merge.rc:1911
+#: Merge.rc:2080
#, c-format
msgid "Image"
msgstr ""
-#: Merge.rc:1912
+#: Merge.rc:1914
#, c-format
msgid "Image File &Patterns:"
msgstr ""
-#: Merge.rc:1925
+#: Merge.rc:1927
#, c-format
msgid "&Hex View"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1950
+#: Merge.rc:1952
#, c-format
msgid "040904e4"
msgstr "041b04e2"
#. VarFileInfo.Translation
-#: Merge.rc:1966
+#: Merge.rc:1968
#, c-format
msgid "0x409, 1252"
msgstr "0x41b, 1250"
-#: Merge.rc:1986
+#: Merge.rc:1988
#, c-format
msgid "EXT"
msgstr "ROZ"
-#: Merge.rc:1987
+#: Merge.rc:1989
#, c-format
msgid "CAP"
msgstr "CAPS"
-#: Merge.rc:1988
+#: Merge.rc:1990
#, c-format
msgid "NUM"
msgstr "NUM"
-#: Merge.rc:1989
+#: Merge.rc:1991
#, c-format
msgid "SCRL"
msgstr "SCRL"
-#: Merge.rc:1990
+#: Merge.rc:1992
#, c-format
msgid "OVR"
msgstr "CEZ"
-#: Merge.rc:1991
+#: Merge.rc:1993
#, c-format
msgid "REC"
msgstr "ZÁZN"
-#: Merge.rc:1997
+#: Merge.rc:1999
#, c-format
msgid "\nNew Documents (Ctrl+N)"
msgstr ""
-#: Merge.rc:1998
+#: Merge.rc:2000
#, c-format
msgid "\nOpen (Ctrl+O)"
msgstr ""
-#: Merge.rc:1999
+#: Merge.rc:2001
#, c-format
msgid "\nSave (Ctrl+S)"
msgstr ""
-#: Merge.rc:2005
+#: Merge.rc:2007
#, c-format
msgid "Unknown error attempting to open project file"
msgstr "Neznáma chyba pri pokuse otvori\9d súbor projektu"
-#: Merge.rc:2006
+#: Merge.rc:2008
#, c-format
msgid "Unknown error attempting to save project file"
msgstr "Neznáma chyba pri pokuse ulo\9ei\9d súbor projektu"
-#: Merge.rc:2007
+#: Merge.rc:2009
#, c-format
msgid "Project File"
msgstr "Súbor projektu"
-#: Merge.rc:2008
+#: Merge.rc:2010
#, c-format
msgid "Project file successfully loaded."
msgstr "Súbor projektu úspe\9ane naèítaný."
-#: Merge.rc:2009
+#: Merge.rc:2011
#, c-format
msgid "Project file successfully saved."
msgstr "Súbor projektu úspe\9ane ulo\9eený."
-#: Merge.rc:2015
+#: Merge.rc:2017
#, c-format
msgid "\nUndo (Ctrl+Z)"
msgstr ""
-#: Merge.rc:2016
+#: Merge.rc:2018
#, c-format
msgid "\nRedo (Ctrl+Y)"
msgstr ""
-#: Merge.rc:2023
+#: Merge.rc:2025
#, c-format
msgid ""
"\n"
"WinMerge File Compare"
msgstr ""
-#: Merge.rc:2024
+#: Merge.rc:2026
#, c-format
msgid ""
"\n"
"WinMerge Folder Compare"
msgstr ""
-#: Merge.rc:2030
+#: Merge.rc:2032
#, c-format
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
msgstr ""
-#: Merge.rc:2031
+#: Merge.rc:2033
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr ""
-#: Merge.rc:2039
+#: Merge.rc:2041
#, c-format
msgid "&Abort"
msgstr "&Zru\9ai\9d"
-#: Merge.rc:2040
+#: Merge.rc:2042
#, c-format
msgid "&Retry"
msgstr "&Znova"
-#: Merge.rc:2041
+#: Merge.rc:2043
#, c-format
msgid "&Ignore"
msgstr "&Ignorova\9d"
-#: Merge.rc:2042
+#: Merge.rc:2044
#, c-format
msgid "Ignore &all"
msgstr "Ignorova\9d &v\9aetky"
-#: Merge.rc:2043
+#: Merge.rc:2045
#, c-format
msgid "&Yes"
msgstr "Á&no"
-#: Merge.rc:2049
+#: Merge.rc:2051
#, c-format
msgid "Yes to &all"
msgstr "Áno &pre v\9aetky"
-#: Merge.rc:2050
+#: Merge.rc:2052
#, c-format
msgid "&No"
msgstr "&Nie"
-#: Merge.rc:2051
+#: Merge.rc:2053
#, c-format
msgid "No to a&ll"
msgstr "Nie pre &v\9aetky"
-#: Merge.rc:2052
+#: Merge.rc:2054
#, c-format
msgid "&Continue"
msgstr "Po&kraèova\9d"
-#: Merge.rc:2053
+#: Merge.rc:2055
#, c-format
msgid "&Skip"
msgstr "Pre&skoèi\9d"
-#: Merge.rc:2054
+#: Merge.rc:2056
#, c-format
msgid "Skip &all"
msgstr "Preskoèi\9d v\9a&etky"
-#: Merge.rc:2056
+#: Merge.rc:2058
#, c-format
msgid "Don't display this &message again."
msgstr "U\9e túto správu nezobrazova\9d."
-#: Merge.rc:2057
+#: Merge.rc:2059
#, c-format
msgid "Don't ask this &question again."
msgstr "U\9e sa túto otázku nepýta\9d."
-#: Merge.rc:2068
+#: Merge.rc:2070
#, c-format
msgid "Syntax"
msgstr ""
-#: Merge.rc:2070
+#: Merge.rc:2072
#, c-format
msgid "Version Control"
msgstr "Kontrola verzií"
-#: Merge.rc:2075
-#: Merge.rc:2421
+#: Merge.rc:2077
+#: Merge.rc:2423
#, c-format
msgid "Differences"
msgstr "Rozdiely"
-#: Merge.rc:2086
+#: Merge.rc:2088
#, c-format
msgid "To:"
msgstr "Do:"
-#: Merge.rc:2087
+#: Merge.rc:2089
#, c-format
msgid "From left:"
msgstr "Z¾ava:"
-#: Merge.rc:2088
+#: Merge.rc:2090
#, c-format
msgid "To left:"
msgstr "Do¾ava:"
-#: Merge.rc:2089
+#: Merge.rc:2091
#, c-format
msgid "From right:"
msgstr "Sprava:"
-#: Merge.rc:2090
+#: Merge.rc:2092
#, c-format
msgid "To right:"
msgstr "Do¾ava:"
-#: Merge.rc:2096
+#: Merge.rc:2098
#, c-format
msgid "Version %1"
msgstr "Verzia %1 - Slovenský preklad"
-#: Merge.rc:2097
+#: Merge.rc:2099
#, c-format
msgid "Unicode"
msgstr "Unicode"
-#: Merge.rc:2098
+#: Merge.rc:2100
#, c-format
msgid "X64"
msgstr ""
-#: Merge.rc:2104
+#: Merge.rc:2106
#, c-format
msgid "Options (%1)"
msgstr "Vlastnosti (%1)"
-#: Merge.rc:2105
+#: Merge.rc:2107
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Znova sa zobrazujú v\9aetky okná so správami."
-#: Merge.rc:2107
+#: Merge.rc:2109
#, c-format
msgid ""
"Value in Tab size -field is not in range WinMerge accepts.\n"
"\n"
"Pou\9eite hodnoty 1 - %1."
-#: Merge.rc:2113
+#: Merge.rc:2115
#, c-format
msgid "Open"
msgstr "Otvori\9d"
-#: Merge.rc:2114
+#: Merge.rc:2116
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programy|*.exe;*.bat;*.cmd|V\9aetky súbory (*.*)|*.*||"
-#: Merge.rc:2115
+#: Merge.rc:2117
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "V\9aetky súbory (*.*)|*.*||"
-#: Merge.rc:2116
+#: Merge.rc:2118
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge projekty (*.WinMerge)|*.WinMerge||"
-#: Merge.rc:2118
+#: Merge.rc:2120
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Súbory s nastavením (*.ini)|*.ini|V\9aetky súbory (*.*)|*.*||"
-#: Merge.rc:2124
+#: Merge.rc:2126
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Textové súbory (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|V\9aetky súbory (*.*)|*.*||"
-#: Merge.rc:2125
+#: Merge.rc:2127
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML súbory (*.htm,*.html)|*.htm;*.html|V\9aetky súbory (*.*)|*.*||"
-#: Merge.rc:2126
+#: Merge.rc:2128
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML súbory (*.xml)|*.xml|V\9aetky súbory (*.*)|*.*||"
-#: Merge.rc:2143
-#: Merge.rc:2637
+#: Merge.rc:2145
+#: Merge.rc:2639
#, c-format
msgid "Name"
msgstr "Názov"
-#: Merge.rc:2144
+#: Merge.rc:2146
#, c-format
msgid "Location"
msgstr "Umiestnenie"
-#: Merge.rc:2145
+#: Merge.rc:2147
#, c-format
msgid "Filters"
msgstr "Filtre"
-#: Merge.rc:2146
+#: Merge.rc:2148
#, c-format
msgid "[F] "
msgstr "[F] "
-#: Merge.rc:2147
-#: Merge.rc:2639
+#: Merge.rc:2149
+#: Merge.rc:2641
#, c-format
msgid "Description"
msgstr "Popis"
-#: Merge.rc:2148
+#: Merge.rc:2150
#, c-format
msgid "Select filename for new filter"
msgstr "Zvo¾te názov súboru pre nový filter"
-#: Merge.rc:2149
+#: Merge.rc:2151
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Filtre súborov (*.flt)|*.flt|V\9aetky súbory (*.*)|*.*||"
-#: Merge.rc:2151
+#: Merge.rc:2153
#, c-format
msgid ""
"Cannot find file filter template file!\n"
"Prosím, skopírujte súbor %1 do adresára WinMerge/Filters :\n"
"%2."
-#: Merge.rc:2153
+#: Merge.rc:2155
#, c-format
msgid ""
"Cannot copy filter template file to filter folder:\n"
"\n"
"Prosím, uistite sa, \9ee adresár existuje a dá sa doòho zapisova\9d."
-#: Merge.rc:2155
+#: Merge.rc:2157
#, c-format
msgid ""
"User's filter file folder is not defined!\n"
"\n"
"Prosím, vyberte adresár pre filtre v dialógu Nastavienia/Systém."
-#: Merge.rc:2157
+#: Merge.rc:2159
#, c-format
msgid ""
"Failed to delete the filter file:\n"
"\n"
"Mo\9eno je filter len na èítanie?"
-#: Merge.rc:2158
+#: Merge.rc:2160
#, c-format
msgid "Locate filter file to install"
msgstr "Nájs\9d súbor filtra, ktorý sa nain\9ataluje"
-#: Merge.rc:2160
+#: Merge.rc:2162
#, c-format
msgid ""
"Installing filter file failed.\n"
"\n"
"Nepodarilo sa skopírova\9d nový súbor do adresára s filtrami."
-#: Merge.rc:2162
+#: Merge.rc:2164
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr "Filter u\9e existuje. Prepísa\9d existujúci filter?"
-#: Merge.rc:2168
+#: Merge.rc:2170
#, c-format
msgid "Regular expression"
msgstr "Regulárny výraz"
-#: Merge.rc:2174
+#: Merge.rc:2176
#, c-format
msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
msgstr ""
-#: Merge.rc:2181
+#: Merge.rc:2183
#, c-format
msgid "&Path to SS.EXE:"
msgstr ""
-#: Merge.rc:2187
+#: Merge.rc:2189
#, c-format
msgid "Folder Comparison Results"
msgstr "Výsledok porovnania adresárov"
-#: Merge.rc:2188
+#: Merge.rc:2190
#, c-format
msgid "File Comparison"
msgstr "Porovnávanie súborov"
-#: Merge.rc:2189
+#: Merge.rc:2191
#, c-format
msgid "Untitled left"
msgstr "Nepomenovaný ¾avý"
-#: Merge.rc:2190
+#: Merge.rc:2192
#, c-format
msgid "Untitled middle"
msgstr ""
-#: Merge.rc:2191
+#: Merge.rc:2193
#, c-format
msgid "Untitled right"
msgstr "Nepomenovaný pravý"
-#: Merge.rc:2192
+#: Merge.rc:2194
#, c-format
msgid "Theirs File"
msgstr "Ich súbor"
-#: Merge.rc:2193
+#: Merge.rc:2195
#, c-format
msgid "Mine File"
msgstr "Môj súbor"
-#: Merge.rc:2199
+#: Merge.rc:2201
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)"
msgstr ""
-#: Merge.rc:2200
+#: Merge.rc:2202
#, c-format
msgid "Line: %s"
msgstr "Riadok: %s"
-#: Merge.rc:2201
+#: Merge.rc:2203
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)"
msgstr ""
-#: Merge.rc:2202
+#: Merge.rc:2204
#, c-format
msgid "Merge"
msgstr "Zlúèi\9d"
-#: Merge.rc:2203
+#: Merge.rc:2205
#, c-format
msgid "Difference %1 of %2"
msgstr "Rozdiel %1 z %2"
-#: Merge.rc:2204
+#: Merge.rc:2206
#, c-format
msgid "%1 Differences Found"
msgstr "nájdených %1 rozdielov"
-#: Merge.rc:2205
+#: Merge.rc:2207
#, c-format
msgid "1 Difference Found"
msgstr "nájdený jeden rozdiel"
#. Abbreviation from "Read Only"
-#: Merge.rc:2206
+#: Merge.rc:2208
#, c-format
msgid "RO"
msgstr "na èítanie"
-#: Merge.rc:2212
+#: Merge.rc:2214
#, c-format
msgid "Item %1 of %2"
msgstr "Polo\9eka %1 of %2"
-#: Merge.rc:2213
+#: Merge.rc:2215
#, c-format
msgid "Items: %1"
msgstr "Polo\9eky: %1"
-#: Merge.rc:2219
+#: Merge.rc:2221
#, c-format
msgid "Select two existing folders or files to compare"
msgstr "Vyberte 2 existujúce súbory alebo adresáre na porovnanie"
-#: Merge.rc:2220
+#: Merge.rc:2222
#, c-format
msgid "Folder Selection"
msgstr "Výber adresára"
-#: Merge.rc:2221
+#: Merge.rc:2223
#, c-format
msgid "Select two folders or two files to compare."
msgstr "Vyberte dva adresáre na porovnanie."
-#: Merge.rc:2222
+#: Merge.rc:2224
#, c-format
msgid "Left path is invalid!"
msgstr "¼avá cesta je neplatná!"
-#: Merge.rc:2223
+#: Merge.rc:2225
#, c-format
msgid "Middle path is invalid!"
msgstr ""
-#: Merge.rc:2224
+#: Merge.rc:2226
#, c-format
msgid "Right path is invalid!"
msgstr "Pravá cesta je neplatná!"
-#: Merge.rc:2225
+#: Merge.rc:2227
#, c-format
msgid "Both paths are invalid!"
msgstr "Obe cesty sú neplatné!"
-#: Merge.rc:2226
+#: Merge.rc:2228
#, c-format
msgid "Left and middle path is invalid!"
msgstr ""
-#: Merge.rc:2227
+#: Merge.rc:2229
#, c-format
msgid "Left and right path is invalid!"
msgstr ""
-#: Merge.rc:2228
+#: Merge.rc:2230
#, c-format
msgid "Middle and right path is invalid!"
msgstr ""
-#: Merge.rc:2229
+#: Merge.rc:2231
#, c-format
msgid "All paths are invalid!"
msgstr ""
-#: Merge.rc:2230
+#: Merge.rc:2232
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr "Zvo¾te si dva súbory pre zapnutie rozba¾ovaèa súborov."
-#: Merge.rc:2231
+#: Merge.rc:2233
#, c-format
msgid "Cannot compare file and folder!"
msgstr "Nemô\9eem porovna\9d súbor a adresár!"
-#: Merge.rc:2237
+#: Merge.rc:2239
#, c-format
msgid "File not found: %1"
msgstr "Súbor nenájdený: %1"
-#: Merge.rc:2238
+#: Merge.rc:2240
#, c-format
msgid "File not unpacked: %1"
msgstr "Súbor nerozbalený: %1"
-#: Merge.rc:2239
+#: Merge.rc:2241
#, c-format
msgid ""
"Cannot open file\n"
"\n"
"%2"
-#: Merge.rc:2240
+#: Merge.rc:2242
#, c-format
msgid "Failed to parse conflict file."
msgstr "Nepodarilo sa spracova\9d súbor konfliktov."
-#: Merge.rc:2241
+#: Merge.rc:2243
#, c-format
msgid ""
"The file\n"
"%1\n"
"nie je súbor konfliktov."
-#: Merge.rc:2247
+#: Merge.rc:2249
#, c-format
msgid "Save As"
msgstr "Ulo\9ei\9d ako"
-#: Merge.rc:2248
+#: Merge.rc:2250
#, c-format
msgid "Save changes to %1?"
msgstr "Ulo\9ei\9d zmeny do %1?"
-#: Merge.rc:2249
+#: Merge.rc:2251
#, 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 oznaèený len na èítanie. Chcete aj tak prepísa\9d súbor len na èítanie? (Stlaète Nie ak ho chcete zapísa\9d po novým názvom.)"
-#: Merge.rc:2250
+#: Merge.rc:2252
#, c-format
msgid "Error backing up file"
msgstr "Chyba pri zálohovaní súboru"
-#: Merge.rc:2252
+#: Merge.rc:2254
#, c-format
msgid ""
"Unable to backup original file:\n"
"\n"
"Pokraèova\9d napriek tomu?"
-#: Merge.rc:2253
+#: Merge.rc:2255
#, c-format
msgid ""
"Saving file failed.\n"
"\t-pou\9ei\9d iný názov súbory (Stlaète Ok)\n"
"\t-zru\9ai\9d prebiehajúcu operáciu (Stlaète Zru\9ai\9d)?"
-#: Merge.rc:2254
+#: Merge.rc:2256
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
"\n"
"\8eeláte si ulo\9ei\9d rozbalenú verziu do iného súboru?"
-#: Merge.rc:2255
+#: Merge.rc:2257
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
"\n"
"\8eeláte si ulo\9ei\9d rozbalenú verziu do iného súboru?"
-#: Merge.rc:2256
+#: Merge.rc:2258
#, c-format
msgid ""
"Another application has updated file\n"
"\n"
"Prepísa\9d zmenený súbor?"
-#: Merge.rc:2257
+#: Merge.rc:2259
#, c-format
msgid ""
"%1\n"
"%1\n"
"je oznaèený len na èítanie. \8eeláte si prepísa\9d polo\9eku len na èítanie?"
-#: Merge.rc:2258
+#: Merge.rc:2260
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
msgstr ""
-#: Merge.rc:2259
+#: Merge.rc:2261
#, c-format
msgid "Save Left File As"
msgstr "Ulo\9ei\9d ¾avý súbor ako"
-#: Merge.rc:2260
+#: Merge.rc:2262
#, c-format
msgid "Save Middle File As"
msgstr ""
-#: Merge.rc:2261
+#: Merge.rc:2263
#, c-format
msgid "Save Right File As"
msgstr "Ulo\9ei\9d pravý súbor ako"
-#: Merge.rc:2262
+#: Merge.rc:2264
#, c-format
msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
msgstr ""
-#: Merge.rc:2268
+#: Merge.rc:2270
#, c-format
msgid ""
"Cannot merge differences when documents are not in synch.\n"
"\n"
"Obnovte dokumenty, ne\9e budete pokraèova\9d."
-#: Merge.rc:2274
+#: Merge.rc:2276
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr "Musíte nastavi\9d cestu k projektu SourceSafe (napr.: $/MojProjekt)"
-#: Merge.rc:2275
+#: Merge.rc:2277
#, c-format
msgid "Checkout files from VSS..."
msgstr "Checkout súborov z VSS..."
-#: Merge.rc:2276
+#: Merge.rc:2278
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr "SourceSafe vrátil chybu pri pokuse skontrolova\9d súbor. Nemo\9eno pokraèova\9d..."
-#: Merge.rc:2277
+#: Merge.rc:2279
#, c-format
msgid "Error executing versioning system command."
msgstr "Chyba pri spú\9a\9daní príkazu zo Systému Verzií (CVS a pod)."
-#: Merge.rc:2278
+#: Merge.rc:2280
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr "pracovný adresár VSS Working Folder a umiestnenie aktuálneho súboru sa nezhodujú. Pokraèova\9d?"
-#: Merge.rc:2279
+#: Merge.rc:2281
#, c-format
msgid "No VSS database(s) found!"
msgstr "Nebola nájdená databáza VSS!"
-#: Merge.rc:2280
+#: Merge.rc:2282
#, c-format
msgid "Error from VSS:"
msgstr "Chyba VSS:"
-#: Merge.rc:2281
+#: Merge.rc:2283
#, c-format
msgid ""
"Versioning System returned an error while attempting to check in the file.\n"
" Prosím, skontrolujte konfiguráciu zvoleného poh¾adu.\n"
" Vráti\9d operáciu checkout?"
-#: Merge.rc:2282
+#: Merge.rc:2284
#, c-format
msgid ""
"Versioning System returned an error while attempting to undo checkout the file.\n"
"Systém pre správu verzií vrátil chybu pri pokuse vráti\9d (checkout) súbor.\n"
" Prosím, skontrolujte konfiguráciu zvoleného poh¾adu. "
-#: Merge.rc:2288
-#: Merge.rc:2632
+#: Merge.rc:2290
+#: Merge.rc:2634
#, c-format
msgid "None"
msgstr "\8eiadny"
-#: Merge.rc:2289
+#: Merge.rc:2291
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr "Visual SourceSafe (men\9aie ako 5.0)"
-#: Merge.rc:2290
+#: Merge.rc:2292
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr "Visual SourceSafe (5.0 a vy\9a\9aie)"
-#: Merge.rc:2292
+#: Merge.rc:2294
#, c-format
msgid "Break at whitespace"
msgstr "Preru\9ai\9d na netlaèite¾nom znaku"
-#: Merge.rc:2293
+#: Merge.rc:2295
#, c-format
msgid "Break at whitespace or punctuation"
msgstr "Preru\9ai\9d na netlaèite¾nom znaku alebo vetnej diakritike"
-#: Merge.rc:2299
+#: Merge.rc:2301
#, c-format
msgid "Right to Left (%1)"
msgstr "Kopíruj do ¾avej strany %1 z %2 vybraných polo\9eiek"
-#: Merge.rc:2300
+#: Merge.rc:2302
#, c-format
msgid "Right to Middle (%1)"
msgstr ""
-#: Merge.rc:2301
+#: Merge.rc:2303
#, c-format
msgid "Middle to Left (%1)"
msgstr ""
-#: Merge.rc:2302
+#: Merge.rc:2304
#, c-format
msgid "Middle to Right (%1)"
msgstr ""
-#: Merge.rc:2303
+#: Merge.rc:2305
#, c-format
msgid "Left to Right (%1)"
msgstr "Kopíruj do pravej strany %1 z %2 vybraných polo\9eiek"
-#: Merge.rc:2304
+#: Merge.rc:2306
#, c-format
msgid "Left to Middle (%1)"
msgstr ""
-#: Merge.rc:2311
-#: Merge.rc:2338
+#: Merge.rc:2313
+#: Merge.rc:2340
#, c-format
msgid "Left to... (%1)"
msgstr "Z¾ava... (%1)"
-#: Merge.rc:2312
-#: Merge.rc:2339
+#: Merge.rc:2314
+#: Merge.rc:2341
#, c-format
msgid "Middle to... (%1)"
msgstr ""
-#: Merge.rc:2313
-#: Merge.rc:2340
+#: Merge.rc:2315
+#: Merge.rc:2342
#, c-format
msgid "Right to... (%1)"
msgstr "Sprava... (%1)"
-#: Merge.rc:2314
+#: Merge.rc:2316
#, c-format
msgid "Both to... (%1)"
msgstr ""
-#: Merge.rc:2315
+#: Merge.rc:2317
#, c-format
msgid "All to... (%1)"
msgstr ""
-#: Merge.rc:2316
+#: Merge.rc:2318
#, c-format
msgid "Differences to... (%1)"
msgstr ""
-#: Merge.rc:2328
+#: Merge.rc:2330
#, c-format
msgid "Left (%1)"
msgstr "¼avý (%1)"
-#: Merge.rc:2329
+#: Merge.rc:2331
#, c-format
msgid "Middle (%1)"
msgstr ""
-#: Merge.rc:2330
+#: Merge.rc:2332
#, c-format
msgid "Right (%1)"
msgstr "Zma\9e %1 z %2 vybraných polo\9eiek z pravej strany"
-#: Merge.rc:2331
+#: Merge.rc:2333
#, c-format
msgid "Both (%1)"
msgstr "Zmaza\9d z oboch strán %1 z %2 vybraných polo\9eiek"
-#: Merge.rc:2332
+#: Merge.rc:2334
#, c-format
msgid "All (%1)"
msgstr ""
-#: Merge.rc:2344
+#: Merge.rc:2346
#, c-format
msgid "Left side - select destination folder:"
msgstr "¼avá strana - vyberte cie¾ový adresár:"
-#: Merge.rc:2345
+#: Merge.rc:2347
#, c-format
msgid "Middle side - select destination folder:"
msgstr ""
-#: Merge.rc:2346
+#: Merge.rc:2348
#, c-format
msgid "Right side - select destination folder:"
msgstr "Pravá strana - vyberte cie¾ový adresár:"
-#: Merge.rc:2347
+#: Merge.rc:2349
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 ovplyvnených súborov)"
-#: Merge.rc:2348
+#: Merge.rc:2350
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 ovplyvnených súborov z %2)"
-#: Merge.rc:2354
+#: Merge.rc:2356
#, c-format
msgid ""
"Are you sure you want to delete\n"
"\n"
"%1 ?"
-#: Merge.rc:2355
+#: Merge.rc:2357
#, c-format
msgid "Are you sure you want to copy:"
msgstr "Naozaj chcete skopírova\9d:"
-#: Merge.rc:2356
+#: Merge.rc:2358
#, c-format
msgid "Are you sure you want to copy %d items:"
msgstr "Naozaj chcete skopírova\9d %d polo\9eiek:"
-#: Merge.rc:2357
+#: Merge.rc:2359
#, c-format
msgid ""
"Operation aborted!\n"
"\n"
"Prosím, obnovte porovnanie."
-#: Merge.rc:2358
+#: Merge.rc:2360
#, c-format
msgid "Are you sure you want to move:"
msgstr ""
-#: Merge.rc:2359
+#: Merge.rc:2361
#, c-format
msgid "Are you sure you want to move %d items:"
msgstr ""
-#: Merge.rc:2361
+#: Merge.rc:2363
#, c-format
msgid "Confirm Move"
msgstr ""
-#: Merge.rc:2362
+#: Merge.rc:2364
#, c-format
msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
msgstr ""
-#: Merge.rc:2368
+#: Merge.rc:2370
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Nepodarilo sa spusti\9d externý editor: %1"
-#: Merge.rc:2374
+#: Merge.rc:2376
#, c-format
msgid "Unknown archive format"
msgstr "Neznámy formát archívu"
-#: Merge.rc:2380
+#: Merge.rc:2382
#, c-format
msgid "Filename"
msgstr "Názov súboru"
-#: Merge.rc:2382
+#: Merge.rc:2384
#, c-format
msgid "Comparison result"
msgstr "Výsledok porovnania"
-#: Merge.rc:2383
+#: Merge.rc:2385
#, c-format
msgid "Left Date"
msgstr "Dátum v¾avo"
-#: Merge.rc:2384
+#: Merge.rc:2386
#, c-format
msgid "Right Date"
msgstr "Dátum vpravo"
-#: Merge.rc:2385
+#: Merge.rc:2387
#, c-format
msgid "Middle Date"
msgstr ""
-#: Merge.rc:2386
+#: Merge.rc:2388
#, c-format
msgid "Extension"
msgstr "Prípona"
-#: Merge.rc:2387
+#: Merge.rc:2389
#, c-format
msgid "Left Size"
msgstr "Ve¾kos\9d v¾avo"
-#: Merge.rc:2388
+#: Merge.rc:2390
#, c-format
msgid "Right Size"
msgstr "Ve¾kos\9d vpravo"
-#: Merge.rc:2389
+#: Merge.rc:2391
#, c-format
msgid "Middle Size"
msgstr ""
-#: Merge.rc:2390
+#: Merge.rc:2392
#, c-format
msgid "Right Size (Short)"
msgstr "Ve¾kos\9d vpravo (krátka)"
-#: Merge.rc:2391
+#: Merge.rc:2393
#, c-format
msgid "Left Size (Short)"
msgstr "Ve¾kos\9d v¾avo (krátka)"
-#: Merge.rc:2392
+#: Merge.rc:2394
#, c-format
msgid "Middle Size (Short)"
msgstr ""
-#: Merge.rc:2398
+#: Merge.rc:2400
#, c-format
msgid "Left Creation Time"
msgstr "Èas vzniku v¾avo"
-#: Merge.rc:2399
+#: Merge.rc:2401
#, c-format
msgid "Right Creation Time"
msgstr "Èas vzniku vpravo"
-#: Merge.rc:2400
+#: Merge.rc:2402
#, c-format
msgid "Middle Creation Time"
msgstr ""
-#: Merge.rc:2401
+#: Merge.rc:2403
#, c-format
msgid "Newer File"
msgstr "Nov\9aí súbor"
-#: Merge.rc:2402
+#: Merge.rc:2404
#, c-format
msgid "Left File Version"
msgstr "Verzia súboru v¾avo"
-#: Merge.rc:2403
+#: Merge.rc:2405
#, c-format
msgid "Right File Version"
msgstr "Verzia súboru vpravo"
-#: Merge.rc:2404
+#: Merge.rc:2406
#, c-format
msgid "Middle File Version"
msgstr ""
-#: Merge.rc:2405
+#: Merge.rc:2407
#, c-format
msgid "Short Result"
msgstr "Krátky výsledok"
-#: Merge.rc:2406
+#: Merge.rc:2408
#, c-format
msgid "Left Attributes"
msgstr "Atribúty v¾avo"
-#: Merge.rc:2407
+#: Merge.rc:2409
#, c-format
msgid "Right Attributes"
msgstr "Atribúty vpravo"
-#: Merge.rc:2408
+#: Merge.rc:2410
#, c-format
msgid "Middle Attributes"
msgstr ""
-#: Merge.rc:2409
+#: Merge.rc:2411
#, c-format
msgid "Left EOL"
msgstr "Konce riadkov v¾avo"
-#: Merge.rc:2410
+#: Merge.rc:2412
#, c-format
msgid "Middle EOL"
msgstr ""
-#: Merge.rc:2411
+#: Merge.rc:2413
#, c-format
msgid "Right EOL"
msgstr "Konce riadkov vpravo"
-#: Merge.rc:2417
+#: Merge.rc:2419
#, c-format
msgid "Left Encoding"
msgstr "Kódovanie v¾avo"
-#: Merge.rc:2418
+#: Merge.rc:2420
#, c-format
msgid "Right Encoding"
msgstr "Kódovanie vpravo"
-#: Merge.rc:2419
+#: Merge.rc:2421
#, c-format
msgid "Middle Encoding"
msgstr ""
-#: Merge.rc:2420
+#: Merge.rc:2422
#, c-format
msgid "Ignored Diff."
msgstr "Ignorovaný rozdiel"
-#: Merge.rc:2428
+#: Merge.rc:2430
#, c-format
msgid "Unable to compare files"
msgstr "Nemo\9eno porovna\9d súbory"
-#: Merge.rc:2429
+#: Merge.rc:2431
#, c-format
msgid "Item aborted"
msgstr "Polo\9eka zru\9aená"
-#: Merge.rc:2430
+#: Merge.rc:2432
#, c-format
msgid "File skipped"
msgstr "Súbor preskoèený"
-#: Merge.rc:2431
+#: Merge.rc:2433
#, c-format
msgid "Folder skipped"
msgstr "Adresár preskoèený"
-#: Merge.rc:2432
+#: Merge.rc:2434
#, c-format
msgid "Left only: %1"
msgstr "Iba v¾avo: %1"
-#: Merge.rc:2433
+#: Merge.rc:2435
#, c-format
msgid "Middle only: %1"
msgstr ""
-#: Merge.rc:2434
+#: Merge.rc:2436
#, c-format
msgid "Right only: %1"
msgstr "Iba vpravo: %1"
-#: Merge.rc:2435
+#: Merge.rc:2437
#, c-format
msgid "Does not exist in %1"
msgstr ""
-#: Merge.rc:2436
+#: Merge.rc:2438
#, c-format
msgid "Binary files are identical"
msgstr "Binárne súbory sú identické"
-#: Merge.rc:2438
+#: Merge.rc:2440
#, c-format
msgid "Binary files are different"
msgstr "Binárne súbory sú rozdielne"
-#: Merge.rc:2439
+#: Merge.rc:2441
#, c-format
msgid "Files are different"
msgstr "Súbory sú rozdielne"
-#: Merge.rc:2440
+#: Merge.rc:2442
#, c-format
msgid "Folders are different"
msgstr ""
-#: Merge.rc:2441
+#: Merge.rc:2443
#, c-format
msgid "Left Only"
msgstr "Iba v¾avo"
-#: Merge.rc:2442
+#: Merge.rc:2444
#, c-format
msgid "Right Only"
msgstr "Iba vpravo"
-#: Merge.rc:2443
+#: Merge.rc:2445
#, c-format
msgid "Middle Only"
msgstr ""
-#: Merge.rc:2444
+#: Merge.rc:2446
#, c-format
msgid "No item in left"
msgstr ""
-#: Merge.rc:2445
+#: Merge.rc:2447
#, c-format
msgid "No item in right"
msgstr ""
-#: Merge.rc:2446
+#: Merge.rc:2448
#, c-format
msgid "No item in middle"
msgstr ""
-#: Merge.rc:2448
+#: Merge.rc:2450
#, c-format
msgid "Error"
msgstr "Chyba"
-#: Merge.rc:2449
+#: Merge.rc:2451
#, c-format
msgid "Text files are identical"
msgstr ""
-#: Merge.rc:2454
+#: Merge.rc:2456
#, c-format
msgid "Text files are different"
msgstr ""
-#: Merge.rc:2460
+#: Merge.rc:2462
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Uplynulý èas: %ld ms"
-#: Merge.rc:2461
+#: Merge.rc:2463
#, c-format
msgid "1 item selected"
msgstr "jedna vybraná polo\9eka"
-#: Merge.rc:2462
+#: Merge.rc:2464
#, c-format
msgid "%1 items selected"
msgstr "%1 vybraných polo\9eiek"
-#: Merge.rc:2468
+#: Merge.rc:2470
#, c-format
msgid "Filename or folder name."
msgstr "Názov súboru alebo adresára."
-#: Merge.rc:2469
+#: Merge.rc:2471
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr "Názov podadresára, keï obsahuje aj podadresáre."
-#: Merge.rc:2470
+#: Merge.rc:2472
#, c-format
msgid "Comparison result, long form."
msgstr "Výsledok porovnania, dlhý tvar."
-#: Merge.rc:2471
+#: Merge.rc:2473
#, c-format
msgid "Left side modification date."
msgstr "Dátum poslednej zmeny na ¾avej strane."
-#: Merge.rc:2472
+#: Merge.rc:2474
#, c-format
msgid "Right side modification date."
msgstr "Dátum poslednej zmeny na pravej strane."
-#: Merge.rc:2473
+#: Merge.rc:2475
#, c-format
msgid "Middle side modification date."
msgstr ""
-#: Merge.rc:2474
+#: Merge.rc:2476
#, c-format
msgid "File's extension."
msgstr "Prípona súboru."
-#: Merge.rc:2475
+#: Merge.rc:2477
#, c-format
msgid "Left file size in bytes."
msgstr "Ve¾kos\9d súboru na ¾avej strane v bajtoch."
-#: Merge.rc:2476
+#: Merge.rc:2478
#, c-format
msgid "Right file size in bytes."
msgstr "Ve¾kos\9d súboru na pravej strane v bajtoch."
-#: Merge.rc:2477
+#: Merge.rc:2479
#, c-format
msgid "Middle file size in bytes."
msgstr ""
-#: Merge.rc:2478
+#: Merge.rc:2480
#, c-format
msgid "Left file size abbreviated."
msgstr "Ve¾kos\9d súboru na ¾avej strane skrátená."
-#: Merge.rc:2479
+#: Merge.rc:2481
#, c-format
msgid "Right file size abbreviated."
msgstr "Ve¾kos\9d súboru na pravej strane skrátená."
-#: Merge.rc:2480
+#: Merge.rc:2482
#, c-format
msgid "Middle file size abbreviated."
msgstr ""
-#: Merge.rc:2486
+#: Merge.rc:2488
#, c-format
msgid "Left side creation time."
msgstr "Dátum vytvorenia na ¾avej strane."
-#: Merge.rc:2487
+#: Merge.rc:2489
#, c-format
msgid "Right side creation time."
msgstr "Dátum vytvorenia na pravej strane."
-#: Merge.rc:2488
+#: Merge.rc:2490
#, c-format
msgid "Middle side creation time."
msgstr ""
-#: Merge.rc:2489
+#: Merge.rc:2491
#, c-format
msgid "Tells which side has newer modification date."
msgstr "ktorý zo súborov má nov\9aí èas poslednej zmeny."
-#: Merge.rc:2490
+#: Merge.rc:2492
#, c-format
msgid "Left side file version, only for some filetypes."
msgstr "Verzia súboru na ¾avej strane, iba pre rovneký typ súboru."
-#: Merge.rc:2491
+#: Merge.rc:2493
#, c-format
msgid "Right side file version, only for some filetypes."
msgstr "Verzia súboru na pravej strane, iba pre rovneký typ súboru."
-#: Merge.rc:2492
+#: Merge.rc:2494
#, c-format
msgid "Middle side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2493
+#: Merge.rc:2495
#, c-format
msgid "Short comparison result."
msgstr "Krátky výsledok porovnania."
-#: Merge.rc:2494
+#: Merge.rc:2496
#, c-format
msgid "Left side attributes."
msgstr "Atribúty na ¾avej strane."
-#: Merge.rc:2495
+#: Merge.rc:2497
#, c-format
msgid "Right side attributes."
msgstr "Atribúty na pravej strane."
-#: Merge.rc:2496
+#: Merge.rc:2498
#, c-format
msgid "Middle side attributes."
msgstr ""
-#: Merge.rc:2497
+#: Merge.rc:2499
#, c-format
msgid "Left side file EOL type"
msgstr "Typ zakonèenia riadka súboru na ¾avej strane"
-#: Merge.rc:2498
+#: Merge.rc:2500
#, c-format
msgid "Right side file EOL type"
msgstr "Typ zakonèenia riadka súboru na pravej strane"
-#: Merge.rc:2499
+#: Merge.rc:2501
#, c-format
msgid "Middle side file EOL type"
msgstr ""
-#: Merge.rc:2505
+#: Merge.rc:2507
#, c-format
msgid "Left side encoding."
msgstr "Kódovanie na ¾avej strane."
-#: Merge.rc:2506
+#: Merge.rc:2508
#, c-format
msgid "Right side encoding."
msgstr "Kódovanie na pravej strane."
-#: Merge.rc:2507
+#: Merge.rc:2509
#, c-format
msgid "Middle side encoding."
msgstr ""
-#: Merge.rc:2508
+#: Merge.rc:2510
#, c-format
msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
msgstr "Poèet ignorovaných rozdielov v súbore. Tieto rozdiely WinMerge ignoruje a nie je schopný ich zlúèi\9d."
-#: Merge.rc:2509
+#: Merge.rc:2511
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
msgstr "Poèet rozdielov v súbore. V tomto èísle nie sú zahrnuté ignorované rozdiely."
-#: Merge.rc:2510
+#: Merge.rc:2512
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Zobrazí hviezdièku (*) ak je súbor binárny."
-#: Merge.rc:2516
+#: Merge.rc:2518
#, c-format
msgid "Compare %1 with %2"
msgstr "Porovna\9d %1 s %2"
-#: Merge.rc:2517
+#: Merge.rc:2519
#, c-format
msgid "Comma-separated list"
msgstr "Zoznam oddelený èiarkami"
-#: Merge.rc:2518
+#: Merge.rc:2520
#, c-format
msgid "Tab-separated list"
msgstr "Zoznam oddelený tabulátormi"
-#: Merge.rc:2519
+#: Merge.rc:2521
#, c-format
msgid "Simple HTML"
msgstr "Jednoduché HTML"
-#: Merge.rc:2520
+#: Merge.rc:2522
#, c-format
msgid "Simple XML"
msgstr "Jednoduché XML"
-#: Merge.rc:2522
+#: Merge.rc:2524
#, c-format
msgid "The report file already exists. Do you want to overwrite existing file?"
msgstr "Súbor so správou u\9e existuje. Chcete prepísa\9d existujúci súbor?"
-#: Merge.rc:2523
+#: Merge.rc:2525
#, c-format
msgid ""
"Error creating the report:\n"
"Chyba pri vytváraní správy:\n"
"%1"
-#: Merge.rc:2524
+#: Merge.rc:2526
#, c-format
msgid "The report has been created successfully."
msgstr "Správa bola úspe\9ane vytvorená."
-#: Merge.rc:2530
+#: Merge.rc:2532
#, c-format
msgid "The same file is opened in both panels."
msgstr "Rovnaký súbor je otvorený v boch paneloch."
-#: Merge.rc:2531
+#: Merge.rc:2533
#, c-format
msgid "The selected files are identical."
msgstr "Vybrané súbory sú rovnaké."
-#: Merge.rc:2532
+#: Merge.rc:2534
#, c-format
msgid "An error occurred while comparing the files."
msgstr "Poèas porovnávania sa vyskytla chyba."
-#: Merge.rc:2533
+#: Merge.rc:2535
#, c-format
msgid "Temporary files could not be created. Check your temporary path settings."
msgstr "Doèasné súobry nebolo mo\9ené vytvori\9d. Skontrolujte nastavenie odkladacieho adresára."
-#: Merge.rc:2534
+#: Merge.rc:2536
#, c-format
msgid ""
"These files use different carriage return types.\n"
"\n"
"Pozn.: Ak chcete, aby som v\9edy pova\9eoval v\9aetky zakonèenia riadkov za ekvivalentné, nastavte vo¾bu 'Ignorova\9d rozdiely zakonèenia riadkov..' v zálo\9eke Porovnávanie dialógu Nastavenia (nájdete v Úpravy/Nastavenia)."
-#: Merge.rc:2535
+#: Merge.rc:2537
#, c-format
msgid "The selected folder is invalid."
msgstr "Zvolený adresár je neplatný."
-#: Merge.rc:2536
+#: Merge.rc:2538
#, c-format
msgid "Cannot open a binary file to editor."
msgstr "Nemô\9eem otvori\9d binárny súbor v editore."
-#: Merge.rc:2537
+#: Merge.rc:2539
#, c-format
msgid ""
"The folder exists only in other side and cannot be opened.\n"
"%1\n"
"na druhej strane a otvori\9d tieto adresáre?"
-#: Merge.rc:2543
+#: Merge.rc:2545
#, c-format
msgid ""
"Different codepages found in left (cp%d) and right (cp%d) files. \n"
"Zobrazenie ka\9edého súboru v jeho kódovej stránke lep\9aie zobrazuje, ale zluèovanie/kopírovanie bude nebezpeèné.\n"
"Chcete precova\9d s oboma stránkami akoby boli v predvolenej kódovej stránke Windows (odporúèa sa)?"
-#: Merge.rc:2544
+#: Merge.rc:2546
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr "Informácie sa stratili kvôli chybám v kódovaní: oba súbory"
-#: Merge.rc:2545
+#: Merge.rc:2547
#, c-format
msgid "Information lost due to encoding errors: first file"
msgstr ""
-#: Merge.rc:2546
+#: Merge.rc:2548
#, c-format
msgid "Information lost due to encoding errors: second file"
msgstr ""
-#: Merge.rc:2547
+#: Merge.rc:2549
#, c-format
msgid "Information lost due to encoding errors: third file"
msgstr ""
-#: Merge.rc:2553
+#: Merge.rc:2555
#, c-format
msgid "No difference"
msgstr "Bez rozdielu"
-#: Merge.rc:2554
+#: Merge.rc:2556
#, c-format
msgid "Line difference"
msgstr "Rozdiely v riadkoch"
-#: Merge.rc:2560
+#: Merge.rc:2562
#, c-format
msgid "Replaced %1 string(s)."
msgstr "Nahradených %1 re\9dazcov."
-#: Merge.rc:2561
+#: Merge.rc:2563
#, c-format
msgid "Cannot find string \"%s\""
msgstr "Nemô\9eem nájs\9d re\9dazec \"%s\""
-#: Merge.rc:2567
+#: Merge.rc:2569
#, c-format
msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
msgstr ""
-#: Merge.rc:2574
+#: Merge.rc:2576
#, c-format
msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"
msgstr ""
-#: Merge.rc:2575
+#: Merge.rc:2577
#, c-format
msgid "The change of codepage has been merged"
msgstr ""
-#: Merge.rc:2576
+#: Merge.rc:2578
#, c-format
msgid "The changes of codepage are conflicting"
msgstr ""
-#: Merge.rc:2577
+#: Merge.rc:2579
#, c-format
msgid "The change of EOL has been merged"
msgstr ""
-#: Merge.rc:2578
+#: Merge.rc:2580
#, c-format
msgid "The changes of EOL are conflicting"
msgstr ""
-#: Merge.rc:2584
+#: Merge.rc:2586
#, c-format
msgid "Location Pane"
msgstr "Lokaèný panel"
-#: Merge.rc:2585
+#: Merge.rc:2587
#, c-format
msgid "Diff Pane"
msgstr "Panel rozdielu"
-#: Merge.rc:2591
+#: Merge.rc:2593
#, c-format
msgid "Patch file successfully written."
msgstr "Súbor so záplatou bol úspe\9ane zapísaný."
-#: Merge.rc:2592
+#: Merge.rc:2594
#, c-format
msgid "1. item is not found or is directory!"
msgstr "1. polo\9eka nenájdená alebo je to adresár!"
-#: Merge.rc:2593
+#: Merge.rc:2595
#, c-format
msgid "2. item is not found or is directory!"
msgstr "2. polo\9eka nenájdená alebo je to adresár!"
-#: Merge.rc:2594
+#: Merge.rc:2596
#, c-format
msgid "The patch file already exists. Do you want to overwrite it?"
msgstr "Súbor so záplatou u\9e existuje. Chcete ho prepísa\9d?"
-#: Merge.rc:2595
+#: Merge.rc:2597
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 súbor zvolený]"
-#: Merge.rc:2596
+#: Merge.rc:2598
#, c-format
msgid "Normal"
msgstr "Normálny"
-#: Merge.rc:2597
+#: Merge.rc:2599
#, c-format
msgid "Context"
msgstr "Kontextový"
-#: Merge.rc:2598
+#: Merge.rc:2600
#, c-format
msgid "Unified"
msgstr "Zjednotený"
-#: Merge.rc:2600
+#: Merge.rc:2602
#, c-format
msgid "Could not write to file %1."
msgstr "Nedalo sa zapisova\9d do súboru %1."
-#: Merge.rc:2601
+#: Merge.rc:2603
#, c-format
msgid "The specified output path is not an absolute path: %1"
msgstr "Uvedená výstupná cesta nie je absolútna cesta: %1"
-#: Merge.rc:2602
+#: Merge.rc:2604
#, c-format
msgid "Specify an output file"
msgstr "uveïte výstupný súbor"
-#: Merge.rc:2603
+#: Merge.rc:2605
#, c-format
msgid "Cannot create a patch file from binary files."
msgstr "Nemohol som vytvori\9d súbor so záplatou z binárnych súborov."
-#: Merge.rc:2604
+#: Merge.rc:2606
#, c-format
msgid "Cannot create a patch file from directories."
msgstr "Nemohol som vytvori\9d súbor so záplatou z adresárov."
-#: Merge.rc:2605
+#: Merge.rc:2607
#, c-format
msgid ""
"Please save all files first.\n"
"\n"
"vytvorenie záplaty vy\9eaduje, aby v súboroch neboli neulo\9eené zmeny."
-#: Merge.rc:2606
+#: Merge.rc:2608
#, c-format
msgid "Folder does not exist."
msgstr "Adresár neexistuje."
-#: Merge.rc:2611
+#: Merge.rc:2613
#, c-format
msgid ""
"Archive support is not enabled.\n"
"Niektoré z komponentov (7-zip a/alebo Merge7z*.dll) potrebných pre podporu archívov neboli nájdené.\n"
"Pozri viac informácií o podpore archávov a ako ju zapnú\9d v Príruèke."
-#: Merge.rc:2612
+#: Merge.rc:2614
#, c-format
msgid "Select file for export"
msgstr "Vyberte súbor pre export"
-#: Merge.rc:2613
+#: Merge.rc:2615
#, c-format
msgid "Select file for import"
msgstr "Vyberte súbor pre import"
-#: Merge.rc:2614
+#: Merge.rc:2616
#, c-format
msgid "Options imported from the file."
msgstr "Nastavenia importované zo súboru."
-#: Merge.rc:2615
+#: Merge.rc:2617
#, c-format
msgid "Options exported to the file."
msgstr "Options exportované do súboru."
-#: Merge.rc:2616
+#: Merge.rc:2618
#, c-format
msgid "Failed to import options from the file."
msgstr "Nepodarilo sa importova\9d nastavenia zo súboru."
-#: Merge.rc:2617
+#: Merge.rc:2619
#, c-format
msgid "Failed to write options to the file."
msgstr "Nepodarilo sa zapísa\9d nastavenia do súboru."
-#: Merge.rc:2618
+#: Merge.rc:2620
#, c-format
msgid ""
"You are about to close several compare windows.\n"
"\n"
"Chcete pokraèova\9d?"
-#: Merge.rc:2627
+#: Merge.rc:2629
#, c-format
msgid "Mixed"
msgstr "Zmie\9aaný"
-#: Merge.rc:2638
+#: Merge.rc:2640
#, c-format
msgid "Type"
msgstr ""
-#: Merge.rc:2640
+#: Merge.rc:2642
#, c-format
msgid "Unpacker"
msgstr ""
-#: Merge.rc:2641
+#: Merge.rc:2643
#, c-format
msgid "Prediffer"
msgstr ""
-#: Merge.rc:2642
+#: Merge.rc:2644
#, c-format
msgid "Editor script"
msgstr ""
-#: Merge.rc:2648
+#: Merge.rc:2650
#, c-format
msgid "\nDifference in the Current Line"
msgstr ""
-#: Merge.rc:2649
+#: Merge.rc:2651
#, c-format
msgid "\nOptions"
msgstr ""
-#: Merge.rc:2650
+#: Merge.rc:2652
#, c-format
msgid "\nRefresh (F5)"
msgstr ""
-#: Merge.rc:2656
+#: Merge.rc:2658
#, c-format
msgid "\nPrevious Difference (Alt+Up)"
msgstr ""
-#: Merge.rc:2657
+#: Merge.rc:2659
#, c-format
msgid "\nNext Difference (Alt+Down)"
msgstr ""
-#: Merge.rc:2658
+#: Merge.rc:2660
#, c-format
msgid "\nPrevious Conflict (Alt+Shift+Up)"
msgstr ""
-#: Merge.rc:2659
+#: Merge.rc:2661
#, c-format
msgid "\nNext Conflict (Alt+Shift+Down)"
msgstr ""
-#: Merge.rc:2660
+#: Merge.rc:2662
#, c-format
msgid "\nFirst Difference (Alt+Home)"
msgstr ""
-#: Merge.rc:2661
+#: Merge.rc:2663
#, c-format
msgid "\nCurrent Difference (Alt+Enter)"
msgstr ""
-#: Merge.rc:2662
+#: Merge.rc:2664
#, c-format
msgid "\nLast Difference (Alt+End)"
msgstr ""
-#: Merge.rc:2663
+#: Merge.rc:2665
#, c-format
msgid "\nCopy Right (Alt+Right)"
msgstr ""
-#: Merge.rc:2664
+#: Merge.rc:2666
#, c-format
msgid "\nCopy Left (Alt+Left)"
msgstr ""
-#: Merge.rc:2665
+#: Merge.rc:2667
#, c-format
msgid "\nCopy Right and Advance (Ctrl+Alt+Right)"
msgstr ""
-#: Merge.rc:2666
+#: Merge.rc:2668
#, c-format
msgid "\nCopy Left and Advance (Ctrl+Alt+Left)"
msgstr ""
-#: Merge.rc:2667
+#: Merge.rc:2669
#, c-format
msgid "\nAll Right"
msgstr ""
-#: Merge.rc:2668
+#: Merge.rc:2670
#, c-format
msgid "\nAll Left"
msgstr ""
-#: Merge.rc:2669
+#: Merge.rc:2671
#, c-format
msgid "\nAuto Merge (Ctrl+Alt+M)"
msgstr ""
-#: Merge.rc:2675
+#: Merge.rc:2677
#, c-format
msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
msgstr "Rozba¾ovací program sa pou\9eije na oba súbory (pri jednom súbore staèí prípona)"
-#: Merge.rc:2676
+#: Merge.rc:2678
#, c-format
msgid "No prediffer (normal)"
msgstr "Bez predspracovania (be\9ené)"
-#: Merge.rc:2677
+#: Merge.rc:2679
#, c-format
msgid "Suggested plugins"
msgstr "Odporúèané zásuvné moduly"
-#: Merge.rc:2678
+#: Merge.rc:2680
#, c-format
msgid "Other plugins"
msgstr "Iné zásuvné moduly"
-#: Merge.rc:2684
+#: Merge.rc:2686
#, c-format
msgid "Private Build: %1"
msgstr "Súkromné zostavenie: %1"
-#: Merge.rc:2685
+#: Merge.rc:2687
#, c-format
msgid "Your software is up to date"
msgstr ""
-#: Merge.rc:2686
+#: Merge.rc:2688
#, c-format
msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?"
msgstr ""
-#: Merge.rc:2687
+#: Merge.rc:2689
#, c-format
msgid "Failed to download latest version information"
msgstr ""
-#: Merge.rc:2693
+#: Merge.rc:2695
#, c-format
msgid "Plugin Settings"
msgstr "Nastavenia zásuvných modulov"
-#: Merge.rc:2695
+#: Merge.rc:2697
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH nenájdené - .sct skripty vypnuté"
-#: Merge.rc:2696
+#: Merge.rc:2698
#, c-format
msgid "<None>"
msgstr "<\8eiadny>"
-#: Merge.rc:2697
+#: Merge.rc:2699
#, c-format
msgid "<Automatic>"
msgstr "<Automatické>"
-#: Merge.rc:2703
+#: Merge.rc:2705
#, c-format
msgid "G&oto Line %1"
msgstr "Ch&oï na riadok %1"
-#: Merge.rc:2709
+#: Merge.rc:2711
#, c-format
msgid "Disabled"
msgstr "Vypnuté"
-#: Merge.rc:2710
+#: Merge.rc:2712
#, c-format
msgid "From file system"
msgstr "Zo súborového systému"
-#: Merge.rc:2711
+#: Merge.rc:2713
#, c-format
msgid "From MRU list"
msgstr "Zo zoznamu nedávno pou\9eitých"
-#: Merge.rc:2717
+#: Merge.rc:2719
#, c-format
msgid "No Highlighting"
msgstr ""
-#: Merge.rc:2720
+#: Merge.rc:2722
#, c-format
msgid "Batch"
msgstr "Dávkový"
-#: Merge.rc:2736
+#: Merge.rc:2738
#, c-format
msgid "Portable Object"
msgstr "Portable Object"
-#: Merge.rc:2740
+#: Merge.rc:2742
#, c-format
msgid "Resources"
msgstr "Zdroje"
-#: Merge.rc:2743
+#: Merge.rc:2745
#, c-format
msgid "Shell"
msgstr "Shell"
-#: Merge.rc:2754
+#: Merge.rc:2756
#, c-format
msgid "Close &Left Tabs"
msgstr ""
-#: Merge.rc:2755
+#: Merge.rc:2757
#, c-format
msgid "Close R&ight Tabs"
msgstr ""
-#: Merge.rc:2756
+#: Merge.rc:2758
#, c-format
msgid "Close &Other Tabs"
msgstr ""
-#: Merge.rc:2757
+#: Merge.rc:2759
#, c-format
msgid "Enable &Auto Max Width"
msgstr ""
-#: Merge.rc:2762
+#: Merge.rc:2764
#, c-format
msgid "&Image"
msgstr ""
-#: Merge.rc:2767
+#: Merge.rc:2769
#, c-format
msgid "frhed(http://frhed.sourceforge.net/) not installed"
msgstr ""
msgstr "Izre\9e&i"
#: Merge.rc:85
-#: Merge.rc:617
+#: Merge.rc:619
#, c-format
msgid "&Copy"
msgstr "&Kopiraj"
msgstr "&Prilepi"
#: Merge.rc:88
-#: Merge.rc:729
+#: Merge.rc:731
#, c-format
msgid "&Goto..."
msgstr "Pojdi &na ..."
msgstr "&Odpri"
#: Merge.rc:92
-#: Merge.rc:648
-#: Merge.rc:654
-#: Merge.rc:660
+#: Merge.rc:650
+#: Merge.rc:656
+#: Merge.rc:662
#, c-format
msgid "with &Registered Application"
msgstr "Z re&gistrirano aplikacijo"
#: Merge.rc:93
-#: Merge.rc:649
-#: Merge.rc:655
-#: Merge.rc:661
+#: Merge.rc:651
+#: Merge.rc:657
+#: Merge.rc:663
#, c-format
msgid "with &External Editor"
msgstr "Z &zunanjim urejevalnikom"
#: Merge.rc:94
-#: Merge.rc:650
-#: Merge.rc:656
-#: Merge.rc:662
+#: Merge.rc:652
+#: Merge.rc:658
+#: Merge.rc:664
#, c-format
msgid "&with..."
msgstr "&z ..."
msgstr ""
#: Merge.rc:132
-#: Merge.rc:451
+#: Merge.rc:453
#, c-format
msgid "&Zoom"
msgstr "Po&veèaj"
#: Merge.rc:143
#: Merge.rc:179
-#: Merge.rc:283
-#: Merge.rc:485
+#: Merge.rc:285
+#: Merge.rc:487
#, c-format
msgid "&None"
msgstr "&Brez"
#: Merge.rc:153
#: Merge.rc:230
-#: Merge.rc:357
+#: Merge.rc:359
#, c-format
msgid "&File"
msgstr "&Datoteka"
#: Merge.rc:155
#: Merge.rc:232
-#: Merge.rc:359
+#: Merge.rc:361
#, c-format
msgid "&New\tCtrl+N"
msgstr "&Nova\tCtrl+N"
#: Merge.rc:156
#: Merge.rc:233
-#: Merge.rc:360
+#: Merge.rc:362
#, c-format
msgid "New (&3 panes)"
msgstr ""
#: Merge.rc:157
#: Merge.rc:234
-#: Merge.rc:361
+#: Merge.rc:363
#, c-format
msgid "&Open...\tCtrl+O"
msgstr "&Odpri ... \tCtrl+O"
#: Merge.rc:158
#: Merge.rc:235
-#: Merge.rc:362
+#: Merge.rc:364
#, c-format
msgid "Op&en Conflict File..."
msgstr "Od&pri konfliktno datoteko ..."
#: Merge.rc:160
#: Merge.rc:237
-#: Merge.rc:364
+#: Merge.rc:366
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Odpri pro&jekt ... \tCtrl+J"
#: Merge.rc:161
#: Merge.rc:238
-#: Merge.rc:365
+#: Merge.rc:367
#, c-format
msgid "Sa&ve Project..."
msgstr "S&hrani projekt ..."
#: Merge.rc:164
#: Merge.rc:249
-#: Merge.rc:409
+#: Merge.rc:411
#, c-format
msgid "Recent F&iles Or Folders"
msgstr ""
#: Merge.rc:166
#: Merge.rc:251
-#: Merge.rc:411
-#: Merge.rc:571
-#: Merge.rc:2694
+#: Merge.rc:413
+#: Merge.rc:573
+#: Merge.rc:2696
#, c-format
msgid "< Empty >"
msgstr "< Prazno >"
#: Merge.rc:169
#: Merge.rc:254
-#: Merge.rc:414
+#: Merge.rc:416
#, c-format
msgid "E&xit"
msgstr "I&zhod"
#: Merge.rc:171
#: Merge.rc:256
-#: Merge.rc:416
+#: Merge.rc:418
#, c-format
msgid "&Edit"
msgstr "&Uredi"
#: Merge.rc:173
#: Merge.rc:260
-#: Merge.rc:445
+#: Merge.rc:447
#, c-format
msgid "&Options..."
msgstr "&Mo\9enosti ..."
#: Merge.rc:175
#: Merge.rc:262
-#: Merge.rc:447
+#: Merge.rc:449
#, c-format
msgid "&View"
msgstr "&Pogled"
#: Merge.rc:177
-#: Merge.rc:281
-#: Merge.rc:483
+#: Merge.rc:283
+#: Merge.rc:485
#, c-format
msgid "&Toolbar"
msgstr "&Orodna vrstica"
#: Merge.rc:180
-#: Merge.rc:284
-#: Merge.rc:486
+#: Merge.rc:286
+#: Merge.rc:488
#, c-format
msgid "&Small"
msgstr "&Male ikone"
#: Merge.rc:181
-#: Merge.rc:285
-#: Merge.rc:487
+#: Merge.rc:287
+#: Merge.rc:489
#, c-format
msgid "&Big"
msgstr "&Velike ikone"
#: Merge.rc:183
-#: Merge.rc:287
-#: Merge.rc:489
+#: Merge.rc:289
+#: Merge.rc:491
#, c-format
msgid "&Status Bar"
msgstr "&Statusna vrstica"
#: Merge.rc:184
-#: Merge.rc:288
-#: Merge.rc:490
+#: Merge.rc:290
+#: Merge.rc:492
#, c-format
msgid "Ta&b Bar"
msgstr "Ta&bulatorska vrstica"
#: Merge.rc:186
-#: Merge.rc:311
-#: Merge.rc:546
+#: Merge.rc:313
+#: Merge.rc:548
#, c-format
msgid "&Tools"
msgstr "&Orodja"
#: Merge.rc:188
-#: Merge.rc:314
-#: Merge.rc:548
+#: Merge.rc:316
+#: Merge.rc:550
#, c-format
msgid "&Filters..."
msgstr "&Filtri ..."
#: Merge.rc:189
-#: Merge.rc:315
-#: Merge.rc:549
+#: Merge.rc:317
+#: Merge.rc:551
#, c-format
msgid "&Generate Patch..."
msgstr "&Generiraj datoteko s popravki ..."
#: Merge.rc:191
-#: Merge.rc:318
-#: Merge.rc:552
+#: Merge.rc:320
+#: Merge.rc:554
#, c-format
msgid "&Plugins"
msgstr "&Raz\9airitve"
#: Merge.rc:193
-#: Merge.rc:320
-#: Merge.rc:554
-#: Merge.rc:1852
+#: Merge.rc:322
+#: Merge.rc:556
+#: Merge.rc:1854
#, c-format
msgid "P&lugin Settings..."
msgstr ""
#: Merge.rc:195
-#: Merge.rc:322
-#: Merge.rc:556
+#: Merge.rc:324
+#: Merge.rc:558
#, c-format
msgid "Ma&nual Prediffer"
msgstr "Roèe&n predpregled razlik"
#: Merge.rc:196
-#: Merge.rc:323
-#: Merge.rc:557
+#: Merge.rc:325
+#: Merge.rc:559
#, c-format
msgid "A&utomatic Prediffer"
msgstr "Sa&modejen predpregled razlik"
#: Merge.rc:198
-#: Merge.rc:325
-#: Merge.rc:559
+#: Merge.rc:327
+#: Merge.rc:561
#, c-format
msgid "&Manual Unpacking"
msgstr "&Roèno pretvarjanje"
#: Merge.rc:199
-#: Merge.rc:326
-#: Merge.rc:560
+#: Merge.rc:328
+#: Merge.rc:562
#, c-format
msgid "&Automatic Unpacking"
msgstr "&Samodejno pretvarjanje"
#: Merge.rc:201
-#: Merge.rc:328
-#: Merge.rc:562
-#: Merge.rc:1924
+#: Merge.rc:330
+#: Merge.rc:564
+#: Merge.rc:1926
#, c-format
msgid "&Edit with Unpacker..."
msgstr ""
#: Merge.rc:203
-#: Merge.rc:330
-#: Merge.rc:574
+#: Merge.rc:332
+#: Merge.rc:576
#, c-format
msgid "&Reload plugins"
msgstr "&Ponovno nalo\9ei raz\9airitve"
#: Merge.rc:205
-#: Merge.rc:332
-#: Merge.rc:576
+#: Merge.rc:334
+#: Merge.rc:578
#, c-format
msgid "&Window"
msgstr "&Okna"
#: Merge.rc:207
-#: Merge.rc:334
-#: Merge.rc:578
+#: Merge.rc:336
+#: Merge.rc:580
#, c-format
msgid "Cl&ose"
msgstr "Z&apri"
#: Merge.rc:208
-#: Merge.rc:335
-#: Merge.rc:579
+#: Merge.rc:337
+#: Merge.rc:581
#, c-format
msgid "Clo&se All"
msgstr "Zapri &vse"
#: Merge.rc:210
-#: Merge.rc:337
-#: Merge.rc:581
+#: Merge.rc:339
+#: Merge.rc:583
#, c-format
msgid "Change &Pane\tF6"
msgstr "Preklopi &okvirja\tF6"
#: Merge.rc:212
-#: Merge.rc:339
-#: Merge.rc:583
+#: Merge.rc:341
+#: Merge.rc:585
#, c-format
msgid "Tile &Horizontally"
msgstr "Vodoravna &okna"
#: Merge.rc:213
-#: Merge.rc:340
-#: Merge.rc:584
+#: Merge.rc:342
+#: Merge.rc:586
#, c-format
msgid "Tile &Vertically"
msgstr "&Navpièna okna"
#: Merge.rc:214
-#: Merge.rc:341
-#: Merge.rc:585
+#: Merge.rc:343
+#: Merge.rc:587
#, c-format
msgid "&Cascade"
msgstr "&Kaskadna okna"
#: Merge.rc:216
-#: Merge.rc:343
-#: Merge.rc:587
-#: Merge.rc:2055
+#: Merge.rc:345
+#: Merge.rc:589
+#: Merge.rc:2057
#, c-format
msgid "&Help"
msgstr "&Pomoè"
#: Merge.rc:218
-#: Merge.rc:345
-#: Merge.rc:589
+#: Merge.rc:347
+#: Merge.rc:591
#, c-format
msgid "&WinMerge Help\tF1"
msgstr "&WinMerge pomoè\tF1"
#: Merge.rc:220
-#: Merge.rc:347
-#: Merge.rc:591
+#: Merge.rc:349
+#: Merge.rc:593
#, c-format
msgid "&Check For Updates"
msgstr ""
#: Merge.rc:221
-#: Merge.rc:348
-#: Merge.rc:592
+#: Merge.rc:350
+#: Merge.rc:594
#, c-format
msgid "C&onfiguration"
msgstr "&Nastavitve"
#: Merge.rc:223
-#: Merge.rc:350
-#: Merge.rc:594
+#: Merge.rc:352
+#: Merge.rc:596
#, c-format
msgid "&GNU General Public License"
msgstr "&GNU Javna licenca"
#: Merge.rc:224
-#: Merge.rc:351
-#: Merge.rc:595
+#: Merge.rc:353
+#: Merge.rc:597
#, c-format
msgid "&About WinMerge..."
msgstr "&O programu WinMerge ..."
#: Merge.rc:240
-#: Merge.rc:385
+#: Merge.rc:387
#, c-format
msgid "&Read-only"
msgstr ""
#: Merge.rc:242
-#: Merge.rc:387
+#: Merge.rc:389
#, c-format
msgid "L&eft Read-only"
msgstr "L&evo samo za branje"
#: Merge.rc:243
-#: Merge.rc:388
+#: Merge.rc:390
#, c-format
msgid "M&iddle Read-only"
msgstr ""
#: Merge.rc:244
-#: Merge.rc:389
+#: Merge.rc:391
#, c-format
msgid "Ri&ght Read-only"
msgstr "De&sno samo za branje"
msgstr ""
#: Merge.rc:258
-#: Merge.rc:426
+#: Merge.rc:428
#, c-format
msgid "Select &All\tCtrl+A"
msgstr "Oznaèi &vse\tCtrl+A"
msgstr "S&krèi vse podmape"
#: Merge.rc:278
-#: Merge.rc:449
+#: Merge.rc:451
#, c-format
msgid "Select &Font..."
msgstr "Izberite &pisavo ..."
#: Merge.rc:279
-#: Merge.rc:450
+#: Merge.rc:452
#, c-format
msgid "Use Default F&ont"
msgstr "Uporabite privzeto pi&savo"
-#: Merge.rc:290
+#: Merge.rc:281
+#: Merge.rc:482
+#, c-format
+msgid "Sw&ap Panes"
+msgstr "Zam&enjaj okvirja"
+
+#: Merge.rc:292
#, c-format
msgid "Compa&re Statistics"
msgstr "&Statistika primerjave"
-#: Merge.rc:292
-#: Merge.rc:494
+#: Merge.rc:294
+#: Merge.rc:496
#, c-format
msgid "Refre&sh\tF5"
msgstr "Osv&e\9ei\tF5"
-#: Merge.rc:293
+#: Merge.rc:295
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
msgstr "&Osve\9ei izbrano\tCtrl+F5"
-#: Merge.rc:295
-#: Merge.rc:496
+#: Merge.rc:297
+#: Merge.rc:498
#, c-format
msgid "&Merge"
msgstr "Z&dru\9ei"
-#: Merge.rc:297
+#: Merge.rc:299
#, c-format
msgid "Co&mpare\tEnter"
msgstr "Pr&imerjaj\tEnter"
-#: Merge.rc:299
-#: Merge.rc:498
+#: Merge.rc:301
+#: Merge.rc:500
#, c-format
msgid "&Next Difference\tAlt+Down"
msgstr "&Naslednja razlika\tAlt+Down"
-#: Merge.rc:300
-#: Merge.rc:499
+#: Merge.rc:302
+#: Merge.rc:501
#, c-format
msgid "&Previous Difference\tAlt+Up"
msgstr "&Predhodna razlika\tAlt+Up"
-#: Merge.rc:302
-#: Merge.rc:525
+#: Merge.rc:304
+#: Merge.rc:527
#, c-format
msgid "&First Difference\tAlt+Home"
msgstr "&Prva razlika\tAlt+Home"
-#: Merge.rc:303
-#: Merge.rc:526
+#: Merge.rc:305
+#: Merge.rc:528
#, c-format
msgid "&Current Difference\tAlt+Enter"
msgstr "&Trenutna razlika\tAlt+Enter"
-#: Merge.rc:304
-#: Merge.rc:527
+#: Merge.rc:306
+#: Merge.rc:529
#, c-format
msgid "&Last Difference\tAlt+End"
msgstr "&Zadnja razlika\tAlt+End"
-#: Merge.rc:306
-#: Merge.rc:529
+#: Merge.rc:308
+#: Merge.rc:531
#, c-format
msgid "Copy to &Right\tAlt+Right"
msgstr "Kopiraj &desno\tAlt+Right"
-#: Merge.rc:307
-#: Merge.rc:530
+#: Merge.rc:309
+#: Merge.rc:532
#, c-format
msgid "Copy to L&eft\tAlt+Left"
msgstr "Kopiraj &levo\tAlt+Left"
-#: Merge.rc:309
+#: Merge.rc:311
#, c-format
msgid "&Delete\tDel"
msgstr "&Izbri\9ai\tDel"
-#: Merge.rc:313
-#: Merge.rc:701
+#: Merge.rc:315
+#: Merge.rc:703
#, c-format
msgid "&Customize Columns..."
msgstr "&Prilagodi stolpce ..."
-#: Merge.rc:316
-#: Merge.rc:550
+#: Merge.rc:318
+#: Merge.rc:552
#, c-format
msgid "Generate &Report..."
msgstr "Izdelaj &poroèilo ..."
-#: Merge.rc:367
+#: Merge.rc:369
#, c-format
msgid "&Save\tCtrl+S"
msgstr "&Shrani\tCtrl+S"
-#: Merge.rc:368
+#: Merge.rc:370
#, c-format
msgid "Sav&e"
msgstr ""
-#: Merge.rc:370
+#: Merge.rc:372
#, c-format
msgid "Save &Left"
msgstr "Shrani &levo datoteko"
-#: Merge.rc:371
+#: Merge.rc:373
#, c-format
msgid "Save &Middle"
msgstr ""
-#: Merge.rc:372
+#: Merge.rc:374
#, c-format
msgid "Save &Right"
msgstr "Shrani &desno"
-#: Merge.rc:374
+#: Merge.rc:376
#, c-format
msgid "Save &As"
msgstr ""
-#: Merge.rc:376
+#: Merge.rc:378
#, c-format
msgid "Save &Left As..."
msgstr ""
-#: Merge.rc:377
+#: Merge.rc:379
#, c-format
msgid "Save &Middle As..."
msgstr ""
-#: Merge.rc:378
+#: Merge.rc:380
#, c-format
msgid "Save &Right As..."
msgstr ""
-#: Merge.rc:381
+#: Merge.rc:383
#, c-format
msgid "&Print..."
msgstr "&Natisni ..."
-#: Merge.rc:382
+#: Merge.rc:384
#, c-format
msgid "Page Se&tup"
msgstr "Nastavitev &strani"
-#: Merge.rc:383
+#: Merge.rc:385
#, c-format
msgid "Print Previe&w"
msgstr "&Predogled tiskanja"
-#: Merge.rc:392
+#: Merge.rc:394
#, c-format
msgid "&Convert Line Endings to"
msgstr "&Pretvori konce vrstice v"
-#: Merge.rc:399
+#: Merge.rc:401
#, c-format
msgid "&Merge Mode\tF9"
msgstr "Zdru\9eevalni naèin\tF9"
-#: Merge.rc:401
+#: Merge.rc:403
#, c-format
msgid "Re&load\tCtrl+F5"
msgstr ""
-#: Merge.rc:402
-#: Merge.rc:1923
+#: Merge.rc:404
+#: Merge.rc:1925
#, c-format
msgid "&File Encoding..."
msgstr "De&kodiranje datoteke ..."
-#: Merge.rc:403
+#: Merge.rc:405
#, c-format
msgid "Recompare As"
msgstr ""
-#: Merge.rc:405
-#: Merge.rc:613
+#: Merge.rc:407
+#: Merge.rc:615
#, c-format
msgid "&XML"
msgstr "&XML"
-#: Merge.rc:406
-#: Merge.rc:614
+#: Merge.rc:408
+#: Merge.rc:616
#, c-format
msgid "&Binary"
msgstr "&Binarno"
-#: Merge.rc:418
+#: Merge.rc:420
#, c-format
msgid "&Undo\tCtrl+Z"
msgstr "&Razveljavi\tCtrl+Z"
-#: Merge.rc:419
+#: Merge.rc:421
#, c-format
msgid "&Redo\tCtrl+Y"
msgstr "&Uveljavi\tCtrl+Y"
-#: Merge.rc:421
+#: Merge.rc:423
#, c-format
msgid "Cu&t\tCtrl+X"
msgstr "Iz&re\9ei\tCtrl+X"
-#: Merge.rc:422
+#: Merge.rc:424
#, c-format
msgid "&Copy\tCtrl+C"
msgstr "&Kopiraj\tCtrl+C"
-#: Merge.rc:423
+#: Merge.rc:425
#, c-format
msgid "&Paste\tCtrl+V"
msgstr "&Prilepi\tCtrl+V"
-#: Merge.rc:425
+#: Merge.rc:427
#, c-format
msgid "Select Line &Difference\tF4"
msgstr "Izberi &razlièni vrstici\tF4"
-#: Merge.rc:428
+#: Merge.rc:430
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "&Najdi ... \tCtrl+F"
-#: Merge.rc:429
+#: Merge.rc:431
#, c-format
msgid "Repla&ce...\tCtrl+H"
msgstr "Zamen&jaj ... \tCtrl+H"
-#: Merge.rc:431
+#: Merge.rc:433
#, c-format
msgid "Advanced"
msgstr "Napredno"
-#: Merge.rc:433
+#: Merge.rc:435
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
msgstr "&Kopiraj z \9atevilkami vrstic\tCtrl+Shift+C"
-#: Merge.rc:436
+#: Merge.rc:438
#, c-format
msgid "&Bookmarks"
msgstr "&Zaznamki"
-#: Merge.rc:438
+#: Merge.rc:440
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
msgstr "Zamenjaj zaznamke\tCtrl+F2"
-#: Merge.rc:439
+#: Merge.rc:441
#, c-format
msgid "&Next Bookmark\tF2"
msgstr "&Naslednji zaznamek\tF2"
-#: Merge.rc:440
+#: Merge.rc:442
#, c-format
msgid "&Previous bookmark\tShift+F2"
msgstr "&Prej\9anji zaznamek\tShift+F2"
-#: Merge.rc:441
+#: Merge.rc:443
#, c-format
msgid "&Clear All Bookmarks"
msgstr "&Zbri\9ai vse zaznamke"
-#: Merge.rc:443
+#: Merge.rc:445
#, c-format
msgid "&Go To...\tCtrl+G"
msgstr "Pojdi &na ... \tCtrl+G"
-#: Merge.rc:453
+#: Merge.rc:455
#, c-format
msgid "Zoom &In\tCtrl++"
msgstr "Po&veèaj\tCtrl++"
-#: Merge.rc:454
+#: Merge.rc:456
#, c-format
msgid "Zoom &Out\tCtrl+-"
msgstr "Poman&j\9aaj\tCtrl+-"
#. Zoom to normal
-#: Merge.rc:455
+#: Merge.rc:457
#, c-format
msgid "&Normal\tCtrl+*"
msgstr "&Izvorna velikost\tCtrl+*"
-#: Merge.rc:457
+#: Merge.rc:459
#, c-format
msgid "Syntax Highlight"
msgstr "Oznaèevanje sintakse"
-#: Merge.rc:462
+#: Merge.rc:464
#, c-format
msgid "&Diff Context"
msgstr ""
-#: Merge.rc:464
-#: Merge.rc:641
+#: Merge.rc:466
+#: Merge.rc:643
#, c-format
msgid "&All"
msgstr ""
-#: Merge.rc:473
+#: Merge.rc:475
#, c-format
msgid "&Lock Panes"
msgstr "Za&kleni okvirja"
-#: Merge.rc:474
+#: Merge.rc:476
#, c-format
msgid "&View Whitespace"
msgstr "&Prika\9ei prazne znake"
-#: Merge.rc:475
+#: Merge.rc:477
#, c-format
msgid "Vie&w Line Differences"
msgstr "Prika\9ei razl&ike vrstic"
-#: Merge.rc:476
+#: Merge.rc:478
#, c-format
msgid "View Line &Numbers"
msgstr "Prika\9ei \9atevilke &vrstic"
-#: Merge.rc:477
+#: Merge.rc:479
#, c-format
msgid "View &Margins"
msgstr "Prika\9ei &robove"
-#: Merge.rc:478
+#: Merge.rc:480
#, c-format
msgid "W&rap Lines"
msgstr "Pr&elomi vrstice"
-#: Merge.rc:480
-#, c-format
-msgid "Sw&ap Panes"
-msgstr "Zam&enjaj okvirja"
-
-#: Merge.rc:481
+#: Merge.rc:483
#, c-format
msgid "Split V&ertically"
msgstr ""
-#: Merge.rc:491
+#: Merge.rc:493
#, c-format
msgid "Diff &Pane"
msgstr "Okvir &razlik"
-#: Merge.rc:492
+#: Merge.rc:494
#, c-format
msgid "Lo&cation Pane"
msgstr "&Polo\9eajni okvir"
-#: Merge.rc:501
+#: Merge.rc:503
#, c-format
msgid "Ne&xt Conflict\tAlt+Shift+Down"
msgstr ""
-#: Merge.rc:502
+#: Merge.rc:504
#, c-format
msgid "Pre&vious Conflict\tAlt+Shift+Up"
msgstr ""
-#: Merge.rc:504
+#: Merge.rc:506
#, c-format
msgid "A&dvanced"
msgstr ""
-#: Merge.rc:506
+#: Merge.rc:508
#, c-format
msgid "Next Difference Between Left and Middle\tAlt+1"
msgstr ""
-#: Merge.rc:507
+#: Merge.rc:509
#, c-format
msgid "Previous Difference Between Left And Middle\tAlt+Shift+1"
msgstr ""
-#: Merge.rc:509
+#: Merge.rc:511
#, c-format
msgid "Next Difference Between Left and Right\tAlt+2"
msgstr ""
-#: Merge.rc:510
+#: Merge.rc:512
#, c-format
msgid "Previous Difference Between Left And Right\tAlt+Shift+2"
msgstr ""
-#: Merge.rc:512
+#: Merge.rc:514
#, c-format
msgid "Next Difference Between Middle and Right\tAlt+3"
msgstr ""
-#: Merge.rc:513
+#: Merge.rc:515
#, c-format
msgid "Previous Difference Between Middle And Right\tAlt+Shift+3"
msgstr ""
-#: Merge.rc:515
+#: Merge.rc:517
#, c-format
msgid "Next Left Only Difference\tAlt+7"
msgstr ""
-#: Merge.rc:516
+#: Merge.rc:518
#, c-format
msgid "Previous Left Only Difference\tAlt+Shift+7"
msgstr ""
-#: Merge.rc:518
+#: Merge.rc:520
#, c-format
msgid "Next Middle Only Difference\tAlt+8"
msgstr ""
-#: Merge.rc:519
+#: Merge.rc:521
#, c-format
msgid "Previous Middle Only Difference\tAlt+Shift+8"
msgstr ""
-#: Merge.rc:521
+#: Merge.rc:523
#, c-format
msgid "Next Right Only Difference\tAlt+9"
msgstr ""
-#: Merge.rc:522
+#: Merge.rc:524
#, c-format
msgid "Previous Right Only Difference\tAlt+Shift+9"
msgstr ""
-#: Merge.rc:532
+#: Merge.rc:534
#, c-format
msgid "Copy from Left\tAlt+Shift+Right"
msgstr ""
-#: Merge.rc:533
+#: Merge.rc:535
#, c-format
msgid "Copy from Right\tAlt+Shift+Left"
msgstr ""
-#: Merge.rc:535
+#: Merge.rc:537
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
msgstr "Kopiraj de&sno in nadaljuj\tAlt+Ctrl+desno"
-#: Merge.rc:536
+#: Merge.rc:538
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
msgstr "Kopiraj le&vo in nadaljuj\tAlt+Ctrl+levo"
-#: Merge.rc:538
+#: Merge.rc:540
#, c-format
msgid "Copy &All to Right"
msgstr "Kopiraj vse v des&no"
-#: Merge.rc:539
+#: Merge.rc:541
#, c-format
msgid "Cop&y All to Left"
msgstr "Kopiraj vse v &lev&o"
-#: Merge.rc:541
+#: Merge.rc:543
#, c-format
msgid "A&uto Merge\tAlt+Ctrl+M"
msgstr ""
-#: Merge.rc:543
+#: Merge.rc:545
#, c-format
msgid "Add &Synchronization Point\tAlt+S"
msgstr ""
-#: Merge.rc:544
+#: Merge.rc:546
#, c-format
msgid "Clear Sync&hronization Points"
msgstr ""
-#: Merge.rc:564
+#: Merge.rc:566
#, c-format
msgid "&Prediffer"
msgstr "&Predpregled razlik"
-#: Merge.rc:569
+#: Merge.rc:571
#, c-format
msgid "&Scripts"
msgstr "&Skripte"
-#: Merge.rc:603
+#: Merge.rc:605
#, c-format
msgid "Comp&are"
msgstr "Prime&rjaj"
-#: Merge.rc:604
+#: Merge.rc:606
#, c-format
msgid "Compare Non-hor&izontally"
msgstr ""
-#: Merge.rc:606
+#: Merge.rc:608
#, c-format
msgid "First &left item with second left item"
msgstr ""
-#: Merge.rc:607
+#: Merge.rc:609
#, c-format
msgid "First &right item with second right item"
msgstr ""
-#: Merge.rc:608
+#: Merge.rc:610
#, c-format
msgid "&First left item with second right item"
msgstr ""
-#: Merge.rc:609
+#: Merge.rc:611
#, c-format
msgid "&Second left item with first right item"
msgstr ""
-#: Merge.rc:611
+#: Merge.rc:613
#, c-format
msgid "Co&mpare As"
msgstr "Pri&merjaj kot"
-#: Merge.rc:619
-#: Merge.rc:2310
+#: Merge.rc:621
+#: Merge.rc:2312
#, c-format
msgid "Left to Middle (%1 of %2)"
msgstr ""
-#: Merge.rc:620
-#: Merge.rc:2309
+#: Merge.rc:622
+#: Merge.rc:2311
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Z leve proti desni (%1 od %2)"
-#: Merge.rc:621
-#: Merge.rc:631
-#: Merge.rc:685
-#: Merge.rc:2317
-#: Merge.rc:2341
+#: Merge.rc:623
+#: Merge.rc:633
+#: Merge.rc:687
+#: Merge.rc:2319
+#: Merge.rc:2343
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Leva do ... (%1 od%2)"
-#: Merge.rc:622
-#: Merge.rc:2307
+#: Merge.rc:624
+#: Merge.rc:2309
#, c-format
msgid "Middle to Left (%1 of %2)"
msgstr ""
-#: Merge.rc:623
-#: Merge.rc:2308
+#: Merge.rc:625
+#: Merge.rc:2310
#, c-format
msgid "Middle to Right (%1 of %2)"
msgstr ""
-#: Merge.rc:624
-#: Merge.rc:632
-#: Merge.rc:686
-#: Merge.rc:2318
-#: Merge.rc:2342
+#: Merge.rc:626
+#: Merge.rc:634
+#: Merge.rc:688
+#: Merge.rc:2320
+#: Merge.rc:2344
#, c-format
msgid "Middle to... (%1 of %2)"
msgstr ""
-#: Merge.rc:625
-#: Merge.rc:2306
+#: Merge.rc:627
+#: Merge.rc:2308
#, c-format
msgid "Right to Middle (%1 of %2)"
msgstr ""
-#: Merge.rc:626
-#: Merge.rc:2305
+#: Merge.rc:628
+#: Merge.rc:2307
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Z desne proti levi (%1 od %2)"
-#: Merge.rc:627
-#: Merge.rc:633
-#: Merge.rc:687
-#: Merge.rc:2319
-#: Merge.rc:2343
+#: Merge.rc:629
+#: Merge.rc:635
+#: Merge.rc:689
+#: Merge.rc:2321
+#: Merge.rc:2345
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Desna do ... (%1 od%2)"
-#: Merge.rc:629
+#: Merge.rc:631
#, c-format
msgid "&Move"
msgstr "&Pre&makni"
-#: Merge.rc:635
+#: Merge.rc:637
#, c-format
msgid "&Delete"
msgstr "&Izbri\9ai"
-#: Merge.rc:637
-#: Merge.rc:1366
-#: Merge.rc:1701
+#: Merge.rc:639
+#: Merge.rc:1368
+#: Merge.rc:1703
#, c-format
msgid "&Left"
msgstr "&levi okvir"
-#: Merge.rc:638
-#: Merge.rc:1368
-#: Merge.rc:1704
+#: Merge.rc:640
+#: Merge.rc:1370
+#: Merge.rc:1706
#, c-format
msgid "&Middle"
msgstr ""
-#: Merge.rc:639
-#: Merge.rc:1370
-#: Merge.rc:1707
+#: Merge.rc:641
+#: Merge.rc:1372
+#: Merge.rc:1709
#, c-format
msgid "&Right"
msgstr "&desni okvir"
-#: Merge.rc:640
+#: Merge.rc:642
#, c-format
msgid "&Both"
msgstr "&Oboje"
-#: Merge.rc:643
+#: Merge.rc:645
#, c-format
msgid "Re&name"
msgstr "P&reimenuj"
-#: Merge.rc:644
+#: Merge.rc:646
#, c-format
msgid "&Hide Items"
msgstr "&Skrij predmete"
-#: Merge.rc:646
+#: Merge.rc:648
#, c-format
msgid "&Open Left"
msgstr "&Odpri levo"
-#: Merge.rc:652
+#: Merge.rc:654
#, c-format
msgid "Open Midd&le"
msgstr ""
-#: Merge.rc:658
+#: Merge.rc:660
#, c-format
msgid "O&pen Right"
msgstr "Odpri desno"
-#: Merge.rc:665
+#: Merge.rc:667
#, c-format
msgid "Cop&y Pathnames"
msgstr "Kopiraj &imena poti"
-#: Merge.rc:667
-#: Merge.rc:676
-#: Merge.rc:2333
+#: Merge.rc:669
+#: Merge.rc:678
+#: Merge.rc:2335
#, c-format
msgid "Left (%1 of %2)"
msgstr "Leva (%1 of %2)"
-#: Merge.rc:668
-#: Merge.rc:677
-#: Merge.rc:2334
+#: Merge.rc:670
+#: Merge.rc:679
+#: Merge.rc:2336
#, c-format
msgid "Middle (%1 of %2)"
msgstr ""
-#: Merge.rc:669
-#: Merge.rc:678
-#: Merge.rc:2335
+#: Merge.rc:671
+#: Merge.rc:680
+#: Merge.rc:2337
#, c-format
msgid "Right (%1 of %2)"
msgstr "Desna (%1 of %2)"
-#: Merge.rc:670
-#: Merge.rc:679
-#: Merge.rc:2336
+#: Merge.rc:672
+#: Merge.rc:681
+#: Merge.rc:2338
#, c-format
msgid "Both (%1 of %2)"
msgstr "Obe (%1 of %2)"
-#: Merge.rc:671
-#: Merge.rc:680
-#: Merge.rc:2337
+#: Merge.rc:673
+#: Merge.rc:682
+#: Merge.rc:2339
#, c-format
msgid "All (%1 of %2)"
msgstr ""
-#: Merge.rc:673
+#: Merge.rc:675
#, c-format
msgid "Copy &Filenames"
msgstr "Kopiraj &imena datotek"
-#: Merge.rc:674
+#: Merge.rc:676
#, c-format
msgid "Copy Items To Clip&board"
msgstr ""
-#: Merge.rc:683
+#: Merge.rc:685
#, c-format
msgid "&Zip"
msgstr "&Zip"
-#: Merge.rc:688
-#: Merge.rc:2320
+#: Merge.rc:690
+#: Merge.rc:2322
#, c-format
msgid "Both to... (%1 of %2)"
msgstr ""
-#: Merge.rc:689
-#: Merge.rc:2321
+#: Merge.rc:691
+#: Merge.rc:2323
#, c-format
msgid "All to... (%1 of %2)"
msgstr ""
-#: Merge.rc:690
-#: Merge.rc:2322
+#: Merge.rc:692
+#: Merge.rc:2324
#, c-format
msgid "Differences to... (%1 of %2)"
msgstr ""
-#: Merge.rc:693
+#: Merge.rc:695
#, c-format
msgid "&Refresh"
msgstr "&Osve\9ei"
-#: Merge.rc:695
+#: Merge.rc:697
#, c-format
msgid "Left Shell menu"
msgstr "Levi raz\9airitveni meni"
-#: Merge.rc:696
+#: Merge.rc:698
#, c-format
msgid "Middle Shell menu"
msgstr ""
-#: Merge.rc:697
+#: Merge.rc:699
#, c-format
msgid "Right Shell menu"
msgstr "Desni raz\9airitveni meni"
-#: Merge.rc:709
+#: Merge.rc:711
#, c-format
msgid "Copy"
msgstr ""
-#: Merge.rc:710
+#: Merge.rc:712
#, c-format
msgid "&Copy Full Path"
msgstr "&Kopiraj polno pot"
-#: Merge.rc:711
+#: Merge.rc:713
#, c-format
msgid "Copy &Filename"
msgstr "Kopiraj &ime datoteke"
-#: Merge.rc:717
+#: Merge.rc:719
#, c-format
msgid "Prediffer Settings"
msgstr "Nastavitve predpregleda razlik"
-#: Merge.rc:719
+#: Merge.rc:721
#, c-format
msgid "&No prediffer"
msgstr "&Brez predpregleda razlik"
-#: Merge.rc:720
+#: Merge.rc:722
#, c-format
msgid "Auto prediffer"
msgstr "Samodejen predpregled razlik"
-#: Merge.rc:728
+#: Merge.rc:730
#, c-format
msgid "G&oto Diff"
msgstr "Pojdi &na razliko"
-#: Merge.rc:731
+#: Merge.rc:733
#, c-format
msgid "&No Moved Blocks"
msgstr "&Brez premaknjenih blokov"
-#: Merge.rc:732
+#: Merge.rc:734
#, c-format
msgid "&All Moved Blocks"
msgstr "&Vsi premaknjeni bloki"
-#: Merge.rc:733
+#: Merge.rc:735
#, c-format
msgid "Moved Block for &Current Diff"
msgstr "Premakni blok &za izbrano razliko"
-#: Merge.rc:741
-#: Merge.rc:1265
+#: Merge.rc:743
+#: Merge.rc:1267
#, c-format
msgid "W&hitespaces"
msgstr "&Prazni znaki"
-#: Merge.rc:743
-#: Merge.rc:1266
+#: Merge.rc:745
+#: Merge.rc:1268
#, c-format
msgid "Com&pare"
msgstr "&Primerjaj"
-#: Merge.rc:744
-#: Merge.rc:1268
+#: Merge.rc:746
+#: Merge.rc:1270
#, c-format
msgid "I&gnore changes"
msgstr "Zanemari &spremembe"
-#: Merge.rc:745
-#: Merge.rc:1270
+#: Merge.rc:747
+#: Merge.rc:1272
#, c-format
msgid "Ig&nore all"
msgstr "Ignoriraj &vse"
-#: Merge.rc:747
-#: Merge.rc:1274
+#: Merge.rc:749
+#: Merge.rc:1276
#, c-format
msgid "Case sensi&tive"
msgstr "&Razlikuj m/v èrke"
-#: Merge.rc:748
-#: Merge.rc:1276
-#: Merge.rc:1392
+#: Merge.rc:750
+#: Merge.rc:1278
+#: Merge.rc:1394
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "&Prezri razliènost tipa znakov za zakljuèke vrstic (EOL)"
-#: Merge.rc:750
-#: Merge.rc:896
-#: Merge.rc:1792
+#: Merge.rc:752
+#: Merge.rc:898
+#: Merge.rc:1794
#, c-format
msgid "&Include Subfolders"
msgstr "&Vkljuèi podmape"
-#: Merge.rc:751
-#: Merge.rc:1876
+#: Merge.rc:753
+#: Merge.rc:1878
#, c-format
msgid "&Compare method:"
msgstr "&Metoda za primerjanje datotek"
-#: Merge.rc:753
-#: Merge.rc:2132
+#: Merge.rc:755
+#: Merge.rc:2134
#, c-format
msgid "Full Contents"
msgstr "Popolna vsebina"
-#: Merge.rc:754
-#: Merge.rc:2133
+#: Merge.rc:756
+#: Merge.rc:2135
#, c-format
msgid "Quick Contents"
msgstr "Hitra vsebina"
-#: Merge.rc:755
-#: Merge.rc:2134
+#: Merge.rc:757
+#: Merge.rc:2136
#, c-format
msgid "Binary Contents"
msgstr ""
-#: Merge.rc:756
-#: Merge.rc:2135
+#: Merge.rc:758
+#: Merge.rc:2137
#, c-format
msgid "Modified Date"
msgstr "Spremenjen datum"
-#: Merge.rc:757
-#: Merge.rc:2136
+#: Merge.rc:759
+#: Merge.rc:2138
#, c-format
msgid "Modified Date and Size"
msgstr "Spremenjen datum in velikost"
-#: Merge.rc:758
-#: Merge.rc:2137
+#: Merge.rc:760
+#: Merge.rc:2139
#, c-format
msgid "Size"
msgstr "Velikost"
-#: Merge.rc:852
+#: Merge.rc:854
#, c-format
msgid "About WinMerge"
msgstr "O orodju WinMerge"
-#: Merge.rc:858
+#: Merge.rc:860
#, c-format
msgid "(Private Build)"
msgstr "(Zasebna gradnja)"
-#: Merge.rc:859
+#: Merge.rc:861
#, c-format
msgid "Visit the WinMerge HomePage!"
msgstr "Obi\9aèi domaèo stran programa WinMerge!"
-#: Merge.rc:861
-#: Merge.rc:899
-#: Merge.rc:1284
-#: Merge.rc:1316
-#: Merge.rc:1326
-#: Merge.rc:1485
-#: Merge.rc:1521
-#: Merge.rc:1615
-#: Merge.rc:1630
-#: Merge.rc:1853
-#: Merge.rc:1922
+#: Merge.rc:863
+#: Merge.rc:901
+#: Merge.rc:1286
+#: Merge.rc:1318
+#: Merge.rc:1328
+#: Merge.rc:1487
+#: Merge.rc:1523
+#: Merge.rc:1617
+#: Merge.rc:1632
+#: Merge.rc:1855
+#: Merge.rc:1924
#, c-format
msgid "OK"
msgstr "V redu"
-#: Merge.rc:862
+#: Merge.rc:864
#, c-format
msgid "Contributors"
msgstr "Donatorji"
-#: Merge.rc:867
+#: Merge.rc:869
#, c-format
msgid "Select Files or Folders"
msgstr "Izberite datoteke ali mape"
-#: Merge.rc:875
-#: Merge.rc:943
-#: Merge.rc:1224
-#: Merge.rc:1246
+#: Merge.rc:877
+#: Merge.rc:945
+#: Merge.rc:1226
+#: Merge.rc:1248
#, c-format
msgid "&Browse..."
msgstr "&Brskaj ..."
-#: Merge.rc:881
-#: Merge.rc:1227
+#: Merge.rc:883
+#: Merge.rc:1229
#, c-format
msgid "B&rowse..."
msgstr "B&rskaj ..."
-#: Merge.rc:882
+#: Merge.rc:884
#, c-format
msgid "&3(Optional):"
msgstr ""
-#: Merge.rc:887
-#: Merge.rc:1234
-#: Merge.rc:1250
+#: Merge.rc:889
+#: Merge.rc:1236
+#: Merge.rc:1252
#, c-format
msgid "Br&owse..."
msgstr "Br&skaj"
-#: Merge.rc:888
+#: Merge.rc:890
#, c-format
msgid "Fi<er:"
msgstr ""
-#: Merge.rc:891
-#: Merge.rc:1791
+#: Merge.rc:893
+#: Merge.rc:1793
#, c-format
msgid "Select..."
msgstr "Izberi ..."
-#: Merge.rc:892
+#: Merge.rc:894
#, c-format
msgid "&Unpacker:"
msgstr "&Pretvornik:"
-#: Merge.rc:895
+#: Merge.rc:897
#, c-format
msgid "&Select..."
msgstr "&Izberi ..."
-#: Merge.rc:898
+#: Merge.rc:900
#, c-format
msgid "Status:"
msgstr "Status:"
-#: Merge.rc:900
-#: Merge.rc:930
-#: Merge.rc:1005
-#: Merge.rc:1024
-#: Merge.rc:1056
-#: Merge.rc:1066
-#: Merge.rc:1285
-#: Merge.rc:1317
-#: Merge.rc:1327
-#: Merge.rc:1378
-#: Merge.rc:1486
-#: Merge.rc:1522
-#: Merge.rc:1616
-#: Merge.rc:1631
-#: Merge.rc:1854
+#: Merge.rc:902
+#: Merge.rc:932
+#: Merge.rc:1007
+#: Merge.rc:1026
+#: Merge.rc:1058
+#: Merge.rc:1068
+#: Merge.rc:1287
+#: Merge.rc:1319
+#: Merge.rc:1329
+#: Merge.rc:1380
+#: Merge.rc:1488
+#: Merge.rc:1524
+#: Merge.rc:1618
+#: Merge.rc:1633
+#: Merge.rc:1856
#, c-format
msgid "Cancel"
msgstr "Preklièi"
-#: Merge.rc:901
-#: Merge.rc:1523
+#: Merge.rc:903
+#: Merge.rc:1525
#, c-format
msgid "Help"
msgstr "Pomoè"
-#: Merge.rc:902
+#: Merge.rc:904
#, c-format
msgid "Files or Folders to Compare"
msgstr "Datoteke ali mape za primerjavo"
-#: Merge.rc:914
+#: Merge.rc:916
#, c-format
msgid "Database:"
msgstr "Podatkovna baza:"
-#: Merge.rc:917
+#: Merge.rc:919
#, c-format
msgid "Project:"
msgstr "Projekt:"
-#: Merge.rc:920
+#: Merge.rc:922
#, c-format
msgid "User:"
msgstr "Uporabnik:"
-#: Merge.rc:922
+#: Merge.rc:924
#, c-format
msgid "Password:"
msgstr "Geslo:"
-#: Merge.rc:924
+#: Merge.rc:926
#, c-format
msgid "Link to Destination VSS project"
msgstr "Pove\9ei z ciljem VSS projekta"
-#: Merge.rc:926
-#: Merge.rc:1071
+#: Merge.rc:928
+#: Merge.rc:1073
#, c-format
msgid "Apply to all items"
msgstr "Uporabi na vseh predmetih"
-#: Merge.rc:928
+#: Merge.rc:930
#, c-format
msgid "Check Out"
msgstr "Check Out"
-#: Merge.rc:929
-#: Merge.rc:1067
+#: Merge.rc:931
+#: Merge.rc:1069
#, c-format
msgid "Save As..."
msgstr "Shrani kot ..."
-#: Merge.rc:935
+#: Merge.rc:937
#, c-format
msgid "Versioning System"
msgstr "Versioning System"
-#: Merge.rc:938
+#: Merge.rc:940
#, c-format
msgid "&Versioning System:"
msgstr "&Versioning System:"
-#: Merge.rc:941
-#: Merge.rc:2180
+#: Merge.rc:943
+#: Merge.rc:2182
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "&Pot do cleartool.exe:"
-#: Merge.rc:948
-#: Merge.rc:2063
-#: Merge.rc:2076
+#: Merge.rc:950
+#: Merge.rc:2065
+#: Merge.rc:2078
#, c-format
msgid "General"
msgstr "Splo\9ano"
-#: Merge.rc:951
+#: Merge.rc:953
#, c-format
msgid "Automatically &scroll to first difference"
msgstr "Samodejno &pojdi na prvo razliko"
-#: Merge.rc:954
+#: Merge.rc:956
#, c-format
msgid "Cl&ose windows with ESC"
msgstr "Zapri okna s tipko &ESC"
-#: Merge.rc:956
+#: Merge.rc:958
#, c-format
msgid "&Automatically verify paths in Open-dialog"
msgstr "&Samodejno preverjaj pot v odprtem dialogu"
-#: Merge.rc:959
+#: Merge.rc:961
#, c-format
msgid "All&ow only one instance to run"
msgstr "Dovoli &samo en trenutno aktiven program za izvajanje"
-#: Merge.rc:961
+#: Merge.rc:963
#, c-format
msgid "As&k when closing multiple windows"
msgstr "&Vpra\9aaj pred zapiranjem veèkratnih oken"
-#: Merge.rc:963
+#: Merge.rc:965
#, c-format
msgid "&Preserve file time in file compare"
msgstr "&Zadr\9ei èas datoteke v primerjavi datoteke"
-#: Merge.rc:966
+#: Merge.rc:968
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
msgstr "Prika\9ei pogovorno okno \"Izberite datoteke ali mape\" ob zagonu"
-#: Merge.rc:968
+#: Merge.rc:970
#, c-format
msgid "Close \"Select Files or Folders\" Dialog on clicking OK button"
msgstr ""
-#: Merge.rc:970
+#: Merge.rc:972
#, c-format
msgid "O&pen-dialog Auto-Completion:"
msgstr "Samodejno &dopolnjevanje vrstice v Odprtem dialogu"
-#: Merge.rc:973
+#: Merge.rc:975
#, c-format
msgid "Language:"
msgstr ""
-#: Merge.rc:976
+#: Merge.rc:978
#, 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 oken.\n"
"Pritisnite gumb Ponastavi, da bodo postala vsa sporoèilna okna vidna."
-#: Merge.rc:978
+#: Merge.rc:980
#, c-format
msgid "Reset"
msgstr "Ponastavi"
-#: Merge.rc:985
-#: Merge.rc:1011
+#: Merge.rc:987
+#: Merge.rc:1013
#, c-format
msgid "Find"
msgstr "Najdi"
-#: Merge.rc:988
-#: Merge.rc:1014
-#: Merge.rc:1033
+#: Merge.rc:990
+#: Merge.rc:1016
+#: Merge.rc:1035
#, c-format
msgid "Fi&nd what:"
msgstr "&Kaj naj i\9aèem:"
-#: Merge.rc:991
-#: Merge.rc:1017
-#: Merge.rc:1039
-#, c-format
-msgid "Match &whole word only"
-msgstr "Ujemanje samo &celih besed"
-
#: Merge.rc:993
#: Merge.rc:1019
#: Merge.rc:1041
#, c-format
-msgid "Match &case"
-msgstr "Ujemanje z velikostjo èrk"
+msgid "Match &whole word only"
+msgstr "Ujemanje samo &celih besed"
#: Merge.rc:995
#: Merge.rc:1021
#: Merge.rc:1043
#, c-format
+msgid "Match &case"
+msgstr "Ujemanje z velikostjo èrk"
+
+#: Merge.rc:997
+#: Merge.rc:1023
+#: Merge.rc:1045
+#, c-format
msgid "Regular &expression"
msgstr "&Regularni izraz"
-#: Merge.rc:997
+#: Merge.rc:999
#, c-format
msgid "D&on't wrap end of file"
msgstr "&Po koncu datoteke ne nadaljuj na zaèetku"
-#: Merge.rc:1000
+#: Merge.rc:1002
#, c-format
msgid "&Don't close this dialog box"
msgstr ""
-#: Merge.rc:1003
+#: Merge.rc:1005
#, c-format
msgid "Find &Prev"
msgstr ""
-#: Merge.rc:1004
-#: Merge.rc:1053
+#: Merge.rc:1006
+#: Merge.rc:1055
#, c-format
msgid "&Find Next"
msgstr "&Najdi naslednje"
-#: Merge.rc:1023
-#: Merge.rc:2037
+#: Merge.rc:1025
+#: Merge.rc:2039
#, c-format
msgid "&Ok"
msgstr "&V redu"
-#: Merge.rc:1030
+#: Merge.rc:1032
#, c-format
msgid "Replace"
msgstr "Zamenjaj"
-#: Merge.rc:1036
+#: Merge.rc:1038
#, c-format
msgid "Re&place with:"
msgstr "Zamenjaj z:"
-#: Merge.rc:1045
+#: Merge.rc:1047
#, c-format
msgid "&Don't wrap end of file"
msgstr "&Po koncu datoteke ne nadaljuj na zaèetku"
-#: Merge.rc:1048
+#: Merge.rc:1050
#, c-format
msgid "Replace in"
msgstr "Zamenjaj v"
-#: Merge.rc:1049
+#: Merge.rc:1051
#, c-format
msgid "&Selection"
msgstr "&Izbor"
-#: Merge.rc:1051
+#: Merge.rc:1053
#, c-format
msgid "Wh&ole file"
msgstr "&Cela datoteka"
-#: Merge.rc:1054
+#: Merge.rc:1056
#, c-format
msgid "&Replace"
msgstr "&Zamenjaj"
-#: Merge.rc:1055
+#: Merge.rc:1057
#, c-format
msgid "Replace &All"
msgstr "Zamenjaj &vse"
-#: Merge.rc:1065
+#: Merge.rc:1067
#, c-format
msgid "CheckOut"
msgstr "CheckOut"
-#: Merge.rc:1070
-#: Merge.rc:1396
+#: Merge.rc:1072
+#: Merge.rc:1398
#, c-format
msgid "Comments"
msgstr "Komentarji"
-#: Merge.rc:1073
+#: Merge.rc:1075
#, c-format
msgid "CheckIn after checkout"
msgstr "CheckIn po CheckOut-u"
-#: Merge.rc:1079
+#: Merge.rc:1081
#, c-format
msgid "Linefilters"
msgstr "Vrstièni filtri"
-#: Merge.rc:1082
+#: Merge.rc:1084
#, c-format
msgid "Enable Line Filters"
msgstr "Omogoèi vrstiène filtre"
-#: Merge.rc:1085
+#: Merge.rc:1087
#, c-format
msgid "Regular Expressions (one per line):"
msgstr "Regularni izrazi (eden na vrstico): "
-#: Merge.rc:1090
+#: Merge.rc:1092
#, c-format
msgid "New"
msgstr "Nova"
-#: Merge.rc:1091
+#: Merge.rc:1093
#, c-format
msgid "Edit"
msgstr "Uredi"
-#: Merge.rc:1092
+#: Merge.rc:1094
#, c-format
msgid "Remove"
msgstr "Odstrani"
-#: Merge.rc:1097
-#: Merge.rc:2066
+#: Merge.rc:1099
+#: Merge.rc:2068
#, c-format
msgid "Colors"
msgstr "Barve"
-#: Merge.rc:1100
+#: Merge.rc:1102
#, c-format
msgid "Difference:"
msgstr "Razlike"
-#: Merge.rc:1104
+#: Merge.rc:1106
#, c-format
msgid "Selected Difference:"
msgstr "Izbrane razlike"
-#: Merge.rc:1108
-#: Merge.rc:1756
+#: Merge.rc:1110
+#: Merge.rc:1758
#, c-format
msgid "Background"
msgstr "Ozadje"
-#: Merge.rc:1109
+#: Merge.rc:1111
#, c-format
msgid "Deleted"
msgstr "Izbrisano"
-#: Merge.rc:1126
-#: Merge.rc:1549
-#: Merge.rc:1757
-#: Merge.rc:2067
+#: Merge.rc:1128
+#: Merge.rc:1551
+#: Merge.rc:1759
+#: Merge.rc:2069
#, c-format
msgid "Text"
msgstr "Besedilo"
-#: Merge.rc:1130
+#: Merge.rc:1132
#, c-format
msgid "Ignored Difference:"
msgstr "Zanemarjene razlike:"
-#: Merge.rc:1142
+#: Merge.rc:1144
#, c-format
msgid "Moved:"
msgstr "Premaknjeno:"
-#: Merge.rc:1154
+#: Merge.rc:1156
#, c-format
msgid "Selected Moved:"
msgstr "Izbrano premaknjeno:"
-#: Merge.rc:1163
+#: Merge.rc:1165
#, c-format
msgid "Same As The Next(3 panes):"
msgstr ""
-#: Merge.rc:1175
+#: Merge.rc:1177
#, c-format
msgid "Same As The Next(Selected):"
msgstr ""
-#: Merge.rc:1187
+#: Merge.rc:1189
#, c-format
msgid "Word Difference:"
msgstr "Besedne razlike:"
-#: Merge.rc:1199
+#: Merge.rc:1201
#, c-format
msgid "Selected Word Diff:"
msgstr "Izbrane razlike besed:"
-#: Merge.rc:1212
-#: Merge.rc:1283
-#: Merge.rc:1315
-#: Merge.rc:1399
-#: Merge.rc:1595
-#: Merge.rc:1890
-#: Merge.rc:1904
-#: Merge.rc:1914
+#: Merge.rc:1214
+#: Merge.rc:1285
+#: Merge.rc:1317
+#: Merge.rc:1401
+#: Merge.rc:1597
+#: Merge.rc:1892
+#: Merge.rc:1906
+#: Merge.rc:1916
#, c-format
msgid "Defaults"
msgstr "Privzeto"
-#: Merge.rc:1217
-#: Merge.rc:2069
+#: Merge.rc:1219
+#: Merge.rc:2071
#, c-format
msgid "System"
msgstr "Sistem"
-#: Merge.rc:1220
+#: Merge.rc:1222
#, c-format
msgid "&Send deleted files to Recycle Bin"
msgstr "&Premakni izbrisane datoteke v ko\9a"
-#: Merge.rc:1222
+#: Merge.rc:1224
#, c-format
msgid "&External editor:"
msgstr "&Zunanji urejevalnik:"
-#: Merge.rc:1225
+#: Merge.rc:1227
#, c-format
msgid "&Filter folder:"
msgstr "&Mapa filtrov:"
-#: Merge.rc:1228
+#: Merge.rc:1230
#, c-format
msgid "Temporary files folder"
msgstr "Mapa za zaèasne datoteke"
-#: Merge.rc:1229
+#: Merge.rc:1231
#, c-format
msgid "S&ystem's temp folder"
msgstr "s&istemska mapa"
-#: Merge.rc:1231
+#: Merge.rc:1233
#, c-format
msgid "C&ustom folder:"
msgstr "mapa po meri"
-#: Merge.rc:1240
+#: Merge.rc:1242
#, c-format
msgid "Patch Generator"
msgstr "Generator datotek s popravki ..."
-#: Merge.rc:1243
+#: Merge.rc:1245
#, c-format
msgid "File&1:"
msgstr "Datoteka&1"
-#: Merge.rc:1247
+#: Merge.rc:1249
#, c-format
msgid "File&2:"
msgstr "Datoteka&2"
-#: Merge.rc:1251
+#: Merge.rc:1253
#, c-format
msgid "&Swap"
msgstr "&Zamenjaj"
-#: Merge.rc:1252
+#: Merge.rc:1254
#, c-format
msgid "&Append to existing file"
msgstr "&Dodaj k obstojeèi datoteki"
-#: Merge.rc:1254
+#: Merge.rc:1256
#, c-format
msgid "&Result:"
msgstr "&Rezultat:"
-#: Merge.rc:1257
+#: Merge.rc:1259
#, c-format
msgid "Bro&wse..."
msgstr "&Brskaj ..."
-#: Merge.rc:1258
+#: Merge.rc:1260
#, c-format
msgid "&Format"
msgstr "&Format"
-#: Merge.rc:1259
+#: Merge.rc:1261
#, c-format
msgid "St&yle:"
msgstr "St&il"
-#: Merge.rc:1262
+#: Merge.rc:1264
#, c-format
msgid "&Context:"
msgstr "&Vsebina"
-#: Merge.rc:1272
+#: Merge.rc:1274
#, c-format
msgid "Ignor&e blank lines"
msgstr "&Ignoriraj prazne vrstice"
-#: Merge.rc:1279
+#: Merge.rc:1281
#, c-format
msgid "Inclu&de command line"
msgstr "&Vkljuèi glavno vrstico"
-#: Merge.rc:1281
+#: Merge.rc:1283
#, c-format
msgid "Open to e&xternal editor"
msgstr "Odpri v zunanjem urejevalniku"
-#: Merge.rc:1306
+#: Merge.rc:1308
#, c-format
msgid "Display Columns"
msgstr "Prika\9ei stolpce"
-#: Merge.rc:1312
+#: Merge.rc:1314
#, c-format
msgid "Move &Up"
msgstr "Premakni &gor"
-#: Merge.rc:1313
+#: Merge.rc:1315
#, c-format
msgid "Move &Down"
msgstr "Premakni &navzdol"
-#: Merge.rc:1323
+#: Merge.rc:1325
#, c-format
msgid "Select Unpacker"
msgstr "Izberite Pretvornik"
-#: Merge.rc:1328
+#: Merge.rc:1330
#, c-format
msgid "File unpacker:"
msgstr "Pretvornik za datoteke:"
-#: Merge.rc:1331
+#: Merge.rc:1333
#, c-format
msgid "Display all unpackers, don't check the extension"
msgstr "Prika\9ei vse pretvornike, ne glede na konènico"
-#: Merge.rc:1334
+#: Merge.rc:1336
#, c-format
msgid "Extensions list:"
msgstr "Popis konènic:"
-#: Merge.rc:1335
+#: Merge.rc:1337
#, c-format
msgid "Description:"
msgstr "Opis:"
-#: Merge.rc:1346
+#: Merge.rc:1348
#, c-format
msgid "Stop"
msgstr "Ustavi"
-#: Merge.rc:1351
+#: Merge.rc:1353
#, c-format
msgid "Comparing items..."
msgstr "Primerjanje predmetov ..."
-#: Merge.rc:1352
+#: Merge.rc:1354
#, c-format
msgid "Items compared:"
msgstr "Primerjanih predmetov:"
-#: Merge.rc:1353
+#: Merge.rc:1355
#, c-format
msgid "Items total:"
msgstr "Predmeti skupaj:"
-#: Merge.rc:1360
+#: Merge.rc:1362
#, c-format
msgid "Go To"
msgstr "Pojdi na"
-#: Merge.rc:1363
+#: Merge.rc:1365
#, c-format
msgid "G&oto:"
msgstr "Pojdi &na:"
-#: Merge.rc:1365
+#: Merge.rc:1367
#, c-format
msgid "File"
msgstr "Datoteka"
-#: Merge.rc:1372
+#: Merge.rc:1374
#, c-format
msgid "Goto what"
msgstr "Pojdi na"
-#: Merge.rc:1373
+#: Merge.rc:1375
#, c-format
msgid "Li&ne"
msgstr "&Vrstica"
-#: Merge.rc:1375
+#: Merge.rc:1377
#, c-format
msgid "&Difference"
msgstr "&Razlika"
-#: Merge.rc:1377
+#: Merge.rc:1379
#, c-format
msgid "&Go To"
msgstr "Pojdi &na"
-#: Merge.rc:1383
-#: Merge.rc:2064
+#: Merge.rc:1385
+#: Merge.rc:2066
#, c-format
msgid "Compare"
msgstr "Primerjaj"
-#: Merge.rc:1386
+#: Merge.rc:1388
#, c-format
msgid "Whitespace"
msgstr "Prazen znak"
-#: Merge.rc:1387
+#: Merge.rc:1389
#, c-format
msgid "&Compare"
msgstr "&Primerjaj"
-#: Merge.rc:1388
+#: Merge.rc:1390
#, c-format
msgid "&Ignore change"
msgstr "&Ignoriraj spremembe"
-#: Merge.rc:1389
+#: Merge.rc:1391
#, c-format
msgid "I&gnore all"
msgstr "Ig&noriraj vse"
-#: Merge.rc:1390
+#: Merge.rc:1392
#, c-format
msgid "Ignore blan&k lines"
msgstr "Ignoriraj prazne &vrstice"
-#: Merge.rc:1391
+#: Merge.rc:1393
#, c-format
msgid "Ignore &case"
msgstr "Zanemari &velikost znakov"
-#: Merge.rc:1394
+#: Merge.rc:1396
#, c-format
msgid "E&nable moved block detection"
msgstr "Omogoèi &razlikovanje premaknjenih blokov"
-#: Merge.rc:1395
+#: Merge.rc:1397
#, c-format
msgid "&Match similar lines"
msgstr "&Ujemanje enakih vrstic"
-#: Merge.rc:1397
+#: Merge.rc:1399
#, c-format
msgid "Filter Comments"
msgstr "Komentarji filtrov"
-#: Merge.rc:1404
-#: Merge.rc:2065
+#: Merge.rc:1406
+#: Merge.rc:2067
#, c-format
msgid "Editor"
msgstr "Urejevalnik"
-#: Merge.rc:1407
+#: Merge.rc:1409
#, c-format
msgid "&Highlight syntax"
msgstr "&Poudari skladnjo"
-#: Merge.rc:1409
+#: Merge.rc:1411
#, c-format
msgid "&Automatic rescan"
msgstr "&Samodejno ponovno iskanje"
-#: Merge.rc:1411
+#: Merge.rc:1413
#, c-format
msgid "&Preserve original EOL chars"
msgstr "Obdr\9ei izvorni tip znakov za konec vrstice (EOL)"
-#: Merge.rc:1413
+#: Merge.rc:1415
#, c-format
msgid "Tabs"
msgstr "Tabulatorji"
-#: Merge.rc:1414
+#: Merge.rc:1416
#, c-format
msgid "&Tab size:"
msgstr "&\9atevilo presledkov, ki jih tabulator nadomesti"
-#: Merge.rc:1417
+#: Merge.rc:1419
#, c-format
msgid "&Insert Tabs"
msgstr "&Vstavi tabulatorje"
-#: Merge.rc:1419
+#: Merge.rc:1421
#, c-format
msgid "Insert &Spaces"
msgstr "&Vstavi presledke"
-#: Merge.rc:1421
+#: Merge.rc:1423
#, c-format
msgid "Line Difference Coloring"
msgstr "Obarvaj razlike v vrstici"
-#: Merge.rc:1423
+#: Merge.rc:1425
#, c-format
msgid "View line differences"
msgstr "Poglej razlike vrstic na"
-#: Merge.rc:1425
+#: Merge.rc:1427
#, c-format
msgid "&Character level"
msgstr "&znakovnem nivoju"
-#: Merge.rc:1427
+#: Merge.rc:1429
#, c-format
msgid "&Word-level:"
msgstr "&besednem nivoju"
-#: Merge.rc:1431
+#: Merge.rc:1433
#, c-format
msgid "W&ord break characters:"
msgstr "&Znak za konec besede"
-#: Merge.rc:1444
+#: Merge.rc:1446
#, c-format
msgid "Filefilters"
msgstr "Datoteèni filtri"
-#: Merge.rc:1450
+#: Merge.rc:1452
#, c-format
msgid "Test"
msgstr "Test"
-#: Merge.rc:1451
+#: Merge.rc:1453
#, c-format
msgid "Install..."
msgstr "Namesti ..."
-#: Merge.rc:1452
+#: Merge.rc:1454
#, c-format
msgid "New..."
msgstr "Nova ..."
-#: Merge.rc:1453
+#: Merge.rc:1455
#, c-format
msgid "Edit..."
msgstr "Uredi ..."
-#: Merge.rc:1454
+#: Merge.rc:1456
#, c-format
msgid "Delete..."
msgstr "Izbri\9ai ..."
-#: Merge.rc:1460
+#: Merge.rc:1462
#, c-format
msgid "Save modified files?"
msgstr "Shrani spremenjene datoteke?"
-#: Merge.rc:1463
+#: Merge.rc:1465
#, c-format
msgid "Left side file"
msgstr "Leva stran datoteke"
-#: Merge.rc:1466
+#: Merge.rc:1468
#, c-format
msgid "&Save changes"
msgstr "&Shrani spremembe"
-#: Merge.rc:1468
+#: Merge.rc:1470
#, c-format
msgid "&Discard changes"
msgstr "&Zavr\9ei spremembe"
-#: Merge.rc:1470
+#: Merge.rc:1472
#, c-format
msgid "Middle side file"
msgstr ""
-#: Merge.rc:1473
+#: Merge.rc:1475
#, c-format
msgid "Sa&ve changes"
msgstr ""
-#: Merge.rc:1475
+#: Merge.rc:1477
#, c-format
msgid "Disca&rd changes"
msgstr ""
-#: Merge.rc:1477
+#: Merge.rc:1479
#, c-format
msgid "Right side file"
msgstr "Desna stran datoteke"
-#: Merge.rc:1480
+#: Merge.rc:1482
#, c-format
msgid "S&ave changes"
msgstr "Shrani spremembe"
-#: Merge.rc:1482
+#: Merge.rc:1484
#, c-format
msgid "Dis&card changes"
msgstr "Zavr\9ei spremembe"
-#: Merge.rc:1484
+#: Merge.rc:1486
#, c-format
msgid "Disca&rd All"
msgstr "&Zavr\9ei vse"
-#: Merge.rc:1491
-#: Merge.rc:1697
-#: Merge.rc:2071
+#: Merge.rc:1493
+#: Merge.rc:1699
+#: Merge.rc:2073
#, c-format
msgid "Codepage"
msgstr "Kodna tabela"
-#: Merge.rc:1494
+#: Merge.rc:1496
#, c-format
msgid "Default Codepage"
msgstr "Privzeta kodna tabela"
-#: Merge.rc:1495
+#: Merge.rc:1497
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "Izberite privzeto kodno tabelo za nalaganje ne-Unicode datotek:"
-#: Merge.rc:1497
+#: Merge.rc:1499
#, c-format
msgid ""
"Detect codepage info for these files: .html, .rc, .xml \n"
"Zaznaj kodno tabelo za datoteke s konènico: .html, .rc, .xml \n"
"(potreben je ponovni zagon seje)"
-#: Merge.rc:1500
+#: Merge.rc:1502
#, c-format
msgid "Detect codepage for text files using mlang.dll\nneed to restart session"
msgstr ""
-#: Merge.rc:1505
+#: Merge.rc:1507
#, c-format
msgid "System codepage"
msgstr "Sistemska kodna tabela"
-#: Merge.rc:1507
+#: Merge.rc:1509
#, c-format
msgid "According to WinMerge User Interface"
msgstr "Glede na WinMerge uporabni\9aki vmesnik"
-#: Merge.rc:1509
+#: Merge.rc:1511
#, c-format
msgid "Custom codepage:"
msgstr "Kodna tabela po meri:"
-#: Merge.rc:1518
+#: Merge.rc:1520
#, c-format
msgid "Options"
msgstr "Mo\9enosti"
-#: Merge.rc:1529
+#: Merge.rc:1531
#, c-format
msgid " Categories"
msgstr "Kategorije"
-#: Merge.rc:1531
+#: Merge.rc:1533
#, c-format
msgid "Import..."
msgstr "Uvozi ..."
-#: Merge.rc:1532
+#: Merge.rc:1534
#, c-format
msgid "Export..."
msgstr "Izvozi ..."
-#: Merge.rc:1537
-#: Merge.rc:1745
+#: Merge.rc:1539
+#: Merge.rc:1747
#, c-format
msgid "Dialog"
msgstr "Dialog"
-#: Merge.rc:1540
+#: Merge.rc:1542
#, c-format
msgid "Keywords:"
msgstr "Kljuène Besede:"
-#: Merge.rc:1541
+#: Merge.rc:1543
#, c-format
msgid "Function names:"
msgstr "Imena funkcij:"
-#: Merge.rc:1542
+#: Merge.rc:1544
#, c-format
msgid "Comments:"
msgstr "Komentarji:"
-#: Merge.rc:1543
+#: Merge.rc:1545
#, c-format
msgid "Numbers:"
msgstr "\8atevilke:"
-#: Merge.rc:1544
+#: Merge.rc:1546
#, c-format
msgid "Operators:"
msgstr "Operatorji:"
-#: Merge.rc:1545
+#: Merge.rc:1547
#, c-format
msgid "Strings:"
msgstr "Nizi:"
-#: Merge.rc:1546
+#: Merge.rc:1548
#, c-format
msgid "Preprocessor:"
msgstr "Preprocesirano:"
-#: Merge.rc:1547
+#: Merge.rc:1549
#, c-format
msgid "User 1:"
msgstr "Uporabnik 1:"
-#: Merge.rc:1548
+#: Merge.rc:1550
#, c-format
msgid "User 2:"
msgstr "Uporabnik 2:"
-#: Merge.rc:1553
-#: Merge.rc:1558
-#: Merge.rc:1563
-#: Merge.rc:1568
-#: Merge.rc:1573
-#: Merge.rc:1578
-#: Merge.rc:1583
-#: Merge.rc:1588
-#: Merge.rc:1593
+#: Merge.rc:1555
+#: Merge.rc:1560
+#: Merge.rc:1565
+#: Merge.rc:1570
+#: Merge.rc:1575
+#: Merge.rc:1580
+#: Merge.rc:1585
+#: Merge.rc:1590
+#: Merge.rc:1595
#, c-format
msgid "Bold"
msgstr "Krepko"
-#: Merge.rc:1601
+#: Merge.rc:1603
#, c-format
msgid "Folder Compare Report"
msgstr "Poroèilo primerjanja datotek"
-#: Merge.rc:1604
+#: Merge.rc:1606
#, c-format
msgid "Report &File:"
msgstr "Poroèilna &datoteka:"
-#: Merge.rc:1607
-#: Merge.rc:1783
-#: Merge.rc:1787
-#: Merge.rc:1814
+#: Merge.rc:1609
+#: Merge.rc:1785
+#: Merge.rc:1789
+#: Merge.rc:1816
#, c-format
msgid "Browse..."
msgstr "Brskaj ..."
-#: Merge.rc:1608
+#: Merge.rc:1610
#, c-format
msgid "&Style:"
msgstr "&Stil:"
-#: Merge.rc:1611
+#: Merge.rc:1613
#, c-format
msgid "&Include File Compare Report"
msgstr ""
-#: Merge.rc:1613
+#: Merge.rc:1615
#, c-format
msgid "&Copy to Clipboard"
msgstr "&Kopiraj v odlo\9ei\9aèe"
-#: Merge.rc:1621
+#: Merge.rc:1623
#, c-format
msgid "Shared or Private Filter"
msgstr "Skupni ali zasebni filter"
-#: Merge.rc:1624
+#: Merge.rc:1626
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "Kateri tip filtra \9eelite ustvariti"
-#: Merge.rc:1626
+#: Merge.rc:1628
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "Deljen filter (za vse uporabnike na tem raèunalniku)"
-#: Merge.rc:1628
+#: Merge.rc:1630
#, c-format
msgid "Private Filter (only for current user)"
msgstr "Zasebni filter (samo za doloèene uporabnike)"
-#: Merge.rc:1636
-#: Merge.rc:2072
+#: Merge.rc:1638
+#: Merge.rc:2074
#, c-format
msgid "Archive Support"
msgstr "Podpora arhivskim datotekam"
-#: Merge.rc:1639
+#: Merge.rc:1641
#, c-format
msgid "&Enable archive file support"
msgstr "Omogoèi delo z &arhivskimi datotekami"
-#: Merge.rc:1641
+#: Merge.rc:1643
#, c-format
msgid "&Detect archive type from file signature"
msgstr "&Razberi tip arhivske datoteke iz podpisa datoteke"
-#: Merge.rc:1649
+#: Merge.rc:1651
#, c-format
msgid "Compare Statistics"
msgstr "Preimerjalna statistika"
-#: Merge.rc:1652
+#: Merge.rc:1654
#, c-format
msgid "Folders:"
msgstr "Mape:"
-#: Merge.rc:1653
+#: Merge.rc:1655
#, c-format
msgid "Files:"
msgstr "Datoteke:"
-#: Merge.rc:1654
-#: Merge.rc:2447
+#: Merge.rc:1656
+#: Merge.rc:2449
#, c-format
msgid "Different"
msgstr "Razlika"
-#: Merge.rc:1655
+#: Merge.rc:1657
#, c-format
msgid "Text:"
msgstr "Besedilo:"
-#: Merge.rc:1658
-#: Merge.rc:1682
+#: Merge.rc:1660
+#: Merge.rc:1684
#, c-format
msgid "Binary:"
msgstr "Binarno:"
-#: Merge.rc:1661
+#: Merge.rc:1663
#, c-format
msgid "Unique"
msgstr "Unikat"
-#: Merge.rc:1662
+#: Merge.rc:1664
#, c-format
msgid "Left:"
msgstr "Levo:"
-#: Merge.rc:1667
+#: Merge.rc:1669
#, c-format
msgid "Middle:"
msgstr ""
-#: Merge.rc:1672
+#: Merge.rc:1674
#, c-format
msgid "Right:"
msgstr "Desno:"
-#: Merge.rc:1677
-#: Merge.rc:2437
+#: Merge.rc:1679
+#: Merge.rc:2439
#, c-format
msgid "Identical"
msgstr "Enako"
-#: Merge.rc:1686
+#: Merge.rc:1688
#, c-format
msgid "Total:"
msgstr "Celotno:"
-#: Merge.rc:1691
+#: Merge.rc:1693
#, c-format
msgid "Close"
msgstr "Zapri"
-#: Merge.rc:1700
+#: Merge.rc:1702
#, c-format
msgid "Affects"
msgstr "Spremeni"
-#: Merge.rc:1703
-#: Merge.rc:1706
-#: Merge.rc:1709
+#: Merge.rc:1705
+#: Merge.rc:1708
+#: Merge.rc:1711
#, c-format
msgid "(Affects)"
msgstr "(Spremeni)"
-#: Merge.rc:1710
+#: Merge.rc:1712
#, c-format
msgid "Select Codepage for"
msgstr "Izberi kodno tabelo datoteke za"
-#: Merge.rc:1711
+#: Merge.rc:1713
#, c-format
msgid "&File Loading:"
msgstr "&nalaganje datoteke:"
-#: Merge.rc:1714
+#: Merge.rc:1716
#, c-format
msgid "File &Saving:"
msgstr "&shranjevanje datoteke:"
-#: Merge.rc:1717
+#: Merge.rc:1719
#, c-format
msgid "&Use same codepage for both"
msgstr "&Uporabi enako kodno tabelo za oboje"
-#: Merge.rc:1720
+#: Merge.rc:1722
#, c-format
msgid "&Apply"
msgstr "&Uporabi"
-#: Merge.rc:1721
-#: Merge.rc:2038
+#: Merge.rc:1723
+#: Merge.rc:2040
#, c-format
msgid "&Cancel"
msgstr "&Preklièi"
-#: Merge.rc:1726
+#: Merge.rc:1728
#, c-format
msgid "Test Filter"
msgstr "Testni filter"
-#: Merge.rc:1729
+#: Merge.rc:1731
#, c-format
msgid "Testing filter ..."
msgstr "Testiranje filtra ..."
-#: Merge.rc:1731
+#: Merge.rc:1733
#, c-format
msgid "&Enter text to test:"
msgstr "&Vnos besedila za testiranje:"
-#: Merge.rc:1733
+#: Merge.rc:1735
#, c-format
msgid "&Folder Name"
msgstr "&Ime mape"
-#: Merge.rc:1735
+#: Merge.rc:1737
#, c-format
msgid "Result:"
msgstr "Rezultat:"
-#: Merge.rc:1739
+#: Merge.rc:1741
#, c-format
msgid "&Test"
msgstr "&Test"
-#: Merge.rc:1740
+#: Merge.rc:1742
#, c-format
msgid "&Close"
msgstr "&Zapri"
-#: Merge.rc:1748
+#: Merge.rc:1750
#, c-format
msgid "&Use customized text colors"
msgstr "&Uporabi izbrane barve besedila"
-#: Merge.rc:1751
+#: Merge.rc:1753
#, c-format
msgid "Custom text colors"
msgstr "Izbrane barve besedila"
-#: Merge.rc:1753
+#: Merge.rc:1755
#, c-format
msgid "Whitespace:"
msgstr "Prazen znak:"
-#: Merge.rc:1754
+#: Merge.rc:1756
#, c-format
msgid "Regular text:"
msgstr "Navadno besedilo:"
-#: Merge.rc:1755
+#: Merge.rc:1757
#, c-format
msgid "Selection:"
msgstr "Izbira:"
-#: Merge.rc:1778
+#: Merge.rc:1780
#, c-format
msgid "Paths"
msgstr "Poti"
-#: Merge.rc:1781
+#: Merge.rc:1783
#, c-format
msgid "&Left:"
msgstr "&Levi okvir:"
-#: Merge.rc:1784
+#: Merge.rc:1786
#, c-format
msgid "R&ead-only"
msgstr "Samo za branje"
-#: Merge.rc:1785
+#: Merge.rc:1787
#, c-format
msgid "&Right:"
msgstr "&Desni okvir:"
-#: Merge.rc:1788
+#: Merge.rc:1790
#, c-format
msgid "Re&ad-only"
msgstr "Samo za branje"
-#: Merge.rc:1789
+#: Merge.rc:1791
#, c-format
msgid "&Filter:"
msgstr "&Filter:"
-#: Merge.rc:1794
+#: Merge.rc:1796
#, c-format
msgid "Open..."
msgstr "Odpri.."
-#: Merge.rc:1795
+#: Merge.rc:1797
#, c-format
msgid "Save..."
msgstr "Shrani"
-#: Merge.rc:1800
-#: Merge.rc:2073
+#: Merge.rc:1802
+#: Merge.rc:2075
#, c-format
msgid "Backup Files"
msgstr "Arhivske datoteke"
-#: Merge.rc:1803
+#: Merge.rc:1805
#, c-format
msgid "Create backup files in:"
msgstr "Ustvari arhivske datoteke v:"
-#: Merge.rc:1804
+#: Merge.rc:1806
#, c-format
msgid "&Folder compare"
msgstr "primerjava &map"
-#: Merge.rc:1806
+#: Merge.rc:1808
#, c-format
msgid "Fil&e compare"
msgstr "primerjavi &datotek"
-#: Merge.rc:1808
+#: Merge.rc:1810
#, c-format
msgid "Create backup files into:"
msgstr "Ustvari arhivske datoteke v:"
-#: Merge.rc:1809
+#: Merge.rc:1811
#, c-format
msgid "&Original file's folder"
msgstr "&mapi izvorne datoteke"
-#: Merge.rc:1811
+#: Merge.rc:1813
#, c-format
msgid "&Global backup folder:"
msgstr "&globalni arhivski mapi:"
-#: Merge.rc:1815
+#: Merge.rc:1817
#, c-format
msgid "Backup filename:"
msgstr "Naziv arhivske datoteke"
-#: Merge.rc:1816
+#: Merge.rc:1818
#, c-format
msgid "&Append .bak -extension"
msgstr "&Dodaj .bak konènico"
-#: Merge.rc:1818
+#: Merge.rc:1820
#, c-format
msgid "A&ppend timestamp"
msgstr "&Dodaj datum in èas "
-#: Merge.rc:1825
-#: Merge.rc:2360
+#: Merge.rc:1827
+#: Merge.rc:2362
#, c-format
msgid "Confirm Copy"
msgstr "Potrdi kopiranje"
-#: Merge.rc:1829
+#: Merge.rc:1831
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Ali ste preprièani, da \9eelite kopirati XXX predmete?"
-#: Merge.rc:1831
+#: Merge.rc:1833
#, c-format
msgid "From left"
msgstr "Z leve"
-#: Merge.rc:1834
+#: Merge.rc:1836
#, c-format
msgid "To right"
msgstr "Na desno"
-#: Merge.rc:1837
+#: Merge.rc:1839
#, c-format
msgid "Yes"
msgstr "Da"
-#: Merge.rc:1838
+#: Merge.rc:1840
#, c-format
msgid "No"
msgstr "Ne"
-#: Merge.rc:1844
+#: Merge.rc:1846
#, c-format
msgid "Plugins"
msgstr "Raz\9airitve"
-#: Merge.rc:1847
+#: Merge.rc:1849
#, c-format
msgid "&Enable plugins"
msgstr "&Omogoèi raz\9airitve"
-#: Merge.rc:1859
-#: Merge.rc:2074
+#: Merge.rc:1861
+#: Merge.rc:2076
#, c-format
msgid "Shell Integration"
msgstr "Integracija v lupino"
-#: Merge.rc:1862
+#: Merge.rc:1864
#, c-format
msgid "Explorer"
msgstr "Explorer"
-#: Merge.rc:1863
+#: Merge.rc:1865
#, c-format
msgid "E&nable advanced menu"
msgstr "Omogoèi &napredni meni"
-#: Merge.rc:1865
+#: Merge.rc:1867
#, c-format
msgid "&Add to context menu"
msgstr "&Dodaj k raz\9airjenemu meniju"
-#: Merge.rc:1867
+#: Merge.rc:1869
#, c-format
msgid "&Register shell extension"
msgstr ""
-#: Merge.rc:1868
+#: Merge.rc:1870
#, c-format
msgid "&Unregister shell extension"
msgstr ""
-#: Merge.rc:1873
-#: Merge.rc:2077
-#: Merge.rc:2381
+#: Merge.rc:1875
+#: Merge.rc:2079
+#: Merge.rc:2383
#, c-format
msgid "Folder"
msgstr "Mapa"
-#: Merge.rc:1878
+#: Merge.rc:1880
#, c-format
msgid "S&top after first difference"
msgstr "&Ustavi po prvi razliki"
-#: Merge.rc:1880
+#: Merge.rc:1882
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
msgstr "&Zanemari razlike manj\9ae od 3 sekund"
-#: Merge.rc:1882
+#: Merge.rc:1884
#, c-format
msgid "&Include unique subfolders contents"
msgstr "&Vkljuèi podmape ki obstajajo samo na eni strani"
-#: Merge.rc:1884
+#: Merge.rc:1886
#, c-format
msgid "&Automatically expand all subfolders"
msgstr ""
-#: Merge.rc:1886
+#: Merge.rc:1888
#, c-format
msgid "Ignore &Reparse Points"
msgstr ""
-#: Merge.rc:1888
+#: Merge.rc:1890
#, c-format
msgid "&Quick compare limit (MB):"
msgstr "Omejitev za &hitro primerjavo (MB):"
-#: Merge.rc:1895
-#: Merge.rc:2079
-#: Merge.rc:2422
-#: Merge.rc:2628
+#: Merge.rc:1897
+#: Merge.rc:2081
+#: Merge.rc:2424
+#: Merge.rc:2630
#, c-format
msgid "Binary"
msgstr "Binarno"
-#: Merge.rc:1898
+#: Merge.rc:1900
#, c-format
msgid "Binary File &Patterns:"
msgstr ""
-#: Merge.rc:1900
+#: Merge.rc:1902
#, c-format
msgid "Frhed settings"
msgstr ""
-#: Merge.rc:1901
+#: Merge.rc:1903
#, c-format
msgid "View &Settings..."
msgstr ""
-#: Merge.rc:1902
+#: Merge.rc:1904
#, c-format
msgid "&Binary Mode..."
msgstr ""
-#: Merge.rc:1903
+#: Merge.rc:1905
#, c-format
msgid "&Character Set..."
msgstr ""
-#: Merge.rc:1909
-#: Merge.rc:2078
+#: Merge.rc:1911
+#: Merge.rc:2080
#, c-format
msgid "Image"
msgstr ""
-#: Merge.rc:1912
+#: Merge.rc:1914
#, c-format
msgid "Image File &Patterns:"
msgstr ""
-#: Merge.rc:1925
+#: Merge.rc:1927
#, c-format
msgid "&Hex View"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1950
+#: Merge.rc:1952
#, c-format
msgid "040904e4"
msgstr "040904e4"
#. VarFileInfo.Translation
-#: Merge.rc:1966
+#: Merge.rc:1968
#, c-format
msgid "0x409, 1252"
msgstr "0x407, 1250"
-#: Merge.rc:1986
+#: Merge.rc:1988
#, c-format
msgid "EXT"
msgstr "EXT"
-#: Merge.rc:1987
+#: Merge.rc:1989
#, c-format
msgid "CAP"
msgstr "CAP"
-#: Merge.rc:1988
+#: Merge.rc:1990
#, c-format
msgid "NUM"
msgstr "NUM"
-#: Merge.rc:1989
+#: Merge.rc:1991
#, c-format
msgid "SCRL"
msgstr "SCRL"
-#: Merge.rc:1990
+#: Merge.rc:1992
#, c-format
msgid "OVR"
msgstr "OVR"
-#: Merge.rc:1991
+#: Merge.rc:1993
#, c-format
msgid "REC"
msgstr "REC"
-#: Merge.rc:1997
+#: Merge.rc:1999
#, c-format
msgid "\nNew Documents (Ctrl+N)"
msgstr ""
-#: Merge.rc:1998
+#: Merge.rc:2000
#, c-format
msgid "\nOpen (Ctrl+O)"
msgstr ""
-#: Merge.rc:1999
+#: Merge.rc:2001
#, c-format
msgid "\nSave (Ctrl+S)"
msgstr ""
-#: Merge.rc:2005
+#: Merge.rc:2007
#, c-format
msgid "Unknown error attempting to open project file"
msgstr "Neznana napaka pri odpiranju datoteke projekta"
-#: Merge.rc:2006
+#: Merge.rc:2008
#, c-format
msgid "Unknown error attempting to save project file"
msgstr "Neznana napaka pri shranjevanju datoteke projekta"
-#: Merge.rc:2007
+#: Merge.rc:2009
#, c-format
msgid "Project File"
msgstr "Datoteka projekta"
-#: Merge.rc:2008
+#: Merge.rc:2010
#, c-format
msgid "Project file successfully loaded."
msgstr "Datoteka projekta uspe\9ano nalo\9eena."
-#: Merge.rc:2009
+#: Merge.rc:2011
#, c-format
msgid "Project file successfully saved."
msgstr "Datoteka projekta uspe\9ano shranjena."
-#: Merge.rc:2015
+#: Merge.rc:2017
#, c-format
msgid "\nUndo (Ctrl+Z)"
msgstr ""
-#: Merge.rc:2016
+#: Merge.rc:2018
#, c-format
msgid "\nRedo (Ctrl+Y)"
msgstr ""
-#: Merge.rc:2023
+#: Merge.rc:2025
#, c-format
msgid ""
"\n"
"WinMerge.Primerjava datotek\n"
"WinMerge primerjava datotek"
-#: Merge.rc:2024
+#: Merge.rc:2026
#, c-format
msgid ""
"\n"
"WinMerge.Primerjava map\n"
"WinMerge primerjava map"
-#: Merge.rc:2030
+#: Merge.rc:2032
#, c-format
msgid ""
"Developers:\n"
"Razvijalci:\n"
"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-#: Merge.rc:2031
+#: Merge.rc:2033
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr "WinMerge prihaja POPOLNOMA BREZ GARANCIJE. To je brezplaèna programska oprema, dobrodo\9ali ste za njeno raz\9airjanje pod doloèenimi pogoji, veè v GNU licenci v meniju Pomoè."
-#: Merge.rc:2039
+#: Merge.rc:2041
#, c-format
msgid "&Abort"
msgstr "&Prekini"
-#: Merge.rc:2040
+#: Merge.rc:2042
#, c-format
msgid "&Retry"
msgstr "&Poskusi ponovno"
-#: Merge.rc:2041
+#: Merge.rc:2043
#, c-format
msgid "&Ignore"
msgstr "&Prezri"
-#: Merge.rc:2042
+#: Merge.rc:2044
#, c-format
msgid "Ignore &all"
msgstr "Prezri &vse"
-#: Merge.rc:2043
+#: Merge.rc:2045
#, c-format
msgid "&Yes"
msgstr "&Da"
-#: Merge.rc:2049
+#: Merge.rc:2051
#, c-format
msgid "Yes to &all"
msgstr "Da za &vse"
-#: Merge.rc:2050
+#: Merge.rc:2052
#, c-format
msgid "&No"
msgstr "&Ne"
-#: Merge.rc:2051
+#: Merge.rc:2053
#, c-format
msgid "No to a&ll"
msgstr "Ne za &vse"
-#: Merge.rc:2052
+#: Merge.rc:2054
#, c-format
msgid "&Continue"
msgstr "&Nadaljuj"
-#: Merge.rc:2053
+#: Merge.rc:2055
#, c-format
msgid "&Skip"
msgstr "&Preskoèi"
-#: Merge.rc:2054
+#: Merge.rc:2056
#, c-format
msgid "Skip &all"
msgstr "Preskoèi &vse"
-#: Merge.rc:2056
+#: Merge.rc:2058
#, c-format
msgid "Don't display this &message again."
msgstr "Tega sporoèila ne ka\9ei veè."
-#: Merge.rc:2057
+#: Merge.rc:2059
#, c-format
msgid "Don't ask this &question again."
msgstr "Tega vpra\9aanja ne postavi veè."
-#: Merge.rc:2068
+#: Merge.rc:2070
#, c-format
msgid "Syntax"
msgstr "Sintaksa"
-#: Merge.rc:2070
+#: Merge.rc:2072
#, c-format
msgid "Version Control"
msgstr "Nadzor razlièic"
-#: Merge.rc:2075
-#: Merge.rc:2421
+#: Merge.rc:2077
+#: Merge.rc:2423
#, c-format
msgid "Differences"
msgstr "Razlike"
-#: Merge.rc:2086
+#: Merge.rc:2088
#, c-format
msgid "To:"
msgstr "Na:"
-#: Merge.rc:2087
+#: Merge.rc:2089
#, c-format
msgid "From left:"
msgstr "Iz leve:"
-#: Merge.rc:2088
+#: Merge.rc:2090
#, c-format
msgid "To left:"
msgstr "Na levo:"
-#: Merge.rc:2089
+#: Merge.rc:2091
#, c-format
msgid "From right:"
msgstr "Iz desne:"
-#: Merge.rc:2090
+#: Merge.rc:2092
#, c-format
msgid "To right:"
msgstr "Na desno:"
-#: Merge.rc:2096
+#: Merge.rc:2098
#, c-format
msgid "Version %1"
msgstr "Razlièica %1"
-#: Merge.rc:2097
+#: Merge.rc:2099
#, c-format
msgid "Unicode"
msgstr "Unicode"
-#: Merge.rc:2098
+#: Merge.rc:2100
#, c-format
msgid "X64"
msgstr "X64"
-#: Merge.rc:2104
+#: Merge.rc:2106
#, c-format
msgid "Options (%1)"
msgstr "Mo\9enosti (%1)"
-#: Merge.rc:2105
+#: Merge.rc:2107
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Vsa sporoèilna okna bodo sedaj ponovno prikazana "
-#: Merge.rc:2107
+#: Merge.rc:2109
#, c-format
msgid ""
"Value in Tab size -field is not in range WinMerge accepts.\n"
"\n"
"Prosimo, uporabite vrednosti 1 - %1."
-#: Merge.rc:2113
+#: Merge.rc:2115
#, c-format
msgid "Open"
msgstr "Odpri"
-#: Merge.rc:2114
+#: Merge.rc:2116
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Izvedljive datoteke|*.exe;*.bat;*.cmd|Vse datoteke (*.*)|*.*||"
-#: Merge.rc:2115
+#: Merge.rc:2117
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Vse datoteke (*.*)|*.*||"
-#: Merge.rc:2116
+#: Merge.rc:2118
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "Datoteke WinMerge projektov (*.WinMerge)|*.WinMerge||"
-#: Merge.rc:2118
+#: Merge.rc:2120
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Datoteke nastavitev (*.ini)|*.ini|Vse datoteke (*.*)|*.*||"
-#: Merge.rc:2124
+#: Merge.rc:2126
#, c-format
msgid "Text Files (*.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:2125
+#: Merge.rc:2127
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|Vse datoteke (*.*)|*.*||"
-#: Merge.rc:2126
+#: Merge.rc:2128
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML datoteke (*.xml)|*.xml|Vse datoteke (*.*)|*.*||"
-#: Merge.rc:2143
-#: Merge.rc:2637
+#: Merge.rc:2145
+#: Merge.rc:2639
#, c-format
msgid "Name"
msgstr "Ime"
-#: Merge.rc:2144
+#: Merge.rc:2146
#, c-format
msgid "Location"
msgstr "Lokacija"
-#: Merge.rc:2145
+#: Merge.rc:2147
#, c-format
msgid "Filters"
msgstr "Filtri"
-#: Merge.rc:2146
+#: Merge.rc:2148
#, c-format
msgid "[F] "
msgstr "[F] "
-#: Merge.rc:2147
-#: Merge.rc:2639
+#: Merge.rc:2149
+#: Merge.rc:2641
#, c-format
msgid "Description"
msgstr "Opis"
-#: Merge.rc:2148
+#: Merge.rc:2150
#, c-format
msgid "Select filename for new filter"
msgstr "Izberite ime datoteke za nov filter"
-#: Merge.rc:2149
+#: Merge.rc:2151
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Datoteke filtrov (*.flt)|*.flt|Vse datoteke (*.*)|*.*||"
-#: Merge.rc:2151
+#: Merge.rc:2153
#, c-format
msgid ""
"Cannot find file filter template file!\n"
"Prosimo, kopirajte datoteko %1 v \"WinMerge/Filters\" mapo:\n"
"%2."
-#: Merge.rc:2153
+#: Merge.rc:2155
#, c-format
msgid ""
"Cannot copy filter template file to filter folder:\n"
"\n"
"Prosim preverite, èe mapa obstaja in je zapisljiva."
-#: Merge.rc:2155
+#: Merge.rc:2157
#, c-format
msgid ""
"User's filter file folder is not defined!\n"
"\n"
"Prosim izberite filter mape v Mo\9enosti/Sistem."
-#: Merge.rc:2157
+#: Merge.rc:2159
#, c-format
msgid ""
"Failed to delete the filter file:\n"
"\n"
"Morda je datoteka za\9aèitena - samo za branje."
-#: Merge.rc:2158
+#: Merge.rc:2160
#, c-format
msgid "Locate filter file to install"
msgstr "Poi\9aèi filter datoteko za namestitev"
-#: Merge.rc:2160
+#: Merge.rc:2162
#, c-format
msgid ""
"Installing filter file failed.\n"
"\n"
"Ni mogoèe kopirati nove filter datoteke v filter mapo."
-#: Merge.rc:2162
+#: Merge.rc:2164
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr "Filter datoteka \9ee obstaja. Prepi\9aem obstojeèi filter."
-#: Merge.rc:2168
+#: Merge.rc:2170
#, c-format
msgid "Regular expression"
msgstr "Regularni izraz"
-#: Merge.rc:2174
+#: Merge.rc:2176
#, c-format
msgid ""
"Filters were updated. Do you want to refresh all open folder compares?\n"
"\n"
"Èe jih ne \9eelite osve\9eiti sedaj, lahko izberete Ne in osve\9eite primerjave kasneje."
-#: Merge.rc:2181
+#: Merge.rc:2183
#, c-format
msgid "&Path to SS.EXE:"
msgstr "&Pot do SS.EXE:"
-#: Merge.rc:2187
+#: Merge.rc:2189
#, c-format
msgid "Folder Comparison Results"
msgstr "Rezultati primerjanja map"
-#: Merge.rc:2188
+#: Merge.rc:2190
#, c-format
msgid "File Comparison"
msgstr "Primerjanje map"
-#: Merge.rc:2189
+#: Merge.rc:2191
#, c-format
msgid "Untitled left"
msgstr "Levi neimenovan"
-#: Merge.rc:2190
+#: Merge.rc:2192
#, c-format
msgid "Untitled middle"
msgstr ""
-#: Merge.rc:2191
+#: Merge.rc:2193
#, c-format
msgid "Untitled right"
msgstr "Desni neimenovan"
-#: Merge.rc:2192
+#: Merge.rc:2194
#, c-format
msgid "Theirs File"
msgstr "Njihova datoteka"
-#: Merge.rc:2193
+#: Merge.rc:2195
#, c-format
msgid "Mine File"
msgstr "Va\9aa datoteka"
-#: Merge.rc:2199
+#: Merge.rc:2201
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)"
msgstr ""
-#: Merge.rc:2200
+#: Merge.rc:2202
#, c-format
msgid "Line: %s"
msgstr "Vrstica: %s"
-#: Merge.rc:2201
+#: Merge.rc:2203
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)"
msgstr ""
-#: Merge.rc:2202
+#: Merge.rc:2204
#, c-format
msgid "Merge"
msgstr "Zdru\9ei"
-#: Merge.rc:2203
+#: Merge.rc:2205
#, c-format
msgid "Difference %1 of %2"
msgstr "Razlika %1 od %2"
-#: Merge.rc:2204
+#: Merge.rc:2206
#, c-format
msgid "%1 Differences Found"
msgstr "%1 najdenih razlik"
-#: Merge.rc:2205
+#: Merge.rc:2207
#, c-format
msgid "1 Difference Found"
msgstr "1 najdena razlika"
#. Abbreviation from "Read Only"
-#: Merge.rc:2206
+#: Merge.rc:2208
#, c-format
msgid "RO"
msgstr "SZB"
-#: Merge.rc:2212
+#: Merge.rc:2214
#, c-format
msgid "Item %1 of %2"
msgstr "Predmet %1 od %2"
-#: Merge.rc:2213
+#: Merge.rc:2215
#, c-format
msgid "Items: %1"
msgstr "Predmetov: %1"
-#: Merge.rc:2219
+#: Merge.rc:2221
#, c-format
msgid "Select two existing folders or files to compare"
msgstr "Izberite dve obstojeèi mapi ali datoteki za primerjavo"
-#: Merge.rc:2220
+#: Merge.rc:2222
#, c-format
msgid "Folder Selection"
msgstr "Izbira map"
-#: Merge.rc:2221
+#: Merge.rc:2223
#, c-format
msgid "Select two folders or two files to compare."
msgstr "Izberite dve mapi ali dve datoteki za primerjavo."
-#: Merge.rc:2222
+#: Merge.rc:2224
#, c-format
msgid "Left path is invalid!"
msgstr "Leva pot je neveljavna!"
-#: Merge.rc:2223
+#: Merge.rc:2225
#, c-format
msgid "Middle path is invalid!"
msgstr ""
-#: Merge.rc:2224
+#: Merge.rc:2226
#, c-format
msgid "Right path is invalid!"
msgstr "Desna pot je neveljavna!"
-#: Merge.rc:2225
+#: Merge.rc:2227
#, c-format
msgid "Both paths are invalid!"
msgstr "Obe poti sta neveljavni!"
-#: Merge.rc:2226
+#: Merge.rc:2228
#, c-format
msgid "Left and middle path is invalid!"
msgstr ""
-#: Merge.rc:2227
+#: Merge.rc:2229
#, c-format
msgid "Left and right path is invalid!"
msgstr ""
-#: Merge.rc:2228
+#: Merge.rc:2230
#, c-format
msgid "Middle and right path is invalid!"
msgstr ""
-#: Merge.rc:2229
+#: Merge.rc:2231
#, c-format
msgid "All paths are invalid!"
msgstr ""
-#: Merge.rc:2230
+#: Merge.rc:2232
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr "Izberite dve datoteki, da boste omogoèili izbiro pretvornika."
-#: Merge.rc:2231
+#: Merge.rc:2233
#, c-format
msgid "Cannot compare file and folder!"
msgstr "Ne morem primerjati datoteke in mape!"
-#: Merge.rc:2237
+#: Merge.rc:2239
#, c-format
msgid "File not found: %1"
msgstr "Datoteka ni najdena: %1"
-#: Merge.rc:2238
+#: Merge.rc:2240
#, c-format
msgid "File not unpacked: %1"
msgstr "Datoteka ni pretvorjena: %1"
-#: Merge.rc:2239
+#: Merge.rc:2241
#, c-format
msgid ""
"Cannot open file\n"
"\n"
"%2"
-#: Merge.rc:2240
+#: Merge.rc:2242
#, c-format
msgid "Failed to parse conflict file."
msgstr "Ne morem razèleniti konfliktne datoteke."
-#: Merge.rc:2241
+#: Merge.rc:2243
#, c-format
msgid ""
"The file\n"
"%1\n"
"ni konfliktna datoteka."
-#: Merge.rc:2247
+#: Merge.rc:2249
#, c-format
msgid "Save As"
msgstr "Shrani kot"
-#: Merge.rc:2248
+#: Merge.rc:2250
#, c-format
msgid "Save changes to %1?"
msgstr "Shrani spremembe v %1?"
-#: Merge.rc:2249
+#: Merge.rc:2251
#, 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 oznaèena samo za branje. Ali jo kljub temu \9eelite prepisati? ( Ne, za shranjevanje pod novim imenom)"
-#: Merge.rc:2250
+#: Merge.rc:2252
#, c-format
msgid "Error backing up file"
msgstr "Napaka pri shranjevanju arhiva"
-#: Merge.rc:2252
+#: Merge.rc:2254
#, c-format
msgid ""
"Unable to backup original file:\n"
"\n"
"Vseeno nadaljujem?"
-#: Merge.rc:2253
+#: Merge.rc:2255
#, c-format
msgid ""
"Saving file failed.\n"
"\t- uporabiti drugaèno ime datoteke (pritisnite V redu)\n"
"\t- preklicati trenutno operacijo (pritisnite Preklièi)?"
-#: Merge.rc:2254
+#: Merge.rc:2256
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
"\n"
"Ali \9eelite shraniti nezapakirano razlièico v drugo datoteko?"
-#: Merge.rc:2255
+#: Merge.rc:2257
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
"\n"
"Ali \9eelite shraniti nezapakirano razlièico v drugo datoteko?"
-#: Merge.rc:2256
+#: Merge.rc:2258
#, c-format
msgid ""
"Another application has updated file\n"
"\n"
"Prepi\9ai spremenjeno datoteko?"
-#: Merge.rc:2257
+#: Merge.rc:2259
#, c-format
msgid ""
"%1\n"
"%1\n"
"je oznaèena samo za branje. Ali jo kljub temu \9eelite prepisati?"
-#: Merge.rc:2258
+#: Merge.rc:2260
#, c-format
msgid ""
"Another application has updated file\n"
"\n"
"Ali \9eelite posodobljeno ponovno nalo\9eiti?"
-#: Merge.rc:2259
+#: Merge.rc:2261
#, c-format
msgid "Save Left File As"
msgstr "Shrani levo datoteko kot"
-#: Merge.rc:2260
+#: Merge.rc:2262
#, c-format
msgid "Save Middle File As"
msgstr ""
-#: Merge.rc:2261
+#: Merge.rc:2263
#, c-format
msgid "Save Right File As"
msgstr "Shrani desno datoteko kot"
-#: Merge.rc:2262
+#: Merge.rc:2264
#, c-format
msgid ""
"The file\n"
"%1\n"
"ne najdem veè. Prosim shranite kopijo datoteke za nadaljevanje."
-#: Merge.rc:2268
+#: Merge.rc:2270
#, c-format
msgid ""
"Cannot merge differences when documents are not in synch.\n"
"\n"
"Prosim, osve\9eite dokumente pred nadaljujete."
-#: Merge.rc:2274
+#: Merge.rc:2276
#, 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)"
-#: Merge.rc:2275
+#: Merge.rc:2277
#, c-format
msgid "Checkout files from VSS..."
msgstr "CheckOut datotek iz VSS ..."
-#: Merge.rc:2276
+#: Merge.rc:2278
#, 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 ..."
-#: Merge.rc:2277
+#: Merge.rc:2279
#, c-format
msgid "Error executing versioning system command."
msgstr "Napaka pri izvr\9aevanju Versioning System ukaza."
-#: Merge.rc:2278
+#: Merge.rc:2280
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr "VSS delovna mapa in lokacija trenutne datoteke se ne ujemata. Nadaljujem?"
-#: Merge.rc:2279
+#: Merge.rc:2281
#, c-format
msgid "No VSS database(s) found!"
msgstr "Ne morem najti VSS podatkovne baze!"
-#: Merge.rc:2280
+#: Merge.rc:2282
#, c-format
msgid "Error from VSS:"
msgstr "Napaka od VSS:"
-#: Merge.rc:2281
+#: Merge.rc:2283
#, c-format
msgid ""
"Versioning System returned an error while attempting to check in the file.\n"
"Prosim preverite nastavitvene specifikacije uporabljenega pogleda.\n"
"Zavrzi pregledno operacijo?"
-#: Merge.rc:2282
+#: Merge.rc:2284
#, c-format
msgid ""
"Versioning System returned an error while attempting to undo checkout the file.\n"
"Sistem za verzije vraèa napako med preverjanjem datoteke.\n"
"Prosim preverite nastavitvene specifikacije uporabljenega pogleda"
-#: Merge.rc:2288
-#: Merge.rc:2632
+#: Merge.rc:2290
+#: Merge.rc:2634
#, c-format
msgid "None"
msgstr "Brez"
-#: Merge.rc:2289
+#: Merge.rc:2291
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr "Visual SourceSafe (manj\9ai od 5.0)"
-#: Merge.rc:2290
+#: Merge.rc:2292
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr "Visual SourceSafe (5.0 in vi\9aji)"
-#: Merge.rc:2292
+#: Merge.rc:2294
#, c-format
msgid "Break at whitespace"
msgstr "Prelom na praznem znaku"
-#: Merge.rc:2293
+#: Merge.rc:2295
#, c-format
msgid "Break at whitespace or punctuation"
msgstr "Prelom na praznem znaku ali loèilu"
-#: Merge.rc:2299
+#: Merge.rc:2301
#, c-format
msgid "Right to Left (%1)"
msgstr "Z desne proti levi (%1)"
-#: Merge.rc:2300
+#: Merge.rc:2302
#, c-format
msgid "Right to Middle (%1)"
msgstr ""
-#: Merge.rc:2301
+#: Merge.rc:2303
#, c-format
msgid "Middle to Left (%1)"
msgstr ""
-#: Merge.rc:2302
+#: Merge.rc:2304
#, c-format
msgid "Middle to Right (%1)"
msgstr ""
-#: Merge.rc:2303
+#: Merge.rc:2305
#, c-format
msgid "Left to Right (%1)"
msgstr "Z leve proti desni (%1)"
-#: Merge.rc:2304
+#: Merge.rc:2306
#, c-format
msgid "Left to Middle (%1)"
msgstr ""
-#: Merge.rc:2311
-#: Merge.rc:2338
+#: Merge.rc:2313
+#: Merge.rc:2340
#, c-format
msgid "Left to... (%1)"
msgstr "Leva do ... (%1)"
-#: Merge.rc:2312
-#: Merge.rc:2339
+#: Merge.rc:2314
+#: Merge.rc:2341
#, c-format
msgid "Middle to... (%1)"
msgstr ""
-#: Merge.rc:2313
-#: Merge.rc:2340
+#: Merge.rc:2315
+#: Merge.rc:2342
#, c-format
msgid "Right to... (%1)"
msgstr "Desna do ... (%1)"
-#: Merge.rc:2314
+#: Merge.rc:2316
#, c-format
msgid "Both to... (%1)"
msgstr ""
-#: Merge.rc:2315
+#: Merge.rc:2317
#, c-format
msgid "All to... (%1)"
msgstr ""
-#: Merge.rc:2316
+#: Merge.rc:2318
#, c-format
msgid "Differences to... (%1)"
msgstr ""
-#: Merge.rc:2328
+#: Merge.rc:2330
#, c-format
msgid "Left (%1)"
msgstr "Leva (%1)"
-#: Merge.rc:2329
+#: Merge.rc:2331
#, c-format
msgid "Middle (%1)"
msgstr ""
-#: Merge.rc:2330
+#: Merge.rc:2332
#, c-format
msgid "Right (%1)"
msgstr "Desna (%1)"
-#: Merge.rc:2331
+#: Merge.rc:2333
#, c-format
msgid "Both (%1)"
msgstr "Obe (%1)"
-#: Merge.rc:2332
+#: Merge.rc:2334
#, c-format
msgid "All (%1)"
msgstr ""
-#: Merge.rc:2344
+#: Merge.rc:2346
#, c-format
msgid "Left side - select destination folder:"
msgstr "Leva stran - izberite ciljno mapo:"
-#: Merge.rc:2345
+#: Merge.rc:2347
#, c-format
msgid "Middle side - select destination folder:"
msgstr ""
-#: Merge.rc:2346
+#: Merge.rc:2348
#, c-format
msgid "Right side - select destination folder:"
msgstr "Desna stran - izberite ciljno mapo:"
-#: Merge.rc:2347
+#: Merge.rc:2349
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 vpletenih datotek)"
-#: Merge.rc:2348
+#: Merge.rc:2350
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 of %2 vpletenih datotek)"
-#: Merge.rc:2354
+#: Merge.rc:2356
#, c-format
msgid ""
"Are you sure you want to delete\n"
"\n"
"%1?"
-#: Merge.rc:2355
+#: Merge.rc:2357
#, c-format
msgid "Are you sure you want to copy:"
msgstr "Ali ste preprièani da \9eelite kopirati:"
-#: Merge.rc:2356
+#: Merge.rc:2358
#, c-format
msgid "Are you sure you want to copy %d items:"
msgstr "Ali ste preprièani, da \9eelite kopirati %d predmetov:"
-#: Merge.rc:2357
+#: Merge.rc:2359
#, c-format
msgid ""
"Operation aborted!\n"
"\n"
"Prosim, osve\9eite primerjavo."
-#: Merge.rc:2358
+#: Merge.rc:2360
#, c-format
msgid "Are you sure you want to move:"
msgstr "Ali ste preprièani, da \9eelite premakniti:"
-#: Merge.rc:2359
+#: Merge.rc:2361
#, c-format
msgid "Are you sure you want to move %d items:"
msgstr "Ali ste preprièani, da \9eelite premakniti: %d predmetov"
-#: Merge.rc:2361
+#: Merge.rc:2363
#, c-format
msgid "Confirm Move"
msgstr "Potrdi premik"
-#: Merge.rc:2362
+#: Merge.rc:2364
#, c-format
msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
msgstr ""
-#: Merge.rc:2368
+#: Merge.rc:2370
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Ni bilo mogoèe zagnati zunanjega urejevalnika: %1"
-#: Merge.rc:2374
+#: Merge.rc:2376
#, c-format
msgid "Unknown archive format"
msgstr "Nepoznan format arhiva"
-#: Merge.rc:2380
+#: Merge.rc:2382
#, c-format
msgid "Filename"
msgstr "Ime datoteke"
-#: Merge.rc:2382
+#: Merge.rc:2384
#, c-format
msgid "Comparison result"
msgstr "Rezultat primerjave"
-#: Merge.rc:2383
+#: Merge.rc:2385
#, c-format
msgid "Left Date"
msgstr "Levi datum"
-#: Merge.rc:2384
+#: Merge.rc:2386
#, c-format
msgid "Right Date"
msgstr "Desni datum"
-#: Merge.rc:2385
+#: Merge.rc:2387
#, c-format
msgid "Middle Date"
msgstr ""
-#: Merge.rc:2386
+#: Merge.rc:2388
#, c-format
msgid "Extension"
msgstr "Konènica"
-#: Merge.rc:2387
+#: Merge.rc:2389
#, c-format
msgid "Left Size"
msgstr "Leva velikost"
-#: Merge.rc:2388
+#: Merge.rc:2390
#, c-format
msgid "Right Size"
msgstr "Desna velikost"
-#: Merge.rc:2389
+#: Merge.rc:2391
#, c-format
msgid "Middle Size"
msgstr ""
-#: Merge.rc:2390
+#: Merge.rc:2392
#, c-format
msgid "Right Size (Short)"
msgstr "Desna velikost (kratko)"
-#: Merge.rc:2391
+#: Merge.rc:2393
#, c-format
msgid "Left Size (Short)"
msgstr "Leva velikost (kratko)"
-#: Merge.rc:2392
+#: Merge.rc:2394
#, c-format
msgid "Middle Size (Short)"
msgstr ""
-#: Merge.rc:2398
+#: Merge.rc:2400
#, c-format
msgid "Left Creation Time"
msgstr "Datum nastanka leve datoteke"
-#: Merge.rc:2399
+#: Merge.rc:2401
#, c-format
msgid "Right Creation Time"
msgstr "Datum nastanka desne datoteke"
-#: Merge.rc:2400
+#: Merge.rc:2402
#, c-format
msgid "Middle Creation Time"
msgstr ""
-#: Merge.rc:2401
+#: Merge.rc:2403
#, c-format
msgid "Newer File"
msgstr "Novej\9aa datoteka"
-#: Merge.rc:2402
+#: Merge.rc:2404
#, c-format
msgid "Left File Version"
msgstr "Verzija leve datoteke"
-#: Merge.rc:2403
+#: Merge.rc:2405
#, c-format
msgid "Right File Version"
msgstr "Verzija desne datoteke"
-#: Merge.rc:2404
+#: Merge.rc:2406
#, c-format
msgid "Middle File Version"
msgstr ""
-#: Merge.rc:2405
+#: Merge.rc:2407
#, c-format
msgid "Short Result"
msgstr "Kratek rezultat"
-#: Merge.rc:2406
+#: Merge.rc:2408
#, c-format
msgid "Left Attributes"
msgstr "Levi atributi"
-#: Merge.rc:2407
+#: Merge.rc:2409
#, c-format
msgid "Right Attributes"
msgstr "Desni atributi"
-#: Merge.rc:2408
+#: Merge.rc:2410
#, c-format
msgid "Middle Attributes"
msgstr ""
-#: Merge.rc:2409
+#: Merge.rc:2411
#, c-format
msgid "Left EOL"
msgstr "Znake za konec vrstice (EOL) na levi datoteki"
-#: Merge.rc:2410
+#: Merge.rc:2412
#, c-format
msgid "Middle EOL"
msgstr ""
-#: Merge.rc:2411
+#: Merge.rc:2413
#, c-format
msgid "Right EOL"
msgstr "Znake za konec vrstice (EOL) na desni datoteki"
-#: Merge.rc:2417
+#: Merge.rc:2419
#, c-format
msgid "Left Encoding"
msgstr "Kodiranje levo"
-#: Merge.rc:2418
+#: Merge.rc:2420
#, c-format
msgid "Right Encoding"
msgstr "Kodiranje desno"
-#: Merge.rc:2419
+#: Merge.rc:2421
#, c-format
msgid "Middle Encoding"
msgstr ""
-#: Merge.rc:2420
+#: Merge.rc:2422
#, c-format
msgid "Ignored Diff."
msgstr "Zanemarjene razlike."
-#: Merge.rc:2428
+#: Merge.rc:2430
#, c-format
msgid "Unable to compare files"
msgstr "Nisem mogel primerjati datotek"
-#: Merge.rc:2429
+#: Merge.rc:2431
#, c-format
msgid "Item aborted"
msgstr "Pregled predmeta prekinjen"
-#: Merge.rc:2430
+#: Merge.rc:2432
#, c-format
msgid "File skipped"
msgstr "Preskoèena datoteka"
-#: Merge.rc:2431
+#: Merge.rc:2433
#, c-format
msgid "Folder skipped"
msgstr "Preskoèena mapa"
-#: Merge.rc:2432
+#: Merge.rc:2434
#, c-format
msgid "Left only: %1"
msgstr "Samo leva: %1"
-#: Merge.rc:2433
+#: Merge.rc:2435
#, c-format
msgid "Middle only: %1"
msgstr ""
-#: Merge.rc:2434
+#: Merge.rc:2436
#, c-format
msgid "Right only: %1"
msgstr "Samo desna: %1"
-#: Merge.rc:2435
+#: Merge.rc:2437
#, c-format
msgid "Does not exist in %1"
msgstr ""
-#: Merge.rc:2436
+#: Merge.rc:2438
#, c-format
msgid "Binary files are identical"
msgstr "Binarni datoteki sta enaki"
-#: Merge.rc:2438
+#: Merge.rc:2440
#, c-format
msgid "Binary files are different"
msgstr "Binarni datoteki sta razlièni"
-#: Merge.rc:2439
+#: Merge.rc:2441
#, c-format
msgid "Files are different"
msgstr "Datoteki sta razlièni"
-#: Merge.rc:2440
+#: Merge.rc:2442
#, c-format
msgid "Folders are different"
msgstr "Mapi sta razlièni"
-#: Merge.rc:2441
+#: Merge.rc:2443
#, c-format
msgid "Left Only"
msgstr "Samo leva"
-#: Merge.rc:2442
+#: Merge.rc:2444
#, c-format
msgid "Right Only"
msgstr "Samo desna"
-#: Merge.rc:2443
+#: Merge.rc:2445
#, c-format
msgid "Middle Only"
msgstr ""
-#: Merge.rc:2444
+#: Merge.rc:2446
#, c-format
msgid "No item in left"
msgstr ""
-#: Merge.rc:2445
+#: Merge.rc:2447
#, c-format
msgid "No item in right"
msgstr ""
-#: Merge.rc:2446
+#: Merge.rc:2448
#, c-format
msgid "No item in middle"
msgstr ""
-#: Merge.rc:2448
+#: Merge.rc:2450
#, c-format
msgid "Error"
msgstr "Napaka"
-#: Merge.rc:2449
+#: Merge.rc:2451
#, c-format
msgid "Text files are identical"
msgstr "Tekstovni datoteki sta enaki"
-#: Merge.rc:2454
+#: Merge.rc:2456
#, c-format
msgid "Text files are different"
msgstr "Tekstovni datoteki sta razlièni"
-#: Merge.rc:2460
+#: Merge.rc:2462
#, c-format
msgid "Elapsed time: %ld ms"
msgstr "Minilo je: %ld ms"
-#: Merge.rc:2461
+#: Merge.rc:2463
#, c-format
msgid "1 item selected"
msgstr "1 predmet oznaèen"
-#: Merge.rc:2462
+#: Merge.rc:2464
#, c-format
msgid "%1 items selected"
msgstr "%1 predmetov oznaèenih"
-#: Merge.rc:2468
+#: Merge.rc:2470
#, c-format
msgid "Filename or folder name."
msgstr "Ime datoteke ali mape"
-#: Merge.rc:2469
+#: Merge.rc:2471
#, c-format
msgid "Subfolder name when subfolders are included."
msgstr "Imena podmap ko so vkljuèene podmape."
-#: Merge.rc:2470
+#: Merge.rc:2472
#, c-format
msgid "Comparison result, long form."
msgstr "Rezultat primerjave, dolga oblika."
-#: Merge.rc:2471
+#: Merge.rc:2473
#, c-format
msgid "Left side modification date."
msgstr "Datum spremembe datoteke na levi strani."
-#: Merge.rc:2472
+#: Merge.rc:2474
#, c-format
msgid "Right side modification date."
msgstr "Datum spremembe datoteke na desni strani."
-#: Merge.rc:2473
+#: Merge.rc:2475
#, c-format
msgid "Middle side modification date."
msgstr ""
-#: Merge.rc:2474
+#: Merge.rc:2476
#, c-format
msgid "File's extension."
msgstr "Datoteèna konènica."
-#: Merge.rc:2475
+#: Merge.rc:2477
#, c-format
msgid "Left file size in bytes."
msgstr "Velikost leve datoteke v bajtih."
-#: Merge.rc:2476
+#: Merge.rc:2478
#, c-format
msgid "Right file size in bytes."
msgstr "Velikost desne datoteke v bajtih."
-#: Merge.rc:2477
+#: Merge.rc:2479
#, c-format
msgid "Middle file size in bytes."
msgstr ""
-#: Merge.rc:2478
+#: Merge.rc:2480
#, c-format
msgid "Left file size abbreviated."
msgstr "Skraj\9aana velikost leve datoteke."
-#: Merge.rc:2479
+#: Merge.rc:2481
#, c-format
msgid "Right file size abbreviated."
msgstr "Skraj\9aana velikost desne datoteke."
-#: Merge.rc:2480
+#: Merge.rc:2482
#, c-format
msgid "Middle file size abbreviated."
msgstr ""
-#: Merge.rc:2486
+#: Merge.rc:2488
#, c-format
msgid "Left side creation time."
msgstr "Datum nastanka na levi strani."
-#: Merge.rc:2487
+#: Merge.rc:2489
#, c-format
msgid "Right side creation time."
msgstr "Datum nastanka na desni strani."
-#: Merge.rc:2488
+#: Merge.rc:2490
#, c-format
msgid "Middle side creation time."
msgstr ""
-#: Merge.rc:2489
+#: Merge.rc:2491
#, c-format
msgid "Tells which side has newer modification date."
msgstr "Pove katera stran ni \9ae nikoli modificirala datuma"
-#: Merge.rc:2490
+#: Merge.rc:2492
#, c-format
msgid "Left side file version, only for some filetypes."
msgstr "Verzija leve datoteke, samo za nekatere datoteène tipe."
-#: Merge.rc:2491
+#: Merge.rc:2493
#, c-format
msgid "Right side file version, only for some filetypes."
msgstr "Verzija desne datoteke, samo za nekatere datoteène tipe."
-#: Merge.rc:2492
+#: Merge.rc:2494
#, c-format
msgid "Middle side file version, only for some filetypes."
msgstr ""
-#: Merge.rc:2493
+#: Merge.rc:2495
#, c-format
msgid "Short comparison result."
msgstr "Rezultat kratke primerjave."
-#: Merge.rc:2494
+#: Merge.rc:2496
#, c-format
msgid "Left side attributes."
msgstr "Atributi leve strani."
-#: Merge.rc:2495
+#: Merge.rc:2497
#, c-format
msgid "Right side attributes."
msgstr "Atributi desne strani."
-#: Merge.rc:2496
+#: Merge.rc:2498
#, c-format
msgid "Middle side attributes."
msgstr ""
-#: Merge.rc:2497
+#: Merge.rc:2499
#, c-format
msgid "Left side file EOL type"
msgstr "Tip znakov za konec vrstice (EOL) na levi datoteki"
-#: Merge.rc:2498
+#: Merge.rc:2500
#, c-format
msgid "Right side file EOL type"
msgstr "Tip znakov za konec vrstice (EOL) na desni datoteki"
-#: Merge.rc:2499
+#: Merge.rc:2501
#, c-format
msgid "Middle side file EOL type"
msgstr ""
-#: Merge.rc:2505
+#: Merge.rc:2507
#, c-format
msgid "Left side encoding."
msgstr "Kodna stran leve strani."
-#: Merge.rc:2506
+#: Merge.rc:2508
#, c-format
msgid "Right side encoding."
msgstr "Kodna stran desne strani."
-#: Merge.rc:2507
+#: Merge.rc:2509
#, c-format
msgid "Middle side encoding."
msgstr ""
-#: Merge.rc:2508
+#: Merge.rc:2510
#, 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 program WinMerge ignorira in ne morejo biti zdru\9eene."
-#: Merge.rc:2509
+#: Merge.rc:2511
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
msgstr "\8atevilo razlik v datoteki. Ta \9atevilka ne vsebuje ignoriranih razlik."
-#: Merge.rc:2510
+#: Merge.rc:2512
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
msgstr "Prika\9ee zvezdico (*) èe je datoteka binarna"
-#: Merge.rc:2516
+#: Merge.rc:2518
#, c-format
msgid "Compare %1 with %2"
msgstr "Primerjaj %1 z %2"
-#: Merge.rc:2517
+#: Merge.rc:2519
#, c-format
msgid "Comma-separated list"
msgstr "Seznam, loèen z vejicami"
-#: Merge.rc:2518
+#: Merge.rc:2520
#, c-format
msgid "Tab-separated list"
msgstr "Seznam, loèen s tabulatorji"
-#: Merge.rc:2519
+#: Merge.rc:2521
#, c-format
msgid "Simple HTML"
msgstr "Enostavni HTML"
-#: Merge.rc:2520
+#: Merge.rc:2522
#, c-format
msgid "Simple XML"
msgstr "Enostavni XML"
-#: Merge.rc:2522
+#: Merge.rc:2524
#, c-format
msgid "The report file already exists. Do you want to overwrite existing file?"
msgstr "Datoteka s poroèilom \9ee obstaja. Ali jo \9eelite prepisati?"
-#: Merge.rc:2523
+#: Merge.rc:2525
#, c-format
msgid ""
"Error creating the report:\n"
"Napaka med ustvarjanjem poroèila:\n"
"%1"
-#: Merge.rc:2524
+#: Merge.rc:2526
#, c-format
msgid "The report has been created successfully."
msgstr "Poroèilo je bilo uspe\9ano izdelano."
-#: Merge.rc:2530
+#: Merge.rc:2532
#, c-format
msgid "The same file is opened in both panels."
msgstr "Ista datoteka je odprta v obeh okvirih"
-#: Merge.rc:2531
+#: Merge.rc:2533
#, c-format
msgid "The selected files are identical."
msgstr "Izbrani datoteki sta enaki."
-#: Merge.rc:2532
+#: Merge.rc:2534
#, c-format
msgid "An error occurred while comparing the files."
msgstr "Pri\9alo je do napake med primerjanjem datotek"
-#: Merge.rc:2533
+#: Merge.rc:2535
#, c-format
msgid "Temporary files could not be created. Check your temporary path settings."
msgstr "Zaèasne datoteko ne morejo biti ustvarjene. Preverite nastavitve za va\9ao pot zanje (PATH)."
-#: Merge.rc:2534
+#: Merge.rc:2536
#, c-format
msgid ""
"These files use different carriage return types.\n"
"\n"
"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:2535
+#: Merge.rc:2537
#, c-format
msgid "The selected folder is invalid."
msgstr "Izbrana mapa ni veljavna."
-#: Merge.rc:2536
+#: Merge.rc:2538
#, c-format
msgid "Cannot open a binary file to editor."
msgstr "V urejevalniku ne morem odpreti binarne datoteke."
-#: Merge.rc:2537
+#: Merge.rc:2539
#, c-format
msgid ""
"The folder exists only in other side and cannot be opened.\n"
"%1\n"
"na drugi strani in jo odpreti?"
-#: Merge.rc:2543
+#: Merge.rc:2545
#, c-format
msgid ""
"Different codepages found in left (cp%d) and right (cp%d) files. \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:2544
+#: Merge.rc:2546
#, c-format
msgid "Information lost due to encoding errors: both files"
msgstr "Informacija izgubljena pri kodiranju: Obe datatoteki"
-#: Merge.rc:2545
+#: Merge.rc:2547
#, c-format
msgid "Information lost due to encoding errors: first file"
msgstr ""
-#: Merge.rc:2546
+#: Merge.rc:2548
#, c-format
msgid "Information lost due to encoding errors: second file"
msgstr ""
-#: Merge.rc:2547
+#: Merge.rc:2549
#, c-format
msgid "Information lost due to encoding errors: third file"
msgstr ""
-#: Merge.rc:2553
+#: Merge.rc:2555
#, c-format
msgid "No difference"
msgstr "Ni razlik"
-#: Merge.rc:2554
+#: Merge.rc:2556
#, c-format
msgid "Line difference"
msgstr "Razlika v vrstici"
-#: Merge.rc:2560
+#: Merge.rc:2562
#, c-format
msgid "Replaced %1 string(s)."
msgstr "Zamenjan %1 niz(i)."
-#: Merge.rc:2561
+#: Merge.rc:2563
#, c-format
msgid "Cannot find string \"%s\""
msgstr "Ne morem najti niza \"%s\""
-#: Merge.rc:2567
+#: Merge.rc:2569
#, c-format
msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
msgstr ""
-#: Merge.rc:2574
+#: Merge.rc:2576
#, c-format
msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"
msgstr ""
-#: Merge.rc:2575
+#: Merge.rc:2577
#, c-format
msgid "The change of codepage has been merged"
msgstr ""
-#: Merge.rc:2576
+#: Merge.rc:2578
#, c-format
msgid "The changes of codepage are conflicting"
msgstr ""
-#: Merge.rc:2577
+#: Merge.rc:2579
#, c-format
msgid "The change of EOL has been merged"
msgstr ""
-#: Merge.rc:2578
+#: Merge.rc:2580
#, c-format
msgid "The changes of EOL are conflicting"
msgstr ""
-#: Merge.rc:2584
+#: Merge.rc:2586
#, c-format
msgid "Location Pane"
msgstr "Polo\9eajni okvir"
-#: Merge.rc:2585
+#: Merge.rc:2587
#, c-format
msgid "Diff Pane"
msgstr "Okvir razlik"
-#: Merge.rc:2591
+#: Merge.rc:2593
#, c-format
msgid "Patch file successfully written."
msgstr "Datoteka s popravki je bila uspe\9ano zapisana"
-#: Merge.rc:2592
+#: Merge.rc:2594
#, c-format
msgid "1. item is not found or is directory!"
msgstr "1. predmet ni najden ali pa je mapa"
-#: Merge.rc:2593
+#: Merge.rc:2595
#, c-format
msgid "2. item is not found or is directory!"
msgstr "2. predmet ni najden ali pa je mapa"
-#: Merge.rc:2594
+#: Merge.rc:2596
#, c-format
msgid "The patch file already exists. Do you want to overwrite it?"
msgstr "Datoteka s popravki \9ee obstaja. Jo \9eelite prepisati?"
-#: Merge.rc:2595
+#: Merge.rc:2597
#, c-format
msgid "[%1 files selected]"
msgstr "[%1 izbranih datotek]"
-#: Merge.rc:2596
+#: Merge.rc:2598
#, c-format
msgid "Normal"
msgstr "Normalno"
-#: Merge.rc:2597
+#: Merge.rc:2599
#, c-format
msgid "Context"
msgstr "Pomen"
-#: Merge.rc:2598
+#: Merge.rc:2600
#, c-format
msgid "Unified"
msgstr "Poenoteno"
-#: Merge.rc:2600
+#: Merge.rc:2602
#, c-format
msgid "Could not write to file %1."
msgstr "Ne morem pisati v datoteko %1."
-#: Merge.rc:2601
+#: Merge.rc:2603
#, c-format
msgid "The specified output path is not an absolute path: %1"
msgstr "Navedena izhodna pot ni absolutna pot: %1"
-#: Merge.rc:2602
+#: Merge.rc:2604
#, c-format
msgid "Specify an output file"
msgstr "Doloèite izhodno datoteko"
-#: Merge.rc:2603
+#: Merge.rc:2605
#, c-format
msgid "Cannot create a patch file from binary files."
msgstr "Iz binarnih datotek ne morem izdelati datoteke s popravki."
-#: Merge.rc:2604
+#: Merge.rc:2606
#, c-format
msgid "Cannot create a patch file from directories."
msgstr "Iz map ne morem izdelati datoteke s popravki."
-#: Merge.rc:2605
+#: Merge.rc:2607
#, c-format
msgid ""
"Please save all files first.\n"
" \n"
"Izdelava datoteke s popravki zahteva, da so vse datoteke predhodno shranjene."
-#: Merge.rc:2606
+#: Merge.rc:2608
#, c-format
msgid "Folder does not exist."
msgstr "Mapa ne obstaja"
-#: Merge.rc:2611
+#: Merge.rc:2613
#, c-format
msgid ""
"Archive support is not enabled.\n"
"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:2612
+#: Merge.rc:2614
#, c-format
msgid "Select file for export"
msgstr "Izberite datoteko za izvoz"
-#: Merge.rc:2613
+#: Merge.rc:2615
#, c-format
msgid "Select file for import"
msgstr "Izberite datoteko za uvoz"
-#: Merge.rc:2614
+#: Merge.rc:2616
#, c-format
msgid "Options imported from the file."
msgstr "Mo\9enosti uvo\9eene iz datoteke"
-#: Merge.rc:2615
+#: Merge.rc:2617
#, c-format
msgid "Options exported to the file."
msgstr "Mo\9enosti izvo\9eene v datoteko"
-#: Merge.rc:2616
+#: Merge.rc:2618
#, c-format
msgid "Failed to import options from the file."
msgstr "Uva\9eanje mo\9enosti iz datoteke ni uspelo"
-#: Merge.rc:2617
+#: Merge.rc:2619
#, c-format
msgid "Failed to write options to the file."
msgstr "Izva\9eanje mo\9enosti v datoteko ni uspelo"
-#: Merge.rc:2618
+#: Merge.rc:2620
#, c-format
msgid ""
"You are about to close several compare windows.\n"
"\n"
"Ali \9eelite nadaljevati?"
-#: Merge.rc:2627
+#: Merge.rc:2629
#, c-format
msgid "Mixed"
msgstr "Me\9aano"
-#: Merge.rc:2638
+#: Merge.rc:2640
#, c-format
msgid "Type"
msgstr "Tip"
-#: Merge.rc:2640
+#: Merge.rc:2642
#, c-format
msgid "Unpacker"
msgstr "Pretvornik"
-#: Merge.rc:2641
+#: Merge.rc:2643
#, c-format
msgid "Prediffer"
msgstr "Predpregled razlik"
-#: Merge.rc:2642
+#: Merge.rc:2644
#, c-format
msgid "Editor script"
msgstr "Script urejevalnika"
-#: Merge.rc:2648
+#: Merge.rc:2650
#, c-format
msgid "\nDifference in the Current Line"
msgstr ""
-#: Merge.rc:2649
+#: Merge.rc:2651
#, c-format
msgid "\nOptions"
msgstr ""
-#: Merge.rc:2650
+#: Merge.rc:2652
#, c-format
msgid "\nRefresh (F5)"
msgstr ""
-#: Merge.rc:2656
+#: Merge.rc:2658
#, c-format
msgid "\nPrevious Difference (Alt+Up)"
msgstr ""
-#: Merge.rc:2657
+#: Merge.rc:2659
#, c-format
msgid "\nNext Difference (Alt+Down)"
msgstr ""
-#: Merge.rc:2658
+#: Merge.rc:2660
#, c-format
msgid "\nPrevious Conflict (Alt+Shift+Up)"
msgstr ""
-#: Merge.rc:2659
+#: Merge.rc:2661
#, c-format
msgid "\nNext Conflict (Alt+Shift+Down)"
msgstr ""
-#: Merge.rc:2660
+#: Merge.rc:2662
#, c-format
msgid "\nFirst Difference (Alt+Home)"
msgstr ""
-#: Merge.rc:2661
+#: Merge.rc:2663
#, c-format
msgid "\nCurrent Difference (Alt+Enter)"
msgstr ""
-#: Merge.rc:2662
+#: Merge.rc:2664
#, c-format
msgid "\nLast Difference (Alt+End)"
msgstr ""
-#: Merge.rc:2663
+#: Merge.rc:2665
#, c-format
msgid "\nCopy Right (Alt+Right)"
msgstr ""
-#: Merge.rc:2664
+#: Merge.rc:2666
#, c-format
msgid "\nCopy Left (Alt+Left)"
msgstr ""
-#: Merge.rc:2665
+#: Merge.rc:2667
#, c-format
msgid "\nCopy Right and Advance (Ctrl+Alt+Right)"
msgstr ""
-#: Merge.rc:2666
+#: Merge.rc:2668
#, c-format
msgid "\nCopy Left and Advance (Ctrl+Alt+Left)"
msgstr ""
-#: Merge.rc:2667
+#: Merge.rc:2669
#, c-format
msgid "\nAll Right"
msgstr ""
-#: Merge.rc:2668
+#: Merge.rc:2670
#, c-format
msgid "\nAll Left"
msgstr ""
-#: Merge.rc:2669
+#: Merge.rc:2671
#, c-format
msgid "\nAuto Merge (Ctrl+Alt+M)"
msgstr ""
-#: Merge.rc:2675
+#: Merge.rc:2677
#, c-format
msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
msgstr "Izbran pretvornik je uporabljen na obeh datotekah (samo ena datoteka potrebuje konènico)"
-#: Merge.rc:2676
+#: Merge.rc:2678
#, c-format
msgid "No prediffer (normal)"
msgstr "Brez predpregleda razlik (obièajno)"
-#: Merge.rc:2677
+#: Merge.rc:2679
#, c-format
msgid "Suggested plugins"
msgstr "Priporoèene raz\9airitve"
-#: Merge.rc:2678
+#: Merge.rc:2680
#, c-format
msgid "Other plugins"
msgstr "Ostale raz\9airitve"
-#: Merge.rc:2684
+#: Merge.rc:2686
#, c-format
msgid "Private Build: %1"
msgstr "Zasebna gradnja:%1"
-#: Merge.rc:2685
+#: Merge.rc:2687
#, c-format
msgid "Your software is up to date"
msgstr ""
-#: Merge.rc:2686
+#: Merge.rc:2688
#, c-format
msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?"
msgstr ""
-#: Merge.rc:2687
+#: Merge.rc:2689
#, c-format
msgid "Failed to download latest version information"
msgstr ""
-#: Merge.rc:2693
+#: Merge.rc:2695
#, c-format
msgid "Plugin Settings"
msgstr "Nastavitve raz\9airitev"
-#: Merge.rc:2695
+#: Merge.rc:2697
#, c-format
msgid "WSH not found - .sct scripts disabled"
msgstr "WSH ni najden - .sct skripte onemogoèene"
-#: Merge.rc:2696
+#: Merge.rc:2698
#, c-format
msgid "<None>"
msgstr "<Niè>"
-#: Merge.rc:2697
+#: Merge.rc:2699
#, c-format
msgid "<Automatic>"
msgstr "<Samodejno>"
-#: Merge.rc:2703
+#: Merge.rc:2705
#, c-format
msgid "G&oto Line %1"
msgstr "Pojdi &na vrstico %1"
-#: Merge.rc:2709
+#: Merge.rc:2711
#, c-format
msgid "Disabled"
msgstr "Onemogoèeno"
-#: Merge.rc:2710
+#: Merge.rc:2712
#, c-format
msgid "From file system"
msgstr "Iz datoteènega sistema"
-#: Merge.rc:2711
+#: Merge.rc:2713
#, c-format
msgid "From MRU list"
msgstr "IZ MRU seznama"
-#: Merge.rc:2717
+#: Merge.rc:2719
#, c-format
msgid "No Highlighting"
msgstr "Brez osvetljevanja"
-#: Merge.rc:2720
+#: Merge.rc:2722
#, c-format
msgid "Batch"
msgstr "Paket (Batch)"
-#: Merge.rc:2736
+#: Merge.rc:2738
#, c-format
msgid "Portable Object"
msgstr "Prenosni objekt"
-#: Merge.rc:2740
+#: Merge.rc:2742
#, c-format
msgid "Resources"
msgstr "Sredstva"
-#: Merge.rc:2743
+#: Merge.rc:2745
#, c-format
msgid "Shell"
msgstr "Shell"
-#: Merge.rc:2754
+#: Merge.rc:2756
#, c-format
msgid "Close &Left Tabs"
msgstr ""
-#: Merge.rc:2755
+#: Merge.rc:2757
#, c-format
msgid "Close R&ight Tabs"
msgstr ""
-#: Merge.rc:2756
+#: Merge.rc:2758
#, c-format
msgid "Close &Other Tabs"
msgstr ""
-#: Merge.rc:2757
+#: Merge.rc:2759
#, c-format
msgid "Enable &Auto Max Width"
msgstr ""
-#: Merge.rc:2762
+#: Merge.rc:2764
#, c-format
msgid "&Image"
msgstr ""
-#: Merge.rc:2767
+#: Merge.rc:2769
#, c-format
msgid "frhed(http://frhed.sourceforge.net/) not installed"
msgstr ""