From 78ac13641f6aaa6d55da2cdfd29df3b244555eca Mon Sep 17 00:00:00 2001 From: sdottaka Date: Mon, 7 Sep 2015 00:15:03 +0900 Subject: [PATCH] Update translations --- Translations/WinMerge/Basque.po | 2248 +++++++++++++------------- Translations/WinMerge/Brazilian.po | 2248 +++++++++++++------------- Translations/WinMerge/Bulgarian.po | 2248 +++++++++++++------------- Translations/WinMerge/Catalan.po | 2248 +++++++++++++------------- Translations/WinMerge/ChineseSimplified.po | 2248 +++++++++++++------------- Translations/WinMerge/ChineseTraditional.po | 2248 +++++++++++++------------- Translations/WinMerge/Croatian.po | 2246 +++++++++++++------------- Translations/WinMerge/Czech.po | 2244 +++++++++++++------------- Translations/WinMerge/Danish.po | 2248 +++++++++++++------------- Translations/WinMerge/Dutch.po | 2248 +++++++++++++------------- Translations/WinMerge/English.pot | 2208 +++++++++++++------------- Translations/WinMerge/French.po | 2248 +++++++++++++------------- Translations/WinMerge/Galician.po | 2248 +++++++++++++------------- Translations/WinMerge/German.po | 2248 +++++++++++++------------- Translations/WinMerge/Greek.po | 2248 +++++++++++++------------- Translations/WinMerge/Hungarian.po | 2248 +++++++++++++------------- Translations/WinMerge/Italian.po | 2248 +++++++++++++------------- Translations/WinMerge/Japanese.po | 2254 ++++++++++++++------------- Translations/WinMerge/Korean.po | 2248 +++++++++++++------------- Translations/WinMerge/Norwegian.po | 2248 +++++++++++++------------- Translations/WinMerge/Persian.po | 2248 +++++++++++++------------- Translations/WinMerge/Polish.po | 2248 +++++++++++++------------- Translations/WinMerge/Portuguese.po | 2244 +++++++++++++------------- Translations/WinMerge/Romanian.po | 2248 +++++++++++++------------- Translations/WinMerge/Russian.po | 2248 +++++++++++++------------- Translations/WinMerge/Serbian.po | 2248 +++++++++++++------------- Translations/WinMerge/Slovak.po | 2248 +++++++++++++------------- Translations/WinMerge/Slovenian.po | 2248 +++++++++++++------------- Translations/WinMerge/Spanish.po | 2248 +++++++++++++------------- Translations/WinMerge/Swedish.po | 2248 +++++++++++++------------- Translations/WinMerge/Turkish.po | 2248 +++++++++++++------------- Translations/WinMerge/Ukrainian.po | 2248 +++++++++++++------------- 32 files changed, 37258 insertions(+), 34634 deletions(-) diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po index 1d8adbe61..410e43ef6 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -81,7 +81,7 @@ msgid "Cu&t" msgstr "Eba&ki" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Kopiatu" @@ -92,7 +92,7 @@ msgid "&Paste" msgstr "&Itsatsi" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&Joan hona..." @@ -103,22 +103,25 @@ msgid "Op&en" msgstr "Ire&ki" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "&Erregistratutako Aplikazioarekin" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "&Kanpoko Editorearekin" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&Honekin..." @@ -156,7 +159,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Zooma" @@ -168,8 +171,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Ezer ez" @@ -186,49 +189,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Agiria" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Berria\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Ireki...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Ire&ki Gatazka Agiria..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Ireki Egit&asmoa...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Gor&de Egitasmoa..." @@ -240,274 +243,274 @@ msgstr "Azken Egitasmoak" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Hutsik >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "Ir&ten" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Editatu" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Aukerak..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Ikusi" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "Tre&snabarra" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Txikia" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Handia" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "&Egoera Barra" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "&Fitxa Barra" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Tresnak" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Iragazkiak..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "Sortu &Eranskina..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Pluginak" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "&Eskuzko Aurrezberd" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "&Berezgaitasunezko Aurrezberd" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "E&skuzko Despaketatzea" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "Be&rezgaitasunezko Despaketatzea" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "B&irgertatu pluginak" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "Lei&hoa" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "It&xi" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "I&txi Denak" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Aldatu &Panela\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Eradonki &Etzana" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Eradonki &Zutia" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Urjauzia" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Laguntza" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "WinMerge &Laguntza\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "It&xurapena" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU Baimen Publiko Orokorra " #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&WinMergeri buruz..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Ezkerra Irakurri-bakarrik" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Eskuina Irakurri-bakarrik" @@ -518,7 +521,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Hautatu &Denak\t Ctrl+A" @@ -540,1751 +543,1811 @@ msgstr "Erakutsi E&zkerreko Unique gaiak" #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Erakutsi E&skuineko Unique gaiak" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Erakutsi &Jauzitako Gaiak" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "&Erakutsi Agiri Binarioak" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Erakutsi E&zkutatutako Gaiak" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "Zuhaitz &Modua" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "H&edatu Azpiagiritegi Guztiak" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "&Azpiagiritegi Denak Erauzi" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Hautatu &Hizkia..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Erabili Berezko H&izkia" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Alderatu Esta&tistikak" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "Ber&ritu\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Berritu Hautatutakoa\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Batu" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "&Alderatu\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Hurrengo Ezberdintasuna\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "A&urreko Ezberdintasuna\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Lehen Ezberdintasuna\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "U&neko Ezberdintasuna\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Azken Ezberdintasuna\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopiatu E&skuinera\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopiatu E&zkerrera\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Ezabatu\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Antolatu Zutabeak..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Sortu &Jakinarazpena..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Gorde\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Gorde E&zkerra" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Gorde E&skuina" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "I&rarkitu..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Orrialde Ezarpe&na" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Irarkitu Aurreikus&pena" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "Bihurtu &Lerro Amaierak hona" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "Batu &Modua\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "&Agiria Kodeatzen..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "&Binarioa" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Desegin\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Birre&gin\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Ebaki\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopiatu\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Itsatsi\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Hautatu Lerro &Ezberdintasunak\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Bilatu...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Ordeztu...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Aurrera&tua" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopiatu Lerro Zenbakiekin\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "Laster&markak" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Aldatu Lastermarka\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Hurrengo Lastermarka\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "A&urreko Lastermarka\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Garbitu Lastermarka Guztiak" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Joan Hona...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Zooma &Handitu\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Zooma &Gutxitu\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normala\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Joskera Nabar&mentzea" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "Bl&okeatu Panelak" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "Ikusi Zurigu&nea" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "I&kusi Lerro Ezberdintasunak" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Ikusi &Lerro Zenbakiak" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Ikusi &Bazterrak" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "I&nguratu Lerroak" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "&Trukatu Panelak" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Ezberd &Panela" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Kokalek&u Panela" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "K&opiatu Eskuinera eta Aurrera egin\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopiatu Ez&kerrera eta Aurrera egin\tAlt+Ctrl+Right" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Kopiatu &Dena Eskuinera" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Kopia&tu Dena Ezkerrera" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "Au&rrezberdintasuna" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "E&skriptak" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Alder&atu" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "Alderatu &Honela" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&Ezkerra Eskuinera" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "Ezkerra hona..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "E&skuina Ezkerrera" +msgid "Left to Right (%1 of %2)" +msgstr "Ezkerra Eskuinera (%1 %2-tik)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "Es&kuina hona..." +msgid "Left to... (%1 of %2)" +msgstr "Ezkerra hona... (%1 %2-tik)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Mugitu" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "Ezke&rra hona..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "Eskui&na hona..." +msgid "Right to Left (%1 of %2)" +msgstr "Eskuina Ezkerrera (%1 %2-tik)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Eskuina hona... (%1 %2-tik)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Mugitu" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Ezabatu" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "Ezker&ra" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&E&skuina" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Biak" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Birri&zendatu" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Ezkutatu Gaiak" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "&Ireki Ezkerrekoa" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Ire&ki Eskuina" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Kopiatu &Helburu-izenak" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "E&zkerra (%1 %2-tik)" +msgid "Left (%1 of %2)" +msgstr "Ezkerra (%1 %2-tik)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "E&skuina (%1 %2-tik)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Eskuina (%1 %2-tik)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Biak (%1 %2-tik)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Biak (%1 %2-tik)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Kopiatu &Agirizenak" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Zipa" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "E&zkerra... (%1 %2-tik)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "E&skuina... (%1 %2-tik)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Both... (%1 %2-tik)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Ezberdintasunak... (%1 %2-tik)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Berritu" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Ezkerreko Shell menua" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Eskuineko Shell menua" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "Kopiatu Helburu O&soa" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Kopiatu &Agirizena" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Aurrezberdintasun Ezarpenak" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Ez aurrezberd" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Berez aurrezberd" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Jo&an Ezberd" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "Mugitu &Gabeko Bloke Guztiak" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Mugitutako Bloke Guztiak" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "&Uneko Ezberd Mugitutako Blokeak " -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "Zurig&uneak" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Al&deratu" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "Ezikus&i aldaketak" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "E&zikusi denak" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "Hizki larri eta &xehe artean" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Ezikusi g&urdi itzulera ezberdintasunak (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "Alderaketa &metodoa:" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Eduki Denak" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Eduki Azkarrak" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Eguna Aldatuta" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Eguna eta Neurria Aldatuta" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Neurria" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "WinMergeri buruz" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Bilduma Pribatua)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Ikusi WinMerge Webgunea!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "Ongi" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "&Laguntzaileak" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Hautatu Agiriak edo Agiritegiak" -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "Bil&atu..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "Bi&latu..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Bilat&u" -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Ha&utatu..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Despaketatzailea:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "&Hautatu..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Az&piagiritegiak Barne" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Egoera:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Ezeztatu" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Laguntza" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Alderatzeko Agiriak edo Agiritegiak" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Datubasea:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Egitasmoa:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Erabiltzailea:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Sar-hitza:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "VSS Egitasmoaren Helbide lotura" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Ezarri gai guztiei" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Egiaztatu" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Gorde Honela..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Bertsio Sistema" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "Bertsio &Sistema:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Helburutu hona cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Orokorra" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Berezgaitasunez &irristatu lehen ezberdintasunera" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Itxi leihoak ES&C-rekin" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Berezgaitasunez egiaztatu helburuak Ireki-elkarrizketan" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Ahalbidetu e&kinbide bat bakarrik " -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Gal&detu leiho anitz isterakoan" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "&Heutsi agiri denborari agiri alderaketan" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Erakutsi \"Hau&tatu agiriak edo Agiritegiak\" Elkarrizk. Hasterakoan" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Ireki-elkarrizketa Berez-&Osaketa:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMergek mezu-kutxatila arrunt batzuk ezkutatzea ahalbidetzen du. Sakatu Birrezarri botoia mezu-kutxatila guztiak berriro ere ikusgarri egiteko." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Birrezarri" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Bilatu" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "Bi&latu zer:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Hitz osoa bat datorre&nean bakarrik" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Hizki larriak eta &xeheak" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "Adierazpen a&rrunta" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "E&z inguratu agiri amaiera" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "Bilatu &Hurrengoa" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&Ongi" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Ordeztu" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Ordez&tu honekin:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "&Ez inguratu agiri amaiera" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Ordeztu hemen" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "Hauta&pena" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "&Agiri osoa" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Ordeztu" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Ordeztu &Dena" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Egiaztatu" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Aipamenak" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Aurkeztu egiaztatu ondoren" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Lerro-iragazkiak" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Gaitu Lerro Iragazkiak" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Adierazpen Arruntak (bat lerroko)" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Berria" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Editatu" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Kendu" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Margoak" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Ezberdintasuna" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Hautatutako Ezberdintasuna:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Barrena" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Ezabatuta" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Idazkia" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Baztertutako Ezberdintasuna:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Mugituta:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Hautatutakoa Mugituta:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Hitz Ezberdintasuna:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Hautatutako Hitz Ezberd:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Berezkoak" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Bidali ezabatutako agiriak Birziklatze Ontzira" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&Kanpoko editatzailea:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Iragazki agiritegia:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Aldibaterako agirien agiritegia" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "&Sistemaren aldibaterako agiritegia" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "&Egile agiritegia:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Eranskin Sortzailea" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "&1 Agiria:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "&2 Agiria:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "A&ldaketa" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "E&rantsi dagoen agirira" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Emaitzak:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Bila&tu..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Formatoa" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "Estil&oa:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "Hitzi&ngurua:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ezi&kusi lerro zuriak" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Ko&mando lerroa barne" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Ireki kan&poko editatzailean" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Erakutsi Zutabeak" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Mugitu &Gora" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Mugitu &Behera" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Hautatu Despaketatzailea" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Agiri Despaketatzailea:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Erakutsi despaketatzaile denak, ez egiaztatu luzapena" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Luzapen zerrenda:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Azalpena:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Gelditu" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Gaiak alderatzen..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Alderatutako gaiak:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Gaiak guztira:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Joan Hona" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "Joan &Hona:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Agiria" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Joan &nora" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "&Lerroa" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Ezberdintasuna" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Joan Hona" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Alderatu" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "&Zurigunea" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "Al&deratu" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "&Ezikusi aldaketa" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "E&zikusi denak" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ezikusi &lerro zuriak" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Ezikusi &kasua" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Gaitu bloke &mugitu atzematea" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "&Berdindu antzeko lerroak" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "&Iragazki Aipamenak" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Editatzailea" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&Nabarmendu joskera" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "&Berezgaitasunezko birmihaketa" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&Heutsi jatorrizko EOL hizkiei" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Fitxak" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "Fit&xa neurria:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "Sartu &Fitxak" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "Sartu &Tarteak" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Lerro Ezberdintasuna Margotzen" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "&Ikusi lerro ezberdintasunak" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "Hiz&ki maila" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "Hit&z maila:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Agiri-iragazkiak" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Azterketa" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Ezarri..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Berria..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Editatu..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Ezabatu..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Gorde amaitutako agiriak?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Ezkerralde agiria" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "Gor&de aldaketak" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Baztertu aldaketak" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Eskuinalde agiria" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "&Gorde aldaketak" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "B&aztertu aldaketak" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Kode-orrialdea" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Berezko Kode-orrialdea" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Hautatu berezko kode-orrialdea ez-Unicode agiriak gertatzerakoan:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2293,692 +2356,692 @@ msgstr "" "&Atzeman kode-orrialde argibideak agiri hauentzat:\n" " .html, .rc, .xml. Saioa birrabiaraztea beharrezkoa da." -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "&Sistema kode-orrialdea" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "&WinMerge Erabiltzaile Interfazearen arabera" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "&Egile kode-orrialdea:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Aukerak" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Kategoriak" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Inportatu" -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Esportatu..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Elkarrizketa" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Lasterteklak:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Eginkizun izenak:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Aipamenak:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Zenbakiak:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Eragileak:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Kateak:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Aurreprozesapena:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "1 Erabiltzailea:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "2 Erabiltzailea:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Lodia" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Agiritegi Alderaketa Jakinarazpena" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Jakinarazi &Agiria:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Bilatu..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Estiloa" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopiatu Gakoan" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Iragazki Partekatua edo Pribatua" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Zein iragazki mota nahi duzu sortzea?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Partekatutako Iragazkia (erabiltzaile guztientzat ordenagailu honetan)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Iragazki Pribatua (uneko erabiltzailearentzat bakarrik)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Agiri Sostengua" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Gaitu agirien agiri sostengua" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Atzeman agiri mota agiriaren sinaduratik" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Alderatu Estatistikak" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Agiritegiak:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Agiriak:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Ezberdin" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Idazkia:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binarioa:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Unique" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Ezker:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Eskuin:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Berdin" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Guztira:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Itxi" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Eraginak" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Eraginak)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Hautatu Kode-orrialdea" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&Agiria Gertatzen:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Agira &Gordetzen:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "Erabili &kode-orrialde bera bientzat" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Ezarri" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "E&zeztatu" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Azterketa Iragazkia" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Iragazkia aztertzen..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Sartu idazkia aztertzeko:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Agiritegi Izena" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Emaitza:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Azterketa" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Itxi" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&Erabili norbere idazki margoak" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Norbere idazki margoak" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Zurigunea:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Idazki arrunta:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Hautapena:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Helburuak" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "E&zkerra:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "I&rakurri-bakarrik" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "E&skuina:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Irakurri-&bakarrik" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Iragazkia:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Ireki..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Gorde..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Babeskopia Agiriak" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Sortu babeskopia agiriak hemen:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "&Agiritegi alderaketa" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "A&giri alderaketa" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Sortu babeskopia agiriak honen barnean:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "Agiriaren &jatorrizko agiritegia" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&Babeskopia agiritegi globala:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Babeskopia agirizena:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&Erantsi .bak -luzapena" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "Erantsi &denbora" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Berretsi Kopiatzea" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Zihur zaude XXX gaiak kopiatzea nahi dituzula?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Ezkerretik" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Eskuinera" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Bai" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Ez" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Pluginak" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "Gaitu &pluginak" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Shell Baterapena" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Bilaketa" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Gaitu &menu aurreratua" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "Gehitu &hitzinguru menura" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Agiritegia" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "&Gelditu lehen ezberdintasunaren ondoren" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ezikusi 3 segundu baino gut&xiagoko ezberdintasunak" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "&Alderaketa azkar muga (MB):" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binarioa" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "040904e4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x409, 1252" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "NUM" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Akats ezezagun bat egitasmo agiria irekitzen saiatzean" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Akats ezezagun bat egitasmo agiria gordetzen saiatzean" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Egitasmo Agiria" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Egitasmo agiria ongi gertatu da." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Egitasmo agiria ongi gorde da." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2997,7 +3060,7 @@ msgstr "" "WinMerge.AgiriAlderaketa\n" "WinMerge Agiri Alderaketa" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3016,7 +3079,7 @@ msgstr "" "WinMerge.AgiritegiAlderketa\n" "WinMerge Agirtegi Alderaketa" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3025,143 +3088,143 @@ msgstr "" "Garatzaileak:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 BERME BAKAR BAT GABE dator. Hau software askea da eta ongi etorria zara birbanatzeko baldintza jakin batzuenpean ; ikusi GNU Baimen Publiko Orokorra, Laguntza menuan xehetasunetarako." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Utzi" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Birsaiatu" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Baztertu" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "&Baztertu denak" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Bai" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Bai g&uztiari" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Ez" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Ez gu&ztiari" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Jarraitu" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Jauzi" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Jauzi &guztiak" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Ez erakutsi &mezu hau berriro." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Ez egin ga&ldera hau berriro." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "Joskera" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Bertsio Kontrola" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Ezberdintasunak" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Hona:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Ezkerretik:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Ezkerrera:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Eskuinetik:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Eskuinera:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Bertsioa %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Aukerak (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Mezu kutxatila guztiak erakusten dira berriro." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3172,84 +3235,84 @@ msgstr "" "\n" "Mesedez erabili balioak 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Ireki" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programak|*.exe;*.bat;*.cmd|Agiri Denak (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Agiri Denak (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Egitasmo Agiriak (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Aukera agiriak (*.ini)|*.ini|Agiri Denak (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Idazki Agiriak (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Agiri Denak (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML Agiriak (*.htm,*.html)|*.htm;*.html|Agiri Denak (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML Agiriak (*.xml)|*.xml|Agiri Denak (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Izena" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Kokalekua" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Iragazkiak" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Azalpena" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Hautatu agirizena iragazki berriarentzat" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Agiri Iragazkiak (*.flt)|*.flt|Agiri Denak (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3262,7 +3325,7 @@ msgstr "" "Mesedez kopiatu agiri hau: %1 WinMerge/Iragazkiak -agiritegia:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3275,7 +3338,7 @@ msgstr "" "\n" "Mesedez zihurtatu zaitez dagoen agiritegia idazgarria dela." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3286,7 +3349,7 @@ msgstr "" "\n" "Mesedez hautatu iragazki agiritegia hemen: Aukerak/Sistema." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3299,12 +3362,12 @@ msgstr "" "\n" "Badaiteke irakurtzeko-bakarrik agiria izatea?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Aurkitu ezartzeko iragazki agiria" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3315,17 +3378,17 @@ msgstr "" "\n" "Ezinezkoa iragazki agiri berria iragazki agiritegira kopiatzea." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Iragazki agiria jadanik badago. Gainidatzi dagoen iragazkia?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Adierazpen arrunta" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3336,173 +3399,173 @@ msgstr "" "\n" "Ez badituzu nahi alderaketa guztiak orain berritzea hautatu Ez eta berritu alderaketak gero." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&Helburutu SS.EXE-ra:" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Agiritegi Alderaketa Emaitzak" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Agiri Alderaketa" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Izenburugabeko ezkerra" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Izenburugabeko eskuina" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Theirs Agiria" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Mine Agiria" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Lerroa: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Batu" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Ezberdintasuna %1 %2-tik" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 Ezberdintasun Aurkiturik" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 Ezberdintasun Aurkituta" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Gaiak %1 %2-tik" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Gaiak:%1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Hautatu badauden bi agiritegi edo agiri alderatzeko" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Agirtegi Hautapena" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Hautatu bi agiritegiak edo bi agiriak alderatzeko." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Ezker helburua baliogabea da!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Eskuin helburua baliogabea da!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Bi helburuak baliogabeak dira!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Hautatu bi agiriak despaketatzaile hautapena gaitzeko" -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Ezin dira agiria eta agiritegia alderatu!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Agiria ez da aurkitu: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Agiria ez da despaketatu: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3515,12 +3578,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Hutsegitea gatazka agiria aztertzerakoan." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3531,27 +3594,27 @@ msgstr "" "agiria\n" "ez da agiri gatazkatsu bat." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Gorde Honela" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Gorde aldaketak %1-ri?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 markatuta dago irrakurtzeko-bakarrik bezala. Nahi duzu ezabatzea irakurtzeko-bakarrik agiria? (Ez gordetzeko agirizen berri bezala.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Akatsa babeskopia agirian" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3564,7 +3627,7 @@ msgstr "" "\n" "Jarraitu horrela ere?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3581,7 +3644,7 @@ msgstr "" "\t-agirizen ezberdin bat erabiltzea (Sakatu Ongi)\n" "\t-uneko eragiketa uztea (Sakatu Ezeztatu)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3596,7 +3659,7 @@ msgstr "" "\n" "Nahi duzu despaketatutako bertsioa beste agiri batean gordetzea?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3611,7 +3674,7 @@ msgstr "" "\n" "Nahi duzu despaketatutako bertsioa beste agiri batean gordetzea?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3626,7 +3689,7 @@ msgstr "" "\n" "Gainidatzi aldatutako agiria?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3635,7 +3698,7 @@ msgstr "" "%1\n" "irakurtzeko-bakarrik markatuta dago. Irakurtzeko-bakarrik gaia ezeztatzea nahi duzu?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3650,22 +3713,22 @@ msgstr "" "\n" "Nahi duzu agiria birgertatzea?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Gorde Ezker Agiria Honela" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Gorde Eskuineko Agiria Honela" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3676,7 +3739,7 @@ msgstr "" "%1\n" "ezagertuta dago. Mesedez gorde agiriaren kopia bat jarraitzeko." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3687,42 +3750,42 @@ msgstr "" "\n" "Berritu agiriak jarraitu aurretik." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "SourceSafe egitasmo helburu bat adierazi behar duzu jarraitzeko (ie: $/MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Egiaztatu agiriak VSS-tik..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Bertsio sistema akats bat itzuli du agiran egiaztatzen saiatzerakoan. Ezinezkoa jarraitzea..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Akatsa bertsio sistema komandoari ekitean." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS Lan Agirtegia eta uneko agiriaren kokalekua ez datoz bat. Jarraitu?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Ez da aurkitu VSS datubaserik!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Akatsa VSS-tik:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3733,7 +3796,7 @@ msgstr "" "Mesedez, egiaztatu erabilitako ikuspen itxurap. berez.\n" "Desegin eragiketa?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3742,127 +3805,146 @@ msgstr "" "Bertsio sistema akats bat itzuli du agiran egiaztatzen saiatzerakoan.\n" "Mesedez, egiaztatu erabilitako ikuspen itxurap. berez." -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Bat ere ez" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 azpikoa)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 edo gainekoa)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Hautsi zurigunean" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Hautsi zurigunean edo puntuaketan" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Eskuina Ezkerrera (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Ezkerra Eskuinera (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Eskuina Ezkerrera (%1 %2-tik)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Ezkerra Eskuinera (%1 %2-tik)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Ezkerra Eskuinera (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Ezkerra hona... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Eskuina hona... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Ezkerra hona... (%1 %2-tik)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Eskuina hona... (%1 %2-tik)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Ezkerra (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Eskuina (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Biak (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Ezkerra (%1 %2-tik)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Eskuina (%1 %2-tik)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Biak (%1 %2-tik)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Ezkerraldea - hautatu helmuga agiritegia:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Eskuinaldea - hautatu helmuga agiritegia:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Agiri Eraginda)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 Agiri %2-tik Eraginda)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3873,17 +3955,17 @@ msgstr "" "\n" "%1?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Zihur zaude hona kopiatzea nahi duzula:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Zihur zaude %d gaiak kopiatzea nahi dituzula:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3902,502 +3984,502 @@ msgstr "" "\n" "Mesedez berritu alderaketa." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Zihur zaude mugitzea nahi duzula:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Zihur zaude %d gaiak mugitzea nahi dituzula:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Berretsi Mugitzea" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Hutsegitea kanpoko editatzailea ekiterakoan: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Agiri heuskarri ezezaguna" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Agirizena" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Alderaketa emaitza" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Ezker Eguna" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Eskuin Eguna" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Luzapena" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Ezker Neurria" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Eskuin Neurria" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Eskuin Neurria (Laburra)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Ezker Neurria (Laburra)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Ezkerreko Sortze Denbora" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Eskuineko Sortze Denbora" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Agiri Berriena" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Ezkerreko Agiri Bertsioa" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Eskuineko Agiri Bertsioa" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Emaitz Laburra" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Ezkerraren Ezaugarriak" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Eskuinaren Ezaugarriak" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Ezker EOL" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Eskuin EOL" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Ezker Kodeaketa" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Eskuin Kodeaketa" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Ezikusitako Ezberd." -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Ezinezkoa agiriak alderatzea" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Gaia utzita" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Agiria Jauzita" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Agiritegia jauzita" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Ezkerra bakarrik: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Eskuina bakarrik: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Agiri binarioak berdinak dira" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Agiri binarioak ezberdinak dira" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Agiriak ezberdinak dira" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Agiritegiak ezberdinak dira" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Ezkerra Bakarrik" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Eskuina Bakarrik" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Akatsa" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Idazki agiriak berdinak dira" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Idazki agiriak ezberdinak dira" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Igarotako denbora: %ld sm" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 gai hautatuta" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 gai hautatuta" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Agirizena edo agiritegi izena" -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Azpiagiritegi izena azpiagiritegiak barne direnean." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Alderaketa emaitza, modu luzean." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Ezkerralde aldaketa eguna." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Eskuinalde aldaketa eguna." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Agiriaren luzapena." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Ezkerreko agiriaren neurria byte-tan" -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Eskuineko agiriaren neurria byte-tan" -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Ezkerreko agiri neurria laburtuta." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Eskuineko agiri neurria laburtuta." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Ezkerraldearen sortze denbora." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Eskuinaldearen sortze denbora." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Esaten du zein aldek duen aldaketa egun berriagoa." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Ezkerraldeko agiri bertsioa, agiri-mota batzuentzat bakarrik." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Eskuinaldeko agiri bertsioa, agiri-mota batzuentzat bakarrik." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Alderaketa laburraren emaitza." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Ezkerraldearen ezaugarriak." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Eskuinaldearen ezaugarriak." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Ezkerraldeko agiria EOL motakoa da" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Eskuinaldeko agiria EOL motakoa da" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Eskuinalde kodeaketa." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Ezkerralde kodeaketa." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Agirian ezikusitako ezberdintasun zenbatekoa. Ezberdintasun hauek WinMergek ezikusi ditu eta ezin dira batu." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Agirian dauden ezberdintasun zenbatekoa. Zenbateko honek ez ditu barnebiltzen ezikusitako ezberdintasunak." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Erakutsi asteriskoa (*) agiria binarioa bada." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Alderatu %1 %2-rekin" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Kakotxaz banandutako zerrenda" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Fitxaz banandutako zerrenda" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "HTML Arrunta" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "XML Arrunta" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Jakinarazpen agiria jadanik badago. Dagoen agiria gainidaztea nahi duzu?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4406,32 +4488,32 @@ msgstr "" "Akatsa jakinarazpena sortzean:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Jakinarazpena ongi sortu da." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Agiri berdina dago irekita bi paneletan." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Hautatutako agiriak berdinak dira." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Akats bat gertatu da agiriak alderatzerakoan." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Aldibaterako agiriak ezin izan dira sortu. Egiaztatu zure aldibaterako helburu ezarpenak." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4446,17 +4528,17 @@ msgstr "" "\n" "Oharra: Gurdi itzulera mota guztiak berdin bezala tratatzea nahi badituzu, ezarri 'Ezikusi gurdi itzulera ezberdintasunak...' aukera Alderaketa fitxan aukeren elkarrizketan (eskuragarri hemen: Editatu/Aukerak)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Hautatutako agiritegia ez da baliogarria" -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ezinenezkoa agiri binarioa editatzailera irekitzea" -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4471,7 +4553,7 @@ msgstr "" "%1\n" "beste aldean eta agiritegi hauek irekitzea?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4482,152 +4564,152 @@ msgstr "" "Erakutsiz agiri bakoitza kode-orrialde horretan erakuspen hobeago bat emango du baina batzea/kopiatzea kaltegarria izango da.\n" "Nahi duzu agiri biak tratatzea windowsen kode-orrialde berezkoan (gomendatuta)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informazioa galduta kodeaketa akatsengaitik: bi agirietan" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Ezberdintasunik ez" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Lerro ezberdintasuna" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Ordeztuta %1 kate." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ezin da kate hau aurkitu: \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Kokaleku Panela" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Ezberdint. Panela" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Eranskina agiria ongi idatzi da." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. gaia ez da aurkitu edo zuzenbidea da!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. gaia ez da aurkitu edo zuzenbidea da!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Eranskin agiria jadanik badago. Gainidaztea nahi duzu?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 agiri hautatuta]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normala" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Hitzingurua" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Bateratuta" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Ezin da %1 agirira idatzi." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Adierazitako irteera helburua ez helburu osoa: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Adierazi irteera agiri bat" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ezin da eranski agiria sortu agiri binarioetatik." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ezin da eranskina agiria sortu zuzenbideetatik" -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4638,12 +4720,12 @@ msgstr "" "\n" "Eranskina sortzeak agirietan gordegabeko aldaketarik ez egotea eskatzen du." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Agiritegia ez dago." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4654,37 +4736,37 @@ msgstr "" "Beharrezko osagai guztiak (7-zip eta/edo Merge7z*.dll) agiri sostengurako ezin dira aurkitu.\n" "Ikusi eskuliburua argibide gehigorako agiri sostenguari buruz eta nola gaitzeaz." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Hautatu esportatzeko agiria" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Hautatu inportatzeko agiria" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Agiritik inportatutako aukerak" -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Agiritik esportatutako aukerak" -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Hutsegitea agiritik aukerak inportatzerakoan." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Hutsegitea aukerak agirian idazterakoan." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4695,247 +4777,247 @@ msgstr "" "\n" "Jarraitzea nahi duzu?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Mota" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Despaketatzailea" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Aurrezberd" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Editatzaile eskripta" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Egokitutako despaketatzailea bi agiriei ezartzen zaie (agiri batek bakarrik behar du luzapena)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Ez aurrezberd (normala)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Iradokitutako pluginak" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Beste pluginak" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Bilduma Pribatua: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Plugin Ezarpenak" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ez da aurkitu - .sct eskriptak ezgaituta" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "&Joan lerro honetara: %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Ezgaituta" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Agiri sistematik" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "MRU zerrendatik" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Ez Nabarmenduta" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index 60ff0af7c..dfa6b0bcd 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -80,7 +80,7 @@ msgid "Cu&t" msgstr "Co&rtar" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Copiar" @@ -91,7 +91,7 @@ msgid "&Paste" msgstr "&Colar" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&Ir para..." @@ -102,22 +102,25 @@ msgid "Op&en" msgstr "Ab&rir" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "com &o Aplicativo Registrado" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "com &o Editor Externo" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&com..." @@ -155,7 +158,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -167,8 +170,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Nenhum" @@ -185,49 +188,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Arquivo" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Novo\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Ab&rir o Arquivo do Conflito..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Abrir Pro&jeto...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Sa&lvar Projeto..." @@ -239,274 +242,274 @@ msgstr "Projetos Recentes" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Vazio >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "S&air" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Editar" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Opções..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Visualizar" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "&Barra de ferramentas" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Pequeno" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Grande" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "&Barra de Status" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Ba&rra das Abas" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Ferramentas" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filtros..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Gerar Patch..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "&Desempacotamento Manual" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "&Desempacotamento Automático" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Recarregar plugins" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&Janela" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "Fe&char" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Fec&har Tudo" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Mudar o &Painel\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Lado a Lado &Horizontalmente" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Lado a Lado &Verticalmente" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Em Cascata" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Ajuda" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&Ajuda do WinMerge\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "C&onfiguração" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU Licença para o Público em Geral" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&Sobre o WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "S&omente-Leitura a Esquerda" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "S&omente-Leitura a Direita" @@ -517,7 +520,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Selecio&nar Tudo\tCtrl+A" @@ -539,1751 +542,1811 @@ msgstr "Mostra&r os Itens #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostrar &os Itens Únicos a Direita" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Mostra&r os Itens Pulados" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "M&ostrar Arquivos Binários" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Mostrar os &Itens Escondidos" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "Modo &Árvore" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "E&xpandir Todas as Sub-Pastas" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "&Retrair Todas as Sub-Pastas" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Selecionar a &Fonte..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Usar a Fonte P&adrão" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Compa&rar as Estatísticas" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "Atuali&zar\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Atualizar os Selecionados\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Unir" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&mparar\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Diferença Seguinte\tAlt+Pra Baixo" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Diferença Anterior\tAlt+Pra Cima" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Primeira Diferença\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Diferença Atual\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Última Diferença\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copiar p&ara a Direita\tAlt+Direita" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copiar p&ara a Esquerda\tAlt+Esquerda" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Apagar\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Personalizar as Colunas..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Gerar &Relatório..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Salvar\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Salvar &a Esquerda" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Salvar &a Direita" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Imprimir..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Configu&ração da Página" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Pré-Visualiz&ação da Impressão" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Converter os Finais das Linhas para" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "&Modo de União\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "&Codificação do Arquivo..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Desfazer\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Refazer\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Co&rtar\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Copiar\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Colar\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Selecionar a &Diferença da Linha\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "A&char...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Subst&ituir...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Avançado" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copiar Com Os Números das Linhas\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&Bookmarks" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Ativar o Bookmark\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Bookmark Seguinte\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Bookmark Anterior\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Limpar Todos os Bookmarks" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Ir Para...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Mais &Zoom\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Menos &Zoom\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Destacar a Sintaxe" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "&Trancar os Painéis" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "&Visualizar os Espaços em Branco" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Vis&ualizar as Diferenças das Linhas" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Visualizar &os Números das Linhas" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Visual&izar as Margens" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "O&rganizar as Linhas" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Tr&ocar os Painéis" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Pain&el da Diferença" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Pa&inel de Localização" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "C&opiar para a Direita e Avançar\tAlt+Ctrl+Direita" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copiar ¶ a Esquerda e Avançar\tAlt+Ctrl+Esquerda" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Copiar &Tudo para a Direita" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Cop&iar Tudo para a Esquerda" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Scripts" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Comp&arar" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&Esquerda para a Direita" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "E&squerda para..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "&Direita para a Esquerda" +msgid "Left to Right (%1 of %2)" +msgstr "Esquerda para a Direita (%1 de %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "D&ireita para..." +msgid "Left to... (%1 of %2)" +msgstr "Esquerda para... (%1 de %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Mover" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&Esquerda para..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&Direita para..." +msgid "Right to Left (%1 of %2)" +msgstr "Direita para a Esquerda (%1 de %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Direita para... (%1 de %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Mover" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Apagar" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&Esquerda" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Direita" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Ambos" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Re&nomear" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Esconder os Itens" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "&Abrir a Esquerda" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "A&brir a Direita" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Cop&iar os nomes dos caminhos" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&Esquerda (%1 de %2)" +msgid "Left (%1 of %2)" +msgstr "Esquerda (%1 de %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&Direita (%1 de %¨2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Direita (%1 de %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Ambos (%1 de %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Ambos (%1 de %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Copiar &os nomes dos arquivos" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&Esquerda... (%1 de %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&Direita... (%1 de %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Ambos... (%1 de %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Diferenças... (%1 de %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Atualizar" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Menu do Shell Esquerdo" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Menu do Shell Direito" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Copiar o Caminho Completo" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Copiar &o nome do arquivo" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Configurações do Prediffer" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Sem prediffer" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Auto prediffer" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "I&r para a Diferença" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Nenhum dos Blocos Movidos" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Todos os Blocos Movidos" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Bloco Movido par&a a Diferença Atual" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "E&spaços em branco" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Com¶r" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "I&gnorar as mudanças" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Ig&norar tudo" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "Caso sensi&tivo" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rar diferenças de retorno dos procedimentos (Win/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Conteúdos Completos" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Conteúdos Rápidos" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Data Modificada" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Data e Tamanho Modificados" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Tamanho" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Sobre o WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Build Privado)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visitar a Home Page do WinMerge!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Contribuidores" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Selecionar Arquivos ou Pastas" -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Procurar..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "P&rocurar..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Pr&ocurar..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Selecionar..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Desempacotador:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "&Selecionar..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Incluir as Sub-pastas" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Cancelar" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Ajuda" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Arquivos ou Pastas para Comparar" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Base de dados:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Projeto:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Usuário:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Senha:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Link para o projeto VSS Destino" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Aplicar a todos os itens" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Veja Isso" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Salvar Como..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Sistema de Versões" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Sistema de Versões:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Caminho para o cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Geral" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automaticame&nte rolar para a primeira diferença" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fe&char as janelas com o ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Automaticamente verificar os caminhos no diálogo-Abrir" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Per&mitir apenas uma instância a executar" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Pe&rguntar quando fechar múltiplas janelas" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "&Preservar a hora do arquivo na comparação dos arquivos" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Mostrar o Diálogo \"Selecionar Arquivos ou Pastas\" ao Iniciar" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&uto-Conclusão do diálogo-Abrir:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite esconder algumas caixas de mensagens comuns. Pressione o botão Resetar para tornar todas as caixas de mensagens visíveis de novo." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Resetar" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Achar" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "Ac&har:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Combinar &apenas palavras inteiras" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Combinar &com o caso sensitivo" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "Express&ão regular" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "N&ão organizar o final do arquivo" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Achar o Próximo" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Substituir" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Su&bstituir por:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "&Não organizar o final do arquivo" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Substituir" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&Seleção" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "No &arquivo inteiro" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Substituir" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Substituir &Tudo" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Veja Isso" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Comentários" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn após o checkout" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Filtros das linhas" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Ativar os Filtros das Linhas" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Expressões Regulares (uma por linha):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Novo" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Editar" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Remover" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Cores" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Diferença:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Diferença Selecionada:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "2º Plano" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Apagado" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Diferença Ignorada:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Movido:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Selecionado o Movido:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Diferença das Palavras:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Diferença das Palavras Selecionadas:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Padrões" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Enviar os arquivos apagados para o Recycle Bin" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&Editor externo:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Filtrar a pasta:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Pasta dos arquivos temporários" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "P&asta temporária do sistema" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "P&asta personalizada:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Gerador de Patches" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Arquivo&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Arquivo&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "&Trocar" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "&Anexar ao arquivo existente" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Resultado:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Pro&curar..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "Es&tilo:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Contexto:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&ar as linhas em branco" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Inclu&ir a linha de comando" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir no e&ditor externo" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Exibir Colunas" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Mover &pra Cima" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Mover &pra Baixo" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Selecionar o Desempacotador" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Desempacotador do arquivo:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Exibir todos os desempacotadores, não verificar a extensão" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Lista das extensões:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Descrição:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Parar" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Comparando os itens..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Itens comparados:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Total de itens:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Ir Para" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "I&r para:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Arquivo" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Ir para" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "Li&nha" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Diferença" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Ir Para" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Espaço em branco" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Comparar" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "&Ignorar a mudança" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "I&gnorar tudo" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar as li&nhas em branco" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Ignorar &caso sensitivo" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "A&tivar a detecção dos blocos movidos" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "&Combinar as linhas similares" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Comentários do Filtro" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&Destacar a sintaxe" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "&Re-escaneamento automático" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&Preservar os caracteres EOL originais" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Abas" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Tamanho das abas:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "&Inserir Abas" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "Inserir &Espaços" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Coloramento das Diferenças das Linhas" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Visualizar as diferenças das linhas" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "&Nível dos caracteres" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "&Nível das palavras:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Filtros dos arquivos" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Teste" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Novo..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Apagar..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Salvar os arquivos modificados?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Arquivo do lado esquerdo" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Salvar mudanças" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Descartar mudanças" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Arquivo do lado direito" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "S&alvar mudanças" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Des&cartar mudanças" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Código da página" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Código da Página Padrão" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecionar o código de página padrão assumido quando carregar arquivos não-unicode:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2292,692 +2355,692 @@ msgstr "" "Detectar a info do código de página para estes arquivos : .html, .rc, .xml \n" "precisa reiniciar a sessão" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Código de página do sistema" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "De Acordo com a Interface do Usuário do WinMerge" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Código de página personalizado:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Opções" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Categorias" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Diálogo" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Palavras-chave:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Nomes das funções:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Comentários:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Números:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Strings:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Pré-processador:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Usuário 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Usuário 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Negrito" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Relatório sobre a Comparação das Pastas" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Reportar &Arquivo:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Procurar..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Estilo:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Copiar para a Área de Transferência" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Filtro Compartilhado ou Privado" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Que tipo de filtro você quer criar?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro Compartilhado (para todos os usuários nesta máquina)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro Privado (só para o usuário atual)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Suporte para Arquivos" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Ativar o suporte para arquivos dentro do arquivo" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detectar o tipo de arquivo da assinatura do arquivo" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Comparar as Estatísticas" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Pastas:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Arquivos:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Diferente" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binário:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Único" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Esquerda:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Direita:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Idênticos" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Fechar" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Afeta" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Afeta)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Selecionar o Código da Página para" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&Carregamento do Arquivo:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Salvamento do &Arquivo:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&Usar o mesmo código de página para ambos" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Aplicar" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Cancelar" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Testar Filtro" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Testando o filtro ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Inserir o texto para testar:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Nome da Pasta" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Teste" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Fechar" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&Usar cores de texto personalizadas" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Cores de texto personalizadas" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Espaço vazio:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Texto regular:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Seleção:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Caminhos" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Esquerda:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "S&omente-leitura" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Direita:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "So&mente-leitura" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filtro:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Salvar..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Arquivos de Backup" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "&Comparar as pastas" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Com¶r os arquivos" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "&Pasta do arquivo original" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&Pasta de backup global:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Nome do arquivo de backup:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&Anexar a extensão .bak" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "A&nexar a estampa de tempo" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Confirmar a Cópia" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Você tem certeza que você quer copiar os itens XXX?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Da esquerda" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Para a direita" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Sim" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Não" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "&Ativar plugins" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Integração com o Shell" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Explorer" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "A&tivar o menu avançado" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "&Adicionar ao menu de contexto" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Pasta" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "P&arar após a primeira diferença" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orar as diferenças de hora menores do que 3 segundos" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binário" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "041604e4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x416, 1252" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro desconhecido ao tentar abrir o arquivo do projeto" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro desconhecido ao tentar salvar o arquivo do projeto" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Arquivo do Projeto" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Arquivo do projeto carregado com sucesso." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Arquivo do projeto salvo com sucesso." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2996,7 +3059,7 @@ msgstr "" "WinMerge.FileCompare\n" "Comparação dos Arquivos do WinMerge" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3015,7 +3078,7 @@ msgstr "" "WinMerge.FolderCompare\n" "Comparação das Pastas do WinMerge" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3024,143 +3087,143 @@ msgstr "" "Desenvolvedores:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 vem com ABSOLUTAMENTE NENHUMA GARANTIA. Este é um software livre e você é bem vindo para redistribuí-lo sob certas circunstâncias; veja o GNU Licença para o Público em Geral no menu Ajuda para detalhes." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Abortar" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Tentar de novo" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Ignorar &tudo" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Sim" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Sim para &todos" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Não" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Não para t&odos" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Pular" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Pular &tudo" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Não exibir esta &mensagem de novo." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Não perguntar esta &questão de novo." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Controle da Versão" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Diferenças" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Para:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Da esquerda:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Para a esquerda:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Da direita:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Para a direita:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Versão %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Opções (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as caixas de mensagens agora serão exibidas de novo." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3171,84 +3234,84 @@ msgstr "" "\n" "Por favor use valores de 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Arquivos dos Projetos do WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Arquivos das opções (*.ini)|*.ini|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Arquivos Texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Arquivos XML (*.xml)|*.xml|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Local" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Descrição" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Selecionar o nome do arquivo para o novo filtro" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtros dos Arquivos (*.flt)|*.flt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3261,7 +3324,7 @@ msgstr "" "Por favor copie o arquivo %1 para a pasta WinMerge/Filtros:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3274,7 +3337,7 @@ msgstr "" "\n" "Por favor tenha certeza de que a pasta exista e é gravável." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3285,7 +3348,7 @@ msgstr "" "\n" "Por favor selecione a pasta do filtro em Opções/Sistema." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3298,12 +3361,12 @@ msgstr "" "\n" "Talvez o arquivo seja somente-leitura?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Localizar o filtro do arquivo para instalar" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3314,17 +3377,17 @@ msgstr "" "\n" "Não pôde copiar o novo arquivo do filtro para a pasta do filtro." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "O arquivo do filtro já existe. Sobrescrever o filtro existente?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Expressão regular" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3335,173 +3398,173 @@ msgstr "" "\n" "Se você não quer atualizar todas as comparações agora você pode selecionar o Não e atualizar as comparações mais tarde." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&Caminho para o SS.EXE:" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Resultado da Comparação dos Pastas" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Comparação de Arquivo" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Sem título a esquerda" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Sem título a direita" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "O Arquivo Deles" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Meu Arquivo" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Linha: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Unir" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Diferença %1 de %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 Diferenças Achadas" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 Diferença Achada" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Item %1 de %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Itens: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecione duas pastas ou arquivos existentes para comparar" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Seleção de Pastas" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecione duas pastas ou dois arquivos para comparar." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "O caminho esquerdo é inválido!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "O caminho direito é inválido!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Ambos os caminhos são inválidos!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Escolher dois arquivos para ativar a seleção do desempacotador." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Não pôde comparar o arquivo e a pasta!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Arquivo não achado: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Arquivo não desempacotado: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3514,12 +3577,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Falhou em analisar o arquivo do conflito." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3530,27 +3593,27 @@ msgstr "" "%1\n" "não é um arquivo de conflito." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Salvar Como" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Salvar as mudanças em %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 está marcado como somente-leitura. Você gostaria de sobrescrever o arquivo somente-leitura ? (Não para salvar com um novo nome de arquivo.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Erro ao fazer o backup do arquivo" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3563,7 +3626,7 @@ msgstr "" "\n" "Continuar de qualquer maneira?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3580,7 +3643,7 @@ msgstr "" "\t-usar um nome de arquivo diferente (Pressione Ok)\n" "\t-abortar a operação atual (Pressione Cancelar)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3595,7 +3658,7 @@ msgstr "" "\n" "Você quer salvar a versão desempacotada em outro arquivo?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3610,7 +3673,7 @@ msgstr "" "\n" "Você quer salvar a versão despachada em outro arquivo?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3625,7 +3688,7 @@ msgstr "" "\n" "Sobrescrever o arquivo mudado?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3634,7 +3697,7 @@ msgstr "" "%1\n" "está marcado como somente-leitura. Você gostaria de sobrescrever o item somente-leitura?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3649,22 +3712,22 @@ msgstr "" "\n" "Você quer recarregar o arquivo?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Salvar o Arquivo a Esquerda Como" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Salvar o Arquivo a Direita Como" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3675,7 +3738,7 @@ msgstr "" "%1\n" "desapareceu. Por favor salve uma cópia do arquivo para continuar." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3686,42 +3749,42 @@ msgstr "" "\n" "Atualize os documentos antes de continuar." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Você deve especificar o caminho de um projeto do SourceSafe para continuar (ex: $/MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Ver os arquivos da VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "O Sistema de Versões retornou um erro enquanto tentava verificar o arquivo. Incapaz de continuar..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Erro ao executar o comando do sistema de versões." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "A Pasta de Trabalho VSS e o local do arquivo atual não combinam. Continuar?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Não foram achadas base(s) de dados VSS!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Erro da VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3732,7 +3795,7 @@ msgstr "" " Por favor, verifique a spec da config da visualização usada.\n" " Desfazer a operação de verificação?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3741,127 +3804,146 @@ msgstr "" "O Sistema de Versões retornou um erro enquanto tentava desfazer o checkout do arquivo.\n" " Por favor, verifique a spec da config da visualização usada." -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Nenhum" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (menor do que 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e acima)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Quebrar no espaço em branco" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Quebrar no espaço em branco ou pontuação" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Direita para a Esquerda (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Esquerda para a Direita (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Direita para a Esquerda (%1 de %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Esquerda para a Direita (%1 de %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Esquerda para a Direita (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Esquerda para... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Direita para... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Esquerda para... (%1 de %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Direita para... (%1 de %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Esquerda (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Direita (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Ambos (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Esquerda (%1 de %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Direita (%1 de %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Ambos (%1 de %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Lado esquerdo - selecionar a pasta de destino:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Lado direito - selecionar a pasta de destino:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Arquivos Afetados)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 Arquivos Afetados)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3872,17 +3954,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Você tem certeza de que você quer copiar:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Você tem certeza que você quer copiar os itens %d:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3901,502 +3983,502 @@ msgstr "" "\n" "Por favor atualize a comparação." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Você tem certeza que você quer mover:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Você tem certeza que você quer mover os itens %d:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Confirmar o Movimento" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Falhou em executar o editor externo: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Formato do arquivo desconhecido" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Nome do Arquivo" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Resultado da comparação" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Data da Esquerda" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Data da Direita" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Extensão" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Tamanho a Esquerda" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Tamanho a Direita" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Tamanho a Direita (Curto)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Tamanho a Esquerda (Curto)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Hora da Criação a Esquerda" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Hora da Criação a Direita" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Arquivo Mais Novo" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Versão do Arquivo a Esquerda" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Versão do Arquivo a Direita" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Resultado Curto" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Atributos da Esquerda" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Atributos da Direita" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "EOL a esquerda" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "EOL a direita" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Codificação a Esquerda" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Codificação a Direita" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Diferença Ignorada." -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Incapaz de comparar os arquivos" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Item abortado" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Arquivo pulado" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Pasta pulada" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Apenas a esquerda: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Apenas a direita: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Os arquivos binários são idênticos" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Os arquivos binários são diferentes" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Os arquivos são diferentes" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "As pastas são diferentes" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Apenas a Esquerda" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Apenas a Direita" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Erro" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Os arquivos texto são idênticos" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Os arquivos texto são diferentes" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo decorrido: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 item selecionado" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 itens selecionados" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Nome do arquivo ou nome da pasta." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome da sub-pasta quando as sub-pastas são incluídas." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Resultado da comparação, formulário longo" -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Data de modificação do lado esquerdo." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Data de modificação do lado direito." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Extensão do arquivo." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Tamanho do arquivo a esquerda em bytes." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Tamanho do arquivo a direita em bytes." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Tamanho do arquivo a esquerda abreviado." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Tamanho do arquivo a direita abreviado." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Hora de criação do lado esquerdo." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Hora da criação do lado direito." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Diz qual lado tem a data de modificação mais nova." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versão do arquivo do lado esquerdo, só para alguns tipos de arquivos." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versão do arquivo do lado direito, só para alguns tipos de arquivos." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Resultado curto da comparação." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Atributos do lado esquerdo." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Atributos do lado direito." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Tipo de EOL do arquivo do lado esquerdo" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Tipo de EOL do arquivo do lado direito" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Codificação do lado esquerdo." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Codficação do lado direito." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Número de diferenças ignoradas no arquivo. Estas diferenças são ignoradas pelo WinMerge e não podem ser unidas." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Número de diferenças no arquivo. Este número não inclui as diferenças ignoradas." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostrar um asterisco (*) se o arquivo é binário." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Comparar o %1 com o %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Lista separada por vírgula" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Lista separada por aba" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "HTML Simples" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "XML Simples" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "O arquivo do relatório já existe. Você quer sobrescrever o arquivo existente?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4405,32 +4487,32 @@ msgstr "" "Erro ao criar o relatório:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "O relatório foi criado com sucesso." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "O mesmo arquivo está aberto em ambos os painéis." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Os arquivos selecionados são idênticos." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Um erro ocoreu enquanto comparava os arquivos." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Os arquivos temporários não puderam ser criados. Verifique suas configurações do caminho dos temporários." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4445,17 +4527,17 @@ msgstr "" "\n" "Nota: Se você quer sempre tratar todos os tipos de retorno de procedimentos como equivalentes, configure a opção 'Ignorar diferenças de retorno dos procedimentos..' na aba Comparar do diálogo das opções (disponível em Editar/Opções)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "A pasta selecionada é inválida." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Não pode abrir um arquivo binário no editor." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4470,7 +4552,7 @@ msgstr "" "%1\n" "no outro lado e abrir estas pastas?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4481,152 +4563,152 @@ msgstr "" "Exibir cada arquivo na sua página de código dará uma melhor exibição mas unir/copiar será perigoso.\n" "Você gostaria de tratar ambos os arquivos como estando na página do código padrão do windows? (recomendado)" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informação perdida devido a erros de codificação: em ambos os arquivos" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Sem diferença" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Diferença da linha" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituiu %1 string(s)." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Não pôde achar a string \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Painel de Localização" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Painel das Diferenças" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Arquivo patch gravado com sucesso." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. o item não foi achado ou é diretório!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. o item não foi achado ou é diretório!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "O arquivo do patch já existe. Você quer sobrescrevê-lo?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 arquivos selecionados]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Não pôde gravar no arquivo %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "O caminho de saída especificado não é um caminho absoluto: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Especificar um arquivo de saída" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Não pode criar um arquivo patch dos arquivos binários." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Não pode criar um arquivo patch dos diretórios." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4637,12 +4719,12 @@ msgstr "" "\n" "Criar um patch requer que não hajam mudanças não salvas nos arquivos." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "A pasta não existe." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4653,37 +4735,37 @@ msgstr "" "Todos os componentes necessários (7-zip e/ou Merge7z*.dll) para o suporte para arquivos não podem ser achados.\n" "Veja o manual para mais info sobre o suporte para arquivos e como ativá-lo." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Selecione o arquivo para exportar" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Selecione o arquivo para importar" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Opções importadas do arquivo" -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Opções exportadas para o arquivo." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Falhou em importar as opções do arquivo." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Falhou em gravar as opções no arquivo." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4694,247 +4776,247 @@ msgstr "" "\n" "Você quer continuar?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Misturado" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Tipo" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Desempacotador" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Script do editor" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "O desempacotador adaptado está aplicado a ambos os arquivos (um arquivo só precisa da extensão)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Sem prediffer (normal)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Outros plugins" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Build Privado: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Configurações dos Plugins" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH não achado - scripts .sct desativados" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "I&r para a Linha %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Desativado" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Do sistema de arquivos" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Da lista da MRU" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Sem Destacamento" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Objeto Portátil" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Recursos" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po index cceadc952..ae0a415a0 100644 --- a/Translations/WinMerge/Bulgarian.po +++ b/Translations/WinMerge/Bulgarian.po @@ -78,7 +78,7 @@ msgid "Cu&t" msgstr "È&çðåæè" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Êîïèðàé" @@ -89,7 +89,7 @@ msgid "&Paste" msgstr "Ïî&ñòàâè" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "Îòèäè &íà..." @@ -100,22 +100,25 @@ msgid "Op&en" msgstr "&Îòâîðè" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "ñ &Ðåãèñòðèðàíî Ïðèëîæåíèå" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "ñ &Âúíøåí Ðåäàêòîð" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&ñúñ..." @@ -153,7 +156,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "Ìàùàá" @@ -165,8 +168,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Íÿìà" @@ -183,49 +186,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Ôàéë" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Íîâ\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Îòâîðè...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Îòâîðè êîíôëèêòåí ôàéë" #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Îòâîðè &Ïðîåêò...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "&Çàïèøè Ïðîåêò..." @@ -237,274 +240,274 @@ msgstr " #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Ïðàçåí >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "&Èçõîä" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Ðåäàêòèðàíå" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Íàñòðîéêè..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "È&çãëåä" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "Ëåíòà ñ èíñòðóìåíòè" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Ìàëúê" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Ãîëÿì" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "&Ëåíòà íà ñúñòîÿíèåòî" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Òàá ëåíòà" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Èíñòðóìåíòè" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Ôèëòðè..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Ñúçäàé ïà÷..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Äîáàâêè" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "&Ðú÷íî ðàçàðõèâèðàíå" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "&Àâòîìàòè÷íî ðàçàðõèâèðàíå" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Ïðåçàðåäè äîáàâêèòå" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&Ïðîçîðöè" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Çàòâîðè" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Çàòâîðè &âñè÷êè" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Ñìåíè &ëèñòà\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Ïîäðåäè &õîðèçîíòàëíî" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Ïîäðåäè &âåðòèêàëíî" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "Ïîäðåäè &êàñêàäíî" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Ïîìîù" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge Ïîìîù\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "Êîíôèãóðàöèÿ" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU Ïóáëè÷åí ëèöåíç" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&Çà WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Î&ò ëÿâî ñàìî çà ÷åòåíå" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Îò äÿñ&íî ñàìî çà ÷åòåíå" @@ -515,7 +518,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Èçáåðè &âñè÷êî\tCtrl+A" @@ -537,2592 +540,2652 @@ msgstr " #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Ïîêàæè &Äåñíèòå Óíèêàëíè íåùà" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Ïîêàæè &Ïðîïóñíàòèòå íåùà" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Ïîêàæè Äâ&îè÷íèòå ôàéëîâå" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Ïîêàæè &Ñêðèòèòå íåùà" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Èçáåðè &øðèôò..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Èçïîëçâàé ø&ðèôò ïî ïîäðàçáèðàíå" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Ñòàòèñòèêà íà ñðàâíÿâàíåòî" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "&Îáíîâè\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Îáíîâè &èçáðàíîòî\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Ñðàâíÿâàíå" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Ñðà&âíè\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Ñëåäâàùà ðàçëèêà\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Ïðåäèøíà ðàçëèêà\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Ï&úðâà ðàçëèêà\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Òåêóùà ðàçëèêà\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Ïî&ñëåäíà ðàçëèêà\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Êîïèðàé â &äÿñíî\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Êîïèðàé â ë&ÿâî\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Èçòðèé\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Íàãëàñè êîëîíèòå..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Ñúçäàé &Îò÷åò..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Çàïèøè\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Çàïèøè &ëÿâàòà ÷àñò" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Çàïèøè &äÿñíàòà ÷àñò" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Ïðèíòèðàíå..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Íàñòðîéêè íà ñòðàíèöàòà" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Ï&ðåãëåä" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Ôîðìàò çà" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "Ðåæèì íà ñëèâàíå\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "Êîäèðàíå íà ôàéë..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Îòìåíè\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Âú&ðíè\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Èçðåæè\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Êîïèðàé\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "Ïî&ñòàâè\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Èçáåðè &ðàçëè÷íèòå ðåäîâå\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Í&àìåðè...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Çàìåñ&òè...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Äîïúëíèòåëíè" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Êîïèðàé ñ íîìåðàòà íà ðåäîâåòå\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&Îòìåòêè" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Ïðèêðåïè îòìåòêà\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Ñëåäâàùà îòìåòêà\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Ï&ðåäèøíà îòìåòêà\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Èç÷èñòè âñè÷êè îòìåòêè" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Îò&èäè íà...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Óâåëè÷è" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Íàìàëè" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "Íîðìàëåí" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Îöâåòÿâàíå íà ñèíòàêñèñà" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "Çàêëþ÷è ïðîçîðöèòå" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "&Ïîêàæè ïðàçíèòå ìåñòà" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Ïîêàæè ðàçëè÷íèòå ðåäîâå" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Ïîêàæè íîìåðà íà ðåäîâåòå" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Ïîêàæè ãðàíèöè" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "Îòðåæè äúëãèòå ðåäîâå" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Ðàçìåíè ëèñòîâåòå" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Ëèñò ñ &ðàçëè÷èÿòà" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Íàâèãàòîð" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Ê&îïèðàé â äÿñíî è ñå ïðåìåñòè\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Êîïèðàé &â ëÿâî è ñå ïðåìåñòè\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Êîïèðàé &âñè÷êî â äÿñíî" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Êîïèðà&é âñè÷êî â ëÿâî" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Íàëè÷íè" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Ñêðèïòîâå" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "&Ñðàâíè" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "Îò &ëÿâî êúì äÿñíî" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "Îò ëÿâ&î êúì..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "Îò &äÿñíî êúì ëÿâî" +msgid "Left to Right (%1 of %2)" +msgstr "Ëÿâ êúì äåñåí (%1 îò %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "Îò ä&ÿñíî êúì..." +msgid "Left to... (%1 of %2)" +msgstr "Ëÿâ êúì... (%1 îò %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Ïðåìåñòè" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "Îò &ëÿâî êúì..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "Îò &äÿñíî êúì..." +msgid "Right to Left (%1 of %2)" +msgstr "Äåñåí êúì ëÿâ (%1 îò %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Äåñåí êúì... (%1 îò %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Ïðåìåñòè" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Èçòðèé" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&Îò ëÿâî" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Îò äÿñíî" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Äâåòå" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "&Ïðåèìåíóâàé" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Ñêðèé" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "&Îòâîðè â ëÿâî" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Î&òâîðè â äÿñíî" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Êîïèðàé &ïúòÿ" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&Ëÿâî (%1 îò %2)" +msgid "Left (%1 of %2)" +msgstr "Ëÿâ (%1 îò %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&Äÿñíî (%1 îò %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Äåñåí (%1 îò %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Äâåòå (%1 îò %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "Ä&âåòå (%1 îò %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Êîïèðàé &ôàéëîâèòå èìåíà" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Çèï" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&Ëÿâî... (%1 îò %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&Äÿñíî... (%1 îò %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "Ä&âåòå... (%1 îò %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Ðàçëèêè... (%1 îò %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Îáíîâè" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Êîïèðàé ïúòÿ" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Êîïèðàé &èìåòî" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Íàëè÷íè íàñòðîéêè" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Áåç íàëè÷íè" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "&Àâòîìàòè÷íè" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "&Îòèäè íà ðàçëèêà" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Áåç ïðåìåñòåíè áëîêîâå" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Âñè÷êè ïðåìåñòåíè áëîêîâå" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Ïðåìåñòåí áëîê çà &òåêóùà ðàçëèêà" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "Ïðàçí&è ìåñòà" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Ñðàâ&íè" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "È&ãíîðèðàé ïðîìåíèòå" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Èã&íîðèðàé âñè÷êî" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "Ãîëåìè/ìàëêè áóêâè" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Öÿëîòî ñúäúðæàíèå" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Áúðç äîñòúï" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Ïðîìåíåíà äàòà" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Ïðîìåíåíè äàòà è ðàçìåð" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Ðàçìåð" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Çà WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Ïîñåòè ñòðàíèöàòà íà WinMerge!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "ÎÊ" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Äàðèòåëè" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Èçáåðè Ôàéë èëè äèðåêòîðèÿ..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Ïîòúðñè..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "Ïðåãëåä" -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Ï&îòúðñè..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Èçáåðè..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Ðàçàðõèâèòîð:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "Èçáåðè..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Âêëþ÷èòåëíî ïîäïàïêèòå" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Ñòàòóñ:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Îòìåíè" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Ïîìîù" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Ôàéëîâå èëè äèðåêòîðèè çà ñðàâíÿâàíå" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Áàçà äàííè:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Ïðîåêò:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Ïîòðåáèòåë:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Ïàðîëà:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Âðúçêà ñ VSS ïðîåêò" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Çàäàé çà âñè÷êè" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Äåéñòâàé" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Çàïèøè êàòî..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Ñèñòåìà çà âåðñèè" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "Ñèñòåìà çà âåðñèè" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Ïúò äî cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Îñíîâíè" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Àâòîìàòè÷íî &ïðèäâèæâàíå êúì ïúðâàòà ðàçëèêà" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Çàòâîðè &ïðîçîðöèòå ïðè ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Àâòîìàòè÷íî ïðîâåðè ïúòèùàòà â äèàëîãà Îòâîðè" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Ïîçâîëè ñàìî &åäíî ñòàðòèðàíî êîïèå" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Ïèòàé ïðè çàòâàðÿíå íà ìíîãî ïðîçîðöè" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "Çàïàçè âðåìåòî íà ôàéëà ïðè ñðàâíÿâàíå" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Îòâîðè-äèàëîã Àâòî-çàâúðøâàíå:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge ïîçâîëÿâà ñêðèâàíå íà íÿêîè ñúîáùåíèÿ. Íàòèñíåòå áóòîíà Âúçñòàíîâè, çà äà ïîêàæåòå ïàê òåçè ñúîáùåíèÿ." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Âúçñòàíîâè" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Íàìåðè" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "&Òúðñè çà:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Òúðñè &ñàìî öåëè äóìè" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Ãëàâíè/ìàëêè áóêâè" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "Ïðàâèëíè &èçðàçè" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "Äî êðàÿ íà ôàéëà" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Íàìåðè" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&ÎÊ" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Çàìåíè" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "&Çàìåíè ñ:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "Äî êðàÿ íà ôàéëà" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Çàìåíè â" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&Èçáðàíîòî" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr " &öåëèÿ ôàéë" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Çàìåíè" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Çàì. &âñè÷êî" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Äåéñòâàé" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Êîìåíòàðè" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn ñëåä checkout" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Ôèëòðè çà ðåä" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Âêëþ÷è ôèëòðè çà ðåä" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Ïðàâèëíè èçðàçè (ïî åäèí íà ðåä):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Íîâ" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Ðåäàêòèðàé" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Ïðåìàõíè" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Öâåòîâå" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Ðàçëèêè:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Èçáðàíè ðàçëèêè:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Ôîí" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Èçòðèòè" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Òåêñò" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Èãíîðèðàíè ðàçëèêè:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Ïðåìåñòåíè:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Èçáðàíè è ïðåìåñòåíè:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Ðàçëèêè â äóìèòå:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr " èçáðàíèòå äóìè:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Âúçñòàíîâè" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Ñèñòåìíè" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Ñëîæè èçòðèòèòå ôàéëîâå â Êîø÷åòî" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&Âúíøåí ðåäàêòîð:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Ïàïêà íà ôèëòðèòå:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Âðåìåííà ïàïêà" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "Âðåìåííà ïàïêà íà ñèñòåìàòà" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "Äðóãà ïàïêà" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Ãåíåðèðàíå íà ïà÷" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Ôàéë&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Ôàéë&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "&Ðàçìåíè" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "&Ïðèëîæè êúì ñúùåñòâóâàù ôàéë" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Ðåçóëòàò:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Ïî&òúðñè..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Ôîðìàò" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "Ñòè&ë:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Êîíòåêñò:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Èãíîðèðà&é ïðàçíèòå ëèíèè" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Âêëþ÷èòåëíî êîìàíäíèÿ ðåä" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Îòâîðè ñ âúíøå&í ðåäàêòîð" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Ïîêàæè êîëîíèòå" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Íàãîðå" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Íàäîëó" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Èçáåðè ðàçàðõèâàòîð" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Ôàéëîâ ðàçàðõèâàòîð:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Ïîêàçâàé âñè÷êè ðàçàðõèâàòîðè, íå ïðîâåðÿâàé ðàçøèðåíèÿòà" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Ñïèñúê íà ðàçøèðåíèÿòà:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Îïèñàíèå:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Ñïðè" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Ñðàâíÿâàíå íà..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Ñðàâíåíè:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Âñè÷êî:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Îòèäè íà" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "&Îòèäè íà:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Ôàéë" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Îòèäè íà:" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "Ðå&ä" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Ðàçëèêà" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Îòèäè" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Ñðàâíÿâàíå" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Ïðàçíè ìåñòà" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Ñðàâíÿâàíå" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "&Èãíîðèðàé ïðîìåíèòå" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "È&ãíîðèðàé âñè÷êî" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Èãíîðèðàé ïðà&çíèòå ëèíèè" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Èãíîðèðàé &Ãîëåìè/ìàëêè áóêâè" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Ïîçâîëè ðàçïîçíàâàíå íà ïðåìåñòåí &áëîê" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "Ñúîòâåòñòâèå íà ïîäîáíè ðåäîâå" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Ôèëòúð çà êîìåíòàðè" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Ðåäàêòîð" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&Ïîä÷åðòàâàé ñèíòàêñèñà" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "&Àâòîìàòè÷íî ñêàíèðàíå" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&Çàïàçè îðèãèíàëíèòå EOL âèôúð" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Òàáóëàöèÿ" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Ãîëåìèíà íà òàáóëàöèÿòà:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "&Ñëîæè òàáóëàöèÿ" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "Ñëîæè &ðàçñòîÿíèÿ" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Îöâåòÿâàé ðåäîâåòå ñ ðàçëèêè" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Ïîêàçâàé ðàçëèêèòå â ðåäà" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "Íèâî &ñèìâîë" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "Íèâî &äóìà:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Ôàéëîâè ôèëòðè" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Òåñòâàé" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Èíñòàëèðàé..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Íîâ..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Ðåäàêòèðàé..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Èçòðèé..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Çàïèñ íà ïðîìåíåíè ôàéëîâå?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Ëÿâ ôàéë" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Çàïèøè ïðîìåíèòå" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Îòìåíè ïðîìåíèòå" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Äåñåí ôàéë" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "Ç&àïèøè ïðîìåíèòå" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Î&òìåíè ïðîìåíèòå" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Êîäèðîâêà" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Ñòàíäàðòíà êîäèðîâêà" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Èçáåðåòå ñòàíäàðòíà êîäèðîâêà çà íå-Unicode ôàéëîâå:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Êîäèðîâêà íà ñèñòåìàòà" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Ñïîðåä èíòåðôåéñà íà WinMerge" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Íàñòðîéêè" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Êàòåãîðèè" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Èìïîðò..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Åêñïîðò..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Äèàëîã" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Êëþ÷îâè äóìè:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Èìåíà íà ôóíêöèè:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Êîìåíòàðè:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "×èñëà:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Îïåðàòîðè:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Ñòðèíãîâå:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Ïðåäïðîöåñîð:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Ïîòðåáèòåë 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Ïîòðåáèòåë 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Óäåáåëåí" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Îò÷åò çà ñðàâíÿâàíå íà ïàïêè" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Ôàéë:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Ïîòúðñè..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Ñòèë:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Êîïèðàé â êëèïáîðäà" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Ñïîäåëåí èëè ñîáñòâåí ôèëòúð" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Êîé òèï ôèëòúð èñêàòå äà ñúçäàäåòå?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Ñïîäåëåí ôèëòúð (çà âñè÷êè ïîòðåáèòåëè íà òîçè êîìïþòúð)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Ñîáñòâåí ôèëòúð (ñàìî çà òåêóùèÿ ïîòðåáèòåë)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Ïîääðúæêà íà àðõèâè" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Ïîçâîëè ïîääðúæêà íà àðõèâè" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Çàñå÷è àðõèâà îò ôàéëîâàòà ñèãíàòóðà" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Ñòàòèñòèêà çà ñðàâíÿâàíå" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Ïàïêè:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Ôàéëà:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Ðàçëè÷íè" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Òåêñò:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Äâîè÷íè:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Óíèêàëíè" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Ëÿâî:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Äÿñíî:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Èäåíòè÷íè" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Îáùî:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Çàòâîðè" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Ïðîìåíè" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Ïðîìåíè)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Èçáåðåòå êîäèðîâêà çà" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&Çàðåæäàíå íà ôàéë:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Çàïèñâàíå íà ôàéë:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&Èçïîëçâàé åäíàêâà êîäèðîâêà è çà äâåòå" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Ïðèëîæè" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Îòìåíè" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Òåñò íà ôèëòúð" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Òåñòâàíå íà ôèëòúð ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Âúâåäåòå òåêñò çà òåñòâàíå:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Èìå íà ïàïêà" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Ðåçóëòàò:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Òåñòâàé" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Çàòâîðè" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&Èçïîëçâàé çàäàäåíè öâåòîâå çà òåêñòà" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Çàäàäåíè öâåòîâå íà òåêñò" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Áÿëî ïðîñòðàíñòâî:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Íîðìàëåí òåêñò:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Èçáðàí:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Ïúòèùà" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "Îò &ëÿâî:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Ñàìî çà ÷åòåíå" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "Îò &äÿñíî:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Ñàìî çà ÷åòåíå" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Ôèëòúð:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Îòâîðè..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Çàïèøè..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Ðåçåðâíè ôàéëîâå" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Ñúçäàé ðåçåðâíè ôàéëîâå â:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Ñðàâíÿâàíå íà &Ïàïêè" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Ñðàâíÿâàíå íà &Ôàéëîâå" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Ñúçäàé ðåçåðâíè ôàéëîâå â:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "Îðèãèíàëíà ïàïêà íà ôàéëà" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "Ãëîáàëíà ðåçåðâíà ïàïêà" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Ðåçåðâíî èìå:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "Äîáàâè .bak -ðàçøèðåíèå" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "Äîáàâè âðåìå" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Ïîòâúðäè êîïèðàíå" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Èñêàòå ëè äà êîïèðàòå XXX íåùà?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Îò ëÿâî" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Êúì äÿñíî" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Äà" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Íå" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Ïîçâîëè &äîïúëíèòåëíî ìåíþ" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Äèðåêòîðèÿ" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "&Ñïðè ñëåä ïúðâàòà ðàçëèêà" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Èãíîðèðàé âðåìåâèòå ðàçëèêè ïî-ìàëêè îò 3 ñåêóíäè" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Äâîè÷åí" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "040204e3" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x402, 1251" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Íåïîçíàòà ãðåøêà ïðè îòâàðÿíåòî íà ôàéëà ñ ïðîåêòà" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Íåïîçíàòà ãðåøêà ïðè çàïèñâàíåòî íà ôàéëà ñ ïðîåêòà" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Ïðîåêòîâ ôàéë" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Ïðîåêòîâèÿ ôàéë å çàðåäåí óñïåøíî." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Ïðîåêòîâèÿ ôàéë å çàïèñàí óñïåøíî." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "Ðàçðàáîò÷èöè:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 èäâà ÁÅÇ ÍÈÊÀÊÂÀ ÃÀÐÀÍÖÈß. Òîâà å áåçïëàòåí ñîôòóåð è ìîæåòå äà ãî ðàçïðîñòðàíÿâàòå ïîä îáùèòå óñëîâèÿ; çà äåòàéëè âèæòå GNU Ïóáëè÷åí ëèöåíç â ìåíþòî Ïîìîù." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Ïðåêúñíè" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Îïèòàé ïàê" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Èãíîðèðàé" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Èãíîðèðàé &âñè÷êî" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Äà" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Äà çà &âñè÷êè" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Íå" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Íå çà Â&ñè÷êè" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Ïðîäúëæè" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Ïðåñêî÷è" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Ïðåñêî÷è &âñè÷êè" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Íå ïîêàçâàé òîâà ñúîáùåíèå îòíîâî." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Íå ïèòàé ïàê òîçè âúïðîñ." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Êîíòðîë íà âåðñèÿòà" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Ðàçëèêè" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Â:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Îò ëÿâî:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr " ëÿâî:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Îò äÿñíî:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr " äÿñíî:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Âåðñèÿ %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Óíèêîä" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Íàñòðîéêè (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Âñè÷êè ñúîáùåíèÿ ñå ïîêàçâàò îòíîâî." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3133,84 +3196,84 @@ msgstr "" "\n" "Ìîëÿ, èçïîëçâàéòå ñòîéíîñò îò 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Îòâîðè" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Ïðîãðàìè|*.exe;*.bat;*.cmd|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ôàéëîâå ñ ïðîåêòè (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Ôàéëîâå çà íàñòðîéêà (*.ini)|*.ini|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, 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:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML ôàéëîâå (*.htm,*.html)|*.htm;*.html|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ôàéëîâå (*.xml)|*.xml|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Èìå" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Ìÿñòî" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Ôèëòðè" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Îïèñàíèå" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Èçáåðåòå èìå çà íîâèÿ ôèëòúð" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Ôàéëîâè Ôèëòðè (*.flt)|*.flt|Âñè÷êè ôàéëîâå (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3223,7 +3286,7 @@ msgstr "" "Ìîëÿ, êîïèðàéòå ôàéëà %1 â ïàïêàòà WinMerge/Filters:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3236,7 +3299,7 @@ msgstr "" "\n" "Ìîëÿ, óâåðåòå ñå ÷å ïàïêàòà ñúùåñòâóâà è ìîæå äà ñå çàïèñâà â íåÿ." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3247,7 +3310,7 @@ msgstr "" "\n" "Ìîëÿ, èçáåðåòå ïàïêà çà ôèëòðè â Íàñòðîéêè/Ñèñòåìíè." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3260,12 +3323,12 @@ msgstr "" "\n" "Ìîæå áè ôàéëúò å ñàìî çà ÷åòåíå?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Çàäàéòå ôèëòúðåí ôàéë çà èíñòàëèðàíå" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3276,188 +3339,188 @@ msgstr "" "\n" "Íå ìîæå äà ñå êîïèðà íîâèÿò ôàéë â ïàïêàòà ñ ôèëòðè." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Ôèëòúðíèÿò ôàéë âå÷å ñúùåñòâóâà. Äà ñå ïðåçàïèøå ëè ñúùåñòâóâàùèÿò ôèëòúð?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "×åñòè èçðàçè" -#: Merge.rc:2151 +#: Merge.rc:2172 #, 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:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Ðåçóëòàòè îò ñðàâíÿâàíå íà äèðåêòîðèèòå" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Ñðàâíÿâàíå íà ôàéëîâå" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Áåç çàãëàâèå ëÿâ" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Áåç çàãëàâèå äåñåí" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Òåõåí ôàéë" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Ìîé ôàéë" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Ðåä: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Ñëèâàíå" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Ðàçëèêè %1 îò %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 Íàìåðåíè ðàçëèêè" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 Íàìåðåíà ðàçëèêà" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "Ñ×" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Åëåìåíò %1 îò %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Îáùî: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Èçáåðåòå äâå ÑÚÙÅÑÒÂÓÂÀÙÈ äèðåêòîðèè èëè ôàéëîâå çà ñðàâíåíèå" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Èçáîð íà äèðåêòîðèÿ" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Èçáåðåòå äâå ïàïêè èëè äâà ôàéëà çà ñðàâíåíèå." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Íåâàëèäåí ëÿâ ïúò!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Íåâàëèäåí äåñåí ïúò!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Äâàòà ïúòÿ ñà íåâàëèäíè!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Èçáåðåòå äâà ôàéëà çà àêòèâèðàíå íà èçáîðà çà ðàçàðõèâèðàíå." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Íå ìîæå äà ñå ñðàâíè ôàéë ñ äèðåêòîðèÿ!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Íå å íàìåðåí ôàéëà: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Íå å ðàçàðõèâèðàí ôàéëà: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3470,37 +3533,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Ãðåøêà ïðè ðàçáîðà íà êîíôëèêòåí ôàéë" -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "Ôàéëúò\n%1\níå å êîíôëèêòåí." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Çàïèøè êàòî" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Çàïèøè ïðîìåíèòå íà %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 å ñàìî çà ÷åòåíå. Äà çàïèøà ëè ôàéëà? (Íå, ùå ãî çàïèøà ñ íîâî èìå.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Ãðåøêà ïðè ñúçäàâàíå íà ðåçåðâíî êîïèå" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3513,7 +3576,7 @@ msgstr "" "\n" "Äà ïðîäúëæà ëè?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3530,7 +3593,7 @@ msgstr "" "\t-èçïîëçâàòå ðàçëè÷íî èìå (íàòèñíåòå Ok)\n" "\t-îòìåíèòå òåêóùàòà îïåðàöèÿ (íàòèñíåòå Îòìåíè)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3545,7 +3608,7 @@ msgstr "" "\n" "Èñêàòå ëè äà çàïèøåòå íåïàêåòèðàíà âåðñèÿ â äðóã ôàéë?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3560,7 +3623,7 @@ msgstr "" "\n" "Èñêàòå ëè äà çàïèøåòå íåïàêåòèðàíà âåðñèÿ â äðóã ôàéë?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3575,7 +3638,7 @@ msgstr "" "\n" "Äà çàìåíÿ ëè ïðîìåíåíèÿ ôàéë?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3584,32 +3647,32 @@ msgstr "" "%1\n" "å ìàðêèðàí ñàìî ç ÷åòåíå. Èñêàòå ëè äà çàìåíèòå åëåìåíòà ñàìî çà ÷åòåíå?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, 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:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Çàïèøè ëåâèÿ ôàéë êàòî" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Çàïèøè äåñíèÿ ôàéë êàòî" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3620,42 +3683,42 @@ msgstr "" "\n" "Îáíîâåòå äîêóìåíòèòå ïðåäè äà ïðîäúëæèòå." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Âèå òðÿáâà äà èçáåðåòå SourceSafe ïðîåêò çà äà ïðîäúëæèòå (ïð: $/MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Ïðîâåðÿâàíå íà ôàéëîâå îò VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Versioning System âúðíà ãðåøêà ïðè îïèòà äà ïðîâåðè ôàéëà. Íå ìîæå äà ïðîäúëæè..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Ãðåøêà ïðè ñòàðòèðàíå íà êîìàíäà îò versioning system." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ðàáîòíàòà ïàïêà è ðàçïîëîæåíèåòî íà ôàéëà íå ñúâïàäàò. Ùå ïðîäúëæèòå ëè?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Íå å íàìåðåíà VSS áàçà äàííè!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Ãðåøêà îò VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3666,7 +3729,7 @@ msgstr "" " Ìîëÿ, ïðîâåðåòå êîíôèãóðàöèÿòà íà èçïîëçâàíèÿ èçãëåä.\n" " Äà îòìåíÿ ëè ïðîâåðêàòà?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3675,127 +3738,146 @@ msgstr "" "Versioning System âúðíà ãðåøêà äîêàòî ñå îïèòâà äà îòìåíè ïðîâåðêàòà íà ôàéëà.\n" " Ìîëÿ, ïðîâåðåòå êîíôèãóðàöèÿòà íà èçïîëçâàíèÿ èçãëåä." -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Íÿìà" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (ïðåäè â.5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (â.5.0 è íàãîðå)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Ïðåêúñíè íà ïðàçíî ïðîñòðàíñòâî" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Ïðåêúñíè íà ïðàçíî ïðîñòðàíñòâî èëè ïóíêòóàöèÿ" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Îò äÿñíî êúì ëÿâî (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Îò ëÿâî êúì äÿñíî (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Äåñåí êúì ëÿâ (%1 îò %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Ëÿâ êúì äåñåí (%1 îò %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Îò ëÿâî êúì äÿñíî (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Ëÿâ êúì... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Äåñåí êúì... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Ëÿâ êúì... (%1 îò %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Äåñåí êúì... (%1 îò %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Ëÿâî (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Äÿñíî (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Äâåòå(%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Ëÿâ (%1 îò %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Äåñåí (%1 îò %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Äâåòå (%1 îò %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Ëÿâà ÷àñò - èçáåðåòå ïàïêà:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Äÿñíà ÷àñò - èçáåðåòå ïàïêà:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Ôàéëà çàñåãíàòè)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 îò %2 ôàéëà çàñåãíàòè)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3806,17 +3888,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Èñêàòå ëè äà êîïèðàòå:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Èñêàòå ëè äà êîïèðàòå %d åëåìåíòè:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3835,502 +3917,502 @@ msgstr "" "\n" "Ìîëÿ, îáíîâåòå ñðàâíÿâàíåòî." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íå ìîæå äà ñå ñòàðòèðà âúíøíèÿ ðåäàêòîð: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Íåïîçíàò àðõèâåí ôîðìàò" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Èìå" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Ðåçóëòàòè ïðè ñðàâíÿâàíå" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Ëÿâà äàòà" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Äÿñíà äàòà" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Ðàçøèðåíèå" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Ðàçìåð íà ëÿâàòà ÷àñò" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Ðàçìåð íà äÿñíàòà ÷àñò" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Ðàçìåð îò äÿñíî (Êðàòúê)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Ðàçìåð îò ëÿâî (Êðàòúê)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Âðåìå çà íàïðàâà íà ëÿâàòà ÷àñò" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Âðåìå çà íàïðàâà íà äÿñíàòà ÷àñò" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Íîâè ôàéëîâå" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Âåðñèÿ íà ëåâèÿ ôàéë" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Âåðñèÿ íà äåñíèÿ ôàéë" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Áúðçè ðåçóëòàòè" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Àòðèáóòè îò ëÿâî" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Àòðèáóòè îò äÿñíî" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Ëÿâ EOL" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Äåñåí EOL" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Ëÿâà êîäèðîâêà" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Äÿñíà êîäèðîâêà" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Èãíîðèðàíè ðàçëèêè" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Íå ìîæå äà ñå ñðàâíÿò ôàéëîâåòå" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Ïðåêúñíàò ôàéë" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Ïðîïóñíàò ôàéë" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Ïðîïóñíàòà äèðåêòîðèÿ" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Îò ëÿâî ñàìî: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Îò äÿñíî ñàìî: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Áèíàðíèòå ôàéëîâå ñà åäíàêâè" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Áèíàðíèòå ôàéëîâå ñà ðàçëè÷íè" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Ðàçëè÷íè ôàéëîâå" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Ñàìî ëåâèÿò" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Ñàìî äåñíèÿò" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Ãðåøêà" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Îñòàâàùî âðåìå: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 èçáðàí îáåêò" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 èçáðàíè îáåêòà" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Èìå íà ïàïêàòà èëè ôàéëà." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Èìå íà ïîäïàïêàòà, êîãàòî ñà âêëþ÷åíè ïîäïàïêèòå." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Ðåçóëòàò íà ñðàâíåíèåòî, äúëãà ôîðìà." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Äàòà íà ïðîìÿíà íà ëÿâàòà ñòðàíà." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Äàòà íà ïðîìÿíà íà äÿñíàòà ñòðàíà." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Ðàçøèðåíèå íà ôàéëà." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Ðàçìåð íà ëåâèÿ ôàéë â áàéòà." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Ðàçìåð íà äåñíèÿ ôàéë â áàéòà." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Ñúêðàòåí ðàçìåð íà ôàéëà â ëÿâî." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Ñúêðàòåí ðàçìåð íà ôàéëà â äÿñíî." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Äàòà íà ñúçäàâàíå íà ëÿâàòà ñòðàíà." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Äàòà íà ñúçäàâàíå íà äÿñíàòà ñòðàíà." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Ïîêàçâà êîÿ ñòðàíà èìà ïî-íîâà äàòà íà ïðîìÿíà." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Âåðñèÿ íà ôàéëà îò ëÿâî, ñàìî çà ôàéëîâå îò åäíàêúâ òèï." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Âåðñèÿ íà ôàéëà îò äÿñíî, ñàìî çà ôàéëîâå îò åäíàêúâ òèï." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Êðàòêè ðåçóëòàòè íà ñðàâíÿâàíå." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Àòðèáóòè íà ëÿâàòà ñòðàíà." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Àòðèáóòè íà äÿñíàòà ñòðàíà." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "EOL òèï íà ëåâèÿ ôàéë" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "EOL òèï íà äåñíèÿ ôàéë" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Êîäèðîâêà íà ëÿâàòà ñòðàíà." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Êîäèðîâêà íà äÿñíàòà ñòðàíà." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Áðîé íà èãíîðèðàíèòå ðàçëèêè âúâ ôàéë. Òåçè ðàçëèêè ñà èãíîðèðàíè îò WinMerge è íå ìîãàò äà áúäàò ñìåñåíè." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Áðîé íà ðàçëè÷èÿòà âúâ ôàéë. Òîçè áðîé íå âêëþ÷âà èãíîðèðàíèòå ðàçëèêè." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ïîêàæè çâåçäè÷êà (*), àêî ôàéëúò å äâîè÷åí." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Ñðàâíÿâàíå íà %1 ñ %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Ñïèñúê, ðàçäåëåí ñúñ çàïåòàÿ" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Ñïèñúê, ðàçäåëåí ñ òàáóëàöèÿ" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "×èñò HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "×èñò XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Ôàéëúò ñ îò÷åòà âå÷å ñúùåñòâóâà. Èñêàòå ëè äà çàìåíèòå ñúùåñòâóâàùèÿ ôàéë?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4339,32 +4421,32 @@ msgstr "" "Ãðåøêà ïðè ñúçäàâàíå íà îò÷åòà:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Îò÷åòúò áåøå ñúçäàäåí óñïåøíî." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Åäíàêâè ôàéëîâå ñà îòâîðåíè â äâàòà ïàíåëà." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Èçáðàíèòå ôàéëîâå ñà åäíàêâè." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Ïîëó÷è ñå ãðåøêà ïðè ñðàâíÿâàíå íà ôàéëîâåòå." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Íå ìîæå äà ñå ñúçäàäàò âðåìåííè ôàéëîâå. Ïðîâåðåòå íàñòðîéêèòå çà âðåìåííè ôàéëîâå." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4379,22 +4461,22 @@ msgstr "" "\n" "Áåëåæêà: Àêî èñêàòå äà ñ÷èòàòå âñè÷êè âúðíàòè òèïîâå êàòî åäíàêâè, çàäàéòå îïöèÿòà 'Èãíîðèðàé ðàçëè÷íèòå âúðíàòè òèïîâå..' â ðàçäåëà Ñðàâíÿâàíå îò ïðîçîðåöà ñ íàñòðîéêèòå (íàìèðà ñå îò Ðåäàêòèðàíå/Íàñòðîéêè)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Èçáðàíàòà ïàïêà å íåâàëèäíà." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Íå ìîæå äà ñå îòâîðè äâîè÷åí ôàéë ñ ðåäàêòîð." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "Ïàïêàòà ñúùåñòâóâà ñàìî â äðóãàòà ñòðàíà è íå ìîæå äà ñå îòâîðè.\n\nÈñêàò ëè äà ñúçäàäåòå ñúîòâåòñòâàùè ïàïêè:\n%1\nâ äðóãàòà ñòðàíà è äà ãè îòâîðèòå?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4405,152 +4487,152 @@ msgstr "" "Ïîêàçâàíåòî íà âñåêè ôàéë ñ íåãîâàòà êîäèðîâêà ùå äàäå ïî-äîáðà âèäèìîñò, íî ñðàâíÿâàíåòî èëè êîïèðàíåòî ùå å îïàñíî.\n" "Èñêàòå ëè ôàéëîâåòå äà ñå îáðàáîòâàò, èçïîëçâàéêè çàäàäåíàòà êîäèðîâêà íà Windows (ïðåïîðú÷èòåëíî)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Çàãóáà íà èíôîðìàöèÿ, ïîðàäè ãðåøêà â êîäèðîâêàòà íà: äâàòà ôàéëà" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Áåç ðàçëèêè" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Ðàçëèêè â ðåäîâåòå" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Çàìåíåíè %1 íèç(à)." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Íå ìîæå äà ñå íàìåðè íèçà \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Ìåñòîïîëîæåíèå" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Ðàçëèêè" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Ïà÷úò å ãîòîâ." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. îáåêòà íå å íàìåðåí èëè å äèðåêòîðèÿ!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. îáåêòà íå å íàìåðåí èëè å äèðåêòîðèÿ!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Ïà÷à âå÷å ñúùåñòâóâà. Ùå ãî ïðåçàïèøåòå ëè?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 èçáðàíè ôàéëîâå]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Íîðìàëåí" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Êîíòåêñò" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Óíèôèöèðàí" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Íå ìîæå äà ñå çàïèøå âúðõó %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Çàäàäåíèÿò ïúò íå å ïúëåí ïúò: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Çàäàéòå èçõîäåí ôàéë" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Íå ìîæå äà ñå ñúçäàäå ïà÷ îò äâîè÷íè ôàéëîâå." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Íå ìîæå äà ñå ñúçäàäå ïà÷ îò äèðåêòîðèè." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4561,12 +4643,12 @@ msgstr "" "\n" "Ñúçäàâàíåòî íà ïà÷ èçèñêâà äà íÿìà íåçàïèñàíè ïðîìåíè âúâ ôàéëîâåòå." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Ïàïêàòà íå ñúùåñòâóâà." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4577,37 +4659,37 @@ msgstr "" "Íå ñà íàìåðåíè íåîáõîäèìèòå êîìïîíåíòè (7-zip è/èëè Merge7z*.dll) çà ïîääðúæêàòà íà àðõèâè.\n" "Ïîãëåäíåòå ðúêîâîäñòâîòî çà ïîâå÷å èíôîðìàöèÿ îòíîñíî ïîääðúæêàòà íà àðõèâè è êàê äà ÿ âêëþ÷èòå." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Èçáåðåòå ôàéë çà åêñïîðò" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Èçáåðåòå ôàéë çà èìïîðò" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Íàñòðîéêèòå ñà èìïîðòèðàíè îò ôàéë." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Íàñòðîéêèòå ñà åêñïîðòèðàíè âúâ ôàéë." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Íå ìîæå äà ñå èìïîðòèðàò íàñòðîéêèòå îò ôàéë." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Íå ìîæå äà ñå åêñïîðòèðàò íàñòðîéêèòå âúâ ôàéë." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4618,247 +4700,247 @@ msgstr "" "\n" "Èñêàòå ëè äà ïðîäúëæèòå?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Ñìåñåí" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Çàäàäåíèÿ ðàçàðõèâàòîð ùå ñå ïðèëîæè è çà äâàòà ôàéëà (íåîáõîäèìî å ðàçøèðåíèå ñàìî íà åäèíèÿ ôàéë)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Íÿìà ïðåäâàðèòåëíè ðàçëè÷èÿ (íîðìàëåí)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Ïðåäëîæåíà äîáàâêà" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Äðóãè äîáàâêè" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Âúòðåøåí áèëä: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Íàñòðîéêè íà äîáàâêèòå" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH íå å íàìåðåí - .sct ñêðèïòîâåòå ñà çàáðàíåíè" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "<Íÿìà>" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "<Àâòîìàòè÷íî>" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "Îòèäè íà ðåä %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Çàáðàíåí" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Îò ôàéëîâàòà ñèñòåìà" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Îò MRU ñïèñúê" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Ðåñóðñè" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po index 3e2b0ca19..b583a576b 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -77,7 +77,7 @@ msgid "Cu&t" msgstr "&Retalla" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "C&opia" @@ -88,7 +88,7 @@ msgid "&Paste" msgstr "Engan&xa" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&Vés a..." @@ -99,22 +99,25 @@ msgid "Op&en" msgstr "O&bre" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "amb l'&aplicació registrada" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "amb l'&editor extern" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "a&mb..." @@ -152,7 +155,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "" @@ -164,8 +167,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Cap" @@ -182,49 +185,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Fitxer" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Nou\tControl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Obre...\tControl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "" #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Obre un &projecte...\tControl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Desa el P&rojecte..." @@ -236,274 +239,274 @@ msgstr "Projectes re¢s" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Buit >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "&Surt" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "E&dita" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "O&pcions..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Visualització" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "Barra d'ei&nes" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Petita" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Gran" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "Barra d'est&at" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Barra de ta&bulacions" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Eines" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filtres..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Genera un pedaç..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Connectors" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "Desempaquetament &manual" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "Desempaquetament &automàtic" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Recarrega els connectors" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "Fi&nestra" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Tanca" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "T&anca-ho tot" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Canvia de &subfinestra\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Finestres en mosaic &horitzontal" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Finestres en mosaic &vertical" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "Finestres en &cascada" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Ajuda" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&Quant al WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Fes l'es&querra només de lectura" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Fes la dre&ta només de lectura" @@ -514,7 +517,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Selecciona-ho &tot\tControl+A" @@ -536,2592 +539,2652 @@ msgstr "Mostra els elements #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostra els elements únics de la &dreta" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Mostra els elements &omesos" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Mostra els fitxers &binaris" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Mostra els elements ama&gats" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "&Tipus de lletra..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Empra el tipus de lletra del &sistema" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Estadístiques de &comparació" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "Actualit&za\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Actualitza &seleccionats\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "Co&mbinació" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "&Compara\tRetorn" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Propera diferència\tAlt+Avall" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Diferència a&nterior\tAlt+Amunt" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Pri&mera diferència\tAlt+Inici" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Diferència &actual\tAlt+Retorn" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Da&rrera diferència\tAlt+Fi" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copia a la &dreta\tAlt+Dreta" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copia a l'&esquerra\tAlt+Esquerra" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "S&uprimeix\tSupr" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Personalitza les columnes..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Gene&ra un informe..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Desa\tControl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Desa l'&Esquerra" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Desa la D&reta" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Imprimeix..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Configuració de la pàgina" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "&Visualització prèvia de la impressió" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Converteix retorns de línia a" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "&Mode de combinació\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Desfés\tControl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Re&fés\tControl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Retalla\tControl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "C&opia\tControl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "Engan&xa\tControl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Selecciona &la diferència a la línia\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Cerca...\tControl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Subst&itueix...\tControl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "&Avançat" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copia amb els números de línia\tControl+Maj+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&Punts d'interès" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Activa/desactiva el punt d'interès\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Següent punt d'interès\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Punt d'interès previ\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Esborra tots els punts d'interès" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Vés a...\tControl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Ressaltat de sintaxi" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "Mostra els es&pais" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Mostra les &diferències de la línia" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Mostra els &números de línia" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Mostra els &marges" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "A&justa les línies" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "&Intercanvia les subfinestres" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Subfinest&ra de diferències" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Subfinestra d'&ubicació" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Copia a la dreta i a&vança\tAlt+Control+Dreta" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copia a l'esquerra i avan&ça\tAlt+Control+Esquerra" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Copia-ho &tot a la dreta" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Copia-ho t&ot a l'esquerra" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Prediferenciació" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Seqüències d'ordres" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Compa&ra" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "D'&esquerra a dreta" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "D'e&squerra a..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "De &dreta a esquerra" +msgid "Left to Right (%1 of %2)" +msgstr "Esquerra a dreta (%1 de %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "De d&reta a..." +msgid "Left to... (%1 of %2)" +msgstr "Esquerra a... (%1 de %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Mou" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "D'&esquerra a..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "De &dreta a..." +msgid "Right to Left (%1 of %2)" +msgstr "Dreta a esquerra (%1 de %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Dreta a... (%1 de %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Mou" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Suprimeix" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "De l'&esquerra" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "De la &dreta" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "D'&ambdós costats" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Canvia el &nom" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Amaga els elements" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "Obre l'&esquerra" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Obre la &dreta" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "C&opia els camins" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "L'&esquerra (%1 de %2)" +msgid "Left (%1 of %2)" +msgstr "Esquerra (%1 de %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "La &dreta (%1 de %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Dreta (%1 de %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Ambdós (%1 de %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Ambdós costats (%1 de %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Co&pia els noms" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "Co&mprimeix" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "L'&esquerra... (%1 de %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "La &dreta... (%1 de %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Ambdós costats... (%1 de %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "Di&ferències... (%1 de %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "Actualit&za" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Copia el camí sencer al fitxer" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Copia el nom del &fitxer" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Ajustos de prediferenciació" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Sense prediferenciació" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Prediferenciació &automàtica" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Vé&s a la diferència" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "Blocs &no moguts" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Tots el blocs moguts" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Blocs moguts per a la &diferència actual" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "Espais" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Co&mpara'ls" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "&Ignora'n els canvis" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "I&gnora'ls tots" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "&Distingeix entre majúscules i minúscules" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Tot el contingut" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Contingut en un cop d'ull" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Data de modificació" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Data de modificació i mida" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Mida" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Quant al WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Muntatge privat)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visiteu la plana web del WinMerge!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "D'acord" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Col·laboradors" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Tria de fitxers o directoris..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Navega..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "N&avega..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "&Tria..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "Desem&paquetador:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "T&ria..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Inclou-hi les subcarpetes" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Estat:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Cancel·la" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Ajuda" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Fitxers o directoris a comparar" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "&Base de dades:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "&Projecte:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "&Usuari:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "&Contrasenya:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "En&llaça amb el projecte de destinació del VSS" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Aplica a &tots els elements" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "&Extreu (check-out)" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "&Anomena i desa..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Sistema de control de versions" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "Sistema de control de &versions" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Camí al cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "&Desplaça automàticament fins a la primera diferència" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "T&anca les finestres amb ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Verifica els camí automàticament al diàleg d'Obrir" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "&Permet d'executar només una instància" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Autocompletar al diàleg d'obrir:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "El WinMerge permet ocultar alguns quadres de missatges comuns. Premeu el botó de Reinicialització per a fer visibles tots els quadres de missatges altre cop." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Reinicialitza" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Cerca" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "&Cerca:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "N&omés paraules senceres" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "&Distingeix entre majúscules i minúscules" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "&Expressió regular" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "No facis la &volta al final del fitxer" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Següent" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&D'acord" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Substitueix" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Substitueix-ho p&er:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "No facis la &volta al final del fitxer" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Substitueix a" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&Selecció" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "&Fitxer sencer" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "S&ubstitueix-ho" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Su&bstitueix-ho tot" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "&Extreu (check-out)" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Comentaris" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Reintegra (check-in) després d'extreure (check-out)" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Filtres de línia" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Habilita els filtres de línia" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Expressions ®ulars (una per línia):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Nova" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Edita" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Suprimeix" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Diferència:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Diferència seleccionada:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Fons" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Línia absent" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Diferència ignorada:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Text mogut:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Text mogut seleccionat:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Paraula diferent:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Paraula diferent seleccionada:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Predeterminats" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Desa els fitxers suprimits a la Paperera de reciclatge" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&Editor extern:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Filtre de carpeta:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Generador de pedaços" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Fitxer &1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Fitxer &2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "Inter&canvia" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "A&fegeix al final del fitxer existent" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Resultat:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "N&avega..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "Format" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "E&stil:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ign&ora les línies en blanc" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Inc&lou-hi la línia de comandes" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Obre-ho en un &editor extern" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Visualització de columnes" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Tria el desempaquetador" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "&Desempaquetador de fitxer:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "&Visualitza tots els desempaquetadors sense verificar l'extensió" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "&Llistat d'extensions:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "&Descripció:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "&Atura" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Comparant elements..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Elements comparats:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Elements totals:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Anar" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "&Anar a:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Fitxer" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Anar a on" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "&Línia" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Diferència" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Vés-hi" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Comparació" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Espais en blanc" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "Compara els &espais" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "Ignora els &canvis en els espais" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Ignora t&ots els espais" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "&Ignora les línies en blanc" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Ignora &majúscules/minúscules" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "&Habilita detecció de blocs desplaçats" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "Em&parella les línies similars" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "&Filtra els comentaris" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&Ressalta la sintaxi" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "Re-explora &automàticament" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&Preserva els caracters de salt de línia originals" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabulacions" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Mida de les tabulacions:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "&Insereix tabulacions" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "In&sereix espais" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Acoloriment de diferència de línia" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "&Veure les diferències de la línia" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "Nivell de &caràcter" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "Nivell de ¶ula:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Filtres de fitxer" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "&Prova" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "&Instal·la..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "&Nou..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "&Edita..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "&Suprimeix..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Voleu desar els fitxers modificats?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Fitxer del costat esquerre" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Desa-hi els canvis" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "D&escarta'n els canvis" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Fitxer del costat dret" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "De&sa-hi els canvis" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Des&carta'n els canvis" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Pàgina de codis" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Pàgina de codis predeterminada" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecciona la pàgina de codis predeterminada assumida en carregar fitxers no-Unicode:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Pàgina de codis del sistema" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "En funció de l'idioma de l'interfície d'usuari del WinMerge" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Opcions" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importa..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Exporta..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Diàleg" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Paraules clau:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Noms de funció:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Comentaris:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Nombres:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operadors:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Cadenes:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Preprocessador:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Usuari 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Usuari 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Negreta" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Informe de comparació de directoris" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "&Fitxer d'informe:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "N&avega..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Estil:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Copia al Porta-retalls" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Filtre compartit o privat" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Quina mena de filtre voleu crear?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtre compartit (per a tots els usuaris d'aquesta màquina)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtre privat (només per a l'usuari actual)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Suport d'arxivament" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Habilita el suport de fitxers d'arxivament" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detecta el tipus d'arxiu a partir de la signatura del fitxer" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Estadístiques de comparació" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Carpetes:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Fitxers:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Diferents" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binaris:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Únics" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Esquerra:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Dreta:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Idèntics" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Tanca" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Afectament" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Afecta)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Selecciona pàgina de codis per a" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&Càrrega de fitxers:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "&Desament de fitxers:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&Empra la mateixa pàgina de codis a ambdós" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Aplica" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Cancel·la" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Prova de filtre" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Provant el filtre ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Entreu el text a provar:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Nom de la carpeta" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Resultat:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Prova" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Tanca" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&Usa colors de text personalitzats" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Color de text personalitzat" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Espais:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Text regular:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Selecció:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Camins" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Esquerra:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Només de &lectura" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Dreta:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Només de l&ectura" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filtre:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "&Obre..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "De&sa..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Fitxers de còpia de seguretat" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Crea els fitxers de còpia de seguretat en:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Comparació de &carpetes" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Comparació de &fitxers" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Crea els fitxers de còpia de seguretat a:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "Carpeta del fitxer &original" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "Carpeta de còpia de seguretat &global:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Nom de fitxer de còpia de seguretat:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&Afegeix l'extensió .bak" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "A&fegeix una marca horària" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Confirmació de còpia" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Esteu segur que voleu copiar XXX elements?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "D'esquerra" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "A dreta" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Sí" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Habilita el &menú avançat" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Directori" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "&Atura després de la primera diferència" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignora diferències en l'&hora inferiors a 3 segons" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binari" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "040304e4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x403, 1252" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "S'ha produït un error desconegut en intentar obrir un fitxer de projecte" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "S'ha produït un error desconegut en intentar desar un fitxer de projecte" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Fitxer de projecte" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "El fitxer de projecte s'ha carregat amb èxit." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "El fitxer de projecte s'ha desat amb èxit." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Avorta" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Reintenta" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Ignora" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Ignora-ho &tot" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Sí" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Sí a &tot" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "No a t&ot" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Continua" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Omet" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Omet-ho &tot" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "No tornis amostrar aquest missatge." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "No tornis a preguntar-ho." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Control de versions" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Diferències" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "A:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "D'esquerra:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "A esquerra:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "De dreta:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "A dreta:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Versió %1 - Català" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Opcions (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Tots el quadres de missatges es mostraran altre cop." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3132,84 +3195,84 @@ msgstr "" "\n" "Useu valors entre 1 i %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Obre" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programes|*.exe;*.bat;*.cmd|Tots els fitxers (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Tots els fitxers (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Fitxers de projecte del WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Fitxers d'options de configuració (*.ini)|*.ini|Tots els fitxers (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Fitxers de text (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Fitxers HTML (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fitxers XML (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Nom" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Ubicació" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filtres" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Descripció" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Selecciona un nom de fitxer per al nou filtre" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtres de fitxer (*.flt)|*.flt|Tots els fitxers (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3222,7 +3285,7 @@ msgstr "" "Copieu el fitxer %1 a la carpeta WinMerge/Filters:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3235,7 +3298,7 @@ msgstr "" "\n" "Verifiqueu que la carpeta existeix i s'hi pot escriure." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3246,7 +3309,7 @@ msgstr "" "\n" "Seleccioneu la carpeta de filtres a opcions/sistema." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3259,12 +3322,12 @@ msgstr "" "\n" "Potser el fitxer és només de lectura?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Localitza el fitxer de filtre a instal·lar" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3275,188 +3338,188 @@ msgstr "" "\n" "No s'ha pogut copiar el nou fitxer de filtre a la carpeta de filtres." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "El fitxer de filtre ja existeix. Voleu sobreescriure el filtre existent?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Expressió regular" -#: Merge.rc:2151 +#: Merge.rc:2172 #, 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:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Resultats de la comparació dels directoris" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Comparació de fitxers" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Fitxer esquerre sense títol" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Fitxer dret sense títol" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Línia: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Combina" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Diferència %1 de %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "S'han trobat %1 diferènces" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "S'ha trobat una diferència" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Element %1 de %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Elements: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecciona dos directoris o fitxers existents per a comparar" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Selecció de directori" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecciona dos directoris o dos fitxers per a comparar." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "El camí de l'esquerra és invalid!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "El camí de la dreta és invalid!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Ambdós camins són invalids!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Tria dos fitxers per a habilitar la selecció del desempaquetador." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "No es pot comparar un fitxer i un directori!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "El fitxer no s'ha trobat: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "El fitxer no s'ha desempaquetat: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3469,37 +3532,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Anomena i desa" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Voleu desar els canvis a %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "El fitxer %1 està marcat com a només de lectua. Voldríeu substituir el fitxer només de lectura? (No es tracta de desar amb un nom nou.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Hi ha hagut un error en crear una còpia de seguretat del fitxer" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3512,7 +3575,7 @@ msgstr "" "\n" "Voleu continuar tot i així?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3529,7 +3592,7 @@ msgstr "" "\t-desar-lo amb un nom diferent (premeu D'acord)\n" "\t-avortar l'operació actual (Premeu Cancel·lar)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3544,7 +3607,7 @@ msgstr "" "\n" "Voleu desar la versió desempaquetada en un altre fitxer?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3559,7 +3622,7 @@ msgstr "" "\n" "Voleu desar la versió desempaquetada en un altre fitxer?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3574,7 +3637,7 @@ msgstr "" "\n" "Voleu sobreescriure el fitxer?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3583,32 +3646,32 @@ msgstr "" "%1\n" "està marcat com a només de lectura. Voleu substituir l'element només de lectura?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, 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:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Anomena i desa el fitxer de l'esquerra" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Anomena i desa el fitxer de la dreta" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3619,42 +3682,42 @@ msgstr "" "\n" "Cal que refresqueu els documents abans de continuar." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Cal que especifiqueu el camí a un projecte del SourceSafe per tal de continuar (p.ex.: $/ElMeuProjecte)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Extreu (check-out) fitxers del VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "El sistema de control de versions ha retornat un error en extreure (check-out) el fitxer. No es pot continuar..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "S'ha produït un error en executar una ordre del sistema de control de versions." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "La carpeta de treball del VSS i la ubicació del fitxer actual no concorden. Voleu continuar?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "No s'han trobat cap base de dades del VSS!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Error del VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3665,7 +3728,7 @@ msgstr "" "Reviseu les especificacions de configuració de la vista emprada.\n" "Voleu desfer la operació d'extracció (check-out)?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3674,127 +3737,146 @@ msgstr "" "El sistema de control de versions ha retornat un error en intentar desfer l'extracció (check-out) del fitxer.\n" "Reviseu les especificacions de configuració de la vista emprada." -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Cap" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (anterior al 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 i posterior)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Separa a l'espai" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Separa a l'espai o puntuació" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Dreta a esquerra (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Esquerra a dreta (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Dreta a esquerra (%1 de %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Esquerra a dreta (%1 de %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Esquerra a dreta (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Esquerra a... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Dreta a... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Esquerra a... (%1 de %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Dreta a... (%1 de %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Esquerra (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Dreta (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Ambdós (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Esquerra (%1 de %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Dreta (%1 de %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Ambdós (%1 de %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Costat esquerre - seleccioneu la carpeta de destinació:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Costat dret - seleccioneu la carpeta de destinació:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 fitxers afectats)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 fitxers afectats)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3805,17 +3887,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Esteu segur que voleu copiar:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Esteu segur que voleu copiar %d elements:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3834,502 +3916,502 @@ msgstr "" "\n" "Actualitzeu la comparació." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "No s'ha pogut executar l'editor extern: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "El format de l'arxiu és desconegut" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Nom" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Resultat de la comparació" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Data esquerra" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Data dreta" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Extensió" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Mida esquerra" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Mida dreta" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Mida dreta (breu)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Mida esquerra (breu)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Data de creació esquerra" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Data de creació dreta" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Fitxer més nou" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Versió del fitxer esquerra" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Versió del fitxer dreta" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Resultat breu" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Atributs esquerra" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Atributs dreta" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Salt de línia esquerra" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Salt de línia dreta" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Codificació esquerra" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Codificació dreta" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Diferències ignorades" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "No es pot comparar els fitxers" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Element avortat" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Fitxer omès" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Directori omès" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Només esquerra: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Només dreta: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Els fitxers binaris són idèntics" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Els fitxers binaris són diferents" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Els fitxers són diferents" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Només l'esquerre" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Només el dret" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Temps transcorregut: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 element seleccionat" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 elements seleccionats" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Nom del fitxer o directori." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nom del subdirectori quan s'incloguin els subdirectoris." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Resultat de la comparació, en forma llarga." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Data de modificació del costat esquerre." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Data de modificació del costat dret." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Extensió del fitxer." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Mida en bytes del fitxer esquerre." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Mida en bytes del fitxer dret." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Mida del fitxer esquerre en format abreujat." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Mida del fitxer dret en format abreujat." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Data de creació del fitxer esquerre." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Data de creació del fitxer dret." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Diu quin costat te una data de modificació més recent." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versió del fitxer del costat esquerre, només per a alguns tipus de fitxer." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versió del fitxer del costat dret. només per a alguns tipus de fitxer." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Resultat breu de la comparació." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Atributs del costat esquerre." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Atributs del costat dret." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Tipus de salt de línia del fitxer del costat esquerre" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Tipus de salt de línia del fitxer del costat dret" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Codificació del costat esquerre." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Codificació del costat dret." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Nombre de diferències ignorades al fitxer. Aquestes diferències són ignorades pel WinMerge i no es poden combinar." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Nombre de diferències al fitxer. Aquest nombre no inclou les diferències ignorades.." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostra un asterisc (*) si el fitxer és binari." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Compara %1 amb %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Llista delimitada per comes" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Llista delimitada per tabulacions" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "HTML símple" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "XML símple" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "El fitxer d'informe ja existeix. Voleu sobreescriure'l?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4338,32 +4420,32 @@ msgstr "" "Hi ha hagut un error creant l'informe:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "L'informe s'ha creat satisfactòriament." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "El mateix fitxer és obert a ambdues subfinestres." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Els fitxers seleccionats són idèntics." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "S'ha produït un error en comparar els fitxers." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "No s'han pogut obrir els fitxers temporals. Comproveu els ajustos de camí temporal." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4378,22 +4460,22 @@ msgstr "" "\n" "Nota: Si voleu tractar els salts de línia sempre com a equivalents, especifiqueu l'opció 'Ignora diferències de salt de línia...' al quadre d'opcions (disponible des del menú Edita/Opcions...)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "La carpeta seleccionada és invàlida." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "No es poden obrir fitxers binaris a l'editor." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4404,152 +4486,152 @@ msgstr "" "En mostrar cada fitxer en la seva pròpia pàgina de codis millora la seva visualització però fa perillosa la combinació/còpia.\n" "Voleu tractar ambdós fitxers com si fossin en la pàgina de codis predeterminada del Windows (recomanat)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "S'ha perdut informació degut a errors de codificació: ambdós fitxers" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Sense diferències" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Diferència de línia" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "S'ha(n) substituït %1 cadena(s)." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "No s'ha trobat la cadena \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Subfinestra d'ubicació" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Subfinestra de diferències" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "El pedaç s'ha generat satisfactòriament." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. no s'ha trobat l'element o aquest és un directori!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. no s'ha trobat l'element o aquest és un directori!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "El fitxer de pedaç ja existeix. El voleu sobreescriure?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 fitxers seleccionats]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Unificat" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "No s'ha pogut escriure al fitxer %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "El camí de sortida especificat no és un camí absolut: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Especifiqueu un fitxer de sortida" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "No es pot crear un pedaç de fitxers binaris." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "No es pot crear un pedaç de directoris." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4560,12 +4642,12 @@ msgstr "" "\n" "Cal que no hi hagi cap fitxer pendent de salvar per tal de crear un pedaç." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "La carpeta no existeix." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4576,37 +4658,37 @@ msgstr "" "Els components necessaris (7-zip i/o Merge7z*.dll) per al suport d'arxivament no s'han pogut trobar.\n" "Vegeu el manual per a més informació quan al suport per a arxivament i com habilitar-lo." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Trieu el fitxer per a exportar" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Trieu el fitxer per a importar" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "S'ha importat les opcions des del fitxer." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "S'ha exportat les opcions al fitxer." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "No s'ha pogut importar les opcions del fitxer." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "No s'ha pogut escriure les opcions al fitxer." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4614,247 +4696,247 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Barrejat" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "El desempaquetador adaptat s'aplica a ambdós fitxers (només hi cal l'extensió en un fitxer)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "No prediferencia (normal)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Connectors suggerits" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Altres connectors" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Muntatge privat: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Ajustos del connector" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "No s'ha trobat el WSH - seqüències d'ordres .sct inhabilitades" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "Va fins a la línia %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Inhabilitat" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Des del sistema de fitxers" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Des de la llista de recents" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po index 283ff4974..58f2588fd 100644 --- a/Translations/WinMerge/ChineseSimplified.po +++ b/Translations/WinMerge/ChineseSimplified.po @@ -78,7 +78,7 @@ msgid "Cu&t" msgstr "¼ôÇÐ(&T)" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "¸´ÖÆ(&C)" @@ -89,7 +89,7 @@ msgid "&Paste" msgstr "Õ³Ìù(&P)" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "תµ½(&G)..." @@ -100,22 +100,25 @@ msgid "Op&en" msgstr "´ò¿ª(&E)" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "ÓÃĬÈϳÌÐò(&R)" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "ÓÃÍⲿ±à¼­Æ÷(&E)" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "Ñ¡Ôñ³ÌÐò(&W)..." @@ -153,7 +156,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "Ëõ·Å(&Z)" @@ -165,8 +168,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "ÎÞ(&N)" @@ -183,49 +186,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "Îļþ(&F)" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "н¨(&N)\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "´ò¿ª(&O)...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "´ò¿ª³åÍ»Îļþ(&E)..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "´ò¿ª¹¤³Ì(J)...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "±£´æ¹¤³Ì(&V)..." @@ -237,274 +240,274 @@ msgstr " #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< ¿Õ >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "Í˳ö(&X)" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "±à¼­(&E)" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "Ñ¡Ïî(&O)..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "ÊÓͼ(&V)" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "¹¤¾ßÀ¸(&T)" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "С(&S)" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "´ó(&B)" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "״̬À¸(&S)" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "±êÇ©À¸(&B)" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "¹¤¾ß(&T)" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "¹ýÂËÆ÷(&F)..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "Éú³É²¹¶¡(&G)..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "²å¼þ(&P)" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "ÊÖ¶¯½â°ü(&M)" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "×Ô¶¯½â°ü(&A)" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "ÖØÐÂ×°Èë²å¼þ(&R)" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "´°¿Ú(&W)" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "¹Ø±Õ(&O)" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "È«²¿¹Ø±Õ(&S)" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Çл»´°¸ñ(&P)\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "ˮƽƽÆÌ(&H)" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "´¹Ö±Æ½ÆÌ(&V)" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "²ãµþ(&C)" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "°ïÖú(&H)" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge°ïÖú\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "ÅäÖÃ(&O)" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "¹ØÓÚ WinMerge(&A)..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "×ó²àÖ»¶Á(&E)" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "ÓÒ²àÖ»¶Á(&G)" @@ -515,7 +518,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Ñ¡ÔñËùÓÐ(&A)\tCtrl+A" @@ -537,2592 +540,2652 @@ msgstr " #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "ÏÔʾֻÔÚÓÒ²àµÄÏîÄ¿(&G)" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "ÏÔʾÌø¹ýµÄÏîÄ¿(&K)" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "ÏÔʾ¶þ½øÖÆÎļþ(&H)" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "ÏÔʾÒþ²ØµÄÏîÄ¿(&E)" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Ñ¡Ôñ×ÖÌå(&F)..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "ʹÓÃĬÈÏ×ÖÌå(&O)" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "¶Ô±È½á¹ûͳ¼Æ(&R)" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "Ë¢ÐÂ(&S)\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Ë¢ÐÂÑ¡ÖÐÏî(&R)\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "ºÏ²¢(&M)" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "¶Ô±È(&M)\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "ÏÂÒ»´¦²»Í¬(&N)\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "ÉÏÒ»´¦²»Í¬(&P)\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "µÚÒ»´¦²»Í¬(&F)\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "µ±Ç°²»Í¬(&C)\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "×îºóÒ»´¦²»Í¬(&L)\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "¸´ÖƵ½ÓÒ²à(&R)\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "¸´ÖƵ½×ó²à(&E)\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "ɾ³ý(&D)\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "Ñ¡ÔñÁÐ(&C)..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Éú³É±¨¸æ(&R)..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "±£´æ(&S)\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "±£´æ×ó²à(&L)" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "±£´æÓÒ²à(&R)" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "´òÓ¡(&P)..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Ò³ÃæÉèÖÃ(&T)" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "´òÓ¡Ô¤ÀÀ(&W)" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "½«Ðзָô·ûת»»Îª(&C)" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "ºÏ²¢Ä£Ê½(&M)\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "Îļþ±àÂë(&F)..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "³·Ïú(&U)\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Öظ´(&R)\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "¼ôÇÐ(&T)\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "¸´ÖÆ(&C)\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "Õ³Ìù(&P)\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Ñ¡ÖÐÐÐÄÚ²»Í¬(&D)\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "²éÕÒ(&I)...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Ìæ»»(&C)...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "¸ß¼¶" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "´øÐкŸ´ÖÆ(&C)\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "ÊéÇ©(&B)" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "ÉèÖÃ/È¡Ïû(&T)\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "ÏÂÒ»¸ö(&N)\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "ÉÏÒ»¸ö(&P)\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "Çå³ýËùÓÐ(&C)" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "תµ½(&G)...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "·Å´ó(&I)\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "ËõС(&O)\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "Õý³£´óС(&N)\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Óï·¨¸ßÁÁ" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "Ëø¶¨´°¸ñ(&L)" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "ÏÔʾ¿Õ°×ºÍÖƱí·û(&V)" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "ÏÔʾÐÐÄÚ²»Í¬(&W)" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "ÏÔʾÐкÅ(&N)" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "ÏÔʾҳ±ß(&M)" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "×Ô¶¯»»ÐÐ(&R)" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "½»»»×óÓÒ´°¸ñ(&A)" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "¶Ô±È´°¸ñ(&P)" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "λÖô°¸ñ(&C)" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "¸´ÖƵ½ÓҲಢǰ½ø\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "¸´ÖƵ½×ó²à²¢Ç°½ø\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "È«²¿¸´ÖƵ½ÓÒ²à(&A)" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "È«²¿¸´ÖƵ½×ó²à(&Y)" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "Ô¤¶Ô±È(&P)" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "½Å±¾(&S)" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "¶Ô±È(&A)" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "´Ó×óµ½ÓÒ(&L)" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "´Ó×óµ½(&E)..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "´ÓÓÒµ½×ó(&R)" +msgid "Left to Right (%1 of %2)" +msgstr "×ó²àµ½ÓÒ²à (%1 ¹²%2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "´ÓÓÒµ½(&I)..." +msgid "Left to... (%1 of %2)" +msgstr "×ó²àµ½... (%1 ¹²%2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "Òƶ¯(&M)" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "´Ó×óµ½(&L)..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "´ÓÓÒµ½(&R)..." +msgid "Right to Left (%1 of %2)" +msgstr "ÓҲൽ×ó²à (%1 ¹²%2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "ÓҲൽ... (%1 ¹²%2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "Òƶ¯(&M)" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "ɾ³ý(&D)" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "×ó²à(&L)" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "ÓÒ²à(&R)" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "Á½²à(&B)" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "¸ÄÃû(&N)" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "Òþ²Ø(&H)" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "´ò¿ª×ó²à(&O)" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "´ò¿ªÓÒ²à(&P)" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "¸´ÖÆÈ«Ãû(&Y)" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "×ó²à(&L)(%1¸ö ¹²%2¸ö)" +msgid "Left (%1 of %2)" +msgstr "×ó²à (%1 ¹²%2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "ÓÒ²à(&R)(%1¸ö ¹²%2¸ö)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "ÓÒ²à (%1 ¹²%2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Á½²à (%1 ¹²%2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "Á½²à(&B)(%1¸ö ¹²%2¸ö)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "¸´ÖÆÎļþÃû(&F)" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "×ó²à(&L)...(%1¸ö ¹²%2¸ö)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "ÓÒ²à(&R)...(%1¸ö ¹²%2¸ö)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "Á½²à(&B)...(%1¸ö ¹²%2¸ö)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "Á½²à²»Í¬(&D)...(%1¸ö ¹²%2¸ö)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "Ë¢ÐÂ(&R)" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "¸´ÖÆÈ«Ãû(&C)" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "¸´ÖÆÎļþÃû(&F)" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Ô¤¶Ô±ÈÉèÖÃ" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "²»Ê¹ÓÃ(&N)" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "×Ô¶¯" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "תµ½²»Í¬(&O)" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "²»ÏÔʾÒƶ¯Çø¿é(&N)" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "ËùÓÐÒƶ¯Çø¿é(&A)" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "µ±Ç°²»Í¬´¦Òƶ¯Çø¿é(&C)" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "¿Õ°×(&H)" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "¶Ô±È(&P)" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "ºöÂԿհ׺ÍÖƱí·û¸ü¸Ä(G)" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "ºöÂÔËùÓпհ׺ÍÖƱí·û(&N)" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "Çø·Ö´óСд(&T)" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "ºöÂÔ»»Ðзû²îÒì(Windows/Unix/Mac)(&R)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "È«²¿ÄÚÈÝ" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "¿ìËÙÄÚÈÝ" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "ÐÞ¸ÄÈÕÆÚ" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "ÐÞ¸ÄÈÕÆÚºÍÎļþ´óС" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Îļþ´óС" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "¹ØÓÚ WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Private Build)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "·ÃÎÊ WinMerge Ê×Ò³!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "È·¶¨" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "¹±Ï×Õß" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Ñ¡ÔñÎļþ»òÎļþ¼Ð..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "ä¯ÀÀ(&B)..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "ä¯ÀÀ(&R)..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "ä¯ÀÀ(&O)..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Ñ¡Ôñ..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "½â°ü³ÌÐò(&U):" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "Ñ¡Ôñ(&S)..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "°üº¬×ÓĿ¼(&I)" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "״̬:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "È¡Ïû" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "°ïÖú" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Òª¶Ô±ÈµÄÎļþ»òÎļþ¼Ð" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Êý¾Ý¿â:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "¹¤³Ì:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Óû§Ãû:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "ÃÜÂë:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Á¬½Óµ½Ä¿±ê VSS ¹¤³Ì" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Ó¦ÓÃÓÚËùÓÐÏîÄ¿" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Ç©³ö" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Áí´æΪ..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "°æ±¾¿ØÖÆϵͳ" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "°æ±¾¿ØÖÆϵͳ(&V)" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe ·¾¶(&P):" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "³£¹æ" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "×Ô¶¯¹ö¶¯µ½µÚÒ»´¦²»Í¬(&S)" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "ESC¹Ø±Õ´°¿Ú(&O)" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "ÔÚ¡°´ò¿ª¡±¶Ô»°¿òÖÐ×Ô¶¯Ñé֤·¾¶(&A)" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Ö»ÔÊÐíÔËÐÐÒ»¸öʵÀý(&O)" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "µ±¹Ø±Õ¶à¸ö´°¿ÚʱѯÎÊÎÒ(&K)" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "¶Ô±Èʱ±£³ÖÎļþʱ¼ä²»±ä(&P)" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "¡°´ò¿ª¡±¶Ô»°¿ò×Ô¶¯Íê³É(&P):" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMergeÔÊÐíÒþ²ØһЩ³£¼ûµÄÌáʾÐÅÏ¢, µã»÷¡°ÖØÖá±°´Å¥¿ÉÒÔʹÒþ²ØµÄÐÅÏ¢ÐÂÏÔʾ." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "ÖØÖÃ" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "²éÕÒ" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "²éÕÒÄÚÈÝ(&N):" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "È«×ÖÆ¥Åä(&W)" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Çø·Ö´óСд(&C)" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "ʹÓÃÕýÔò±í´ïʽ(&E)" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "ÖÁÎļþĩβ²»ÔÙ´ÓÍ·ËÑË÷(&O)" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "ÕÒÏÂÒ»¸ö(&F)" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "È·¶¨(&O)" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Ìæ»»" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Ì滻Ϊ(&P):" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "ÖÁÎļþĩβ²»ÔÙ´ÓÍ·ËÑË÷(&D)" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Ìæ»»·¶Î§" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "Ñ¡ÖÐÄÚÈÝ(&S)" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "Õû¸öÎļþ(&O)" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "Ìæ»»(&R)" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "È«²¿Ìæ»»(&A)" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "µ÷ÊÔ" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "±¸×¢" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Ç©³öºóÁ¢¼´Ç©Èë" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "ÐйýÂËÆ÷" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "ºöÂÔ·ûºÏÏÂÁÐÑùʽµÄÐÐ" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "ÕýÔò±í´ïʽ (ÿÐÐÒ»¸ö):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "н¨" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "±à¼­" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "ɾ³ý" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "ÑÕÉ«" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "²»Í¬:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "ÒÑÑ¡Ôñ:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "±³¾°" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "ÒÑɾ³ý" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "ÎÄ×Ö" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "ÂÔ¹ýµÄ²»Í¬:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Òƶ¯Çø¿é:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Ñ¡ÖеÄÒƶ¯Çø¿é:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "µ¥´Ê²»Í¬:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Ñ¡Öеĵ¥´Ê²»Í¬:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "ĬÈÏ" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "ϵͳ" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "½«É¾³ýµÄÎļþÒÆÖÁ»ØÊÕÕ¾(&S)" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "Íⲿ±à¼­Æ÷(&E)" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "¹ýÂËÆ÷·¾¶(&F):" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "ÁÙʱÎļþ¼Ð" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "ϵͳÁÙʱÎļþ¼Ð(&Y)" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "×Ô¶¨ÒåÎļþ¼Ð(&U):" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "²¹¶¡Éú³ÉÆ÷" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Îļþ&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Îļþ&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "ÉÏϽ»»»(&S)" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "Ìí¼Óµ½ÒÑÓÐÎļþµÄĩβ(&A)" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "½á¹û(&R):" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "ä¯ÀÀ(&W)..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "¸ñʽ(&F)" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "Ñùʽ(&Y):" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "ÄÚÈÝ(&C):" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "ºöÂÔ¿ÕÐÐ(&E)" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "°üº¬ÃüÁîÐÐ(&D)" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "ÓÃÍⲿ±à¼­Æ÷´ò¿ª(&X)" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Ñ¡ÔñÏÔʾÁÐ" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "ÉÏÒÆ(&U)" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "ÏÂÒÆ(&D)" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Ñ¡Ôñ½â°ü³ÌÐò" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Îļþ½â°ü³ÌÐò:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "²»¼ì²éÀ©Õ¹Ãû£¬ÏÔʾËùÓнâ°ü³ÌÐò¡£" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "À©Õ¹Ãû:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "ÃèÊö:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Í£Ö¹" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "ÕýÔÚ¶Ô±È..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "ÒѶԱÈ:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "×ÜÊý:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "תµ½" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "תµ½(&O):" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Îļþ" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "תµ½Àà±ð" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "ÐÐ(&N)" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "²»Í¬´¦(&D)" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "תµ½(&G)" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "¶Ô±È" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "¿Õ°×" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "¶Ô±È¿Õ°×ºÍÖƱí·û(&C)" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "ºöÂԿհ׺ÍÖƱí·û¸ü¸Ä(&I)" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "ºöÂÔËùÓпհ׺ÍÖƱí·û(&G)" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "ºöÂÔ¿ÕÐÐ(&K)" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "ºöÂÔ´óСд(&C)" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "ÔÊÐí¼ì²âÒƶ¯Çø¿é(&N)" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "Æ¥ÅäÏàËƵÄÐÐ(&M)" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "¹ýÂË×¢ÊÍ" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "±à¼­Æ÷" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "Óï·¨¸ßÁÁ(&H)" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "×Ô¶¯ÖØÐÂɨÃè(&A)" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "±£³Ö»»Ðзû²»±ä(&P)" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "ÖƱí·û" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "¿í¶È(&T)" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "²åÈëÖƱí·û(&I)" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "²åÈë¿Õ¸ñ(&S)" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "ÐÐÄÚ¶Ô±È" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "ÏÔʾÐÐÄÚ²»Í¬" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "×Ö·û¼¶±ð(&C)" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "µ¥´Ê¼¶±ð(&W):" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Îļþ¹ýÂËÆ÷" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "²âÊÔ" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "°²×°..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "н¨..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "±à¼­..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "ɾ³ý..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "±£´æÐ޸ĺóµÄÎļþÂð£¿" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "×ó²àÎļþ" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "±£´æÐÞ¸Ä(&S)" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "·ÅÆúÐÞ¸Ä(&D)" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "ÓÒ²àÎļþ" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "±£´æÐÞ¸Ä(&A)" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "·ÅÆúÐÞ¸Ä(&C)" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "´úÂëÒ³" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "ĬÈÏ´úÂëÒ³" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "ÇëÑ¡Ôñ´ò¿ª·ÇUnicodeÎļþʱĬÈϵĴúÂëÒ³" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "ϵͳ´úÂëÒ³" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Óë WinMerge Óû§½çÃæÒ»ÖÂ" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Ñ¡Ïî" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " ·ÖÀà" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "µ¼Èë..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "µ¼³ö..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "¶Ô»°¿ò" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "¹Ø¼ü×Ö:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "º¯ÊýÃû:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "×¢ÊÍ:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Êý×Ö:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "²Ù×÷·û:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "×Ö·û´®:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Ô¤´¦ÀíÖ¸Áî:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Óû§¶¨Òå 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Óû§¶¨Òå 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "¼Ó´Ö" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Îļþ¼Ð¶Ô±È±¨¸æ" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "±¨¸æÎļþ(&F):" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "ä¯ÀÀ..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "Ñùʽ(&S):" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "¸´ÖƵ½¼ôÌù°å(&C)" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "¹²Ïí»ò˽ÓйýÂËÆ÷" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "ÄúÒª´´½¨ÄÄÖÖ¹ýÂËÆ÷£¿" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "¹²Ïí¹ýÂËÆ÷(Ϊ±¾»úµÄËùÓÐÓû§)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "˽ÓйýÂËÆ÷(ֻΪµ±Ç°Óû§)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "ѹËõ°üÖ§³Ö" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "ÆôÓÃѹËõÎļþÖ§³Ö(&E)" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "¸ù¾ÝÄÚÈݼì²âÎļþÀàÐÍ(&D)" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "¶Ô±È½á¹ûͳ¼Æ" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Îļþ¼Ð:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Îļþ:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "²»Í¬" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Îı¾:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "¶þ½øÖÆ:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "½öÔÚµ¥²à" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "×ó²à:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "ÓÒ²à:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "ÍêÈ«Ïàͬ" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "×ܼÆ:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "¹Ø±Õ" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Ó°Ï췶Χ" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Ó°Ïì)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Ñ¡ÔñҪʹÓõĴúÂëÒ³" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "´ò¿ªÎļþ(&F):" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "±£´æÎļþ(&S):" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "Á½±ßʹÓÃÏàͬµÄ´úÂëÒ³(&U)" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "Ó¦ÓÃ(&A)" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "È¡Ïû(&C)" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "¹ýÂËÆ÷²âÊÔ" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "ÕýÔÚ²âÊÔ ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "¼üÈëÎÄ×ÖÓÃÒÔ²âÊÔ(&E):" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "Îļþ¼ÐÃû(&F)" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "½á¹û:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "²âÊÔ(&T)" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "¹Ø±Õ(&C)" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "ʹÓÃ×Ô¶¨ÒåµÄÎÄ×ÖÑÕÉ«(&U)" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "×Ô¶¨ÒåÎÄ×ÖÑÕÉ«" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "¿Õ°×:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "ÆÕͨÎÄ×Ö:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Ñ¡ÖÐÇøÓò:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "·¾¶" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "×ó²à(&L):" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Ö»¶Á(&E)" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "ÓÒ²à(&R):" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Ö»¶Á(&A)" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "¹ýÂËÆ÷(&F):" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "´ò¿ª..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "±£´æ..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "±¸·ÝÎļþ" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "½øÐÐÒÔϲÙ×÷ʱ´´½¨±¸·ÝÎļþ:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Îļþ¼Ð¶Ô±È(&F)" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Îļþ¶Ô±È(&E)" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "½«±¸·ÝÎļþ´´½¨ÖÁ:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "Ô­ÎļþËùÔÚÎļþ¼Ð(&O)" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "È«¾Ö±¸·ÝÎļþ¼Ð(&G):" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "±¸·ÝÎļþÃû:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "Ìí¼Ó .bak À©Õ¹Ãû(&A)" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "Ìí¼Óʱ¼ä´Á(&P)" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "È·Èϸ´ÖÆ" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "ÄúÈ·¶¨Òª¸´ÖÆ XXX ¸öÏîĿô?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "´Ó×ó²à" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "µ½ÓÒ²à" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "ÊÇ" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "·ñ" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "ÔÊÐí¸ß¼¶²Ëµ¥(&N)" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Îļþ¼Ð" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "Óöµ½Ê×´¦²»Í¬ºóÍ£Ö¹(&T)" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "ºöÂÔ²»×ã3ÃëµÄʱ¼ä²î±ð(&O)" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "¶þ½øÖÆ" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "040903a8" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x804, 936" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "´ò¿ª¹¤³ÌÎļþʱ·¢Éúδ֪´íÎó" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "±£´æ¹¤³ÌÎļþʱ·¢Éúδ֪´íÎó" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "¹¤³ÌÎļþ" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "³É¹¦´ò¿ª¹¤³ÌÎļþ." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "³É¹¦±£´æ¹¤³ÌÎļþ." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "\nnFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge Îļþ¶Ô±È" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "¿ª·¢ÈËÔ±:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 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." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "ÖÐÖ¹(&A)" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "ÖØÊÔ(&R)" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "ºöÂÔ(&I)" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "ºöÂÔËùÓÐ(&A)" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "ÊÇ(&Y)" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "È«²¿¶¼ÊÇ(&A)" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "·ñ(&N)" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "È«²¿¶¼·ñ(&L)" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "¼ÌÐø(&C)" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "Ìø¹ý(&S)" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "È«²¿Ìø¹ý(&A)" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "²»ÔÙÌáʾ´ËÏûÏ¢(&M)¡£" -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "²»ÔÙѯÎÊ´ËÎÊÌâ(&Q)¡£" -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "°æ±¾¿ØÖÆ" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "²»Í¬´¦" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "µ½:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "´Ó×ó²à:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "µ½×ó²à:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "´ÓÓÒ²à:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "µ½ÓÒ²à:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "°æ±¾ %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Ñ¡Ïî (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "ËùÓÐÌáʾÐÅÏ¢ÒѾ­ÖØÉèΪÏÔʾ¡£" -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3133,84 +3196,84 @@ msgstr "" "\n" "ÇëʹÓà 1 - %1 Ö®¼äµÄÖµ." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "´ò¿ª" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "³ÌÐò|*.exe;*.bat;*.cmd|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ¹¤³ÌÎļþ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "ÅäÖÃÎļþ (*.ini)|*.ini|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, 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:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML Îļþ (*.htm,*.html)|*.htm;*.html|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML Îļþ (*.xml)|*.xml|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Ãû³Æ" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "λÖÃ" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "¹ýÂËÆ÷" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "ÃèÊö" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Ñ¡ÔñйýÂËÆ÷µÄÎļþÃû" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "¹ýÂËÆ÷Îļþ (*.flt)|*.flt|ËùÓÐÎļþ (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3222,7 +3285,7 @@ msgstr "" "\n" "Çë°ÑÎļþ %1 ¸´ÖƵ½ WinMerge/Filters Îļþ¼ÐÏÂ." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3235,7 +3298,7 @@ msgstr "" "\n" "ÇëÈ·ÈÏ´ËÎļþ¼Ð´æÔÚ²¢¿ÉÒÔдÈë." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3246,7 +3309,7 @@ msgstr "" "\n" "ÇëÔÚÑ¡Ïî/ϵͳÖÐÑ¡ÔñÒ»¸ö·¾¶." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3259,12 +3322,12 @@ msgstr "" "\n" "¸ÃÎļþÊÇ·ñΪֻ¶Á?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Ñ¡ÔñÒª°²×°µÄ¹ýÂËÆ÷Îļþ" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3275,188 +3338,188 @@ msgstr "" "\n" "»òÐíÊÇÎÞ·¨½«ÐÂÎļþ¸´ÖƵ½¹ýÂËÆ÷·¾¶?" -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "¹ýÂËÆ÷ÎļþÒѾ­´æÔÚ. ÊÇ·ñ¸²¸ÇÔ­ÓйýÂËÆ÷?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "ÕýÔò±í´ïʽ" -#: Merge.rc:2151 +#: Merge.rc:2172 #, 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:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Îļþ¼Ð¶Ô±È½á¹û" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Îļþ¶Ô±È" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "δÃüÃû ×ó" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "δÃüÃû ÓÒ" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "ËûÃǵÄÎļþ" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "ÎÒµÄÎļþ" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "ÐÐ: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "ºÏ²¢" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "µÚ %1 ´¦²»Í¬(¹² %2 ´¦)" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "¹²ÕÒµ½ %1 ´¦²»Í¬" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "ÕÒµ½ 1 ´¦²»Í¬" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "Ö»¶Á" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "µÚ %1 ÏîÄ¿£¬¹² %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "ÏîÄ¿: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Ñ¡ÔñÁ½¸öÒÑ´æÔÚµÄÎļþ¼Ð»òÎļþ½øÐжԱÈ" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Ñ¡ÔñÎļþ¼Ð" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Ñ¡ÔñÒª½øÐжԱȵÄÁ½¸öÎļþ¼Ð»òÁ½¸öÎļþ¡£" -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "×ó²à·¾¶²»´æÔÚ!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "ÓҲ෾¶²»´æÔÚ!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Á½¸ö·¾¶¶¼²»´æÔÚ!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Ñ¡ÔñÁ½¸öÎļþÒÔÆôÓýâ°ü³ÌÐò." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "²»ÄÜÔÚÎļþºÍÎļþ¼ÐÖ®¼ä½øÐжԱÈ!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "ÕÒ²»µ½Îļþ: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Îļþδ½â°ü: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3469,37 +3532,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "½âÎö³åÍ»Îļþʱʧ°Ü" -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "Îļþ\n%1\n²»ÊÇÒ»¸ö³åÍ»Îļþ" -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Áí´æΪ" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "±£´æ¸ü¸Äµ½ %1£¿" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 ±ê¼ÇΪֻ¶Á¡£ÄúÏ£Íû¸²¸ÇÖ»¶ÁÎļþÂð£¿Ñ¡¡°·ñ¡±¿ÉÒÔÓÃÆäËüÎļþÃû±£´æ¡£" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "±¸·ÝÎļþʱ³ö´í" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3512,7 +3575,7 @@ msgstr "" "\n" "ÈÔÈ»¼ÌÐøÂð£¿" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3529,7 +3592,7 @@ msgstr "" "\t-ÓÃÆäËüÎļþÃû±£´æ(µã»÷¡°È·¶¨¡±)\n" "\t-ÖÐÖ¹µ±Ç°²Ù×÷(µã»÷¡°È¡Ïû¡±)" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3544,7 +3607,7 @@ msgstr "" "\n" "ÄúÒª½«Î´´ò°üµÄ°æ±¾±£´æΪÆäËüÎļþÂð£¿" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3559,7 +3622,7 @@ msgstr "" "\n" "ÄúÒª½«Î´´ò°üµÄ°æ±¾±£´æΪÆäËüÎļþÂð£¿" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3574,7 +3637,7 @@ msgstr "" "\n" "Òª¸²¸ÇÒѱ»Ð޸ĵÄÎļþÂð£¿" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3583,32 +3646,32 @@ msgstr "" "%1\n" "Îļþ±ê¼ÇΪֻ¶Á¡£ÄúÒª¸²¸ÇÖ»¶ÁµÄÎļþÂð£¿" -#: Merge.rc:2235 +#: Merge.rc:2256 #, 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:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "×ó²àÎļþÁí´æΪ" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "ÓÒ²àÎļþÁí´æΪ" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3619,42 +3682,42 @@ msgstr "" "\n" "ÇëË¢ÐÂÎĵµºóÔÙ¼ÌÐø¡£" -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Äú±ØÐëÖ¸¶¨Ò»¸ö SourceSafe ÏîĿ·¾¶ÒÔ±ã¼ÌÐø (ÀýÈ磺 $/MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "´ÓVSSÖÐÇ©³öÎļþ..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "ÔÚÇ©³ö(Checkout)Îļþʱ°æ±¾¿ØÖÆϵͳ·µ»ØÒ»¸ö´íÎó¡£ÎÞ·¨¼ÌÐø..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Ö´Ðа汾¿ØÖÆϵͳÃüÁîʱ³ö´í¡£" -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ¹¤×÷Îļþ¼Ð(Working Folder)Ó뵱ǰÎļþλÖò»·û¡£ÊÇ·ñ¼ÌÐø£¿" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "δÕÒµ½ VSS Êý¾Ý¿â£¡" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "VSS ·µ»Ø´íÎó:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3665,7 +3728,7 @@ msgstr "" " Çë¼ì²éÒ»ÏÂʹÓÃÖеÄÊÓͼµÄÅäÖÃ˵Ã÷.\n" " ³·ÏúÇ©³ö²Ù×÷Âð?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3674,127 +3737,146 @@ msgstr "" "ÔÚ³¢ÊÔ³·ÏúÇ©³öÎļþʱ°æ±¾¿ØÖÆϵͳ·µ»ØÁËÒ»¸ö´íÎó.\n" " Çë¼ì²éÒ»ÏÂʹÓÃÖеÄÊÓͼµÄÅäÖÃ˵Ã÷. " -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "ÎÞ" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 ÒÔÇ°°æ±¾)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ¼°ÒÔºó°æ±¾)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "ÒÔ¿Õ°×·Ö¸ô" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "ÒÔ¿Õ°×»ò±êµã·Ö¸ô" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "ÓҲൽ×ó²à (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "×ó²àµ½ÓÒ²à (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "ÓҲൽ×ó²à (%1 ¹²%2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "×ó²àµ½ÓÒ²à (%1 ¹²%2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "×ó²àµ½ÓÒ²à (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "×ó²àµ½... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "ÓҲൽ... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "×ó²àµ½... (%1 ¹²%2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "ÓҲൽ... (%1 ¹²%2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "×ó²à (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "ÓÒ²à (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Á½²à (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "×ó²à (%1 ¹²%2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "ÓÒ²à (%1 ¹²%2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Á½²à (%1 ¹²%2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "×ó²à - ÇëÑ¡ÔñÄ¿±êÎļþ¼Ð:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "ÓÒ²à - ÇëÑ¡ÔñÄ¿±êÎļþ¼Ð:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(Ó°Ïì %1 ¸öÎļþ)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(Ó°Ïì %2 ÎļþÖÐµÄ %1 ¸ö)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3806,17 +3888,17 @@ msgstr "" "%1\n" "Âð£¿" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "ÄúÈ·¶¨Òª¸´ÖÆÂð:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "ÄúÈ·¶¨Òª¸´ÖÆ %d ¸öÏîÄ¿Âð:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3835,502 +3917,502 @@ msgstr "" "\n" "ÇëˢбȽϴ°¿Ú." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íⲿ±à¼­Æ÷ÔËÐÐʧ°Ü: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "δ֪µÄѹËõ°ü¸ñʽ" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "ÎļþÃû³Æ" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "¶Ô±È½á¹û" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "×ó²àÈÕÆÚ" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "ÓÒ²àÈÕÆÚ" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "À©Õ¹Ãû" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "×ó²àÎļþ´óС" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "ÓÒ²àÎļþ´óС" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "ÓÒ²àÎļþ´óС (¼ò¶Ì)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "×ó²àÎļþ´óС (¼ò¶Ì)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "×ó²à½¨Á¢Ê±¼ä" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "ÓҲཨÁ¢Ê±¼ä" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "½ÏеÄÎļþ" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "×ó²àÎļþ°æ±¾" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "ÓÒ²àÎļþ°æ±¾" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "¼ò¶ÌµÄ½á¹û" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "×ó²àÊôÐÔ" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "ÓÒ²àÊôÐÔ" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "×ó²à»»Ðзû" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "ÓҲ໻Ðзû" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "×ó²àÎļþ±àÂë" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "ÓÒ²àÎļþ±àÂë" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "ºöÂԵIJ»Í¬´¦" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "ÎÞ·¨¶Ô±ÈÎļþ" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "ÏîÄ¿È¡Ïû" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "ÎļþÒÑÌø¹ý" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Îļþ¼ÐÒÑÌø¹ý" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "½öÔÚ×ó²à: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "½öÔÚÓÒ²à: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "¶þ½øÖÆÎļþÍêÈ«Ïàͬ" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "¶þ½øÖÆÎļþ²»Í¬" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Îļþ²»Í¬" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Ö»´æÔÚ×ó²à" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Ö»´æÔÚÓÒ²à" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "´íÎó" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ö´ÐÐʱ¼ä: %ld ºÁÃë" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "Ñ¡ÔñÁË 1 ¸öÏîÄ¿" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "Ñ¡ÔñÁË %1 ¸öÏîÄ¿" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "ÎļþÃû»òÎļþ¼ÐÃû¡£" -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Ëù´¦µÄ×ÓÎļþ¼ÐÃû¡£" -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "¶Ô±È½á¹û£¬½Ï³¤µÄ¸ñʽ¡£" -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "×ó²àµÄ×îºóÐÞ¸ÄÈÕÆÚ¡£" -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "ÓÒ²àµÄ×îºóÐÞ¸ÄÈÕÆÚ¡£" -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "ÎļþµÄÀ©Õ¹Ãû¡£" -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "×ó²àÎļþ³¤¶È×Ö½ÚÊý¡£" -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "ÓÒ²àÎļþ³¤¶È×Ö½ÚÊý¡£" -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "×ó²àÎļþ³¤¶ÈµÄ¼ò¶Ì±íʾ." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "ÓÒ²àÎļþ³¤¶ÈµÄ¼ò¶Ì±íʾ." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "×ó²àµÄ´´½¨Ê±¼ä¡£" -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "ÓÒ²àµÄ´´½¨Ê±¼ä¡£" -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "ÏÔʾ³öÄıßÊǽÏÍíÐ޸ĹýµÄ¡£" -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "×ó²àÎļþµÄ°æ±¾£¬Ö»¶ÔһЩÎļþÀàÐÍÓÐЧ¡£" -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "ÓÒ²àÎļþµÄ°æ±¾£¬Ö»¶ÔһЩÎļþÀàÐÍÓÐЧ¡£" -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "¶Ì¸ñʽµÄ¶Ô±È½á¹û¡£" -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "×ó²àµÄÊôÐÔ¡£" -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "ÓÒ²àµÄÊôÐÔ¡£" -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "×ó²àÎļþµÄ»»ÐзûÀàÐÍ" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "ÓÒ²àÎļþµÄ»»ÐзûÀàÐÍ" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "×ó²àÎļþµÄ×Ö·û±àÂë¡£" -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "ÓÒ²àÎļþµÄ×Ö·û±àÂë¡£" -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "±»ÂÔ¹ýµÄ²»Í¬Êý. ÓÉWinMergeºöÂԵIJ»Í¬, ÎÞ·¨¶ÔËüÃǽøÐкϲ¢." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "ÎļþÖеIJ»Í¬Êý. ²»°üÀ¨ºöÂԵIJ»Í¬." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "ÔÚ¶þ½øÖÆÎļþ´¦ÏÔʾÐǺÅ(*)¡£" -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "¶Ô±È %1 ºÍ %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "¶ººÅ·Ö¸ôµÄÁбí" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "ÖƱí·û·Ö¸ôµÄÁбí" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "¼òµ¥HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "¼òµ¥XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "±¨¸æÎļþÒѾ­´æÔÚ£¬Òª¸²¸ÇÂð£¿" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4339,32 +4421,32 @@ msgstr "" "´´½¨±¨¸æʱ³ö´í:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "³É¹¦´´½¨±¨¸æ¡£" -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Á½²à´ò¿ªµÄÊÇͬһ¸öÎļþ¡£" -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Ñ¡ÔñµÄÎļþÍêÈ«Ïàͬ¡£" -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Ò»¸ö´íÎó·¢ÉúÓÚ¶Ô±ÈÎļþʱ¡£" -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "ÎÞ·¨´´½¨ÁÙʱÎļþ¡£Çë¼ì²éÄúµÄÁÙʱ·¾¶ÉèÖá£" -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4379,22 +4461,22 @@ msgstr "" "\n" "Ìáʾ£ºÈç¹ûÄú×ÜÊǺöÂÔ»»ÐзûµÄ²»Í¬£¬ÇëÔÚ¡°±à¼­/Ñ¡ÏµÄ¡°¶Ô±È¡±Ò³Öй´Ñ¡¡°ºöÂÔ»»Ðзû²îÒ족¡£" -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Ñ¡ÖеÄÎļþ¼ÐÎÞЧ¡£" -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "ÎÞ·¨Óñ༭Æ÷´ò¿ª¶þ½øÖÆÎļþ¡£" -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "Õâ¸öÎļþ¼ÐÖ»´æÔÚÓÚÒ»²àËùÒÔÎÞ·¨´ò¿ª¡£\n\nÊÇ·ñÒªÔÚÁíÒ»²à´´½¨Ò»¸ö¶ÔÓ¦µÄÎļþ¼Ð£º\n%1\n²¢ÇÒ´ò¿ªÕâÁ½¸öÎļþ¼Ð£¿" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4405,152 +4487,152 @@ msgstr "" "·Ö±ðÒÔ²»Í¬´úÂëÒ³ÏÔʾ½«»áÓнϺõÄЧ¹û£¬µ«ÊǺϲ¢/¸´ÖÆ»áÓÐΣÏÕ¡£\n" "ÄúÒªÒÔWindowsĬÈϵĴúÂëÒ³ÏÔʾÁ½¸öÎļþÂð(ÍƼö)£¿" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "ÓÉÓÚ×Ö·û±àÂë´íÎóÔì³ÉÁ½¸öÎļþÐÅÏ¢¶ªÊ§" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "ûÓв»Í¬" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "ÐÐÄÚ²»Í¬" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "ÒÑÌæ»» %1 ¸ö×Ö·û´®¡£" -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "ÎÞ·¨²éÕÒ×Ö·û´®¡¸%s¡¹" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "λÖÃʾÒâ" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "²»Í¬´¦ÏÔʾ" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "³É¹¦Ð´ÈëpatchÎļþ¡£" -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ÌõĿδÕÒµ½»òÕßËüÊÇÒ»¸öÎļþ¼Ð!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ÌõĿδÕÒµ½»òÕßËüÊÇÒ»¸öÎļþ¼Ð!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "patchÎļþÒѾ­´æÔÚ£¬ÄúÒª¸²¸ÇËüÂð£¿" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[Ñ¡ÖÐ %1 ¸öÎļþ]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "ÆÕͨ" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "ÉÏÏÂÎÄ" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "ͳһ" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "ÎÞ·¨Ð´ÈëÎļþ %1¡£" -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Ö¸¶¨µÄ·¾¶²»ÊǾø¶Ô·¾¶: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "ÇëÖ¸¶¨Êä³öÎļþ" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "ÎÞ·¨Îª¶þ½øÖÆÎļþ´´½¨ patch¡£" -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "ÎÞ·¨ÎªÎļþ¼Ð´´½¨ patch¡£" -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4561,12 +4643,12 @@ msgstr "" "\n" "´´½¨ patch ÒªÇóÎļþÖÐûÓÐδ±£´æµÄ¸Ä¶¯¡£" -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Îļþ¼Ð²»´æÔÚ¡£" -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4578,37 +4660,37 @@ msgstr "" "ûÕÒµ½Ö§³ÖѹËõ°üËùÐèÒªµÄ×é¼þ(7-zip »ò Merge7z*.dll)¡£\n" "Çë²é¿´ÊÖ²á»ñµÃÓйØѹËõ°üÖ§³Ö¼°ÈçºÎÆôÓõĸü¶àÐÅÏ¢¡£" -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Ñ¡Ôñµ¼³öÎļþ" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Ñ¡Ôñµ¼ÈëÎļþ" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Ñ¡ÏîÒÑ´ÓÎļþµ¼Èë." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Ñ¡ÏîÒѾ­µ¼³öµ½Îļþ." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Ñ¡Ïîµ¼Èëʧ°Ü." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Ñ¡Ïîµ¼³öʧ°Ü." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4616,247 +4698,247 @@ msgid "" "Do you want to continue?" msgstr "ÄúÕýÒª¹Ø±Õ¶à¸ö¶Ô±È´°¿Ú¡£\nÊÇ·ñ¼ÌÐø£¿" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "»ìºÏ" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "ÔÚÁ½¸öÎļþÉÏÓ¦ÓÃÊʵ±µÄ½â°ü³ÌÐò (ÎļþÖ»ÐèÒªÓÐÊʵ±µÄÀ©Õ¹Ãû)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "ûÓÐÔ¤¶Ô±È³ÌÐò (ÆÕͨ)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "ÍƼöµÄ²å¼þ" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "ÆäËü²å¼þ" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "²å¼þÉèÖÃ" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH δÕÒµ½ - .sct ½Å±¾ÒѽûÓÃ" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "<ÎÞ>" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "<×Ô¶¯>" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "תµ½µÚ %1 ÐÐ(&O)" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "½ûÓÃ" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "ÓÉÎļþϵͳѡÔñ" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "ÓÉ×î½üʹÓõÄÎļþÑ¡Ôñ" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Åú´¦Àí" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "×ÊÔ´Îļþ" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index b078d7e72..eb3e1ac77 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -78,7 +78,7 @@ msgid "Cu&t" msgstr "°Å¤U(&T)" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "½Æ»s(&C)" @@ -89,7 +89,7 @@ msgid "&Paste" msgstr "¶K¤W(&P)" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "¸õ¦Ü(&G)..." @@ -100,22 +100,25 @@ msgid "Op&en" msgstr "¶}±Ò(&E)" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "¥Îµn¿ýªºÀ³¥Îµ{¦¡(&R)" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "¥Î¥~¦b½s¿è¾¹(&E)" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "¥Î(&W)..." @@ -153,7 +156,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "©Ôªñ±À»·(&Z)" @@ -165,8 +168,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "Ãö³¬(&N)" @@ -183,49 +186,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "ÀÉ®×(&F)" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "·s¼W(&N)\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "¶}±Ò(&O)...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "¶}±Ò½Ä¬ðÀÉ(&E)..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "¶}±Ò±M®×(&J)...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Àx¦s±M®×(&V)..." @@ -237,276 +240,276 @@ msgstr " #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< µL >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "µ²§ô(&X)" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "½s¿è(&E)" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "¿ï¶µ(&O)..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "À˵ø(&V)" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "¤u¨ã¦C(&T)" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "¤p¹Ï¥Ü(&S)" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "¤j¹Ï¥Ü(&B)" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "ª¬ºA¦C(&S)" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "­¶ÅÒ¦C(&B)" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "¤u¨ã(&T)" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "¿z¿ï¾¹(&F)..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "²£¥Í¸Éºó(&G)..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "¥~±¾(&P)" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "¤â°Ê¥ý¦æ³B²z¾¹(&N)" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "¦Û°Ê¥ý¦æ³B²z¾¹(&U)" # "¤â°Ê¸ÑÀ£ÁY(&M)" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "¤â°Ê¸Ñ¶}«D¯Â¤å¦rÀÉ(&M)" # "¦Û°Ê¸ÑÀ£ÁY(&A)" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "¦Û°Ê¸Ñ¶}«D¯Â¤å¦rÀÉ(&A)" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "­«·s¸ü¤J¥~±¾(&R)" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "µøµ¡(&W)" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "Ãö³¬(&O)" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Ãö³¬¥þ³¡(&S)" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "¤Á´«µ¡®æ(&P)\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "¤ô¥­¨Ã±Æ(&H)" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "««ª½¨Ã±Æ(&V)" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "Å|¸m(&C)" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "»¡©ú(&H)" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "WinMerge »¡©ú(&W)\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "²ÕºA(&O)" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "GNU ¤½¦@±ÂÅvÃÒ(&G)" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "Ãö©ó WinMerge(&A)..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "¥ªÃä°ßŪ(&E)" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "¥kÃä°ßŪ(&G)" @@ -517,7 +520,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "¥þ¿ï(&A)\tCtrl+A" @@ -539,1757 +542,1817 @@ msgstr " #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Åã¥Ü¥kÃä¿W¦³¶µ¥Ø(&G)" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Åã¥Ü²¤¹Lªº¶µ¥Ø(&K)" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Åã¥Ü¤G¶i¨îÀÉ®×(&H)" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Åã¥ÜÁôÂöµ¥Ø(&E)" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "¾ðª¬¼Ò¦¡(&M)" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "®i¶}©Ò¦³¤l¸ê®Æ§¨(&X)" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "¦¬¦X©Ò¦³¤l¸ê®Æ§¨(&C)" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "¿ï¨ú¦r«¬(&F)..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "¨Ï¥Î¹w³]¦r«¬(&O)" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "²Î­p¤ñ¸ûµ²ªG(&R)" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "­«¾ã(&S)\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "­«¾ã¼Ð¥Ü°Ï(&R)\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "¦X¨Ö(&M)" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "¤ñ¸û(&M)\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "¤U¤@¬Û²§(&N)\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "¤W¤@¬Û²§(&P)\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "³Ìªì¬Û²§(&F)\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "¥Ø«e¬Û²§(&C)\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "³Ì¥½¬Û²§(&L)\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "½Æ»s¨ì¥kÃä(&R)\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "½Æ»s¨ì¥ªÃä(&E)\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "§R°£(&D)\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "¦Û­qÄæ¦ì(&C)..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "²£¥Í³ø§i(&R)..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "Àx¦s(&S)\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Àx¦s¥ªÃä(&L)" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Àx¦s¥kÃä(&R)" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "¦C¦L(&P)..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "³]©w¦C¦L®æ¦¡(&T)" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "¹wÄý¦C¦L(&R)" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "Âà´«¦æ§À¦r¤¸¦¨(&C)" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "¶}/Ãö¦X¨Ö¼Ò¦¡(&M)\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "ÀÉ®×½s½X(&F)..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "ºM¦^(&U)\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "¦A°µ(&R)\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "°Å¤U(&U)\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "½Æ»s(&C)\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "¶K¤W(&P)\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "¿ï¨ú¦æ¤º®t²§(&D)\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "´M§ä(&I)...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "¨ú¥N(&C)...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "¶i¶¥" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "³s¦P¦æ¸¹½Æ»s(&C)\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "®ÑÅÒ(&B)" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "©ñ¸m/²M°£®ÑÅÒ(&T)\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "¤U¤@®ÑÅÒ(&N)\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "¤W¤@®ÑÅÒ(&P)\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "²M°£¥þ³¡®ÑÅÒ(&C)" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "²¾¦Ü(&G)...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "©Ôªñ(&I)\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "±À»·(&O)\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "«ì´_­ì©l(&N)\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "»yªk°ª«G«×Åã¥Ü" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "Âê¦íµ¡®æ(&L)" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "À˵øªÅ¥Õ©M¸õ®æ(&V)" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "À˵ø¦æ¤º®t²§(&W)" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "À˵ø¦æ¸¹(&N)" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "À˵ø­¶Ãä(&M)" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "¦Û°Ê´«¦æ(&R)" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "µ¡®æ´«¦ì(&A)" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" # I would suggest "Microview Pane" # ®t²§µ¡®æ(&P) -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "ªñ¹îµ¡®æ(&P)" # I would suggest "Macroview Pane". # ¦ì¸mµ¡®æ -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "»·±æµ¡®æ(&P)" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "½Æ»s¨ì¥kÃä«á¨ì¤U¤@­Ó(&O)\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "½Æ»s¨ì¥ªÃä«á¨ì¤U¤@­Ó(&T)\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "¥þ³¡½Æ»s¨ì¥kÃä(&A)" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "¥þ³¡½Æ»s¨ì¥ªÃä(&Y)" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "¥ý¦æ³B²z¾¹(&P)" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "ÀHĶ§Y¦æ½X(&S)" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "¤ñ¸û(&A)" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "¥ªÃä¨ì¥kÃä(&L)" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "¥ªÃä¨ì(&E)..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "¥kÃä¨ì¥ªÃä(&R)" +msgid "Left to Right (%1 of %2)" +msgstr "¥ªÃä¨ì¥kÃä (%2 ¤§ %1)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "¥kÃä¨ì(&I)..." +msgid "Left to... (%1 of %2)" +msgstr "¥ªÃä¨ì... (%2 ¤§ %1)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "²¾°Ê(&M)" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "¥ªÃä¨ì(&L)..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "¥kÃä¨ì(&R)..." +msgid "Right to Left (%1 of %2)" +msgstr "¥kÃä¨ì¥ªÃä (%2 ¤§ %1)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "¥kÃä¨ì... (%2 ¤§ %1)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "²¾°Ê(&M)" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "§R°£(&D)" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "¥ªÃä(&L)" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "¥kÃä(&R)" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "¨âÃä(&B)" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "­«·s©R¦W(&N)" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "ÁôÂÃÀÉ®×(&H)" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "¶}±Ò¥ªÃä(&O)" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "¶}±Ò¥kÃä(&P)" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "½Æ»s®|¦W(&Y)" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "¥ªÃä(&L) (%2 ¤§ %1)" +msgid "Left (%1 of %2)" +msgstr "¥ªÃä (%2 ¤§ %1)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "¥kÃä(&R) (%2 ¤§ %1)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "¥kÃä (%2 ¤§ %1)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "¨âÃä (%2 ¤§ %1)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "¨âÃä(&B) (%2 ¤§ %1)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "½Æ»sÀɦW(&F)" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "Zip(&Z)" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "¥ªÃä(&L)... (%2 ¤§ %1)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "¥kÃä(&R)... (%2 ¤§ %1)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "¨âÃä(&B)... (%2 ¤§ %1)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "¬Û²§ªÌ(&D)... (%2 ¤§ %1)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "­«¾ã(&R)" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "¥ªÃ䤶­±¿ï³æ" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "¥kÃ䤶­±¿ï³æ" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "½Æ»s§¹¾ã¸ô®|(&C)" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "½Æ»sÀɦW(&F)" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "¥ý¦æ³B²z¾¹³]©w" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "¤£­n¥ý¦æ³B²z¾¹(&N)" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "¦Û°Ê¥ý¦æ³B²z¾¹" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "¦Ü¬Û²§°Ï¶ô(&O)" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "¤£Åã¥Ü²¾¦ì°Ï¶ô(&N)" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "Åã¥Ü²¾¦ì°Ï¶ô(&A)" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "´N¥Ø«e¬Û²§³BÅã¥Ü¨ä²¾¦ì°Ï¶ô(&C)" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "ªÅ®æ(&H)" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "¤ñ¸û¤§(&P)" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "©¿²¤¨äÅܧó(&G)" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "©¿²¤¥þ³¡(&N)" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "°Ï¤À¤j¤p¼g(&T)" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "©¿²¤´«¦æ¦r¤¸¤§®t²§(Windows/Unix/Mac)(&R)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "Àɮפñ¸û¤è¦¡(&C)¡G" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "§¹¾ã¤º®e" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "§Ö³t¤º®e" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "­×§ï¤é´Á" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "­×§ï¤é´Á»P¤j¤p" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "¤j¤p" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Ãö©ó WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(¨p¤H½sĶ)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "«ô³X WinMerge ­º­¶¡I" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "½T©w" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "°^ÄmªÌ" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "¿ï¨úÀɮשθê®Æ§¨" -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "ÂsÄý(&B)..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "ÂsÄý(&R)..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "ÂsÄý(&O)..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "¿ï¨ú..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "¸Ñ¥]¾¹(&U)¡G" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "¿ï¨ú(&S)..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "¥]¬A¤l¸ê®Æ§¨(&I)" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "ª¬ºA¡G" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "¨ú®ø" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "»¡©ú" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "­n¤ñ¹ïªºÀɮשθê®Æ§¨" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "¸ê®Æ®w¡G" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "±M®×¡G" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "¥Î¤á¡G" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "±K½X¡G" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "³sµ²¨ì¥Ø¼Ð VSS ±M®×" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "®M¥Î¨ì©Ò¦³¶µ¥Ø" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "³q¹L" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "¥t¦s·sÀÉ..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "ª©¥»ºÞ²z¨t²Î" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "ª©¥»ºÞ²z¨t²Î(&V)¡G" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe ¸ô®|(&P)¡G" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "¤@¯ë" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "¦Û°Ê±²¦Ü³Ìªì®t²§(&S)" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "«ö ESC Ãö³¬µøµ¡(&O)" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "©ó¡u¶}±Ò¡v¹ï¸Ü¤è¶ô¦Û°ÊÀËÅç¸ô®|(&A)" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "¤£¯à¦P®É°õ¦æ¤@­Ó¥H¤W¥»µ{¦¡(&O)" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Ãö³¬¦h­«µøµ¡®É¥ý¸ß°Ý(&K)" # "¤ñ¸û®É­p¤JÀɮ׮ɶ¡(&P)" # Do you want with it to say "Include file time difference in comparing" or "Do not change file time in comparing"? -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "¤ñ¸ûÀɮ׮ɫO¯dÀɮ׮ɶ¡(&P)" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "±Ò°Ê®ÉÅã¥Ü¡u¿ï¾ÜÀɮשθê®Æ§¨¡v¹ï¸Ü¤è¶ô" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "¡u¶}±Ò¡v¹ï¸Ü¤è¶ô¤§¦Û°Ê§¹¦¨(&P)¡G" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge ¤¹³\ÁôÂìY¨Ç¦@¦P°T®§²°¡C«ö­«³]Áä¥H¦A¦¸Åã¥Ü©Ò¦³°T®§²°¡C" -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "­«³]" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "´M§ä" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "´M§ä(&N)¡G" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "¿W¥ß§¹¾ã¦r(&W)" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "°Ï¤À¤j¤p¼g(&C)" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "¥ÎÃþ«¬ªí¦¡(&E)" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "¦ÜÀɧÀ¤£§éªð(&O)" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "§ä¤U¤@­Ó(&F)" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "½T©w(&O)" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "¨ú¥N" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "¥N¥H(&P)¡G" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "¦ÜÀɧÀ¤£§éªð(&D)" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "©ó" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "¿ï¨ú°Ï(&S)" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "¾ã­ÓÀÉ®×(&O)" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "¨ú¥N(&R)" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "¥þ³¡¨ú¥N(&A)" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "°e¦^§ï¹LÀÉ" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "³Æµù" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "°e¦^§ï¹LÀÉ«á´N¨ú¥X¤§" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "¦æ¤§¿z°£¾¹" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "±Ò¥Î¦æ¿z°£¾¹" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Ãþ«¬ªí¦¡ (¨C¦æ¤@¦¡)¡G" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "·s¼W" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "½s¿è" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "²¾°£" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "¦â±m" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "¬Û²§°Ï¶ô¡G" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "¤w¿ï¨úªº¬Û²§°Ï¶ô¡G" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "­I´º" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "¤w§R°£" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "«e´º¤å" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "©¿²¤ªº¬Û²§°Ï¶ô¡G" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "²¾¦ì°Ï¶ô¡G" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "¤w¿ï¨úªº²¾¦ì°Ï¶ô¡G" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "¦r¼h¦¸ªº¬Û²§¡G" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "¤w¿ï¨úªº¦rªº¬Û²§¡G" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "¹w³]­È" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "¨t²Î" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "§R°£ÀÉ°e¨ì¸ê·½¦^¦¬µ©(&S)" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "¥~³¡½s¿è¾¹(&E)¡G" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "¸ê®Æ§¨¿z¿ï¾¹(&F)¡G" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "¼È¦sÀɸê®Æ§¨" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "¨t²Îªº¼È¦s¸ê®Æ§¨(&Y)" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "¦Û­q¸ê®Æ§¨(&U)¡G" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "¸Éºó²£¥Í¾¹" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "ÀÉ®×1(&1)¡G" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "ÀÉ®×2(&2)¡G" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "¹ï½Õ(&S)" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "ªþ¥[¨ì²{¦³ÀÉ®×(&A)" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "µ²ªG(&R)¡G" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "ÂsÄý(&W)..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "®æ¦¡(&F)" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "¼Ë¦¡(&Y)¡G" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "¤W¤U¤å(&C)¡G" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "©¿²¤ªÅ¥Õ¦æ(&E)" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "ªþ¥[ diff ©R¥O©óÀÉ­º(&P)" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "¶}±Ò¥~³¡½s¿è¾¹(&X)" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Åã¥ÜÄæ¦ì" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "¤W²¾(&U)" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "¤U²¾(&D)" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "¿ï¨ú¸Ñ¥]¾¹" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Àɮ׸ѥ]¾¹¡G" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Åã¥Ü©Ò¦³¸Ñ¥]¾¹¡A¤£­nÀˬd°ÆÀɦW" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "°ÆÀɦW²M³æ¡G" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "´y­z¡G" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "°±¤î" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "¤ñ¸û¶µ¥Ø¤¤..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "¤ñ¸û¹Lªº¶µ¥Ø¡G" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "¶µ¥ØÁ`¼Æ¡G" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "²¾¦Ü" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "²¾¦Ü(&O)¡G" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "ÀÉ®×" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "²¾¦Ü" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "¦æ(&N)" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "¬Û²§°Ï¶ô(&D)" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "²¾¦Ü(&G)" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "¤ñ¸û" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "ªÅ¥Õ³B" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "¤ñ¹ïªÅ¥Õ³B(&W)" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "©¿²¤ªÅ¥Õ¼Æ¶q¤§Åܰʦӳy¦¨ªº®t²§(&H)" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "©¿²¤ªÅ¥Õ³B¤§¥ô¦ó®t²§(&A)" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "©¿²¤ªÅ¥Õ¦æ(&K)" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "©¿²¤¤j¤p¼g(&C)" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "°»´ú²¾¦ìªº°Ï¶ô(&N)" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "§ä¥X¬Û¦ü¦æ(&M)" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "¿z¿ï¾¹¤§µù" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "½s¿è¾¹" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "°ª«G«×»yªk(&H)" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "¦Û°Ê­«·s±½´y(&A)" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "«O¯d­ì©l EOL ¦r¤¸(&P)" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "¸õ®æ" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "¸õ®æ¤j¤p(&T)¡G" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "´¡¤J¸õ®æ¦r¤¸(&I)" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "´¡¤JªÅ¥Õ(&S)" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "¦æ¤º®t²§µÛ¦â" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "À˵ø¦æ¤º®t²§" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "¦r¤¸¶¥¼h(&C)" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "¦r¶¥¼h(&W)¡G" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "Â_¥y¦r¤¸(&O)¡G" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Àɮ׿z¿ï¾¹" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "´ú¸Õ" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "¦w¸Ë..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "·s¼W..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "½s¿è..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "§R°£..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Àx¦s­×§ïªºÀɮסH" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "¥ªÃäÀÉ®×" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "Àx¦sÅܧó(&S)" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "©ñ±óÅܧó(&D)" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "¥kÃäÀÉ®×" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "Àx¦sÅܧó(&A)" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "©ñ±óÅܧó(&C)" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "©ñ±ó¥þ³¡(&R)" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "½s½X­¶" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "½s½X­¶" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "©ó¸ü¤J non-unicode Àɮ׮ɧïÅܩҥΪº½s½X­¶¦¨" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2298,693 +2361,693 @@ msgstr "" "°»´ú«á­±Àɮתº½s½X­¶¸ê°T¡G.html, .rc, .xml \n" "­«±Ò°Ê«á¤~°»´ú" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "¨t²Î¥Îªº½s½X­¶" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "WinMerge ¨Ï¥ÎªÌ¤¶­±¥Îªº½s½X­¶" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "¦Û­q½s½X­¶¡G" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "¿ï¶µ" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr "ºØÃþ" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "¶×¤J..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "¶×¥X..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "¹ï¸Ü" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "ÃöÁä¦r¡G" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "¨ç¼Æ¦W¡G" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "µù¡G" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "¼Æ¡G" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "¹Bºâ¤l¡G" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "¦r¦ê¡G" # What is preprocessor? Is it prediffer? The term "preprocessor" cannot be found elsewhere. -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "«e³B²z¾¹¡G" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "¨Ï¥ÎªÌ 1¡G" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "¨Ï¥ÎªÌ 2¡G" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "²ÊÅé" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "¤ñ¸û¥Ø¿ý«áªº³ø§i" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "³ø§iÀÉ(&F)¡G" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "ÂsÄý..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "¼Ë¦¡(&S)¡G" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "½Æ»s¨ì°Å¶Kï(&C)" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "¦@¥Î©Î­Ó¤H¿z¿ï¾¹" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "§A­n«Ø¥ß­þºØ¿z¿ï¾¹¡H" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "¦@¥Î¿z¿ï¾¹(¾A¥Î©Ò¦³¨Ï¥ÎªÌ)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "­Ó¤H¿z¿ï¾¹(¶È¾A¥Î²{¦b¨Ï¥ÎªÌ)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "¤ä´©À£ÁY" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "À£ÁYÀɤ䴩(&E)" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "°»´úÀÉ­º¸ê°T¥H¨M©wÀ£ÁYÀÉÃþ«¬(&D)" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "¤ñ¸û«áªº²Î­p" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "¸ê®Æ§¨¡G" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "ÀɮסG" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "¤£¦P" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "¤å¦r¡G" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "¤G¶i¨î¡G" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "¿W¦³" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "¥ªÃä¡G" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "¥kÃä¡G" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "¥þ¦P" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Á`­p¡G" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Ãö³¬" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "¼vÅT" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(¼vÅT)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "¿ï©w½s½X­¶µ¹" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "­n¸ü¤JªºÀÉ®×(&F)¡G" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "­nÀx¦sªºÀÉ®×(&S)¡G" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "¨âÀɳ£¥Î¬Û¦Pªº½s½X­¶(&U)" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "®M¥Î(&A)" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "¨ú®ø(&C)" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "´ú¸Õ¿z¿ï¾¹" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "´ú¸Õ¿z¿ï¾¹ ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "¿é¤J¤å¦r¥H°µ´ú¸Õ(&E)¡G" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "¸ê®Æ§¨¦WºÙ(&F)" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "µ²ªG¡G" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "´ú¸Õ(&T)" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "Ãö³¬(&C)" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "¨Ï¥Î¦Û­q¤å¦r¦â±m(&U)" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "¦Û­q¤å¦r¦â±m" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "ªÅ¥Õ¡G" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Ãþ«¬ªí¦¡¤å¡G" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "¿ï¨ú¡G" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "¸ô®|" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "¥ªÃä(&L)¡G" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "°ßŪ(&E)" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "¥kÃä(&R)¡G" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "°ßŪ(&A)" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "¿z¿ï¾¹(&F)¡G" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "¶}±Ò..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Àx¦s..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "³Æ¥÷ÀÉ®×" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "²£¥Í³Æ¥÷ÀÉ©ó¡G" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "¤ñ¸û¸ê®Æ§¨®É(&F)" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "¤ñ¸ûÀÉ®×®É(&E)" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "²£¥Í³Æ¥÷ÀɦܡG" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "­ì©lÀɪº¸ê®Æ§¨(&O)" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "Á`ªº³Æ¥÷¸ê®Æ§¨(&G)¡G" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "³Æ¥÷ÀÉÀɦW¡G" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "ªþ¤W .bak °ÆÀɦW(&A)" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "ªþ¤W®É¶¡ÂW°O(&P)" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "½T»{½Æ»s" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "½T©w­n½Æ»s XXX ¶µ¥Ø¡H" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "±q¥ªÃä" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "¨ì¥kÃä" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "¬O" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "§_" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "¥~±¾" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "±Ò¥Î¥~±¾(&E)" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "¨Ö¤JÀÉ®×Á`ºÞ¤¶­±" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "ÀÉ®×Á`ºÞ" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "±Ò¥Î¶i¶¥¿ï³æ(&N)" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "¥[¨ì¥kÁä¿ï³æ(&A)" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "¸ê®Æ§¨" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "²Ä¤@­Ó®t²§´N°±(&T)" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "¦p¨âÀɮפ§­×§ï®É¶¡¶¡¹j¤Ö©ó¤T¬í¡A«h©¿²¤¦¹®t²§(&O)" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "¥]¬A¿W¤@¤l¸ê®Æ§¨(&I)" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "§Ö³t¤ñ¸û¤§Àɮפj¤p¤W­­ (MB)(&Q)¡G" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "¤G¶i¨î" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "040403B6" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x404, 950" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "¶}±Ò±M®×Àɮɵo¥Í¤£©ú¿ù»~" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Àx¦s±M®×Àɮɵo¥Í¤£©ú¿ù»~" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "±M®×ÀÉ" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "±M®×Àɦ¨¥\¸ü¤J¡C" -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "±M®×Àɦ¨¥\Àx¦s¡C" -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -3003,7 +3066,7 @@ msgstr "" "WinMerge.Àɮפñ¸û\n" "WinMerge Àɮפñ¸û" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3022,7 +3085,7 @@ msgstr "" "WinMerge.¸ê®Æ§¨¤ñ¸û\n" "WinMerge ¸ê®Æ§¨¤ñ¸û" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3031,143 +3094,143 @@ msgstr "" "¬ãµoªÌ¡G\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 "µ´¤£«OÃҦۥѳnÅé WinMerge µL·å²«¡CÅwªï¦b¬Y¨Ç±ø¥ó¤U¦A´²µo¥¦¡F²Ó¸`¨£»¡©ú¿ï³æ¤¤ªº GNU ¤½¦@±ÂÅvÃÒ¡C" -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "©ñ±ó(&A)" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "­«¸Õ(&R)" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "©¿²¤(&I)" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "¥þ³¡©¿²¤(&A)" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "¬O(&Y)" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "¥þ³¡¬Ò¬O(&A)" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "§_(&N)" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "¥þ³¡¬Ò§_(&L)" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "Ä~Äò(&C)" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "²¤¹L(&S)" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "¥þ³¡²¤¹L(&A)" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "¤£­n¦AÅã¥Ü³o­Ó°T®§(&M)" -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "¤£­n¦A´£¥Ü³o­Ó°ÝÃD(&Q)" -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "»yªk" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "ª©¥»±±¨î" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "®t²§" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "¨ì¡G" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "±q¥ªÃä¡G" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "¨ì¥ªÃä¡G" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "±q¥kÃä¡G" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "¨ì¥kÃä¡G" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "ª©¥» %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "¸U°ê½X" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "¿ï¶µ (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "©Ò¦³°T®§²°²{¦b·|¦AÅã¥Ü¡C" -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3178,85 +3241,85 @@ msgstr "" "\n" "½Ð¥Î­È 1 - %1¡C" -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "¶}±Ò" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "µ{¦¡|*.exe;*.bat;*.cmd|©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ±M®×ÀÉ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "¿ï¶µÀÉ (*.ini)|*.ini|©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Text ÀÉ (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML ÀÉ (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ÀÉ (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "¦WºÙ" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "¦ì¸m" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "¿z¿ï¾¹" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "´y­z" # I suggest "Add new filter filename" instead. For it must not select a name, rather give one. -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "«Ø¥ß·s¿z¿ï¾¹ÀɦW" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Àɮ׿z¿ï¾¹ (*.flt)|*.flt|©Ò¦³ÀÉ®× (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3269,7 +3332,7 @@ msgstr "" "½Ð½Æ»sÀÉ®× %1 ¨ì WinMerge/Àɮ׿z¿ï¾¹-¸ê®Æ§¨¡G\n" "%2¡C" -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3282,7 +3345,7 @@ msgstr "" "\n" "½Ð½T©w¦³¸Ó¸ê®Æ§¨¡A¦Ó¥B¤¹³\¼g¤J¡C" -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3293,7 +3356,7 @@ msgstr "" "\n" "½Ð©ó¡u¿ï¶µ/¨t²Î¡v¤¤¿ï©wÀɮ׿z¿ï¾¹¸ê®Æ§¨¡C" -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3306,12 +3369,12 @@ msgstr "" "\n" "¥¦¬O°ßŪÀÉ¡H" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "§ä¨ìÀɮ׿z¿ï¾¹ÀÉ¥H¦w¸Ë" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3322,17 +3385,17 @@ msgstr "" "\n" "¤£¯à½Æ»s·s¿z¿ï¾¹ÀɨìÀɮ׿z¿ï¾¹¸ê®Æ§¨¡C" -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Àɮ׿z¿ï¾¹Àɤw¦s¦b¡CÂл\¤§¡H" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Ãþ«¬ªí¦¡" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3343,173 +3406,173 @@ msgstr "" "\n" "¦p¤£·Q²{¦b­«¾ã¡A¿ï¡u§_¡v¡A¥H«á¦A­«¾ã¡C" -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "¦Ü SS.EXE ªº¸ô®|(&P)" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "¸ê®Æ§¨¤ñ¹ïµ²ªG" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Àɮפñ¹ï¤¤" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "¥¼³]¼ÐÃDªº¥ªÃä" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "¥¼³]¼ÐÃDªº¥kÃä" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "¥L­Ìªº(ÀÉ®×)" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "§Úªº(ÀÉ®×)" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "¦æ¡G %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "¦X¨Ö" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "%2 ­Ó®t²§¤¤¤§²Ä %1" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "§ä¨ì %1 ­Ó®t²§" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "§ä¨ì 1 ­Ó®t²§" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "%2 ­Ó¶µ¥Ø¤§²Ä %1" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "¶µ¥Ø¡G%1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "¿ï¨ú¨â­Ó²{¦s¸ê®Æ§¨©ÎÀÉ®×°µ¤ñ¹ï" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "¸ê®Æ§¨¿ï¨ú" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "¿ï¨ú¨â­Ó¸ê®Æ§¨©ÎÀÉ®×°µ¤ñ¹ï¡C" -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "¥ªÃä¸ô®|µL®Ä¡I" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "¥kÃä¸ô®|µL®Ä¡I" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "¨âÃä¸ô®|µL®Ä¡I" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "¿ï¨âÀÉ¥H±Ò¥Î¸Ñ¥]¾¹¿ï¨ú¡C" -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "µLªk¤ñ¸ûÀɮשM¸ê®Æ§¨¡I" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "§ä¤£¨ìÀɮסG%1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "¥¼¸Ñ¥]ªºÀɮסG%1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3522,12 +3585,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "µLªk¸ÑªR½Ä¬ðÀÉ¡C" -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3538,27 +3601,27 @@ msgstr "" "%1\n" "¤£¬O½Ä¬ðÀÉ¡C" -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "¥t¦s·sÀÉ" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Àx¦s§ó§ï¨ì %1¡H" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 ¤w¼Ð°O¦¨°ßŪ¡C§A­nÂмg°ßŪÀɶܡH (§_¡A«h¥H·sÀɦWÀx¦s)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "³Æ¥÷Àɮ׮ɵo¥Í¿ù»~" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3571,7 +3634,7 @@ msgstr "" "\n" "¤´ÂÂÄ~Äò¶Ü¡H" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3588,7 +3651,7 @@ msgstr "" "\t-¥H¤£¦P¦WºÙÀx¦sÀÉ®× («ö¡u½T©w¡v)\n" "\t-©ñ±ó¥Ø«e¾Þ§@(«ö¡u¨ú®ø¡v)¡H" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3603,7 +3666,7 @@ msgstr "" "\n" "­nÀx¦s¸Ñ¥]ª©¦¨¥t¤@Àɮ׶ܡH" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3618,7 +3681,7 @@ msgstr "" "\n" "§A­nÀx¦s¸Ñ«Ê¥]ª©¥»¬°¥t¤@Àɮ׶ܡH" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3633,7 +3696,7 @@ msgstr "" "\n" "­nÂмg¨º§ó·s¹LªºÀɮ׶ܡH" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3642,7 +3705,7 @@ msgstr "" "%1\n" "¤w¼Ð°O¦¨°ßŪ¡C¤´­nÂмg¥¦¶Ü¡H" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3657,22 +3720,22 @@ msgstr "" "\n" "­n­«·s¸ü¤J¥¦¶Ü¡H" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Àx¦s¥ªÃäÀɮ׬°" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Àx¦s¥kÃäÀɮ׬°" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3683,7 +3746,7 @@ msgstr "" "%1\n" "®ø¥¢¡C½ÐÀx¦sÀÉ®×°Æ¥»¦AÄ~Äò¡C" -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3691,42 +3754,42 @@ msgid "" "Refresh documents before continuing." msgstr "¦p¥¼­«¾ãÀɮסAWinMerge ¤£¯à¨Ö¤J²§°Ê¡C" -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "¤@©w±o«ü©w¤@­Ó SourceSafe ±M®×¸ô®|¤~¯àÄ~Äò (¨Ò¦p¡G $/MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "¥Ñ VSS ¨ú¥XÀÉ®×..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "°e¦^§ï¹LÀɮɡAª©¥»¨t²Î¦^³ø¤@­Ó¿ù»~¡CµLªkÄ~Äò..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "°õ¦æª©¥»¨t²Î«ü¥O®Éµo¥Í¿ù»~¡C" -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS §@·~¸ê®Æ§¨©M¥Ø«eÀɮצì¸m¤£²Å¦X¡C­nÄ~Äò¶Ü¡H" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "§ä¤£¨ì VSS ¸ê®Æ®w¡I" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "VSS µo¥Í¿ù»~¡G" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3737,7 +3800,7 @@ msgstr "" " ½ÐÀˬdÀ˵ø¹L«áªº²ÕºA¡C\n" " ºM¦^¨ú¥X¡H" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3746,127 +3809,146 @@ msgstr "" "ºM¦^¨ú¥XÀɮ׮ɡAª©¥»¨t²Î¦^³ø¤@­Ó¿ù»~¡C\n" " ½ÐÀˬdÀ˵ø¹L«áªº²ÕºA¡C" -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "µL" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (¦­©ó 5.0 ª©)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ª©©M§ó±ßªºª©¥»)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "ªÅ¥Õ³B¤¤Â_" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "ªÅ¥Õ³B©Î¼ÐÂI³B¤¤Â_" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "¥kÃä¨ì¥ªÃä (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "¥ªÃä¨ì¥kÃä (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "¥kÃä¨ì¥ªÃä (%2 ¤§ %1)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "¥ªÃä¨ì¥kÃä (%2 ¤§ %1)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "¥ªÃä¨ì¥kÃä (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "¥ªÃä¨ì... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "¥kÃä¨ì... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "¥ªÃä¨ì... (%2 ¤§ %1)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "¥kÃä¨ì... (%2 ¤§ %1)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "¥ªÃä (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "¥kÃä (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "¨âÃä (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "¥ªÃä (%2 ¤§ %1)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "¥kÃä (%2 ¤§ %1)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "¨âÃä (%2 ¤§ %1)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "¥ªÃä - ¿ï¨ú¥Ø¼Ð¸ê®Æ§¨¡G" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "¥kÃä - ¿ï¨ú¥Ø¼Ð¸ê®Æ§¨¡G" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ¨ü¼vÅTÀÉ®×)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%2 ¨ü¼vÅTÀɮפ§ %1)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3877,17 +3959,17 @@ msgstr "" "\n" "%1¡H" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "½T©w­n½Æ»s¡G" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "½T©w­n½Æ»s %d ¶µ¥Ø¡G" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3906,502 +3988,502 @@ msgstr "" "\n" "½Ð­«¾ã¤ñ¸û¡C" -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "½T©w­n²¾°£¡G" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "½T©w­n²¾°£ %d ¶µ¥Ø¡G" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "½T»{²¾°£" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "µLªk°õ¦æ¥~³¡½s¿è¾¹ %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "¥¼ª¾À£ÁY®æ¦¡" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "ÀɮצWºÙ" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "¤ñ¹ïµ²ªG" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "¥ªÃä¤é´Á" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "¥kÃä¤é´Á" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "°ÆÀɦW" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "¥ªÃä¤j¤p" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "¥kÃä¤j¤p" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "¥kÃä¤j¤p (²)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "¥ªÃä¤j¤p (²)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "¥ªÃä«Ø¥ß®É¶¡" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "¥kÃä«Ø¥ß®É¶¡" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "¸û·sÀÉ®×" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "¥ªÃäÀɮת©¥»" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "¥kÃäÀɮת©¥»" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "²¦¡µ²ªG" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "¥ªÃäÄÝ©Ê" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "¥kÃäÄÝ©Ê" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "¥ªÃä EOL" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "¥kÃä EOL" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "¥ªÃä½s½X" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "¥kÃä½s½X" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "©¿²¤ªº®t²§" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "µLªk¤ñ¸ûÀÉ®×" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "¤¤Â_ªº¶µ¥Ø" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "²¤¹LªºÀÉ®×" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "²¤¹Lªº¸ê®Æ§¨" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "¶È¥ªÃä¡G%1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "¶È¥kÃä¡G%1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "¤G¶i¨îÀɧ¹¥þ¬Û¦P" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "¤G¶i¨îÀɤ£¦P" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Àɮפ£¦P" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "¨â¸ê®Æ§¨¤£¦P" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "¶È¥ªÃä" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "¶È¥kÃä" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "¿ù»~" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "¤å¦rÀɤº®e¬Û¦P" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "¤å¦rÀɤº®e¤£¦P" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "¸g¹L®É¶¡¡G %ld ²@¬í" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "¤w¿ï¨ú 1 ­Ó¶µ¥Ø" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "¤w¿ï¨ú %1 ­Ó¶µ¥Ø" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "ÀɮצWºÙ©Î¸ê®Æ§¨¦WºÙ¡C" -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "¥]¬A¤l¸ê®Æ§¨®É¤§¤l¸ê®Æ§¨¦WºÙ¡C" -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "¤ñ¸ûµ²ªG¡Aªø¦¡ªí³æ¡C" -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "¥ªÃä­×§ï¤é´Á¡C" -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "¥ªÃä­×§ï¤é´Á¡C" -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "°ÆÀɦW¡C" -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "¥ªÃäÀɮצ줸²Õ¤j¤p¡C" -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "¥kÃäÀɮצ줸²Õ¤j¤p¡C" -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "¥ªÃäÀɮײ¦¡¤j¤p¡C" -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "¥kÃäÀɮײ¦¡¤j¤p¡C" -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "¥ªÃä«Ø¥ß®É¶¡¡C" -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "¥kÃä«Ø¥ß®É¶¡¡C" -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "§iª¾¨ºÃ䦳¸û·sªº­×§ï¤é´Á¡C" -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¥ªÃäÀɮת©¥»¡A¥u¬Y¨ÇÀÉ®×Ãþ«¬¡C" -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "¥kÃäÀɮת©¥»¡A¥u¬Y¨ÇÀÉ®×Ãþ«¬¡C" -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "µu¦¡¤ñ¸ûµ²ªG¡C" -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "¥ªÃäÄÝ©Ê¡C" -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "¥kÃäÄÝ©Ê¡C" -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "¥ªÃäÀÉ®× EOL Ãþ«¬" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "¥kÃäÀÉ®× EOL Ãþ«¬" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "¥ªÃä½s½X¡C" -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "¥kÃä½s½X¡C" -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "³Q©¿²¤ªºÀɮפ¤ªº®t²§­Ó¼Æ¡C¬J³Q©¿²¤¡A´N¤£¯à¦X¨Ö¡C" -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Àɮפ¤ªº®t²§­Ó¼Æ¡C¦¹¼Æ¤£¥]¬A³Q©¿²¤ªº®t²§¡C" -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "¬O¤G¶i¨îÀÉ¡A´NÅã¥Ü¬P¸¹ (*)" -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "¤ñ¸û %1 ©M %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "³r¸¹¤À¹j¦Cªí" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "¸õ®æ¸¹¤À¹j¦Cªí" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "³æ¯Â HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "³æ¯Â XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "³ø§iÀɤw¸g¦s¦b¡CÂл\¤§¡H" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4410,32 +4492,32 @@ msgstr "" "²£¥Í³ø§i®Éµo¥Í¿ù»~¡G\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "¦¨¥\²£¥Í³ø§i¡C" -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "¬Û¦PÀɮ׶}±Ò¨ì¨âÃä¡C" -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "©Ò¿ïÀɮק¹¥þ¬Û¦P¡C" -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "¤ñ¹ïÀɮ׮ɵo¥Í¿ù»~¡C" -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "µLªk«Ø¥ß¼È¦sÀɮסC½ÐÀˬd¼È¦s¸ô®|¤§³]©w¡C" -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4450,17 +4532,17 @@ msgstr "" "\n" "ª`·N¡G¦p­n±N©Ò¦³´«¦æ¦r¤¸µø­Y¬Û¦P¡A±o¦b(½s¿è > ¿ï¶µ) ¿ï¶µ¹ï¸Ü²°¤§¡u¤ñ¸û¡v­¶ÅÒ³]©w¿ï¶µ¦¨¡u©¿²¤´«¦æ¦r¤¸¤§®t²§¡v¡C" -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "©Ò¿ïªº¸ê®Æ§¨µL®Ä¡C" -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "½s¿è¾¹¤£¯à¶}±Ò¤G¶i¨îÀÉ¡C" -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4475,7 +4557,7 @@ msgstr "" "%1\n" "¨ì¥t¤@Ãä¡AµM«á¶}±Ò¨â§¨¶Ü¡H" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4486,156 +4568,156 @@ msgstr "" "§Y¨Ïºû«ù¦U§O½X­¶·|¤À§O¬Ý¨ì¤å¦r¡A¦ý¦X¨Ö/½Æ»s·|¦³¦MÀI¡C\n" "­n¨Ï¥Î¬Û¦Pªº¹w³] windows ½s½X­¶¥h¬Ý¨âÃä¶Ü¡H(«Øij)" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "¦]½s½X°ÝÃD¾É­P¤º®eµLªk¥¿±`§e²{¡G¨â­ÓÀɮ׬Ҧp¦¹¡C" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "µL®t²§" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "¦æ¤º®t²§" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "¤w¨ú¥N %1 ­Ó¦r¦ê¡C" -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "§ä¤£¨ì \"%s\" ¦r¦ê" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" # also refer to line 5584 # ¦ì¸mµ¡®æ -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "»·±æµ¡®æ" # also refer to line 5578 # ®t²§µ¡®æ -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "ªñ¹îµ¡®æ" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "¸ÉºóÀɦ¨¥\¼g¤J¡C" -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ¶µ¥Ø§ä¤£¨ì©Î¥¦¬O¸ê®Æ§¨¡I" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ¶µ¥Ø§ä¤£¨ì©Î¥¦¬O¸ê®Æ§¨¡I" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "¸ÉºóÀɤw¦s¦b¡C­nÂмg¥¦¶Ü¡H" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 ­ÓÀɮפw¿ï¨ú]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "¤@¯ë" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "¯ßµ¸" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "¦P¤@¤Æ" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "µLªk¼g¤J¨ìÀÉ®× %1¡C" -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "«ü©wªº¿é¥X¸ô®|¤£¬Oµ´¹ï¸ô®|¡G%1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "«ü©w¤@­Ó¿é¥XÀÉ" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "µLªk±q¤G¶i¨îÀɫظɺóÀÉ¡C" -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "µLªk±q¥Ø¿ý«Ø¸ÉºóÀÉ¡C" -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4646,12 +4728,12 @@ msgstr "" "\n" "«Ø¸ÉºóÀÉ«e±o¥ýÀx¦sÀɤº©Ò¦³²§°Ê¡C" -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "¸ê®Æ§¨¤£¦s¦b¡C" -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4662,37 +4744,37 @@ msgstr "" "§ä¤£¨ì¤ä´©À£ÁYªº©Ò¦³¥²­n¤¸¥ó (7-Zip ©M/©Î Merge7z*.dll)¡C\n" "½Ð°Ñ¦Ò¤â¥U¨ú±o§ó¦h¦³ÃöÀ£ÁY¤ä´©©M±Ò¥ÎÀ£ÁYªº¸ê°T¡C" -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "¿ï¨úÀÉ®×¥H¶×¥X" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "¿ï¨úÀÉ®×¥H¶×¤J" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "±qÀɮ׶פJ¿ï¶µ¡C" -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "¶×¥X¿ï¶µ¨ìÀɮסC" -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "µLªk±qÀɮ׶פJ¿ï¶µ¡C" -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "µLªk¶×¥X¿ï¶µ¨ìÀɮסC" -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4703,249 +4785,249 @@ msgstr "" "\n" "­nÄ~Äò¶Ü¡H" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "²V¦X" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Ãþ«¬" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "¸Ñ¥]¾¹" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "¥ý¦æ³B²z¾¹" # What does "Editor script" mean? Perhaps "editing scripts" or "scripts to edit"? -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "½s¿è¾¹ÀHĶ§Y¦æ½X" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" # Instead of "one file only needs the extension" I would suggest "at least one file should have a needed extension". -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "¥H¿ï¥Îªº¸Ñ¥]¾¹¥Î¨ì¨â­ÓÀÉ (¦Ü¤Ö¤@­ÓÀɮ׻ݰÆÀɦW)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "¤£­n¥ý¦æ³B²z¾¹ (±`ºA)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "«Øijªº¥~±¾" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "¨ä¥L¥~±¾" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "¨p¤H½sĶ¡G%1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "¥~±¾³]©w" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "§ä¤£¨ì WSH - °±¥Î .sct «ü¥O½X" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "<µL>" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "<¦Û°Ê>" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "¦Ü²Ä %1 ¦æ(&O)" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Ãö³¬" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "±qÀɮרt²Î" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "±q MRU ªí" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "µL°ª«G«×Åã¥Ü" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "¥iÄ⦡ª«¥ó" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po index 94fa2df98..5a1feae19 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -78,7 +78,7 @@ msgid "Cu&t" msgstr "Od&reži" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Kopiraj" @@ -89,7 +89,7 @@ msgid "&Paste" msgstr "&Zalijepi" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "Idi &na redak" @@ -100,22 +100,25 @@ msgid "Op&en" msgstr "&Otvori" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "in&staliranim programom" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "&vanjskim ureðivaèem" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&s..." @@ -153,7 +156,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "Po&veæaj" @@ -165,8 +168,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Nevidljiva" @@ -183,49 +186,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Datoteka" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Nova usporedba\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Usporedi...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Otvori &konfliktne..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Otvori &usporedbu...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Po&hrani usporedbu..." @@ -237,274 +240,274 @@ msgstr "Zadnje usporedbe" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< ništa >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "I&zlaz" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Ureðivanje" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "Pos&tavke..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Izgled" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "Traka &alata" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Male ikone" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Velike ikone" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "Traka &statusa" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Traka &oznaka panela" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Alati" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filtri..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Pohrani razlike (Patch)..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "Doda&ci" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "&Ruèno raspakiravanje" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatsko raspakiravanje" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Uèitaj dodatke ponovo" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "Paneli i &okna" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Zatvori panele" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Zatvori &sve panele" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "&Drugi panel\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Okna &vodoravno" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Okna &okomito" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "Okna &kaskadno" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Pomoæ" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge Pomoæ\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "Po&dešenost" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU javna licenca" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&O WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Samo za èitanje - l&ijeva" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Samo za èitanje - d&esna" @@ -515,7 +518,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Oznaèi &sve\tCtrl+A" @@ -537,1751 +540,1811 @@ msgstr "Prika #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Prikaži d&esne unikatne stavke" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Prikaži &izostavljene stavke" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Prikaži &binarne datoteke" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Prikaži skri&vene stavke" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "Prikaz &stabla" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "&Otvori sve podmape" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "&Zatvori sve podmape" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Izbor &fonta..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Koristi standardni f&ont" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Usporedbena &statistika" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "Osv&ježi\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Osvježi odabir\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "U&sporedo" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Us&poredi\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Slijedeæa razlika\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Prethodna razlika\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Prva razlika\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktivna razlika\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Zadnja razlika\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopiraj u &desno\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopiraj u &lijevo\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Obriši\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Prilagodba kolona..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Pohrani &izvještaj..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Pohrani\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "&Lijevu datoteku" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "&Desnu datoteku" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Ispis" -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Postava &stranice" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "&Pregled ispisa" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Završi retke prema" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "Usporedni naèin" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "De&kodiranje datoteke..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Poništi\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Vrati\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Od&reži\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopiraj\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Zalijepi\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Istakni &razliku\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Naði...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Za&mijeni...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Dodatno" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopiraj s brojevima redaka\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&Oznake" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Zamijeni oznake\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Slijedeæa oznaka\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Prethodna oznaka\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "Ukloni sve oznake" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Idi &na...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Po&veæaj\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "&Smanji\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Izvorna velièina\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Oznaèavanje sintakse" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "Za&kljuèaj panele" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "Skriv&eni znaci i razmaci" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Prikaži razli&èitost redaka" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Prikaži &brojeve redaka" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Prikaži &margine" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "Pre&lomi retke" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "&Zamijeni panele" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Panel &razlika" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Panel &položaja" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopiraj u de&sno i nastavi\tAlt+Ctrl+desno" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopiraj u lije&vo i nastavi\tAlt+Ctrl+lijevo" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Kopiraj sve u des&no" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Kopiraj sve u &lijevo" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Dodaci" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Skripte" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "&Usporedba" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&Lijevi do desni" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "L&ijevi do..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "&Desni do lijevi" +msgid "Left to Right (%1 of %2)" +msgstr "Lijevo do desno (%1 od %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "D&esni do..." +msgid "Left to... (%1 of %2)" +msgstr "Lijevo do... (%1 od %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Pre&mjesti" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&Lijevi do..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&Desni do..." +msgid "Right to Left (%1 of %2)" +msgstr "Desno do lijevo (%1 od %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Desno do... (%1 od %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Pre&mjesti" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Obriši" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&lijevu datoteku" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&desnu datoteku" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Obje" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "P&reimenuj" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Sakrij stavke" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "&Otvori lijevi" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Otvori &desni" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Kopiraj &stazu" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&Lijevo (%1 od %2)" +msgid "Left (%1 of %2)" +msgstr "Lijevo (%1 od %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 +#, c-format +msgid "Middle (%1 of %2)" +msgstr "" + +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 #, c-format -msgid "&Right (%1 of %2)" +msgid "Right (%1 of %2)" msgstr "Desno (%1 od %2)" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Oba panela (%1 od %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Obje (%1 od %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Kopiraj &nazive datoteka" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&Lijevo... (%1 od %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&Desno...(%1 od %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Obje...(%1 od %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Razlike... (%1 od %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Osvježi" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Lijevi Shell izbornik" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Desni Shell izbornik" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Kopiraj stazu" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Kopiraj &naziv datoteke" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Dodaci - postavke " -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Nema dodataka" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Automatski dodaci" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Idi &na razliku" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Ne premještaj blokove" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "Premještaj &svih blokova" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Premjesti blok &ove razlike" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "&Razmaci prema" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "&Usporedi" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "Zanemari &izmjene" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Zanemari &sve" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "&Razlikuj V/m slova" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "&Zanemari razlièitost oznaka završetka retka (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Potpun sadržaj" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Skraæeni sadržaj" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Datum promjene" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Datum promjene i velièina" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Velièina" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "O WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Osobni uradak)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "WinMerge stranica na Web-u" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "U redu" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Suradnici" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Odabir datoteke ili mape" -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Odabir..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "&Odabir..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "&Odabir..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Od&abir..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Arhiver:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "Oda&bir..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "Ukljuèi i &podmape" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Odustajem" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Pomoæ" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Datoteke ili mape za usporedbu" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Baza podataka:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Usporedba:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Korisnik:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Lozinka" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Poveži s odredišnom VSS usporedbom" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Primijeni na sve stavke" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Provjera" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Pohrana kao..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Izbor programa:" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Izbor programa:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Staza do cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Opæe" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Uvijek kreni od &prve razlike" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Zatvori usporedbu tipkom &ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Prethodno provjeri stazu u dijalogu odabira" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Samo &jedna instanca WinMerge-a" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "&Upitaj prije zatvaranja višestrukih usporedbi" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "&Zadrži oznake vremena i datuma u usporedbi" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Pri pokretanju prikaži dijalog\"Odabir datoteke ili mape\"" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Otvori dijalog &samodovršenja" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge omoguæuje skrivanje uobièajenih poruka. Pritisnite 'Poništi' da poruke opet budu vidljive." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Poništi" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Naði" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "&Pojam:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Poklapanje &cijele rijeèi" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Osjetljivost na &V/m slova" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "&Algoritam" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "Ne pre&lamaj završetak datoteke" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "Traži &slijedeæi" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&U redu" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Zamijeni" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Zamijeni s:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "&Bez preloma teksta" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Zamijeni u" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "oznaèenom" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "&cijeloj datoteci" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Zamijeni" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Zamijeni &sve" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Provjeri" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Komentari" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Provjeri ponovo" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Filtar redaka" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Omoguæi filtriranje redaka" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Ispravan algoritam (jedan po retku):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Novi" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Ureðivanje" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Ukloni" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Boje" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Razlike:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Oznaèena razlika:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Pozadina" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Obrisano" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Zanemarene razlike:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Premješteno:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Premještaj oznaèenog:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Razlièite rijeèi:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Razlike oznaèene rijeèi:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Predpodešeno" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Sistem" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Premjesti obrisano u koš?" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&Vanjski ureðivaè:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Naziv mape filtara:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Mapa privremenih datoteka" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "Mapa s&istemska, privremena" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "Ko&risnikova mapa" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Pohrana razlika (Patch)" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "&Lijeva dat." -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "&Desna dat." -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "&Obrni D<->L" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "&Prikljuèi postojeæoj datoteci" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Pohranu u:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "O&dabir..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Naèin prikaza" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "St&il" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Dubina:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "&Zanemari prazne retke" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "&Ukljuèi naredbeni redak" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Otvori u vanjskom pregledniku." -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Prikaži kolone" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Pomakni &gore" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Pomakni &dole" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Izbor arhivera" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Arhiver datoteka:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Prikaži sve arhivere bez provjere ekstenzije" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Popis ekstenzija" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Opis:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Stani" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Usporedba stavki..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Stavki usporeðeno:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Stavki ukupno:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Idi na" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "Redak &br:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "datoteku" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "u datoteci" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "&redak" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&razliku" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "Idi &na" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Usporedba" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Skriveni znaci i razmaci" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Usporedi" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "Zanemari &izmjene" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Zanemari &sve" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Zanemari prazne &retke" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Zanemari V/m &slova" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Omoguæi &razlikovanje premještenih blokova" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "&Jednake retke" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Filtriraj komentare" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Ureðivanje" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&Istakni sintaksu" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "&Automatski ponovo pretraži" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "Zadrži izvorni naèin oznaèavanja kraja redaka" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabulatori" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Velièina tabulatora" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "&Umetni tabulator" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "&Umetni razmak" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Isticanje razlièitosti" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Unutar retka" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "Svaki &znak" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "&Rijeæ:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Filtar redaka" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Test" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Instaliraj..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Novi..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Ureðivanje..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Brisanje..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Pohraniti izmijenjenu datoteku?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Datoteka s lijeva" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Pohrani promjene" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Odustajem od izmjena" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Datoteka s desna" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "Pohrani promjene" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Odustajem od izmjena" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Kodna stranica" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Standardna kodna stranica" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Odaberite standardnu kodnu stranicu za uèitanje ne-Unicode datoteka:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2290,692 +2353,692 @@ msgstr "" "Odredi info kodne stranice za datoteke: .html, .rc, .xml \n" "Nije potrebno ponovno pokretanje" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Standardna kodna stranica sistema" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Prema korisnikovom suèelju WinMerge-a" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Kodna stranica prema želji:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Postavke" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Skupina" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Uvoz..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Izvoz..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Dijalog" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Kljuène rijeèi:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Nazivi funkcija:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Komentari:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Brojevi:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operatori:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Pojmovi:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Predobraðeno:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Korisnik 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Korisnik 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Podebljano" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Izvještaj usporedbe mapa" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Datoteka izvještaja:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Odabir..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopiraj u meðumemoriju" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Zajednièki ili osobni filtar" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Koji tip filtra želite stvoriti?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Zajednièki Filtar (za sve korisnike raèunala)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Osobni filtar (samo za trenutnog korisnika)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Rad s arhivima" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "Omoguæi rad s &arhivima" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Oèitaj tip arhiva iz zaglavlja datoteke" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Usporedba statistike" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Mape:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Datoteke:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Razlika" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Tekst" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binarno:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Unikat" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Lijevo:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Desno:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Identièno" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Ukupno:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Zatvori" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Primjeni na" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Primjeni na)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Odabir kodne stranice za" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&Uèitavanje datoteke:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "&Pohrana datoteke:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&Ista kodna stranica za obje" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Primjeni" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Odustajem" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Test filtar" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Testiranje filtra..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Unos teksta za provjeru" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Naziv mape" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Rezultat:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Test" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Zatvori" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&Koristi odabrane boje" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Korisnièke boje" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Skriveni znaci i razmaci:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Pravilan tekst" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Odabir:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Staze" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Lijevi panel:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Samo za èitanje" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Desni panel:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Samo za èitanje" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filtar" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Otvori..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Pohrani..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Sigurnost" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Pohrani rezervnu datoteku pri:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Usporedbi &mapa" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Usporedbi &datoteka" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Pohrani rezervnu datoteku u:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "&Izvornu mapu datoteke" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&Standardnu mapu rezervnih kopija" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Naziv rezervne datoteke" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&Dodaj .bak ekstenziju" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "&Dodaj datum i vrijeme" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Potvrdite kopiranje" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Kopirati XXX stavku?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "S lijeva" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "U desno" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Da" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Ne" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Dodaci" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "&Omoguæi dodatke" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Shell integracija" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Explorer" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Omoguæi &napredni izbornik." -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "&Dodaj u kontekstni izbornik" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Mapa" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "&Zastani na prvoj razlici" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "&Zanemari razlike manje od 3 sekunde" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binarno" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "041a04e2" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x41a, 1250" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Nepoznata greška pri otvaranju usporedbe" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Nepoznata greška pri pohrani usporedbe" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Usporedba" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Usporedba je uèitana." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Usporedba je pohranjena." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2994,7 +3057,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge Usporedba datoteka" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3013,7 +3076,7 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Usporedba mapa" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3022,143 +3085,143 @@ msgstr "" "Razvojni tim:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, fuzzy, 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 je program BEZ IKAKVE GARANCIJE. To je besplatan softver koji možete dalje distribuirati pod odreðenim okolnostima prema GNU javnoj licenci koju pogledajte u datoteci pomoæi." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Prekini" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Ponovi" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Zanemari" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Zanemari &sve" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Da" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Da za &sve" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Ne" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Ne za s&ve" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Nastavi" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Izostavi" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Izostavi &sve" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Ne prikazuj više ovu poruku." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Ne &pitaj ponovo." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Programi" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Razlike" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "S lijeva:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "U lijevo:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "S desna:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "U desno:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "inaèica %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Postavke" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Ponovni prikaz svih poruka" -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3169,84 +3232,84 @@ msgstr "" "\n" "Molimo koristite vrijednosti 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Otvori" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programi |*.exe;*.bat;*.cmd|Sve datoteke (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Sve datoteke (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge datoteke (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "INI datoteke (*.ini)|*.ini|Sve datoteke (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Tekst datoteke (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Sve datoteke (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|Sve datoteke (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML datoteke (*.xml)|*.xml|Sve datoteke (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Naziv" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Položaj" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filtri..." -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Opis" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Izaberite datoteku kao novi filtar" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "FLT datoteke (*.flt)|*.flt|Sve datoteke (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3259,7 +3322,7 @@ msgstr "" "Molimo, kopirajte datoteku %1 u WinMerge/Filters -mapu:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3272,7 +3335,7 @@ msgstr "" "\n" "Provjerite postoji li mapa i njenu dostupnost." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3283,7 +3346,7 @@ msgstr "" "\n" "Molimo, odredite ju u 'Postavke/Sistem'." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3296,12 +3359,12 @@ msgstr "" "\n" "Možda je zaštiæena - samo za èitanje?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Locirajte datoteku filtriranja za instalaciju" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3312,17 +3375,17 @@ msgstr "" "\n" "Ne mogu je pohraniti u mapu filtara." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filtar veæ postoji. Natpisati ga?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Algoritam" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3333,173 +3396,173 @@ msgstr "" "\n" "Ako odaberete 'Ne', to možete uæiniti i kasnije.." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&Staza do SS.EXE:" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Rezultati usporedbe mapa" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Usporedba datoteka" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Neimenovan" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Neimenovan" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Tuðe datoteke" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Moje datoteke" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Redak: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Usporedo" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Razlika: %1 od %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "Naðeno razlika: %1" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "Naðeno razlika: 1" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "SÈ" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Stavka %1 od %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Stavke: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Odaberite dvije datoteke ili mape za usporedbu" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Izbor mape" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Odabir dvije datoteke ili mape za usporedbu." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Nedostaje staza do lijeve datoteke!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Nedostaje staza do desne datoteke!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Obje staze su krive!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Molim izaberite dvije datoteke koje prihvaæa arhiver." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Ne mogu usporediti datoteku i mapu." -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Nema datoteke: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Datoteka nije raspakirana: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3512,12 +3575,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Ne mogu podjeliti konfliktnu datoteku." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3528,27 +3591,27 @@ msgstr "" "%1\n" "nije konfliktna." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Pohrani kao" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Pohraniti izmjene %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 smo za èitanje. Natpisati zaštiæenu datoteku? (Stisnite 'Ne', za pohranu pod novim nazivom.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Greška pri stvaranju rezervne datoteke" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3561,7 +3624,7 @@ msgstr "" "\n" "Nastaviti?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3578,7 +3641,7 @@ msgstr "" "\t- Pritisnite 'U redu' za pohranu pod drugim nazivom\n" "\t- ili pritisnite 'Odustajem' za prekid postupka." -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3593,7 +3656,7 @@ msgstr "" "\n" "Pohraniti nespakiranu verziju kao datoteku?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3608,7 +3671,7 @@ msgstr "" "\n" "Pohraniti nespakiranu verziju kao datoteku?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3623,7 +3686,7 @@ msgstr "" "\n" "Natpisati datoteku?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3632,7 +3695,7 @@ msgstr "" "%1\n" "je oznaèena samo za èitanje. Natpisati zaštiæenu stavku?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3647,22 +3710,22 @@ msgstr "" "\n" "Želite li ponovno uèitanje datoteke?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Pohrani lijevu datoteku kao" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Pohrani desnu datoteku kao" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3673,7 +3736,7 @@ msgstr "" "%1\n" "je nestala. Za nastavak, pohranite kopiju." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3684,42 +3747,42 @@ msgstr "" "\n" "Osvježite dokumente prije nastavka." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Odredite SourceSafe stazu usporedbe, ako želite nastaviti (ie: $/MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Provjera datoteka na VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Sistem pokazuje grešku dok pokušava provjeriti datoteku. Nastavak nemoguæ..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Greška pri izvršenju sistemske naredbe." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS radna mapa i lokacija aktivne datoteke se ne poklapaju. Nastaviti?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Nema VSS baze" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Greška iz VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3730,7 +3793,7 @@ msgstr "" " Molimo pregledajte podešenost korištenog izgleda. .\n" " Odustati?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3739,127 +3802,146 @@ msgstr "" "Versioning Sistem pokazuje grešku dok pokušava provjeriti datoteku.\n" " Molimo pregledajte podešenost korištenog izgleda. " -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Ništa" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 i viši)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 i viši)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Stani na razmaku" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Stani na razmaku ili interpunkciji" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Desno do lijevo (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Lijevo do desno (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Desno do lijevo (%1 od %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Lijevo do desno (%1 od %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Lijevo do desno (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Lijevo do... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Desno do... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Lijevo do... (%1 od %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Desno do... (%1 od %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Lijevo (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Desno (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Oba panela (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Lijevo (%1 od %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Desno (%1 od %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Oba panela (%1 od %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Lijeva strana - odaberite odredišnu mapu:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Desna strana - odaberite odredišnu mapu:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 datoteka doraðeno)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 od %2 datoteka doraðeno)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3870,17 +3952,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Kopirati? -" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Kopirati %d stavku:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3899,502 +3981,502 @@ msgstr "" "\n" "Osvježite usporedbu." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Premjestiti?" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Premjestiti %d stavku?" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Potvrdite premještanje" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Greška pri pokretanju vanjskog editora: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Nepoznat oblik arhiva" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Naziv datoteke" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Rezultat usporedbe" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Datum lijevo" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Datum sadašnji" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Tip" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Velièina lijevo" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Velièina desno" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Velièina desno (skraæeno)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Velièina lijevo (skraæeno)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Tim lijeve datoteke" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Tim desne datoteke" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Novija datoteka" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Verzija lijeve datoteke" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Verzija desne datoteke" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Rezultat skraæeno" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Atributi lijevo" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Atributi desno" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Završetak reda lijevo" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Završetak retka desne datoteke." -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Kodiranje lijevo" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Kodiranje desno" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Zanemari razlike" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Ne mogu usporediti datoteke" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Odbaèena stavka" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Izostavljene datoteke" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Izostavljene mape" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Samo lijevi: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Samo desni: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Binarne datoteke su identiène" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Binarne datoteke su razlièite" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Datoteke su razlièite" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Mape su razlièite" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Samo lijevo" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Samo desno" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Greška" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Tekstovi su identièni" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Tekstovi su razlièiti" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Proteklo vrijeme: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 stavka oznaèena" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 stavki oznaèeno" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Naziv datoteke ili mape." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nazivi podmapa ako su podmape ukljuèene." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Rezultat usporedbe, duži oblik." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Lijeva strana - datum promjene." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Desna strana - datum promjene." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Tip (ekstenzija) datoteke" -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Velièina u bajtima, lijeve datoteke." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Velièina u bajtima, desne datoteke." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Skraæenice lijeve datoteke" -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Skraæenice desne datoteke" -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Lijeva strana - vrijeme stvaranja." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Desna strana - vrijeme stvaranja." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Koja strana je promijenjena ranije?" -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verzija na lijevoj strani, samo za neke tipove." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verzija na desnoj strani, samo za neke tipove." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Rezultat usporedbe, kraæi oblik." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Atributi lijeve datoteke" -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Atributi desne strane" -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Naèin završetka retka lijeve datoteke." -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Naèin završetka retka desne datoteke." -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Kodirana lijeva strana" -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Kodiranje desne strane" -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Broj zanemarenih razlika u datoteci. Zanemarene razlike ne mogu biti spajane u WinMergeu." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Broj razlika u datoteci. Zanemarene razlike nisu ukljuèene." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Prikaži zvjezdicu (*) uz binarnu datoteku." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Usporedi %1 s %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Popis odvojen zarezom" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Popis odvojen tabulatorom" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Jednostavni HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Jednostavni HTML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Datoteka izvještaja veæ postoji. Natpisati?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4403,32 +4485,32 @@ msgstr "" "Greška pri stvaranju izvještaja:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Izvještaj je uspješno stvoren." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Ista datoteka je otvorena u oba panela." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Datoteke su identiène." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Greška pri usporedbi datoteka." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Ne mogu stvoriti privremenu datoteku. Provjerite postavke staze." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4443,17 +4525,17 @@ msgstr "" "\n" "Napomena: Želite li uvijek zadržati li razlièitost prijelaza u drugi redak, odaberite 'Zanemari razlièitost prijelaza u drugi redak..' u kartici usporedbi u oknu dijaloga 'Ureðivanje/Postavke." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Odabrana mapa je pogrešna." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ne mogu otvoriti binarnu datoteku u ureðivaèu" -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4468,7 +4550,7 @@ msgstr "" "%1\n" "na drugoj strani i otvoriti je?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4479,152 +4561,152 @@ msgstr "" "Prikaz svake datoteke u vlastitoj ks je ljepši, ali dovodi do teškoæa prilikom spajanja ili kopiranja.\n" "Preporuèamo obje datoteke prikazati u Windows prednamještenoj kodnoj stranici?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Greškom pri kodiranju izgubljena je informacija: obje datoteke" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Nema razlike" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Razlièiti redak" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Zamijenjeno %1 pojam (pojmova)." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ne mogu naæi pojam \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Položaj panela" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Panel razlika" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Datoteka razlika je pohranjena." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. stavka ili mapa ne postoji!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. stavka ili mapa ne postoji!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Datoteka razlika veæ postoji. Natpisati?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 datoteka odabrano]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Uobièajeno" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Detaljnije" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Združeno" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Ne mogu pohraniti u datoteku" -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Dana staza ne odgovara: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Odredite izlaznu datoteku" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ne mogu stvoriti datoteku razlika iz binarnih datoteka" -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ne mogu stvoriti datoteku razlika mapa." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4635,12 +4717,12 @@ msgstr "" "\n" "Prije stvaranja datoteke razlika, sve datoteke trebaju biti pohranjene." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Mapa ne postoji" -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4651,37 +4733,37 @@ msgstr "" "Nema nužnih komponenata (7-zip i/ili Merge7z*.dll) .\n" "Pregledajte upute kako omoguæiti rad s arhivama." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Odabir datoteke za izvoz" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Odabir datoteke za uvoz" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Uvoz postavki u datoteku" -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Izvoz postavki u datoteku" -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Greška pri uèitanju postavki" -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Greška pri pohrani odabranih postavki." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4692,247 +4774,247 @@ msgstr "" "\n" "Nastaviti?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Tip" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Raspakiravaè" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Ureðivaè skripti" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Arhiver æe se koristiti za obje datoteke (jedna treba samo ekstenziju)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Bez dodataka (uobièajeno)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Preporuèljivi dodaci" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Ostali dodaci" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Osobni uradak: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Postavke dodataka" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH dodatak nije naðen! - .sct skripte su onemoguæene" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "Ništa" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "Automatski" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "Idi &na redak" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Onemoguæeno" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Sistem datoteka" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Popis zadnje korištenih" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Nije oznaèeno" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Prenosni objekt" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Resursi" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po index 2a23255c6..cbf654d9a 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -78,7 +78,7 @@ msgid "Cu&t" msgstr "Vyj&mout" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Kopírovat" @@ -89,7 +89,7 @@ msgid "&Paste" msgstr "&Vložit" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "Pø&ejít na..." @@ -100,22 +100,25 @@ msgid "Op&en" msgstr "&Otevøít" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "pøidruženou &aplikací" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "externím &editorem" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&zvolit..." @@ -153,7 +156,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Velikost písma" @@ -165,8 +168,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Skrýt" @@ -183,49 +186,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Soubor" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Nové\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Otevøít...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "" #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Otevøít pro&jekt...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Uložit &projekt..." @@ -237,274 +240,274 @@ msgstr "Naposledy pou #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< žádné >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "&Konec" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "Úpr&avy" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "Možnost&i..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Zobrazit" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "Panel &nástrojù" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Malý" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Velký" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "&Stavový øádek" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Panel &záložek" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Nástroje" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filtry..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Opravný soubor..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Pluginy" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "Pøevádìt &ruènì" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "Pøevádìt &automaticky" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "Znovu &naèíst" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&Okno" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Zavøít" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Z&avøít vše" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Z&mìnit panel\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Vedle sebe &vodorovnì" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Vedle sebe &svisle" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Na sebe" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "Nápo&vìda" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&Obsah a rejstøík\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "&Nastavení" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "Obecná veøejná licence &GNU" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "O &aplikaci WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "L&evý pouze pro ètení" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Pr&avý pouze pro ètení" @@ -515,7 +518,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Vybr&at vše\tCtrl+A" @@ -537,2594 +540,2654 @@ msgstr "Uk #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Ukázat p&ravé jedineèné položky" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Ukázat pø&eskoèené položky" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Ukázat &binární soubory" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Ukázat s&kryté položky" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "Stro&mová struktura" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "Rozbal&it všechny podsložky" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "Sbali&t všechny podsložky" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Vybrat písmo..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Použít výchozí písmo" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "St&atistika porovnání" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "&Obnovit\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Obnovit &vybrané\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "Slo&uèit" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Porov&nat\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Další rozdíl\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Pøedchozí rozdíl\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Pr&vní rozdíl\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Ak&tuální rozdíl\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Po&slední rozdíl\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopírovat dop&rava\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopírovat do&leva\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "Odstran&it\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "Vlastní &sloupce..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "&Protokol porovnání..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Uložit\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Uložit &levý" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Uložit p&ravý" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Tisk..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "V&zhled stránky" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Ná&hled..." -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "Pøevést konce øá&dkù" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "Režim sl&uèování\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "Kódo&vání souborù" -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Zpìt\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Znov&u\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Vyj&mout\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopírovat\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Vložit\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Vybrat roz&díl v øádku\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Najít...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Na&hradit...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "&Rozšíøené" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopírovat s èísly øádkù\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "Zá&ložky" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Pøepnout &záložku\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Další záložka\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Pøedchozí záložka\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "Zrušit &všechny záložky" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Pø&ejít na...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Z&vìtšit\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Z&menšit\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normální\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Zvýraznìní syntaxe" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "&Uzamknout panely" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "Zobrazit ne&tisknutelné znaky" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Zobrazit rozdíly v øá&dcích" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Zobrazit èísla øád&kù" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Zobrazit &levé okraje" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "Zala&movat øádky" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Z&amìnit panely" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "&Rozdílový panel" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "&Polohový panel" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopírovat dopr&ava a na další\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopírovat dol&eva a na další\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "&Kopírovat vše doprava" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "K&opírovat vše doleva" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "Skrip&ty" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "&Porovnat" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&Levé doprava" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "L&evé do..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "P&ravé doleva" +msgid "Left to Right (%1 of %2)" +msgstr "&Levé doprava (%1 z %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "Pr&avé do..." +msgid "Left to... (%1 of %2)" +msgstr "L&evé do... (%1 z %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "Pø&esunout" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&Levé do..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "P&ravé do..." +msgid "Right to Left (%1 of %2)" +msgstr "P&ravé doleva (%1 z %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Pr&avé do... (%1 z %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "Pø&esunout" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "Odstran&it" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&Levé" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "P&ravé" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "O&boje" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Pøej&menovat" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Skrýt položky" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "Otevøít &levé" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Otevøít p&ravé" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Kopírovat &umístìní souborù" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" +msgid "Left (%1 of %2)" msgstr "&Levé (%1 z %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" +msgid "Middle (%1 of %2)" +msgstr "" + +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" msgstr "P&ravé (%1 z %2)" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "O&boje (%1 z %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "O&boje (%1 z %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Kopírovat &název souboru" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Archivovat" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&Levé... (%1 z %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "P&ravé... (%1 z %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "O&boje... (%1 z %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "Ro&zdíly... (%1 z %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Obnovit" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Levá systémová nabídka" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Pravá systémová nabídka" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "Kopírovat celé &umístìní" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Kopírovat &název souboru" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "&Pøejít na øádek" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Nezobrazovat pøesunuté bloky" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Všechny pøesunuté bloky" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Pøesunutý blok pro ak&tuální rozdíl" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "Prázdná místa" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "P&orovnávat" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "Ignorovat &zmìny" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Ignorovat &všechny" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "Rozlišovat &malá a velká písmena" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Ignorovat rozdíly v &koncích øádkù (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "&Zpùsob porovnání:" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Plný obsah" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Rychlý obsah" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Datum zmìny" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Datum zmìny a velikost" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Velikost" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "O aplikaci WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Navštivte domovskou stránku WinMerge!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Pøispìvatelé" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Vybrat soubory nebo složky..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Procházet..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "Pr&ocházet..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Procházet..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "&Vybrat..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "Pø&evadìè:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "Vy&brat..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "Vèetnì pod&složek" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Storno" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Nápovìda" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Soubory nebo složky k porovnání" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "" -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Systém sledování verzí" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Systém sledování verzí:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Cesta k programu cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Obecné" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automaticky posunout na pr&vní rozdíl" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Zavírat okna klávesou &Esc" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Automaticky &ovìøovat cesty v dialogu Otevøít" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Povolit pouze jedno &hlavní okno aplikace" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Dotázat se na &zavøení více oken" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "Z&achovávat pùvodní èas souboru" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "&Po spuštìní vybrat soubory nebo složky" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Automatické &dokonèování:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" "Nìkterá obecná okna se zprávami je možno skrýt.\n" "Po stisknutí tlaèítka Vrátit se všechna tato okna opìt budou objevovat." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "V&rátit" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Najít" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "C&o hledat:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Pouze &celá slova" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "&Rozlišovat malá a velká písmena" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "R&egulérní výraz" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "Zastavit na &konci souboru" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Najít další" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Nahradit" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Èí&m nahradit:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "Zastavit na &konci souboru" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Nahrazovat" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "ve vý&bìru" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "v ce&lém souboru" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "Na&hradit" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Nahradit &vše" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Komentáøe" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Filtrování øádkù" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Povolit filtrování øádkù" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulérní výrazy (jeden na øádek):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "&Nový" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Upr&avit" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "O&dstranit" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Barvy" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Rozdíl:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Vybraný rozdíl:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Pozadí" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Chybìjící" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Text" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Ignorovaný rozdíl:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Pøesunutý blok:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Vybraný pøesunutý blok:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Rozdílné slovo:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Vybrané rozdílné slovo:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "&Pùvodní" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Systém" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Odeslat odstranìné soubory do &koše" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&Externí editor:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "Složka vlastních &filtrù:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Složka &doèasných souborù" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "Sys&témová složka doèasných souborù" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "&Vlastní složka:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Vytvoøení opravného souboru" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Soubor &1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Soubor &2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "Z&amìnit" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "Pø&ipojit ke stávajícímu souboru" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "Vý&sledek:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Pr&ocházet..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "Formát" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "Me&toda:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "O&bsah:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorovat prázdné øá&dky" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Vložit pøí&kazový øádek" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Otevøít v &externím editoru" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Zobrazit sloupce" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "&Nahoru" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "&Dolù" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Zvolit pøevadìè" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "&Pøevadìè souborù:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "&Zobrazit všechny pøevadìèe (nekontrolovat podle pøípony)" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Seznam pøípon:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Popis:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Zastavit" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Porovnávají se položky..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Porovnáno:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Celkem:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Pøejít" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "Pøejít &na:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Soubor" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Pøejít na co" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "Øá&dek" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "Ro&zdíl" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Pøejít" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Porovnávání" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Prázdná místa" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "P&orovnávat" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "Ignorovat &zmìny" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Ignorovat &všechny" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorovat prázdné øá&dky" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Ignorovat &malá a velká písmena" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Povolit zjišování pøesunutých &blokù" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "Za&rovnat podobné øádky" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Filtrovat kom&entáøe" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "Zvýraznit sy&ntaxi" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "Automaticky &opìtovnì porovnávat" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "Zachovat pùvodní znaky na &koncích øádkù" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabelátory" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Velikost:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "Vkládat &tabelátory" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "Vkládat &mezery" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Obarvit rozdíly v øádku" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Zobrazit rozdíly v øá&dku" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "Na úrovni &znakù" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "Na úrovni &slov:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "Zn&aky oddìlující slova:" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Filtrování souborù" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Z&kouška" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "&Instalovat..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "&Nový..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "&Upravit..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "O&dstranit..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Uložit zmìnìné soubory?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Soubor na levé stranì" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "Ulož&it zmìny" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Zrušit zmìny" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Soubor na pravé stranì" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "Ul&ožit zmìny" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Zr&ušit zmìny" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "Zrušit &vše" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Kódování" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Výchozí kódování" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Zvolte výchozí znakovou stránku, která se použije v pøípadì naètení souborù, které nejsou v kódování Unicode:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "&Zjistit informaci o kódování u tìchto souborù: .html, .rc, .xml \n(vyžaduje opìtovné spuštìní programu)" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "&Systémové kódování" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "&Podle uživatelského prostøedí WinMerge" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "&Vlastní znaková stránka:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Možnosti" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Kategorie" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "&Naèíst..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "&Uložit..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Syntaxe" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Klíèová slova:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Názvy funkcí:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Komentáøe:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Èísla:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operátory:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Øetìzce:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Preprocesor:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Uživatelská 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Uživatelská 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Tuèné" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Protokol o porovnání složek" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "&Soubor protokolu:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Pr&ocházet..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "Uložit jako &typ:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopírovat do schránky" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Typ filtru" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Jaký typ filtru chcete vytvoøit?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Spoleèný filtr (pro všechny uživatele tohoto poèítaèe)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Vlastní filtr (pouze pro souèasného uživatele)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Podpora archivace" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Zapnout podporu archivních souborù" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "Zjistit &automaticky typ archivu" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Statistika porovnání" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Složky:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Soubory:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Rozdílné" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Textové:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binární:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Jedineèné" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Vlevo:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Vpravo:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Shodné" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Celkem:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Zavøít" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Vliv" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(ovlivnìno)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Zvolte kódování pro" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&Naètení souboru:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "&Uložení souboru:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "Použít &stejnou znakovou stránku pro oba" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "P&oužít" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "Storno" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Zkouška filtru" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Zkouška filtru ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Vložte text ke zkoušce:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Název složky" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Výsledek:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "Z&kusit" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Zavøít" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "Po&užít vlastní barvy textu" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Vlastní barvy textu" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Okolí textu:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Øádný text:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Výbìr:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Cesty" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "V&levo:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Pouze pro è&tení" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "Vp&ravo:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Pouze pro èt&ení" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filtr:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "&Naèíst..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "&Uložit..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Zálohování souborù" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Vytváøet záložní soubory pro:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "s&ložek" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "&souborù" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Umístìní záložních souborù:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "&Pùvodní složka souborù" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&Jednotná záložní složka:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Název záložního souboru:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "Pøipojit pøíponu .&bak" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "Pøipojit è&asové razítko" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Potvrdit kopírování" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Opravdu chcete zkopírovat XXX položek?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Zleva" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Doprava" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Ano" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Ne" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Pluginy" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "&Povolit pluginy" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Systémová integrace" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Prùzkumník" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Povolit &rozšíøenou nabídku" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "Pøidat do &systémové místní nabídky" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Složky" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "Zastavit po prvním &rozdílu" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "&Ignorovat èasové rozdíly menší než 3 sekundy" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "Zahrnout obsah jedineèných podsložek" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "&Omezení pro rychlé porovnání (MB):" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binární" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "040504e2" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x405, 1250" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Neznámá chyba pøi pokusu o otevøení souboru projektu" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Neznámá chyba pøi pokusu o uložení souboru projektu" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Projekt" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Soubor s projektem byl úspìšnì naèten." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Soubor s projektem byl úspìšnì uložen." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Pøerušit" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Zkusit znovu" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Ignorovat" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "I&gnorovat vše" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Ano" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Ano &všem" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Ne" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Ne vš&em" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "Pok&raèovat" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "Pøe&skoèit" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Pøes&koèit vše" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "T&uto zprávu již pøíštì nezobrazovat." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Na t&uto otázku se již pøíštì nedotazovat." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "Syntaxe" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Kontrola verzí" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Rozdíly" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Zleva:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Doleva:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Zprava:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Doprava:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Verze %1 - Èesky" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Možnosti (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Všechna okna se zprávami budou nyní opìt zobrazována." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3135,84 +3198,84 @@ msgstr "" "\n" "Použijte prosím hodnoty mezi 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Otevøít" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programy|*.exe;*.bat;*.cmd|Všechny soubory (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Všechny soubory (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Projekty WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Soubory nastavení (*.ini)|*.ini|Všechny soubory (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Textové soubory (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Všechny soubory (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Soubory HTML (*.htm,*.html)|*.htm;*.html|Všechny soubory (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Soubory XML (*.xml)|*.xml|Všechny soubory (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Název" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Umístìní" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filtry" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Popis" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Zvolte název souboru pro nový filtr" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtry (*.flt)|*.flt|Všechny soubory (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3225,7 +3288,7 @@ msgstr "" "Zkopírujte prosím soubor %1 do složky s filtry pro aplikaci WinMerge:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3238,7 +3301,7 @@ msgstr "" "\n" "Ujistìte se prosím, že složka existuje a je možné do ní zapisovat." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3249,7 +3312,7 @@ msgstr "" "\n" "Zvolte prosím složku v dialogovém oknì Možnosti, v kategorii Systém." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3262,12 +3325,12 @@ msgstr "" "\n" "Možná je soubor oznaèen pouze pro ètení?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Vyhledat soubor s filtrem k instalaci" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3278,188 +3341,188 @@ msgstr "" "\n" "Nový soubor nelze zkopírovat do složky filtrù." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Soubor s filtrem již existuje. Chcete nahradit stávající filtr?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Regulérní výraz" -#: Merge.rc:2151 +#: Merge.rc:2172 #, 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 "Filtry byly aktualizovány. Chcete obnovit všechna porovnání složek?\n\nPokud nechcete obnovit všechna porovnání teï, zvolte Ne a obnovte porovnání pozdìji." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&Cesta k programu SS.EXE :" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Výsledky porovnání složek" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Porovnání souborù" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Bez názvu vlevo" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Bez názvu vpravo" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Øádek: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Slouèit" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Rozdíl %1 z %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "Nalezeno %1 rozdílù" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "Nalezen 1 rozdíl" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "Pro ètení" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Položka %1 z %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Položek: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Vyberte dvì existující složky nebo soubory k porovnání" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Vybrat složku" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Vyberte dvì složky nebo dva soubory k porovnání" -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Levá cesta je chybná!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Pravá cesta je chybná!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Obì cesty jsou chybné!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Vyberte dva soubory k zpøístupnìní volby pøevadìèe" -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Nelze porovnat soubor a složku!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Soubor nebyl nalezen: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Soubor nebyl pøeveden: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3472,37 +3535,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Uložit jako" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Uložit zmìny do %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 pouze pro ètení. Chcete nahradit tento soubor? (Neukládat pod novým názvem.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Chyba pøi zálohování souboru" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3515,7 +3578,7 @@ msgstr "" "\n" "Chcete pokraèovat?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3532,7 +3595,7 @@ msgstr "" "\t- použít jiný název souboru (stisknìte OK)\n" "\t- pøerušit souèasnou operaci (stisknìte Storno)" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3547,7 +3610,7 @@ msgstr "" "\n" "Chcete uložit pøevedenou verzi do jiného souboru?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3562,7 +3625,7 @@ msgstr "" "\n" "Chcete uložit pøevedenou verzi do jiného souboru?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3577,7 +3640,7 @@ msgstr "" "\n" "Pøepsat zmìnìný soubor?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3586,32 +3649,32 @@ msgstr "" "%1\n" "je oznaèen pouze pro ètení. Chcete nahradit tuto položku?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, 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 "Jiná aplikace provedla zmìny v souboru\n%1\nod jeho posledního prozkoumání aplikací WinMerge.\n\nChcete soubor naèíst znovu?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Uložit levý soubor jako" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Uložit pravý soubor jako" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "Soubor\n%1\nse ztratil. Pro pokraèování prosím uložte kopii souboru." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3622,42 +3685,42 @@ msgstr "" "\n" "Pøed dalším pokraèováním dokumenty obnovte." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3665,134 +3728,153 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" " Please, check config spec of used view. " msgstr "" -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Žádný" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (nižší než 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 a vyšší)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Pøerušit v mezerách" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Pøerušit v mezerách nebo v interpunkci" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "P&ravé doleva (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "&Levé doprava (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "P&ravé doleva (%1 z %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "&Levé doprava (%1 z %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "&Levé doprava (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "L&evé do... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Pr&avé do... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "L&evé do... (%1 z %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Pr&avé do... (%1 z %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "&Levé (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "P&ravé (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "O&boje (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "&Levé (%1 z %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "P&ravé (%1 z %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "O&boje (%1 z %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Zvolte cílovou složku pro položky z levé strany:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Zvolte cílovou složku pro položky z pravé strany:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(ovlivnìno souborù: %1)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(ovlivnìno souborù: %1 z %2)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3803,17 +3885,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Opravdu chcete zkopírovat:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Opravdu chcete zkopírovat %d položek:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3832,502 +3914,502 @@ msgstr "" "\n" "Obnovte prosím porovnání." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Opravdu chcete pøesunout:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Opravdu chcete pøesunout %d položek:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Potvrdit pøesunutí" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nelze spustit externí editor: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Neznámý formát archivu" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Název souboru" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Výsledek porovnání" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Datum vlevo" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Datum vpravo" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Pøípona" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Velikost vlevo" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Velikost vpravo" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Velikost vpravo (krátce)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Velikost vlevo (krátce)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Datum vytvoøení vlevo" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Datum vytvoøení vpravo" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Novìjší soubor" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Verze souboru vlevo" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Verze souboru vpravo" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Struèný výsledek" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Atributy vlevo" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Atributy vpravo" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Konce øádkù vlevo" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Konce øádkù vpravo" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Kódování vlevo" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Kódování vpravo" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Ignor. rozdílù" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Soubory nelze porovnat" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Pøerušeno" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Soubor pøeskoèen" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Složka pøeskoèena" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Pouze vlevo: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Pouze vpravo: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Binární soubory jsou shodné" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Binární soubory jsou rozdílné" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Soubory jsou rozdílné" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Složky jsou rozdílné" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Pouze vlevo" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Pouze vpravo" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Chyba" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Textové soubory jsou shodné" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Textové soubory jsou rozdílné" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Uplynulý èas: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "Vybrána 1 položka" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "Vybráno %1 položek" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Název souboru nebo složky" -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Název podsložky, pokud jsou porovnávány i soubory v podsložkách" -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Výsledek porovnání, dlouhý popis" -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Datum zmìny souboru na levé stranì" -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Datum zmìny souboru na pravé stranì" -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Pøípona souboru" -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Velikost souboru na levé stranì v bytech" -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Velikost souboru na pravé stranì v bytech" -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Velikost souboru na levé stranì zkrácenì" -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Velikost souboru na pravé stranì zkrácenì" -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Datum vytvoøení souboru na levé stranì" -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Datum vytvoøení souboru na pravé stranì" -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Ukáže, na které stranì je novìjší datum zmìny" -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verze souboru na levé stranì, pouze pro nìkteré typy souborù" -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verze souboru na pravé stranì, pouze pro nìkteré typy souborù" -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Struèný výsledek porovnání" -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Atributy souboru na levé stranì" -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Atributy souboru na pravé stranì" -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Typ konce øádkù v souboru na levé stranì" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Typ konce øádkù v souboru na pravé stranì" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Kódování souboru na levé stranì" -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Kódování souboru na pravé stranì" -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Poèet ignorovaných rozdílù v souboru. Tyto rozdíly nelze slouèit." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Poèet rozdílù v souboru. Neobsahuje ignorované rozdíly." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ukáže hvìzdièku (*), pokud je soubor binární" -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Porovnání %1 s %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Seznam oddìlený èárkami" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Seznam oddìlený tabelátory" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Soubor HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Soubor XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Soubor protokolu již existuje. Chcete ho pøepsat?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4336,32 +4418,32 @@ msgstr "" "Chyba pøi vytváøení protokolu:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Protokol byl úspìšnì vytvoøen." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "V obou panelech je otevøen stejný soubor." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Vybrané soubory jsou shodné." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Bìhem porovnání souborù se vyskytla chyba." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Nelze vytvoøit doèasné soubory. Zkontrolujte nastavení cesty k doèasným souborùm." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4376,22 +4458,22 @@ msgstr "" "\n" "Poznámka: Pokud chcete vždy sjednocovat konce øádkù, nastavte možnost 'Ignorovat rozdíly v koncích øádkù' v nastavení Porovnávání v Možnostech dostupných z nabídky Úpravy." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Zvolená složka je chybná." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Binární soubor nelze otevøít pro úpravy." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "Složka existuje pouze na jedné stranì a nelze ji otevøít.\n\nChcete vytvoøit odpovídající složku na druhé stranì a otevøít ji?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4402,152 +4484,152 @@ msgstr "" "Zobrazení každého souboru v jeho znakové stránce poskytne lepší náhled, ale sluèování nebo kopírování bude nebezpeèné.\n" "Chcete kódování u obou souborù upravit na výchozí znakovou stránku Windows (doporuèeno)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Došlo ke ztrátì informací zpùsobené chybami kódování u obou souborù." -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Žádný rozdíl" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Rozdíl v øádku" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Nahrazeno %1 øetìzcù." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nelze najít øetìzec \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Poloha" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Rozdíly" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Opravný soubor byl úspìšnì vytvoøen." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. položka nebyla nalezena nebo je to složka!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. položka nebyla nalezena nebo je to složka!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Opravný soubor již existuje. Chcete ho pøepsat?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[vybráno %1 souborù]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Nelze zapisovat do souboru %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Zadaná cesta pro výstup není cesta k souboru: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Zadejte výstupní soubor" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nelze vytvoøit opravný soubor z binárních souborù." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nelze vytvoøit opravný soubor ze složek." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4558,12 +4640,12 @@ msgstr "" "\n" "Vytvoøení opravného souboru vyžaduje, aby v souborech nebyly žádné neuložené zmìny." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Složka neexistuje." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4575,37 +4657,37 @@ msgstr "" "Nelze nalézt všechny potøebné souèásti (7-Zip anebo Merge7z*.dll).\n" "Podívejte se do uživatelské pøíruèky, kde najdete další informace o podpoøe archivace a jak ji zpøístupnit." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Uložit nastavení" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Naèíst nastavení" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Nastavení bylo naèteno ze souboru." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Nastavení bylo uloženo do souboru." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Naètení nastavení ze souboru se nezdaøilo." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Uložení nastavení do souboru se nezdaøilo." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4616,247 +4698,247 @@ msgstr "" "\n" "Chcete pokraèovat?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Rùzné" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Typ" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Pøevadìè" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Pøizpùsobený pøevadìè bude použit pro oba soubory (podle pøípony jednoho ze souborù)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Navržené pluginy" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Ostatní pluginy" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Nastavení pluginù" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Program Windows Script Host nebyl nalezen - skripty .sct jsou vypnuté" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "<žádný>" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "&Pøejít na øádek %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Vypnuto" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Systém souborù" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Naposledy použité" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Žádné zvýraznìní" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index 8dd587aed..673ef182e 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -79,7 +79,7 @@ msgid "Cu&t" msgstr "&Klip" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "Ko&pier" @@ -90,7 +90,7 @@ msgid "&Paste" msgstr "&Indsæt" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "Gå &til..." @@ -101,22 +101,25 @@ msgid "Op&en" msgstr "Åb&en" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "med det ®istrerede program" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "med en &ekstern editor" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&med..." @@ -154,7 +157,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -166,8 +169,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Ingen" @@ -184,49 +187,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Filer" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Ny\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Åben...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Åb&en konfliktfil..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Åben pro&jekt...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Gem &projekt..." @@ -238,274 +241,274 @@ msgstr "Seneste Projekt" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Tom >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "&Afslut" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Rediger" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "I&ndstillinger..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Vis" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "&Værktøjslinje" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Lille" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Stor" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "S&tatuslinje" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Fa&nelinje" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "Værk&tøjer" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filtre..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Generer en Patch..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "Ma&nuel Prediffer" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "A&utomatisk Prediffer" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "&Manuel Udpakning" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisk Udpakning" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Genindlæs plugins" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "Vind&ue" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Luk" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Luk &alle" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "&Skift panel\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "&Horisontale vinduer" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "&Vertikale vinduer" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Kaskade" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Hjælp" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge hjælp\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "K&onfiguration" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&Om WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "V&enstre skrivebeskyttet" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "&Højre skrivebeskyttet" @@ -516,7 +519,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Vælg &alt\tCtrl+A" @@ -538,1091 +541,1157 @@ msgstr "Vis &venstre unikke" #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Vis &højre unikke" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Vis &oversprungne" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Vis &binære filer" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "V&is skjulte" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "Vis i et &træ" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "&Udvid alle undermapper" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "Luk &alle undermapper" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Vælg &skrifttype..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Brug standard s&krifttype" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Sammen&ligningsstatistikker" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "&Opdater\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Op&dater valgte\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Flet" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Sammen&lign\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Næste forskel\tAlt+Ned" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Forrige forskel\tAlt+Op" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "F&ørste forskel\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuelle forskel\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Sidste forskel\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopier til &højre\tAlt+Højre" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopier til &venstre\tAlt+Venstre" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "Sl&et\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Tilpas søjler..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Generer en &rapport..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Gem\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Gem &venstre" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Gem &højre" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Udskriv..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Side op&sætning" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Vis udskrif&t" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Konverter linjeendelserne til" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "&Flette modus\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "&Fil Kodning..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "&Binær" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Fortryd\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Gendan\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Klip\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "Ko&pier\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Indsæt\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Vælg &linjeforskel\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "S&øg...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Erstat...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Avanceret" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopier med linjenumre\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&Bogmærker" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Vis/skjul bogmærke\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Næste bogmærke\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Forrige bogmærke\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Slet alle bogmærker" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Gå til...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Zoom &ind\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Zoom &ud\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Fremhæv syntaks" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "&Lås vinduer" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "Vis &mellemrum" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Vis &linjeforskelle" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Vis linje&numre" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Vis &margener" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "O&mbryd linjer" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "By&t vinduer" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "H&orisontalt panel" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "V&ertikalt panel" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopier til hø&jre og gå til næste\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopier til v&enstre og gå til næste\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Kopier alt &til højre" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Kopier alt til venst&re" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Scripts" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Samm&enlign" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "Sa&mmenlign som" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&Venstre til højre" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "V&enstre til..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "&Højre til venstre" +msgid "Left to Right (%1 of %2)" +msgstr "Venstre til højre (%1 af %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "H&øjre til..." +msgid "Left to... (%1 of %2)" +msgstr "Venstre til... (%1 af %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Flyt" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&Venstre til..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&Højre til..." +msgid "Right to Left (%1 of %2)" +msgstr "Højre til venstre (%1 af %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Højre til... (%1 af %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Flyt" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Slet" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&Venstre" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Højre" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Begge" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Om&døb" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Skjul emner" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "&Åben venstre" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Å&ben højre" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "K&opier stinavne" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&Venstre (%1 af %2)" +msgid "Left (%1 of %2)" +msgstr "Venstre (%1 af %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&Højre (%1 af %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Højre (%1 af %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Begge (%1 af %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Begge (%1 af %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Ko&pier filnavne" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&Venstre... (%1 af %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&Højre... (%1 af %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Begge... (%1 af %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Forskelle... (%1 af %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Opdater" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Venstre Shell menu" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Højre Shell menu" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Kopier det fulde stinavn" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Kopier &filnavn" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Prediffer indstillinger" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Ingen prediffer" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "&Automatisk prediffer" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Gå til &forskel" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Ingen flyttede blokke" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Alle flyttede blokke" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Flyttede blokke for &denne forskel" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "&Mellemrum" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "S&ammenlign" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "&Ignorer ændringer" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Ign&orer alle" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "Sammenlign store/sm&å bogstaver" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rer returtegns forskelle (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "&Sammenligningsmetode:" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Alt indhold" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Hurtigt indhold" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Ændringsdato" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Ændringsdato og størrelse" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Størrelse" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Om WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Privat Udgave)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Besøg WinMerge hjemmesiden!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Deltagere" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Vælg filer eller mapper..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Gennemse..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "G&ennemse..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "G&ennemse..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "V&ælg..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Udpakker:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "Væ&lg..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Inkluder undermapper" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Annuller" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Hjælp" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Filer eller mapper der skal sammenlignes" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Database:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Bruger:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Password:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Link til Destinations VSS projekt" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Anvend på alle emner" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Check ud" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Gem som..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Versionsstyringssystem" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Versionsstyringssystem" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Sti til cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Generelt" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Scroll &automatisk til første forskel" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "L&uk vinduer med ESC tasten" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Verificer automatisk stinavnene i åben dialogen" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Til&lad kun et eksempel ad gangen" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Sp&ørg ved lukning af flere vinduer " -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "Bevar filtid i filsammenligning" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Vis dialogen \"Vælg filer eller mapper...\" ved hver start" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Å&ben-dialog Auto-fuldførelse:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "" "WinMerge allows hiding some common messageboxes. Press the Reset button to " @@ -1631,664 +1700,658 @@ msgstr "" "WinMerge kan gemme almene beskedvinduer. Brug Reset knappen for at vise " "disse vinduer igen." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Nulstil" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Søg" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "F&ind hvad:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Sammenlign &hele ordet" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Sammenlign store/små &bogstaver" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "Regulært &udtryk" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "O&mbryd ikke filendelser" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Find næste" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Erstat" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Ers&tat med:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "&Ombryd ikke filendelser" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Erstat i" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&Valgte" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "He&le filen" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Erstat" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Erstat &alt" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Check ud" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Kommentarer" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Check ind lige efter check ud" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Linjefiltre" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Aktiver linjefiltre" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulære udtryk (et pr linje):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Ny" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Rediger" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Fjern" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Farver" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Forskelle:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Valgte forskelle:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Baggrund" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Slettet" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Ignoreret forskel:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Flyttet:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Valgt flyttet:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Ordforskel:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Valgte ordforskelle:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Standard" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "System" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Send slettede filer til skraldespanden" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&Ekstern editor:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Filter mappe:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Mappe til midlertidige filer" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "S&ystemets mappe til midlertidige filer" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "V&algt mappe:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Patch Generator" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Fil&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Fil&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "&Byt" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "&Tilføj til eksisterende fil" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "Res&ultat:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "G&ennemse..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "Sti&l:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Sammenhæng:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Igno&rer blanke linjer" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Inkluder &kommandolinjen" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Åben i ekstern e&ditor" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Vis søjler" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Flyt &op" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Flyt &ned" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Vælg udpakker" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Fil udpakker:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Vis all udpakkerer, tjek ikke extension" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Extension liste:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Beskrivelse:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Stop" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Sammenligner emner..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Emner sammenlignet:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Emner ialt:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Gå til" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "G&å til:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Fil" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Gå til hvad" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "Li&nje" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Forskel" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Gå til" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Sammenlign" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Mellemrum" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Sammenlign" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "&Ignorer ændringer" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "I&gnorer alle" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorer blan&ke linjer" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Ignorer store/små &bogstaver" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "&Aktiver detektion af flyttede blokke" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "&Match ens linjer" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Filter Kommentarer" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Redigering" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&Fremhæv syntaksen" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "Automatisk &opdatering" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&Bevar originale EOL tegn" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabulator" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Tabulator størrelse:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "&Indsæt tabulatorer" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "Indsæt &mellemrum" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Farver for linjeforskelle" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Vis linjeforskelle" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "&Karakter niveau" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "&Ord niveau:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Filfiltre" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Test" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Installer..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Ny..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Rediger..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Slet..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Gem ændrede filer?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Fil på venstre side" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Gem ændringer" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Fjern ændringer" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Fil på højre side" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "G&em ændringer" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "F&jern ændringer" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Codepage" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Standard codepage" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" "Vælg den standard codepage der antages når der indlæses filer der ikke er " "unicode:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2297,692 +2360,692 @@ msgstr "" "Find codepage automatisk for disse filer: .html, .rc, .xml\n" "WinMerge skal genstartes før dette tager effekt" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "System codepage" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Samme som WinMerge brugerflade" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Udvalgt codepage:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Valg" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Kategorier" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importer..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Eksporter..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Nøgleord:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Funktionsnavne:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Kommentarer:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Numre:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operatører:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Strenge:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Forbereder:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Bruger 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Bruger 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Fed" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Directory Compare Report" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Rapport &Fil:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Gennemse..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Stil" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopier til Udklipsholder" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Delt eller Privat Filter " -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Hvilken type filter vil du oprette?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Delt Filter (for alle brugere)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Privat Filter (kun aktuel bruger)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Arkiv Support" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Aktiver arkiv fil support" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "Bestem arkivtype udfra fil signatur" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Sammenlign Statistik" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Mapper:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Filer:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Forskellige" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Tekst:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binær:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Unik" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Venstre:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Højre:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Identiske" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Ialt:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Luk" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Påvirker" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Påvirker)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Vælg codepage til" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&Fil Indlæsning:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Fil &Gemning:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&Brug samme codepage for begge" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Anvend" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Annuller" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Test Filter" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Tester filter..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Indsæt test tekst:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Mappenavn" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Resultater:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Test" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Luk" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&Brug tilpasset tekstfarve" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Tilpasset tekstfarve" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Mellemrum:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Almindelig tekst:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Udvalgt:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Stier" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Venstre:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "S&krivebeskyttet" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Højre:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Sk&rivebeskyttet" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filter:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Åben..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Gem..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Backup filer" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Opret backup filer som:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "&Mappe sammenligning" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Fil& sammenligning" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Gem backup filer i:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "&Originalfilens mappe" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&Global backup mappe:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Backup filnavn:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&Tilføj .bak -extension" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "T&ilføj tidsstempel" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Bekræft kopi" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Ønsker du virkelig at kopiere XXX emner?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Fra venstre" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Til højre" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Ja" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Nej" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "&Aktiver plugins" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Shell Integration" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Explorer" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "&Aktiver den avancerede menu" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "&Tilføj til kontekstmenu" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Mappe" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "S&top efter første forskel" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orer tidsforskelle under 3 sekunder" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "&Grænse for hurtig sammenligning (MB):" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binær" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "040904e4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x406, 1252" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Ukendt fejl ved forsøg på åbning af projekt fil" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Ukendt fejl ved forsøg på at gemme projekt fil" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Projektfil" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Projektfil indlæst succesfuldt" -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Projekt gemt succesfuldt." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -3001,7 +3064,7 @@ msgstr "" "WinMerge.FilSammenligning\n" "WinMerge FilSammenligning" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3020,7 +3083,7 @@ msgstr "" "WinMerge.Mappe sammenligning\n" "WinMerge Mappe sammenligning" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3031,7 +3094,7 @@ msgstr "" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi " "Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, c-format msgid "" "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you " @@ -3042,138 +3105,138 @@ msgstr "" "velkommen til at videredistribuere det under visse omstændigheder, jf. GNU " "General Public License. Se Hjælp for yderligere oplysninger." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Fortryd" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Prøv igen" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Ignorer" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "I&gnorer alle" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Ja til &alle" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Nej" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Nej til a&lle" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Fortsæt" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Spring over" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Spring over all&e" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Vis ikke denne &besked igen." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Stil ikke dette sp&ørgsmål igen." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "Syntaks" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Versionskontrol" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Forskelle" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Til:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Fra Venstre:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Til Venstre:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Fra Højre:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Til Højre:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Version %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Indstillinger (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle beskeder vises nu igen." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3184,32 +3247,32 @@ msgstr "" "\n" "Brug værdierne 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Åben" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmer|*.exe;*.bat;*.cmd|Alle filer (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle filer (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge projektfiler (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Valg filer (*.ini)|*.ini|Alle filer (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "" "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|" @@ -3218,54 +3281,54 @@ msgstr "" "Tekst Filer (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle filer (*." "*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML Filer (*.htm,*.html)|*.htm;*.html|Alle filer (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML Filer (*.xml)|*.xml|Alle filer (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Navn" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Sti" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filtre" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F]" -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Beskrivelse" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Vælg filnavn til nyt filter" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Fil Filtre (*.flt)|*.flt|Alle Filer (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3278,7 +3341,7 @@ msgstr "" "Kopier filen %1 til WinMerge/Filtermappe:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3291,7 +3354,7 @@ msgstr "" "\n" "Undersøg om mappen eksisterer og kan ændres." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3302,7 +3365,7 @@ msgstr "" "\n" "Vælg filter mappe i valg/System." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3315,12 +3378,12 @@ msgstr "" "\n" "Måske er filen skrivebeskyttet?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Find filter fil til installering" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3331,17 +3394,17 @@ msgstr "" "\n" "Kunne ikke kopiere filter fil til filter mappe." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filter filen eksisterer allerede. Vil du overskrive den?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Regulært udtryk" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3353,173 +3416,173 @@ msgstr "" "\n" "Hvis du ikke vil opdatere sammenligningerne så vælg Nej og opdater senere." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&Sti til SS.EXE:" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Resultat af sammenligning af mapper" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Filsammenligning" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Ikke navngivet venstre" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Ikke navngivet højre" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Deres fil" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Min fil" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Linje: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Flet" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Forskel %1 af %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 forskelle fundet" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 forskel fundet" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Emne %1 of %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Emner: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Vælg to eksisterende mapper eller filer at sammenligne" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Valgt mappe" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Vælg to mapper eller to filer at sammenligne." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Ventre sti er ugyldig!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Højre sti er ugyldig!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Begge stier er ugyldige!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Vælg to filer for at aktivere udvælgelse af udpakker." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan ikke sammenligne en fil og en mappe!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Fil ikke fundet: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Fil ikke udpakket: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3532,12 +3595,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Kunne ikke fortolke konfliktfil" -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3548,17 +3611,17 @@ msgstr "" "%1\n" "er ikke en konfliktfil." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Gem som" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Gem ændringer til %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, c-format msgid "" "%1 is marked read-only. Would you like to override the read-only file ? (No " @@ -3567,12 +3630,12 @@ msgstr "" "%1 er markeret som skrivebeskyttet. Vil du ignorerer skrivebeskyttelsen? " "(Nej for at gemme til et andet filnavn.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Fejl under backup af filen" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3585,7 +3648,7 @@ msgstr "" "\n" "Fortsæt alligevel?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3602,7 +3665,7 @@ msgstr "" "\t-bruge et andet filenavn (Tryk Ok)\n" "\t-afbryd aktuel operation (Tryk Annuller)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3618,7 +3681,7 @@ msgstr "" "\n" "Vil du gemme den udpakkede version under et andet filnavn?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3634,7 +3697,7 @@ msgstr "" "\n" "Vil du gemme den udpakkede version under et andet filnavn?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3649,7 +3712,7 @@ msgstr "" "\n" "Vil du overskrive den ændrede fil?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3659,7 +3722,7 @@ msgstr "" "er markeret som skrivebeskyttet. Vil du overskrive den skrivebeskyttede fil " "alligevel?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3674,22 +3737,22 @@ msgstr "" "\n" "Vil du genindlæse filen?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Gem venstre fil som" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Gem højre fil som" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3700,7 +3763,7 @@ msgstr "" "%1\n" "er forsvundet. Gem en kopi af filen for at fortsætte." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3711,7 +3774,7 @@ msgstr "" "\n" "Opdater dokumenter før du fortsætter." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "" "You must specify a SourceSafe project path in order to continue (ie: $/" @@ -3719,12 +3782,12 @@ msgid "" msgstr "" "Du skal angive en SourceSafe projekt sti for at fortsætte (ie: $/MitProjekt)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Checkout filer fra VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "" "Versioning System returned an error while attempting to check out the file. " @@ -3733,12 +3796,12 @@ msgstr "" "Versionsstyringssystemet returnerede en fejl under forsøget på at " "kontrollere filen. Kan ikke fortsætte..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Fejl under udførelse af versionsstyringssystem kommando." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "" "The VSS Working Folder and the location of the current file do not match. " @@ -3747,17 +3810,17 @@ msgstr "" "Arbejdsmappen for VSS og mappen for den aktuelle fil er ikke ens. Vil du " "fortsætte?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS database(r) fundet!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Fejl fra VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3769,7 +3832,7 @@ msgstr "" "Kontroller konfiguration af visning.\n" "Fortryd kontrol operation?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the " @@ -3780,127 +3843,146 @@ msgstr "" "filkontrol.\n" "Knotroller konfiguration af visning." -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Ingen" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (mindre end 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 og over)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Bryd ved mellemrum" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Bryd ved mellemrum eller tegnsætning" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Højre til venstre (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Venstre til højre (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Højre til venstre (%1 af %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Venstre til højre (%1 af %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Venstre til højre (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Venstre til... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Højre til... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Venstre til... (%1 af %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Højre til... (%1 af %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Venstre (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Højre (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Begge (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Venstre (%1 af %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Højre (%1 af %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Begge (%1 af %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Venstre side - vælg destinationsmappen" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Højre side - vælg destinationsmappen" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 filer påvirket)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 af %2 filer påvirket)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3911,17 +3993,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Er du sikker på du vil kopiere:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Er du sikker på du vil kopiere %d emner:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3940,457 +4022,457 @@ msgstr "" "\n" "Opdater sammenligning." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Er du sikker på du vil flytte:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Er du sikker på du vil flytte: %d emner:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Bekræft flytning" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Kunne ikke eksekvere ekstern editor: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Ukendt arkivformat" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Filnavn" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Resultat af sammenligning" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Venstre dato" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Højre dato" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Udvidelse" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Venstre størrelse" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Højre størrelse" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Højre størrelse (kort)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Venstre størrelse (kort)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Venstre oprettelsesdato" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Højre oprettelsesdato" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Nyeste fil" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Venstre filversion" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Højre filversion" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Venstre attributter" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Højre attributter" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Venstre EOL" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Højre EOL" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Venstre encoding" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Højre encoding" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Ignoreret forskel" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Kan ikke sammenligne filer" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Emne fortrudt" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Fil sprunget over" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Mappe sprunget over" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Venstre kun: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Højre kun: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Binære filer er identiske" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Binære filer er forskellige" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Filer er forskellige" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Mapper er forskellige" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Kun venstre" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Kun højre" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Fejl" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Tekstfiler er identiske" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Tekstfiler er forskellige" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tid forløbet: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 element valgt" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 elementer valgt" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Filnavn eller mappenavn." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Undermappenavn når undermapper er inkluderet." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Resultat af sammenligning, lang form." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Venstre side ændringsdato." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Højre side ændringsdato." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Filens extension." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Venstre filstørrelse i bytes." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Højre filstørrelse i bytes." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Venstre filstørrelse forkortet." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Højre filstørrelse forkortet." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Venstre side oprettelsesdato." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Højre side oprettelsesdato." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Fortæller hvilken side har den nyeste ændringsdato." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Venstre side filversion, kun for nogle filtyper." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Højre side filversion, kun for nogle filtyper." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Kort resultat af sammenligning." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Venstre side attributter." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Højre side attributter." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Venstre sidefil EOL type" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Højre sidefil EOL type" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Venstre side encoding." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Højre side encoding." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "" "Number of ignored differences in file. These differences are ignored by " @@ -4399,50 +4481,50 @@ msgstr "" "Antal ignorerede forskelle i filen. Disse forskelle er ignoreret af WinMerge " "og kan ikke blive flettet." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "" "Number of differences in file. This number does not include ignored " "differences." msgstr "Antel forskelle i filen. Dette tal omfatter ikke ignorerede forskelle." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Vis stjerne (*) hvis fil er binær." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Sammenlign %1 med %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Komma opdelt liste" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Tab opdelt liste" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Simpel HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Simpel XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" "Rapportfilen eksisterer allerede. Ønsker du at overskrive eksisterende fil" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4451,27 +4533,27 @@ msgstr "" "Fejl ved opretning af rapporten:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Rapporten blev oprettet succesfuldt." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Den samme fil er åbnet på begge sider." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "De valgte filer er identiske." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Der skete en fejl under sammenligning af filerne." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "" "Temporary files could not be created. Check your temporary path settings." @@ -4479,7 +4561,7 @@ msgstr "" "Midlertidige filer kunne ikke oprettes. Tjek dine indstillinger for " "midlertidig (temp) mappe." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4499,17 +4581,17 @@ msgstr "" "valget 'Ignorer returtegn forskelle ..' i Fanen: Indstillinger -> " "Sammenlign (findes under Redigér)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Den valgte mappe er ugyldig." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan ikke åbne en binær fil til editor." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4524,7 +4606,7 @@ msgstr "" "%1\n" "til den anden side og åbne disse mapper?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4539,152 +4621,152 @@ msgstr "" "Vil du behandle begge filer som værende i standard Windows codepage " "(anbefalet)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Oplysninger tabt, på grund af kodnings fejl: begge filer" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Ingen forskel" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Linje forskel" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Erstattet %1 streng(e)." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan ikke finde strengen \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Placerings vindue" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Forskels vindue" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Patch fil oprettet med succes." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. element er ikke fundet eller er en mappe!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. element er ikke fundet eller er en mappe!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Denne patch fil eksisterer allerede. Vil du overskrive den?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 filer valgt]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Kontekst" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Samlet" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Kunne ikke skrive til fil %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Den angivne output sti er ikke en endelig sti: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Angiv en output fil" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan ikke lave patch filer fra binære filer." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan ikke lave patch filer fra mapper." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4695,12 +4777,12 @@ msgstr "" "\n" "Oprettelse af en patch kræver at alle ændringer i filen er gemt." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Mappen eksisterer ikke." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4714,37 +4796,37 @@ msgstr "" "Se manualen for mere information om arkiv support og hvordan man aktivere " "det." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Vælg fil til eksport" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Vælg fil til import" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Indstillinger importeret fra filen." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Indstillinger eksporteret til filen." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Kunne ikke importere indstillinger fra filen." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Kunne ikke skrive indstillinger til filen." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4755,117 +4837,117 @@ msgstr "" "\n" "Vil du fortsætte?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Type" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Udpakker" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Editor script" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "" "The adapted unpacker is applied to both files (one file only needs the " @@ -4874,132 +4956,132 @@ msgstr "" "Udpakkeren bruges på begge filer (kun den ene fil behøves en korrekt " "extension)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Ingen prediffer (normal)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Anbefalede plugins" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Andre plugins" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Privat Udgave: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Plugin indstillinger" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ikke fundet - .sct scripts afbrudt" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "G&å til linje %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Deaktiveret" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Fra filsystem" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Fra MRU liste" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Ingen fremhævning" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Transportabelt Objekt" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Resourser" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index 6e25a35e6..6144302e6 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -80,7 +80,7 @@ msgid "Cu&t" msgstr "&Knippen" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "Ko&piëren" @@ -91,7 +91,7 @@ msgid "&Paste" msgstr "Pl&akken" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&Ga naar..." @@ -102,22 +102,25 @@ msgid "Op&en" msgstr "Op&enen" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "met ge®istreerde applicatie" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "met &externe editor" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&met..." @@ -155,7 +158,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Zoomen" @@ -167,8 +170,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "Geen" @@ -185,49 +188,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Bestand" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Nieuw\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Openen...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Conflictbestand openen..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Pro&ject openen...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Project Op&slaan..." @@ -239,274 +242,274 @@ msgstr "Recente Projecten" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Leeg >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "&Afsluiten" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "Be&werken" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Eigenschappen..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "B&eeld" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "&Werkbalk" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "Klein" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "Groot" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "&Statusbalk" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Tab-balk" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Tools" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filters..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "Patch &genereren..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "Ma&nuele voorvergelijking" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "A&utomatische voorvergelijking" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "Hand&matig uitpakken" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisch uitpakken" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "Plug-ins he&rladen" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&Venster" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "Sluiten" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Alles &sluiten" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "&Venster wijzigen\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "&Horizontaal verdelen" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "&Verticaal verdelen" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Trapsgewijs" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Help" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge Help\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "C&onfiguratie" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "I&nfo..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Links all&een-lezen" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Re&chts alleen-lezen" @@ -517,7 +520,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "&Alles selecteren\tCtrl+A" @@ -539,1091 +542,1157 @@ msgstr "Toon linkse unieke items" #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Toon rechtse unieke items" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Toon overgeslagen items" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Binaire bestanden weergeven" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Toon verborgen items" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "Tree-&modus" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "Alle submappen uitklappen" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "Alle submappen inklappen" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Lettertype kiezen..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Standaard lettertype gebruiken" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Ve&rgelijk statistieken" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "Verver&sen\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Selectie ve&rversen\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "Sa&menvoegen" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Vergelijken\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Volgende verschil\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Vor&ige verschil\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Eerste verschil\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Huidig verschil\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Laatste verschil\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Naar &rechts kopiëren\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Naar &links kopiëren\tAlt+left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "Wissen\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Kolommen aanpassen..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "&Rapport genereren..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "Op&slaan\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "&Links opslaan" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "&Rechts opslaan" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Afdrukken..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Pagina-in&stelling" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Afdrukvoorbeeld" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Converteer regeleindes naar" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "Sa&menvoegmodus\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "Bestandscodering..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "&Binair" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Ongedaan maken\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "He&rhalen\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Knippen\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "Ko&piëren\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "Pl&akken\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Selecteer regelverschillen\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Z&oeken...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Vervan&gen...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Geavanceerd" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "Met regelnummers &kopiëren\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&Bladwijzers" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Bladwijzer aan/uit\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "Volge&nde bladwijzer\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Vo&rige bladwijzer\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "Alle bladwijzers wissen" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Ga naar...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "&Inzoomen\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "&Uitzoomen\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normaal\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Syntaxmarkering" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "Vensters vastzetten" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "Wit&ruimte weergeven" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Bekijk regelverschillen" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Bekijk regel&nummers" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Bekijk &marges" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "Automatische te&rugloop" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Wissel vensters" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Verschilvenster" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Location &pane" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Naar rechts k&opiëren en verder gaan\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Naar links ko&piëren en verder gaan\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Alles naar rechts kopiëren" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Alles naar links kopiëren" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "Voorvergelijking" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Scripts" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Vergelijken" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "Vergelijken als" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "Van &links naar rechts" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "Van l&inks naar..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "Van &rechts naar links" +msgid "Left to Right (%1 of %2)" +msgstr "Van links naar rechts (%1 van %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "Van r&echts naar..." +msgid "Left to... (%1 of %2)" +msgstr "Van links naar... (%1 van %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Verplaatsen" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "Van &links naar..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "Van &rechts naar..." +msgid "Right to Left (%1 of %2)" +msgstr "Van rechts naar links (%1 van %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Van rechts naar... (%1 van %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Verplaatsen" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "Ver&wijderen" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&Links" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Rechts" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Beide" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "&Naam wijzigen" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "Items verbergen" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "Links &openen" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Rechts o&penen" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Padnamen ko&piëren" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&Links (%1 van %2)" +msgid "Left (%1 of %2)" +msgstr "Links (%1 of %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&Rechts (%1 van %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Rechts (%1 of %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Beide (%1 of %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Beide (%1 van %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "&Bestandsnamen kopiëren" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Comprimeren" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&Links... (%1 van %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&Rechts... (%1 van %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Beide... (%1 van %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Verschillen... (%1 van %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "Ve&rnieuwen" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Linker shellmenu" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Rechter shellmenu" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Volledig pad kopiëren" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "&Bestandsnaam kopiëren" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Instellingen voorvergelijking verschillen" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Geen voorvergelijking" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Automatische voorvergelijking" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "G&a naar verschil" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "Gee&n verplaatste blokken" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Alle verplaatste blokken" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Verplaatste blokken voor huidige vers&chillen" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "Witr&uimte" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Ver&gelijken" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "Wij&zigingen negeren" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Alle&s negeren" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "Hoo&fdlettergevoelig" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Negee&r regeleindeteken-verschillen (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "Vergelijkingsmethode:" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Volledige Inhoud" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Snelle Inhoud" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Datum gewijzigd" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Datum en grootte gewijzigd" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Grootte" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Over WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Private Versie)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Bezoek deWinMerge HomePage!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Medewerkers" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Bestanden of mappen selecteren" -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Zoeken" -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "Bladeren..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Bl&aderen..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Selecteren..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Uitpakker:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "&Selecteren..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "Ook &in submappen" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Annuleren" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Help" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Bestanden of mappen om te vergelijken" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Database:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Project:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Gebruiker:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Wachtwoord:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Link naar VSS doelproject" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Op alle items toepassen" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Check-out" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Opslaan als..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Versiebeheersysteem" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Versiebeheersysteem:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Pad naar cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Algemeen" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "&Automatisch naar eerste verschil gaan" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Vensters met ESC sl&uiten" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Paden automatisch controleren in het venster Openen" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Slechts één draaiende toepassing toestaan" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Vragen bij &sluiten van meerdere vensters" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "Behoud bestandstijd bij bestandsvergelijking" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Toon \"Bestanden of mappen selecteren\"-dialoog bij Opstarten" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Auto-aanvullen O&penen-venster:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "" "WinMerge allows hiding some common messageboxes. Press the Reset button to " @@ -1632,664 +1701,658 @@ msgstr "" "WinMerge staat toe dat een aantal algemene berichtvensters verborgen worden. " "Druk de Herstellen-knop om alle berichtvensters terug zichtbaar te maken." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Herstellen" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Zoeken" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "Zoeke&n naar:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Alleen hele &woorden" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Hoofdle&ttergevoelig" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "Reguliere &expressies" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "Bij einde bestand st&oppen" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Volgende" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Vervangen" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Ver&vangen door:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "Bij einde bestan&d stoppen" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Vervangen in" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&Selectie" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "&Hele bestand" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "Ve&rvangen" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "&Alles vervangen" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Check-out" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Opmerkingen" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn na checkout" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Regelfilters" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Regelfilters inschakelen" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Reguliere expressies (één per regel):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Nieuw" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Bewerken" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Verwijderen" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Kleuren" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Verschil:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Geselecteerd verschil:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Achtergrond" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Verwijderd" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Genegeerd verschil:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Verplaatst:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Geselecteerd verplaatst:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Woordverschil:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Geselect. woordverschil:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Standaard" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Systeem" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Verwijderde bestanden naar de Prullenbak verplaat&sen" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&Externe editor:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Filter map:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Map met tijdelijke bestanden" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "Tijdelijke map van het systeem" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "Eigen map:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Patch generator" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Bestand&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Bestand&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "&Wisselen" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "Toevoegen &aan bestaand bestand" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Resultaat:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Zoe&ken" -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Formaat" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "St&ijl:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Context:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Lege regels o&verslaan" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Inclusief opdrac&htregel" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Openen in e&xterne editor" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Kolommen weergeven" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Verplaats omhoog" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Verplaats omlaag" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Uitpakker kiezen" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Bestandsuitpakker:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Alle uitpakkers weergeven zonder extensie te controleren" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Lijst extensies:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Beschrijving:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Stoppen" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Items vergelijken..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Items vergeleken:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Totaal aantal items:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Ga naar" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "G&a naar:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Bestand" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Ga naar" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "Re&gel" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Verschil" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Ga naar" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Vergelijken" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Witruimte" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Vergelijken" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "&Wijzigingen negeren" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Alles ne&geren" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Lege regels negeren" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "N&iet hoofdlettergevoelig" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Detectie verplaatste blokken i&nschakelen" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "Laat gelijke lijnen overeenko&men" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Filter-commentaar" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&Accentueer syntax" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "&Automatisch opnieuw scannen" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "Be&waar originele regeleindes" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabinstellingen" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Tabgrootte:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "Tabs &invoegen" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "&Spaties invoegen" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Kleur van regelverschillen" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Bekijk regelverschillen" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "Tekenniveau" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "&Woordniveau:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Bestandsfilters" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Test" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Installeren..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Nieuw..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Bewerken..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Wissen" -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Gewijzigde bestanden opslaan?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Linker bestand" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "Wijzigingen op&slaan" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "Wijzigingen ne&geren" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Rechter bestand" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "Wijzigingen opsl&aan" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Wijzigingen nege&ren" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Tekenset" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Standaard codetabel" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" "Selecteer de standaard veronderstelde codetabel bij laden van niet-" "Unicodebestanden:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2298,692 +2361,692 @@ msgstr "" "Tekenset detecteren voor deze bestanden: .html, .rc, .xml \n" "Herstarten sessie noodzakelijk" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Tekenset van systeem" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Volgens WinMerge-gebruikersinterface" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Aangepaste tekenset:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Opties" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Categorieën" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importeren..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Exporteren..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Dialoog" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Sleutelwoorden:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Functienamen" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Opmerkingen:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Nummers:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operators:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Strings:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Preprocessor:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Gebruiker 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Gebruiker 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Vet" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Mapvergelijkingsrapport" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Rapporteer &bestand" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Bladeren..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Stijl:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "Naar klembord kopiëren" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Gedeelde of persoonlijke filter" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Welk type filter wilt u maken?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Gedeelde filter (voor alle gebruikers op deze pc)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Persoonlijke filter (alleen voor huidige gebruiker)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Archiefondersteuning" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "Archiefbestand-ondersteuning inschakelen" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detecteer archieftype via bestandssignatuur" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Vergelijkingsstatistieken" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Mappen:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Bestanden:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Verschillend" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Tekst:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binair:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Uniek" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Links:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Rechts:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Identiek" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Totaal:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Sluiten" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Aanpassingen" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Aanpassingen)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Selecteer codetabel voor" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "Bestanden laden:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Bestanden op&slaan:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "Gebr&uik dezelfde codetabel voor beide" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "Toepassen" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "Annuleren" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Filter testen" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Filter testen..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "G&eef tekst op om te testen:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "Mapnaam" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Resultaat:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Test" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "Sluiten" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "Aangepaste tekstkleuren gebr&uiken" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Aangepaste tekstkleuren" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Witruimte:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Gewone tekst:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Selectie:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Paden" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Links:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "All&een-lezen" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Rechts:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "&Alleen-lezen" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filter:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Openen..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Opslaan..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Backupbestanden" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Maak backupbestanden in:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Mappen vergelijken" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "B&estanden vergelijken" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Maak backupbestanden binnen:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "Map van &origineel bestand" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&Globale backupmap:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Bestandsnaam backup:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "Voeg .b&ak-extensie toe" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "Voeg tijdstem&pel toe" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Kopiëren bevestigen" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Bent u zeker dat u XXX items wilt kopiëren?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Van links" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Naar rechts" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Ja" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Nee" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "Plugins inschakelen" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Shell-integratie" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Verkenner" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Geavanceerd me&nu inschakelen" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "Toevoegen &aan contextmenu" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Map" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "S&top na eerste verschil" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Negeer tijdsverschillen kleiner dan 3 sec&onden" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "Limiet snelvergelijking (MB):" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binair" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "041304e4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x413, 1252" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "UIT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "OPN" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Onbekende fout bij poging tot openen van projectbestand" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Onbekende fout bij poging tot opslaan van projectbestand" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Projectbestand" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Projectbestand met succes geladen." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Projectbestand met succes opgeslagen." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -3002,7 +3065,7 @@ msgstr "" "WinMerge.BestandsVergelijking\n" "WinMerge BestandsVergelijking" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3021,7 +3084,7 @@ msgstr "" "WinMerge.MapVergelijking\n" "WinMerge MapVergelijking" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3032,7 +3095,7 @@ msgstr "" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi " "Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, c-format msgid "" "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you " @@ -3043,138 +3106,138 @@ msgstr "" "herverdelen onder bepaalde omstandigheden; zie de GNU General Public License " "in het Help-menu voor details." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Afbreken" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Herhalen" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Negeren" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "&Alles negeren" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Ja op &alles" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Nee" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Nee op a&lles" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Doorgaan" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Overslaan" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "&Alles overslaan" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Dit bericht niet &meer weergeven." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Deze &vraag niet meer stellen." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "Syntax" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Versiebeheer" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Verschillen" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Naar:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Van links:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Naar links:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Van rechts:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Naar rechts:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Versie %1 - Nederlands" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Opties (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle berichtvensters worden terug weergegeven." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3185,32 +3248,32 @@ msgstr "" "\n" "Gebruik waarden 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Openen" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Uitvoerbare bestanden|*.exe;*.bat;*.cmd|Alle bestanden (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle bestanden (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projectbestanden (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Optie-bestanden (*.ini)|*.ini|Alle Bestanden (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "" "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|" @@ -3219,54 +3282,54 @@ msgstr "" "Tekstbestanden (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle " "Bestanden (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-bestanden (*.htm,*.html)|*.htm;*.html|Alle Bestanden (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-bestanden (*.xml)|*.xml|Alle Bestanden (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Naam" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Locatie" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filters" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Beschrijving" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Selecteer bestandsnaam voor nieuwe filter" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Bestandsfilters (*.flt)|*.flt|Alle Bestanden (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3279,7 +3342,7 @@ msgstr "" "Kopieer bestand %1 naar map WinMerge/Filters:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3292,7 +3355,7 @@ msgstr "" "\n" "Ga na of de map bestaat en schrijfbaar is." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3303,7 +3366,7 @@ msgstr "" "\n" "Selecteer filtermap in Opties/Systeem." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3316,12 +3379,12 @@ msgstr "" "\n" "Misschien is het bestand alleen-lezen?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Localiseer te installeren filterbestand" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3332,17 +3395,17 @@ msgstr "" "\n" "Kon nieuwe filter niet kopiëren naar filtermap." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filterbestand bestaat reeds. Bestaande filter overschrijven?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Reguliere expressie" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3356,173 +3419,173 @@ msgstr "" "Indien u dit nu niet wilt doen, kan u Nee selecteren en de vergelijkingen " "later vernieuwen." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&Pad naar SS.EXE:" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Resultaten mapvergelijking" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Restultaten bestandsvergelijking" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Geen titel links" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Geen titel rechts" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Hun bestand" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Mijn bestand" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Regel: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Samenvoegen" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Verschil %1 van %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 verschillen gevonden" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "Eén verschil gevonden" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "AL" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Item %1 van %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Items: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecteer twee bestaande mappen of bestanden om te vergelijken" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Selectie van mappen" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecteer twee mappen of bestanden om te vergelijken." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Linker pad is ongeldig!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Rechter pad is ongeldig!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Beide paden zijn ongeldig!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Kies twee bestanden om de uitpakker selectie in te schakelen." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan geen bestand met een map vergelijken!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Bestand niet gevonden: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Bestand niet uitgepakt: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3535,12 +3598,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Analyseren van conflictbestand mislukt." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3551,17 +3614,17 @@ msgstr "" "%1\n" "is geen conflictbestand." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Opslaan als" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Wijzigingen opslaan in %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, c-format msgid "" "%1 is marked read-only. Would you like to override the read-only file ? (No " @@ -3570,12 +3633,12 @@ msgstr "" "%1 is gemarkeerd als alleen lezen. Wilt u dit alleen-lezen bestand " "overschrijven? (Niet opslaan onder nieuwe naam.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Fout bij het maken van een veiligheidskopie" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3588,7 +3651,7 @@ msgstr "" "\n" "Toch doorgaan?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3603,7 +3666,7 @@ msgstr "" "%2\n" "Wilt u het bestand onder een andere naam opslaan?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3618,7 +3681,7 @@ msgstr "" "\n" "Wilt u de uitgepakte versie in een ander bestand opslaan?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3633,7 +3696,7 @@ msgstr "" "\n" "Wilt u de uitgepakte versie in een ander bestand opslaan?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3648,7 +3711,7 @@ msgstr "" "\n" "Het gewijzigde bestand overschrijven?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3657,7 +3720,7 @@ msgstr "" "%1\n" "is gemarkeerd als alleen-lezen. Wilt u het alleen-lezen item overschrijven?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3672,22 +3735,22 @@ msgstr "" "\n" "Wilt u het bestand opnieuw laden?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Linker bestand opslaan als" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Rechter bestand opslaan als" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3698,7 +3761,7 @@ msgstr "" "%1\n" "is verdwenen. Sla een kopie van het bestand op om door te gaan." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3709,7 +3772,7 @@ msgstr "" "\n" "Vernieuw documenten voordat u doorgaat." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "" "You must specify a SourceSafe project path in order to continue (ie: $/" @@ -3718,12 +3781,12 @@ msgstr "" "U moet een SourceSafe project path specificeren voordat u verder kunt (bv: " "$/MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Bestanden vanuit VSS uitchecken..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "" "Versioning System returned an error while attempting to check out the file. " @@ -3732,12 +3795,12 @@ msgstr "" "SourceSafe gaf een foutmelding bij de check out van het bestand. Kan niet " "verder gaan..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Fout bij het uitvoeren van een versiebeheer systeemopdracht." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "" "The VSS Working Folder and the location of the current file do not match. " @@ -3746,17 +3809,17 @@ msgstr "" "De VSS werkmap en de lokatie van het huidige bestand komen niet overeen. " "Doorgaan?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Geen VSS database(s) gevonden!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Fout uit VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3767,7 +3830,7 @@ msgstr "" " Controleer configuratie-specificaties van de gebruikte weergave.\n" " Checkout ongedaan maken?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the " @@ -3778,127 +3841,146 @@ msgstr "" "bestands-checkout.\n" " Controleer configuratie-specificaties van de gebruikte weergave." -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Geen" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 of lager)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 en hoger)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Afbreken bij witruimte" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Afbreken bij witruimte of interpunctie" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Van rechts naar links (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Van links naar rechts (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Van rechts naar links (%1 van %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Van links naar rechts (%1 van %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Van links naar rechts (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Van links naar... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Van rechts naar... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Van links naar... (%1 van %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Van rechts naar... (%1 van %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Links (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Rechts (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Beide (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Links (%1 of %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Rechts (%1 of %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Beide (%1 of %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Linkerkant - selecteer doelmap:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Rechterkant - selecteer doelmap:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Bestanden Aangepast)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 van %2 Bestanden Aangepast)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3910,17 +3992,17 @@ msgstr "" "%1\n" "wilt verwijderen?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Bent u zeker dat u het volgende wilt kopiëren:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Bent u zeker dat u %d items wilt kopiëren:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3939,457 +4021,457 @@ msgstr "" "\n" "Vernieuw a.u.b. de vergelijking." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Bent u zeker dat u wilt verplaatsen:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Bent u zeker dat u %d items wilt verplaatsen:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Bevestig Verplaatsen" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Uitvoeren externe editor mislukt: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Onbekend archiefformaat" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Bestandsnaam" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Vergelijkingsresultaat" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Datum links" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Datum rechts" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Extensie" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Grootte links" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Grootte rechts" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Grootte rechts (Kort)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Grootte links (Kort)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Aanmaaktijd links" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Aanmaaktijd rechts" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Nieuwer bestand" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Bestandsversie links" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Bestandsversie rechts" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Kort resultaat" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Attributen links" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Attributen rechts" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Links regeleinde" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Rechts regeleinde" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Tekenset links" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Tekenset rechts" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Genegeerde Versch." -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Kan bestanden niet vergelijken" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Item afgebroken" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Bestand overgeslagen" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Map overgeslagen" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Alleen links: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Alleen rechts: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Binaire bestanden zijn identiek" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Binaire bestanden zijn niet gelijk" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Bestanden zijn niet gelijk" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Mappen zijn verschillend" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Alleen links" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Alleen rechts" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Fout" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Tekstbestanden zijn identiek" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Tekstbestanden zijn verschillend" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Verstreken tijd: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 item geselecteerd" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 items geselecteerd" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Bestandsnaam of mapnaam." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Naam van submap als submappen erbij horen." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Resultaat van vergelijking, lange vorm." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Wijzigingsdatum linker zijde." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Wijzigingsdatum rechter zijde." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Bestandsextensie." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Bestandsgrootte in bytes voor linker zijde." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Bestandsgrootte in bytes voor rechter zijde." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Linker bestandsgrootte ingekort." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Rechter bestandsgrootte ingekort." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Aanmaaktijdstip linker zijde." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Aanmaaktijdstip rechter zijde." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Geeft aan welke zijde het recentst gewijzigd is." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Bestandsversie linker zijde, alleen voor bepaalde bestandstypes." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Bestandsversie rechter zijde, alleen voor bepaalde bestandstypes." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Kort vergelijkingsresultaat." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Attributen linker zijde." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Attributen rechter zijde." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Type regeleinde linker bestand" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Type regeleinde rechter bestand" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Tekenset linker zijde." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Tekenset rechter zijde." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "" "Number of ignored differences in file. These differences are ignored by " @@ -4398,7 +4480,7 @@ msgstr "" "Aantal genegeerde verschillen in bestand. Deze verschillen worden genegeerd " "door WinMerge en kunnen niet samengevoegd worden." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "" "Number of differences in file. This number does not include ignored " @@ -4406,43 +4488,43 @@ msgid "" msgstr "" "Aantal verschillen in bestand. Dit aantal is zonder genegeerde verschillen." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Toont sterretje (*) als het een binair bestand is." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "%1 met %2 vergelijken" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Komma-gescheiden lijst" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Tab-gescheiden lijst" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Simpele html" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Simpele xml" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" "Het rapportbestand bestaat reeds. Wilt u het bestaande bestand overschrijven?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4451,27 +4533,27 @@ msgstr "" "Fout bij maken van rapport:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Het rapport is met succes opgesteld." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Hetzelfde bestand is in beide vensters geopend." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "De geselecteerde bestanden zijn identiek" -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Fout opgetreden tijdens het vergelijken van de bestanden" -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "" "Temporary files could not be created. Check your temporary path settings." @@ -4479,7 +4561,7 @@ msgstr "" "Tijdelijke bestanden konden niet aangemaakt worden. Controleer de instelling " "voor het pad van tijdelijke bestanden." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4500,17 +4582,17 @@ msgstr "" "behandelen, stel optie \"Negeer regeleindeteken-verschillen...\" dan in in " "de Vergelijken-tab van het opties-venster (beschikbaar onder Wijzigen/Opties)" -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "De geselecteerde map is ongeldig." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan geen binair bestand openen met de editor." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4525,7 +4607,7 @@ msgstr "" "%1\n" "maken aan de andere kant en deze mappen openen?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4541,152 +4623,152 @@ msgstr "" "Wilt u beide bestanden behandelen alsof ze in de standaard Windows-codetabel " "zijn (aangeraden)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informatie verloren gegaan wegens coderingsfouten: beide bestanden" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Geen verschil" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Regelverschil" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 tekenreeks(en) vervangen." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan tekenreeks \"%s\" niet vinden" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Locatievenster" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Verschilvenster" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Patch-bestand met succes weggeschreven." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1ste item niet gevonden! (is het een map?)" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2de item niet gevonden! (is het een map?)" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Het patch-bestand bestaat al. Wilt u het overschrijven?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 bestanden geselecteerd]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normaal" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Context" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Verenigd" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Kan niet schrijven naar bestand %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Het gespecifieerde uitvoerpad is geen absoluut pad: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Specifieer een uitvoerbestand" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan geen patch-bestand maken uit binaire bestanden." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan geen patch-bestand maken uit mappen." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4698,12 +4780,12 @@ msgstr "" "Een patch genereren vereist dat er geen niet-opgeslagen veranderingen in " "bestanden zijn." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Map bestaat niet." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4717,37 +4799,37 @@ msgstr "" "Zie de handleiding voor meer info over archiefondersteuning en hoe het in te " "schakelen." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Selecteer te exporteren bestand" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Selecteer te importeren bestand" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Opties geïmporteerd van bestand" -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Opties geëxporteerd naar bestand." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Opties importeren van bestand mislukt." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Opties schrijven naar bestand mislukt." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4759,117 +4841,117 @@ msgstr "" "\n" "Wilt u doorgaan?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Gemengd" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Type" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Uitpakker" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Voorvergelijken" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Editor-script" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "" "The adapted unpacker is applied to both files (one file only needs the " @@ -4878,132 +4960,132 @@ msgstr "" "De overgenomen uitpakker wordt gebruikt voor beide bestanden (een bestand " "hoeft maar de extensie te hebben)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Geen voorvergelijking (normaal)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Voorgestelde plug-ins" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Andere plug-ins" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Private Versie: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Plug-in instellingen" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH niet gevonden - .sct scripts uitgeschakeld" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "G&a naar regel %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Uitgeschakeld" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Van bestandssysteem" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Van MRU-lijst" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Geen Markering" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Draagbaar Object" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Bronnen" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index 10ae5e0fc..e28d17e17 100644 --- a/Translations/WinMerge/English.pot +++ b/Translations/WinMerge/English.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n" -"POT-Creation-Date: 2015-07-25 11:15+0000\n" +"POT-Creation-Date: 2015-09-06 23:44+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -74,7 +74,7 @@ msgid "Cu&t" msgstr "" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "" @@ -85,7 +85,7 @@ msgid "&Paste" msgstr "" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "" @@ -96,22 +96,25 @@ msgid "Op&en" msgstr "" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "" @@ -149,7 +152,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "" @@ -161,8 +164,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "" @@ -179,49 +182,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "" #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "" @@ -233,274 +236,274 @@ msgstr "" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "" #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "" #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "" #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "" #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "" @@ -511,7 +514,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "" @@ -533,4150 +536,4229 @@ msgstr "" #: Merge.rc:267 #, c-format -msgid "Show Ri&ght Unique Items" +msgid "Show Midd&le Unique Items" msgstr "" #: Merge.rc:268 #, c-format -msgid "Show S&kipped Items" +msgid "Show Ri&ght Unique Items" msgstr "" #: Merge.rc:269 #, c-format +msgid "Show S&kipped Items" +msgstr "" + +#: Merge.rc:270 +#, c-format msgid "S&how Binary Files" msgstr "" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "" -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "" -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "" -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." +msgid "Left to Middle (%1 of %2)" msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" +msgid "Left to Right (%1 of %2)" msgstr "" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 +#, c-format +msgid "Left to... (%1 of %2)" +msgstr "" + +#: Merge.rc:622 +#: Merge.rc:2305 #, c-format -msgid "R&ight to..." +msgid "Middle to Left (%1 of %2)" msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." +msgid "Right to Middle (%1 of %2)" msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 +#, c-format +msgid "Right to Left (%1 of %2)" +msgstr "" + +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "" + +#: Merge.rc:629 #, c-format -msgid "&Right to..." +msgid "&Move" msgstr "" -#: Merge.rc:628 +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" +msgid "Left (%1 of %2)" msgstr "" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" +msgid "Middle (%1 of %2)" msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 #, c-format -msgid "&Both (%1 of %2)" +msgid "Right (%1 of %2)" msgstr "" -#: Merge.rc:656 +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 #, c-format -msgid "Copy &Filenames" +msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:657 +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "Copy Items To Clip&board" +msgid "All (%1 of %2)" msgstr "" -#: Merge.rc:664 +#: Merge.rc:673 #, c-format -msgid "&Zip" +msgid "Copy &Filenames" msgstr "" -#: Merge.rc:666 +#: Merge.rc:674 #, c-format -msgid "&Left... (%1 of %2)" +msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:667 +#: Merge.rc:683 #, c-format -msgid "&Right... (%1 of %2)" +msgid "&Zip" msgstr "" -#: Merge.rc:668 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Both... (%1 of %2)" +msgid "Both to... (%1 of %2)" msgstr "" -#: Merge.rc:669 +#: Merge.rc:689 +#: Merge.rc:2319 +#, c-format +msgid "All to... (%1 of %2)" +msgstr "" + +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" +msgid "Differences to... (%1 of %2)" msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "" -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "" -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "" -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "" -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "" -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "" -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "" -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "" -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "" -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "" -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "" -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "" -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1." msgstr "" -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2." msgstr "" -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable." msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System." msgstr "" -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?" msgstr "" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:2151 +#: Merge.rc:2172 #, 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:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "" -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2247 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" msgstr "" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "%1\nis marked read-only. Would you like to override the read-only item?" msgstr "" -#: Merge.rc:2235 +#: Merge.rc:2256 #, 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:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing." msgstr "" -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?" msgstr "" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. " msgstr "" -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" +msgid "Right to Middle (%1)" msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" +msgid "Middle to Left (%1)" msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" +msgid "Middle to Right (%1)" msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" +msgid "Both to... (%1)" msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" +msgid "All to... (%1)" msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2314 #, c-format -msgid "Left (%1)" +msgid "Differences to... (%1)" msgstr "" -#: Merge.rc:2290 +#: Merge.rc:2326 #, c-format -msgid "Right (%1)" +msgid "Left (%1)" msgstr "" -#: Merge.rc:2291 +#: Merge.rc:2327 #, c-format -msgid "Both (%1)" +msgid "Middle (%1)" msgstr "" -#: Merge.rc:2292 +#: Merge.rc:2328 #, c-format -msgid "Left (%1 of %2)" +msgid "Right (%1)" msgstr "" -#: Merge.rc:2293 +#: Merge.rc:2329 #, c-format -msgid "Right (%1 of %2)" +msgid "Both (%1)" msgstr "" -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" +msgid "All (%1)" msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare." msgstr "" -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "" -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "" -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "" -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "" -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "" -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "" -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "" -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "" -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "" -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "" -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "" -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "Error creating the report:\n%1" msgstr "" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "" -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "" -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "" -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "" -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." msgstr "" -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?" msgstr "" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "" -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "Archive support is not enabled.\nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it." msgstr "" -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index db76f972e..70e5c7493 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -82,7 +82,7 @@ msgid "Cu&t" msgstr "&Couper" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "Co&pier" @@ -93,7 +93,7 @@ msgid "&Paste" msgstr "Co&ller" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&Atteindre..." @@ -104,22 +104,25 @@ msgid "Op&en" msgstr "&Ouvrir" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "avec l'application &désignée" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "avec l'éditeur &externe" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&avec..." @@ -157,7 +160,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -169,8 +172,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Aucune" @@ -187,49 +190,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Fichier" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Nouveau\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Ouvrir...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Ouvrir le fichier en conflit..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Ouvrir un &projet...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Enregistrer un Pro&jet..." @@ -241,274 +244,274 @@ msgstr "Projets r #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Vide >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "&Quitter" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Edition" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Préférences..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Affichage" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "Barre d'ou&tils" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Petite" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Grande" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "Barre d'&état" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Barre d'&onglets" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Outils" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filtrer..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Générer des retouches..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Plugiciels" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "Pré-comparaison &manuelle" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "Pré-comparaison &automatique" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "Décompression &manuelle" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "Décompression &automatique" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Recharger les plugiciels" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "Fe&nêtre" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Fermer" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Fermer &tout" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Chan&ger de volet\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Mosaïque &horizontale" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Mosaïque &verticale" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Cascade" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "A&ide" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&Rubriques d'aide WinMerge\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "&Configuration" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&Licence publique générale GNU" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&A propos de WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Côté gauc&he lecture seulement" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Côté droi&t lecture seulement" @@ -519,7 +522,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Sélectionner &tout\tCtrl+A" @@ -541,1751 +544,1811 @@ msgstr "Fichiers uniquement #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Fichiers uniquement à d&roite" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Fichiers ig&norés" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Fichiers &binaires" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "A&fficher les éléments cachés" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "Arborescence" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "Dilat&er tous les sous-répertoires" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "&Contracter tous les sous-répertoires" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Choisir une &police..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "&Utiliser la police par défaut" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Statistiques de comparaison" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "&Actualiser\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Actualiser la &sélection\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "Fu&sionner" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&mparer\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "Différence &suivante\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Différence &précédente\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "P&remière différence\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Différence &courante\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Dernière différence\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copier vers la dr&oite\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copier vers la ga&uche\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "Su&pprimer\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Ajuster les colonnes..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Générer un &rapport..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Enregistrer\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Enregistrer à &gauche" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Enregistrer à &droite" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Imprimer..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "&Mise en page" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "&Aperçu avant impression" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Convertir les fins de ligne" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "Mode &Fusion\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "Encodage de fic&hier" -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "&Binaire" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "Ann&uler\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Rétablir\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Couper\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "Cop&ier\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "Co&ller\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "&Sélectionner la distinction\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Rec&hercher...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Re&mplacer...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "A&vancé" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copier avec des numéros de ligne\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "Si&gnets" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Placer ou &retirer un signet\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "Signet &suivant\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Signet &précédent\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Effacer tous les signets" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Atteindre...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Zoom a&vant\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Zoom a&rrière\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "&Coloration de la syntaxe" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "&Verrouiller les fenêtres" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "Afficher les &espaces" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Afficher la &granularité des lignes" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Afficher la &numérotation des lignes" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Afficher les &marges" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "&Retour à la ligne automatique" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "&Intervertir les fenêtres" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "&Détail des différences" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Barre de locali&sation" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Copier vers la droite et A&vancer\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copier vers la gauche et Av&ancer\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Tout cop&ier vers la droite" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Tout copi&er vers la gauche" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Pré-comparer" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "Appli&quer un script" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Co&mparer" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "Co&mparer comme" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "de &gauche vers la droite" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "de g&auche vers..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "de &droite vers la gauche" +msgid "Left to Right (%1 of %2)" +msgstr "De gauche à droite (%1 de %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "de d&roite vers..." +msgid "Left to... (%1 of %2)" +msgstr "De gauche vers... (%1 de %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "Dé&placer" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "de g&auche vers..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "de d&roite vers..." +msgid "Right to Left (%1 of %2)" +msgstr "De droite à gauche (%1 de %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "De droite vers... (%1 de %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "Dé&placer" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Supprimer" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "à &gauche" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "à &droite" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "des deu&x côtés" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Re&nommer" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "D&issimuler l'élément(s)" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "Ouvrir à &gauche" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Ouvrir à &droite" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Copier le c&hemin complet" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "de &gauche (%1 de %2)" +msgid "Left (%1 of %2)" +msgstr "À gauche (%1 de %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "de &droite (%1 de %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "À droite (%1 de %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Des deux côtés (%1 de %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "des deu&x côtés (%1 de %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Copier le nom de &fichier" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "Co&mpresser" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "à &gauche... (%1 de %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "à &droite... (%1 de %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "les deu&x côtés... (%1 de %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "les di&fférences...(%1 de %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Actualiser" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Menu explorateur gauche" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Menu explorateur droit" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "Copier le c&hemin complet" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Copier le nom de &fichier" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Ajustements de pré-comparaison" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "Au&cun" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Au&tomatique" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Atteindre la différence courante" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Ne pas afficher les blocs déplacés" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Afficher les blocs déplacés" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Afficher le bloc déplacé de la différence &courante" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "Caractères d'&espacement" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "C&omparer" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "Ignorer les chan&gements" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Ignorer &tout" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "Respecter la casse" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Ignorer les différences de &fin de ligne (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "&Méthode de comparaison:" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Contenu complet" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Contenu rapide" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Date de modification" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Date et taille modifiée" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Taille" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "A propos de WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Compilation personnalisée)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Découvrez la page d'accueil de WinMerge !" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Contributeurs" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Sélection des fichiers ou des répertoires..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "P&arcourir..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "Parc&ourir..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "P&arcourir..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "&Choisir..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "Décom&pres." -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "C&hoisir..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Inclure les sous-répertoires" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Statut:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Ann&uler" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Aide" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Fichiers ou répertoires à comparer :" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "&Database:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "&Projet:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Usa&ger:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "&Mot de passe:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "&Lien vers le projet destination VSS" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "&Appliquer à tous les éléments" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "E&xtraire" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Enregis. &sous" -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Contrôle de version" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Système utilisé:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Chemin vers cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Général" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "&Atteindre automatiquement la première différence" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fermer les fenêtres avec la &touche ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Vérifier automatiquement les chemins de la fenêtre-Ouvrir" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "&Permettre une seule instance en exécution" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "&Confirmer la fermeture de plusieurs fenêtres" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "Préserver le timbre horaire lors de comparaison de fichier" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Afficher la boîte de dialogue d'ouverture au démarrage" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Remplissage de la boîte de dialogue d'ouverture:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permet de dissimuler certaines boîtes de message. Appuyer sur ce bouton pour les rendre visibles à nouveau." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Rétablir" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Rechercher" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "&Rechercher:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "&Mot entier seulement" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Respecter la &casse" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "E&xpressions régulières" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "Pas de retour automatique à la ligne" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Suivant" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Remplacer" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Rem&placer par:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "&Ne pas absorber la fin de ligne" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Portée " -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "La sé&lection" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "Tout le &fichier" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Remplacer" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "&Tout Remplacer" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "&Extraire" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Commentaires" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Inscrire après extraction" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Filtre des lignes" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Activer le fitrage des lignes" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Expressions régulières (une par ligne)" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Nouveau" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Editer" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Supprimer" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Couleurs" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Différence:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Différence sélectionnée :" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Fond" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Absence" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Texte" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Différence ignorée:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Déplacé:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Sélectionné et déplacé:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Mot différent:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Mot différent sélectionné:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Défauts" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Système" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Envoyer les fichiers supprimés à la corbeille" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "E&diteur externe:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Répertoire de filtre:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Répertoire des fichiers temporaires" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "Répertoire temporaire du système" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "Répertoire à identifier:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Générateur de retouche" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Fichier&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Fichier&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "&Intervertir" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "A&jouter au fichier existant" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "Ré&sultat:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Pa&rcourir..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "St&yle:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Contexte:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorer les lignes &vides" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Inclure la ligne de co&mmande" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Ouvrir avec l'éditeur e&xterne" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Affichage des colonnes" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "&Monter" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "&Descendre" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Sélectionner le décompresseur" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Décompresseur:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Afficher tous les décompresseurs, ignorer les extensions" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Extensions:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Description:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Arrêter" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Comparaison des éléments..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Éléments comparés:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Éléments au total:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Atteindre" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "A&tteindre:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Fichier" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Atteindre quoi" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "&Ligne" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "Di&fférence" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Atteindre" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Comparaison" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Caractères d'espacement" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "C&omparer" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "Ignorer les chan&gements" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Ignorer &tout" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorer les lignes &vides" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Ignorer la ca&sse" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "&Activer la détection des blocs déplacés" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "Assortir les &lignes similaires" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Filtrer les commentaires" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Éditeur" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&Colorer la syntaxe" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "&Actualiser automatiquement" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&Préserver les caractères de fin de ligne d'origine" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabulations" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "Tai&lle des tabulations:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "Insérer &tabulation" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "Insérer &espace" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Colorer les différences de ligne" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "A&fficher les différences" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "Précision au &caractère" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "Précision au &mot" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "Caractères pour distinction de mot:" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Filtre des fichiers" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Test" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Installer..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "&Nouveau..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "É&diter..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "&Supprimer..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Enregister les fichiers modifiés ?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Fichier du côté gauche" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Enregister les changements" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Ignorer les changements" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Fichier du côté droit" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "E&nregister les changements" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "I&gnorer les changements" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "Ignorer tout" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Page de code" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Page de code par défaut" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Sélectionnez la page de code par défaut qui est assumé lors du chargement des fichiers non-Unicode:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2294,692 +2357,692 @@ msgstr "" "&Détecter la page de code pour les fichiers : .html, .rc, .xml \n" "nécessite un redémarrage de session" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Page de code &système" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Conformément à l'&interface usager WinMerge" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Page de code sti&pulée :" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Préférences" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Catégories" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importer..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Exporter..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Dialogue" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Mots clés:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Nom des Fonctions:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Commentaires:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Nombres:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Opérateurs:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Chaines:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Préprocesseur:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Usager 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Usager 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Surbrillance" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Répertoire du rapport de comparaison" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Fichier du &rapport:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Parc&ourir..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Style:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Copier au presse-papiers" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Filtre partagé ou privé" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Quel type de filtre voulez-vous créer ?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtre partagé (pour tous les usagers de l'odinateur)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtre privé (pour l'usager actuel seulement)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Support d'archives" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Activer le support d'archives" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Détecter le type d'archives avec un fichier de signature" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Statistiques de comparaison" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Répertoires:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Fichiers:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Différent" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Texte:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binaire:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Unique" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Gauche:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Droit:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Identique" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Fermer" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Affectations" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Concernés)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Sélectionner le code de page pour" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&Chargement de fichier:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "&Enregistrement de fichier:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&Utiliser le même pour les deux" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Appliquer" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "Ann&uler" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Filtre de test" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Tester le filtre ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Saisir le texte à tester:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Nom de répertoire" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Resultat:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Tester" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Fermer" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&Utiliser les couleurs de texte ajustées" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Couleurs de texte ajustées" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Caractère espace:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Texte régulier:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Sélection:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Chemins" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Gauche:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Lecture seule" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Droite:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Lecture seule" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filtre:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Ouvrir..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Enregistrer..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Fichiers d'archive" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Créer les fichiers d'archive sous:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "comparaison de Répert&oires" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "comparaison de &Fichiers" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Créer les fichiers d'archive dans:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "&Répertoire d'&origine du fichier" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "Répertoire d'archive &global:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "&Nom du fichier d'archive:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "Apposer une &extension .bak" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "Apposer une estampille &temporelle" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Confirmation de copie" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Êtes-vous sûr de vouloir copier XXX éléments ?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "De la gauche" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Vers la droite" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Oui" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Non" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Plugiciels" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "&Activer les plugiciels" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Intégration à l'explorateur" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Explorateur" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "&Activer le menu avancé" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "&Ajouter au menu contextuel" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Répertoire" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "&Arrêter à la première différence" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "I&gnorer les différences de temps de moins de 3 secondes" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "&Inclure le contenu des répertoires uniques" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "&Limite de comparaison rapide (MO):" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binaire" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "040c04e4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x40c, 1252" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "MAJ" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erreur indéterminée lors de l'ouverture du projet" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erreur indéterminée lors de l'enregistrement du projet" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Fichier de projet" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Fichiers du projet correctement chargés." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Fichiers du projet correctement enregistrés." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2998,7 +3061,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge File Compare" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3017,7 +3080,7 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Folder Compare" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3026,143 +3089,143 @@ msgstr "" "Développeurs:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 est fourni SANS AUCUNE GARANTIE. C'est un logiciel libre et vous êtes invité à le redistribuer sous certaines conditions; Voir la licence publique générale GNU au menu d'aide pour tous les détails." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Avorter" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Réessayer" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Ignorer" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Ignorer &tout" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Oui" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Oui pour &tout" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Non" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Non pour t&out" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Continuer" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Ignorer" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Ignorer &tout" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Ne plus afficher ce &message." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Ne plus poser cette &question." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "Syntaxe" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Contrôle de version" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Différences" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Vers:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "De la gauche:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Vers la gauche:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "De la droite:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Vers la droite:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Version %1 - Français" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Préférences (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Tous les messages seront réaffichés." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3172,84 +3235,84 @@ msgstr "La valeur de la taille des tabulations n'entre pas dans la plage accept "\n" "Voici la plage des valeurs acceptées 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Ouvrir" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmes|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Tous les fichiers (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Fichiers de projet WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Fichiers d'options (*.ini)|*.ini|Tous les fichiers (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Fichiers texte (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tous les fichiers (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Fichiers HTML (*.htm,*.html)|*.htm;*.html|Tous les fichiers(*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fichiers XML (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Nom" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Emplacement" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filtres" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Description" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Sélectionner un nom de fichier pour le nouveau filtre" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtres de fichier (*.flt)|*.flt|Tous les fichiers (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3262,7 +3325,7 @@ msgstr "" "Veuillez copier le fichier %1 dans WinMerge/Répertoire des filtres:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3275,7 +3338,7 @@ msgstr "" "\n" "Veuillez vous assurer de l'existance du répertore et qu'il soit inscriptible." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3286,7 +3349,7 @@ msgstr "" "\n" "Veuillez le définir sous Préférences/Système." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3299,12 +3362,12 @@ msgstr "" "\n" "Cause probable: fichier en lecture seule?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Localiser le fichier de filtre à installer" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3315,17 +3378,17 @@ msgstr "" "\n" "Ne peut copier le nouveau fichier de filtre au répertoire de filtre." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Le fichier de filtre existe déjà. Écraser le filtre existant?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Expression régulière" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3336,173 +3399,173 @@ msgstr "" "\n" "Si vous ne voulez pas actualiser la comparaison. Sélectionnez Non et l'actualisation se fera plus tard." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&Chemin vers SS.EXE:" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Résultats de la comparaison des répertoires" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Comparaison de fichiers" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Sans titre à gauche" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Sans titre à droite" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Leur fichier" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Mon fichier" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Ligne: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Fusion" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Différence %1 de %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 Différences trouvées" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 Différence trouvée" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "LS" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Élément %1 de %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Élément: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Comparez deux fichiers ou deux répertoires !" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Sélection de répertoire" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Sélectionner deux répertoires ou deux fichiers à comparer" -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Le chemin de gauche est invalide !" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Le chemin de droite est invalide !" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Les deux chemins sont invalides !" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Choisissez deux fichiers pour activer la sélection du décompresseur." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Ne peut comparer un fichier et un répertoire !" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Fichier %1 non trouvé" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Fichier non décompressé : %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3515,12 +3578,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "L'analyse du fichier en conflit a échoué." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3531,27 +3594,27 @@ msgstr "" "%1\n" "n'est pas un fichier en conflit." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Enregistrer sous" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Enregistrer les changements de %1 ?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 est en lecture seule. Voulez-vous outrepasser ? (Choisissez Non pour enregistrer avec un nouveau nom.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Erreur durant la prise de fichiers d'archive" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3564,7 +3627,7 @@ msgstr "" "\n" "Continuer quand même ?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3581,7 +3644,7 @@ msgstr "" "\t-utiliser un nom autre nom de fichier (Ok)\n" "\t-avorter l'opération en cours (Annuler)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3596,7 +3659,7 @@ msgstr "" "\n" "Voulez-vous enregistrer la version décompressée sous un autre nom ?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3611,7 +3674,7 @@ msgstr "" "\n" "Voulez-vous enregistrer la version décompressée sous un autre nom ?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3626,7 +3689,7 @@ msgstr "" "\n" "Voulez-vous écraser le fichier mis à jour ?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3635,7 +3698,7 @@ msgstr "" "%1\n" "est en lecture seule. Voulez-vous outrepasser ?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3650,22 +3713,22 @@ msgstr "" "\n" "Voulez-vous actualiser le fichier?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Enregistrer le fichier de gauche sous" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Enregistrer le fichier de droite sous" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3676,7 +3739,7 @@ msgstr "" "%1\n" "a disparu. Veuillez enregistrer une copie du fichier pour continuer." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3687,42 +3750,42 @@ msgstr "" "\n" "Actualiser les documents avant de poursuivre." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Vous dever indiquer un chemin d'accès au projet SourceSafe afin de pouvoir continuer (par ex. : $/MonProjet)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Extraire les fichiers de VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Le système de contrôle de version a retourné une erreur en essayant d'extraire le fichier. Ne peut continuer..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Erreur d'exécution d'une commande du système de contrôle de version." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Le répertoire de travail de VSS et l'emplacement du fichier courant ne correspondent pas. Continuer ?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Aucune base de données de VSS trouvée !" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Erreur de VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3733,7 +3796,7 @@ msgstr "" " Veuillez vérifier la configuration.\n" " Annuler l'operation d'extraction?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3742,127 +3805,146 @@ msgstr "" "Le système de contrôle de version a retourné une erreur en essayant d'extraire le fichier.\n" " Veuillez vérifier la configuration. " -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Aucun" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (inférieur à 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 et supérieur)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Distinguer sur espacement" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Distinguer sur espacement ou ponctuation" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "De droite à gauche (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "De gauche à droite (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "De droite à gauche (%1 de %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "De gauche à droite (%1 de %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "De gauche à droite (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "De gauche vers... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "De droite vers... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "De gauche vers... (%1 de %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "De droite vers... (%1 de %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "À gauche (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "À droite (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Des deux côtés (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "À gauche (%1 de %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "À droite (%1 de %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Des deux côtés (%1 de %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Côté gauche - choisir répertoire de destination:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Côté droit - choisir répertoire de destination:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Fichiers concernés)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 Fichiers concernés)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3873,17 +3955,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Voulez-vous vraiment copier:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Voulez-vous vraiment copier %d éléments:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3902,502 +3984,502 @@ msgstr "" "\n" "Veuillez actualiser la comparaison." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Êtes-vous sûr de vouloir déplacer:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Êtes-vous sûr de vouloir déplacer %d éléments:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Confirmez le déplacement" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Lancement de l'éditeur externe a échoué: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Format d'archives inconnu" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Nom du fichier" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Résultat de la comparaison" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Date mod. gauche" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Date mod. droite" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Extension" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Taille gauche" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Taille droite" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Taille droite (abrégée)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Taille gauche (abrégée)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Date cré. gauche" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Date cré. droit" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Plus récent" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Version gauche" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Version droite" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Résultat" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Attributs gauches" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Attributs droits" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Fin de ligne gauche" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Fin de ligne droit" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Page de code gauche" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Page de code droite" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Différences ignorées" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Impossible de comparer les fichiers" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Élément abandonné" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Fichier ignoré" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Répertoire ignoré" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Juste à gauche: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Juste à droite: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Les fichiers binaires sont identiques" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Les fichiers binaires sont différents" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Les fichiers sont différents" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Les répertoires sont différents" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Juste à gauche" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Juste à droite" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Erreur" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Les fichiers de texte sont identiques" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Les fichiers de texte sont différents" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Temps écoulé: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 élément sélectionné" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 éléments sélectionnés" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Nom de fichier ou de répertoire." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nom du sous-répertoire lorsque ceux-ci sont inclus." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Resultat de la comparison, format étendu." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Date de modification du côté gauche." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Date de modification du côté droit." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Extension du fichier." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Taille du fichier du côté gauche en octets." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Taille du fichier du côté droit en octets." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Taille du fichier du côté gauche abrégée." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Taille du fichier du côté droit abrégée." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Date de creation du côté gauche." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Date de creation du côté droit." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Indique le côté ayant la date de modification la plus récente." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Version du fichier du côté gauche, certains fichiers seulement." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Version du fichier du côté droit, certains fichiers seulement." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Resultat de la comparison, format abrégé." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Attributs du côté gauche." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Attributs du côté droit." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Type de fin de ligne du côté gauche" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Type de fin de ligne du côté droit" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Page de code du côté gauche." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Page de code du côté droit." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Nombre total des différences. Elles sont ignorées par WinMerge et ne peuvent être fusionnées." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Nombre de différences à l'exclusion de celles ignorées." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Indique un astérisque (*) si le fichier est binaire." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Comparer %1 avec %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Liste délimitée par des virgules" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Liste délimitée par des tabulations" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Format HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Format XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Le rapport existe déjà. Voulez-vous écraser le fichier existant?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4406,32 +4488,32 @@ msgstr "" "Erreur à la création du rapport:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Le rapport a été créé avec succès." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Le même fichier est ouvert dans les deux volets." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Les fichiers sélectionnés sont identiques." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Erreur lors de la comparaison des fichiers." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Des fichiers temporaires ne peuvent être créés. Vérifiez la définition du chemin temporaire." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4446,17 +4528,17 @@ msgstr "" "\n" "Notez bien: Si vous voulez toujours considérer une telle égalité. Définnissez l'option: Ignorer les différences de fin de ligne à la fenêtre des Préférences sous l'onglet Comparaison (accessible avec le menu Edition/Préférences)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Le répertoire sélectionné est invalide." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ne peut ouvrir un fichier binaire avec l'éditeur." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4471,7 +4553,7 @@ msgstr "" "%1\n" "à l'autre côté et ouvrir ces répertoires" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4482,152 +4564,152 @@ msgstr "" "L'affichage est ainsi meilleurs cependant les copie/fusion seront dangeureuses.\n" "Désirez-vous traiter les deux fichiers avec la page de code windows par défaut (recommandé)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Information perdue à cause d'erreurs d'encodage: pour les deux fichiers" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Aucune différence" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Ligne différente" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 remplacement(s) effectué(s)." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Texte non trouvé \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Barre de localisation" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Détail des différences" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Fichier de retouche écrit avec succès." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. élément non trouvé ou il s'agit d'un répertoire !" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. élément non trouvé ou il s'agit d'un répertoire !" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Le fichier de retouche existe déja. Voulez-vous l'écraser ?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 fichiers sélectionnés]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Contexte" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Unifié" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Ne peut écrire au fichier %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Le chemin spécifié n'est pas un chemin absolu: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Indiquez un fichier de sortie" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ne peut créer un fichier de retouche depuis un fichier binaire." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ne peut créer un fichier de retouche depuis des répertoires." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4638,12 +4720,12 @@ msgstr "" "\n" "Générer une retouche requiert l'état non modifié des fichiers." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Le répertoire n'existe pas." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4654,37 +4736,37 @@ msgstr "" "Tous les composants requis (7-zip et/ou Merge7z*.dll) pour le support d'archives ne peuvent être trouvés.\n" "Consulter la documentation au sujet du support d'archives indiquant comment l'activer." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Sélectionner le fichier pour exportation" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Sélectionner le fichier pour importation" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Préférences importées du fichier." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Préférences exportées au fichier." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "L'importation (lecture) du fichier des préférences a échoué." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "L'exportation (écriture) du fichier des préférences a échoué." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4695,247 +4777,247 @@ msgstr "" "\n" "Voulez-vous continuer ?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Combiné" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Type" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Décompresseur" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Pré-comparaison" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Éditeur de script" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Appliquer automatiquement le décompresseur approprié (basé sur l'extension d'au moins un des deux fichiers)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Pas de pré-comparaison (normal)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Plugiciels suggérés" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Plugiciels autres" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Compilation personnelle: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Ajuster les plugiciels" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH pas trouvé - .sct les scripts sont désactivés" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "Atteindre la ligne %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Désactivé" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "A partir du système de fichier" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "A partir de la liste des fichiers récents" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Pas de surbrillance" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Objet portatif" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Ressources" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index 415892449..3c6c3afa7 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -78,7 +78,7 @@ msgid "Cu&t" msgstr "Cor&tar" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Copiar" @@ -89,7 +89,7 @@ msgid "&Paste" msgstr "&Colar" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&Ir a..." @@ -100,22 +100,25 @@ msgid "Op&en" msgstr "&Abrir" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "coa Aplicación &Rexistrada" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "cun &Editor Externo" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&con..." @@ -153,7 +156,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -165,8 +168,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Ningunha" @@ -183,49 +186,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Arquivo" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Novo\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Abrir Arquivo de C&onflito..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Abrir Pro&xecto...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Gar&dar Proxecto..." @@ -237,274 +240,274 @@ msgstr "Proxectos recentes" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Baleiro >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "Saír" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Editar" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Opcións..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Ver" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "Ba&rra de ferramentas" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Pequena" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Grande" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "&Barra de estado" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "&Barra de pestanas" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Ferramentas" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filtros..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Xerar Patch..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "&Desempaquetado manual" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "&Desempaquetado automático" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Recargar plugins" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&Fiestra" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "Pe&char" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Pe&char todo" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Trocar o &panel\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Ordenar &horizontalmente" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Ordenar &verticalmente" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&En fervenza" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Axuda" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "Axuda do &WinMerge\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "C&onfiguración..." #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "Licenza Pública Xeral &GNU..." #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&Acerca de WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Banda esquerda só lectura" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Banda dereita só lectura" @@ -515,7 +518,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Seleccion&ar todo\tCtrl+A" @@ -537,1751 +540,1811 @@ msgstr "Amosar &elementos #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Amosar e&lementos únicos da dereita" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Amosar os elementos saltados" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Amosar os arq&uivos binarios" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Amosar os elementos ocu<os" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "&Modo Árbore" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "E&xpandir Todos os Subcartafoles" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "&Colapsar Todos os Subcartafoles" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Escoller &fonte..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Empregar fonte pr&edefinida" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Estadístic&as da comparación" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "Refre&scar\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Refrescar seleccionados\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Combinar" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&mparar\tIntro" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "Segui&nte diferenza\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Diferenza &previa\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Primeira diferenza\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Diferenza a&ctual\tAlt+Intro" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Derradeira diferenza\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copia&r para a dereita\tAlt+Dereita" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copiar para a &esquerda\tAlt+Esquerda" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Borrar\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "Personalizar &columnas..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Xera&r informe..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Gardar\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Gardar banda esquerda" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Gardar banda &dereita" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Imprimir..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Con&figuración da páxina" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Vista previa da impresión" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Converter quebras de liña a" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "&Modo Combinar\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "Codificación do ar&quivo" -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Desfacer\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Refacer\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Cor&tar\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Copiar\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Colar\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Seleccionar &diferenzas de liña\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Pr&ocurar...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Substituí&r...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Avanzado" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copiar cos números de liña\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&Marcadores" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Cambiar marcador\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Seguinte marcador\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Marcador anterior\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Borrar todos os marcadores" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Ir a...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "&Aumentar\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "&Reducir\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Resaltar sintaxe" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "B&loquear Paneis" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "&Ver espazos en branco" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Ve&r diferenzas de liña" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Ver os números de liña" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Ver as &marxes" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "A&xuste de liñas" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "In&tercambiar paneis" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Panel de &diferenzas" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Pane&l de situación" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "C&opiar para a dereita e avanzar\tAlt+Ctrl+Dereita" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "C&opiar para a esquerda e avanzar\tAlt+Ctrl+Esquerda" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Copiar todo ¶ a dereita" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Cop&iar todo para a esquerda" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Pre-comparación" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Scripts" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Compa&rar" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&Da esquerda para a dereita" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "D&a esquerda para..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "&Da dereita para a esquerda" +msgid "Left to Right (%1 of %2)" +msgstr "Da esquerda para a dereita (%1 de %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "Da d&ereita para..." +msgid "Left to... (%1 of %2)" +msgstr "Banda esquerda a...(%1 de %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Mover" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&Da esquerda para ..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&Da dereita para..." +msgid "Right to Left (%1 of %2)" +msgstr "Da dereita para a esquerda (%1 de %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Banda dereita a...(%1 de %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Mover" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Borrar" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&Esquerda" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Dereita" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Ambos" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Re&nomear" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Agochar elementos" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "&Abrir arquivo esquerdo" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "&Abrir arquivo dereito" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Cop&iar nomes de camiño" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&Esquerda (%1 de %2)" +msgid "Left (%1 of %2)" +msgstr "Esquerda (%1 de %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&Dereita (%1 de %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Dereita (%1 de %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Ambas as bandas (%1 de %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Ambas (%1 de %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Copiar &nomes dos arquivos" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&Esquerda... (%1 of %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&Dereita... (%1 of %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Ambos... (%1 of %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Diferenzas... (%1 of %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Actualizar" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Menú Shell Esquerdo" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Menú Shell Dereito" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Copiar o camiño completo" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Copiar o nome do &arquivo" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Configuración da pre-comparación" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Sen pre-comparación" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Pre-comparación autom." -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Ir ¶ a diferenza" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Non mostrar bloques movidos" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Mostrar todos os bloques movidos" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Amosar bloques movidos desde a &diferenza actual" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "Es&pazos en branco" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Com¶r" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "I&gnorar trocos" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Ig&norar todo" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "Diferenciar maiúsculas/minúsculas" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rar diferenzas nas quebras de liña (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Contidos completos" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Contidos rápidos" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Data de modificación" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Data de modificación e tamaño" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Tamaño" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Acerca de Winmerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Private Build)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visita a Web Oficial de WinMerge!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "Aceptar" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Colaboradores" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Seleccionar arquivos ou cartafoles" -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Explorar..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "Explo&rar..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Pro&curar..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Seleccionar..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Desempaquetador:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "&Seleccionar..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Incluíndo sub-cartafoles" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Estado:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Cancelar" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Axuda" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Arquivos ou cartafoles a comparar" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Base de datos" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Proxecto:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Usuario:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Seña:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Ligazón ao proxecto VSS de destino" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Aplicar a tódos os elementos" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Desprotexer" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Gardar como..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Sistema de versionado" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Sistema de versionado:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Camiño a cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Xeral" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Ir &automaticamente á primeira diferenza" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Pechar as fiestras con ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Verificar automaticamente os camiños no diálogo Abrir" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Per&mitir só unha instancia en curso" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Pr&eguntar antes de pechar varias fiestras" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "&Preservar data e hora do arquivo nas comparacións de ficheiros" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Amosar o Diálogo \"Selecciona Arquivos ou Cartafoles\" no Inicio " -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&uto-completar diálogo de apertura:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite ocultar algunhas caixas de mensaxes de uso frecuente. Preme o botón Restaurar para facer visibles todas as mensaxes outra vez." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Restaurar" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Procurar" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "&Procurar:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Só se coinci&de toda a palabra" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "&Coincidir maiúsc./minúsc." -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "&Expresión Regular" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "N&on sobrepasar o remate do arquivo" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Procurar seguinte" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&Aceptar" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Substituír" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Substituír con:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "&Non sobrepasar o remate do arquivo" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Substituír en" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&Selección" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "Ar&quivo completo" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Substituír" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Substituír &todo" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Desprotexer" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Comentarios" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Protexer despois de desprotexer" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Filtros de liña" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Activar filtros de liña" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Expresións Regulares (unha por liña):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Novo" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Editar" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Eliminar" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Cores" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Diferenza:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Diferenzas seleccionadas:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Fondo" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Borrado" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Diferenzas ignoradas:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Movidas:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Seleccionadas movidas:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Diferenza de palabra:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Diferenza de palabra seleccionada:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Predeterminados" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Enviar os arquivos eliminados para o lixo" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&Editor externo:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Cartafol de filtros:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Cartafol de arquivos temporais" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "Cartafol temporal do s&istema" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "Ca&rtafol personalizado:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Xerador de Patchs" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Arquivo&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Arquivo&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "&Cambiar" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "&Anexar ao arquivo existente" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Resultado:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Procu&rar..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "Est&ilo" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Contexto:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&ar liñas en branco" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Inclu&ír liña de comandos" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir nun e&ditor externo" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Amosar columnas" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Mover E&nriba" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Mover E&mbaixo" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Seleccionar desempaquetador" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Desempaquetador de arquivos:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Amosar todos os desempaquetadores, non verificar a extensión" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Listaxe de extensións:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Descrición:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Parar" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "A comparar elementos..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Elementos comparados:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Total de elementos:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Ir a" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "Ir &a:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Arquivo" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Ir á" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "Li&ña" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Diferenza" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Ir a" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Espazo en branco" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Comparar" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "&Ignorar trocos" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "&Ignorar todo" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar &liñas en branco" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Ignorar maiúsc/minús." -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "A&ctivar detección de bloques movidos" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "&Combinar as liñas semellantes" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Filtrar comentarios" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&Resaltar a sintaxe" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "&Re-escaneo automático" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&Conservar os caracteres orixinais EOL" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabulacións" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Tamaño da tabulación:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "&Inserir tabulacións" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "Inserir &espazos" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Colorar as diferenzas de liña" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Ver diferenzas de liña" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "&A nivel do caracter" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "&A nivel da palabra:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Filtros de arquivos" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Testar" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Novo..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Borrar..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Queres gardar os arquivos modificados?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Arquivo da esquerda" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Gardar trocos" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Desbotar trocos" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Arquivo da dereita" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "G&ardar trocos" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Desbo&tar trocos" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Páxina de códigos" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Páxina de códigos predeterminada" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecciona a páxina de códigos predeterminada cando se carguen arquivos non-Unicode:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2290,693 +2353,693 @@ msgstr "" "Detectar a información de páxina de códigos para estes arquivos: .html, .rc, .xml \n" "Precísase reiniciar a sesión" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Páxina de códigos do sistema" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Igual á que emprega a interface de usuario de Winmerge" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Páxina de códigos á medida: " -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Opcións" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr "Categorías" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Diálogo" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Palabras chave:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Nomes das funcións:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Comentarios:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Números:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Cadeas:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Pre-procesador:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Usuario 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Usuario 2:" # Esta tradución atopeina no corpus lingüístico do Open Office, en mancomun.org -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Negra" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Informe da comparación de cartafoles" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Arquivo do &Informe" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Explorar..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Estilo:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Copiar para o portapapeis" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Filtro privado ou compartido" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Que tipo de filtro queres crear?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro compartido (para todos os usuarios desta máquina)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro privado (só para o usuario actual)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Soporte de Arquivos" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Activar o soporte de arquivos" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detectar o tipo de arquivo pola sinatura" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Estadísticas da comparación" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Cartafoles:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Arquivos:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Diferente" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binario:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Único" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Esquerda:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Dereita" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Iguais" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Pechar" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Afecta" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Afecta)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Selecciona a páxina de códigos para" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&Cargar o arquivo:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Gardar o &arquivo:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&Empregar a mesma páxina de códigos para ambas" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Aplicar" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Cancelar" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Probar filtro" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Probando filtro..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Inserir texto para probar:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Nome do cartafol" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Probar" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Pechar" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&Empregar cores de texto personalizadas" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Cores de texto personalizadas" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Espazo en branco:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Texto normal" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Selección:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Camiños" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Esquerda" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "S&ó lectura" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Dereita" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Só l&ectura" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filtro:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Gardar..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Copias de seguridade(backups)" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Crear copias de seguridade na:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Comparación de carta&foles" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Comparación de arq&uivos" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Crear as copias de seguridade no: " -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "&Cartafol orixinal do arquivo" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&Cartafol das copias de seguridade:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Nome do arquivo de seguridade" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&Anexar extensión .bak" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "&Engadir etiqueta coa data" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Confirmar copia" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Estás seguro de querer copiar XXX elementos?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Desde a esquerda" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Para a dereita" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Si" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Non" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "&Activar plugins" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Integración na Shell" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Explorador" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Ac&tivar menú avanzado" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "Eng&adir ao menú de contexto" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Cartafol" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "P&arar despois da primeira diferenza" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ig&norar diferenzas de tempo inferiores a 3 segundos" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binario" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "040904e4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x409, 1252" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro descoñecido ao tentar abrir o arquivo do proxecto" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro descoñecido ao tentar gardar o arquivo do proxecto" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Arquivo do proxecto" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "O arquivo do proxecto cargouse correctamente." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "O arquivo do proxecto gardouse correctamente." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2995,7 +3058,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge File Compare" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3014,7 +3077,7 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Folder Compare" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3023,143 +3086,143 @@ msgstr "" "Desenvolvedores:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 ofrécese sen GARANTÍA DE NINGUNHA CLASE. Este programa é software ceibe e animámoste a distribuílo baixo certas condicións; mira a Licenza Pública Xeral GNU no menú de Axuda para atopar máis información." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Abortar" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Tentar de novo" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Ignorar &todo" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Si" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Si a &todo" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Non" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "&Non a todo" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Saltar" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "S&altar todo" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Non amosar esta &mensaxe de novo." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Non preguntar &isto de novo." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Control de versións" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Diferenzas" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "A:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Dende a esquerda:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Para a esquerda:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Dende a dereita:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Para a dereita:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Versión %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Opcións (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as caixas de mensaxes amosaranse outra vez." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3170,84 +3233,84 @@ msgstr "" "\n" "Emprega valores entre 1 e %1" -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Arquivos do proxecto de WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Arquivos de opcións (*.ini)|*.ini|Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Arquivos de texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Arquivos XML (*.xml)|*.xml|Todos os arquivos(*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Localización" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F]" -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Descrición" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Escoller un nome de arquivo para o filtro novo " -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtros dos arquivos (*.flt)|*.flt|Todos os arquivos (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3260,7 +3323,7 @@ msgstr "" "Copia o arquivo %1 ao cartafol de filtros:\n" "%2" -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3273,7 +3336,7 @@ msgstr "" "\n" "Asegúrate de que existe o cartafol e de que é escribible." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3284,7 +3347,7 @@ msgstr "" "\n" "Escolle un cartafol de filtros en Opcións/Sistema." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3297,12 +3360,12 @@ msgstr "" "\n" "Comprobe se o arquivo é do só-lectura." -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Procurar arquivo de filtros para instalar" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3313,17 +3376,17 @@ msgstr "" "\n" "Non se poden copiar novos filtros ao cartafol de filtros." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "O arquivo de filtros xa existe. Quérelo sobre-escribir?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Expresión regular" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3334,173 +3397,173 @@ msgstr "" "\n" "Se non queres regargar todas as comparacións agora podes seleccionar Non e actualizalas máis adiante." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&Ruta ao SS.EXE:" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Resultado da comparación dos cartafoles " -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Comparación de arquivos" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Cadro esquerdo sen título" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Cadro dereito sen título" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "O Arquivo Deles" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "O Meu Arquivo" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Liña: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Combinar" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Diferenza %1 de %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 diferenzas atopadas" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 diferenza atopada" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "SL" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Elemento %1 de %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Elementos: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Escolle dous cartafoles ou arquivos para comparar" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Selección de cartafol" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Escolle dous cartafoles ou arquivos para comparar." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "O camiño esquerdo non é válido!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "O camiño dereito non é válido!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Ambos os camiños non son válidos!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Escolle dous arquivos para activar a selección de desempaquetador." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Non se pode comparar un arquivo cun cartafol!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "No se atopou o arquivo: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "O arquivo non está desempaquetado: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3513,12 +3576,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Fallo na análise interpretativa do arquivo de conflito." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3529,27 +3592,27 @@ msgstr "" "%1\n" "non é un arquivo de conflito." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Gardar como" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Queres gardar os cambios en %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 está definido como de só-lectura. Queres sobre-escribilo? (Non gardar cun nome de arquivo novo.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Erro ao facer unha copia de seguridade do arquivo" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3562,7 +3625,7 @@ msgstr "" "\n" "Queres continuar?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3579,7 +3642,7 @@ msgstr "" "\t-usar un nome de arquivo distinto (preme Aceptar)\n" "\t-abortar a operación (preme Abortar)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3594,7 +3657,7 @@ msgstr "" "\n" "Desexas gardar a versión desempaquetada noutro arquivo?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3609,7 +3672,7 @@ msgstr "" "\n" "Desexas gardar a versión desempaquetada noutro arquivo?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3624,7 +3687,7 @@ msgstr "" "\n" "Queres sobre-escribir o arquivo cambiado?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3633,7 +3696,7 @@ msgstr "" "%1\n" " está marcado como de só-lectura. Queres sobre-escribir o elemento?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3648,27 +3711,27 @@ msgstr "" "\n" "Queres recargar o arquivo?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Gardar o arquivo esquerdo como" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Gardar o arquivo dereito como" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3679,42 +3742,42 @@ msgstr "" "\n" "Actualizar os documentos antes de seguir." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Debes especificar o camiño do proxecto SourceSafe para continuar (p.e:$/ProxectoMeu)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Desprotexer arquivos de VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "O Sistema de Versionado devolveu un erro mentres se intentaba desprotexer o arquivo. Imposible proseguir..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Erro ao executar un comando no sistema de versionado" -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "O cartafol de traballo VSS e a localización do arquivo actual non coinciden. Queres continuar?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Non se atopou banco de datos VSS ningún" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Erro de VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3725,7 +3788,7 @@ msgstr "" "Comproba a configuración da visualización.\n" "Queres anular a operación de desprotección?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3734,127 +3797,146 @@ msgstr "" "O sistema de versionado devolveu un erro ao intentar desfacer a desprotección do arquivo.\n" "Comproba a configuración da visualización." -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Ningún" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (inferior de 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e superiores)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Parar no espazo en branco" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Parar en espazo en branco ou puntuación" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Da dereita para a esquerda (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Da esquerda para a dereita(%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Da dereita para a esquerda (%1 de %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Da esquerda para a dereita (%1 de %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Da esquerda para a dereita(%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Banda esquerda a...(%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Banda dereita a...(%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Banda esquerda a...(%1 de %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Banda dereita a...(%1 de %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Esquerda (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Dereita (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Ambas (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Esquerda (%1 de %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Dereita (%1 de %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Ambas as bandas (%1 de %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Banda esquerda - escoller cartafol de destino:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Banda dereita - escoller cartafol de destino:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 arquivos afectados)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 arquivos afectados)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3865,17 +3947,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Tes a certeza de quereres copiar:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Tes a certeza de quereres copiar %d elementos: " -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3894,534 +3976,534 @@ msgstr "" "\n" "Actualiza a comparación. " -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Tes a certeza de quereres mover:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Tes a certeza de quereres mover %d elementos: " -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Confirmar Movemento" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Non se puido executar o editor externo: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Formato de arquivo descoñecido" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Nome do arquivo" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Resultado da comparación" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Data esquerda" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Data dereita" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Extensión" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Tamaño esquerda" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Tamaño dereita" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Tamaño dereita (curto)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Tamaño esquerda (curto)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Data de creación esquerda" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Data de creación dereita" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Arquivo máis recente" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Versión do arquivo esquerdo" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Versión do arquivo dereito" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Resultado curto" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Atributos da esquerda" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Atributos da dereita" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "EOL esquerdo" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "EOL dereito" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Codificación esquerda" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Codificación dereita" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Diferenzas ignoradas" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Non é posible comparar os arquivos" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Elemento abortado" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Arquivo saltado" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Cartafol saltado" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Só esquerda: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Só dereita: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Os arquivos binarios son idénticos" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Os arquivos binarios son diferentes" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Os arquivos son diferentes" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Os cartafoles son diferentes" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Só esquerda" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Só dereita" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Erro" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Os arquivos de texto son idénticos" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Os arquivos de texto son diferentes" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo decorrido: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 elemento seleccionado" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 elementos seleccionados" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Nome do arquivo ou cartafol." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome do sub-cartafol cando os sub-cartafoles están incluídos" -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Resultados da comparación, formato completo." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Data de modificación da banda esquerda." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Data de modificación da banda dereita" -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Extensión do arquivo." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Tamaño do arquivo esquerdo en bytes." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Tamaño do arquivo dereito en bytes." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Tamaño abreviado do arquivo esquerdo." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Tamaño abreviado do arquivo dereito. " -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Data de creación do arquivo esquerdo." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Data de creación do arquivo dereito." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Di que parte foi modificada máis recentemente." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versión do arquivo da banda esquerda, só para algúns tipos de arquivo." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versión do arquivo da banda dereita, só para algúns tipos de arquivo." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Resultados curtos da comparación." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Atributos da banda esquerda." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Atributos da banda dereita." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Tipo de EOL do arquivo esquerdo" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Tipo de EOL do arquivo dereito" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Codificación da banda esquerda." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Codificación da banda dereita." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Número de diferenzas ignoradas no arquivo. Estas diferenzas son ignoradas por WinMerge e non se poden combinar." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Número de diferenzas no arquivo. Este número non inclúe as diferenzas ignoradas." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Amosa un asterisco (*) se o arquivo é binario." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Comparar %1 con %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Listaxe separada por comas" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Listaxe separada por tabulacións" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "HTML simple" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "XML simple" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "O arquivo de informe xa existe. Quérelo sobre-escribir?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" "%1" msgstr "Erro ao crear o informe:n%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "O informe creouse correctamente." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "O mesmo arquivo está aberto en ambos paneis." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Os arquivos escollidos son idénticos." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Produciuse un erro durante a comparación dos arquivos." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Non se puideron crear os arquivos temporais. Comproba as configuracións dos camiños." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4436,17 +4518,17 @@ msgstr "" "\n" "Aviso: Se queres tratar todos os tipos de quebra como equivalentes, marca a opción 'Ignorar diferenzas de quebras de liña..' no apartado de comparación do diálogo de opcións (dispoñible en Editar/Opcións)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "O cartafol seleccionado non é válido." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Non se pode abrir un arquivo binario no editor." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4461,7 +4543,7 @@ msgstr "" "%1\n" "que coincida co anterior e abrir ámbolos dous?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4472,152 +4554,152 @@ msgstr "" "Amosando cada arquivo coa súa páxina de códigos proporcionará unha mellor visualización pero combinar/copiar será perigoso.\n" "Preferirías tratar ambos arquivos como se tivesen a páxina de códigos predeterminada de windows (recomendado)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Perdeuse información debido a erros de codificación: en ambos os arquivos" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Non hai diferenzas" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Diferenzas de liña" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituídas %1 cadea(s)." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Non se atopou a cadea \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Panel de situación" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Panel de diferenzas" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Escribiuse correctamente o arquivo de mendo." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Non se atopou este elemento ou é un cartafol" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Non se atopou este elemento ou é un cartafol" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "O arquivo patch xa existe. Quérelo sobre-escribir?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 arquivos seleccionados]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Non se puido escribir no arquivo %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "O camiño de saída especificado non é un camiño absoluto: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Especifica un arquivo de saída" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Non se pode crear un arquivo patch desde arquivos binarios." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Non se pode crear un arquivo patch desde un cartafol." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4628,12 +4710,12 @@ msgstr "" "\n" "Crear un arquivo patch precisa que todos os cambios nos arquivos estean gardados." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "O cartafol non existe." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4644,37 +4726,37 @@ msgstr "" "Non foron atopados todos os compoñentes precisos (7-zip e/ou Merge7z*.dll).\n" "Mira o manual para máis información acerca do soporte de arquivos e como se activa. " -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Escolle un arquivo para exportar" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Escolle un arquivo para importar" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Opcións importadas desde o arquivo." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Opcións exportadas desde o arquivo." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Fallo na importación das opcións deste arquivo." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Fallo ao escribir as opcións no arquivo." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4685,247 +4767,247 @@ msgstr "" "\n" "Queres continuar?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Mesturado" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Tipo" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Desempaquetador" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Pre-comparación" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Script do Editor" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "O desempaquetador escollido utilízase con ambos arquivos (unicamente un arquivo precisa a extensión)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Sen pre-comparación (normal)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Plugins recomendados" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Outros plugins" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Configuración do plugin" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH non atopado - scripts .sct desactivados" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "I&r á liña %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Desactivado" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Do sistema de arquivos" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Da listaxe MRU" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Sen Resaltar" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Obxecto Portable" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Recursos" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index 3ad39a812..bea5781f3 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -81,7 +81,7 @@ msgid "Cu&t" msgstr "Auss&chneiden" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Kopieren" @@ -92,7 +92,7 @@ msgid "&Paste" msgstr "E&infügen" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&Gehe nach..." @@ -103,22 +103,25 @@ msgid "Op&en" msgstr "Ö&ffnen" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "Mit ®istrierter Anwendung" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "Mit &externem Editor" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&Mit..." @@ -156,7 +159,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -168,8 +171,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Keine" @@ -186,49 +189,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Datei" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Neu\tStrg+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "Ö&ffnen...\tStrg+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "&Konflikt-Datei öffnen..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Pro&jekt öffnen...\tStrg+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Proje&kt speichern..." @@ -240,274 +243,274 @@ msgstr "K #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Leer >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "&Beenden" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Bearbeiten" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Einstellungen..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Ansicht" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "&Symbolleiste" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "K&lein" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Groß" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "S&tatusleiste" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Ta&b-Leiste" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Tools" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filter..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Patch generieren..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "Man&ueller Prediffer" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "Au&tomatischer Prediffer" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "&Manuell entpacken" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisch entpacken" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "Plugins &neu laden" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&Fenster" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Schließen" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Alle s&chließen" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "&Ausschnitt wechseln\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "&Untereinander" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "&Nebeneinander" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "Über&lappend" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Hilfe" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge Hilfe\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "&Konfiguration" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "Ü&ber WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "L&inks schreibgeschützt" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "R&echts schreibgeschützt" @@ -518,7 +521,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Alles &markieren\tStrg+A" @@ -540,1753 +543,1813 @@ msgstr "Eindeutige Objekte &links anzeigen" #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Eindeutige Objekte &rechts anzeigen" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Übersprun&gene Objekte anzeigen" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Binär&dateien anzeigen" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Verstec&kte Objekte anzeigen" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "Baum&modus" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "Alle Unterordner erweiter&n" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "Alle Unterordner redu&zieren" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Schrift &auswählen..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Standard-Schrift &verwenden" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "V&ergleichsstatistik" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "&Aktualisieren\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Ausge&wählte aktualisieren\tStrg+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Merge" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Ver&gleichen\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Nächster Unterschied\tAlt+Runter" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Voriger Unterschied\tAlt+Hoch" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Erster Unterschied\tAlt+Pos1" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktueller Unterschied\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Letzter Unterschied\tAlt+Ende" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Nach &rechts kopieren\tAlt+Rechts" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Nach l&inks kopieren\tAlt+Links" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "Lös&chen\tEntf" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Spalten anpassen..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "&Bericht generieren..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Speichern\tStrg+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "&Links speichern" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "&Rechts speichern" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Drucken..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Sei&te einrichten" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Druck&vorschau" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Zeilenenden konvertieren nach" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "&Merge Modus\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "Dateik&odierung..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Rückgängig\tStrg+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Wiederherstellen\tStrg+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Auss&chneiden\tStrg+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopieren\tStrg+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "E&infügen\tStrg+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Zeilen&unterschied markieren\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Suchen...\tStrg+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Erse&tzen...\tStrg+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Erweitert" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopieren mit Zeilennummern\tStrg+Umschalt+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&Lesezeichen" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Lesezeichen ein/aus\tStrg+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Nächstes Lesezeichen\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Vorheriges Lesezeichen\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Alle Lesezeichen löschen" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Gehe nach...\tStrg+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Ver&größern\tStrg++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Ver&kleinern\tStrg+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tStrg+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Syntaxhervorhebung" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "Ausschnitte &fixieren" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "&Leerzeichen anzeigen" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Zeilenuntersc&hiede anzeigen" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Zeilennu&mmern anzeigen" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "&Ränder anzeigen" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "Zeilen &umbrechen" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Ausschnitt v&ertauschen" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "U&nterschiedsleiste" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "P&ositionsleiste" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Nach rechts kopieren und &fortschreiten\tAlt+Strg+Rechts" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Nach links kopieren und f&ortschreiten\tAlt+Strg+Links" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Alles nach rec&hts kopieren" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Alles nach lin&ks kopieren" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "Skri&pte" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Ver&gleichen" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&Links nach Rechts" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "L&inks nach ..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "&Rechts nach Links" +msgid "Left to Right (%1 of %2)" +msgstr "Links nach Rechts (%1 von %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "R&echts nach ..." +msgid "Left to... (%1 of %2)" +msgstr "Links nach... (%1 von %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Verschieben" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&Links nach..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&Rechts nach..." +msgid "Right to Left (%1 of %2)" +msgstr "Rechts nach Links (%1 von %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Rechts nach... (%1 von %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Verschieben" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Löschen" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&Links" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Rechts" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Beide" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "&Umbenennen" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "Objekte v&erstecken" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "Ö&ffne links" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Öff&ne rechts" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Kopiere &Pfade" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&Links (%1 von %2)" +msgid "Left (%1 of %2)" +msgstr "Links (%1 von %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&Rechts (%1 von %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Rechts (%1 von %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Beide (%1 von %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Beide (%1 von %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Kopiere &Dateinamen" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "P&acken" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&Links... (%1 von %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&Rechts... (%1 von %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Beide... (%1 von %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Unterschiede... (%1 von %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "Ak&tualisieren" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Linkes Shell-Menü" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Rechtes Shell-Menü" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Kopiere vollständigen Pfad" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Kopiere &Dateiname" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "&Prediffer Einstellungen" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Kein Prediffer" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "&Auto Prediffer" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "G&ehe nach Unterschied" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Keine verschobene Blöcke" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Alle verschobene Blöcke" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Verschobenen Block für aktuellen &Unterschied" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "&Leerzeichen" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "&Vergleichen" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "Änderung &ignorieren" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "&Alle ignorieren" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "&Groß-/Kleinschreibung beachten" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Zeilen&umbruchunterschiede (Windows/Unix/Mac) ignorieren" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "Vergleichs&methode:" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Voller Inhalt" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Schneller Inhalt" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Änderungsdatum" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Änderungsdatum und Größe" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Größe" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Info über WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Private Build)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Besuchen Sie die WinMerge Homepage!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Mitwirkende" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Dateien oder Ordner auswählen..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Suchen..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "Su&chen..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "S&uchen..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Auswählen..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Entpacker:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "Auswählen..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "Unter&ordner einbeziehen" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Abbrechen" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Hilfe" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Zu vergleichende Dateien oder Ordner" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Datenbank:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Nutzer:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Passwort:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Verbindung zum Ziel-VSS-Projekt" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Auf alle Objekte anwenden" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Auschecken" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Speichern unter..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Versionskontrolle" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Versionskontrollsystem" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Pfad zu cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Allgemein" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Anzeige automatisch auf den ersten Unterschied &positionieren" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fenster mit &ESC schließen" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "P&fade im Öffnen-Dialog automatisch überprüfen" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "&Nur eine Programm-Instanz zulassen" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "&Nachfragen, wenn mehrfache Fenster geschlossen werden" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "Datei&zeit beim Dateivergleich bewahren" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Öffnen-Dialog beim Programmstart anzeigen" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Öffnen-Dialog Auto&vervollständigung:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" "WinMerge erlaubt das Verstecken von einigen häufigen Meldungen.\n" "Drücken Sie die Zurücksetzen-Schaltfläche um alle Meldungen wieder sichtbar zumachen." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Zurücksetzen" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Suchen" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "&Suchen nach:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "&Nur ganze Wörter" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "&Groß-/Kleinschreibung beachten" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "&Reguläre Ausdrücke" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "Nicht am Dateiende um&brechen" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Weitersuchen" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Ersetzen" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Erse&tzen durch:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "Nicht am Dateiende um&brechen" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Ersetze in" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&Auswahl" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "ganzer &Datei" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "E&rsetzen" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "A&lle ersetzen" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Auschecken" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Kommentare" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Einchecken nach Auschecken" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Zeilenfilter" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Zeilenfilter aktivieren" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Reguläre Ausdrücke (einer pro Zeile):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Neu" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Bearbeiten" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Entfernen" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Farben" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Unterschied:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Selektierter Unterschied:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Hintergrund" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Gelöscht" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Text" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Ignorierter Unterschied:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Verschoben:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Verschoben (Selektiert):" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Wortunterschied:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Wortunterschied (Selektiert):" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Vorgaben" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "System" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Gelöschte Dateien in den &Papierkorb verschieben" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&Externer Editor:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Filterordner:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Temporärer Dateienordner" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "Temporärer Ordner vom S&ystem:" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "&Benutzerdefinierter Ordner:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Patch Generator" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Datei &1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Datei &2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "Ver&tauschen" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "A&n vorhandene Datei anfügen" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Ergebnis:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "S&uchen..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "St&yle:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Context:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Leer&zeilen ignorieren" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "&Befehlszeile einfügen" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Im e&xternen Editor öffnen" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Spalten anpassen" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Nach &oben" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Nach &unten" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Entpacker auswählen" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Datei-Entpacker:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Zeigt alle Entpacker, nicht die Erweiterung überprüfen." -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Erweiterungsliste:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Beschreibung:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Stop" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Vergleiche Objekte..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Objekte verglichen:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Objekte gesamt:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Gehe nach" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "&Nach:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Datei" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Ziel" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "&Zeile" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Unterschied" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Gehe" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Vergleichen" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Leerzeichen" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Vergleichen" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "Änderung &ignorieren" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "&Alle ignorieren" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "&Leerzeilen ignorieren" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "&Groß-/Kleinschreibung ignorieren" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Verschobene &Blöcke erkennen" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "Ä&hnliche Zeilen angleichen" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Kommentare filtern" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&Syntax hervorheben" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "&Automatisch aktualisieren" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&Mischen der Zeilenumbruch-Formate erlauben" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabulatoren" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Tabulator-Größe:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "Tabulatoren &einfügen" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "&Leerzeichen einfügen" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Zeilenunterschied-Färbung" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Zeilenunterschied anzeigen" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "&Zeichen-Ebene" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "&Wort-Ebene:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "W&ort-Abbruchzeichen:" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Dateifilter" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Testen" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Installieren..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Neu..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Bearbeiten..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Löschen..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Geänderte Dateien speichern?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Linke Datei" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "Änderungen &speichern" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "Änderungen &verwerfen" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Rechte Datei" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "Änderungen s&peichern" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Änderungen ver&werfen" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "&Alle verwerfen" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Zeichensatz" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Standard-Zeichensatz" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Wählen Sie den Standard-Zeichensatz, der angenommen wird, wenn man Nicht-Unicode Dateien lädt:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2295,702 +2358,702 @@ msgstr "" "Ermitteln des Zeichensatzes für folgende Dateien: .html, .rc, .xml \n" "Benötigt einen Neustart des Programmes." -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "System-Zeichensatz" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Entsprechend der WinMerge Benutzeroberfläche" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Benutzerdefinierter Zeichensatz:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Einstellungen" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Kategorien" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importieren..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Exportieren..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Schlüsselwörter:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Funktionsnamen:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Kommentare:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Nummern:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operatoren:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Zeichenketten:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Preprozessor:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Benutzer 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Benutzer 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Fett" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Ordnervergleichs-Bericht" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "&Berichtsdatei:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Suchen..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "In die &Zwischenablage kopieren" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Gemeinsamer oder privater Filter" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Welche Art von Filter möchten Sie erzeugen?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Gemeinsamer Filter (für alle Benutzer auf diesem Computer)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Privater Filter (nur für den aktuellen Benutzer)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Archiv-Unterstützung" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Archiv-Unterstützung aktivieren" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Archivtyp aus der Dateisignatur ermitteln" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Vergleichsstatistik" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Ordner:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Dateien:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Unterschiedlich" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Text:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binär:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Eindeutig" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Links:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Rechts:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Identisch" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Gesamt:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Schließen" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Betrifft" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Betrifft)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Zeichensatz auswählen für" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&Datei laden:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Datei &speichern:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&Gleichen Zeichensatz für Beide verwenden" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "An&wenden" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Abbrechen" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Filter testen" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Teste Filter ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Text zum Testen:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Ordnername" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Ergebnis:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Testen" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Schließen" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&Benutzerdefinierte Textfarben verwenden" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Benutzerdefinierte Textfarben" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Leerzeichen:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Normaler Text:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Auswahl:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Pfade" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Links:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Schreib&geschützt" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Rechts:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Schreibg&eschützt" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filter:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Öffnen..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Speichern..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Sicherungsdateien" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Sicherungsdateien erzeugen beim:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "&Ordnervergleich" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "D&ateivergleich" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Sicherungsdateien erzeugen im:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "Ordner der &ursprünglichen Datei" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&Globalen Sicherungsordner:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Sicherungsdateiname:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr ".bak-&Erweiterung anhängen" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "&Zeitstempel anhängen" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Kopieren bestätigen" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Wollen Sie wirklich XXX Objekte kopieren?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Von links" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Nach rechts" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Ja" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Nein" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "&Plugins aktivieren" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Shell-Integration" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Explorer" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Er&weitertes Menü verwenden" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "Zum Kontextmenü &hinzufügen" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Ordner" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "Nach dem ersten Unterschied &stoppen" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignoriere &Zeitunterschiede kleiner als 3 Sekunden" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "&Eindeutige Unterordner-Inhalte einbeziehen" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "&Limit für Schneller Inhalt (MB):" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binär" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "040704e4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x407, 1252" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "ER" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "FEST" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "RF" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "ÜB" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "MA" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Unbekannter Fehler beim Versuch die Projektdatei zu öffnen." -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Unbekannter Fehler beim Versuch die Projektdatei zu speichern." -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Projektdatei" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Projektdatei erfolgreich geladen." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Projektdatei erfolgreich gespeichert." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "\nDateivergleich\n\n\n\nWinMerge.Dateivergleich\nWinMerge Dateivergleich" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "\nOrdnervergleich\n\n\n\nWinMerge.Ordnervergleich\nWinMerge Ordnervergleich" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -2999,143 +3062,143 @@ msgstr "" "Entwickler:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 kommt mit ABSOLUT KEINER GARANTIE. Es ist freie Software und Sie können sie unter bestimmten Bedingungen weiter vertreiben; für Details sehen Sie sich die GNU General Public License unter dem Hilfe-Menü an." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Abbruch" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Wiederholen" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Ignorieren" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "&Alle ignorieren" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Ja zu &allen" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Nein" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Nein zu a&llen" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Fortsetzen" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "Über&springen" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "&Alle überspringen" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Diese &Meldung nicht erneut anzeigen." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Diese &Frage nicht erneut stellen." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "Syntax" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Versionskontrolle" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Unterschiede" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Nach:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Von links:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Nach links:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Von rechts:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Nach rechts:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Version %1 - Deutsch" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Eigenschaften (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle Meldungen werden wieder angezeigt." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3146,84 +3209,84 @@ msgstr "" "\n" "Bitte benutzen Sie Werte von 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Öffnen" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programme|*.exe;*.bat;*.cmd|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle Dateien (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projektdatei (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Einstellungsdateien (*.ini)|*.ini|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Textdateien (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-Dateien (*.htm,*.html)|*.htm;*.html|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-Dateien (*.xml)|*.xml|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Name" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Pfad" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filter" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Beschreibung" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Dateinamen für neuen Filter auswählen" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Dateifilter (*.flt)|*.flt|Alle Dateien (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3236,7 +3299,7 @@ msgstr "" "Bitte kopieren Sie die Datei %1 in den Filterordner:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3249,7 +3312,7 @@ msgstr "" "\n" "Bitte stellen Sie sicher, dass der Ordner existiert und beschreibbar ist." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3260,7 +3323,7 @@ msgstr "" "\n" "Bitte wählen Sie den Filterordner unter Einstellungen/System aus." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3273,12 +3336,12 @@ msgstr "" "\n" "Ist die Datei möglicherweise schreibgeschützt?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Zu installierenden Filter auswählen" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3289,17 +3352,17 @@ msgstr "" "\n" "Die Filterdatei konnte nicht in den Filterordner kopiert werden." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filterdatei existiert bereits. Existierenden Filter überschreiben?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Regulärer Ausdruck" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3310,173 +3373,173 @@ msgstr "" "\n" "Wenn Sie nicht jetzt alle Vergleiche aktualisieren möchten, können Sie Nein wählen und die Vergleiche später aktualisieren." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&Pfad zu SS.EXE:" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Ordnervergleichs-Ergebnisse" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Dateivergleich" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Unbenannt links" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Unbenannt rechts" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Deren Datei" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Meine Datei" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Zeile: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Merge" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Unterschied %1 von %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 Unterschiede gefunden" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 Unterschied gefunden" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 von %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Objekte: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Wählen Sie zwei Dateien oder Ordner zum Vergleichen aus" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Ordnerauswahl" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Zwei Ordner oder zwei Dateien zum Vergleichen auswählen." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Der linke Pfad ist ungültig!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Der rechte Pfad ist ungültig!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Beide Pfade sind ungültig!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Zwei Dateien zum Aktivieren der Entpacker-Auswahl auswählen." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Datei und Ordner können nicht verglichen werden!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Datei nicht gefunden: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Datei nicht entpackt: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3489,12 +3552,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Fehler beim Analysieren der Konflikt-Datei." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3505,27 +3568,27 @@ msgstr "" "%1\n" "ist keine Konflikt-Datei." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Speichern unter" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Änderungen in %1 speichern?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 ist als Schreibgeschützt markiert. Möchten Sie die schreibgeschützte Datei überschreiben? (Nicht unter neuem Dateinamen speichern.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Fehler beim Erstellen einer Sicherheitskopie" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3538,7 +3601,7 @@ msgstr "" "\n" "Trotzdem fortfahren?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3555,7 +3618,7 @@ msgstr "" "\t-einen anderen Dateinamen verwenden? (Ok drücken)\n" "\t-die aktuelle Operation abbrechen? (Abbruch drücken)" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3570,7 +3633,7 @@ msgstr "" "\n" "Möchten Sie die ungepackte Version in einer anderen Datei speichern?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3585,7 +3648,7 @@ msgstr "" "\n" "Möchten Sie die ungepackte Version in einer anderen Datei speichern?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3600,7 +3663,7 @@ msgstr "" "\n" "Geänderte Datei überschreiben?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3609,32 +3672,32 @@ msgstr "" "%1\n" "ist als schreibgeschützt markiert. Möchten Sie das schreibgeschützte Objekt überschreiben?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, 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 "Eine andere Anwendung hat die Datei\n%1\naktualisiert, seit WinMerge sie das letzte Mal geprüft hat.\n\nMöchten Sie die Datei neu laden?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Speichere linke Datei unter" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Speichere rechte Datei unter" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "Die Datei\n%1\nist verlorengegangen. Bitte speichern Sie eine Kopie der Datei, um fortzufahren." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3645,42 +3708,42 @@ msgstr "" "\n" "Aktualisieren Sie die Dokumente, bevor Sie fortfahren." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Sie müssen einen SourceSafe-Projektpfad angeben um fortzufahren (z.B.: $/MeinProjekt)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Dateien auschecken vom VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Das Versionierungssystem meldete einen Fehler beim Versuch die Datei auszuchecken. Der Vorgang kann nicht fortgesetzt werden..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Fehler beim Ausführen eines Befehles des Versionierungssystems." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Der VSS-Arbeitsordner und die Position der aktuellen Datei stimmen nicht überein. Fortsetzen?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Keine VSS Datenbank(en) gefunden!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Fehler vom VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3691,7 +3754,7 @@ msgstr "" " Bitte überprüfen Sie die Konfiguration der verwendeten Ansicht.\n" " Auschecken rückgängig machen?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3700,127 +3763,146 @@ msgstr "" "Das Versionierungssystem meldete einen Fehler beim Versuch das Auschecken der Datei rückgängig zu machen.\n" " Bitte überprüfen Sie die Konfiguration der verwendeten Ansicht." -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Keines" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (kleiner als 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 und höher)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "An Leerzeichen abbrechen" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "An Leerzeichen oder Interpunktion abbrechen" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Rechts nach Links (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Links nach Rechts (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Rechts nach Links (%1 von %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Links nach Rechts (%1 von %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Links nach Rechts (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Links nach... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Rechts nach... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Links nach... (%1 von %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Rechts nach... (%1 von %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Links (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Rechts (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Beide (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Links (%1 von %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Rechts (%1 von %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Beide (%1 von %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Linke Seite - Zielordner auswählen:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Rechte Seite - Zielordner auswählen:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Dateien betroffen)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 von %2 Dateien betroffen)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3832,17 +3914,17 @@ msgstr "" "%1\n" "löschen?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Wollen Sie wirklich kopieren:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Wollen Sie wirklich %d Objekte kopieren:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3861,502 +3943,502 @@ msgstr "" "\n" "Bitte aktualisieren Sie den Vergleich." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Wollen Sie wirklich verschieben:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Wollen Sie wirklich %d Objekte verschieben:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Verschieben bestätigen" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Konnte externen Editor nicht ausführen: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Unbekanntes Archiv Format" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Dateiname" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Vergleichsergebnis" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Linkes Datum" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Rechtes Datum" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Erweiterung" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Linke Größe" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Rechte Größe" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Rechte Größe (Kurz)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Linke Größe (Kurz)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Linkes Erstellungsdatum" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Rechtes Erstellungsdatum" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Neuere Datei" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Linke Dateiversion" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Rechte Dateiversion" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Kurz-Ergebnis" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Linke Attribute" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Rechte Attribute" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Linkes Zeilenende" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Rechtes Zeilenende" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Linke Kodierung" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Rechte Kodierung" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Ignorierte Unter." -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Dateien können nicht verglichen werden" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Objekt abgebrochen" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Datei übersprungen" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Ordner übersprungen" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Nur Links: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Nur Rechts: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Binärdateien sind identisch" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Binärdateien sind unterschiedlich" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Dateien sind unterschiedlich" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Ordner sind unterschiedlich" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Nur Links" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Nur Rechts" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Fehler" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Textdateien sind identisch" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Textdateien sind unterschiedlich" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ausführungszeit: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 Objekt ausgewählt" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 Objekte ausgewählt" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Dateiname oder Ordnername." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Unterordnername, wenn Unterordner vorhanden sind." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Vergleichsergebnis, langes Format." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Linkes Änderungsdatum." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Rechtes Änderungsdatum." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Dateierweiterung." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Linke Dateigröße in Byte." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Rechte Dateigröße in Byte." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Linke Dateigröße gekürzt." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Rechte Dateigröße gekürzt." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Linkes Erstellungsdatum." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Rechtes Erstellungsdatum." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Zeigt, welche Seite ein neueres Änderungsdatum hat." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Linke Dateiversion, nur für einige Dateitypen." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Rechte Dateiversion, nur für einige Dateitypen." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Vergleichsergebnis, kurzes Format." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Linke Attribute." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Rechte Attribute." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Linker Zeilenenden-Typ" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Rechter Zeilenenden-Typ" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Linke Zeichensatz-Kodierung." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Rechte Zeichensatz-Kodierung." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Anzahl der ignorierten Unterschiede in der Datei. Diese Unterschiede werden von WinMerge ignoriert und können nicht vermischt werden." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Anzahl der Unterschiede in der Datei. Die Zahl enthält nicht die ignorierten Unterschiede." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Zeigt ein Asterisk (*), wenn die Datei binär ist." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Vergleiche %1 mit %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Komma-getrennte Liste" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Tab-getrennte Liste" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Einfaches HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Einfaches XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Der Bericht existiert bereits. Überschreiben?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4365,32 +4447,32 @@ msgstr "" "Fehler beim Erzeugen des Berichtes:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Der Bericht wurde erfolgreich geschrieben." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Die gleiche Datei ist in beiden Feldern ausgewählt." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Die ausgewählten Dateien sind identisch." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Beim Vergleichen der Dateien ist ein Fehler aufgetreten." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Temporäre Dateien konnten nicht erzeugt werden. Überprüfen Sie Ihre Einstellungen für temporäre Dateien." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4405,17 +4487,17 @@ msgstr "" "\n" "Hinweis: Wenn Sie immer alle Zeilenumbruch-Formate als Gleichwertig behandeln wollen, aktivieren Sie die Option 'Zeilenumbruchunterschiede ignorieren' unter 'Vergleichen' im Einstellungsdialog (erreichbar unter Bearbeiten/Einstellungen)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Der ausgewählte Ordner ist ungültig." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kann keine Binärdatei im Editor öffnen." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4430,7 +4512,7 @@ msgstr "" "%1\n" "auf der anderen Seite erzeugen und die Ordner öffnen?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4441,152 +4523,152 @@ msgstr "" "Das Anzeigen jeder Datei im eigenen Zeichensatz erlaubt eine bessere Darstellung, aber das Mischen/Kopieren ist gefährlich.\n" "Wollen Sie beide Dateien behandeln, als wären sie im gleichen Zeichensatz (empfohlen)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informationsverlust wegen Kodierungsfehlern: Beide Dateien" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Kein Unterschied" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Zeilen-Unterschied" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 Vorkommen ersetzt." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kann \"%s\" nicht finden" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Positionsleiste" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Unterschiedsleiste" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Die Patchdatei wurde erfolgreich geschrieben." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Objekt ist nicht vorhanden oder ist ein Verzeichnis!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Objekt ist nicht vorhanden oder ist ein Verzeichnis!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Die Patchdatei existiert bereits. Überschreiben?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 Dateien ausgewählt]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Context" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Unified" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Konnte nicht in die Datei %1 schreiben." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Der angegebene Ausgabepfad ist kein absoluter Pfad: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Geben Sie eine Ausgabedatei an." -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kann keine Patchdatei von Binärdateien erzeugen." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kann keine Patchdatei von Verzeichnissen erzeugen." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4597,12 +4679,12 @@ msgstr "" "\n" "Das Erzeugen eines Patches erfordert, dass es keine ungespeicherten Änderungen in den Dateien gibt." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Der Ordner existiert nicht." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4613,37 +4695,37 @@ msgstr "" "Alle erforderlichen Komponenten (7-zip und/oder Merge7z*.dll) für die Archiv-Unterstützung können nicht gefunden werden.\n" "Entnehmen Sie dem Handbuch mehr Informationen über die Archiv-Unterstützung und wie sie aktiviert wird." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Datei zum Exportieren auswählen" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Datei zum Importieren auswählen" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Einstellungen aus der Datei importiert." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Einstellungen in die Datei exportiert." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Konnte die Einstellungen nicht aus der Datei importieren." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Konnte die Einstellungen nicht in die Datei exportieren." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4654,247 +4736,247 @@ msgstr "" "\n" "Möchten Sie wirklich fortfahren?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Gemischt" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Typ" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Entpacker" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Editor-Skript" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Der passende Entpacker wird auf beide Dateien angewendet (nur eine Datei benötigt die Erweiterung)." -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Kein Prediffer (Normal)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Vorgeschlagene Plugins" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Andere Plugins" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Plugin Einstellungen" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH nicht gefunden - .sct Skripte deaktiviert." -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "G&ehe nach Zeile %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Deaktiviert" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Von Dateisystem" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Von MRU-Liste" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Keine Hervorhebung" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Ressourcen" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index a9efea7df..3e1c3c417 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -77,7 +77,7 @@ msgid "Cu&t" msgstr "Áðï&êïðÞ" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "Áíôé&ãñáöÞ" @@ -88,7 +88,7 @@ msgid "&Paste" msgstr "Ðñï&óÜñôçóç" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "ÌåôÜ&âáóç..." @@ -99,22 +99,25 @@ msgid "Op&en" msgstr "¢í&ïéãìá" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "ìå Áíôéóôïé÷éóìÝíç Å&öáñìïãÞ" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "ì&å Üëëç ÅöáñìïãÞ" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "ìå..." @@ -152,7 +155,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Æïõì" @@ -164,8 +167,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Áðüêñõøç" @@ -182,49 +185,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Áñ÷åßï" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Äçìéïõñãßá\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "¢í&ïéãìá...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "¢íïéãìá Áñ÷åßïõ &ÄéåíÝîåùí..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "¢íïéãìá ¸ñ&ãïõ...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Áðï&èÞêåõóç ¸ñãïõ..." @@ -236,274 +239,274 @@ msgstr " #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< ¢äåéï >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "¸îïäï&ò" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Åðåîåñãáóßá" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "Åðéë&ïãÝò..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "Ðñ&ïâïëÞ" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "ÃñáììÞ Å&ñãáëåßùí" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "Ìé&êñÞ" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "Ìå&ãÜëç" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "ÃñáììÞ &ÊáôáóôÜóåùò" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "ÃñáììÞ Óå&ëéäïäåéêôþí" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "Åñãá&ëåßá" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Ößëôñá..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Äçìéïõñãßá Patch..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "Áñ&èñþìáôá" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "Á&ðïóõìðßåóç áðü ôï ×ñÞóôç" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "Á&õôüìáôç Áðïóõìðßåóç" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "ÅðáíÝ&ëåã÷ïò ÁñèñùìÜôùí" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&ÐáñÜèõñï" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "Ê&ëåßóéìï" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Êëåßóéìï üë&ùí" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "ÅíáëëáãÞ ìåôáîý Ðå&äßùí\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "ÐáñÜèåóç Ïñé&æïíôßùò" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "ÐáñÜèåóç Êáôá&êïñýöùò" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "ÅðéêÜëõ&øç" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&ÂïÞèåéá" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "ÂïÞèåéá WinMerge\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "&Ñõèìßóåéò" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "ÃåíéêÞ Äçìïóßá ¢äåéá &GNU" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&Ðåñß ôïõ WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Áñéóôåñü ãéá ÁíÜã&íùóç ìüíï" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Äåîéü ãéá ÁíÜãí&ùóç ìüíï" @@ -514,7 +517,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "ÅðéëïãÞ ¼&ëùí\tCtrl+A" @@ -536,2441 +539,2501 @@ msgstr " #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "ÅìöÜíéóç Ïñöáíþí Óôïé÷åßùí Äå&îéïý" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "ÅìöÜíéóç Áíôé&ðáñåëèÝíôùí Óôïé÷åßùí" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "ÅìöÜíéóç &Äõáäéêþí Áñ÷åßùí" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "ÅìöÜíéóç Êñõ&öþí Óôïé÷åßùí" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "ÅðéëïãÞ &ÃñáììáôïóåéñÜò..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "×ñÞóç Ðñïêá&èïñéóìÝíçò ÃñáììáôïóåéñÜò" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "ÓôáôéóôéêÜ Óõãêñßóåùò" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "Áíá&íÝùóç\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Áíá&íÝùóç ÅðéëåãìÝíùí\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "Óõã&÷þíåõóç" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "&Óýãêñéóç\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&ÅðïìÝíç ÄéáöïñÜ\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Ð&ñïçãïõìÝíç ÄéáöïñÜ\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Ðñþôç ÄéáöïñÜ\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Ô&ñÝ÷ïõóá ÄéáöïñÜ\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Ôåëåõôáßá ÄéáöïñÜ\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "ÁíôéãñáöÞ Äå&îéÜ\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "ÁíôéãñáöÞ Á&ñéóôåñÜ\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&ÄéáãñáöÞ\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&ÐñïóáñìïãÞ Óôçëþí..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Äçìéïõñãßá Áíá&öïñÜò..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "Áðï&èÞêåõóç\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "ÁðïèÞêåõóç Á&ñéóôåñïý" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "ÁðïèÞêåõóç Äå&îéïý" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "Åê&ôýðùóç..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "ÄéÜôáîç &Óåëßäáò" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Ðñïå&ðéóêüðçóç Åêôõðþóåùò" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&ÌåôáôñïðÞ ×áñáêôÞñùí Ôåñìáôéóìïý" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "Ëåéôïõñãßá Óõã&÷ùíåýóåùò\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "&Êùäéêïóåëßäá Áñ÷åßïõ..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "Á&íáßñåóç\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "ÅðáíÜëç&øç\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Áðï&êïðÞ\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "Áíôé&ãñáöÞ\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "Ðñï&óÜñôçóç\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Åðéëï&ãÞ ÄéáöïñÜò ÃñáììÞò\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Áíá&æÞôçóç...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "ÁíôéêáôÜ&óôáóç...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Åé&äéêÝò ÅíôïëÝò" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "ÁíôéãñáöÞ ìå &Áñßèìçóç Ãñáììþí" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "ÓçìÜí&óåéò" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "ÌåôáâïëÞ ÓçìÜí&óåùò\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "Åðï&ìÝíç ÓÞìáíóç\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Ð&ñïçãïõìÝíç ÓÞìáíóç\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "Êá&ôÜñãçóç üëùí ôùí ÓçìÜíóåùí" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "ÌåôÜ&âáóç óå...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Æïõì &ÌåãÝèõíóç\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Æïõì &Óìßêñõíóç\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Êáíïíéêü\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "&×ñùìáôéóìüò Êþäéêá" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "&ÐÜãùìá Ðåäßùí" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "Åì&öÜíéóç ×áñáêôÞñùí ÄéáóôÞìáôïò" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Åì&öÜíéóç Äéáöïñþí Ãñáììþí" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "ÅìöÜíéóç &ÁñéèìÞóåùò Ãñáììþí" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "ÅìöÜíéóç Ðåñé&èùñßùí" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "Áíá&äßðëùóç Ãñáììþí" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Áíôé&ìåôÜèåóç Ðåäßùí" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "&Ðåäßï Äéáöïñþí" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Ðåäßï &Åíôïðéóìïý" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "ÁíôéãñáöÞ Äå&îéÜ êáé ÌåôÜâáóç óå åðïìÝíç\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "ÁíôéãñáöÞ Á&ñéóôåñÜ êáé ÌåôÜâáóç óå åðïìÝíç\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "ÁíôéãñáöÞ üëùí &ÄåîéÜ" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "ÁíôéãñáöÞ üëùí &ÁñéóôåñÜ" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "Ðñïåðå&îåñãáóôÞò Äéáöïñþí" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "Ìáê&ñïåíôïëÝò" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "&Óýãêñéóç" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "Á&ñéóôåñü óôï Äåîéü" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "Áñéóô&åñü óôï..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "Äå&îéü óôï Áñéóôåñü" +msgid "Left to Right (%1 of %2)" +msgstr "Áñéóôåñü óôï Äåîéü (%1 áðü %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "Äåî&éü óôï..." +msgid "Left to... (%1 of %2)" +msgstr "Áñéóôåñü óôï... (%1 áðü %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Ìåôáêßíçóç" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "Áñéóô&åñü óôï..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "Äå&îéü óôï..." +msgid "Right to Left (%1 of %2)" +msgstr "Äåîéü óôï Áñéóôåñü (%1 áðü %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Äåîéü óôï... (%1 áðü %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Ìåôáêßíçóç" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&ÄéáãñáöÞ" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "Á&ñéóôåñü" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "Äå&îéü" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "Áì&öüôåñá" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Ìåôï&íïìáóßá" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "Áðüêñõ&øç ÁíôéêåéìÝíùí" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "¢íïéãìá Á&ñéóôåñïý" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "¢íïéãìá Äå&îéïý" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "ÁíôéãñáöÞ Äéá&äñïìþí" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "Á&ñéóôåñü (%1 áðü %2)" +msgid "Left (%1 of %2)" +msgstr "Áñéóôåñü (%1 áðü %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "Äå&îéü (%1 áðü %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Äåîéü (%1 áðü %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Áìöüôåñá (%1áðü %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "Áì&öüôåñá (%1 áðü %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "ÁíôéãñáöÞ Ï&íïìÜôùí" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "Á&ñéóôåñü... (%1 áðü %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "Äå&îéü... (%1 áðü %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "Áì&öüôåñá... (%1 áðü %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&ÄéáöïñÝò... (%1 áðü %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "Áíá&íÝùóç" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "ÁíôéãñáöÞ ðëÞñïõò Äéá&äñïìÞò" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "ÁíôéãñáöÞ Ï&íüìáôïò" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Ñõèìßóåéò ÐñïåðåîåñãáóôÞ Äéáöïñþí" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "×ùñßò ðñïåðåîåñãáóßá äéáöïñþí" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Áõôüìáôç åðéëïãÞ ðñïåðåîåñãáóôÞ äéáöïñþí" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "ÌåôÜ&âáóç óå ÄéáöïñÜ" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "¼÷é ìåôáêéíçèÝíôá ÔìÞìáôá" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "¼&ëá ôá ìåôáêéíçèÝíôá ÔìÞìáôá" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "ÌåôáêéíçèÝí ÔìÞìá ãéá Ô&ñÝ÷ïõóá ÄéáöïñÜ" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "×áñáêôÞñåò &ÄéáóôÞìáôïò" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Óýã&êñéóç" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "Ïé ìåôáâïëÝò íá Á&ãíïçèïýí" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Íá Áãíïçèïýí ¼&ëá" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "ÄéÜêñéóç Ðåæþí/&Êåöáëáßùí" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "ÄéáöïñÝò ÷áñáêôÞñùí &ôåñìáôéóìïý (Win/Unix/Mac) íá áãíïïýíôáé" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "ÐëÞñçò Ðåñéå÷ïìÝíùí" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Óýíôïìç Ðåñéå÷ïìÝíùí" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Çìåñïìçíßá ÔñïðïðïéÞóåùò" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Çìåñïìçíßá ÔñïðïðïéÞóåùò êáé ÌÝãåèïò" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "ÌÝãåèïò" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Ðåñß ôïõ WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(ÉäéùôéêÞ Ìåôáãëþôôéóç)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Åðéóêåöèåßôå ôï Óôáèìü ôïõ WinMerge!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "ÏÊ" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "ÓõíôåëåóôÝò" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "ÅðéëïãÞ Áñ÷åßùí Þ ÖáêÝëùí" -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "Áíá&æÞôçóç..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "Áíá&æÞôçóç..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Áíá&æÞôçóç..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "ÅðéëïãÞ..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "Áðï&óõìðéåóôéêü:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "&ÅðéëïãÞ..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "Ïé ÕðïöÜêåëïé íá &óõìðåñéëçöèïýí" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "ÊáôÜóôáóç:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "¢&êõñï" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "ÂïÞèåéá" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Áñ÷åßá Þ ÖÜêåëïé ðñïò Óýãêñéóç" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "ÂÜóç ÄåäïìÝíùí:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "¸ñãï:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "×ñÞóôçò:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Óõíèçìáôéêü:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "ÐáñáðïìðÞ óôï Ýñãï VSS Ðñïïñéóìïý" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "ÅöáñìïãÞ óå üëá ôá áíôéêåßìåíá" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "¸ëåã÷ïò ê´ ¸îïäïò" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "ÁðïèÞêåõóç Ùò..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&ÄéáäñïìÞ ôïõ cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "ÃåíéêÜ" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Áõôüìáôç &êýëéóç óôçí ðñþôç äéáöïñÜ" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Ê&ëåßóéìï ðáñáèýñùí ìå ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Áõôüìáôç åðáëÞèåõóç äéáäñïìþí óôï äéÜëïãï áíïßãìáôïò" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "ÅðéôñÝðåôáé ìüíï ìßá õðüóôáóç ôïõ WinMerge áíïéêôÞ" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Åñþôçóç ðñéí áðü ôï êëåßóéìï ðïëëáðëþí ðáñáèýñùí" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "Äéá&ôÞñçóç ôçò þñáò ôñïðïðïéÞóåùò êáôÜ ôç óýãêñéóç áñ÷åßùí" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Áõôüìáôç óõìðëÞñùóç äéáëüãïõ áí&ïßãìáôïò" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "Ôï WinMerge åðéôñÝðåé ôçí áðüêñõøç ïñéóìÝíùí êïéíþí ðëáéóßùí ìçíõìÜôùí. ÐáôÞóôå ôï êïõìðß ÅðáíáöïñÜ ãéá íá îáíáêÜíåôå üëá ôá ìçíýìáôá ïñáôÜ." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "ÅðáíáöïñÜ" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "ÁíáæÞôçóç" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "Áíá&æÞôçóç ãéá:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Åýñåóç ïëïêëÞñùí &ëÝîåùí ìüíï" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "ÄéÜêñéóç Ðåæþí/&Êåöáëáßùí" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "ÔõðïðïéçìÝíç ¸ê&öñáóç" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "×ùñßò áíá&äßðëùóç óôï ôÝëïò ôïõ áñ÷åßïõ" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "Åýñåóç &ÅðïìÝíïõ" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&ÏÊ" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "ÁíôéêáôÜóôáóç" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Áíôé&êáôÜóôáóç ìå:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "×ùñßò áíá&äßðëùóç óôï ôÝëïò ôïõ áñ÷åßïõ" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "ÁíôéêáôÜóôáóç åíôüò" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&ÅðéëïãÞò" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "¼&ëïõ ôïõ Áñ÷åßïõ" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "Áíôé&êáôÜóôáóç" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "ÁíôéêáôÜóôáóç ¼&ëùí" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "¸ëåã÷ïò ê´ ¸îïäïò" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Ó÷üëéá" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Äéáðßóôåõóç ìåôÜ áðü Ýëåã÷ï ê´ Ýîïäï" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Ößëôñá Ãñáììþí" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Åíåñãïðïßçóç Ößëôñùí Ãñáììþí" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "ÔõðïðïéçìÝíåò Åê&öñÜóåéò (ìßá áíÜ ãñáììÞ):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Äçìéïõñãßá" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Åðåîåñãáóßá" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "ÄéáãñáöÞ" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "×ñþìáôá" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "ÄéáöïñÜ:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "ÅðéëåãìÝíç ÄéáöïñÜ:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Öüíôï" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "ÄéáãñáöÝíôá" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Êåßìåíï" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Áãíïçèåßóá ÄéáöïñÜ" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "ÌåôáêéíçèÝíôá:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "ÅðéëåãìÝíá ÌåôáêéíçèÝíôá:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "ÄéáöïñÜ ËÝîåùò:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "ÅðéëåãìÝíç ÄéáöïñÜ ËÝîåùò:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "&Áñ÷éêÝò Ñõèìßóåéò" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Óýóôçìá" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "ÁðïóôïëÞ äéáãñáöÝíôùí áñ÷åßùí óôïí &ÊÜäï Áíáêõêëþóåùò" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "Åðåîåñãáóßá ìå &Üëëç åöáñìïãÞ:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "ÖÜêåëïò &Ößëôñùí:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "ÖÜêåëïò ðñïóùñéíþí áñ÷åßùí" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "ÖÜêåëïò ðñïóùñéíþí áñ÷åßùí ïñßæåôáé áðü ôï &Óýóôçìá" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "Ðñï&ôéìþìåíïò ÖÜêåëïò:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "ÅöáñìïãÞ Äçìéïõñãßáò Patch" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Áñ÷åßï&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Áñ÷åßï&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "ÁíôéìåôÜ&èåóç" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "ÐñïóÜñôçóç óå õðÜñ÷ïí áñ÷åßï" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&ÁðïôÝëåóìá:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Áíá&æÞôçóç..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "Ìïñ&öÞ" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "Óô&õë:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Ðåñéâ. Êåßì.:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ïé êåíÝò ãñáììÝò íá áãíïïýíôáé" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Ç ãñáììÞ åíôïëÞò íá óõìðåñéëáìâÜíåôáé" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "¢í&ïéãìá ìå Üëëç åöáñìïãÞ åðåîåñãáóßáò" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "ÅìöÜíéóç Óôçëþí" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Ìåôáêßíçóç ðñïò ôá &Üíù" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Ìåôáêßíçóç ðñïò ôá &êÜôù" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "ÅðéëïãÞ Áðïóõìðéåóôéêïý" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Áðïóõìðéåóôéêü Áñ÷åßùí:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "ÅìöÜíéóç üëùí ôùí áðïóõìðéåóôéêþí, íá ìçí åëÝã÷åôáé ç åðÝêôáóç" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "ÊáôÜëïãïò ÅðåêôÜóåùí:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "ÐåñéãñáöÞ:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Ôåñìáôéóìüò" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Óýãêñéóç áíôéêåéìÝíùí..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "ÓõãêñéèÝíôá áíôéêåßìåíá:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Óýíïëï áíôéêåéìÝíùí:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "ÌåôÜâáóç" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "&ÌåôÜâáóç:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Áñ÷åßï" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "ÌåôÜâáóç óå" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "&ÃñáììÞ" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&ÄéáöïñÜ" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "ÌåôÜ&âáóç" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Óýãêñéóç" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "×áñáêôÞñåò ÄéáóôÞìáôïò" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Óýãêñéóç" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "Ç ìåôáâïëÞ íá á&ãíïåßôáé" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Íá áãíïïýíôáé ôá &ðÜíôá" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ïé &êåíÝò ãñáììÝò íá áãíïïýíôáé" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "ÄéÜêñéóç ìåôáîý Ðåæþí/&Êåöáëáßùí áíåíåñãüò" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Åíåñãïðïßçóç áíé&÷íåýóåùò ìåôáêéíçèÝíôùí ôìçìÜôùí" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "Áíôéóôïß÷éóç ðáñïìïßùí ãñáììþí" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Ó÷üëéá Ößëôñùí" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Åðåîåñãáóßá ÊåéìÝíïõ" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&×ñùìáôéóìüò Êþäéêá" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "Á&õôüìáôç ÅðáíåîÝôáóç" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "Äéá&ôÞñçóç áñ÷éêþí ÷áñáêôÞñùí ôåñìáôéóìïý" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "ÓôçëïèÝôåò" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "ÐëÜôïò Óôçëï&èåôþí" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "Å&éóáãùãÞ Óôçëïèåôþí" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "ÅéóáãùãÞ Êåíþí &ÄéáóôçìÜôùí" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "×ñùìáôéóìüò Äéáöïñþí Ãñáììþí" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "ÅìöÜíéóç äéáöïñþí ãñáììþí" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "Åðßðåäï &×áñáêôÞñùí" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "Åðßðåäï &ËÝîåùí" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Áñ÷åéïößëôñá" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "ÄïêéìÞ" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "ÅãêáôÜóôáóç..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Äçìéïõñãßá..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Åðåîåñãáóßá..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "ÄéáãñáöÞ..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "ÁðïèÞêåõóç ôñïðïðïéçìÝíùí áñ÷åßùí;" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Áñ÷åßï áñéóôåñÞò ðëåõñÜò" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "Áðï&èÞêåõóç áëëáãþí" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "Áðü&ññéøç áëëáãþí" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Áñ÷åßï äåîéÜò ðëåõñÜò" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "Áðï&èÞêåõóç áëëáãþí" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Áðü&ññéøç áëëáãþí" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Êùäéêïóåëßäá" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "ÐñïêáèïñéóìÝíç Êùäéêïóåëßäá" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "ÅðéëÝîáôå ôçí ðñïêáèïñéóìÝíç êùäéêïóåëßäá íïïõìÝíç êáôÜ ôï Üíïéãìá áñ÷åßùí ÷ùñßò êùäéêïðïßçóç Unicode" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Êùäéêïóåëßäá óõóôÞìáôïò" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Óýìöùíá ìå ôï ÐåñéâÜëëïí Åñãáóßáò ôïõ WinMerge" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "ÅðéëïãÝò" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Êáôçãïñßåò" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "ÅéóáãùãÞ..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "ÅîáãùãÞ..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "ÄéÜëïãïò" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "ÅéäéêÝò ËÝîåéò:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Ïíüìáôá Äéåñãáóéþí:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Ó÷üëéá:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Áñéèìïß:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "ÔåëåóôÝò:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Áõôïýóéï Êåßìåíï:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "ÐñïåðåîåñãáóôÞò:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "áðü ×ñÞóôç 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "áðü ×ñÞóôç 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "¸íôïíá" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "ÁíáöïñÜ Óõãêñßóåùò ÖáêÝëùí" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Áñ÷åßï Áíá&öïñÜò" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Áíá&æÞôçóç..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Óôõë:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "Áíôé&ãñáöÞ óôï Ðñü÷åéñï" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Êïéíü Þ Éäéùôéêü Ößëôñï" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Ôé ôýðï ößëôñïõ åðéèõìåßôå íá äçìéïõñãÞóåôå;" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Êïéíü Ößëôñï (ãéá üëïõò ôïõò ÷ñÞóôåò áõôïý ôïõ óõóôÞìáôïò)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Éäéùôéêü Ößëôñï (ìüíï ãéá ôïí ðáñüíôá ÷ñÞóôç)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "ÕðïóôÞñéîç ÓõìðéåóìÝíùí" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Åíåñãïðïßçóç õðïóôçñßîåùò óõìðéåóìÝíùí áñ÷åßùí" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "Áíß&÷íåõóç ôýðïõ óõìðéåóìÝíïõ áñ÷åßïõ áðü ôçí õðïãñáöÞ ôïõ" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "ÓôáôéóôéêÜ Óõãêñßóåùí" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "ÖÜêåëïé:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Áñ÷åßá:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "ÄéáöïñåôéêÜ" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Êåßìåíï:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "ÄõáäéêÜ:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "ÏñöáíÜ" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "ÁñéóôåñÜ:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "ÄåîéÜ:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Ðáíïìïéüôõðá" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Óýíïëï:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Êëåßóéìï" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "ÅðçñåÜæåé" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(ÅðçñåÜæåé)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "ÅðéëïãÞ Êùäéêïóåëßäáò ãéá" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "ÁíÜ&ãíùóç Áñ÷åßïõ:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Áðï&èÞê. Áñ÷åßïõ:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "×ñÞóç éäßáò êùäéêïóåëßäáò ãéá áìöüôåñá" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "Å&öáñìïãÞ" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "¢&êõñï" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "ÄïêéìÞ Ößëôñïõ" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "ÄïêéìÞ Ößëôñïõ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&ÅéóáãùãÞ êåéìÝíïõ ãéá äïêéìÞ:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "¼íïìá &ÖáêÝëïõ" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "ÁðïôÝëåóìá:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&ÄïêéìÞ" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "Ê&ëåßóéìï" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "×ñÞóç ðñï&ôéìùìÝíùí ÷ñùìáôéóìþí êåéìÝíïõ" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Ðñïôéìþìåíïé ÷ñùìáôéóìïß êåéìÝíïõ" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "×áñáêôÞñåò ÄéáóôÞìáôïò:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Áðëü êåßìåíï:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "ÅðéëïãÞ:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "ÄéáäñïìÝò" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "Á&ñéóôåñü:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Ìüíï ãéá ÁíÜ&ãíùóç" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "Äå&îéü:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Ìüíï ãéá ÁíÜ&ãíùóç" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Ößëôñï:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "¢í&ïéãìá" -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "ÁðïèÞêåõóç..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "ÅöåäñéêÜ Áñ÷åßá" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Äçìéïõñãßá åöåäñéêþí áñ÷åßùí åíþ ãßíåôáé:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Óýãêñéóç &ÖáêÝëùí" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Óýãêñéóç &Áñ÷åßùí" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Äçìéïõñãßá åöåäñéêþí áñ÷åßùí åíôüò:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "Áñ&÷éêïý öáêÝëïõ áñ÷åßïõ" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&Êáèïëéêïý öáêÝëïõ åöåäñåéþí:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "¼íïìá åöåäñéêïý áñ÷åßïõ:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "Ðñïó&èÞêç åðåêôÜóåùò .bak" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "ÐñïóèÞêç &çìåñïìçíßáò ê´ þñáò" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Åðéâåâáßùóç ÁíôéãñáöÞò" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Åßóèå âÝâáéïé üôé åðéèõìåßôå íá áíôéãñÜøåôå XXX áíôéêåßìåíá;" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Åî áñéóôåñþí" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Ðñïò ôá äåîéÜ" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Íáé" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "¼÷é" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Áñèñþìáôá" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "Åíåñãïðïßçóç ÁñèñùìÜôùí" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Åíåñãïðïßçóç åîåéäéêåõìÝíùí åðéëïãþí" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "ÖÜêåëïò" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "&Ôåñìáôéóìüò ìåôÜ ôçí ðñþôç äéáöïñÜ" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "ÄéáöïñÝò þñáò ìéêñüôåñåò ôùí &3 äåõôåñïëÝðôùí íá áãíïïýíôáé" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Äõáäéêü" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "ÐáñïõóéÜóèçêå êÜðïéï óöÜëìá êáôÜ ôï Üíïéãìá ôïõ áñ÷åßïõ Ýñãïõ." -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "ÐáñïõóéÜóèçêå êÜðïéï óöÜëìá êáôÜ ôçí áðïèÞêåõóç ôïõ áñ÷åßïõ Ýñãïõ." -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "ÁðïèÞêåõóç ¸ñãïõ Ùò" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Áñ÷åßï ¸ñãïõ áíïß÷èçêå åðéôõ÷þò." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Áñ÷åßï ¸ñãïõ áðïèçêåýèçêå åðéôõ÷þò." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2989,7 +3052,7 @@ msgstr "" "WinMerge.ÓýãêñéóçÁñ÷åßùí\n" "Óýãêñéóç Áñ÷åßùí WinMerge" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3008,7 +3071,7 @@ msgstr "" "WinMerge.ÓýãêñéóçÖáêÝëùí\n" "Óýãêñéóç ÖáêÝëùí WinMerge" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3017,143 +3080,143 @@ msgstr "" "ÐñïãñáììáôéóôÝò:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 ðñïóöÝñåôáé ÷ùñßò ÊÁÌÌÉÁ ÁÐÏËÕÔÙÓ ÅÃÃÕÇÓÇ. Åßíáé åëåýèåñï ëïãéóìéêü êáé åßóèå åõðñüóäåêôïò íá ôï áíáäéáíåßìåôå õðü ïñéóìÝíåò ðåñéóôÜóåéò· äåßôå ôç ÃåíéêÞ Äçìïóßá ¢äåéá GNU óôéò åðéëïãÝò ôçò Âïçèåßáò ãéá ëåðôïìÝñåéåò." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Ìáôáßùóç" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&ÅðáíÜëçøç" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "Íá &áãíïçèåß" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Íá áãíïçèïýí &üëá" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Íáé" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Íáé óå &üëá" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&¼÷é" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "¼÷é óå ü&ëá" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&ÓõíÝ÷åéá" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&ÐáñÜëåéøç" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "ÐáñÜëåéøç ¼&ëùí" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Íá ìçí åìöáíéóèåß îáíÜ áõôü ôï &ÌÞíõìá." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Íá ìçí îáíáãßíåé áõôÞ ç &åñþôçóç." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Äéá÷åßñéóç Åêäüóåùí" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "ÄéáöïñÝò" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Ðñïò:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Åî áñéóôåñþí:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Ðñïò ôá áñéóôåñÜ:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Åê äåîéþí:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Ðñïò ôá äåîéÜ:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "¸êäïóç %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "ÅðéëïãÝò (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "¼ëá ôá ðëáßóéá ìçíõìÜôùí åßíáé ðÜëé ïñáôÜ." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3164,84 +3227,84 @@ msgstr "" "\n" "Ðáñáêáëþ ÷ñçóéìïðïéåßóôå ôéìÝò 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "¢íïéãìá" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "ÐñïãñÜììáôá|*.exe;*.bat;*.cmd|¼ëá ôá Áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "¼ëá ôá Áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Áñ÷åßá ¸ñãïõ ôïõ WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Áñ÷åßá ñõèìßóåùí (*.ini)|*.ini|¼ëá ôá Áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, 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:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Áñ÷åßá HTML (*.htm,*.html)|*.htm;*.html|¼ëá ôá Áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Áñ÷åßá XML (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "¼íïìá" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Ôïðïèåóßá" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Ößëôñá" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "ÐåñéãñáöÞ" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "ÅðéëÝîáôå üíïìá áñ÷åßïõ ãéá ôï íÝï ößëôñï" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Ößëôñá Áñ÷åßùí (*.flt)|*.flt|¼ëá ôá áñ÷åßá (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3254,7 +3317,7 @@ msgstr "" "Ðáñáêáëþ áíôéãñÜøáôå ôï áñ÷åßï %1 óôï öÜêåëï WinMerge/Filters:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3267,7 +3330,7 @@ msgstr "" "\n" "Ðáñáêáëþ âåâáéùèåßôå üôé ï öÜêåëïò õðÜñ÷åé êáé äåí Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\"." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3278,7 +3341,7 @@ msgstr "" "\n" "Ðáñáêáëþ åðéëÝîôå öÜêåëï áñ÷åßùí áðü ÅðéëïãÝò/Óýóôçìá." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3291,12 +3354,12 @@ msgstr "" "\n" "ÌÞðùò ôï áñ÷åßï Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\";" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Åíôïðéóìüò áñ÷åßïõ ößëôñïõ ðñïò åãêáôÜóôáóç" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3307,188 +3370,188 @@ msgstr "" "\n" "Ç áíôéãñáöÞ ôïõ íÝïõ áñ÷åßïõ ößëôñïõ óôï öÜêåëï ößëôñùí Þôáí áäýíáôç." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Ôï áñ÷åßï ößëôñïõ õðÜñ÷åé Þäç. ÁíôéêáôÜóôáóç ôïõ õðÜñ÷ïíôïò ößëôñïõ;" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "ÔõðïðïéçìÝíç ¸êöñáóç" -#: Merge.rc:2151 +#: Merge.rc:2172 #, 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 "Ôá ößëôñá åíçìåñþèçêáí. Åðéèõìåßôå íá áíáíåùèïýí üëåò ïé áíïéêôÝò óõãêñßóåéò öáêÝëùí;\n\nÅÜí äåí åðéèõìåßôå íá áíáíåùèïýí üëåò ïé óõãêñßóåéò ôþñá, ìðïñåßôå íá åðéëÝîåôå ¼÷é êáé íá áíáíåþóåôå ôéò óõãêñßóåéò áñãüôåñá." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "ÁðïôåëÝóìáôá Óõãêñßóåùò ÖáêÝëùí" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Óýãêñéóç Áñ÷åßùí" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "×ùñßò ôßôëï áñéóôåñÜ" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "×ùñßò ôßôëï äåîéÜ" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Áñ÷åßï Áõôþí" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Áñ÷åßï Äéêü ìïõ" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "ÃñáììÞ: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Óõã÷þíåõóç" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "ÄéáöïñÜ %1 áðü %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 ÄéáöïñÝò âñÝèçêáí" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 ÄéáöïñÜ âñÝèçêå" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "ÌãÁ" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Áíôéêåßìåíï %1 áðü %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Áíôéêåßìåíá: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "ÅðéëÝîáôå äýï õðÜñ÷ïíôåò öáêÝëïõò Þ áñ÷åßá ðñïò óýãêñéóç" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "ÅðéëïãÞ ÖáêÝëùí" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "ÅðéëÝîáôå äýï öáêÝëïõò Þ áñ÷åßá ðñïò óýãêñéóç." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "ÓöÜëìá óôç äéáäñïìÞ ôïõ áñéóôåñïý!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "ÓöÜëìá óôç äéáäñïìÞ ôïõ äåîéïý!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "ÓöÜëìá óå áìöüôåñåò ôéò äéáäñïìÝò!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "ÅðéëÝîáôå äýï áñ÷åßá þóôå íá åíåñãïðïéçèåß ç åðéëïãÞ áðïóõìðéåóôéêïý." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Ç óýãêñéóç áñ÷åßïõ êáé öáêÝëïõ äåí åßíáé äõíáôÞ!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Ôï áñ÷åßï äå âñÝèçêå: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Ôï áñ÷åßï äåí áðïóõìðéÝóèçêå: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3501,12 +3564,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Áðïôõ÷ßá áíáëýóåùò áñ÷åßïõ äéåíÝîåùí." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3517,27 +3580,27 @@ msgstr "" "%1\n" "äåí åßíáé áñ÷åßï äéåíÝîåùí." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "ÁðïèÞêåõóç Ùò" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "ÁðïèÞêåõóç ìåôáâïëþí óôï %1;" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\". Èá èÝëáôå íá áíôéêáôáóôÞóåôå ôï áñ÷åßï; (¼÷é ãéá áðïèÞêåõóç ùò äéáöïñåôéêü áñ÷åßï.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Áðïôõ÷ßá äçìéïõñãßáò åöåäñéêïý áñ÷åßïõ" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3550,7 +3613,7 @@ msgstr "" "\n" "ÓõíÝ÷åéá ùò Ý÷åé;" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3567,7 +3630,7 @@ msgstr "" "\t-÷ñçóéìïðïéÞóåôå Ýíá äéáöïñåôéêü üíïìá (ÐéÝóôå ÏÊ)\n" "\t-ìáôáéþóåôå ôçí ôñÝ÷ïõóá åíÝñãåéá (ÐéÝóôå ¢êõñï);" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3582,7 +3645,7 @@ msgstr "" "\n" "Åðéèõìåßôå íá áðïèçêåýóåôå ôï áðïóõìðéåóìÝíï áñ÷åßï ùò äéáöïñåôéêü áñ÷åßï;" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3597,7 +3660,7 @@ msgstr "" "\n" "Åðéèõìåßôå íá áðïèçêåýóåôå ôï áðïóõìðéåóìÝíï áñ÷åßï ùò äéáöïñåôéêü áñ÷åßï;" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3612,7 +3675,7 @@ msgstr "" "\n" "ÁíôéêáôÜóôáóç ìåôáâëçèÝíôïò áñ÷åßïõ?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3621,32 +3684,32 @@ msgstr "" "Ôï %1\n" "Ý÷åé ôçí éäéüôçôá \"Ìüíï ãéá ÁíÜãíùóç\". Åðéèõìåßôå íá áíôéêáôáóôÞóåôå ôï áñ÷åßï;" -#: Merge.rc:2235 +#: Merge.rc:2256 #, 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:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "ÁðïèÞêåõóç Áñéóôåñïý Áñ÷åßïõ Ùò" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "ÁðïèÞêåõóç Äåîéïý Áñ÷åßïõ Ùò" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3657,42 +3720,42 @@ msgstr "" "\n" "Áíáíåþóôå ôá áñ÷åßá ðñéí óõíå÷ßóåôå." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "ÐñÝðåé íá ïñßóåôå ìßá äéáäñïìÞ Ýñãïõ ôïõ SourceSafe þóôå íá óõíå÷ßóåôå (äçë. $/Ôï¸ñãïìïõ)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "¸ëåã÷ïò ê´ ¸îïäïò áðü ôï VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Ôï Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí áíÝöåñå óöÜëìá êáôÜ ôïí Ýëåã÷ï ê´ Ýîïäï ôïõ áñ÷åßïõ. Ç óõíÝ÷åéá åßíáé áäýíáôç..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "ÓöÜëìá êáôÜ ôçí åêôÝëåóç åíôïëÞò ôïõ óõóôÞìáôïò äéá÷åéñßóåùò åêäüóåùí." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Ï öÜêåëïò åñãáóßáò ôïõ VSS êáé ç èÝóç ôïõ ôñÝ÷ïíôïò áñ÷åßïõ äåí åßíáé óå óõìöùíßá. ÓõíÝ÷åéá;" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Äå âñÝèçêáí âÜóåéò äåäïìÝíùí ôïõ VSS!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "ÓöÜëìá ôïõ VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3703,7 +3766,7 @@ msgstr "" " Ðáñáêáëþ, åëÝãîôå ðñïäéáãñáöÝò ñõèìßóåùí ôçò ÷ñçóéìïðïéïõìÝíçò åðéóêïðÞóåùò.\n" " Áíáßñåóç åíåñãåßáò åëÝã÷ïõ ê´ åîüäïõ;" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3712,127 +3775,146 @@ msgstr "" "Ôï Óýóôçìá Äéá÷åéñßóåùò Åêäüóåùí áíÝöåñå óöÜëìá êáôÜ ôçí áíáßñåóç åëÝã÷ïõ ê´ åîüäïõ ôïõ áñ÷åßïõ.\n" " Ðáñáêáëþ, åëÝãîôå ðñïäéáãñáöÝò ñõèìßóåùí ôçò ÷ñçóéìïðïéïõìÝíçò åðéóêïðÞóåùò.\n" -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "×ùñßò" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (Ýêäïóç ðñï ôçò 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (Ýêäïóç 5.0 êáé ìåôáãåíÝóôåñï)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "ÓôÜóç óôá êåíÜ" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "ÓôÜóç óôá êåíÜ Þ óôá óçìåßá óôßîåùò" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Äåîéü óôï Áñéóôåñü (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Áñéóôåñü óôï Äåîéü (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Äåîéü óôï Áñéóôåñü (%1 áðü %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Áñéóôåñü óôï Äåîéü (%1 áðü %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Áñéóôåñü óôï Äåîéü (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Áñéóôåñü óôï... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Äåîéü óôï... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Áñéóôåñü óôï... (%1 áðü %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Äåîéü óôï... (%1 áðü %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Áñéóôåñü (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Äåîéü (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Áìöüôåñá (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Áñéóôåñü (%1 áðü %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Äåîéü (%1 áðü %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Áìöüôåñá (%1áðü %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "ÁñéóôåñÞ ðëåõñÜ - åðéëïãÞ öáêÝëïõ ðñïïñéóìïý:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "ÄåîéÜ ðëåõñÜ - åðéëïãÞ öáêÝëïõ ðñïïñéóìïý:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Áñ÷åßá ÌåôáâëÞèçêáí)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 áðü %2 Áñ÷åßá ÌåôáâëÞèçêáí)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3843,17 +3925,17 @@ msgstr "" "\n" "%1 ;" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Åßóèå âÝâáéïé üôé åðéèõìåßôå íá áíôéãñÜøåôå:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Åßóèå âÝâáéïé üôé åðéèõìåßôå íá áíôéãñÜøåôå %d áíôéêåßìåíá:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3872,502 +3954,502 @@ msgstr "" "\n" "Ðáñáêáëþ áíáíåþóôå ôç óýãêñéóç." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Åßóèå âÝâáéïò üôé åðéèõìåßôå íá ìåôáêéíÞóåôå:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Åßóèå âÝâáéïò üôé åðéèõìåßôå íá ìåôáêéíÞóåôå %d áíôéêåßìåíá:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Åðéâåâáéþóáôå Ìåôáêßíçóç" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Áðïôõ÷ßá êáôÜ ôï Üíïéãìá Üëëçò åöáñìïãÞò: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "¢ãíùóôç ìïñöÞ óõìðéåóìÝíïõ áñ÷åßïõ" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "¼íïìá Áñ÷åßïõ" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "ÁðïôÝëåóìá Óõãêñßóåùò" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Çìåñïìçíßá Áñéóôåñïý" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Çìåñïìçíßá Äåîéïý" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "ÅðÝêôáóç" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "ÌÝãåèïò Áñéóôåñïý" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "ÌÝãåèïò Äåîéïý" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "ÌÝãåèïò Äåîéïý (Óýíôïìï)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "ÌÝãåèïò Áñéóôåñïý (Óýíôïìï)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "×ñüíïò Äçìéïõñãßáò Áñéóôåñïý" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "×ñüíïò Äçìéïõñãßáò Äåîéïý" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Íåþôåñï Áñ÷åßï" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "¸êäïóç Áñéóôåñïý Áñ÷åßïõ" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "¸êäïóç Äåîéïý Áñ÷åßïõ" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Óýíôïìï ÁðïôÝëåóìá" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Éäéüôçôåò Áñéóôåñïý" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Éäéüôçôåò Äåîéïý" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "×áñáêôÞñáò Ôåñìáôéóìïý Áñéóôåñïý" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "×áñáêôÞñáò Ôåñìáôéóìïý Äåîéïý" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Êùäéêïóåëßäá Áñéóôåñïý" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Êùäéêïóåëßäá Äåîéïý" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Áãíïçèåßóá ÄéáöïñÜ." -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Ç óýãêñéóç ôùí áñ÷åßùí åßíáé áäýíáôç" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Ôï áíôéêåßìåíï ìáôáéþèçêå" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Ôï áñ÷åßï ðáñåëåßöèç" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Ï öÜêåëïò ðáñåëåßöèç" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "ÁñéóôåñÜ ìüíï: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "ÄåîéÜ ìüíï: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Ôá äõáäéêÜ áñ÷åßá åßíáé ðáíïìïéüôõðá" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Ôá äõáäéêÜ áñ÷åßá åßíáé äéáöïñåôéêÜ" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Ôá áñ÷åßá åßíáé äéáöïñåôéêÜ" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "ÁñéóôåñÜ ìüíï" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "ÄåîéÜ ìüíï" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "ÓöÜëìá" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ðáñåëèþí ÷ñüíïò: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 áíôéêåßìåíï åðéëåãìÝíï" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 áíôéêåßìåíá åðéëåãìÝíá" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "¼íïìá áñ÷åßïõ Þ üíïìá öáêÝëïõ." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "¼íïìá õðïöáêÝëïõ üôáí ïé õðïöÜêåëïé ðåñéëáìâÜíïíôáé." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "ÁðïôÝëåóìá óõãêñßóåùò, ðëÞñçò áíÜðôõîç" -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Çìåñïìçíßá ôñïðïðïéÞóåùò áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Çìåñïìçíßá ôñïðïðïéÞóåùò äåîéÜò ðëåõñÜò." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "ÅðÝêôáóç áñ÷åßïõ." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "ÌÝãåèïò áñéóôåñïý áñ÷åßïõ óå byte." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "ÌÝãåèïò äåîéïý áñ÷åßïõ óå byte." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "ÌÝãåèïò áñéóôåñïý áñ÷åßïõ óõíôïìåõìÝíï." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "ÌÝãåèïò äåîéïý áñ÷åßïõ óõíôïìåõìÝíï." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "×ñüíïò äçìéïõñãßáò áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "×ñüíïò äçìéïõñãßáò äåîéÜò ðëåõñÜò." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Ðëçñïöïñåß ðïéá ðëåõñÜ Ý÷åé ôçí ðëÝïí ðñüóöáôç çìåñïìçíßá ôñïðïðïéÞóåùò." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¸êäïóç áñ÷åßïõ áñéóôåñÞò ðëåõñÜò, ìüíï ãéá ïñéóìÝíïõò ôýðïõò áñ÷åßùí." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "¸êäïóç áñ÷åßïõ äåîéÜò ðëåõñÜò, ìüíï ãéá ïñéóìÝíïõò ôýðïõò áñ÷åßùí." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Âñá÷ý áðïôÝëåóìá óõãêñßóåùò." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Éäéüôçôåò áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Éäéüôçôåò äåîéÜò ðëåõñÜò." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Ôýðïò ÷áñáêôÞñá ôåñìáôéóìïý áñéóôåñÞò ðëåõñÜò" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Ôýðïò ÷áñáêôÞñá ôåñìáôéóìïý äåîéÜò ðëåõñÜò" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Êùäéêïóåëßäá áñéóôåñÞò ðëåõñÜò." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Êùäéêïóåëßäá äåîéÜò ðëåõñÜò." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Áñéèìüò áãíïçèåéóþí äéáöïñþí óôï áñ÷åßï. ÁõôÝò ïé äéáöïñÝò áãíïïýíôáé áðü ôï WinMerge êáé äåí åßíáé äõíáôüí íá óõã÷ùíåõèïýí." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Áñéèìüò äéáöïñþí óôï áñ÷åßï. Áõôüò ï áñéèìüò äåí ðåñéëáìâÜíåé áãíïçèåßóåò äéáöïñÝò." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Åìöáíßæåé Ýíáí áóôåñßóêï (*) åÜí ôï áñ÷åßï åßíáé äõáäéêü." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Óýãêñéóç %1 ìå %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "ÊáôÜëïãïò ìå êüììá ùò ÷áñáêôÞñá äéá÷ùñéóìïý" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "ÊáôÜëïãïò ìå óôçëïèÝôç ùò ÷áñáêôÞñá äéá÷ùñéóìïý" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Áðëü HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Áðëü XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Ôï áñ÷åßï áíáöïñÜò áðïôåëåóìÜôùí õðÜñ÷åé Þäç. Åðéèõìåßôå íá áíôéêáôáóôÞóåôå ôï õðÜñ÷ïí áñ÷åßï;" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4376,32 +4458,32 @@ msgstr "" "ÓöÜëìá êáôÜ ôç äçìéïõñãßá ôçò áíáöïñÜò áðïôåëåóìÜôùí:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Ç áíáöïñÜ áðïôåëåóìÜôùí äçìéïõñãÞèçêå åðéôõ÷þò." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Ôï ßäéï áñ÷åßï áíïß÷èçêå óå áìöüôåñá ôá ðåäßá." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Ôá åðéëåãìÝíá áñ÷åßá åßíáé ðáíïìïéüôõðá." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "ÐáñïõóéÜóèçêå êÜðïéï óöÜëìá êáôÜ ôç óýãêñéóç ôùí áñ÷åßùí." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Ç äçìéïõñãßá ðñïóùñéíþí áñ÷åßùí äåí Þôáí äõíáôÞ. ÅëÝãîôå ôéò ñõèìßóåéò óáò ôéò ó÷åôéêÝò ìå ôçí ðñïóùñéíÞ äéáäñïìÞ." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4416,17 +4498,17 @@ msgstr "" "\n" "Óçìåßùóç: ÅÜí åðéèõìåßôå ïé ÷áñáêôÞñåò ôåñìáôéóìïý íá èåùñïýíôáé ðÜíôïôå éóïäýíáìïé, åíåñãïðïéåßóôå ôçí åðéëïãÞ \"ÄéáöïñÝò ÷áñáêôÞñùí ôåñìáôéóìïý (Win/Unix/Mac) íá áãíïïýíôáé...\" óôçí êáñôÝëá Óýãêñéóç ôïõ äéáëüãïõ åðéëïãþí (åìöáíßæåôáé ìå ôçí åðéëïãÞ Åðåîåñãáóßá/ÅðéëïãÝò)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Ï åðéëåãìÝíïò öÜêåëïò äåí åßíáé Ýãêõñïò." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ôï Üíïéãìá äõáäéêïý áñ÷åßïõ óôï ðåäßï åðåîåñãáóßáò äåí åßíáé äõíáôüí." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4441,7 +4523,7 @@ msgstr "" "%1\n" "óôçí Üëëç ðëåõñÜ êáé íá áíïßîåôå áõôïýò ôïõò öáêÝëïõò;" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4452,152 +4534,152 @@ msgstr "" "Ç åìöÜíéóç êÜèå öáêÝëïõ ìå ôç äéêÞ ôïõ êùäéêïóåëßäá èá Ý÷åé åìöáíéóéáêÜ êáëýôåñá áðïôåëÝóìáôá áëëÜ ç óõã÷þíåõóç/áíôéãñáöÞ èá åßíáé åðéêßíäõíç.\n" "Åðéèõìåßôå íá èåùñçèåß üôé áìöüôåñá ôá áñ÷åßá ÷ñçóéìïðïéïýí ôçí ðñïêáèïñéóìÝíç êùäéêïóåëßäá ôïõ windows (óõíéóôÜôáé);" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Áðþëåéá ðëçñïöïñéþí ëüãù óöáëìÜôïò êùäéêïóåëßäáò: áìöüôåñá ôá áñ÷åßá" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "×ùñßò äéáöïñÜ" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "ÄéáöïñÜ ãñáììÞò" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "ÁíôéêáôáóôÜèçêáí %1 áêïëïõèßåò ÷áñáêôÞñùí." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ç áêïëïõèßá ÷áñáêôÞñùí \"%s\" äåí åßíáé äõíáôüí íá âñåèåß" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Ðåäßï Åíôïðéóìïý" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Ðåäßï Äéáöïñþí" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Ç åããñáöÞ ôïõ áñ÷åßïõ patch ïëïêëçñþèçêå åðéôõ÷þò." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ôï áíôéêåßìåíï äå âñÝèçêå Þ åßíáé öÜêåëïò!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ôï áíôéêåßìåíï äå âñÝèçêå Þ åßíáé öÜêåëïò!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Ôï áñ÷åßï patch õðÜñ÷åé Þäç. Åðéèõìåßôå íá ôï áíôéêáôáóôÞóåôå;" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 åðéëåãìÝíá áñ÷åßá]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Êáíïíéêü" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Ìå ðåñéâÜëëïí êåßìåíï" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "ÅíïðïéçìÝíï" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Ç åããñáöÞ óôï áñ÷åßï %1 äåí Þôáí äõíáôÞ." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Ç ïñéóèåßóá äéáäñïìÞ åîüäïõ äåí åßíáé áðüëõôç äéáäñïìÞ: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Ïñßóáôå Ýíá áñ÷åßï åîüäïõ" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ç äçìéïõñãßá áñ÷åßïõ patch áðü äõáäéêÜ áñ÷åßá äåí åßíáé äõíáôÞ." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ç äçìéïõñãßá áñ÷åßïõ patch áðü öáêÝëïõò äåí åßíáé äõíáôÞ." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4608,12 +4690,12 @@ msgstr "" "\n" "Ç äçìéïõñãßá patch áðáéôåß íá ìçí õðÜñ÷ïõí óå áñ÷åßá áëëáãÝò ïé ïðïßåò äåí Ý÷ïõí áðïèçêåõèåß." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Ï öÜêåëïò äåí õðÜñ÷åé." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4624,37 +4706,37 @@ msgstr "" "Äåí åßíáé äõíáôüí íá âñåèïýí üëá ôá áðáñáßôçôá óôïé÷åßá (ôï 7-zip êáé/Þ ôï Merge7z*.dll) ãéá ôçí õðïóôÞñéîç óõìðéåóìÝíùí áñ÷åßùí.\n" "Äåßôå óôï åã÷åéñßäéï ãéá ðåñéóóüôåñåò ðëçñïöïñßåò ó÷åôéêÜ ìå ôçí õðïóôÞñéîç óõìðéåóìÝíùí áñ÷åßùí êáé ìå ôïí ôñüðï åíåñãïðïéÞóåùò áõôÞò." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "ÅðéëÝîáôå áñ÷åßï ðñïò åîáãùãÞ" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "ÅðéëÝîáôå áñ÷åßï ðñïò åéóáãùãÞ" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Ïé ñõèìßóåéò åéóÞ÷èçóáí áðü ôï áñ÷åßï." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Ïé ñõèìßóåéò åîÞ÷èçóáí óôï áñ÷åßï." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Áðïôõ÷ßá åéóáãùãÞò ñõèìßóåùí áðü ôï áñ÷åßï." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Áðïôõ÷ßá åããñáöÞò ñõèìßóåùí óôï áñ÷åßï." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4665,247 +4747,247 @@ msgstr "" "\n" "Åðéèõìåßôå íá óõíå÷ßóåôå;" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Ìéêôü" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Ôýðïò" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Áðïóõìðéåóôéêü" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "ÐñïåðåîåñãáóôÞò Äéáöïñþí" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "ÌáêñïåíôïëÝò ÅðåîåñãáóôÞ ÊåéìÝíïõ" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Ôï óõíåñãáæüìåíï áðïóõìðéåóôéêü åíåñãåß óå áìöüôåñá ôá áñ÷åßá (ìüíï Ýíá áñ÷åßï ÷ñåéÜæåôáé íá Ý÷åé ôçí åðÝêôáóç)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "×ùñßò ðñïåðåîåñãáóßá äéáöïñþí (ÊáíïíéêÞ Ëåéôïõñãßá)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Ðñïôåéíüìåíá Áñèñþìáôá" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "¢ëëá áñèñþìáôá" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "ÉäéùôéêÞ Ìåôáãëþôôéóç: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Ñõèìßóåéò ÁñèñùìÜôùí" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Ôï ÐåñéâÜëëïí Äéåñìçíåßáò Windows (WSH) äå âñÝèçêå - ç ÷ñÞóç áñ÷åßùí äÝóìçò åíåñãåéþí .sct åßíáé áðåíåñãïðïéçìÝíç" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "<ÏõäÝí>" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "<Áõôüìáôï>" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "ÌåôÜ&âáóç óôç ÃñáììÞ %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "ÁðåíåñãïðïéçìÝíç" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Áðü Áñ÷åéïóýóôçìá" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Áðü ÊáôÜëïãï ðñïóöÜôùò ÷ñçóéìïðïéçèÝíôùí" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "×ùñßò ×ñùìáôéóìü Êþäéêá" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index b74703f00..83ce8dee5 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -78,7 +78,7 @@ msgid "Cu&t" msgstr "&Kivágás" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Másolás" @@ -89,7 +89,7 @@ msgid "&Paste" msgstr "&Beillesztés" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&Ugrás..." @@ -100,22 +100,25 @@ msgid "Op&en" msgstr "Meg&nyitás" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "&Társított programmal" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "&Külsõ szerkesztõvel" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&Egyéb programmal..." @@ -153,7 +156,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "Nagyítás" @@ -165,8 +168,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Nincs" @@ -183,49 +186,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Fájl" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Új\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "M&egnyitás...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Konfliktus fájl megnyitása..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Projekt megnyitása...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Projekt mentése..." @@ -237,274 +240,274 @@ msgstr "Legut #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Üres >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "&Kilépés" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "S&zerkesztés" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Beállítások..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Nézet" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "Eszköztár" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "Kic&si" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "Nagy" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "&Állapotsor" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Eszközök" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Szûrõk..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Patch generálása..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Bõvítmények" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "&Kézi kicsomagolás" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatikus kicsomagolás" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Bõvítmények betöltése" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&Ablak" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Bezárás" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "&Mindegyik bezárása" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "&Panel váltása\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Elrendezés &vízszintesen" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Elrendezés &függõlegesen" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Felosztás" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Súgó" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge Súgó\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&A Winmerge névjegye..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Bal oldal csak &olvasható" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Jobb oldal csak o&lvasható" @@ -515,7 +518,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "M&indent kijelöl\tCtrl+A" @@ -537,2592 +540,2652 @@ msgstr "Csak bal oldali elemek mutat #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Csak jobb oldali elemek mutatása" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Kihagyott elemek mutatása" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Bináris fájlok mutatása" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "&Rejtett elemek mutatása" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "Fa &mód" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "Minden alkönyvtár kibontása" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "Minden alkönyvtár bezárása" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Betûtípus..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Alapértelmezett betûtípus használata" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Összehasonlítási statisztika" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "&Frissítés\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Kijelöltek frissítése\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Olvasztás" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "&Összehasonlítás\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Következõ eltérés\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Elõzõ eltérés\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "E&lsõ eltérés\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuális eltérés\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Utolsó eltérés\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Másolás &Jobbra\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Másolás &Balra\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Törlés\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Oszlopok testreszabása..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "&Jelentés generálása..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Mentés\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "&Bal oldal mentése" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "&Jobb oldal mentése" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "Nyomtatás..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Oldalbeállítás" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Nyomtatási kép" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "Sorvégek átalakítása" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "&Olvasztási mód\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "&Fájl kódolás..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Visszavonás\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Még&is\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Kivágás\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Másolás\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Beillesztés\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Keresé&s...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Csere...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Haladó" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Másolás sorszámokkal együtt\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "Könyvjelzõk" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Könyvjelzõ ki/be\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "Következõ könyvjelzõ\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Elõzõ könyvjelzõ\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "Összes könyvjelzõ törlése" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Ugrás...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Nagyítás\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Kicsinyítés\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "Pane&lek rögzítése" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "&Szóközök mutatása" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Sorok &eltérésének mutatása" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Sorszámok megjelenítése" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Margók megjelenítése" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "Sortördelés" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Panelek megcserélése" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Eltérés &panel" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "&Pozíció panel" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Másolás J&obbra és ugrás tovább\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Másolás B&alra és ugrás tovább\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "M&inden Jobbra másolása" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Mi&nden Balra másolása" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Elõvizsgáló" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Szkriptek" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "&Összehasonlítás" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&Balról Jobbra" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "B&alról..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "&Jobbról Balra" +msgid "Left to Right (%1 of %2)" +msgstr "Balról jobbra (%1 of %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "J&obbról..." +msgid "Left to... (%1 of %2)" +msgstr "Balról... (%1 of %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Áthelyezés" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&Balról..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&Jobbról..." +msgid "Right to Left (%1 of %2)" +msgstr "Jobbról balra (%1 of %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Jobbról... (%1 of %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Áthelyezés" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Törlés" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&Bal oldal" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Jobb oldal" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Mindkettõ" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Át&nevezés" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "Elemek &rejtése" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "&Bal oldal megnyitása" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "&Jobb oldal megnyitása" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "&Útvonalak másolása" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&Bal oldal (%1 ennyibõl: %2)" +msgid "Left (%1 of %2)" +msgstr "Bal (%1 ennyibõl: %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&Jobb oldal (%1 ennyibõl: %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Jobb (%1 ennyibõl: %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Mindkettõ (%1 ennyibõl: %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Mindkét oldal (%1 ennyibõl: %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "&Fájlnevek másolása" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&Bal oldal... (%1 ennyibõl: %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&Jobb oldal... (%1 ennyibõl: %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Mindkét oldal... (%1 ennyibõl: %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Eltérések... (%1 ennyibõl: %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Frissítés" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Teljes útvonal másolása" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "&Fájlnév másolása" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Elõvizsgáló Beállítások" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Nincs elõvizsgálat" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Automatikus elõvizsgálat" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Ugrás &eltérésre" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Nem mozgatott blokkok" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Minden mozgatott blokk" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "A &jelenlegi Eltérés mozgatott blokkja" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "&Szóközök" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "&Összehasonlít" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "&Változások kihagyása" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Minden kihagyása" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "&Kis-nagybetû érzékenység" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Sorvég különbségek figyelmen kívül hagyása (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Teljes tartalmak" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Átfutott tartalmak" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Módosítási dátum" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Méret" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "A WinMerge névjegye" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Privát build)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Látogasd meg a WinMerge honlapját!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "Vissza" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Közremûködõk" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Válaszd ki a fájlokat vagy könyvtárakat..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Tallózás..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "Tallóz..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "T&allózás..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Kiválasztás..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Csomagoló:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "&Kiválasztás..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Alkönyvtárakkal együtt" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Állapot:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Mégsem" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Súgó" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Összehasonlítandó fájlok vagy könyvtárak" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Adatbázis:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Felhasználó:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Jelszó:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Link a cél VSS projekthez" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Alkalmazás minden elemen" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Ellenõrzés" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Mentés másként..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Verzió Rendszer" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Verzió Rendszer:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "A &cleartool.exe elérési útvonala:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Általános" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automatikus &ugrás az elsõ eltérésre" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Ablakok bezárása az &ESC billentyûvel" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Automatikus útvonalellenõrzés a &Megnyitás ablakban" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Csak &egy példány futásának engedélyezése" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Rá&kérdezés több ablak bezárásakor" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "Fájl idõk megõrzése összehasonlításkor" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "\"Válaszd ki a fájlokat vagy könyvtárakat\" ablak induláskor" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "A WinMerge lehetõvé teszi általános üzenetablakok elrejtését. A Visszaállít gombbal minden üzenetablak újra láthatóvá tehetõ." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Visszaállít" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Keresés" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "&Szöveg:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Csak &teljes szavak mutatása" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Kis-nagybetû &érzékenység" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "&Reguláris kifejezések" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "Kere&sés" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&Rendben" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Csere" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Cs&ere erre:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "&Álljon meg a fájl végénél" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "A csere tartománya" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&Kijelölés" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "Teljes &fájl" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Csere" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "&Mindet" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Ellenõriz" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Megjegyzések" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Sorszûrõk" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Reguláris kifejezések (soronként egy):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Új" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Szerkesztés" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Eltávolítás" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Színek" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Eltérés:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Kijelölt Eltérés:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Háttér" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Törölt" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Szöveg" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Kihagyott Eltérés:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Áthelyezett:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Kijelölt áthelyezett:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Szó eltérés:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Kijelölt szó eltérés:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Alapértékek" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Rendszer" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "A törölt fájlok a &Lomtárba kerüljenek" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&Belsõ szerkesztõ:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Átmeneti fájlok könyvtára" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "A rendszer temp könyvtára" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "Egyedi könyvtár:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Patch Generátor" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Fájl&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Fájl&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "&Megfordítás" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "&Hozzáfûzés a létezõ fájlhoz" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Eredmény:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "T&allózás..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Formátum" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "St&ílus:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Környezet:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Üres sorok kihagyása" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "&Parancssor mellékelése" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Megnyitás a &Belsõ Szerkesztõvel" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Oszlopok mutatása" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Mozgatás fel" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Mozgatás le" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Kicsomagoló kiválasztása" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Fájl kicsomagoló:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Minden kicsomagoló mutatása kiterjesztéstõl függetlenül" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Kiterjesztések listája:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Leírás:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Leállítás" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Elemek összehasonlítása..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Összehasonlított elemek:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Összes elem:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Ugrás" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "U&grás:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Fájl" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Mire ugorjon:" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "&Sorra" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Eltérésre" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Ugrás" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Összehasonlítás" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Szóközök" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Összehasonlítás" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "&Változtatások kihagyása" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "&Minden kihagyása" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "&Üres sorok kihagyása" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "&Kis-nagybetû különbségek kihagyása" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Mozgatott &blokk észlelés bekapcsolása" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Szerkesztõ" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&Szintaxis kiemelés" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "&Automatikus újraolvasás" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&Eredeti újsor-karakterek megõrzése" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabulátorok" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "Tab. &mérete:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "&Tabulátorok használata" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "&Szóközök használata" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Sorok eltérésének színezése" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Sorok eltérésének mutatása" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "FájlSzûrõk" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Telepítés..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Új..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Szerkeszt..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Töröl..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Módosított fájlok mentése?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Bal oldali fájl" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Változtatások mentése" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "Változtatások &elvetése" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Jobb oldali fájl" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "V&áltoztatások mentése" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Változtatások e&lvetése" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Kódlap" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Alapértelmezett kódlap" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Válaszd ki az alapértelmezett kódlapot a nem-Unicode fájlokhoz:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "Kódlap információ detektálása ezen fájloknál: .html, .rc, .xml \nprogram újraindítás szükséges" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Rendszer kódlap" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "A Winmerge felhasználói felületéhez igazodva" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Egyedi kódlap:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Opciók" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Kategóriák" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importálás..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Exportálás..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Kérdés" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Kulcsszavak:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Függvény nevek:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Megjegyzések:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Számok:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operátorok:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Sztringek:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Elõfeldolgozó:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Felhasználó 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Felhasználó 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Félkövér" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Könyvtár összehasonítási jelentés" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Jelentés &fájl:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Tallózás..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Stílus:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "Másolás vágólapra" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Megosztott vagy saját szûrõ" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Milyen típusú szûrõt szeretnél létrehozni?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Megosztott szûrõ (a gép minden felhasználójának)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Saját szûrõ (csak a jelenlegi felhasználónak)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Archívum támogatás" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "Archív fájlok támogatásának &engedélyezése" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "Archív fájl típusának megállapítása a fájl &szignatúrája alapján" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Összehasonlítási statisztika" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Könyvtárak:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Fájlok:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Különbözõ" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Szöveg:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Bináris:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Bal:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Jobb:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Egyezõ" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Összesen:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Bezár" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Kódlap kiválasztása" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "Fájl töltése:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Fájl menté&se:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&Ugyanazon kódlap használata mindkettõhöz" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Alkalmaz" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Mégsem" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "Könyvtár neve" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Eredmény:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "Bezár" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "Egyéni szövegszínek használata" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Egyéni szövegszínek" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Szóköz, tab:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Sima szöveg:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Kijelölés:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Bal:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Csak olvasható" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Jobb:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Cs&ak olvasható" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Szûrõ:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Megnyitás..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Mentés..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Visszaállítási fájlok" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Visszaállítási fájlok készítése itt:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "&Mappa összehasonlításkor" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "&Fájl összehasonlításkor" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Visszaállítási fájlok készítése ide:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "Eredeti fájl könyvtára" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "Globális visszaállítási könyvtár:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Visszaállítási fájl neve:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr ".bak kiterjesztés hozzáfûzése" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "Idõpecsét hozzáfûzése" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Másolás megerõsítése" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Biztosan másolni szeretne XXX elemet?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Balról" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Jobbra" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Igen" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Nem" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Bõvítmények" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "Bõvítmény&ek bekapcsolása" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Intézõ" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "&Bõvített menü engedélyezése" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "Hozzáadás a helyi menühöz" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Könyvtár" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "Megállás az &elsõ különbségnél" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "3 másodperc alatti idõkülönbségek mellõzése" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Bináris" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "040E04e2" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x040E, 1250" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "ÁTÍR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Ismeretlen hiba a projekt fájl megnyitásakor" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Ismeretlen hiba a projekt fájl mentésekor" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Projekt fájl" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Projekt fájl sikeresen betöltve." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Projekt fájl sikeresen elmentve." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Leállít" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Ismét" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Kihagy" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Kihagy M&indent" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Igen" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Igen &mindenre" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Nem" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Nem m&indenre" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Folytatás" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Kihagy" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Kihagy &mindent" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "&Ne jelenjen meg többet ez az üzenet." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "&Ne jelenjen meg többet ez a kérdés." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Verzió Kontroll" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Eltérések" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Balról:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Jobbra:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Jobbról:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Jobbra:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Verzió %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Opciók (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Minden üzenet ezentúl újra megjelenik." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3130,84 +3193,84 @@ msgid "" "Please use values 1 - %1." msgstr "" -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Megnyitás" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programok|*.exe;*.bat;*.cmd|Minden fájl (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Minden fájl (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projekt Fájlok (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Név" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Hely" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Szûrõk" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Leírás" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Válassz fájlnevet az új szûrõhöz" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Fájl szûrõk (*.flt)|*.flt|Minden fájl (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3216,7 +3279,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3225,7 +3288,7 @@ msgid "" "Please make sure the folder exists and is writable." msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3233,7 +3296,7 @@ msgid "" "Please select filter folder in Options/System." msgstr "" -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3242,12 +3305,12 @@ msgid "" "Maybe the file is read-only?" msgstr "" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3255,188 +3318,188 @@ msgid "" "Could not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Reguláris kifejezés" -#: Merge.rc:2151 +#: Merge.rc:2172 #, 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:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Könyvtár összehasonlítási eredmények" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Fájl összehasonlítás" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Névtelen bal oldal" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Névtelen jobb oldal" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Sor: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Olvasztás" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Ennyi különség: %1 ennyibõl: %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 különbséget találtam" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 különbséget találtam" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "%1 elem ennyibõl: %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "%1 elem" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Válassz ki két összehasonlítandó fájlt vagy könyvtárat" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Könytár kiválasztás" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Válassz ki két összehasonlítandó fájlt vagy könyvtárat." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "A bal oldali elérési út érvénytelen!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "A jobb oldali elérési út érvénytelen!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Mindkét elérési út érvénytelen!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Válassz ki két fájlt a kicsomagoló kijelöléshez." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Nem lehet fájlt könyvtárral összehasonlítani!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Ez a fájl nem található: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "A fájl nincs kicsomagolva: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3449,37 +3512,37 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Hiba a konfliktusfájl értelmezésekor." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "A fájl\n%1\nnem egy konfliktus fájl." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Mentés másként" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Mentsem a változtatásokat %1 néven?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "Ez a fájl: %1 csak olvasható. Szeretnéd ezt megváltoztatni? (Kattints a Nem gombra a fájl új néven való mentéséhez.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Hiba a fájl biztonsági másolatának készítésekor" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3492,7 +3555,7 @@ msgstr "" "\n" "Folytatni akarod?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3509,7 +3572,7 @@ msgstr "" "\t-másik fájlnév választása (Ok)\n" "\t-a jelenlegi folyamat megszakítása (Mégsem)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3524,7 +3587,7 @@ msgstr "" "\n" "Szeretnéd menteni a kicsomagolt változatot egy másik fájlba?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3539,7 +3602,7 @@ msgstr "" "\n" "Szeretnéd menteni a kicsomagolt változatot egy másik fájlba?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3554,7 +3617,7 @@ msgstr "" "\n" "Felülírjuk a megváltoztatott fájlt?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3563,32 +3626,32 @@ msgstr "" "%1\n" "csak olvasható. Szeretnéd ezt megváltoztatni?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, 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 "Egy másik alkalmazás módosította a fájlt\n%1\nmióta a WinMerge utoljára vizsgálta.\n\nSzeretné újra betölteni a fájlt?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Bal oldali fájl mentése más néven" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Jobb oldali fájl mentése más néven" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "A fájl\n%1\neltûnt. A folytatáshoz mentse el a fájlt." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3599,42 +3662,42 @@ msgstr "" "\n" "Frissítsd a dokumentumokat, mielõtt folytatnád." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Meg kell adnod a SourceSafe projekt elérési útvonalát a folytatáshoz (pl.: $/MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Fájlok ellenõrzése VSS-bõl..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "A Verzió Rendszer hibát adott vissza a fájl ellenõrzése közben. Nem lehet folytatni..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Hiba a Verzió Rendszer futtatása közben." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "A VSS Munka Könyvtár és a jelenlegi fájl útvonala nem egyezik. Folytassuk?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Nem található VSS adatbázis!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Hiba a VSS-bõl:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3642,134 +3705,153 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" " Please, check config spec of used view. " msgstr "" -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (régebbi mint 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 vagy újabb)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Megállás szóközöknél" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Megállás szóközöknél vagy írásjeleknél" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Jobbról balra (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Balról jobbra (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Jobbról balra (%1 of %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Balról jobbra (%1 of %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Balról jobbra (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Balról... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Jobbról... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Balról... (%1 of %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Jobbról... (%1 of %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Bal (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Jobb (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Mindkettõ (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Bal (%1 ennyibõl: %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Jobb (%1 ennyibõl: %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Mindkettõ (%1 ennyibõl: %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Bal oldal - válassz úticél mappát:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Jobb oldal - válassz úticél mappát:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3780,17 +3862,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3802,502 +3884,502 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Mozgatás megerõsítése" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nem sikerült elindítani a külsõ szerkesztõt: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Ismeretlen archívum formátum" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Fájlnév" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Összehasonlítási eredmények" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Bal oldali dátum" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Jobb oldali dátum" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Kiterjesztés" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Bal oldali méret" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Jobb oldali méret" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Bal oldali létrehozási idõ" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Jobb oldali létrehozási idõ" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Újabb fájl" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Bal oldali fájl verzió" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Jobb oldali fájl verzió" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Rövid eredmények" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Bal oldali attribútumok" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Jobb oldali attribútumok" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Bal oldali kódolás" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Jobb oldali kódolás" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Nem lehett összehasonlítani a fájlokat" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "A fájl kihagyva" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "A könyvtár kihagyva" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Csak bal: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Csak jobb: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "A bináris fájlok megegyezõek" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "A bináris fájlok különbözõek" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "A fájlok különbözõek" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "A könyvtárak különböznek" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Csak bal oldal" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Csak jobb oldal" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Hiba" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "A szövegfájlok megegyeznek" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "A szövegfájlok különböznek" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Eltelt idõ: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 elem kiválasztva" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 elem kiválasztva" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "fájlnév vagy könyvtárnév." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Alkönyvtár neve ha az alkönyvtárak is ki vannak választva." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Összehasonlítási eredmény bõvebb formában." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Bal oldali módosítási dátum." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Jobb oldali módosítási dátum." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Fájlok kiterjesztése." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Bal oldali fájl mérete bájtokban." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Jobb oldali fájl mérete bájtokban." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Bal oldal létrehozási ideje." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Jobb oldal létrehozási ideje." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Megmutatja, melyik oldalnak újabb a létrehozási dátuma." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Bal oldali fájl verziója, csak bizonyos fájloknál." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Jobb oldali fájl verziója, csak bizonyos fájloknál." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Rövid összehasonlítási eredmények." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Bal oldali attribútumok." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Jobb oldali attribútumok." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Bal oldali kódolás." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Jobb oldali kódolás." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Mellõzött különbségek száma a fájlban. Ezeket a különbségeket a WinMerge mellõzte és nem olvaszthatók." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Különbségek száma a fájlban. Ez a szám nem tartalmazza a mellõzött különbségeket." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "(*) látható, ha a fájl bináris." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "%1 összehasonlítása ezzel: %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Vesszõvel elválasztott lista" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Tabulált lista" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Egyszerû HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Egyszerû XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "A jelentés fájl már létezik. Szeretnéd felülírni a létezõ fájlt?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4306,32 +4388,32 @@ msgstr "" "Hiba a jelentés készítése közben:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "A jelentés sikeresen elkészült." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Ugyanaz a fájl van megnyitva mindkét panelen." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "A kijelölt fájlok ugyanazok." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Hiba történt a fájlok összehasonlításakor." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Nem lehetett létrehozni az ideiglenes fájlokat. Ellenõrizd az ideiglenes könyvtár beállításait." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4346,22 +4428,22 @@ msgstr "" "\n" "Megjegyzés: Amennyiben minden esetben ezt az opciót szeretnéd használni, kapcsold be a 'Sortörési eltérések kihagyása' opciót az Összehasonlítás menüpontban (a Szerkesztés/Opciók menüpont alatt találod meg)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4372,152 +4454,152 @@ msgstr "" "A különbözõ kódlapokkal történõ kijelzés könnyebben áttekinthetõ de az olvasztás/törlés kockázatos lehet.\n" "Would you like to treat both files as being in the default windows codepage (recommended)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Nincs eltérés" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Sor eltérés" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Cserélve lett %1 sztring." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nem található ez: \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "A Patch fájl sikeresen elkészült." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "Az 1. elem nem található vagy az egy könyvtár!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "A 2. elem nem található vagy az egy könyvtár!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "A patch fájl már létezik. Szeretnéd felülírni azt?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 kijelölt fájl]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normál" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Környezeti" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Egységesített" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Nem lehetett ebbe a fájlba írni: %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "A megadott kimeneti útvonal nem abszolút elérési út: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Adj meg egy kimeneti fájlt" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nem lehet patch fájlt létrehozni bináris fájlokból." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nem lehet patch fájlt létrehozni könyvtárakból." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4528,12 +4610,12 @@ msgstr "" "\n" "A patch létrehozásához elengedhetetlen, hogy ne legyenek el nem mentett változtatások a fájlokban." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "A mappa nem létezik." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4544,37 +4626,37 @@ msgstr "" "Az ehhez szükséges összetevõk (7-zip és/vagy Merge7z*.dll) nem találhatóak.\n" "Olvasd el a kézikönyv archívum támogatásról szóló részét." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4585,247 +4667,247 @@ msgstr "" "\n" "Biztosan folytatja?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "A választott kicsomagoló lesz használva mindkét fájlnál (az egyik fájlnak csak a kiterjesztése lényeges)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Nincs elõvizsgálat (normális)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Javasolt bõvítmények" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Egyéb bõvítmények" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Bõvítmény beállítások" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "A WSH nem található - Az .sct szkriptek le lesznek tiltva" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "&Ugrás a(z) %1. sorra" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po index afbac4a22..a5bba1221 100644 --- a/Translations/WinMerge/Italian.po +++ b/Translations/WinMerge/Italian.po @@ -78,7 +78,7 @@ msgid "Cu&t" msgstr "&Taglia" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "C&opia" @@ -89,7 +89,7 @@ msgid "&Paste" msgstr "I&ncolla" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&Vai a..." @@ -100,22 +100,25 @@ msgid "Op&en" msgstr "&Apri" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "con l'applicazione ®istrata" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "con l'editor &esterno" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&con..." @@ -153,7 +156,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "" @@ -165,8 +168,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Nessuna" @@ -183,49 +186,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&File" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Nuovo\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Apri...\tCtrl+A" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Apr&i file conflittuale..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Apri pro&getto...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Sal&va progetto..." @@ -237,274 +240,274 @@ msgstr "Progetti recenti" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Vuoto >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "&Esci" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Modifica" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "Op&zioni" #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Visualizza" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "Barra degli s&trumenti" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Piccola" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Grande" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "&Barra di stato" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "&Barra delle schede" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Strumenti" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filtri..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Crea patch..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Plugin" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "Scompattazione &manuale" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "Scompattazione &automatica" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Ricarica plugin" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "Fi&nestra" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Chiudi" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Chiudi &tutto" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Cambia &pannello\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Affianca &orizzontalmente" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Affianca &verticalmente" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Sovrapponi" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&?" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "Guida &WinMerge\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "C&onfigurazione" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "Infor&mazioni su WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Fil&e di sinistra di Sola lettura" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "F&ile di destra di Sola lettura" @@ -515,7 +518,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Se&leziona tutto\tCtrl+A" @@ -537,2441 +540,2501 @@ msgstr "Mostra elementi unici di &sinistra" #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostra elementi unici di &destra" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Mostra elementi sa<ati" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Mostra i file &binari" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "M&ostra elementi nascosti" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "&Carattere..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "&Utilizza carattere predefinito" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Statistic&he del confronto" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "A&ggiorna\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Aggio&rna selezionati\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Unisci" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&nfronta\tInvio" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Differenza successiva\tAlt+Su" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Di&fferenza precedente\tAlt+Giù" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Prima differen&za\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Differenza &corrente\tAlt+Invio" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Ultima differenza\tAlt+Fine" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "C&opia a destra\tAlt+Destra" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Co&pia a sinistra\tAlt+Sinistra" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Elimina\tCanc" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Personalizza colonne..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Genera &rapporto..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Salva\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Sa&lva sinistro" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Salva dest&ro" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "Stam&pa..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Impos&ta pagina..." -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Anteprima &di stampa" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Converti caratteri di fine linea a" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "&Modalità 'Unione'\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "Codifica &file..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Annulla\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Ripristina\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Taglia\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "C&opia\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "I&ncolla\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Seleziona &differenze nella riga\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Tro&va...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Sostit&uisci...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Avanzat&e" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copia con numeri di linea\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "Segnali&bri" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Imposta segnalibro\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "Segnalibro successi&vo\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Segnalibro precedente\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Cancella tutti i segnalibri" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Va&i a...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "&Ingrandisci\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Rid&uci\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normale\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Evidenziazione sintassi" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "B&locca pannelli" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "&Visualizza spazi bianchi" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Visualizza &differenze nelle linee" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Mostra i &numeri delle righe" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Visualizza &margini" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "A capo a&utomatico" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Sc&ambia pannelli" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "&Pannello delle differenze" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Pannello della loca&zione" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Copia a des&tra e avanza\tAlt+Ctrl+Destra" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copia &a sinistra e avanza\tAlt+Ctrl+Sinistra" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Cop&ia tutto a destra" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "C&opia tutto a sinistra" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Script" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "&Confronta" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "Da &Sinistra a Destra" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "Si&nistra in..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "Da &Destra a Sinistra" +msgid "Left to Right (%1 of %2)" +msgstr "Da Sinistra a Destra (%1 su %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "Destra &in..." +msgid "Left to... (%1 of %2)" +msgstr "Sinistra in... (%1 su %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Sposta" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "Si&nistra in..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "Destra &in..." +msgid "Right to Left (%1 of %2)" +msgstr "Da Destra a Sinistra (%1 su %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Destra in... (%1 su %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Sposta" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Elimina" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&Sinistra" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Destra" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Entrambi" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "&Rinomina" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Nascondi elementi" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "Apri &file di sinistra" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "A&pri file di destra" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Cop&ia percorsi" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&Sinistra (%1 su %2)" +msgid "Left (%1 of %2)" +msgstr "Sinistra (%1 su %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&Destra (%1 su %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Destra (%1 su %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Entrambi (%1 su %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Entrambi (%1 su %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Copia nomi dei fi&le" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Zippa" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&Sinistra... (%1 su %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&Destra... (%1 su %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Entrambi... (%1 su %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "Di&fferenze... (%1 su %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "A&ggiorna" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "Copia &percorso completo" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Copia nome del &file" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Impostazioni Prediffer" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&No prediffer" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Prediffer &automatico" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Vai alla &differenza" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Nessun blocco spostato" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Tutti i blocchi spostati" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Blocchi spostati per la differenza &corrente" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "Spa&zi bianchi" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Conf&ronta" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "Ignora ca&mbiamenti" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Ig&nora tutto" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "&Maiuscolo/Minuscolo" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "I&gnora differenze nei fine riga (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Contenuti completi" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Contenuti rapidi" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Data ultima modifica" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Data ultima modifica e dimens." -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Dimensioni" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Informazioni su WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Build Privata)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visita la pagina web di WinMerge!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Hanno contribuito" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Seleziona i file o le cartelle" -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "S&foglia..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "&Sfoglia..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Sf&oglia..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "S&eleziona..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "Scompa&ttatore:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "Sele&ziona..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Includi sottocartelle" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Stato:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Annulla" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Aiuto" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "File o cartelle da confrontare" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Database:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Progetto:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Utente:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Password:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Collegamento al progetto VSS di destinazione" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Applica a tutte le voci" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Estrai" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Salva con nome..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Sistema per il versioning" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "Sistema per il &versioning" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Percorso di cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Generale" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "&Visualizza automaticamente la prima differenza" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "C&hiudi finestra con ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verifica &automaticamente i percorsi nella finestra Apri" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "&Permetti l'esecuzione di un'unica istanza del programma" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Domanda alla c&hiusura di più finestre" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "&Preserva orario del file durante il confronto" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Completamento automatico nella scelta dei file:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge ti permette di nascondere alcuni messaggi comuni. Premi il pulsante Ripristina per rendere di nuovo visibili tutti i messaggi." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Ripristina" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Trova" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "Tro&va:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Solo &parole intere" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "&Maiuscolo/Minuscolo" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "&Espressione regolare" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "&Fermati alla fine del file" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Trova succ." -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Sostituisci" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Sostituisci &con:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "&Fermati alla fine del file" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Sostituisci in" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "Sele&zione" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "T&utto il file" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Sostituisci" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Sost&ituisci tutto" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Estrai" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Commenti" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Reinserisci dopo l'estrazione" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Filtri di linee" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Attiva i filtri di linee" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Espressioni regolari (una per riga):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Nuovo" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Modifica" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Rimuovi" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Colori" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Differenza:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Differenza selezionata:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Sfondo" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Eliminata" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Testo" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Differenza ignorata:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Spostata:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Spostata selezionata:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Differenza di parole:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Diff. parole selezionata:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Predefinito" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Posiziona i file eliminati nel cestino" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&Editor esterno:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "Cartella dei &filtri:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Cartella file temporanei" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "Cartella temporanea di s&istema" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "Cartella &utente:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Creatore di patch" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "File&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "File&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "&Scambia" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "&Appendi a un file esistente" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "Ris&ultato:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Sf&oglia..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "Sti&le:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Contesto:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ignora lin&ee vuote" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Includi &linea di comando" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Apri in un e&ditor esterno" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Scelta delle colonne" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Sposta in &alto" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Sposta in &basso" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Seleziona scompattatore" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Scompattatore di file:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Visualizza tutti gli scompattatori, non verificare l'estensione" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Lista delle estensioni:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Descrizione:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Stop" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Confronto in corso..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Elementi confrontati:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Totale elementi:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Vai a" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "Va&i a:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "File" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Vai a ..." -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "Li&nea" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "Di&fferenza" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Vai" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Confronto" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Spazi bianchi" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Confronta" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "&Ignora cambiamenti" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "I&gnora tutto" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ign&ora le linee vuote" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Ig&nora le differenze tra maiuscole e minuscole" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Attiva il rilevamento di blocc&hi spostati" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "&Metti in corrispondenza linee simili" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Filtra i commenti" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "Evidenzia sintassi" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "Riscansiona &automaticamente" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&Conserva i caratteri originali di fine riga" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabulazioni" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Dimensioni:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "&Inserisci tabulazioni" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "In&serisci spazi" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Colorazione delle differenze di linea" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Mostra differenze di linea" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "Livello &caratteri" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "Livello &parole:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Filtri di file" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Prova" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Installa..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Nuovo..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Modifica..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Elimina..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Salvare i file modificati?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "File sul lato sinistro" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Salva le modifiche" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "S&carta le modifiche" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "File sul lato destro" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "S&alva le modifiche" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Sca&rta le modifiche" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Codice di pagina" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Codice di pagina predefinito" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Scegli il codice di pagina predefinito assegnato al caricamento di file non-Unicode:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Codice di pagina del sistema" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "In accordo con l'interfaccia di WinMerge" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Opzioni" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Categorie" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importa..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Esporta..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Finestra di dialogo" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Parole chiave:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Nomi funzioni:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Commenti:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Numeri:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operatori:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Stringhe:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Preprocessore:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Utente 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Utente 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Grassetto" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Rapporto sul confronto tra cartelle" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "&File di rapporto:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Sfoglia..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Stile:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Copia negli appunti" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Filtro privato o condiviso" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Che genere di filtro desideri creare?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro condiviso (per tutti gli utenti su questa macchina)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro privato (solo per l'utente corrente)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Supporto per gli archivi" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Attiva il supporto per i file di archivio" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Rileva il tipo di archivio dalla firma del file" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Statistiche del confronto" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Cartelle:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "File:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Diversi" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Testo:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binari:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Unici" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Sinistra:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Destra:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Identici" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Totale:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Chiudi" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Coinvolge" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Coinvolge)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Scegli codice di pagina per" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "Caricamento &file:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "&Salvataggio file:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&Usa lo stesso codice di pagina per entrambi" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Applica" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "Annu&lla" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Prova del filtro" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Filtro in prova ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Inserisci testo di prova:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Nome cartella" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Risultato:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Prova" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Chiudi" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&Utilizza colori personalizzati per il testo" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Colori personalizzati per il testo" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Spazi bianchi:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Testo normale:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Selezione:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Percorsi" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Sinistra:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Sola &lettura" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Destra:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Sola lett&ura" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filtro:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Apri..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Salva..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "File di backup" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Crea copie dei file per:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Confron&to di cartelle" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Confronto di &file" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Crea le copie dei file in:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "Cartella &originaria del file" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "Cartella &globale di backup:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Nome della copia:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&Aggiungi l'estensione .bak" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "Aggiungi il ×tamp" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Conferma la copia" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Sei sicuro di voler copiare XXX elementi?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Da sinistra" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "A destra" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Sì" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "No" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Atti&va menu avanzato" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Cartella" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "&Fermati dopo la prima differenza" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignora differenze di tempo inferiori a 3 secondi" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binario" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "041004e4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x410, 1252" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EST" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "MA" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "BS" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "SSC" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REG" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Errore sconosciuto provando a aprire il file di progetto" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Errore sconosciuto provando a salvare il file di progetto" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "File di progetto" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "File di progetto caricato con successo." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "File di progetto salvato con successo." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2990,7 +3053,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge File Compare" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3002,7 +3065,7 @@ msgid "" "WinMerge Folder Compare" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3011,143 +3074,143 @@ msgstr "" "Sviluppatori:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 viene fornito ASSOLUTAMENTE PRIVO DI GARANZIA. Questo è uin software gratuito e ne è apprezzata la ridistribuzione a determinate condizioni; per dettagli, vedere la GNU General Public License nel menu Guida." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Termina" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Riprova" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Ignora" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Ignora t&utto" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Sì" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Sì a &tutto" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&No" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "No a t&utto" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Continua" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Salta" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "S&alta tutto" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Non visualizzare questo &messaggio di nuovo." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Non farmi più &questa domanda." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Controllo versioni" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Differenze" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "A:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Da sinistra:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "A sinistra:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Da destra:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "A destra:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Versione %1 - Italiano" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Opzioni (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Tutti i messaggi di avviso vengono ora visualizzati nuovamente." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3158,84 +3221,84 @@ msgstr "" "\n" "Utilizza per favore un valore compreso tra 1 e %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Apri" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmi|*.exe;*.bat;*.cmd|Tutti i file (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Tutti i file (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "File di progetto di WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "File delle opzioni (*.ini)|*.ini|Tutti i file (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "File di testo (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tutti i file (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "File HTML (*.htm,*.html)|*.htm;*.html|Tutti i file (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "File XML (*.xml)|*.xml|Tutti i file (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Percorso" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filtri" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Descrizione" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Inserisci il nome del file per il nuovo filtro" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtri di file (*.flt)|*.flt|Tutti i file (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3248,7 +3311,7 @@ msgstr "" "Copia per favore il file %1 nella cartella WinMerge/Filters :\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3261,7 +3324,7 @@ msgstr "" "\n" "Assicurati che questa cartella esista e si abbiano i permessi di scrittura." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3272,7 +3335,7 @@ msgstr "" "\n" "Scegli per favore una cartella per i filtri in Opzioni->Sistema." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3285,12 +3348,12 @@ msgstr "" "\n" "Il file potrebbe essere di sola lettura." -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Scegli il file con il filtro da installare" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3301,188 +3364,188 @@ msgstr "" "\n" "Impossibile copiare il nuovo file nella cartella dei filtri." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Il file del filtro esiste già. Desideri sovrascrivere il file esistente?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Espressione regolare" -#: Merge.rc:2151 +#: Merge.rc:2172 #, 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:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Risultati del confronto tra cartelle" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Confronto tra file" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "File di sinistra senza titolo" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "File di destra senza titolo" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Loro file" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Miei file" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Linea: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Unione" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Differenza %1 su %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 differenze trovate" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 differenza trovata" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "SL" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Elemento %1 su %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Elementi: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Seleziona due cartelle o file esistenti da confrontare" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Selezione cartella" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Seleziona due cartelle o due file da confrontare." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Il percorso di sinistra non è valido!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Il percorso di destra non è valido!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Entrambi i percorsi non sono validi!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Seleziona due file per attivare la selezione dello scompattatore." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Impossibile confrontare file e cartelle!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "File non trovato: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "File non scompattato: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3495,12 +3558,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3511,27 +3574,27 @@ msgstr "" "%1\n" "non è un file di conflitto." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Salva con nome" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Vuoi salvare le modifiche in %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 è marcato come di sola lettura. Desideri non tenere conto di questa impostazione? (Premi No per salvare con un nuovo nome.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Errore durante il salvataggio di una copia di backup del file" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3544,7 +3607,7 @@ msgstr "" "\n" "Continuare comunque?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3561,7 +3624,7 @@ msgstr "" "\t-utilizzare un nome diverso per il file (Premi OK)\n" "\t-annullare l'operazione corrente (Premi Annulla)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3576,7 +3639,7 @@ msgstr "" "\n" "Desideri salvare la versione non compattata in un altro file?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3591,7 +3654,7 @@ msgstr "" "\n" "Desideri salvare la versione non compattata in un altro file?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3606,7 +3669,7 @@ msgstr "" "\n" "Sovrascrivere il file modificato?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3615,32 +3678,32 @@ msgstr "" "%1\n" "è marcato come di sola lettura. Desideri non tenere conto della voce di Sola lettura?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, 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:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Salva il file di sinistra con nome" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Salva il file di destra con nome" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3651,42 +3714,42 @@ msgstr "" "\n" "Aggiorna i documenti prima di continuare." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "E' necessario specificare il percorso di un progetto SourceSafe per continuare (Es.: $/MioProgetto)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Estrazione dei file da VSS in corso..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "SourceSafe ha generato un errore tentando di estrarre il file. Impossibile continuare..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Errore nell'esecuzione di un comando del sistema di versioning." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "La cartella di lavoro di VSS e la posizione del file corrente non coincidono. Continuare?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Nessun database di VSS trovato!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Errore di VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3697,7 +3760,7 @@ msgstr "" " Controlla per favore la configurazione della vista utilizzata.\n" " Annullare l'operazione di estrazione?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3706,127 +3769,146 @@ msgstr "" "Il sistema di versioning ha restituito un errore tentando di annullare l'estrazione del file.\n" " Controlla per favore la configurazione della vista utilizzata." -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Nessuno" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (precedente a 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e superiore)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Interrompi agli spazi bianchi" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Interrompi agli spazi bianchi o punteggiatura" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Da Destra a Sinistra (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Da Sinistra a Destra (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Da Destra a Sinistra (%1 su %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Da Sinistra a Destra (%1 su %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Da Sinistra a Destra (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Sinistra in... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Destra in... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Sinistra in... (%1 su %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Destra in... (%1 su %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Sinistra (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Destra (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Entrambi (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Sinistra (%1 su %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Destra (%1 su %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Entrambi (%1 su %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Lato sinistro - scegli cartella di destinazione:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Lato destro - scegli cartella di destinazione:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 file coinvolti)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 file su %2 coinvolti)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3837,17 +3919,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Sei sicuro di voler copiare:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Sei sicuro di voler copiare %d elementi:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3866,502 +3948,502 @@ msgstr "" "\n" "Aggiorna per favore il confronto." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Impossibile lanciare l'editor esterno: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Formato dell'archivio sconosciuto" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Nome del file" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Risultato del confronto" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Data file di sinistra" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Data file di destra" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Estensione" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Dimensioni file di sinistra" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Dimensioni file di destra" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Dim. file destra (breve)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Dim. file destra (breve)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Data creazione file sinistra" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Data creazione file destra" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "File più recente" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Versione file sinistra" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Versione file destra" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Risultato breve" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Attributi sinistra" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Attributi destra" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "EOL di sinistra" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "EOL di destra" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Codifica di sinistra" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Codifica di destra" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Diff. ignorate" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Impossibile confrontare i file" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Elemento annullato" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "File saltato" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Cartella saltata" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Solo sinistra: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Solo destra: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "I file binari sono identici" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "I file non di testo contengono delle differenze" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "I file contengono delle differenze" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Solo a sinistra" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Solo a destra" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Errore" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo trascorso: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 elemento selezionato" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 elementi selezionati" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Nome del file o della cartella." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome della sottocartella quando le sottocartelle sono incluse." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Risultato del confronto nella forma completa." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Data ultima modifica del file di sinistra." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Data ultima modifica del file di destra." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Estensione del file." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Dimensioni del file di sinistra in byte." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Dimensioni del file di destra in byte." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Dimensioni abbreviate del file di sinistra." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Dimensioni abbreviate del file di destra." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Data e ora di creazione del file di sinistra." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Data e ora di creazione del file di destra." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Mostra quale file ha la data dell'ultima modifica più recente." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versione del file di sinistra, solo per alcuni tipi di file." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versione del file di destra, solo per alcuni tipi di file." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Risultato del confronto nella forma breve." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Attributi del file di sinistra." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Attributi del file di destra." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Tipo di fine linea nel file di sinistra" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Tipo di fine linea nel file di destra" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Codifica del file di sinistra." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Codifica del file di destra." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Numero di differenze ignorate nel file. Queste differenze sono ignorate da WinMerge e non possono venire unite." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Numero di differenze nel file. Questo numero non include le differenze ignorate." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostra un asterisco (*) se il file è binario." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Confronto di %1 con %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Lista separata da virgole" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Lista separata da Tab" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "HTML semplice" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "XML semplice" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Il file di rapporto esiste già. Vuoi sovrascrivere il file esistente?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4370,32 +4452,32 @@ msgstr "" "Errore nella creazione del rapporto:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Il rapporto è stato creato con successo." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Lo stesso file è aperto in entrambi i pannelli." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "I file selezionati sono identici." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Si è verificato un errore durante il confronto dei file." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Impossibile creare file temporanei. Controlla le impostazioni del percorso per i file temporanei." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4410,17 +4492,17 @@ msgstr "" "\n" "Nota: Se vuoi sempre trattare tutti i tipi di carriage return come equivalenti, imposta l'opzione 'Ignora le differenze di carriage return' nella linguetta Confronto delle Opzioni (raggiungibile dal menu Modifica->Opzioni)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "La cartella selezionata non è valida." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Impossibile aprire il file binario nell'editor." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4435,7 +4517,7 @@ msgstr "" "%1\n" "dall'altro lato ed aprirle entrambe?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4446,152 +4528,152 @@ msgstr "" "La visualizzazione di ciascun file con il proprio codice di pagina fornirà una migliore visualizzazione ma l'unione/copia sarà pericolosa.\n" "Desideri trattare entrambi i file come se avessero il codice di pagina predefinito di Windows (raccomandato)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informazioni perse a causa di errori nella codifica: entrambi i file" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Nessuna differenza" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Differenza della linea" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 stringhe sostituite." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Impossibile trovare la stringa '%s'" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Pannello della locazione" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Pannello delle differenze" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "File di patch scritto con successo." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "Prima voce non trovata o è una cartella!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "Seconda voce non trovata o è una cartella!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Il file di patch esiste già. Desideri sovrascriverlo?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 file selezionati]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normale" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Contesto" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Unificato" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Impossibile scrivere nel file %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Il percorso di output specificato non è un percorso assoluto: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Specifica un file di output" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Impossibile creare un file di patch da file binari." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Impossibile creare un file di patch da cartelle." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4602,12 +4684,12 @@ msgstr "" "\n" "La creazione di una patch richiede che non ci siano cambiamenti non salvati nei file." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "La cartella non esiste." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4618,37 +4700,37 @@ msgstr "" "Nessuno dei componenti necessari (7-zip e/o Merge7z*.dll) per il supporto sono stati trovati.\n" "Guarda il manuale per ulteriori informazioni sugli archivi e come attivare il supporto per essi." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Scegli file per l'esportazione" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Scegli file per l'importazione" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Opzioni importate dal file." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Opzioni esportate nel file." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Impossibile importare le opzioni dal file." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Impossibile esportare le opzioni nel file." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4659,247 +4741,247 @@ msgstr "" "\n" "Sei sicuro di voler proseguire?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Mescolato" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Lo scompattatore adatto è applicato a entrambi i file (è sufficiente che uno dei file abbia l'estensione)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "No prediffer (normale)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Plugin suggeriti" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Altri plugin" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Build privata: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Impostazioni plugin" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH non trovato - script .sct disattivati" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "Vai alla &linea %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Disattivato" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Dal file system" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Dalla lista dei file recenti" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Oggetto portabile" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Risorse" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po index 7913d4f11..a5c87f68f 100644 --- a/Translations/WinMerge/Japanese.po +++ b/Translations/WinMerge/Japanese.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2015-03-29 16:00+0900\n" +"PO-Revision-Date: 2015-09-06 23:41+0900\n" "Last-Tranuslator: Takashi Sawanaka \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -79,7 +79,7 @@ msgid "Cu&t" msgstr "Ø‚èŽæ‚è(&T)" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "ƒRƒs[(&C)" @@ -90,7 +90,7 @@ msgid "&Paste" msgstr "“\‚è•t‚¯(&P)" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "ˆÚ“®(&G)..." @@ -101,22 +101,25 @@ msgid "Op&en" msgstr "ŠJ‚­(&E)" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "“o˜^‚³‚ꂽƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚Å(&R)" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "ŠO•”ƒGƒfƒBƒ^‚Å(&E)" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "ƒvƒƒOƒ‰ƒ€‚Ì‘I‘ð(&W)..." @@ -154,7 +157,7 @@ msgid "&Active Pane" msgstr "‘I‘ðƒyƒCƒ“(&A)" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "Šg‘å(&Z)" @@ -166,8 +169,8 @@ msgstr " #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "‚È‚µ(&N)" @@ -184,49 +187,49 @@ msgstr " #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "ƒtƒ@ƒCƒ‹(&F)" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "V‹Kì¬(&N)\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "V‹Kì¬(&3ƒyƒCƒ“)" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "ŠJ‚­(&O)...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "ƒRƒ“ƒtƒŠƒNƒgƒtƒ@ƒCƒ‹‚ðŠJ‚­(&E)..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "ƒvƒƒWƒFƒNƒg‚ðŠJ‚­(&J)...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "ƒvƒƒWƒFƒNƒg‚ð•Û‘¶(&V)..." @@ -238,274 +241,274 @@ msgstr " #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "Å‹ßŽg—p‚µ‚½ƒtƒ@ƒCƒ‹‚Ü‚½‚̓tƒHƒ‹ƒ_(&I)" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< ‚È‚µ >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "I—¹(&X)" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "•ÒW(&E)" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "Ý’è(&O)..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "•\Ž¦(&V)" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "ƒc[ƒ‹ƒo[(&T)" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "¬(&S)" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "‘å(&B)" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "ƒXƒe[ƒ^ƒXƒo[(&S)" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "ƒ^ƒuƒo[(&B)" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "ƒc[ƒ‹(&T)" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "ƒtƒBƒ‹ƒ^(&F)..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "ƒpƒbƒ`‚̐¶¬(&G)..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "ƒvƒ‰ƒOƒCƒ“(&P)" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "ƒvƒ‰ƒOƒCƒ“‚̐ݒè(&L)..." #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "Žè“®”äŠr‘Oˆ—(&N)" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "Ž©“®”äŠr‘Oˆ—(&U)" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "Žè“®“WŠJ" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "Ž©“®“WŠJ" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "“WŠJƒvƒ‰ƒOƒCƒ“‚ÅŠJ‚­(&E)..." #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "ƒvƒ‰ƒOƒCƒ“‚̍ēǍž‚Ý(&R)" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "ƒEƒBƒ“ƒhƒE(&W)" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "•Â‚¶‚é(&O)\tCtrl+W" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "‘S‚ĕ‚¶‚é(&S)" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "ƒyƒCƒ“‚ð•ÏX‚·‚é(&P)\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "ã‰º‚É•À‚ׂĕ\Ž¦(&H)" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "¶‰E‚É•À‚ׂĕ\Ž¦(&V)" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "d‚Ë‚Ä•\Ž¦(&C)" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "ƒwƒ‹ƒv(&H)" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge ƒwƒ‹ƒv\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "XV‚ðŠm”F(&C)" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "Ý’è(&O)" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "WinMerge‚ɂ‚¢‚Ä(&A)..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "“Ç‚ÝŽæ‚èê—p(&R)" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "¶‘¤‚ð“Ç‚ÝŽæ‚èê—p(&E)" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "’†‰›‚ð“Ç‚ÝŽæ‚èê—p(&I)" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "‰E‘¤‚ð“Ç‚ÝŽæ‚èê—p(&G)" @@ -516,7 +519,7 @@ msgid "File En&coding..." msgstr "ƒtƒ@ƒCƒ‹ƒGƒ“ƒR[ƒfƒBƒ“ƒO(&E)..." #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "‚·‚ׂđI‘ð(&A)\tCtrl+A" @@ -538,1091 +541,1157 @@ msgstr " #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "’†‰›‚Ì‚Ý‚É‘¶Ý‚·‚鍀–Ú‚Ì•\Ž¦(&L)" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "‰E‚Ì‚Ý‚É‘¶Ý‚·‚鍀–Ú‚Ì•\Ž¦(&G)" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "ƒXƒLƒbƒv‚³‚ꂽ€–Ú‚Ì•\Ž¦(&K)" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚Ì•\Ž¦(&H)" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "”ñ•\Ž¦‚̍€–Ú‚ð•\Ž¦(&E)" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "ƒcƒŠ[•\Ž¦(&M)" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "‚·‚ׂẴTƒuƒtƒHƒ‹ƒ_‚ð“WŠJ‚·‚é(&X)" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "‚·‚ׂẴTƒuƒtƒHƒ‹ƒ_‚ðÜ‚肽‚½‚Þ(&C)" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "ƒtƒHƒ“ƒg‘I‘ð(&F)..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "ƒfƒtƒHƒ‹ƒgƒtƒHƒ“ƒg‚ðŽg—p(&O)" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "”äŠr“Œv(&R)" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "ÅV‚̏î•ñ‚ɍXV(S)\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "‘I‘ð€–Ú‚ðÅV‚ɍXV(&R)\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "ƒ}[ƒW(&M)" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "”äŠr(&M)\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "ŽŸ‚̍·ˆÙ(&N)\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "‘O‚̍·ˆÙ(&P)\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Å‰‚̍·ˆÙ(&F)\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Œ»Ý‚̍·ˆÙ(&C)\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "ÅŒã‚̍·ˆÙ(&L)\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "‰E‚ɃRƒs[(&R)\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "¶‚ɃRƒs[(&E)\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "íœ(&D)\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "—ñ‚̐ݒè(&C)..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "ƒŒƒ|[ƒg‚̐¶¬(&R)..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "•Û‘¶(&S)\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "•Û‘¶(&E)" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "¶‘¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶(&L)" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "’†‰›‚̃tƒ@ƒCƒ‹‚ð•Û‘¶(&M)" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "‰E‘¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶(&R)" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "–¼‘O‚ð•t‚¯‚Ä•Û‘¶(&A)" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "–¼‘O‚ð•t‚¯‚趑¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶(&L)..." -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "–¼‘O‚ð•t‚¯‚Ä’†‰›‚̃tƒ@ƒCƒ‹‚ð•Û‘¶(&M)..." -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "–¼‘O‚ð•t‚¯‚ĉE‘¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶(&R)..." -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "ˆóü(&P)..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "ƒy[ƒWÝ’è(&T)" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "ˆóüƒvƒŒƒrƒ…[(&W)" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "‰üsƒR[ƒh‚Ì•ÏŠ·(&C)" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "ƒ}[ƒWƒ‚[ƒh(&M)\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "Ä“Ǎž‚Ý(&L)\tCtrl+F5" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "ƒtƒ@ƒCƒ‹ƒGƒ“ƒR[ƒfƒBƒ“ƒO(&F)..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "Œ`Ž®‚ðŽw’肵‚čĔäŠr" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "XML(&X)" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "ƒoƒCƒiƒŠ(&B)" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "Œ³‚É–ß‚·(&U)\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "‚â‚è’¼‚µ(&R)\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Ø‚èŽæ‚è(&T)\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "ƒRƒs[(&C)\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "“\‚è•t‚¯(&P)\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "s“à‚̍·ˆÙ‚ð‘I‘ð(&D)\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "ŒŸõ(&F)...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "’uŠ·(&E)...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "‚“x‚È‘€ì" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "s”ԍ†•t‚«‚ŃRƒs[(&C)\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "ƒuƒbƒNƒ}[ƒN(&B)" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "ƒuƒbƒNƒ}[ƒN‚̍쐬Eíœ(&T)\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "ŽŸ‚̃uƒbƒNƒ}[ƒN‚ÖˆÚ“®(&N)\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "‘O‚̃uƒbƒNƒ}[ƒN‚ÖˆÚ“®(&P)\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "‘S‚ẴuƒbƒNƒ}[ƒN‚ðƒNƒŠƒA(&C)" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "ˆÚ“®(&G)...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "ƒY[ƒ€ƒCƒ“(&I)\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "ƒY[ƒ€ƒAƒEƒg(&O)\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "Œ³‚É–ß‚·(&N)\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "ƒVƒ“ƒ^ƒbƒNƒXƒnƒCƒ‰ƒCƒg" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "DiffƒRƒ“ƒeƒLƒXƒg(&D):" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "‘S‚Ä(&A)" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "ƒyƒCƒ“‚ðƒƒbƒN(&L)" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "‹ó”’‚ð•\Ž¦(&V)" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "s“à‚̍·ˆÙ‚ð•\Ž¦(&W)" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "s”ԍ†‚ð•\Ž¦(&N)" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "ƒ}[ƒWƒ“‚ð•\Ž¦(&M)" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "s‚ð‰E’[‚ŐܕԂ·(&R)" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "ƒyƒCƒ“‚ÌŒðŠ·(&A)" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "‚’¼•ªŠ„(&E)" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "DiffƒyƒCƒ“(&P)" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "ƒƒP[ƒVƒ‡ƒ“ƒyƒCƒ“(&C)" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "ŽŸ‚̃Rƒ“ƒtƒŠƒNƒg(&X)\tAlt+Shift+Down" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "‘O‚̃Rƒ“ƒtƒŠƒNƒg(&V)\tAlt+Shift+Up" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "‚“x‚È‘€ì" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "ŽŸ‚̍¶‘¤‚Æ’†‰›‚̍·ˆÙ\tAlt+1" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "‘O‚̍¶‘¤‚Æ’†‰›‚̍·ˆÙ\tAlt+Shift+1" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "ŽŸ‚̍¶‘¤‚ƉE‘¤‚̍·ˆÙ\tAlt+2" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "‘O‚̍¶‘¤‚ƉE‘¤‚̍·ˆÙ\tAlt+Shift+2" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "ŽŸ‚Ì’†‰›‚ƉE‘¤‚̍·ˆÙ\tAlt+3" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "‘O‚Ì’†‰›‚ƉE‘¤‚̍·ˆÙ\tAlt+Shift+3" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "ŽŸ‚̍¶‘¤‚݂̂̍·ˆÙ\tAlt+7" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "‘O‚̍¶‘¤‚݂̂̍·ˆÙ\tAlt+Shift+7" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "ŽŸ‚Ì’†‰›‚݂̂̍·ˆÙ\tAlt+8" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "‘O‚Ì’†‰›‚݂̂̍·ˆÙ\tAlt+Shift+8" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "ŽŸ‚̉E‘¤‚݂̂̍·ˆÙ\tAlt+9" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "‘O‚̉E‘¤‚݂̂̍·ˆÙ\tAlt+Shift+9" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "¶‚©‚çƒRƒs[\tAlt+Shift+Right" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "‰E‚©‚çƒRƒs[\tAlt+Shift+Left" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "‰E‚ɃRƒs[‚µ‚ÄŽŸ‚ɐi‚Þ(&O)\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "¶‚ɃRƒs[‚µ‚ÄŽŸ‚ɐi‚Þ(&T)\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "‘S‚Ä‚ð‰E‚ɃRƒs[(&A)" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "‘S‚Ä‚ð¶‚ÉƒRƒs[(&Y)" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "Ž©“®ƒ}[ƒW(&U)\tAlt+Ctrl+M" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "“¯Šúƒ|ƒCƒ“ƒg‚ð’ljÁ(&S)\tAlt+S" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "‚·‚ׂĂ̓¯Šúƒ|ƒCƒ“ƒg‚ðƒNƒŠƒA(&H)" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "”äŠr‘Oˆ—ƒvƒ‰ƒOƒCƒ“(&P)" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "ƒXƒNƒŠƒvƒg(&S)" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "”äŠr(&A)" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "”ñ…•½“I‚É”äŠr‚·‚é(&I)" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "1”Ԗڂ̍¶‘¤€–Ú‚Æ2”Ԗڂ̍¶‘¤€–Ú(&L)" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "1”Ԗڂ̉E‘¤€–Ú‚Æ2”Ԗڂ̉E‘¤€–Ú(&R)" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "1”Ԗڂ̍¶‘¤€–Ú‚Æ2”Ԗڂ̉E‘¤€–Ú(&F)" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "2”Ԗڂ̍¶‘¤€–Ú‚Æ1”Ԗڂ̉E‘¤€–Ú(&S)" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "Œ`Ž®‚ðŽw’肵‚Ä”äŠr(&M)" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "¶‚©‚ç‰E‚É(&L)" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "¶‚©‚çŽQÆæ‚Ö(&E)..." +msgid "Left to Middle (%1 of %2)" +msgstr "¶‚©‚ç’†‰› (%1)" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "‰E‚©‚獶‚É(&R)" +msgid "Left to Right (%1 of %2)" +msgstr "¶‚ð‰E‚É (%1 / %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 +#, c-format +msgid "Left to... (%1 of %2)" +msgstr "¶‚ð... (%1/%2)" + +#: Merge.rc:622 +#: Merge.rc:2305 #, c-format -msgid "R&ight to..." -msgstr "‰E‚©‚çŽQÆæ‚Ö(&I)..." +msgid "Middle to Left (%1 of %2)" +msgstr "’†‰›‚©‚獶 (%1 / %2)" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "ˆÚ“®(&M)" +msgid "Middle to Right (%1 of %2)" +msgstr "’†‰›‚©‚ç‰E (%1 / %2)" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "’†‰›‚ð... (%1 / %2)" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "¶‚©‚çŽQÆæ‚Ö(&L)..." +msgid "Right to Middle (%1 of %2)" +msgstr "‰E‚©‚ç’†‰› (%1 / %2)" #: Merge.rc:626 +#: Merge.rc:2303 +#, c-format +msgid "Right to Left (%1 of %2)" +msgstr "‰E‚ð¶‚É (%1 / %2)" + +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 #, c-format -msgid "&Right to..." -msgstr "‰E‚©‚çŽQÆæ‚Ö(&R)..." +msgid "Right to... (%1 of %2)" +msgstr "‰E‚ð... (%1/%2)" -#: Merge.rc:628 +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "ˆÚ“®(&M)" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "íœ(&D)" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "¶(&L)" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "’†‰›(&M)" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "‰E(&R)" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "—¼‘¤(&B)" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "–¼‘O‚̕ύX(&N)" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "€–Ú‚ð”ñ•\Ž¦(&H)" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "¶‚ðŠJ‚­(&O)" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "’†‰›‚ðŠJ‚­(&L)" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "‰E‚ðŠJ‚­(&P)" -#: Merge.rc:650 +#: Merge.rc:665 +#, c-format +msgid "Cop&y Pathnames" +msgstr "ƒpƒX–¼‚ðƒRƒs[(&Y)" + +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 +#, c-format +msgid "Left (%1 of %2)" +msgstr "¶ (%1 / %2)" + +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "Cop&y Pathnames" -msgstr "ƒpƒX–¼‚ðƒRƒs[(&Y)" +msgid "Middle (%1 of %2)" +msgstr "’†‰› (%1 / %2)" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 #, c-format -msgid "&Left (%1 of %2)" -msgstr "¶(&L) (%1 / %2)" +msgid "Right (%1 of %2)" +msgstr "‰E (%1 / %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 #, c-format -msgid "&Right (%1 of %2)" -msgstr "‰E(&R) (%1 / %2)" +msgid "Both (%1 of %2)" +msgstr "—¼‘¤ (%1 / %2)" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "—¼‘¤(&B) (%1 / %2)" +msgid "All (%1 of %2)" +msgstr "‘S‚Ä (%1 / %2)" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "ƒtƒ@ƒCƒ‹–¼‚ðƒRƒs[(&F)" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "€–Ú‚ðƒNƒŠƒbƒvƒ{[ƒh‚ɃRƒs[(&C)" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "ˆ³k(&Z)" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "¶(&L)... (%1 / %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "‰E(&R)... (%1 / %2)" +msgid "Both to... (%1 of %2)" +msgstr "—¼‘¤‚ð... (%1 / %2)" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "—¼‘¤(&B)... (%1 / %2)" +msgid "All to... (%1 of %2)" +msgstr "‘S‚Ä‚ð... (%1 / %2)" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "·ˆÙ(&D)... (%1 / %2)" +msgid "Differences to... (%1 of %2)" +msgstr "·ˆÙ‚ð... (%1 / %2)" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "‘I‘ð€–Ú‚ðÄ”äŠr(&R)" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "¶‘¤ƒVƒFƒ‹ƒƒjƒ…[" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "’†‰›ƒVƒFƒ‹ƒƒjƒ…[" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "‰E‘¤ƒVƒFƒ‹ƒƒjƒ…[" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "ƒRƒs[" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "ƒtƒ‹ƒpƒX‚ðƒRƒs[(&C)" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "ƒtƒ@ƒCƒ‹–¼‚ðƒRƒs[(&F)" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "”äŠr‘Oˆ—ƒvƒ‰ƒOƒCƒ“Ý’è" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "Žg—p‚µ‚È‚¢(&N)" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Ž©“®" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "·ˆÙ‚ÖˆÚ“®(&O)" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "ˆÚ“®ƒuƒƒbƒN•\Ž¦‚È‚µ(&N)" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "‘SˆÚ“®ƒuƒƒbƒN•\Ž¦(&A)" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Œ»Ý·ˆÙ‚̈ړ®ƒuƒƒbƒN‚Ì‚Ý•\Ž¦(&C)" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "‹ó”’(&H)" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "”äŠr‚·‚é(&P)" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "•ÏX‚𖳎‹‚·‚é(&G)" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "‚·‚ׂĖ³Ž‹‚·‚é(&N)" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "‘啶Žš‚Ə¬•¶Žš‚ð‹æ•Ê‚·‚é(&T)" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "‰üs•¶Žš‚̈Ⴂ‚𖳎‹‚·‚é(&R) (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "”äŠr•û–@(&C):" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "ƒtƒ‹ƒRƒ“ƒeƒ“ƒc" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "ƒNƒCƒbƒNƒRƒ“ƒeƒ“ƒc" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "ƒoƒCƒiƒŠƒRƒ“ƒeƒ“ƒc" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "XV“úŽž" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "XV“úŽž‚ƃTƒCƒY" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "ƒTƒCƒY" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "WinMerge‚ɂ‚¢‚Ä" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Private Build)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "WinMerge‚̃z[ƒ€ƒy[ƒW‚ɍs‚­!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "vŒ£ŽÒ" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "ƒtƒ@ƒCƒ‹‚Ü‚½‚̓tƒHƒ‹ƒ_‚Ì‘I‘ð..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "ŽQÆ(&B)..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "ŽQÆ(&R)" -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "&3(ƒIƒvƒVƒ‡ƒ“)" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "ŽQÆ(&O)..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "ƒtƒBƒ‹ƒ^(&L):" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "‘I‘ð..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "“WŠJƒvƒ‰ƒOƒCƒ“(&U):" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "‘I‘ð(&S)..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "ƒTƒuƒtƒHƒ‹ƒ_‚ðŠÜ‚Þ(&I)" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "ƒXƒe[ƒ^ƒX:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "ƒLƒƒƒ“ƒZƒ‹" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "ƒwƒ‹ƒv" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "”äŠr‚·‚éƒtƒ@ƒCƒ‹‚Ü‚½‚̓tƒHƒ‹ƒ_" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "ƒf[ƒ^ƒx[ƒX:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "ƒvƒƒWƒFƒNƒg:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "ƒ†[ƒU[:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "ƒpƒXƒ[ƒh:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "‘ΏÛVSSƒvƒƒWƒFƒNƒg‚ƃŠƒ“ƒN‚·‚é" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "‘S‚Ă̍€–Ú‚É“K—p‚·‚é" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "ƒ`ƒFƒbƒNƒAƒEƒg" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "–¼‘O‚ð•t‚¯‚Ä•Û‘¶..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "ƒo[ƒWƒ‡ƒ“ŠÇ—ƒVƒXƒeƒ€" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "ƒo[ƒWƒ‡ƒ“ƒVƒXƒeƒ€(&V):" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe‚ւ̃pƒX(&P):" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "ˆê”Ê" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Ž©“®“I‚ɍŏ‰‚̍·ˆÙ‚ɃXƒNƒ[ƒ‹‚·‚é(&S)" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "ESCƒL[‚ŃEƒCƒ“ƒhƒE‚ð•Â‚¶‚é(&O)" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "ŠJ‚­ƒ_ƒCƒAƒƒO‚ÅŽ©“®“I‚ɃpƒX‚ðŒŸ¸‚·‚é" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "•¡”‚̃Cƒ“ƒXƒ^ƒ“ƒX‚ð‹N“®‚µ‚È‚¢(&O)" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "•¡”‚̃EƒCƒ“ƒhƒE‚ð•Â‚¶‚é‚Æ‚«‚ɐq‚Ë‚é(&K)" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "ƒtƒ@ƒCƒ‹”äŠrŽž‚̃tƒ@ƒCƒ‹Žž‚ð•Û‚Â(&P)" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "‹N“®Žž‚Ɂuƒtƒ@ƒCƒ‹‚Ü‚½‚̓tƒHƒ‹ƒ_‚Ì‘I‘ðvƒ_ƒCƒAƒƒO‚ð•\Ž¦" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "OKƒ{ƒ^ƒ“‰Ÿ‰ºŽž‚Ɂuƒtƒ@ƒCƒ‹‚Ü‚½‚̓tƒHƒ‹ƒ_‚Ì‘I‘ðvƒ_ƒCƒAƒƒO‚ð•Â‚¶‚é" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "ŠJ‚­ƒ_ƒCƒAƒƒO‚̃I[ƒgƒRƒ“ƒvƒŠ[ƒg(&O):" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "Œ¾Œê:" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "" "WinMerge allows hiding some common messageboxes. Press the Reset button to " @@ -1631,667 +1700,661 @@ msgstr "" "WinMerge ‚́A‚¢‚­‚‚©‚Ì‹¤’ʃƒbƒZ[ƒWƒ{ƒbƒNƒX‚ð”ñ•\Ž¦‚É‚Å‚«‚Ü‚·B ‘S‚Ẵƒb" "ƒZ[ƒWƒ{ƒbƒNƒX‚ðÄ‚Ñ•\Ž¦‚³‚¹‚é‚ɂ́AƒŠƒZƒbƒgƒ{ƒ^ƒ“‚ð‰Ÿ‰º‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "ƒŠƒZƒbƒg" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "ŒŸõ" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "ŒŸõ•¶Žš—ñ(&N)" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "’PŒê’PˆÊ‚Å’T‚·(&W)" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "‘啶Žš‚Ə¬•¶Žš‚ð‹æ•Ê‚·‚é(&C)" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "³‹K•\Œ»(&E)" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "ÅŒã‚Ü‚ÅŒŸõ‚µ‚½Œãƒ‹[ƒv‚µ‚È‚¢(&O)" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "‚±‚̃_ƒCƒAƒƒOƒ{ƒbƒNƒX‚ð•Â‚¶‚È‚¢(&D)" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "‘O‚ðŒŸõ(&P)" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "ŽŸ‚ðŒŸõ(&F)" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "’uŠ·" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "’uŠ·Œã‚Ì•¶Žš—ñ(&P):" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "ƒtƒ@ƒCƒ‹‚̏I’[‚Ő܂è•Ô‚³‚È‚¢(&D)" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "’uŠ·" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "‘I‘ð”͈Í(&S)" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "ƒtƒ@ƒCƒ‹‘S‘Ì(&O)" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "’uŠ·‚µ‚ÄŽŸ‚É(&R)" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "‚·‚ׂĒuŠ·(&A)" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "ƒ`ƒFƒbƒNƒAƒEƒg" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "ƒRƒƒ“ƒg" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "ƒ`ƒFƒbƒNƒAƒEƒgŒãƒ`ƒFƒbƒNƒCƒ“‚·‚é" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "sƒtƒBƒ‹ƒ^" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "sƒtƒBƒ‹ƒ^‚ð—LŒø‚É‚·‚é" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "³‹K•\Œ» (s‚ ‚½‚èˆê‚Â):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "V‹K(&N)" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "•ÒW(&E)" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "íœ(&R)" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "F" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "·ˆÙ‚ ‚è:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "‘I‘ð‚³‚ê‚½·ˆÙ:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "”wŒi" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "íœ" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "ƒeƒLƒXƒg" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "–³Ž‹‚³‚ꂽ·ˆÙ:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "ˆÚ“®ƒuƒƒbƒN:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "‘I‘ð‚³‚ê‚½ˆÚ“®ƒuƒƒbƒN:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" "·ˆÙ\n" "(‚½‚¾‚µ—אڃyƒCƒ“‚Æ“¯‚¶):" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" "‘I‘ð‚³‚ê‚½·ˆÙ\n" "(‚½‚¾‚µ—אڃyƒCƒ“‚Æ“¯‚¶):" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "’PŒê‚̍·ˆÙ:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "‘I‘ð‚³‚ê‚½’PŒê‚̍·ˆÙ:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "ƒfƒtƒHƒ‹ƒg" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "ƒVƒXƒeƒ€" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "íœ‚³‚ꂽƒtƒ@ƒCƒ‹‚ð‚²‚Ý” ‚Ɉړ®‚·‚é(&P)" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "ŠO•”ƒGƒfƒBƒ^(&E): (’uŠ·‚³‚ê‚éˆø” $file, $linenum):" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "ƒtƒBƒ‹ƒ^ƒtƒHƒ‹ƒ_(&F):" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "ƒeƒ“ƒ|ƒ‰ƒŠƒtƒ@ƒCƒ‹ƒtƒHƒ‹ƒ_" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "ƒVƒXƒeƒ€‚̃eƒ“ƒ|ƒ‰ƒŠƒtƒHƒ‹ƒ_(&Y)" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "ƒJƒXƒ^ƒ€ƒtƒHƒ‹ƒ_(&U):" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "ƒpƒbƒ`¶¬" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "ƒtƒ@ƒCƒ‹&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "ƒtƒ@ƒCƒ‹&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "ŒðŠ·(&S)" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "Šù‘¶‚̃tƒ@ƒCƒ‹‚ɒljÁ‚·‚é(&A)" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "Œ‹‰Ê(&R):" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "ŽQÆ(&W)..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "o—ÍŒ`Ž®(&F)" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "ƒXƒ^ƒCƒ‹(&Y):" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "ƒRƒ“ƒeƒLƒXƒg(&C):" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "‹ó”’s‚𖳎‹‚·‚é(&E)" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "ƒRƒ}ƒ“ƒhs‚ðŠÜ‚ß‚é(&D)" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "ŠO•”ƒGƒfƒBƒ^‚ÅŠJ‚­(&X)" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "—ñ•\Ž¦" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "ã‚Ö(&U)" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "‰º‚Ö(&D)" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "“WŠJƒvƒ‰ƒOƒCƒ“‚Ì‘I‘ð" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "ƒtƒ@ƒCƒ‹“WŠJƒvƒ‰ƒOƒCƒ“:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "‚·‚ׂĂ̓WŠJƒvƒ‰ƒOƒCƒ“‚ð•\Ž¦‚µAŠg’£Žq‚ðƒ`ƒFƒbƒN‚µ‚Ü‚¹‚ñB(&A)" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Šg’£Žqˆê——:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "à–¾:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "’âŽ~" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "€–Ú‚ð”äŠr‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "”äŠr‚µ‚½€–Ú:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "‘S€–ڐ”:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "ˆÚ“®" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "”ԍ†(&O):" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "ƒtƒ@ƒCƒ‹" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "’†‰›(&M)" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "ˆÚ“®Ží•Ê" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "s(&I)" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "·ˆÙ(&D)" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "ˆÚ“®(&G)" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "”äŠr" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "‹ó”’" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "”äŠr‚·‚é(&C)" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "•ÏX‚𖳎‹‚·‚é(&I)" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "‚·‚ׂĖ³Ž‹‚·‚é(&G)" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "‹ós‚𖳎‹‚·‚é(&K)" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "‘啶Žš‚Ə¬•¶Žš‚ð‹æ•Ê‚µ‚È‚¢(&C)" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "ˆÚ“®ƒuƒƒbƒNŒŸo‚ð—LŒø‚É‚·‚é(&N)" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "—ÞŽ—s‚ðƒ}ƒbƒ`‚³‚¹‚é(&M)" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "ƒRƒƒ“ƒg‚̍·ˆÙ‚𖳎‹‚·‚é" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "ƒGƒfƒBƒ^" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "ƒVƒ“ƒ^ƒbƒNƒXƒnƒCƒ‰ƒCƒg(&H)" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "Ž©“®“I‚ɍăXƒLƒƒƒ“‚·‚é(&A)" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "Œ³‚ÌEOL•¶Žš‚ð•Û‘¶‚·‚é(&P)" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "ƒ^ƒu" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "ƒ^ƒu•(&T):" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "ƒ^ƒu‚ð‘}“ü(&I)" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "ƒXƒy[ƒX‚ð‘}“ü(&S)" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "s“à·ˆÙ‚̐F•t‚¯" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "s“à·ˆÙ‚ð•\Ž¦‚·‚é" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "•¶Žš’PˆÊ(&C)" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "’PŒê’PˆÊ(&W):" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "’PŒê‹æØ‚蕶Žš(&O)" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "ƒtƒ@ƒCƒ‹ƒtƒBƒ‹ƒ^" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "ƒeƒXƒg..." -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "ƒCƒ“ƒXƒg[ƒ‹..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "V‹K..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "•ÒW..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "íœ..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "•ÏX‚³‚ꂽƒtƒ@ƒCƒ‹‚ð•Û‘¶‚µ‚Ü‚·‚©?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "¶‘¤ƒtƒ@ƒCƒ‹" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "•ÏX‚ð•Û‘¶‚·‚é(&S)" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "•ÏX‚ð”jŠü‚·‚é(&D)" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "’†‰›ƒtƒ@ƒCƒ‹" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "•ÏX‚ð•Û‘¶‚·‚é(&V)" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "•ÏX‚ð”jŠü‚·‚é(&R)" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "‰E‘¤ƒtƒ@ƒCƒ‹" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "•ÏX‚ð•Û‘¶‚·‚é(&A)" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "•ÏX‚ð”jŠü‚·‚é(&C)" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "‚·‚ׂĔjŠü‚·‚é(&R)" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "ƒR[ƒhƒy[ƒW" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "ƒfƒtƒHƒ‹ƒgƒR[ƒhƒy[ƒW" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" "”ñUnicodeƒtƒ@ƒCƒ‹‚ð“ǂݍž‚ñ‚¾‚Æ‚«‚̃fƒtƒHƒ‹ƒgƒR[ƒhƒy[ƒW‚ðŽw’肵‚ĉº‚³‚¢:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2300,7 +2363,7 @@ msgstr "" ".html, .rc, .xml ƒtƒ@ƒCƒ‹‚̃R[ƒhƒy[ƒWî•ñ‚ðŒŸo‚·‚é\n" "ƒZƒbƒVƒ‡ƒ“‚̍ċN“®‚ª•K—v‚Å‚·" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "" "Detect codepage for text files using mlang.dll\n" @@ -2310,637 +2373,637 @@ msgstr "" "‚±‚ê‚ð—LŒø‚É‚·‚é‚ƃtƒHƒ‹ƒ_ƒXƒLƒƒƒ“‚ª‚©‚È‚è’x‚­‚È‚è‚Ü‚·\n" "‚Ü‚½AƒZƒbƒVƒ‡ƒ“‚̍ċN“®‚ª•K—v‚Å‚·" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "ƒVƒXƒeƒ€ƒR[ƒhƒy[ƒW" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Œ»Ý‚ÌWinMergeƒ†[ƒU[ƒCƒ“ƒ^[ƒtƒF[ƒXŒ¾Œê‚ɏ]‚¤" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "ƒJƒXƒ^ƒ€ƒR[ƒhƒy[ƒW:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "ƒIƒvƒVƒ‡ƒ“" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " ƒJƒeƒSƒŠ" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "ƒCƒ“ƒ|[ƒg..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "ƒGƒNƒXƒ|[ƒg..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "ƒ_ƒCƒAƒƒO" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "ƒL[ƒ[ƒh:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "ŠÖ”–¼:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "ƒRƒƒ“ƒg:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "”’l:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "ƒIƒyƒŒ[ƒ^:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "•¶Žš—ñ:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "ƒvƒŠƒvƒƒZƒbƒT:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "ƒ†[ƒU[1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "ƒ†[ƒU[2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "‘¾Žš" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "ƒtƒHƒ‹ƒ_”äŠrƒŒƒ|[ƒg" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "ƒŒƒ|[ƒgƒtƒ@ƒCƒ‹(&F):" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "ŽQÆ..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "ƒXƒ^ƒCƒ‹(&S):" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "ƒtƒ@ƒCƒ‹”äŠrƒŒƒ|[ƒg‚ðŠÜ‚ß‚é(&I)" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "ƒNƒŠƒbƒvƒ{[ƒh‚ɃRƒs[(&C)" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "‹¤—L/ƒvƒ‰ƒCƒx[ƒgƒtƒBƒ‹ƒ^" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "‚ǂ̃^ƒCƒv‚̃tƒBƒ‹ƒ^‚ðì¬‚µ‚Ü‚·‚©?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "‹¤—LƒtƒBƒ‹ƒ^ (‚±‚̃}ƒVƒ“ã‚Ì‘S‚Ẵ†[ƒU[‚É—LŒø)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "ƒvƒ‰ƒCƒx[ƒgƒtƒBƒ‹ƒ^ (Œ»Ý‚̃†[ƒU[‚Ì‚Ý)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "ƒA[ƒJƒCƒuƒTƒ|[ƒg" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "ƒA[ƒJƒCƒuƒtƒ@ƒCƒ‹ƒTƒ|[ƒg‚ð—LŒø‚É‚·‚é(&E)" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "ƒtƒ@ƒCƒ‹‚̃VƒOƒlƒ`ƒƒ‚©‚çƒA[ƒJƒCƒu‚ÌŽí—Þ‚ðŒŸo‚·‚é(&D)" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "”äŠr“Œv" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "ƒtƒHƒ‹ƒ_:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "ƒtƒ@ƒCƒ‹:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "·ˆÙ" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "ƒeƒLƒXƒg:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "ƒoƒCƒiƒŠ:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "•Ð•û‚Ì‚Ý" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "¶‘¤:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "’†‰›:" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "‰E‘¤:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "“¯ˆê" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "‡Œv:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "•Â‚¶‚é" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "ì—p" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Affects)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "ƒR[ƒhƒy[ƒW‚Ì‘I‘ð" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "ƒtƒ@ƒCƒ‹“Ǎž‚Ý(&F):" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "ƒtƒ@ƒCƒ‹•Û‘¶(&S)" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "—¼‘¤‚É“¯‚¶ƒR[ƒhƒy[ƒW‚ðŽg—p" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "“K—p(&A)" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "ƒLƒƒƒ“ƒZƒ‹(&C)" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "ƒtƒBƒ‹ƒ^‚̃eƒXƒg" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "ƒeƒXƒg‚·‚éƒtƒBƒ‹ƒ^..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "ƒeƒXƒg‚·‚éƒeƒLƒXƒg‚Ì“ü—Í(&E):" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "ƒtƒHƒ‹ƒ_–¼(&F)" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Œ‹‰Ê:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "ƒeƒXƒg(&T)" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "•Â‚¶‚é(&C)" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "ƒJƒXƒ^ƒ€ƒeƒLƒXƒgƒJƒ‰[‚ðŽg—p(&U)" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "ƒJƒXƒ^ƒ€ƒeƒLƒXƒgƒJƒ‰[" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "‹ó”’:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "•W€ƒeƒLƒXƒg:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "‘I‘ð:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "ƒpƒX" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "¶(&L):" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "“Ç‚ÝŽæ‚èê—p(&E)" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "‰E(&R):" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "“Ç‚ÝŽæ‚èê—p(&A)" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "ƒtƒBƒ‹ƒ^(&F):" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "ŠJ‚­..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "•Û‘¶..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "ì¬‚·‚éƒoƒbƒNƒAƒbƒv:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "ƒtƒHƒ‹ƒ_”äŠr(&F)" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "ƒtƒ@ƒCƒ‹”äŠr(&E)" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹ì¬æ:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "Œ³ƒtƒ@ƒCƒ‹‚̃tƒHƒ‹ƒ_(&O)" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "ƒoƒbƒNƒAƒbƒvƒtƒHƒ‹ƒ_(&G):" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "ƒoƒbƒNƒAƒbƒvƒtƒ@ƒCƒ‹–¼:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr ".bak Šg’£Žq‚ð’ljÁ‚·‚é" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "ƒ^ƒCƒ€ƒXƒ^ƒ“ƒv‚ð’ljÁ‚·‚é(&P)" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "ƒRƒs[‚ÌŠm”F" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "–{“–‚ɍ€–Ú XXX ‚ðƒRƒs[‚µ‚Ü‚·‚©?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "¶‚©‚ç" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "‰E‚Ö" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "‚Í‚¢" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "‚¢‚¢‚¦" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "ƒvƒ‰ƒOƒCƒ“" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "ƒvƒ‰ƒOƒCƒ“‚ð—LŒø‚É‚·‚é(&E)" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "ƒVƒFƒ‹“‡" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "ƒGƒNƒXƒvƒ[ƒ‰" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Šg’£ƒƒjƒ…[‚ð—LŒø‚É‚·‚é(&N)" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "ƒRƒ“ƒeƒLƒXƒgƒƒjƒ…[‚ɒljÁ(&A)" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "ƒVƒFƒ‹ƒGƒNƒXƒeƒ“ƒVƒ‡ƒ“‚ð“o˜^(&R)" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "ƒVƒFƒ‹ƒGƒNƒXƒeƒ“ƒVƒ‡ƒ“‚Ì“o˜^‚ð‰ðœ(&U)" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "ƒtƒHƒ‹ƒ_" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "Å‰‚̍·ˆÙ‚Å”äŠr‚ðI—¹‚·‚é(&T)" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "3•bˆÈ‰º‚ÌŽžŠÔ·‚𖳎‹‚·‚é" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "•Ð•û‚É‚µ‚©‘¶Ý‚µ‚È‚¢ƒTƒuƒtƒHƒ‹ƒ_“à‚àŠÜ‚ß‚é(&I)" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "Ž©“®“I‚ɃTƒuƒtƒHƒ‹ƒ_‚ð“WŠJ‚·‚é(&A)" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "ƒŠƒp[ƒXƒ|ƒCƒ“ƒg‚𖳎‹‚·‚é(&R)" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "ƒNƒCƒbƒNƒRƒ“ƒeƒ“ƒc§ŒÀ(MB)(&Q):" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "ƒoƒCƒiƒŠ" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹ƒpƒ^[ƒ“(&P):" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "Frhed Ý’è" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "•\Ž¦Ý’è(&S)..." -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "ƒoƒCƒiƒŠƒ‚[ƒh(&B)..." -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "ƒLƒƒƒ‰ƒNƒ^ƒZƒbƒg(&C)..." -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "‰æ‘œ" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "‰æ‘œƒtƒ@ƒCƒ‹ƒpƒ^[ƒ“(&P):" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "HEX•\Ž¦(&H)" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "041103a4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x411, 932" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "ã‘" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "‹L˜^" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "" "\n" @@ -2949,7 +3012,7 @@ msgstr "" "\n" "V‚µ‚¢ƒhƒLƒ…ƒƒ“ƒg (Ctrl+N)" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "" "\n" @@ -2958,7 +3021,7 @@ msgstr "" "\n" "ŠJ‚­ (Ctrl+O)" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "" "\n" @@ -2967,32 +3030,32 @@ msgstr "" "\n" "•Û‘¶ (Ctrl+S)" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "–¢’m‚̃Gƒ‰[:ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚ªŠJ‚¯‚Ü‚¹‚ñ" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "–¢’m‚̃Gƒ‰[:ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚ª•Û‘¶‚Å‚«‚Ü‚¹‚ñ" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚ª“Ǎž‚Ü‚ê‚Ü‚µ‚½" -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹‚ª•Û‘¶‚³‚ê‚Ü‚µ‚½" -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "" "\n" @@ -3001,7 +3064,7 @@ msgstr "" "\n" "Œ³‚É–ß‚· (Ctrl+Z)" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "" "\n" @@ -3010,7 +3073,7 @@ msgstr "" "\n" "ŒJ‚è•Ô‚· (Ctrl+Y)" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -3029,7 +3092,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge File Compare" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3048,7 +3111,7 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Folder Compare" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3059,7 +3122,7 @@ msgstr "" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi " "Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, c-format msgid "" "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you " @@ -3070,138 +3133,138 @@ msgstr "" "are welcome to redistribute it under certain circumstances; see the GNU " "General Public License in the Help menu for details." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "’†Ž~(&A)" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "ÄŽŽs(&R)" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "–³Ž‹(&I)" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "‘S‚Ä–³Ž‹(&A)" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "‚Í‚¢(&Y)" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "‘S‚Ä‚Í‚¢(&A)" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "‚¢‚¢‚¦(&N)" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "‘S‚Ä‚¢‚¢‚¦(&L)" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "‘±s(&C)" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "ƒXƒLƒbƒv(&S)" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "‚·‚ׂăXƒLƒbƒv(&A)" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Ä‚Ñ‚±‚̃ƒbƒZ[ƒW‚ð•\Ž¦‚µ‚È‚¢(&M)" -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Ä‚Ñ‚±‚ÌŽ¿–â‚ð‚µ‚È‚¢(&Q)" -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "ƒVƒ“ƒ^ƒbƒNƒX" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "ƒo[ƒWƒ‡ƒ“ŠÇ—" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "·ˆÙ" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "To:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "¶‚©‚ç:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "¶‚Ö:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "‰E‚©‚ç:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "‰E‚Ö:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Version %1 - Japanese" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "ƒIƒvƒVƒ‡ƒ“ (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "‚·‚ׂẴƒbƒZ[ƒWƒ{ƒbƒNƒX‚ªAÄ‚Ñ•\Ž¦‚³‚ê‚Ü‚·B" -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3212,32 +3275,32 @@ msgstr "" "\n" "1‚©‚ç%1‚Ü‚Å‚Ì’l‚ðŽw’肵‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "ŠJ‚­" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "ƒvƒƒOƒ‰ƒ€|*.exe;*.bat;*.cmd|‚·‚ׂẴtƒ@ƒCƒ‹(*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "‚·‚ׂẴtƒ@ƒCƒ‹ (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ƒvƒƒWƒFƒNƒgƒtƒ@ƒCƒ‹ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Ý’èƒtƒ@ƒCƒ‹ (*.ini)|*.ini|‚·‚ׂẴtƒ@ƒCƒ‹(*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "" "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|" @@ -3246,54 +3309,54 @@ msgstr "" "ƒeƒLƒXƒgƒtƒ@ƒCƒ‹ (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files " "(*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML ƒtƒ@ƒCƒ‹ (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ƒtƒ@ƒCƒ‹ (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "–¼Ì" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "êŠ" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "ƒtƒBƒ‹ƒ^" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "à–¾" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "V‚µ‚¢ƒtƒBƒ‹ƒ^‚̃tƒ@ƒCƒ‹–¼‚ðŽw’肵‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "ƒtƒ@ƒCƒ‹ƒtƒBƒ‹ƒ^ (*.flt)|*.flt|All Files (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3306,7 +3369,7 @@ msgstr "" "ƒtƒ@ƒCƒ‹ %1 ‚ðˆÈ‰º‚Ì WinMerge/Filters ƒtƒHƒ‹ƒ_‚ɃRƒs[‚µ‚Ä‚­‚¾‚³‚¢:\n" "%2" -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3318,7 +3381,7 @@ msgstr "" "\n" "ƒtƒHƒ‹ƒ_‚Ì‘¶Ý‚Ü‚½‚͏‘‚«ž‚݉”\‚Å‚ ‚é‚©Šm”F‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3329,7 +3392,7 @@ msgstr "" "\n" "[ƒIƒvƒVƒ‡ƒ“/ƒVƒXƒeƒ€]‚ŃtƒBƒ‹ƒ^ƒtƒHƒ‹ƒ_‚ðŽw’肵‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3341,12 +3404,12 @@ msgstr "" "\n" "‚»‚̃tƒ@ƒCƒ‹‚Í“Ç‚ÝŽæ‚èê—p‚Å‚Í‚ ‚è‚Ü‚¹‚ñ‚©?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "ƒCƒ“ƒXƒg[ƒ‹‚·‚éƒtƒBƒ‹ƒ^ƒtƒ@ƒCƒ‹‚̈ʒu" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3357,18 +3420,18 @@ msgstr "" "\n" "V‚µ‚¢ƒtƒBƒ‹ƒ^ƒtƒ@ƒCƒ‹‚ðƒtƒBƒ‹ƒ^ƒtƒHƒ‹ƒ_‚ɃRƒs[‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B" -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" "ƒtƒBƒ‹ƒ^ƒtƒ@ƒCƒ‹‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·B‘¶Ý‚µ‚Ä‚¢‚éƒtƒ@ƒCƒ‹‚ðã‘‚«‚µ‚Ü‚·‚©?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "³‹K•\Œ»" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3382,173 +3445,173 @@ msgstr "" "‚à‚µA‚¢‚Ü‚Í‚·‚ׂĂ̔äŠrƒEƒCƒ“ƒhƒE‚ðXV‚µ‚½‚­‚È‚¢ê‡A‚¢‚¢‚¦‚ð‘I‘ð‚µAŒã‚Å" "”äŠrƒEƒCƒ“ƒhƒE‚ðXV‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "SS.EXE‚ւ̃pƒX(&P):" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "ƒtƒHƒ‹ƒ_”äŠrŒ‹‰Ê" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "ƒtƒ@ƒCƒ‹”äŠr" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "¶–³‘è" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "’†–³‘è" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "‰E–³‘è" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Theirs File" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Mine File" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "s: %s —ñ: %d/%d •¶Žš: %d/%d EOL: %s ƒR[ƒhƒy[ƒW: %d(%s)" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "s: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "s: %s —ñ: %d/%d •¶Žš: %d/%d ƒR[ƒhƒy[ƒW: %d(%s)" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "ƒ}[ƒW" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "·ˆÙ %1/%2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1ŒÂ‚̍·ˆÙ‚ªŒ©‚‚©‚è‚Ü‚µ‚½" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1ŒÂ‚̍·ˆÙ‚ªŒ©‚‚©‚è‚Ü‚µ‚½" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "€–Ú %1/%2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "€–Ú: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "‘¶Ý‚·‚éƒtƒHƒ‹ƒ_‚Ü‚½‚́Aƒtƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Folder Selection" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "2‚‚̃tƒHƒ‹ƒ_‚Ü‚½‚́A2‚‚̃tƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "¶‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "’†‰›‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "‰E‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "—¼‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "¶‘¤‚Æ’†‰›‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "¶‘¤‚ƉE‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "’†‰›‚ƉE‘¤‚̃pƒX‚Í•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "‘S‚ẴpƒX‚ª•s³‚ȃpƒX‚Å‚·!" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "“WŠJƒvƒ‰ƒOƒCƒ“‘I‘ð‚ð—LŒø‚É‚·‚é‚ɂ̓tƒ@ƒCƒ‹‚ð“ñ‚‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "ƒtƒ@ƒCƒ‹‚ƃtƒHƒ‹ƒ_‚Í”äŠr‚Å‚«‚Ü‚¹‚ñ!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "ƒtƒ@ƒCƒ‹‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "ƒtƒ@ƒCƒ‹‚ª“WŠJ‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3561,12 +3624,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "ƒRƒ“ƒtƒŠƒNƒgƒtƒ@ƒCƒ‹‚̉ðÍ‚ÉŽ¸”s‚µ‚Ü‚µ‚½B" -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3577,19 +3640,19 @@ msgstr "" "%1\n" "‚̓Rƒ“ƒtƒŠƒNƒgƒtƒ@ƒCƒ‹‚Å‚Í‚ ‚è‚Ü‚¹‚ñB" -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "–¼‘O‚ð•t‚¯‚Ä•Û‘¶" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "" "ƒtƒ@ƒCƒ‹ %1 ‚Ì“à—e‚͕ύX‚³‚ê‚Ä‚¢‚Ü‚·B\n" "•ÏX‚ð•Û‘¶‚µ‚Ü‚·‚©?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, c-format msgid "" "%1 is marked read-only. Would you like to override the read-only file ? (No " @@ -3598,12 +3661,12 @@ msgstr "" "%1‚Í“Ç‚ÝŽæ‚èê—pƒtƒ@ƒCƒ‹‚Å‚·B “Ç‚ÝŽæ‚èê—pƒtƒ@ƒCƒ‹‚ðã‘‚«‚µ‚Ü‚·‚©? (V‚µ‚¢" "ƒtƒ@ƒCƒ‹–¼‚Å‚Í•Û‘¶‚µ‚Ü‚¹‚ñB)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "ƒtƒ@ƒCƒ‹ƒoƒbƒNƒAƒbƒvƒGƒ‰[" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3616,7 +3679,7 @@ msgstr "" "‚ðƒoƒbƒNƒAƒbƒv‚Å‚«‚Ü‚¹‚ñB\n" "–³Ž‹‚µ‚Ä‘±‚¯‚Ü‚·‚©?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3632,7 +3695,7 @@ msgstr "" "•Ê–¼‚Å•Û‘¶‚·‚éê‡‚ÍOk‚ðA\n" "’†Ž~‚·‚éê‡‚́AƒLƒƒƒ“ƒZƒ‹‚ð‰Ÿ‚µ‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3648,7 +3711,7 @@ msgstr "" "\n" "“WŠJ‚³‚ꂽ‚à‚Ì‚ð•Êƒtƒ@ƒCƒ‹‚É•Û‘¶‚µ‚Ü‚·‚©?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3664,7 +3727,7 @@ msgstr "" "\n" "“WŠJ‚³‚ꂽ‚à‚Ì‚ð•Êƒtƒ@ƒCƒ‹‚É•Û‘¶‚µ‚Ü‚·‚©?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3677,7 +3740,7 @@ msgstr "" "‚±‚̃tƒ@ƒCƒ‹‚Í WinMerge ˆÈŠO‚̃AƒvƒŠƒP[ƒVƒ‡ƒ“‚ŏC³‚³‚ê‚Ä‚¢‚Ü‚·BC³‚³‚ꂽ" "ƒtƒ@ƒCƒ‹‚ɏ㏑‚«‚µ‚Ü‚·‚©?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3686,7 +3749,7 @@ msgstr "" "%1\n" "‚́A“Ç‚ÝŽæ‚èê—p‚Å‚·B “Ç‚ÝŽæ‚èê—p‚̍€–Ú‚ðã‘‚«‚µ‚Ü‚·‚©?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3700,22 +3763,22 @@ msgstr "" "‚ðXV‚µ‚Ü‚µ‚½B\n" "ƒtƒ@ƒCƒ‹‚ðŠJ‚«‚È‚¨‚µ‚Ü‚·‚©?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "–¼‘O‚ð•t‚¯‚趑¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "–¼‘O‚ð•t‚¯‚Ä’†‰›‚̃tƒ@ƒCƒ‹‚ð•Û‘¶" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "–¼‘O‚ð•t‚¯‚ĉE‘¤‚̃tƒ@ƒCƒ‹‚ð•Û‘¶" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3726,7 +3789,7 @@ msgstr "" "%1\n" "‚͏Á–Å‚µ‚Ü‚µ‚½B‘±s‚·‚邽‚߂Ƀtƒ@ƒCƒ‹‚̃Rƒs[‚ð•Û‘¶‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3737,7 +3800,7 @@ msgstr "" "\n" "‘±s‚·‚é‘O‚ɃhƒLƒ…ƒƒ“ƒg‚ðF5ƒL[‚ōŐV‚É‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "" "You must specify a SourceSafe project path in order to continue (ie: $/" @@ -3746,41 +3809,41 @@ msgstr "" "‘±s‚·‚邽‚߂ɂ́ASourceSafeƒvƒƒWƒFƒNƒgƒpƒX‚ðŽw’肵‚Ä‚­‚¾‚³‚¢B (—á: $/" "MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "VSS‚©‚çƒtƒ@ƒCƒ‹‚ðƒ`ƒFƒbƒNƒAƒEƒg‚µ‚Ä‚¢‚Ü‚·..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "" "Versioning System returned an error while attempting to check out the file. " "Unable to continue..." msgstr "ƒtƒ@ƒCƒ‹‚̃`ƒFƒbƒNƒAƒEƒg‚ŃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B Œp‘±‚Å‚«‚Ü‚¹‚ñ..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "ƒo[ƒWƒ‡ƒ“ƒVƒXƒeƒ€ƒRƒ}ƒ“ƒh‚ÌŽÀsƒGƒ‰[B" -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "" "The VSS Working Folder and the location of the current file do not match. " "Continue?" msgstr "VSSì‹ÆƒtƒHƒ‹ƒ_‚ÆŒ»Ý‚̃tƒ@ƒCƒ‹ˆÊ’u‚͈ê’v‚µ‚Ä‚¢‚Ü‚¹‚ñB‘±s‚µ‚Ü‚·‚©?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "VSS‚̃f[ƒ^ƒx[ƒX‚ª‚݂‚©‚è‚Ü‚¹‚ñ!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "VSS‚©‚ç‚̃Gƒ‰[:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3792,7 +3855,7 @@ msgstr "" " Žg—p‚µ‚Ä‚¢‚éƒrƒ…[‚̐ݒè‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢B\n" " ƒ`ƒFƒbƒNƒAƒEƒg‚ðƒLƒƒƒ“ƒZƒ‹‚µ‚Ü‚·‚©?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the " @@ -3803,127 +3866,146 @@ msgstr "" "‚Ü‚µ‚½B\n" " Žg—p‚µ‚Ä‚¢‚éƒrƒ…[‚̐ݒè‚ðŠm”F‚µ‚Ä‚­‚¾‚³‚¢B " -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "‚È‚µ" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 –¢–ž)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ˆÈã)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "‹ó”’‚Å‹æØ‚é" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "‹ó”’‚©‹å“Ç“_‚Å‹æØ‚é" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "‰E‚©‚獶 (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "¶‚©‚ç‰E (%1)" +msgid "Right to Middle (%1)" +msgstr "‰E‚©‚ç’†‰› (%1)" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "‰E‚ð¶‚É (%1 / %2)" +msgid "Middle to Left (%1)" +msgstr "’†‰›‚©‚獶 (%1)" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "¶‚ð‰E‚É (%1 / %2)" +msgid "Middle to Right (%1)" +msgstr "’†‰›‚©‚ç‰E (%1)" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "¶‚©‚ç‰E (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "¶‚©‚ç’†‰› (%1)" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "¶‚ð... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "’†‰›‚ð... (%1)" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "‰E‚ð... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "¶‚ð... (%1/%2)" +msgid "Both to... (%1)" +msgstr "—¼‘¤‚ð... (%1)" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "‰E‚ð... (%1/%2)" +msgid "All to... (%1)" +msgstr "‘S‚Ä‚ð... (%1)" -#: Merge.rc:2289 +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "·ˆÙ‚ð... (%1)" + +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "¶ (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "’†‰› (%1)" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "‰E (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "—¼‘¤ (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "¶ (%1 / %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "‰E (%1 / %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "—¼‘¤ (%1 / %2)" +msgid "All (%1)" +msgstr "‘S‚Ä (%1)" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "¶‘¤ - ƒRƒs[/ˆÚ“®æƒtƒHƒ‹ƒ_‚ÌŽw’è:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "’†‰› - ƒRƒs[/ˆÚ“®æƒtƒHƒ‹ƒ_‚ÌŽw’è:" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "‰E‘¤ - ƒRƒs[/ˆÚ“®æƒtƒHƒ‹ƒ_‚ÌŽw’è:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ŒÂ‚̃tƒ@ƒCƒ‹‚ɍì—p)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1/%2 ŒÂ‚̃tƒ@ƒCƒ‹‚ɍì—p)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3935,17 +4017,17 @@ msgstr "" "%1\n" "‚ðíœ‚µ‚Ü‚·‚©?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "–{“–‚ɃRƒs[‚µ‚Ü‚·‚©?:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "–{“–‚É%d€–Ú‚ðƒRƒs[‚µ‚Ü‚·‚©?:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3964,22 +4046,22 @@ msgstr "" "\n" "Ä“x”äŠr‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "€–Ú‚ðˆÚ“®‚µ‚Ü‚·‚©?: " -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "%dŒÂ‚̍€–Ú‚ðˆÚ“®‚µ‚Ü‚·‚©?: " -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "ˆÚ“®‚ÌŠm”F" -#: Merge.rc:2316 +#: Merge.rc:2360 #, c-format msgid "" "You are about to close the window that is comparing folders. Are you sure " @@ -3988,437 +4070,437 @@ msgstr "" "ƒtƒHƒ‹ƒ_”äŠr’†‚̃EƒCƒ“ƒhƒE‚ð•Â‚¶‚悤‚Æ‚µ‚Ä‚¢‚Ü‚·B–{“–‚ɃEƒCƒ“ƒhƒE‚ð•Â‚¶‚Ü‚·" "‚©?" -#: Merge.rc:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "ŠO•”ƒGƒfƒBƒ^‚ÌŽÀs‚ÉŽ¸”s‚µ‚Ü‚µ‚½: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "–¢’m‚̃A[ƒJƒCƒuŒ`Ž®‚Å‚·" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "ƒtƒ@ƒCƒ‹–¼" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "”äŠrŒ‹‰Ê" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "¶“ú•t" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "‰E“ú•t" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "’†“ú•t" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Šg’£Žq" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "¶ƒTƒCƒY" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "‰EƒTƒCƒY" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "’†ƒTƒCƒY" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "‰EƒTƒCƒY (’Zk)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "¶ƒTƒCƒY (’Zk)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "’†ƒTƒCƒY (’Zk)" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "¶ì¬“úŽž" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "‰Eì¬“úŽž" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "’†ì¬“úŽž" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "V‚µ‚¢ƒtƒ@ƒCƒ‹" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "¶ƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "‰Eƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "’†ƒtƒ@ƒCƒ‹ƒo[ƒWƒ‡ƒ“" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "ŠÈˆÕŒ‹‰Ê•\Ž¦" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "¶‘®«" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "‰E‘®«" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "’†‘®«" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "¶EOL" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "’†EOL" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "‰EEOL" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "¶ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "‰EƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "’†ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "–³Ž‹‚³‚ꂽ·ˆÙ”" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "ƒtƒ@ƒCƒ‹‚ð”äŠr‚Å‚«‚Ü‚¹‚ñ" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "’†’f‚³‚ꂽ€–Ú" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "ƒXƒLƒbƒv‚³‚ꂽƒtƒ@ƒCƒ‹" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "ƒXƒLƒbƒv‚³‚ꂽƒtƒHƒ‹ƒ_" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "¶‘¤‚Ì‚Ý: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "’†‰›‚Ì‚Ý: %1" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "‰E‘¤‚Ì‚Ý: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "%1 “à‚Ì‚Ý‘¶Ý‚µ‚Ü‚¹‚ñ" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚Í“¯ˆê‚Å‚·" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚͈قȂÁ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "ƒtƒ@ƒCƒ‹‚͈قȂÁ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "ƒtƒHƒ‹ƒ_‚͈قȂÁ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "¶‘¤‚Ì‚Ý" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "‰E‘¤‚Ì‚Ý" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "’†‰›‚Ì‚Ý" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "¶‘¤‚É‚È‚¢" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "‰E‘¤‚É‚È‚¢" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "’†‰›‚É‚È‚¢" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "ƒGƒ‰[" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "ƒeƒLƒXƒgƒtƒ@ƒCƒ‹‚Í“¯ˆê‚Å‚·" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "ƒeƒLƒXƒgƒtƒ@ƒCƒ‹‚͈قȂè‚Ü‚·" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Œo‰ßŽžŠÔ: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1ŒÂ‚̍€–Ú‚ð‘I‘ð" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1ŒÂ‚̍€–Ú‚ð‘I‘ð" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "ƒtƒ@ƒCƒ‹–¼‚Ü‚½‚́AƒtƒHƒ‹ƒ_–¼" -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "ƒTƒuƒtƒHƒ‹ƒ_‚ªŠÜ‚܂ꂽ‚Æ‚«‚̃TƒuƒtƒHƒ‹ƒ_–¼" -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "’·‚¢Œ`Ž®‚Ì”äŠrŒ‹‰Ê•\Ž¦" -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "¶‘¤‚̍XV“ú•t" -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "‰E‘¤‚̍XV“ú•t" -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "’†‰›‚̍XV“ú•t" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "ƒtƒ@ƒCƒ‹Šg’£Žq" -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "¶‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”" -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "‰E‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”" -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "’†‰›ƒtƒ@ƒCƒ‹‚̃oƒCƒg”" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "¶‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”(’ZkŒ`)" -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "‰E‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”(’ZkŒ`)" -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "’†‰›ƒtƒ@ƒCƒ‹‚̃oƒCƒg”(’ZkŒ`)" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "¶‘¤‚̍쐬Žž" -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "‰E‘¤‚̍쐬Žž" -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "’†‰›‚̍쐬Žž" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "‚Ç‚¿‚炪ÅV‚̕ύX“ú•t‚©‚ðŽ¦‚µ‚Ü‚·B" -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¶‘¤ƒtƒ@ƒCƒ‹‚̃o[ƒWƒ‡ƒ“, ŒÀ‚ç‚ꂽƒtƒ@ƒCƒ‹ƒ^ƒCƒv‚Ì‚Ý" -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "‰E‘¤ƒtƒ@ƒCƒ‹‚̃o[ƒWƒ‡ƒ“, ŒÀ‚ç‚ꂽƒtƒ@ƒCƒ‹ƒ^ƒCƒv‚Ì‚Ý" -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "’†‰›ƒtƒ@ƒCƒ‹‚̃o[ƒWƒ‡ƒ“, ŒÀ‚ç‚ꂽƒtƒ@ƒCƒ‹ƒ^ƒCƒv‚Ì‚Ý" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "’Z‚¢Œ`Ž®‚Ì”äŠrŒ‹‰Ê•\Ž¦" -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "¶‘¤‚Ì‘®«" -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "‰E‘¤‚Ì‘®«" -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "’†‰›‚Ì‘®«" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "¶‘¤‚ÌEOLƒ^ƒCƒv" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "‰E‘¤‚ÌEOLƒ^ƒCƒv" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "’†‰›‚ÌEOLƒ^ƒCƒv" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "¶‘¤ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "‰E‘¤ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "’†‰›ƒGƒ“ƒR[ƒfƒBƒ“ƒO" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "" "Number of ignored differences in file. These differences are ignored by " @@ -4427,50 +4509,50 @@ msgstr "" "ƒtƒ@ƒCƒ‹“à‚Å–³Ž‹‚³‚ꂽ·ˆÙ”B‚±‚̍·ˆÙ‚ÍWinMerge‚É‚æ‚Á‚Ä–³Ž‹‚³‚êAƒ}[ƒW‚³‚ê" "‚Ü‚¹‚ñB" -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "" "Number of differences in file. This number does not include ignored " "differences." msgstr "ƒtƒ@ƒCƒ‹“à·ˆÙ”B‚±‚̍·ˆÙ”‚Í–³Ž‹‚³‚ꂽ·ˆÙ”‚ðŠÜ‚Ý‚Ü‚¹‚ñB" -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "‚à‚µAƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚È‚çƒAƒXƒ^ƒŠƒXƒN(*)‚ð•\Ž¦‚µ‚Ü‚·B" -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "%1 ‚Æ %2 ‚Ì”äŠr" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "CSVŒ`Ž®" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "TAB‹æØ‚èŒ`Ž®" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "ƒVƒ“ƒvƒ‹HTMLŒ`Ž®" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "ƒVƒ“ƒvƒ‹XMLŒ`Ž®" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" "ƒŒƒ|[ƒgƒtƒ@ƒCƒ‹‚ÍŠù‚É‘¶Ý‚µ‚Ä‚¢‚Ü‚·B‘¶Ý‚µ‚Ä‚¢‚éƒtƒ@ƒCƒ‹‚ðã‘‚«‚µ‚Ü‚·‚ª?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4479,27 +4561,27 @@ msgstr "" "ƒŒƒ|[ƒg¶¬ƒGƒ‰[:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "ƒŒƒ|[ƒg¶¬‚ɐ¬Œ÷‚µ‚Ü‚µ‚½B" -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "“¯‚¶ƒtƒ@ƒCƒ‹‚ª—¼‘¤‚̃pƒlƒ‹‚ÅŠJ‚©‚ê‚Ä‚¢‚Ü‚·B" -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "‘I‘ð‚³‚ê‚½ƒtƒ@ƒCƒ‹‚Í“¯ˆê‚Å‚·B" -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "ƒtƒ@ƒCƒ‹‚Ì”äŠrŽž‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½B" -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "" "Temporary files could not be created. Check your temporary path settings." @@ -4507,7 +4589,7 @@ msgstr "" "ƒeƒ“ƒ|ƒ‰ƒŠƒtƒ@ƒCƒ‹‚ªì¬‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½Bƒeƒ“ƒ|ƒ‰ƒŠƒpƒXÝ’è‚ðŠm”F‚µ‚Ä‚­‚¾‚³" "‚¢B" -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4527,17 +4609,17 @@ msgstr "" "[•ÒW]¨[Ý’è]¨[”äŠr]‚Ì'‰üs•¶Žš‚̈Ⴂ‚𖳎‹‚·‚é'ƒIƒvƒVƒ‡ƒ“‚ð\n" "ƒZƒbƒg‚µ‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "‘I‘ð‚³‚ê‚½ƒtƒHƒ‹ƒ_‚Í–³Œø‚Å‚·B" -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚ðƒGƒfƒBƒ^‚ÅŠJ‚­‚±‚Æ‚Í‚Å‚«‚Ü‚¹‚ñB" -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4551,7 +4633,7 @@ msgstr "" "‘¼•û‚Ƀ}ƒbƒ`‚·‚éˆÈ‰º‚̃tƒHƒ‹ƒ_‚ðì¬‚µAƒtƒHƒ‹ƒ_‚ðŠJ‚«‚Ü‚·‚©?:\n" "%1" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4565,47 +4647,47 @@ msgstr "" "ƒRƒs[‚ªŠëŒ¯‚É‚È‚è‚Ü‚·B\n" "ƒR[ƒhƒy[ƒW‚ðƒfƒtƒHƒ‹ƒgƒR[ƒhƒy[ƒW‚Æ‚µ‚Ĉµ‚¢‚Ü‚·‚ªA‚æ‚낵‚¢‚Å‚·‚©(„§)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒGƒ‰[‚É‚æ‚èî•ñ‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·B(—¼‘¤‚̃tƒ@ƒCƒ‹)" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒGƒ‰[‚É‚æ‚èî•ñ‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·B(ˆê”Ԗڂ̃tƒ@ƒCƒ‹)" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒGƒ‰[‚É‚æ‚èî•ñ‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·B(“ñ”Ԗڂ̃tƒ@ƒCƒ‹)" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "ƒGƒ“ƒR[ƒfƒBƒ“ƒOƒGƒ‰[‚É‚æ‚èî•ñ‚ªŽ¸‚í‚ê‚Ä‚¢‚Ü‚·B(ŽO”Ԗڂ̃tƒ@ƒCƒ‹)" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "·ˆÙ‚Í‚ ‚è‚Ü‚¹‚ñ" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "s‚̍·ˆÙ" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "%1ŒÂ‚Ì•¶Žš—ñ‚ð’uŠ·‚µ‚Ü‚µ‚½" -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "•¶Žš—ñ\"%s\"‚ªŒŸõ‚Å‚«‚Ü‚¹‚ñ" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "" "You are now entering Merge Mode. If you want to turn off Merge Mode, press " @@ -4615,7 +4697,7 @@ msgstr "" "‚̍·ˆÙ‚Ɉړ®‚Å‚«‚郂[ƒh‚Å‚·Bƒ}[ƒWƒ‚[ƒh‚ðƒIƒt‚É‚µ‚½‚¢ê‡‚́AF9ƒL[‚ð‰Ÿ‚µ" "‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "" "The number of automatically merged changes: %1\n" @@ -4624,102 +4706,102 @@ msgstr "" "Ž©“®“I‚Ƀ}[ƒW‚³‚ꂽ•ÏX‚̐”: %1\n" "‰ðŒˆ‚³‚ê‚Ä‚¢‚È‚¢ƒRƒ“ƒtƒŠƒNƒg‚̐”: %2" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "ƒR[ƒhƒy[ƒW‚̕ύX‚ªƒ}[ƒW‚³‚ê‚Ü‚µ‚½" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "ƒR[ƒhƒy[ƒW‚̕ύX‚ªƒRƒ“ƒtƒŠƒNƒg‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "‰üsƒR[ƒh‚̕ύX‚ªƒ}[ƒW‚³‚ê‚Ü‚µ‚½" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "‰üsƒR[ƒh‚̕ύX‚ªƒRƒ“ƒtƒŠƒNƒg‚µ‚Ä‚¢‚Ü‚·" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Location Pane" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Diff Pane" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "ƒpƒbƒ`ƒtƒ@ƒCƒ‹‚̏‘‚«ž‚݂ɐ¬Œ÷‚µ‚Ü‚µ‚½B" -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. €–Ú‚ª‚݂‚©‚ç‚È‚¢‚©AƒtƒHƒ‹ƒ_‚Å‚·!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. €–Ú‚ª‚݂‚©‚ç‚È‚¢‚©AƒtƒHƒ‹ƒ_‚Å‚·!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "o—ÍŒ‹‰Êƒtƒ@ƒCƒ‹‚ÍŠù‚É‘¶Ý‚µ‚Ü‚·B ã‘‚«‚µ‚Ü‚·‚©?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 ŒÂ‚̃tƒ@ƒCƒ‹‚ª‘I‘ð‚³‚ê‚Ä‚¢‚Ü‚·]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "ƒm[ƒ}ƒ‹" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "ƒRƒ“ƒeƒLƒXƒg" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "ƒ†ƒjƒtƒ@ƒCƒh" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "ƒtƒ@ƒCƒ‹ %1‚ɏ‘‚«ž‚ß‚Ü‚¹‚ñB" -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Žw’肵‚½o—̓pƒX‚́Aâ‘΃pƒX‚Å‚Í‚ ‚è‚Ü‚¹‚ñ: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "o—̓pƒX‚ðŽw’肵‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚©‚çƒpƒbƒ`ƒtƒ@ƒCƒ‹‚͐¶¬‚Å‚«‚Ü‚¹‚ñB" -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "ƒtƒHƒ‹ƒ_‚©‚çƒpƒbƒ`ƒtƒ@ƒCƒ‹‚͐¶¬‚Å‚«‚Ü‚¹‚ñB" -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4730,12 +4812,12 @@ msgstr "" "\n" "ƒpƒbƒ`¶¬‚ɂ́A•ÏX‚ª‘S‚Ä•Û‘¶‚³‚ê‚Ä‚¢‚é•K—v‚ª‚ ‚è‚Ü‚·B" -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "ƒtƒHƒ‹ƒ_‚Í‘¶Ý‚µ‚Ü‚¹‚ñB" -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4749,37 +4831,37 @@ msgstr "" "ƒA[ƒJƒCƒuƒTƒ|[ƒg‚Æ‚»‚ê‚ð—LŒø‚É‚·‚é•û–@‚ɂ‚¢‚Ă̏î•ñ‚́Aƒ}ƒjƒ…ƒAƒ‹‚ðŽQÆ‚µ" "‚Ä‚­‚¾‚³‚¢B" -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "ƒGƒNƒXƒ|[ƒg‚·‚éƒtƒ@ƒCƒ‹‚ðŽw’肵‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "ƒCƒ“ƒ|[ƒg‚·‚éƒtƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Ý’èî•ñ‚ªƒtƒ@ƒCƒ‹‚©‚çƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚µ‚½B" -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Ý’èî•ñ‚ðƒtƒ@ƒCƒ‹‚ɃGƒNƒXƒ|[ƒg‚µ‚Ü‚µ‚½B" -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "ƒtƒ@ƒCƒ‹‚©‚çÝ’èî•ñ‚̃Cƒ“ƒ|[ƒg‚ÉŽ¸”s‚µ‚Ü‚µ‚½B" -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "ƒtƒ@ƒCƒ‹‚ւ̐ݒèî•ñ‚̏‘‚«ž‚Ý‚ÉŽ¸”s‚µ‚Ü‚µ‚½B" -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4790,32 +4872,32 @@ msgstr "" "\n" "‘±s‚µ‚Ü‚·‚©?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "ƒ^ƒCƒv" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "“WŠJƒvƒ‰ƒOƒCƒ“" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "”äŠr‘Oˆ—ƒvƒ‰ƒOƒCƒ“" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "ƒGƒfƒBƒ^ƒXƒNƒŠƒvƒg" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "\n" @@ -4824,7 +4906,7 @@ msgstr "" "\n" "Œ»Ý‚̍s“à·ˆÙ" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "\n" @@ -4833,7 +4915,7 @@ msgstr "" "\n" "Ý’è" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "\n" @@ -4842,7 +4924,7 @@ msgstr "" "\n" "•\Ž¦XV (F5)" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "" "\n" @@ -4851,7 +4933,7 @@ msgstr "" "\n" "‘O‚̍·ˆÙ (Alt+Up)" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "" "\n" @@ -4860,7 +4942,7 @@ msgstr "" "\n" "ŽŸ‚̍·ˆÙ (Alt+Down)" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "" "\n" @@ -4869,7 +4951,7 @@ msgstr "" "\n" "‘O‚̃Rƒ“ƒtƒŠƒNƒg (Alt+Shift+Up)" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "" "\n" @@ -4878,7 +4960,7 @@ msgstr "" "\n" "ŽŸ‚̃Rƒ“ƒtƒŠƒNƒg (Alt+Shift+Down)" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "" "\n" @@ -4887,7 +4969,7 @@ msgstr "" "\n" "Å‰‚̍·ˆÙ (Alt+Home)" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "" "\n" @@ -4896,7 +4978,7 @@ msgstr "" "\n" "Œ»Ý‚̍·ˆÙ (Alt+Enter)" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "\n" @@ -4905,7 +4987,7 @@ msgstr "" "\n" "ÅŒã‚̍·ˆÙ (Alt+End)" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "\n" @@ -4914,7 +4996,7 @@ msgstr "" "\n" "‰E‚ÖƒRƒs[ (Alt+Right)" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "\n" @@ -4923,7 +5005,7 @@ msgstr "" "\n" "¶‚ÖƒRƒs[ (Alt+Left)" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "\n" @@ -4932,7 +5014,7 @@ msgstr "" "\n" "‰E‚ÖƒRƒs[‚µŽŸ‚Ö (Ctrl+Alt+Right)" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "\n" @@ -4941,7 +5023,7 @@ msgstr "" "\n" "¶‚ÖƒRƒs[‚µŽŸ‚Ö (Ctrl+Alt+Left)" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "\n" @@ -4950,7 +5032,7 @@ msgstr "" "\n" "‰E‚·‚ׂÄ" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "" "\n" @@ -4959,7 +5041,7 @@ msgstr "" "\n" "¶‚·‚ׂÄ" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "" "\n" @@ -4968,7 +5050,7 @@ msgstr "" "\n" "Ž©“®ƒ}[ƒW (Ctrl+Alt+M)" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "" "The adapted unpacker is applied to both files (one file only needs the " @@ -4977,32 +5059,32 @@ msgstr "" "Ž©“®“I‚É“WŠJƒvƒ‰ƒOƒCƒ“‚ð‘I‘ð‚µA—¼‘¤‚̃tƒ@ƒCƒ‹‚É“K—p‚µ‚Ü‚· (‚Ç‚¿‚ç‚©‚̃tƒ@ƒC" "ƒ‹‚ɂ́AŠg’£Žq‚ª•K—v‚Å‚·)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "”äŠr‘Oˆ—ƒvƒ‰ƒOƒCƒ“‚ðŽg—p‚µ‚È‚¢ (•W€)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "ŠÖ˜A‚·‚éƒvƒ‰ƒOƒCƒ“" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "‚»‚Ì‘¼‚̃vƒ‰ƒOƒCƒ“" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "‚¨Žg‚¢‚̃\ƒtƒgƒEƒFƒA‚͍ŐV”Å‚Å‚·" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "" "A new version of WinMerge is available.\n" @@ -5011,102 +5093,102 @@ msgstr "" "ÅV”Å‚ÌWinMerge‚ª“üŽè‰Â”\‚Å‚·B\n" "%1 ‚ªŒ»Ý‚̍ŐV”Å‚Å‚·(‚¨Žg‚¢‚̃o[ƒWƒ‡ƒ“‚Í %2) ƒ_ƒEƒ“ƒ[ƒh‚µ‚Ü‚·‚©?" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "ÅV”ŏî•ñ‚̃_ƒEƒ“ƒ[ƒh‚ÉŽ¸”s‚µ‚Ü‚µ‚½" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "ƒvƒ‰ƒOƒCƒ“Ý’è" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ‚ª‚݂‚©‚è‚Ü‚¹‚ñ - .sct ƒXƒNƒŠƒvƒg‚Í–³Œø‰»‚³‚ê‚Ü‚µ‚½" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "<‚È‚µ>" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "<Ž©“®>" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "s%1‚Ɉړ®(&O)" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "–³Œø" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "ƒtƒ@ƒCƒ‹ƒVƒXƒeƒ€" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Å‹ßŽg‚Á‚½ƒŠƒXƒg" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "ƒnƒCƒ‰ƒCƒg‚È‚µ" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Portable Object(.po)" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "¶‘¤‚̃^ƒu‚ð‘S‚ĕ‚¶‚é(&L)" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "‰E‘¤‚̃^ƒu‚ð‘S‚ĕ‚¶‚é(&I)" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "‘¼‚Ì‘S‚Ẵ^ƒu‚ð•Â‚¶‚é(&O)" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "ƒ^ƒu•‚ÌŽ©“®’²®‚ð—LŒø‚É‚·‚é(&A)" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "‰æ‘œ(&I)" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index 23ce46271..948e96087 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -79,7 +79,7 @@ msgid "Cu&t" msgstr "À߶󳻱â(&T)" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "º¹»ç(&C)" @@ -90,7 +90,7 @@ msgid "&Paste" msgstr "ºÙ¿©³Ö±â(&P)" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "À̵¿(&G)" @@ -101,22 +101,25 @@ msgid "Op&en" msgstr "¿­±â(&E)" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "¿¬°á ÇÁ·Î±×·¥(&R)" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "¿ÜºÎ ÆíÁý±â(&E)" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "ÇÁ·Î±×·¥ ¼±ÅÃ(&W)..." @@ -154,7 +157,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "È®´ë/Ãà¼Ò(&Z)" @@ -166,8 +169,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "¾øÀ½(&N)" @@ -184,49 +187,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "ÆÄÀÏ(&F)" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "»õ·Î ¸¸µé±â(&N)\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "¿­±â(&O)...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "ºÒÀÏÄ¡ ÆÄÀÏ ¿­±â(&E)..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "ÇÁ·ÎÁ§Æ® ¿­±â...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "ÇÁ·ÎÁ§Æ® ÀúÀå(&V)..." @@ -238,274 +241,274 @@ msgstr " #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< ºñ¾î ÀÖÀ½ >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "³¡³»±â(&X)" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "ÆíÁý(&E)" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "¼³Á¤(&O)..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "º¸±â(&V)" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "µµ±¸ ¸ðÀ½(&T)" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "ÀÛ°Ô(&S)" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "Å©°Ô(&B)" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "»óÅ ǥ½ÃÁÙ(&S)" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "ÅÇ µµ±¸ ¸ðÀ½(&B)" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "µµ±¸(&T)" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "ÇÊÅÍ(&F)" #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "ÆÐÄ¡ »ý¼º(&G)" #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "Ç÷¯±×ÀÎ(&P)" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "¼öµ¿ ¾ðÆÑ(&M)" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "ÀÚµ¿ ¾ðÆÑ(&A)" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "Ç÷¯±×ÀÎ ´Ù½Ã ·Îµå(&R)" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "â(&W)" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "´Ý±â(&O)" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "¸ðµÎ ´Ý±â(&S)" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "â Àüȯ(&P)\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "¼öÁ÷ Á¤·Ä(&H)" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "¼öÆò Á¤·Ä(&V)" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "°è´Ü½Ä Á¤·Ä(&C)" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "µµ¿ò¸»(&H)" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "WinMerge µµ¿ò¸»(&W)\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "¼³Á¤(&O)" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "GNU ¶óÀ̼¾½º(&G)" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "WinMerge Á¤º¸(&A)..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "¿ÞÂÊÀ» Àбâ Àü¿ëÀ¸·Î(E&)" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "¿À¸¥ÂÊÀ» Àбâ Àü¿ëÀ¸·Î(&G)" @@ -516,7 +519,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "¸ðµÎ ¼±ÅÃ(&A)\tCtrl+A" @@ -538,2441 +541,2501 @@ msgstr " #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "¿À¸¥ÂÊ¿¡¸¸ Á¸ÀçÇÏ´Â ÆÄÀÏ º¸±â(&G)" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "ÇÊÅ͸µµÈ ÆÄÀÏ º¸±â(&H)" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "¹ÙÀ̳ʸ® ÆÄÀÏ º¸±â(&H)" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "¼û±è ÆÄÀÏ º¸±â(&E)" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "±Û²Ã ¼±ÅÃ(&F)..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "±âº» ±Û²Ã »ç¿ë(&O)" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Åë°è ºñ±³(&R)" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "»õ·Î °íħ(&S)\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "¼±Åà ºÎºÐ »õ·Î °íħ(&R)\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "º´ÇÕ(&M)" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "ºñ±³(&M)\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "´ÙÀ½ Â÷ÀÌÁ¡(&N)\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "ÀÌÀü Â÷ÀÌÁ¡(&P)\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "óÀ½ Â÷ÀÌÁ¡(&F)\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "ÇöÀç ¼±ÅÃµÈ Â÷ÀÌÁ¡(&C)\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "¸¶Áö¸· Â÷ÀÌÁ¡(&L)\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "¿À¸¥ÂÊÀ¸·Î º¹»ç(&R)\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "¿ÞÂÊÀ¸·Î º¹»ç(&E)\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "»èÁ¦(&D)\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "µð·ºÅ丮 ºñ±³ ¼³Á¤(&Customize Columns)" -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "º¸°í¼­ ¸¸µé±â(&R)..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "ÀúÀå(&S)\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "¿ÞÂÊ ÀúÀå(&L)" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "¿À¸¥ÂÊ ÀúÀå(&R)" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "Àμâ(&P)..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "ÆäÀÌÁö ¼³Á¤(&T)" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "¹Ì¸® º¸±â(&R)" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "EOL º¯È¯(&C)" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "º´ÇÕ ¸ðµå\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "ÆÄÀÏ ÀÎÄÚµù(&F)..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "½ÇÇà Ãë¼Ò(&U)\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "´Ù½Ã ½ÇÇà(&R)\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "À߶󳻱â(&T)\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "º¹»ç(&C)\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "ºÙ¿©³Ö±â(&P)\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "¶óÀÎ Â÷ÀÌÁ¡ ¼±ÅÃ(&D)\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "ã±â(&I)...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "¹Ù²Ù±â(&C)...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "°í±Þ" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "Çà ¹øÈ£ Æ÷ÇÔ º¹»ç(&C)\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "ºÏ¸¶Å©(&B)" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "ºÏ¸¶Å© Åä±Û(&T)\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "´ÙÀ½ ºÏ¸¶Å©(&N)\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "ÀÌÀü ºÏ¸¶Å©(&P)\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "¸ðµç ºÏ¸¶Å© »èÁ¦(&C)" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "À̵¿(&G)...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "È®´ë(&I)\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Ãà¼Ò(&O)\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "Ç¥ÁØ(&N)\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "±¸¹® °­Á¶" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "â Àá±Ý(&L)" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "°ø¹é º¸±â(&V)" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "¶óÀÎ Â÷ÀÌÁ¡ º¸±â(&W)" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Çà ¹øÈ£ º¸±â(&N)" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "¿©¹é º¸±â(&M)" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "ÀÚµ¿ ÁÙ ¹Ù²Þ(&R)" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "⠸¹ٲٱâ(&A)" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "¼±Åà ºñ±³Ã¢ º¸±â(&P)" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "À§Ä¡ Ç¥½Ãâ(&C)" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "¿À¸¥ÂÊÀ¸·Î º¹»ç ÈÄ ´ÙÀ½ Â÷ÀÌÁ¡À¸·Î À̵¿(&O)\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "¿ÞÂÊÀ¸·Î º¹»ç ÈÄ ´ÙÀ½ Â÷ÀÌÁ¡À¸·Î À̵¿(&T)\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "¸ðµÎ ¿À¸¥ÂÊÀ¸·Î º¹»ç(&A)" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "¸ðµÎ ¿ÞÂÊÀ¸·Î º¹»ç(&E)" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "½ºÅ©¸³Æ®(&S)" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "ºñ±³(&A)" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "¿ÞÂÊ¿¡¼­ ¿À¸¥ÂÊÀ¸·Î(&L)" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "¿ÞÂÊ º¹»ç À§Ä¡ ÁöÁ¤(&E)" +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "¿À¸¥ÂÊ¿¡¼­ ¿ÞÂÊÀ¸·Î(&R)" +msgid "Left to Right (%1 of %2)" +msgstr "¿À¸¥ÂÊÀ¸·Î (%1 / %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "¿À¸¥ÂÊ º¹»ç À§Ä¡ ÁöÁ¤(&I)" +msgid "Left to... (%1 of %2)" +msgstr "¿ÞÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 / %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "À̵¿(&M)" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "¿ÞÂÊ À̵¿ À§Ä¡ ÁöÁ¤(&L)" +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "¿À¸¥ÂÊ À̵¿ À§Ä¡ ÁöÁ¤(&R)" +msgid "Right to Left (%1 of %2)" +msgstr "¿ÞÂÊÀ¸·Î (%1 / %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 / %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "À̵¿(&M)" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "»èÁ¦(&D)" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "¿ÞÂʸ¸(&L)" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "¿À¸¥Âʸ¸(&R)" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "¸ðµÎ(&B)" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "À̸§ ¹Ù²Ù±â(&N)" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "¼û±â±â(&H)" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "¿ÞÂÊ ÆÄÀÏ ¿­±â(&O)" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¿­±â(&O)" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "°æ·Î º¹»ç(&Y)" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "¿ÞÂʸ¸(&L) (%1 / %2)" +msgid "Left (%1 of %2)" +msgstr "¿ÞÂÊ (%1 / %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "¿À¸¥Âʸ¸(&R) (%1 / %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "¿À¸¥ÂÊ (%1 / %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "¸ðµÎ (%1 / %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "¸ðµÎ(&B) (%1 / %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "ÆÄÀÏ¸í º¹»ç(&F)" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "¾ÐÃà(&Z)" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "¿ÞÂʸ¸(&L)... (%1 / %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "¿À¸¥Âʸ¸(&R)... (%1 / %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "¸ðµÎ(&B)... (%1 / %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "´Ù¸¥ ÆÄÀϸ¸(&D)... (%1 / %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "»õ·Î °íħ(&R)" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "Àüü °æ·Î º¹»ç(&C)" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "ÆÄÀÏ¸í º¹»ç(&F)" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Prediffer ¼³Á¤" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "prediffer »ç¿ë ¾È ÇÔ(&N)" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "prediffer ÀÚµ¿ ¼±ÅÃ" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Â÷ÀÌÁ¡À¸·Î À̵¿(&O)" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "À̵¿¿µ¿ª Ç¥½ÃÇÏÁö ¾ÊÀ½(&N)" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "¸ðµç À̵¿¿µ¿ª Ç¥½Ã(&A)" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "ÇöÀç ¼±ÅÃµÈ À̵¿¿µ¿ª¸¸ Ç¥½Ã(&C)" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "°ø¹é ¹®ÀÚ" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "¸ðµÎ ºñ±³(&P)" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "º¯°æµÈ ºÎºÐ ¹«½Ã(&G)" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "¸ðµÎ ºñ±³ ¾È ÇÔ(&N)" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "´ë¼Ò¹®ÀÚ ±¸ºÐ(&T)" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Äɸ®Áö ¸®ÅÏ Â÷ÀÌ ¹«½Ã(&R) (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Àüü ³»¿ë ºñ±³" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "ºü¸¥ ³»¿ë ºñ±³" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "º¯°æµÈ ³¯Â¥" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "º¯°æµÈ ³¯Â¥ ¹× ÆÄÀÏ Å©±â" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "ÆÄÀÏ Å©±â" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "WinMerge Á¤º¸" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(°³ÀÎ ºôµå)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "WinMerge ȨÆäÀÌÁö ¹æ¹®!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "È®ÀÎ" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "¹èÆ÷ÀÚ" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "µð·ºÅ丮/ÆÄÀÏ ¼±ÅÃ" -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "ã¾Æº¸±â(&B)" -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "ã¾Æº¸±â(&R)..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "ã¾Æº¸±â(&O)" -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "¼±ÅÃ..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "¾ðÆÑÄ¿(&U):" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "¼±ÅÃ(&S)..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "ÇÏÀ§ µð·ºÅ丮 Æ÷ÇÔ(&I)" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "»óÅÂ:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Ãë¼Ò" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "µµ¿ò¸»" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "ºñ±³ÇÒ µð·ºÅ丮/ÆÄÀÏ" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "µ¥ÀÌÅͺ£À̽º:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "ÇÁ·ÎÁ§Æ®:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "»ç¿ëÀÚ:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "ºñ¹Ð¹øÈ£:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "VSS ÇÁ·ÎÁ§Æ®¿¡ ¿¬°á" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "¸ðµç Ç׸ñ¿¡ Àû¿ë" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "üũ¾Æ¿ô" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Çü»ó °ü¸® ½Ã½ºÅÛ" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "Çü»ó °ü¸® ½Ã½ºÅÛ(&V) :" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe °æ·Î(&P) :" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "ÀϹÝ" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "óÀ½ Â÷ÀÌÁ¡À¸·Î ÀÚµ¿ ½ºÅ©·Ñ(&S)" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "ESC·Î ⠴ݱâ(&O)" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "¿­±â ´ëÈ­ »óÀÚ¿¡¼­ ÀÚµ¿À¸·Î ¿Ã¹Ù¸¥ °æ·ÎÀÎÁö °Ë»ç" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Winmerge ½Ì±Û ÀνºÅϽº¸¸ Çã¿ëÇÔ(&A)" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "¿©·¯ â ´ÝÀ» ¶§ ¹°¾îº¸±â(&K)" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "ºñ±³ ½Ã ÆÄÀÏ ½Ã°£ º¸È£(&P)" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "¿­±â ´ëÈ­ »óÀÚ ÀÚµ¿¿Ï¼º ±â´É(&P):" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "ÀϺΠ°æ°í ¸Þ½ÃÁö´Â º¸ÀÌÁö ¾Ê°Ô ÇÒ ¼ö ÀÖ½À´Ï´Ù. ÃʱâÈ­Çϸé ÇØ´ç ¸Þ½ÃÁö´Â ´Ù½Ã Ç¥½ÃµË´Ï´Ù." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "ÃʱâÈ­" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "ã±â" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "ãÀ» ³»¿ë(&N) :" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "´Ü¾î ´ÜÀ§·Î(&W)" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "´ë¼Ò¹®ÀÚ ±¸ºÐ(&C)" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "Á¤±Ô Ç¥Çö½Ä(&E)" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "EOF ·¦ ¾È ÇÔ(&O)" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "´ÙÀ½ ã±â(&F)" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "È®ÀÎ(&O)" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "¹Ù²Ù±â" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "º¯°æ ³»¿ë(&P):" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "EOF ·¦ ¾È ÇÔ(&D)" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Àû¿ë ¹üÀ§" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "ÇöÀç ÆÄÀÏ(&S)" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "¸ðµç ÆÄÀÏ(&O)" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "¹Ù²Ù±â(&R)" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "¸ðµÎ ¹Ù²Ù±â(&A)" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "üũ¾Æ¿ô" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "ÁÖ¼®" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "üũ¾Æ¿ô ÈÄ Ã¼Å©ÀÎ" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "¶óÀÎ ÇÊÅÍ" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "¶óÀÎ ÇÊÅÍ »ç¿ë" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Á¤±Ô Ç¥Çö½Ä (¸Å ¶óÀθ¶´Ù Àû¿ë):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "»õ·Î ¸¸µé±â" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "ÆíÁý" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Á¦°Å" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "»ö»ó" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Â÷ÀÌÁ¡:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "¼±ÅÃµÈ Â÷ÀÌÁ¡:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "¹è°æ»ö" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "»èÁ¦ ºÎºÐ" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "ÅؽºÆ®" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "¹«½ÃµÈ Â÷ÀÌÁ¡:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "À̵¿ÇÑ ºÎºÐ:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "¼±ÅÃµÈ À̵¿ÇÑ ºÎºÐ:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "´Ü¾î ´ÜÀ§ Â÷ÀÌÁ¡:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "¼±ÅÃµÈ ´Ü¾î ´ÜÀ§ Â÷ÀÌÁ¡:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "±âº»°ª" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "½Ã½ºÅÛ" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "»èÁ¦ÇÑ ÆÄÀÏÀº ÈÞÁöÅëÀ¸·Î(&P)" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "¿ÜºÎ ÆíÁý±â(&E):" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "µð·ºÅ丮 ÇÊÅ͸µ(&F):" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Àӽà ÆÄÀÏ Æú´õ" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "½Ã½ºÅÛ Àӽà Æú´õ(&Y)" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "»ç¿ëÀÚ Æú´õ(&U):" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "ÆÐÄ¡ »ý¼º±â" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "ÆÄÀÏ&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "ÆÄÀÏ&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "¸Â¹Ù²Ù±â(&S)" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "Á¸ÀçÇÏ´Â ÆÄÀÏ¿¡ µ¡ºÙÀ̱â(&A)" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "°á°ú(&R):" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "ã¾Æº¸±â(&W)" -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "Çü½Ä(&F)" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "½ºÅ¸ÀÏ(&Y):" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "ÄÁÅؽºÆ®(&C):" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "°ø¹é ¶óÀÎ ¹«½Ã(&E)" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Ä¿¸Çµå ¶óÀο¡¼­ ½ÇÇà½Ã¿¡µµ Àû¿ë(&D)" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "¿ÜºÎ ÆíÁý±â·Î ¿­±â(&X)" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "µð·ºÅ丮 ºñ±³ Ç¥½Ã Ç׸ñ" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "À§·Î(&U)" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "¾Æ·¡·Î(&D)" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "¾ðÆÑÄ¿ ¼±ÅÃ" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "ÆÄÀÏ ¾ðÆÑÄ¿:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "¸ðµç ¾ðÆÑÄ¿ Ç¥½Ã, È®ÀåÀÚ¸¦ È®ÀÎÇÏÁö ¾ÊÀ½" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "È®ÀåÀÚ ¸ñ·Ï:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "¼³¸í:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "ÁßÁö" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "ºñ±³ ÁøÇà Áß..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "ºñ±³ ¿Ï·áµÈ ÆÄÀÏ :" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "¸ðµç ÆÄÀÏ :" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "À̵¿" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "À̵¿(&O):" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "ÆÄÀÏ" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "À̵¿ÇÒ °÷" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "¶óÀÎ(&N)" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "Â÷ÀÌÁ¡(&D)" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "À̵¿(&G)" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "ºñ±³" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "°ø¹é" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "°ø¹é ºñ±³(&W)" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "º¯°æ ³»¿ë ¹«½Ã(&H)" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "¸ðµç °ø¹é ¹«½Ã(&A)" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "°ø¹é ¶óÀÎ ¹«½Ã(&K)" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "´ë¼Ò¹®ÀÚ ¹«½Ã(&C)" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "À̵¿¿µ¿ª ã±â È°¼ºÈ­" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "ºñ½ÁÇÑ ¶óÀÎ ´ëÁ¶(&M)" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "ÁÖ¼® ÇÊÅ͸µ" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "ÆíÁý±â" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "±¸¹® °­Á¶" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "ÀÚµ¿ ¸®½ºÄµ(&R)" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "¿øº» EOL º¸Á¸(&P)" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "ÅÇ" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "ÅÇ Å©±â(&T):" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "ÅÇ »ðÀÔ(&T)" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "°ø¹é »ðÀÔ(&N)" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "¶óÀÎ Â÷ÀÌÁ¡ »ö ºÎ¿©" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "¶óÀÎ Â÷ÀÌÁ¡ º¸±â" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "¹®ÀÚ ´ÜÀ§(&C)" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "´Ü¾î ´ÜÀ§(&W):" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "ÆÄÀÏ ÇÊÅÍ" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Å×½ºÆ®" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "¼³Ä¡..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "»õ·Î ¸¸µé±â..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "ÆíÁý..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "»èÁ¦..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "¼öÁ¤ ÆÄÀÏ ÀúÀå" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "¿ÞÂÊ ÆÄÀÏ" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "ÀúÀå(&S)" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "ÀúÀå ¾È ÇÔ(&D)" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "¿À¸¥ÂÊ ÆÄÀÏ" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "ÀúÀå(&A)" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "ÀúÀå ¾È ÇÔ(&C)" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "ÄÚµåÆäÀÌÁö" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "±âº» ÄÚµåÆäÀÌÁö" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "À¯´ÏÄÚµå ÆÄÀÏÀÌ ¾Æ´Ñ ÆÄÀÏÀ» ¿­ ¶§ ±âº»À¸·Î »ç¿ëÇÒ ÄÚµåÆäÀÌÁö ¼±ÅÃ:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "½Ã½ºÅÛ ÄÚµåÆäÀÌÁö" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "WinMerge UI¸¦ µû¸§" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "¼³Á¤" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Ä«Å×°í¸®" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "°¡Á®¿À±â..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "³»º¸³»±â..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "´ëÈ­ »óÀÚ" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Å°¿öµå:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "ÇÔ¼ö:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "ÁÖ¼®:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "¼ýÀÚ:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "¿¬»êÀÚ:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "¹®ÀÚ¿­:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Àü󸮱â:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "»ç¿ëÀÚ ¼³Á¤ 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "»ç¿ëÀÚ ¼³Á¤ 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "±½°Ô" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "µð·ºÅ丮 ºñ±³ °á°ú ¸®Æ÷Æ®" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "º¸°í¼­ ÆÄÀÏ(&F):" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "ã¾Æº¸±â..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "Çü½Ä(&S):" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "Ŭ¸³º¸µå·Î º¹»ç(&C)" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "°øÀ¯ / °³ÀÎ ÇÊÅÍ" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "»ý¼ºÇÒ ÇÊÅÍ Çü½ÄÀ» ¼±ÅÃÇϽʽÿÀ" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "°øÀ¯ ÇÊÅÍ (¸ðµç »ç¿ëÀÚ)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "°³ÀÎ ÇÊÅÍ (ÇöÀç »ç¿ëÀÚ)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "¾ÐÃà ÆÄÀÏ Áö¿ø" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "¾ÐÃà ÆÄÀÏ Áö¿ø »ç¿ë(&E)" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "ÆÄÀÏ ¼­¸íÀ¸·ÎºÎÅÍ ¾ÐÃà Çü½Ä °¨Áö(&D)" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "ºñ±³ ¿ä¾à" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Æú´õ:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "ÆÄÀÏ:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "´Ù¸§" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "ÅؽºÆ®:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "¹ÙÀ̳ʸ®:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "ÇÑÂʸ¸ Á¸Àç" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "¿ÞÂÊ:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "¿À¸¥ÂÊ:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "µ¿ÀÏ" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Àüü:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "´Ý±â" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Àû¿ë" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Àû¿ë)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "ÄÚµåÆäÀÌÁö ¼±ÅÃ:" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "¿­ ¶§ÀÇ ÄÚµåÆäÀÌÁö(&F):" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "ÀúÀå½Ã ÄÚµåÆäÀÌÁö(&S):" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "¾çÂÊ ¸ðµÎ µ¿ÀÏ ÄÚµåÆäÀÌÁö Àû¿ë(&U)" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "Àû¿ë(&A)" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "Ãë¼Ò(&C)" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "ÇÊÅÍ ½ÃÇè" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "ÇÊÅÍ ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "½ÃÇèÇÒ ÅؽºÆ® ÀÔ·Â(&T)" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "Æú´õ¸í(&F)" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "°á°ú:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "½ÃÇè(&T)" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "´Ý±â(&C)" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "»ç¿ëÀÚ »ö»ó »ç¿ë(&U)" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "»ç¿ëÀÚ »ö»ó" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "°ø¹é:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "ÅؽºÆ®:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "¼±Åà ºÎºÐ:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "°æ·Î" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "¿ÞÂÊ(&L):" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Àбâ Àü¿ë(&E)" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "¿À¸¥ÂÊ(&R):" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Àбâ Àü¿ë(&A)" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "ÇÊÅÍ(&F):" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "¿­±â..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "ÀúÀå..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "ÆÄÀÏ ¹é¾÷" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "´ÙÀ½¿¡ ¹é¾÷ ÆÄÀÏ »ý¼º:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "µð·ºÅ丮 ºñ±³(&F)" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "ÆÄÀÏ ºñ±³(&E)" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "´ÙÀ½À¸·Î ¹é¾÷ ÆÄÀÏ »ý¼º:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "¿øº» ÆÄÀÏ Æú´õ(&O)" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "Àü¿ª ¹é¾÷ Æú´õ(&G):" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "¹é¾÷ ÆÄÀϸí:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr ".bak È®ÀåÀÚ Ãß°¡(&A)" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "ÆÄÀÏ ½Ã°£ Ãß°¡(&P)" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "º¹»ç È®ÀÎ" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Á¤¸» XXX Ç׸ñÀ» º¹»çÇϽðڽÀ´Ï±î?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "¿ÞÂÊÀ¸·ÎºÎÅÍ" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "¿À¸¥ÂÊÀ¸·Î" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "¿¹" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "¾Æ´Ï¿À" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "°í±Þ ¸Þ´º È°¼ºÈ­(&N)" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "µð·ºÅ丮" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "Â÷ÀÌÁ¡ ¹ß°ß½Ã ¹Ù·Î ÁßÁö(&T)" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "3ÃÊ À̳» ½Ã°£ Â÷ÀÌ´Â ¹«½ÃÇϱâ(&O)" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "¹ÙÀ̳ʸ®" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "041203b5" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x412, 949" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "ÇÁ·ÎÁ§Æ®¸¦ ¿©´Â Áß ¾Ë ¼ö ¾ø´Â ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "ÇÁ·ÎÁ§Æ®¸¦ ÀúÀåÇÏ´Â Áß ¾Ë ¼ö ¾ø´Â ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "ÇÁ·ÎÁ§Æ® ÆÄÀÏ" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "ÇÁ·ÎÁ§Æ®°¡ Á¤»óÀûÀ¸·Î ¿­·È½À´Ï´Ù." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "ÇÁ·ÎÁ§Æ®°¡ Á¤»óÀûÀ¸·Î ÀúÀåµÇ¾ú½À´Ï´Ù." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2991,7 +3054,7 @@ msgstr "" "WinMerge.ÆÄÀÏ ºñ±³\n" "WinMerge ÆÄÀÏ ºñ±³" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3010,7 +3073,7 @@ msgstr "" "WinMerge.Æú´õ ºñ±³\n" "WinMerge Æú´õ ºñ±³" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3019,143 +3082,143 @@ msgstr "" "°³¹ßÀÚ:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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´Â Àý´ëÀûÀ¸·Î º¸ÁõµÇÁö ¾Ê½À´Ï´Ù. ÀÌ ¼ÒÇÁÆ®¿þ¾î´Â ¹«·áÀ̸ç, ÀûÀýÇÑ È¯°æ ÇÏ¿¡¼­ÀÇ ¹èÆ÷´Â ȯ¿µÇÕ´Ï´Ù; ÀÚ¼¼ÇÑ ³»¿ëÀº µµ¿ò¸» ¸Þ´º¿¡¼­ GNU ¶óÀ̼¾½º¸¦ ÂüÁ¶ÇϽʽÿÀ." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "ÁßÁö(&A)" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "Àç½Ãµµ(&)" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "¹«½Ã(&I)" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "¸ðµÎ ¹«½Ã(&A)" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "¿¹(&Y)" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "¸ðµÎ Àû¿ë(&A)" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "¾Æ´Ï¿À(&N)" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "¸ðµÎ ¾Æ´Ï¿À(&L)" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "°è¼Ó(&C)" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "¹«½Ã(&S)" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "¸ðµÎ ¹«½Ã(&A)" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "ÀÌ ¸Þ½ÃÁö¸¦ ´Ù½Ã Ç¥½ÃÇÏÁö ¾ÊÀ½(&M)" -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "´Ù½Ã ¹¯Áö ¾ÊÀ½(&Q)" -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Çü»ó °ü¸®" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Â÷ÀÌÁ¡" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "->" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "¿ÞÂÊÀ¸·ÎºÎÅÍ:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "¿ÞÂÊÀ¸·Î:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "¿À¸¥ÂÊÀ¸·ÎºÎÅÍ:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "¿À¸¥ÂÊÀ¸·Î:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "¹öÀü %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "À¯´ÏÄÚµå" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "¼³Á¤ (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "ÀÌÁ¦ ¸ðµç ¸Þ½ÃÁö ¹Ú½º°¡ È°¼ºÈ­µË´Ï´Ù." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3166,84 +3229,84 @@ msgstr "" "\n" "°¡´É ¹üÀ§: 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "¿­±â" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "ÇÁ·Î±×·¥|*.exe;*.bat;*.cmd|¸ðµç ÆÄÀÏ (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "¸ðµç ÆÄÀÏ (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ÇÁ·ÎÁ§Æ® ÆÄÀÏ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "¼³Á¤ ÆÄÀÏ (*.ini)|*.ini|All Files (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Text ÆÄÀÏ (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|¸ðµç ÆÄÀÏ (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML ÆÄÀÏ (*.htm,*.html)|*.htm;*.html|¸ðµç ÆÄÀÏ (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ÆÄÀÏ (*.xml)|*.xml|¸ðµç ÆÄÀÏ (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "À̸§" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "°æ·Î" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "ÇÊÅÍ" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "¼³¸í" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "»ý¼ºÇÒ ÇÊÅÍÀÇ ÆÄÀϸíÀ» ÀÔ·ÂÇϽʽÿÀ." -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "ÆÄÀÏ ÇÊÅÍ (*.flt)|*.flt|¸ðµç ÇÊÅÍ (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3255,7 +3318,7 @@ msgstr "" "\n" "%1 ÆÄÀÏÀ» WinMerge/Filters -Æú´õ·Î º¹»çÇϽʽÿÀ." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3268,7 +3331,7 @@ msgstr "" "\n" "Æú´õ°¡ Á¸ÀçÇÏ°í ¾²±â °¡´ÉÀÎÁö È®ÀÎÇϽʽÿÀ." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3279,7 +3342,7 @@ msgstr "" "\n" "¼³Á¤/½Ã½ºÅÛ ¸Þ´º¿¡¼­ ÇÊÅÍ Æú´õ¸¦ ¼±ÅÃÇϽʽÿÀ." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3292,12 +3355,12 @@ msgstr "" "\n" "Ȥ½Ã Àбâ Àü¿ë ÆÄÀÏÀÌ ¾Æ´Ñ°¡¿ä?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "¼³Ä¡ÇÒ ÇÊÅÍ ÆÄÀÏ À§Ä¡" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3308,188 +3371,188 @@ msgstr "" "\n" "»õ ÇÊÅÍ ÆÄÀÏÀ» ÇÊÅÍ Æú´õ·Î º¹»çÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "ÇÊÅÍ ÆÄÀÏÀÌ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾²±â ÇϽðڽÀ´Ï±î?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Á¤±Ô Ç¥Çö½Ä" -#: Merge.rc:2151 +#: Merge.rc:2172 #, 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:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "µð·ºÅ丮 ºñ±³ °á°ú" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "ÆÄÀÏ ºñ±³" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "À̸§¾ø´Â ¹®¼­" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "À̸§¾ø´Â ¹®¼­" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "±× ÆÄÀÏ" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "¸¶ÀÎ ÆÄÀÏ" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "¶óÀÎ: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "º´ÇÕ" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "´Ù¸¥ ÆÄÀÏ(%1 of %2)" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1°³ÀÇ Â÷ÀÌÁ¡ Á¸Àç" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1°³ÀÇ Â÷ÀÌÁ¡ Á¸Àç" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Ç׸ñ %1 / %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Ç׸ñ: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "ºñ±³ÇÒ µð·ºÅ丮 ¶Ç´Â ÆÄÀÏÀ» ¼±ÅÃÇϽʽÿÀ." -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "µð·ºÅ丮 ¼±ÅÃ" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "ºñ±³ÇÒ µð·ºÅ丮/ÆÄÀÏ ¼±ÅÃ" -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "¿ÞÂÊÀº À߸øµÈ °æ·ÎÀÔ´Ï´Ù!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "¿À¸¥ÂÊÀº À߸øµÈ °æ·ÎÀÔ´Ï´Ù!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "¾çÂÊ ¸ðµÎ À߸øµÈ °æ·ÎÀÔ´Ï´Ù!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "¾ðÆÑÄ¿ ¼±Åà Ȱ¼ºÈ­¸¦ À§ÇØ µÎ ÆÄÀÏÀ» ¼±ÅÃÇϽʽÿÀ." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "µð·ºÅ丮/ÆÄÀÏÀ» ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "ÇØ´çÇÏ´Â ÆÄÀÏÀÌ ¾ø½À´Ï´Ù : %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "unpack µÈ ÆÄÀÏ: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3502,12 +3565,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "ºÒÀÏÄ¡ ÆÄÀÏ ÆÄ½Ì ½ÇÆÐ." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3518,27 +3581,27 @@ msgstr "" "%1 ÆÄÀÏÀº\n" "ºÒÀÏÄ¡ ÆÄÀÏÀÌ ¾Æ´Õ´Ï´Ù." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "%1 ÀÇ º¯°æµÈ ºÎºÐÀ» ÀúÀåÇÒ±î¿ä?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 (Àº)´Â Àбâ Àü¿ë ÆÄÀÏÀÔ´Ï´Ù. µ¤¾î ¾µ±î¿ä? (´Ù¸¥ À̸§À¸·Î ÀúÀåÇÏ·Á¸é ¾Æ´Ï¿À¸¦ ¼±ÅÃÇϼ¼¿ä.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "ÆÄÀÏ ¹é¾÷À» ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3551,7 +3614,7 @@ msgstr "" "\n" "°è¼Ó ÁøÇàÇÒ±î¿ä?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3567,7 +3630,7 @@ msgstr "" "\t- ´Ù¸¥ À̸§À¸·Î ÀúÀå(È®ÀÎ)\n" "\t- ÀúÀå Ãë¼Ò(Ãë¼Ò)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3577,7 +3640,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3587,7 +3650,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3601,7 +3664,7 @@ msgstr "" "\n" "µ¤¾î¾µ±î¿ä?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3610,32 +3673,32 @@ msgstr "" "%1\n" "Àбâ Àü¿ë ÆÄÀÏÀÔ´Ï´Ù. µ¤¾î¾²½Ã°Ú½À´Ï±î?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, 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:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "¿ÞÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "¿À¸¥ÂÊ ÆÄÀÏ ´Ù¸¥ À̸§À¸·Î ÀúÀå" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3646,42 +3709,42 @@ msgstr "" "\n" "°è¼ÓÇϱâ Àü¿¡ »õ·Î °íħÀ» ÇØ ÁÖ¼¼¿ä." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "°è¼ÓÇÏ·Á¸é ¼Ò½º¼¼ÀÌÇÁ ÇÁ·ÎÁ§Æ® °æ·Î¸¦ ¼³Á¤ÇØ¾ß ÇÕ´Ï´Ù (¿¹: $/MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "VSS üũ¾Æ¿ô ÆÄÀÏ..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "üũ¾Æ¿ô ½ÇÇà Áß ¿À·ù°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù. ´õ ÀÌ»ó ÁøÇàÇÒ ¼ö ¾ø½À´Ï´Ù..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "¹öÀü °ü¸®½Ã½ºÅÛ ¸í·É ½ÇÇà ½ÇÆÐ." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ¿öÅ· Æú´õ¿Í ÇöÀç ÆÄÀÏÀÇ °æ·Î°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù. °è¼ÓÇÏ°Ú½À´Ï±î?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "VSS µ¥ÀÌÅͺ£À̽º°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "VSS ¿À·ù:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3689,134 +3752,153 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" " Please, check config spec of used view. " msgstr "" -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "»ç¿ë ¾È ÇÔ" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 ÀÌÇÏ)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ÀÌ»ó)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "°ø¹é ¹ß°ß½Ã ¸ØÃã" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "°ø¹é ¶Ç´Â ±¸µÎÁ¡ ¹ß°ß½Ã ¸ØÃã" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "¿ÞÂÊÀ¸·Î (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "¿À¸¥ÂÊÀ¸·Î (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "¿ÞÂÊÀ¸·Î (%1 / %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "¿À¸¥ÂÊÀ¸·Î (%1 / %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "¿À¸¥ÂÊÀ¸·Î (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "¿ÞÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "¿ÞÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 / %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "¿À¸¥ÂÊ ÆÄÀÏ À§Ä¡ÁöÁ¤ º¹»ç (%1 / %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "¿ÞÂÊ (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "¿À¸¥ÂÊ (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "¸ðµÎ (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "¿ÞÂÊ (%1 / %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "¿À¸¥ÂÊ (%1 / %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "¸ðµÎ (%1 / %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "¿ÞÂÊ - À̵¿ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "¿À¸¥ÂÊ - À̵¿ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ÆÄÀÏ º¯°æµÊ)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 / %2 ÆÄÀÏ º¯°æµÊ)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3827,17 +3909,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Á¤¸» º¹»çÇϽðڽÀ´Ï±î:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Á¤¸» %d Ç׸ñÀ» º¹»çÇϽðڽÀ´Ï±î:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3849,502 +3931,502 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "¿ÜºÎ ÆíÁý±â ½ÇÇà ½ÇÆÐ: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "¾Ë ¼ö ¾ø´Â ¾ÐÃà Çü½Ä" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "À̸§" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "ºñ±³ °á°ú" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "¿ÞÂÊ ³¯Â¥" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "¿À¸¥ÂÊ ³¯Â¥" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "È®ÀåÀÚ" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "¿ÞÂÊ Å©±â" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "¿À¸¥ÂÊ Å©±â" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "¿À¸¥ÂÊ Å©±â (ª°Ô)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "¿ÞÂÊ Å©±â (ª°Ô)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "¿ÞÂÊ »ý¼º ½Ã°£" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "¿À¸¥ÂÊ »ý¼º ½Ã°£" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "ÃֽŠÆÄÀÏ" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "¿ÞÂÊ ÆÄÀÏ ¹öÀü" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¹öÀü" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "¿ä¾à °á°ú" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "¿ÞÂÊ ¼Ó¼º" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "¿À¸¥ÂÊ ¼Ó¼º" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "¿ÞÂÊ EOL" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "¿À¸¥ÂÊ EOL" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "¿ÞÂÊ ÀÎÄÚµù" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "¿À¸¥ÂÊ ÀÎÄÚµù" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "ºñ±³ÇÏÁö ¾ÊÀº Â÷ÀÌÁ¡" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "ÆÄÀÏÀ» ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "ºñ±³ ÁßÁöµÈ ÆÄÀÏ" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "ÇÊÅ͸µµÈ ÆÄÀÏ" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "ÇÊÅ͸µµÈ µð·ºÅ丮" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "¿ÞÂʸ¸: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "¿À¸¥Âʸ¸: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "µ¿ÀÏÇÑ ÆÄÀÏ(¹ÙÀ̳ʸ® ÆÄÀÏ)" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "µ¿ÀÏÇÏÁö ¾ÊÀº ÆÄÀÏ(¹ÙÀ̳ʸ® ÆÄÀÏ)" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "µ¿ÀÏÇÏÁö ¾ÊÀº ÆÄÀÏ" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "¿ÞÂʸ¸ Á¸Àç" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "¿À¸¥Âʸ¸ Á¸Àç" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "¿À·ù" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "¼Ò¿ä ½Ã°£: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 Ç׸ñ ¼±ÅÃ" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 Ç׸ñ ¼±ÅÃ" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "µð·ºÅ丮¸í ¶Ç´Â ÆÄÀϸí." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "ÇÏÀ§ µð·ºÅ丮°¡ ÀÖÀ»¶§ ÇÏÀ§ µð·ºÅ丮 À̸§." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "ÀÚ¼¼ÇÑ ºñ±³ °á°ú." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "¿ÞÂÊ ¼öÁ¤ ½Ã°£." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "¿À¸¥ÂÊ ¼öÁ¤ ½Ã°£." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "ÆÄÀÏ È®ÀåÀÚ." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "¿ÞÂÊ ÆÄÀÏ Å©±â(byte)." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "¿À¸¥ÂÊ ÆÄÀÏ Å©±â(byte)." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "¿ÞÂÊ ÆÄÀÏ Å©±â(ª°Ô)" -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "¿À¸¥ÂÊ ÆÄÀÏ Å©±â(ª°Ô)" -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "¿ÞÂÊ »ý¼º ½Ã°£." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "¿À¸¥ÂÊ »ý¼º ½Ã°£." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "¾î´À ÂÊÀÌ ´õ ÃÖ±Ù¿¡ ¼öÁ¤µÇ¾ú´ÂÁö ¾Ë·ÁÁÝ´Ï´Ù." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "¿ÞÂÊ ÆÄÀÏ ¹öÀü(¸ðµç ÆÄÀÏ Á¾·ù¿¡ ´ëÇؼ­ ¾Ë ¼ö´Â ¾ø½À´Ï´Ù)." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "¿À¸¥ÂÊ ÆÄÀÏ ¹öÀü(¸ðµç ÆÄÀÏ Á¾·ù¿¡ ´ëÇؼ­ ¾Ë ¼ö´Â ¾ø½À´Ï´Ù)." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "°£·«ÇÑ ¿ä¾à °á°ú." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "¿ÞÂÊ ¼Ó¼º." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "¿À¸¥ÂÊ ¼Ó¼º." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "¿ÞÂÊ EOL" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "¿À¸¥ÂÊ EOL" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "¿ÞÂÊ ÀÎÄÚµù." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "¿À¸¥ÂÊ ÀÎÄÚµù." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "ÆÄÀÏ ³» ºñ±³ÇÏÁö ¾ÊÀº ºÎºÐÀÇ °³¼ö. Winmerg ¿¡¼­ ÀÌ ºÎºÐÀº ¹«½ÃµÇ¸ç, º´ÇÕµÇÁö ¾Ê½À´Ï´Ù." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "ÆÄÀÏ ³» Â÷ÀÌÁ¡ÀÇ °³¼ö. ÀÌ´Â ºñ±³ÇÏÁö ¾ÊÀº ºÎºÐÀÇ °³¼ö¸¦ Æ÷ÇÔÇÏÁö ¾Ê½À´Ï´Ù." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "¹ÙÀ̳ʸ® ÆÄÀÏÀ̸é * Ç¥½Ã." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "%1 & %2 ºñ±³" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "½°Ç¥·Î ºÐ¸®µÈ ¸ñ·Ï" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "ÅÇÀ¸·Î ºÐ¸®µÈ ¸ñ·Ï" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "´Ü¼ø HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "´Ü¼ø XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "º¸°í¼­ ÆÄÀÏÀÌ Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4353,32 +4435,32 @@ msgstr "" "º¸°í¼­ »ý¼º ½ÇÆÐ:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "º¸°í¼­ »ý¼º ¼º°ø" -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "¾çÂÊ Ã¢¿¡ µ¿ÀÏÇÑ ÆÄÀÏÀÌ ¿­·Á ÀÖ½À´Ï´Ù." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "¼±ÅÃÇÑ ÆÄÀϵéÀº ³»¿ëÀÌ µ¿ÀÏÇÕ´Ï´Ù." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "ÆÄÀÏ ºñ±³ Áß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Àӽà ÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù. Àӽà ÆÄÀÏ ¼³Á¤À» È®ÀÎÇϼ¼¿ä." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4393,17 +4475,17 @@ msgstr "" "\n" "Âü°í: ¸ðµç ij¸®Áö ¸®ÅÏÀ» Ç×»ó µ¿ÀÏÇÏ°Ô ÀÛ¾÷ÇÏ·Á¸é, ºñ±³ÅÇ¿¡¼­ 'ij¸®Áö ¸®ÅÏ ¹«½Ã' ¼³Á¤À» ¼±ÅÃÇÏ¸é µË´Ï´Ù (ÆíÁý/¼³Á¤¿¡¼­ ¼±Åà °¡´É)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "¼±Åà µð·ºÅ丮 °æ·Î ¿À·ùÀÔ´Ï´Ù." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "¹ÙÀ̳ʸ® ÆÄÀÏÀº ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4418,7 +4500,7 @@ msgstr "" "%1\n" "?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4429,152 +4511,152 @@ msgstr "" "°¢°¢ÀÇ ÄÚµåÆäÀÌÁö¸¦ À¯ÁöÇÏ´Â °ÍÀÌ ÀÛ¾÷½Ã º¸±â´Â ÁÁÀ¸³ª À§ÇèÇÒ ¼ö ÀÖ½À´Ï´Ù.\n" "±âÁ¸ À©µµ¿ì ÄÚµåÆäÀÌÁö¸¦ »ç¿ëÇÒ±î¿ä(Ãßõ)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "ÀÎÄÚµù ¿À·ù·Î Á¤º¸ ¼Õ½Ç: ¾çÂÊ ÆÄÀÏ" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "µ¿ÀÏÇÔ" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "¶óÀÎ ºñ±³" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "¸ðµÎ %1 °³¸¦ ¹Ù²Ù¾ú½À´Ï´Ù." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "ÇØ´çÇÏ´Â ¹®ÀÚ¿­À» ãÀ» ¼ö ¾ø½À´Ï´Ù : \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "À§Ä¡Ã¢" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "ºñ±³Ã¢" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "ÆÐÄ¡ ÆÄÀÏÀÌ ÀÛ¼ºµÇ¾ú½À´Ï´Ù." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ÆÄÀÏÀÌ ¾ø°Å³ª µð·ºÅ丮ÀÔ´Ï´Ù!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ÆÄÀÏÀÌ ¾ø°Å³ª µð·ºÅ丮ÀÔ´Ï´Ù!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "°°Àº À̸§ÀÇ ÆÐÄ¡°¡ Á¸ÀçÇÕ´Ï´Ù. µ¤¾î¾µ±î¿ä?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 °³ÀÇ ÆÄÀÏ ¼±ÅõÊ]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Ç¥ÁØ" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "ÄÁÅؽºÆ®" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "ÅëÀϵÊ" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "%1 ÆÄÀÏ¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Àý´ë °æ·Î°¡ ¾Æ´Õ´Ï´Ù: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Ãâ·Â ÆÄÀÏ ÁöÁ¤" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "¹ÙÀ̳ʸ® ÆÄÀÏ¿¡¼­´Â ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "µð·ºÅ丮¿¡¼­´Â ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4585,12 +4667,12 @@ msgstr "" "\n" "ÀúÀå ¾È µÈ ÆÄÀÏÀÌ ÀÖÀ¸¸é ÆÐÄ¡¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Á¸ÀçÇÏÁö ¾Ê´Â µð·ºÅ丮ÀÔ´Ï´Ù." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4602,37 +4684,37 @@ msgstr "" "¾ÐÃà Áö¿ø ±â´É¿¡ ÇÊ¿äÇÑ ÄÄÆ÷³ÍÆ®(7-zip and/or Merge7z*.dll)°¡ ¾ø½À´Ï´Ù. \n" "¾ÐÃà Áö¿ø ±â´É¿¡ ´ëÇØ ´õ ¸¹Àº Á¤º¸¸¦ ¿øÇÏ½Ã¸é ¸Þ´º¾óÀ» ÂüÁ¶Çϼ¼¿ä." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "³»º¸³¾ ÆÄÀÏ ¼±ÅÃ" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "°¡Á®¿Ã ÆÄÀÏ ¼±ÅÃ" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "ÆÄÀϷκÎÅÍ °¡Á®¿Â ¼³Á¤." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "ÆÄÀÏ·Î ³»º¸³½ ¼³Á¤." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "ÆÄÀϷκÎÅÍ ¼³Á¤ °¡Á®¿À±â ½ÇÆÐÇÔ." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "ÆÄÀϷκÎÅÍ ¼³Á¤ ³»º¸³»±â ½ÇÆÐÇÔ." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4643,247 +4725,247 @@ msgstr "" "\n" "°è¼Ó ÇϽðڽÀ´Ï±î?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "È¥ÇÕµÊ" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "¾çÂÊ ÆÄÀÏ ¸ðµÎ¿¡ ¾ðÆÑÄ¿°¡ Àû¿ëµË´Ï´Ù (ÇÑ ÆÄÀϸ¸ÀÌ È®ÀåÀÚ°¡ ÇÊ¿äÇÔ)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "prediffer »ç¿ë ¾È ÇÔ(Ç¥ÁØ)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "±ÇÀåÇÏ´Â Ç÷¯±×ÀÎ" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "´Ù¸¥ Ç÷¯±×ÀÎ" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "°³ÀÎ ºôµå: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Ç÷¯±×ÀÎ ¼¼ÆÃ" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH Á¸ÀçÇÏÁö ¾ÊÀ½ - .sct ½ºÅ©¸³Æ®¸¦ »ç¿ëÇÏÁö ¾ÊÀ½" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "<»ç¿ë ¾È ÇÔ>" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "<ÀÚµ¿>" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "%1 ÁÙ·Î À̵¿" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "»ç¿ë ¾È ÇÔ" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "ÆÄÀÏ ½Ã½ºÅÛ ÀÌ¿ë" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "ÃÖ±Ù ÆÄÀÏ ¸ñ·Ï(MRU) »ç¿ë" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "¹èÄ¡" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "À̵¿Çü °´Ã¼" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "ÀÚ¿ø" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "½©" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index 50cb92e1d..f9242245d 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -78,7 +78,7 @@ msgid "Cu&t" msgstr "&Klipp ut" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "Ko&pier" @@ -89,7 +89,7 @@ msgid "&Paste" msgstr "&Lim inn" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "Gå &til..." @@ -100,22 +100,25 @@ msgid "Op&en" msgstr "&Åpne" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "med ®istrert program" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "med &eksternt redigeringsprogram" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&med..." @@ -153,7 +156,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -165,8 +168,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Ingen" @@ -183,49 +186,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Fil" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Ny\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Åpne...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Åpn&e konfliktfil..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Åpne p&rosjekt...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Lagre pr&osjekt..." @@ -237,274 +240,274 @@ msgstr "Seneste prosjekter" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Tom >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "&Avslutt" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Rediger" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Innstillinger..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Vis" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "Verkt&øylinje" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Liten" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Stor" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "Stat&uslinje" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "F&anelinje" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Verktøy" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filter..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Generer rettelse..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Programtillegg" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "&Manuell utpakking" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisk utpakking" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Gjeninnlast programtillegg" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&Vindu" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Lukk" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "L&ukk alle" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "&Skift panel\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "&Horisontale vinduer" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "&Vertikale vinduer" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Overlappende" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Hjelp" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge hjelp\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "&Konfigurasjon" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "Om Win&Merge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Venstre skrive&beskyttet" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "H&øyre skrivebeskyttet" @@ -515,7 +518,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Me&rk alt\tCtrl+A" @@ -537,1751 +540,1811 @@ msgstr "Vis &venstre unike objekter" #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Vis &høyre unike objekter" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Vis ob&jekter hoppet over" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "V&is binærfiler" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Vis sk&julte objekter" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "Tre&modus" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "&Utvid alle undermapper" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "Sammen&trekk alle undermapper" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Velg &skrifttype..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Bruk standard s&krifttype" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Sammen&lign statistikker" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "&Gjenoppfrisk\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "G&jenoppfrisk valgte\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Sammenslå" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Sa&mmenlign\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Neste forskjell\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Forrige forskjell\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "F&ørste forskjell\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuelle forskjell\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Siste forskjell\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopier til &høyre\tAlt+Høyre" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopier til &venstre\tAlt+Venstre" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "Sle&tt\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Tilpass kolonner..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Generer &rapport..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Lagre\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Lagre &venstre" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Lagre &høyre" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Skriv ut..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "&Utskriftsformat" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "&Forhåndsvisning" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Konverter linjeslutt til" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "Sammenslå-&modus\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "Filko&ding..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Angre\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Ann&uler angre\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Klipp ut\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "Ko&pier\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Lim inn\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "&Marker linjeforskjell\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "S&øk...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Erstatt...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Avansert" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopier med linjenummer\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&Bokmerker" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Vis/Skjul bokmerke\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Neste bokmerke\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Forrige bokmerke\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "Fjern &alle bokmerker" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Gå til...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Zoom &inn\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Zoom &ut\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Syntaksmarkering" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "&Lås paneler" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "&Vis blanktegn" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Vis linjefo&rksjell" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Vis linje&nummer" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Vis &marger" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "&Tekstbrytning" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "&Bytt om paneler" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "&Forskjellspanel" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "L&okaliseringspanel" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopier til høyre og g&å videre\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopier &til venstre og gå videre\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "&Kopier alt til høyre" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "K&opier alt til venstre" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Skript" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Samm&enlign" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&Venstre til høyre" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "V&enstre til..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "&Høyre til venstre" +msgid "Left to Right (%1 of %2)" +msgstr "Venstre til høyre (%1 av %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "H&øyre til..." +msgid "Left to... (%1 of %2)" +msgstr "Venstre til... (%1 av %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Flytt" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&Venstre til..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&Høyre til..." +msgid "Right to Left (%1 of %2)" +msgstr "Høyre til venstre (%1 av %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Høyre til... (%1 av %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Flytt" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Slett" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&Venstre" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Høyre" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Begge" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "En&dre navn" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Skjul objekter" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "&Åpne venstre" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Å&pne høyre" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Kop&ier baner" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&Venstre (%1 av %2)" +msgid "Left (%1 of %2)" +msgstr "Venstre (%1 av %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&Høyre (%1 av %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Høyre (%1 av %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Begge (%1 av %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Begge (%1 av %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Kopier &filnavn" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&Venstre... (%1 av %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&Høyre... (%1 av %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Begge... (%1 av %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Forskjeller... (%1 av %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Gjenoppfrisk" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Venstre skallmeny" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Høyre skallmeny" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Kopier full bane" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Kopier &filnavn" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Prediffer-innstillinger" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Ingen prediffer" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Auto-prediffer" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "G&å til forskjell" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Ingen flyttede blokker" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Alle flyttede blokker" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Flyttet blokk for g&jeldende forskjell" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "&Blanktegn" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Sammen&lign" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "I&gnorer endringer" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Ig&norer alle" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "Skill mellom store/små &bokstaver" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rer linjebruddforskjeller (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Fullt innhold" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Raskt innhold" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Endringsdato" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Endringsdato og størrelse" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Størrelse" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Om WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Privat Build)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Besøk hjemmesiden til WinMerge!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Bidragsytere" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Velg filer eller mapper..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Bla gjennom.." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "B&la gjennom.." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "B&la gjennom.." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Velg..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Utpakker:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "&Velg..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Inkluder undermapper" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Avbryt" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Hjelp" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Filer eller mapper som skal sammenlignes" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Database:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Prosjekt:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Bruker:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Passord:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Lenke til mål-VSS-prosjekt" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Bruk for alle objekter" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Sjekk ut" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Lagre som..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Versjonsstyringssystem" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Versjonsstyringssystem" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Bane til cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Generelt" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automatisk &rulling til første forskjell" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "L&ukk vinduer med ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verifiser baner automatisk i Åpne-dialog" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "&Tillat bare en instans å kjøre" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Sp&ør ved lukking av flere vinduer" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "&Bevar fil-tid i filsammenligning" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Vis \"Velg filer eller mapper\" dialog ved oppstart" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Auto-fullførelse for Å&pne-dialog:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge tillater å skjule noen vanlige meldingsbokser. Trykk tilbakestill-knappen for å gjøre alle meldingsboksene synlige igjen." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Tilbakestill" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Søk" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "F&inn hva:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Bare &hele ord" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Skill mellom store/små &bokstaver" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "Regulære &uttrykk" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "Ikke br&yt ved filende" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Finn neste" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Erstatt" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Ers&tatt med:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "&Ikke bryt ved filende" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Erstatt i" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&Merket område" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "He&le filen" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Erstatt" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Erstatt &alle" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Sjekk ut" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Kommentarer" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Sjekk inn etter utsjekking" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Linjefiltere" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Aktiver linjefiltere" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulære uttrykk (en pr. linje):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Ny" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Rediger" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Fjern" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Farger" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Forskjell:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Valgt forskjell:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Bakgrunn" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Slettet" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Ignorert forskjell:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Flyttet:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Valgt flyttet:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Ordforskjell:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Valgt ordforskjell:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Standardverdier" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "System" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Send slettede filer til papirkurven" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&Eksternt redigeringsprogram:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Filter-mappe:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Mappe for midlertidige filer" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "S&ystemets midlertidige mappe" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "E&gen mappe:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Rettelsegenerator" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Fil&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Fil&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "B&ytt" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "&Legg til i eksisterende fil" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Resultat:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Bla &gjennom.." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "St&il:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Kontekst:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&er tomme linjer" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Inklud&er kommandolinje" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Åpne i e&ksternt redigeringsprogram" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Visningskolonner" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Flytt &opp" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Flytt &ned" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Velg utpakker" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Filutpakker:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Vis alle utpakkere, ikke kontroller filtype" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Filetypeliste:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Beskrivelse:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Stopp" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Sammenligner objekter..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Objekter sammenlignet:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Objekter totalt:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Gå til" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "G&å til:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Fil" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Gå til hva" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "Li&nje" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Forskjell" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Gå til" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Sammenlign" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Blanktegn" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "S&ammenlign" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "Ignorer e&ndringer" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Ignorer &alle" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorer blan&ke linjer" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Ignorer store/små &bokstaver" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "&Aktiver flyttet blokk-oppdagelse" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "&Match lignende linjer" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Filter-kommentarer" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Redigering" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&Marker syntaksen" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "Automatisk &oppdatering" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&Bevar originale EOL-tegn" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabulator" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Tabulatorstørrelse:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "Sett inn tabulatorer" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "Sett inn mellomrom" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Linjeforskjells-farger" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Vis linjeforskjeller" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "&Tegnnivå" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "&Ord-nivå:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Filfiltere" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Test" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Installer..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Ny..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Rediger..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Slett..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Lagre endrede filer?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Fil på venstre side" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Lagre endringer" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Forkast endringer" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Fil på høyre side" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "L&agre endringer" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Fork&ast endringer" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Tegnsett" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Standard tegnsett" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Velg standard tegnsett som blir antatt når det lastes ikke-Unicode filer:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2290,692 +2353,692 @@ msgstr "" "Oppdag tegnsett-info for disse filer: .html, .rc, .xml \n" "nødvendig å starte programmet på nytt" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "System-tegnsett" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "I følge WinMerge brukergrensesnitt" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Egendefinert tegnsett" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Innstillinger" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr "Kategorier" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importer..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Eksporter..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Nøkkelord:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Funksjonsnavn:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Kommentarer:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Nummere:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operatorer:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Strenger:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Preprosessor:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Bruker 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Bruker 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Fet" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Mappesammenlignings-rapport" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Rapport&fil:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Bla gjennom.." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopier til utklippstavle" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Delt eller privat filter" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Hvilken filtertype vil du opprette?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Delt filter (for alle brukere på denne maskin)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Privat filter (bare for aktuelle bruker)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Arkiv-støtte" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Aktiver arkivfil-støtte" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detekter arkivtype fra filsignatur" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Sammenlignings-statistikk" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Mapper:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Filer:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Forskjellig" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Tekst:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binær:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Unik" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Venstre:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Høyre:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Identiske" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Totalt:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Lukk" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Påvirker" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Påvirker)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Velg tegnsett til" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&Fil-lasting:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Fil-&lagring:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&Bruk samme tegnsett for begge" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Bruk" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Avbryt" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Test filter" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Tester filter ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Oppfør tekst å teste:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Mappenavn" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Resultat:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Test" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Lukk" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&Bruk egendefinerte tekstfarger" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Egendefinerte tekstfarger" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Blanktegn:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Normal tekst:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Markering:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Baner" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Venstre:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "S&krivebeskyttet" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Høyre:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Sk&rivebeskyttet" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filter:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Åpne..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Lagre..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Sikkerhetskopifiler" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Opprett sikkerhetskopifiler i:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "&Mappe-sammenligning" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "&Fil-sammenligning" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Opprett sikkerhetskopifiler til:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "&Originalfilens mappe" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&Global sikkerhetskopi-mappe:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Sikkerhetskopi-filnavn:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&Legg til .bak -endelse" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "L&egg til tidsstempel" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Bekreft kopiering" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Er du sikker på at du vil kopiere XXX objekter?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Fra venstre" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Til høyre" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Ja" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Nei" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Programtillegg" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "&Aktiver programtillegg" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Skall-integrasjon" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Utforsker" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "&Aktiver avansert meny" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "Le&gg til i høyreklikkmeny" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Mappe" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "S&topp etter første forskjell " -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orer tidsforskjeller mindre enn 3 sekunder" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binær" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "041404e4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x414, 1252" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Ukjent feil ved forsøk på å åpne prosjektfil" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Ukjent feil ved forsøk på å lagre prosjektfil" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Prosjektfil" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Prosjektfil lastet vellykket." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Prosjektfil lagret vellykket." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2994,7 +3057,7 @@ msgstr "" "WinMerge.Filsammenligning\n" "WinMerge Filsammenligning" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3013,7 +3076,7 @@ msgstr "" "WinMerge.Mappesammenligning\n" "WinMerge Mappesammenligning" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3022,143 +3085,143 @@ msgstr "" "Utviklere:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 kommer med ABSOLUTT INGEN GARANTIER. Dette er gratis programvare og du er velkommen til å videredistribuere den under visse omstendigheter; se GNU General Public License i Hjelp-menyen for detaljer." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Avbryt" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Prøv igjen" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Ignorer" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Ignorer &alle" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Ja til &alt" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Nei" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Nei til a<" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Fortsett" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Hopp over" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Hopp over &alle" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Ikke vis denne &meldingen igjen." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Ikke still dette &spørsmålet igjen." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Versjonskontroll" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Forskjeller" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Til:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Fra venstre:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Til venstre:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Fra høyre:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Til høyre:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Versjon %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Innstillinger (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle meldingsbokser vises nå igjen." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3169,84 +3232,84 @@ msgstr "" "\n" "Bruk verdiene 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Åpne" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmer|*.exe;*.bat;*.cmd|Alle filer (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle filer (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge prosjektfiler (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Innstillingsfiler (*.ini)|*.ini|Alle filer (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Tekstfiler (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle filer (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-filer (*.htm,*.html)|*.htm;*.html|Alle filer (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-filer (*.xml)|*.xml|Alle filer (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Navn" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Plassering" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filter" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Beskrivelse" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Velg navn for nytt filter" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filfiltere (*.flt)|*.flt|Alle filer (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3259,7 +3322,7 @@ msgstr "" "Kopier filen %1 til WinMerge/Filtermappe:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3272,7 +3335,7 @@ msgstr "" "\n" "Forsikre om at mappen eksisterer og kan skrives til." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3283,7 +3346,7 @@ msgstr "" "\n" "Velg filter-mappe i Innstillinger/System." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3296,12 +3359,12 @@ msgstr "" "\n" "Kanskje filen er skrivebeskyttet?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Velg filter-fil å installere" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3312,17 +3375,17 @@ msgstr "" "\n" "Kunne ikke kopiere ny filter-fil til filter-mappe." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filter-fil eksisterer allerede. Overskrive eksisterende filter?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Regulære uttrykk" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3333,173 +3396,173 @@ msgstr "" "\n" "Om du ikke vil gjenoppfriske alle sammenligninger nå kan du velge Nei og gjenoppfriske sammenligninger senere." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&Bane til SS.EXE:" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Resultat av mappesammenligning" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Filsammenligning" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Venstre uten tittel" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Høyre uten tittel" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Deres fil" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Min fil" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Linje: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Slå sammen" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Forskjell %1 av %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 forskjeller funnet" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 forskjell funnet" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "SB" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 av %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Objekter: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Velg to eksisterende mapper eller filer for å sammenligne" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Mappe-valg" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Velg to mapper eller filer for sammenligning." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Venstre bane er ugyldig!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Høyre bane er ugyldig!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Begge baner er ugyldig!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Velg to filer for å aktivere valg av utpakker." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan ikke sammenligne fil og mappe!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Fil ikke funnet: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Fil ikke pakket ut: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3512,12 +3575,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Kunne ikke analysere konflikt-fil" -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3528,27 +3591,27 @@ msgstr "" "%1\n" "er ikke en konfliktfil." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Lagre som" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Lagre endringer til %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 er merket som skrivebeskyttet. Vil du overskrive den skrivebeskyttede filen? (Nei for å lagre filen med et annet navn.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Feil under sikkerhetskopiering av filen" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3561,7 +3624,7 @@ msgstr "" "\n" "Fortsette likevel?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3578,7 +3641,7 @@ msgstr "" "\t-bruk et annet filnavn (Klikk Ok)\n" "\t-avbryt den aktuelle operasjonen (Klikk Avbryt)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3593,7 +3656,7 @@ msgstr "" "\n" "Vil du lagre den utpakkede versjonen til en annen fil?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3608,7 +3671,7 @@ msgstr "" "\n" "Vil du lagre den upakkede versjonen fil en annen fil?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3623,7 +3686,7 @@ msgstr "" "\n" "Overskrive endret fil?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3632,7 +3695,7 @@ msgstr "" "%1\n" "er markert skrivebeskyttet. Vil du overskrive det skrivebeskyttede objekt?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3647,22 +3710,22 @@ msgstr "" "\n" "Vil du laste inn igjen filen?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Lagre venstre fil som" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Lagre høyre fil som" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3673,7 +3736,7 @@ msgstr "" "%1\n" "har forsvunnet. Lagre en kopi av filen for å fortsette." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3684,42 +3747,42 @@ msgstr "" "\n" "Gjenoppfrisk dokumenter før du fortsetter." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Du skal angi en SourceSafe prosjektbane for å fortsette (ie: $/MittProjekt)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Sjekkut filer fra VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Versjonsstyringssystemet returnerte en feil under forsøket på å sjekke ut filen. Kan ikke fortsette..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Feil under utførelse av versjonsstyringssystem-kommando." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS Working Folder og plassering av gjeldende fil stemmer ikke overens. Fortsette?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS database(r) funnet!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Feil fra VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3730,7 +3793,7 @@ msgstr "" "Kontroller konfigurasjonsspesifikasjon på anvendt visning.\n" "Angre sjekke ut operasjon?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3739,127 +3802,146 @@ msgstr "" "Versionsstyrings-system returnerte en feil under forsøket på å angre å sjekke ut filen.\n" "Kontroller konfigurasjonsspesifikasjon på anvendt visning." -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Ingen" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (eldre enn 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 og nyere)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Bryt ved blanktegn" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Bryt ved blanktegn eller tegnsetting" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Høyre til venstre (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Venstre til høyre (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Høyre til venstre (%1 av %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Venstre til høyre (%1 av %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Venstre til høyre (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Venstre til... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Høyre til... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Venstre til... (%1 av %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Høyre til... (%1 av %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Venstre (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Høyre (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Begge (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Venstre (%1 av %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Høyre (%1 av %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Begge (%1 av %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Venstre side - velg målmappe:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Høyre side - velg målmappe:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 filer påvirket)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 av %2 filer påvirket)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3870,17 +3952,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Er du sikker på at du vil kopiere:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Er du sikker på at du vil kopiere %d objekter:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3899,502 +3981,502 @@ msgstr "" "\n" "Gjenoppfrisk sammenligning." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Er du sikker på at du vil flytte:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Er du sikker på at du vil flytte %d objekter:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Bekreft flytting" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Feilet i å kjøre eksternt redigeringsprogram: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Ukjent arkivformat" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Filnavn" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Resultat av sammenligningen" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Venstre dato" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Høyre dato" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Filtype" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Venstre størrelse" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Høyre størrelse" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Høyre størrelse (kort)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Venstre størrelse (kort)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Venstre opprettelsestid" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Høyre opprettelsestid" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Nyere fil" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Venstre filversjon" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Høyre filversjon" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Venstre attributter" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Høyre attributter" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Venstre EOL" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Høyre EOL" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Venstre koding" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Høyre koding" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Ignorerte forskjeller" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Kan ikke sammenligne filer" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Objekt avbrutt" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Fil hoppet over" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Mappe hoppet over" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Bare venstre: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Bare høyre: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Binære filer er identiske" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Binære filer er forskjellige" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Filer er forskjellige" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Mapper er forskjellige" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Bare venstre" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Bare høyre" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Feil" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Tekstfiler er identiske" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Tekstfiler er forskjellige" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Forløpt tid: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 objekt valgt" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 objekter valgt" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Fil eller mappe-navn." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Undermappenavn når undermapper er inkludert." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Sammenligningsresultat, lang form." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Venstre side endringsdato." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Høyre side endringsdato." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Filtype." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Venstre filstørrelse i byte." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Høyre filstørrelse i byte." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Venstre filstørrelse forkortet" -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Høyre filstørrelse forkortet" -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Venstre side opprettelsestid." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Høyre side opprettelsestid." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Forteller hvilken side som har en nyere endringsdato." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Venstre side filversjon, bare for noen filtyper." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Høyre side filversjon, bare for noen filetyper." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Kort sammenligningsresultat." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Venstre side attributter." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Høyre side attributter." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Venstre side fil EOL type" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Høyre side fil EOL type" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Venstre side koding." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Høyre side koding." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Antall ignorerte forskjeller i filen. Disse forskjeller ignoreres av WinMerge og kan ikke slås sammen." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Antall forskjeller i filen. Dette antall inkluderer ikke ignorerte forskjeller." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Viser asterisk (*) hvis filen er binær." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Sammenligning %1 med %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Komma-separert liste" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Tab-separarert liste" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Enkel HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Enkel XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Rapportfilen eksisterer allerede. Vil du overskrive eksisterende fil?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4403,32 +4485,32 @@ msgstr "" "Feil ved oppretting av rapporten:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Rapporten er opprettet vellykket" -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Samme filen er åpen i begge paneler." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "De valgte filene er identiske." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Det skjedde en feil under sammenligning av filene." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Midlertidige filer kan ikke opprettes. Sjekk TEMP-mappebane innstillinger." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4443,17 +4525,17 @@ msgstr "" "\n" "Merknad: Hvis du alltid vil behandle linjeskifttypene likt, velg innstillingen 'Ignorer forskjell i linjeskift' i sammenligningsarket i innstillingsdialogen (tilgjengelig under Rediger/Innstillinger)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Valgte mappe er ugyldig" -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan ikke åpne en binærfil til redigering" -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4468,7 +4550,7 @@ msgstr "" "%1\n" "på andre siden og åpne disse mapper?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4479,152 +4561,152 @@ msgstr "" "Visning av hver fil i sitt tegnsett ser best ut, men sammenslåing/kopiering blir farlig.\n" "Vil du behandle begge filer som om de var i standard Windows tegnsett (anbefales)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informasjon tapt på grunn av kodings-feil: begge filer" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Ingen forskjell" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Linjeforskjell" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Erstattet %1 streng(er)." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan ikke finne strengen \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Lokaliseringspanel" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Forskjellspanel" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Fil med rettelser vellykket skrevet." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. objekt ikke funnet eller er mappe!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. objekt ikke funnet eller er mappe!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Rettelsesfilen eksisterer allerede. Vil du overskrive den?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 filer valgt]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Kontekst" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Forenet" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Kunne ikke skrive til fil %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Den spesifiserte utdata-bane er ikke en absolutt bane: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Spesifiser en utdata-fil" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan ikke opprette en patch-fil fra binære filer." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan ikke opprette en patch-fil fra mapper." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4635,12 +4717,12 @@ msgstr "" "\n" "Opprettelse av en patch krever at det ikke er noen ulagrede endringer i filer." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Mappe eksisterer ikke." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4651,37 +4733,37 @@ msgstr "" "Alle nødvendig komponenter (7-zip og/eller Merge7z*.dll) for arkivstøtte ble ikke funnet.\n" "Se manualen for mer informasjon om arkivstøtte og hvordan aktivere den." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Velg fil for eksport" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Velg fil for import" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Innstillinger importert fra filen." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Innstillinger eksportert til filen." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Feilet i å importere innstillinger fra filen." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Feilet i å skrive innstillinger til filen." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4692,247 +4774,247 @@ msgstr "" "\n" "Vil du fortsette?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Blandet" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Type" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Utpakker" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Redigeringsskript" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Den tilpassede utpakkeren brukes på begge filer (bare en fil behøver filendelsen)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Ingen prediffer (normal)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Foreslåtte programtillegg" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Andre programtillegg" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Privat Build: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Innstillinger for programtillegg" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ikke funnet - .sct skript ikke aktivert" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "G&å til linje %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Deaktivert" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Fra filsystem" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Fra MRU-liste" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Ingen markering" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po index 3dd9964b9..c0013523a 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -77,7 +77,7 @@ msgid "Cu&t" msgstr "&t ÈÑÔ " #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&C ÑæäæÔÊ ÈÑÏÇÑí " @@ -88,7 +88,7 @@ msgid "&Paste" msgstr "&P ÓÈÇäÏä " #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&G ÈÑæ Èå ... " @@ -99,22 +99,25 @@ msgid "Op&en" msgstr "&e ÈÇÒ " #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "&R ÈÇ ÈÑäÇãå ˜ÇÑÈÑÏí ÑÓãí " #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "&E ÈÇ æíÑÇíÔÑ ÈíÑæäí " #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&w ÈÇ " @@ -152,7 +155,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Z ÈÒѐäãÇíí " @@ -164,8 +167,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&N å퍘ÏÇã " @@ -182,49 +185,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&F ÑæäÏå " #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&N ÌÏíÏ \tCtl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&O ÈÇÒ ˜ÑÏä ... \tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "&e ÈÇÒ ˜ÑÏä ÑæäÏå ÊÚÇÑÖ ... " #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "&j ÈÇÒ ˜ÑÏä (ÑæŽå) ØÑÍ ... \tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "&v ÐÎíÑå (ÑæŽå) ØÑÍ ... " @@ -236,274 +239,274 @@ msgstr " #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "<ÎÇáí>" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "&x ÎÑæÌ " #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&E æíÑÇíÔ " #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&O ÎíÇÑÇÊ ... " #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&V äãÇ " #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "&T ãíáå ÇÈÒÇÑ " #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&S ˜æ˜ " #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&B ÈÒѐ" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "&S ãíáå æÖÚíÊ " #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "&b ãíáå ÌåÔ " #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&T ÇÈÒÇÑåÇ " #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&F ÕÇÝíåÇ " #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&G ÊæáíÏ æÕáå / ˜Žäå ... " #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&P æÕá ÔÏäíåÇ " #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "&M ÈÇҘÑÏä ÈÓÊå ÈØæÑ ÏÓÊí " #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "&A ÈÇҘÑÏä ÈÓÊå ÈØæÑ ÎæϘÇÑ " #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&R ÈÇѐíÑí ÏæÈÇÑå æÕá ÔÏäíåÇ " #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&W äÌÑå " #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&o ÈÓÊä " #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "&s ÈÓÊä åãí " #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "&P ÊÛííÑ åÇѐæÔ \tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "&H íÏä ÇÝÞí " #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "&V íÏä ÚãæÏí " #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&C ÂÈÔÇÑí " #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&H ÑÇåäãÇ " #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&W ÑÇåäãÇí æíäãÑÌ \tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "&o í˜ÑÈäÏí " #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&G ãÌæÒ Úãæãí ˜áí Ìí Çä íæ " #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&A ÏÑÈÇÑå æíäãÑÌ ... " #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "&e ØÑÝ  ÝÞØ ÎæÇäÏäí " #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "&g ØÑÝ ÑÇÓÊ ÝÞØ ÎæÇäÏäí " @@ -514,7 +517,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "&A ÇäÊÎÇÈ åãí \tCtrl+A" @@ -536,1751 +539,1811 @@ msgstr "&e #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "&g äãÇíÔ ãæÇÑÏ ÈíãÇääÏ ÑÇÓÊ " -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "&k äãÇíÔ ãæÇÑÏ ãÞÇíÓå äÔÏå " -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "&h äãÇíÔ ÑæäÏå åÇí ÈÇíäÇÑí / ÏæÇäí " -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "&e äãÇíÔ ãæÇÑÏ äåÇä " -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "&M ÓȘ ÔÇÎÓÇÑ " -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "&x ÈÓØ åãå ÒíÑ æÔå åÇ " -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "&C ÝÑæÇÔí åãå ÒíÑ æÔå åÇ " -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "&F ÇäÊÎÇÈ Þáã " -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "&o ÇÓÊÝÇÏå ÇÒ Þá㠁íÔ ÝÑÖ " -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "&r ãÞÇíÓå ÂãÇÑåÇ " -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "&s ÈÇÒÓÇÒí \tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&R ÈÇÒÓÇÒí ÇäÊÎÇÈ \tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&M íæäÏ ÒÏä " -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "&m åãÓäÌí \tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&N ÊÝÇæÊ ÈÚÏí \tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&P ÊÝÇæÊ ÞÈáí \tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&F äÎÓÊíä ÊÝÇæÊ \tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&C ÊÝÇæÊ ÌÇÑí \tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&L ÂÎÑíä ÊÝÇæÊ \tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "&R äÓÎå ÈÑÏÇÑí Èå ÑÇÓÊ \tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "&e äÓÎå ÈÑÏÇÑí Èå  \tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&D ÍÐÝ \tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&C ÓÝÇÑÔí ˜ÑÏä ÓÊæäåÇ ... " -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "&R ÊæáíÏ ÒÇÑÔ ... " -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&S ÐÎíÑå \tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "&L ÐÎíÑå ÓãÊ í " -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "&R ÐÎíÑå ÓãÊ ÑÇÓÊí " -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&P Ç ... " -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "&t ÊäÙíã ÕÝÍå " -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "&w íÔ äãÇíÔ Ç " -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&C ÊÈÏíá ÇíÇä ÎØ Èå " -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "&M ÓȘ íæäÏ \tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "&F ˜ÏÈäÏí ÑæäÏå ... " -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&U Èí ÇËÑ ÔÏä ÂÎÑíä ÏÓÊæÑ \tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&R ʘÑÇÑ ÂÎÑíä ÏÓÊæÑ \tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&t ÈÑÔ \tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&C ÑæäæÔÊ ÈÑÏÇÑí \tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "&P ÓÈÇäÏä \tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "&D ÇäÊÎÇÈ ÎØ ÊÝÇæÊ \tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&i íÇÝÊä ... \tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&c ÌÇíÒíäí ... \tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr " íÔÑÝÊå " -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&C ÑæäæÔÊ ÈÑÏÇÑí ÈÇ ÔãÇÑå åÇí ÎØ \tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&B äÔÇäå åÇ " -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&T ÊÛííÑ æÖÚíÊ æÈ ÇáÝ \tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&N æÈ ÇáÝ ÈÚÏí \tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&P æÈ ÇáÝ ÞÈáí \tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&C Ç˜ ˜ÑÏä ÊãÇã äÔÇäåÇ " -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&G ÈÑæ Èå ... \tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "&I ÈÒѐ äãÇíí \tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "&O ˜æ˜ äãÇíí \tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&N ãÚãæáí \tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr " ãÔÎÕ äãæÏä äÍæ " -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "&L ÞÝá ˜ÑÏä åÇѐæÔåÇ " -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "&V ãÔÇåÏå ÝÇÕáå ÓÝíÏ " -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "&w ãÔÇåÏå ÎØæØ ãÊÝÇæÊ " -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "&N ãÔÇåÏå ÔãÇÑå ÎØæØ " -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "&M ãÔÇåÏå ˜äÇÑå åÇ " -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "&r ÓØÑ ÈäÏí ÎØæØ " -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "&a ÊÚæíÖ åÇѐæÔåÇ " -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "&P åÇѐæÔ ÊÝÇæÊ " -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "&c åÇѐæÔ ã˜Çä íÇÈí " -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "&o Èå ÑÇÓÊ ÑæäæÔÊ ÈÑÏÇÑí ˜ÑÏå æ ÇÏÇãå ÈÏå \tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "&t Èå  ÑæäæÔÊ ÈÑÏÇÑí ˜ÑÏå æ ÇÏÇãå ÈÏå \tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "&A ÑæäæÔÊ ÈÑÏÇÑí åãå Èå ÑÇÓÊ " -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "&y ÑæäæÔÊ ÈÑÏÇÑí åãå Èå  " -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&P íÔ ÝÑÞ ÐÇÑ " -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&S ÏÓÊ äæíÓåÇ " -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "&a åãÓäÌí " -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&L  Èå ÑÇÓÊ " - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "&e  Èå ... " +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "&R ÑÇÓÊ Èå  " +msgid "Left to Right (%1 of %2)" +msgstr "  Èå ÑÇÓÊ - %1 ÇÒ %2 " #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "&i ÑÇÓÊ Èå ... " +msgid "Left to... (%1 of %2)" +msgstr "  Èå ... - %1 ÇÒ %2 " + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&M ÌÇÈÌÇ ˜ÑÏä " +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&L  Èå ... " +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&R ÑÇÓÊ Èå ... " +msgid "Right to Left (%1 of %2)" +msgstr " ÑÇÓÊ Èå  - %1 ÇÒ %2 " -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr " ÑÇÓÊ Èå ... - %1 ÇÒ %2 " + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&M ÌÇÈÌÇ ˜ÑÏä " + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&D ÍÐÝ " -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&L  " -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&R ÑÇÓÊ " -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&B åÑ Ïæ " -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "&n ÊÛííÑ äÇã " -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&H äåÇä ˜ÑÏä ãæÇÑÏ " -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "&O ÈÇҘÑÏä ÓãÊ í " -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "&p ÈÇҘÑÏä ÓãÊ ÑÇÓÊí " -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "&y ÑæäæÔÊ ÈÑÏÇÑí ÇÒ äÇã ãÓíÑåÇ " -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&L ÇÒ %2 %1  " +msgid "Left (%1 of %2)" +msgstr "  - %1 ÇÒ %2" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&R ÑÇÓÊ - %1 ÇÒ %2 " +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr " ÑÇÓÊ - %1 ÇÒ %2" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr " åÑ Ïæ ÓãÊ - %1 ÇÒ %2" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&B åÑ Ïæ ÓãÊ - %1 ÇÒ %2 " +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "&F ÑæäæÔÊ ÈÑÏÇÑí ÇÒ äÇ㠁ÑæäÏå åÇ " -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Z ÝÔÑÏå ÓÇÒí " -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&L  ... - %1 ÇÒ %2 " - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&R ÑÇÓÊ ... - %1 ÇÒ %2 " +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&B åÑ Ïæ ÓãÊ ... - %1 ÇÒ %2 " +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&D ÊÝÇæÊåÇ ... - %1 ÇÒ %2 " +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&R ÈÇÒÓÇÒí " -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr " ÒíäÇä / ÝåÑÓÊ æÓÊå  " -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr " ÒíäÇä / ÝåÑÓÊ æÓÊå ÑÇÓÊ " -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&C ÑæäæÔÊ ÈÑÏÇÑí ˜á ãÓíÑ " -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "&F ÑæäæÔÊ ÈÑÏÇÑí äÇ㠁ÑæäÏå" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr " ÊäÙíãåÇí íÔ ÝÑÞ ÐÇÑ " -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&N ÈÏæä íÔ ÝÑÞ ÐÇÑ " -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr " íÔ ÝÑÞ ÐÇÑ ÎæϘÇÑ " -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "&o ÈÑæ Èå ãÍá ÊÝÇæÊ " -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&N åí ˜äÏå / Èáæ˜ ÌÇÈÌÇ ÔÏå " -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&A åãå ˜äÏå åÇ / Èáæ˜åÇí ÌÇÈÌÇ ÔÏå " -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "&C ˜äÏå / Èáæ˜ ÌÇÈÌÇ ÔÏå ÈÑÇí ÊÝÇæÊ ÌÇÑí " -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "&h ÝÇÕáå åÇí ÓÝíÏ " -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "&p åãÓäÌí " -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "&g Ô㠁æÔí ÇÒ ÊÛííÑÇÊ " -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "&n Ô㠁æÔí ÇÒ åãå " -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "&t ÍÓÇÓ Èå ÇäÏÇÒå ÍÑæÝ " -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "&r Ô㠁æÔí ÇÒ ÊÝÇæÊ ÚáÇãÊ ÈÇҐÔÊ Èå ÓÑ ÓØÑ (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr " ãÍÊæíÇÊ ãÔÑæÍ " -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr " ãÍÊæíÇÊ ˜æÊÇå " -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr " ÊÇÑíÎ ÇÕáÇÍ ÔÏå " -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr " ÊÇÑíÎ æ ÇäÏÇÒå ÇÕáÇÍ ÔÏå " -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr " ÇäÏÇÒå " -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr " ÏÑÈÇÑå æíäãÑÌ " -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "- ÓÇÎÊ ÎÕæÕí - " -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr " ÈÇÒÏíÏ ÕÝÍå ÎÇäí æíäãÑÌ ! " -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr " ÊÇííÏ " -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr " ÔÑ˜Ê ˜ääÏå åÇ " -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr " ÇäÊÎÇÈ ÑæäÏå åÇ íÇ æÔå åÇ " -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&B ãÑæÑ " -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "&r ãÑæÑ ... " -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "&o ãÑæÑ ... " -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr " ÇäÊÎÇÈ ... " -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&U ÈÇҘääÏå ÈÓÊå : " -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "&S ÇäÊÎÇÈ ... " -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&I ÔÇãá ÒíсæÔå åÇ " -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr " æÖÚíÊ : " -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr " áÛæ " -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr " ÑÇåäãÇ " -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr " ÑæäÏå åÇ íÇ æÔå åÇí ãÞÇíÓå ÔæäÏå " -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr " ÇíÇå ÏÇÏå åÇ : " -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr " ÑæŽå / ØÑÍ : " -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr " ˜ÇÑÈÑ : " -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr " ÔäÇÓå : " -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr " ãÞÕÏ VSS íæäÏ Èå ÑæŽå " -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr " Èå ˜ÇÑ ÈÑÓÊä Ñæí åãå ãæÇÑÏ " -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr " ÊÕæíå ÍÓÇÈ " -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr " ÐÎíÑå ˜ÑÏä Èå ÕæÑÊ ... " -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr " äÓÎå ÐÇÑí ÓíÓÊã " -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&V äÓÎå ÐÇÑí ÓíÓÊã " -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&P cleartool.exe ãÓíÑ : " -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr " Úãæãí " -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "&s ÈØæÑ ÎæϘÇÑ Èå äÎÓÊíä ÊÝÇæÊ ãäÊÞá ÔæÏ " -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "&o ESC ÈÓÊä äÌÑå åÇ ÈÇ ˜áíÏ " -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&A ÈØæÑ ÎæϘÇÑ ãÓíÑåÇ ÏÑ äÌÑå ãÍÇæÑå - ÈÇÒ ˜ÑÏä - æÇÑÓí ÔæÏ " -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "&o ÇÌÇÒå ÇÌÑÇí åãÒãÇä ÊäåÇ í˜ äÓÎå ÇÒ äÑã ÇÝÒÇÑ " -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "&k ȁÑÓ¡ æÞÊí ˜å ÏÇÑí äÏ ÊÇ äÌÑå ÑÇ ãí ÈäÏí " -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "&P ÏÑ ãÞÇíÓå ÑæäÏå åÇ ÒãÇä ÑæäÏå ÑÇ ÍÝÙ ˜ä " -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr " äÌÑå ãÍÇæÑå \"ÇäÊÎÇÈ ÑæäÏå åÇ íÇ æÔå åÇ\" Èå åäÇã ÔÑæÚ ˜ÇÑ äÑã ÇÝÒÇÑ äãÇíÔ ÏÇÏå ÔæÏ " -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "&p ÈÇҘÑÏä äÌÑå ãÍÇæÑå ÇÊãÇã ÎæϘÇÑ " -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr " æíäãÑÌ Èå ÔãÇ ÇÌÇÒå ãí ÏåÏ ÊÇ ÈÚÖí ÇÒ ÌÚÈå íÇã ãÚãæáí ÑÇ äåÇä äãÇííÏ. ˜áíÏ ÈÇÒäÔÇäí / ÑíÓÊ ÑÇ ÈÝÔÇÑíÏ ÊÇ ÊãÇã ÌÚÈå íÇã ÏæÈÇÑå ÂԘÇÑ ÔæäÏ " -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr " ÈÇÒäÔÇäí " -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr " íÇÝÊä " -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "&n íÏÇ ˜ÑÏä å : " -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "&w ÝÞØ ÊãÇ㠘áãå ÊØÈíÞ ÏÇÏå ÔæÏ " -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "&c ÊØÈíÞ ÇäÏÇÒå ÍÑæÝ " -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "&e ÚÈÇÑÊ ÞÇÚÏå ãäÏ " -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "&o ÇíÇä ÑæäÏå ÑÇ ÓØÑÈäÏí ä˜ä " -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&F íÇÝÊä ÈÚÏí " -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&O ÊÇííÏ " -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr " ÌÇíÒíäí " -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "&p ÌÇíÒíäí ÈÇ : " -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "&D ÇíÇä ÑæäÏå ÑÇ ÓØÑÈäÏí ä˜ä " -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr " ÌÇíÒíäí ÏÑ " -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&S ÒíäÔ " -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "&o ÊãÇ㠁ÑæäÏå " -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&R ÌÇíÒíäí " -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "&A ÌÇíÒíäí åãí" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr " æÇÑÓí " -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr " íÇÏÏÇÔÊåÇ " -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr " æÑæÏ Ó ÇÒ æÇÑÑÓí " -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr " ÕÇÝíåÇí ÎØ " -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr " ÝÚÇá äãæÏä ÕÇÝíåÇí ÎØ " -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr " ÚÈÇÑÇÊ ÞÇÚÏå ãäÏ - åÑ ÎØ í˜í : " -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr " ÌÏíÏ " -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr " æíÑÇíÔ " -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr " ÈÑÏÇÔÊä " -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr " ÑäåÇ " -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr " ÊÝÇæÊ : " -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr " ÊÝÇæÊ ÇäÊÎÇÈ ÔÏå : " -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr " Ó Òãíäå " -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr " ÍÐÝ ÔÏ " -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr " ãÊä " -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr " ÊÝÇæÊ Ô㠁æÔí ÔÏå " -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr " ÌÇÈÌÇ ÔÏå : " -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr " ÌÇÈÌÇíí ÇäÊÎÇÈ ÔÏå : " -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr " ÊÝÇæÊ æǎå : " -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr " ÊÝÇæÊ æǎå ÇäÊÎÇÈí : " -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr " íÔ ÝÑÖåÇ " -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr " ÓíÓÊã / ÏÓʐÇå " -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&S ÇÑÓÇá ÑæäÏå åÇí ÍÐÝ ÔÏå Èå ÓØá ÈÇÒíÇÝÊ " -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&E æíÑÇÓÊÇÑ ÎÇÑÌí : " -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&F æÔå ÕÇÝí : " -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr " æÔå ÑæäÏå åÇí ãæÞÊí " -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "&y æÔå ãæÞÊí ÓíÓÊã " -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "&u æÔå ÓÝÇÑÔí : " -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr " ÊæáíÏ ˜ääÏå æÕáå / ˜Žäå " -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "&1 ÑæäÏå : " -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "&2 ÑæäÏå : " -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "&S ãÚÇæÖå " -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "&A íæäÏ ÒÏä Èå ÑæäÏå ãæÌæÏ " -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&R äÊíÌå : " -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "&w ãÑæÑ " -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&F ÞÇáÈ ÈäÏí " -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "&y ÓȘ : " -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&C ãÊä : " -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "&e Ô㠁æÔí ÇÒ ÎØæØ ÎÇáí " -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "&d ÔÇãá ÎØ ÝÑãÇä " -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "&x ÈÇҘÑÏä ÈÇ æíÑÇÓÊÇÑ ÎÇÑÌí " -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr " äãÇíÔ ÓÊæä åÇ " -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "&U ÌÇÈÌÇíí Èå ÈÇáÇ " -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr " ÌÇÈÌÇíí Èå Çííä " -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr " ÇäÊÎÇÈ ÈÇҘääÏå ÈÓÊå " -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr " ÈÇÒ ˜ääÏå ÈÓÊå ÑæäÏå : " -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr " ÊãÇã ÈÇҘääÏå åÇí ÈÓÊå ÑÇ äãÇíÔ ÈÏå¡ ÊæÓÚå ÑÇ ÈÑÑÓí ä˜ä " -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr " ÝåÑÓÊ ÊæÓÚå åÇ : " -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr " ÊæÕíÝ : " -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr " ÇíÓÊ " -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr " åãÓäÌí ãæÇÑÏ ... " -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr " ãæÇÑÏ ãÞÇíÓå ÔÏå : " -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr " ˜á ãæÇÑÏ : " -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr " ÈÑæ Èå " -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "&o ÈÑæÑÈå : " -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr " ÑæäÏå " -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr " ÈÑæ Èå å " -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "&n ÎØ " -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&D ÊÝÇæÊ " -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&G ÈÑæ Èå " -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr " ãÞÇíÓå ˜ÑÏä " -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr " ÝÇÕáå ÓÝíÏ " -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&C åãÓäÌí / ãÞÇíÓå ˜ÑÏä " -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "&I Ô㠁æÔí ÇÒ ÊÛííÑ " -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "&g Ô㠁æÔí ÇÒ åãí " -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "&k Ô㠁æÔí ÇÒ ÎØæØ ÎÇáí " -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "&c Ô㠁æÔí ÇÒ ÇäÏÇÒå ÍÑæÝ " -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "&n ÝÚÇá ˜ÑÏä ÊÔÎíÕ ˜äÏå åÇí / Èáæ˜åÇí ÌÇÈÌÇ ÔÏå " -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "&M ãØÇÈÞÊ ˜ÑÏä ÎØæØ ãÔÇÈå " -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr " ÇáÇíå ÊæÖíÍÇÊ " -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr " æíÑÇÓÊÇÑ " -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&H ÈÑÌÓÊå äãÇíí ÊјíÈ " -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "&A æíÔ ãÌÏÏ ÎæϘÇÑ" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&P ÇÕáí EOL äÇåÏÇÔÊ ÍÑæÝ " -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr " ÌåÔåÇ / ÊÈ åÇ " -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&T ÇäÏÇÒå ˜áíÏ ÌåÔ / ÊÈ : " -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "&I ÏÑÌ ÌåÔåÇ / ÊÈ åÇ " -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "&S ÏÑÌ ÝÇÕáå " -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr " Ñä ÂãíÒí ÎØæØ ãÊÝÇæÊ " -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr " äãÇíÔ ÊÝÇæÊåÇí ÎØ " -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "&C ÏÑ ÓØÍ ÏÎÔå / ˜ÇјÊÑ / ÍÑÝ " -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "&W ÏÑ ÓØÍ ˜áãå : " -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr " ÑæäÏå ÕÇÝíåÇ " -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr " ÂÒãÇíÔ " -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr " äÕÈ ... " -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr " ÌÏíÏ ... " -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr " æíÑÇíÔ ... " -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr " ÍÐÝ ... " -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr " ÂíÇ ÑæäÏå åÇí ÇÕáÇÍ ÔÏå ÐÎíÑå ÔæäÏ¿ " -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr " ÑæäÏå ÓãÊ í " -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&S ÐÎíÑå ÊÛííÑÇÊ " -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&D ÏæÑÇäÏÇÎÊä ÊÛííÑÇÊ " -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr " ÑæäÏå ÓãÊ ÑÇÓÊí " -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "&a ÐÎíÑå ÊÛííÑÇÊ " -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "&c ÏæÑÇäÏÇÎÊä ÊÛííÑÇÊ " -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr " ÕÝÍå ˜Ï " -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr " ÕÝÍå ˜Ï íÔ ÝÑÖ " -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr " ãæÞÚí ˜å ÑæäÏå åÇí ÛíÑ íæäí ˜Ï ÈÇѐíÑí ãí ÔæäÏ¡ ÇäÊÎÇÈ ÕÝÍå ˜Ï íÔ ÝÑÖ ÏÑ äÙÑ ÑÝÊå ãí ÔæÏ : " -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2289,692 +2352,692 @@ msgstr "" " ÊÔÎíÕ ÇØáÇÚÇÊ ÕÝÍå ˜Ï ÈÑÇí Çíä ÑæäÏå åÇ : .html, .rc, .xml \n" " äíÇÒãäÏ ÌáÓå ÔÑæÚ ÏæÈÇÑå / ÈÇÒÂÛÇÒí " -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr " ÕÝÍå ˜Ï ÓíÓÊã " -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr " ãØÇÈÞ ÈÇ ÑÇÈØ ˜ÇÑÈÑ æíäãÑÌ " -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr " ÕÝÍå ˜Ï ÓÝÇÑÔí : " -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr " ÎíÇÑÇÊ " -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " ÑÓÊå åÇ : " -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr " æÑæÏ ... " -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr " ÕÏæÑ ... " -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr " äÌÑå ãÍÇæÑå " -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr " ˜áíÏæǎå åÇ : " -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr " äÇ㠘áíϘÇÑåÇ : " -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr " ÊæÖíÍÇÊ : " -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr " ÔãÇÑå åÇ : " -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr " ÚãáÑåÇ : " -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr " ÑÔÊå åÇ : " -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr " íÔ ÑÏÇÒ : " -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr " ˜ÇÑÈÑ 1 : " -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr " ˜ÇÑÈÑ 2 : " -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr " ÊíÑå " -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr " ÒÇÑÔ åãÓäÌí æÔå " -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr " ÒÇÑÔ ÏÇÏä ÑæäÏå : " -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr " ãÑæÑ ... " -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&S ÓȘ " -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&C ÑæäæÔÊ ÈÑÏÇÑí Èå ÍÇÝÙå íÇÏÏÇÔÊ / ˜áí ÈæÑÏ " -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr " ÕÇÝí ÔÎÕí íÇ ÇÔÊÑǘí " -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr " ˜ÏÇã äæÚ ÕÇÝí ÑÇ ãí ÎæÇåíÏ ÇíÌÇÏ äãÇííÏ¿ " -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr " ÕÇÝí ÇÔÊÑǘí - ÈÑÇí ÊãÇ㠘ÇÑÈÑÇä Ñæí Çíä ÏÓʐÇå" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr " ÕÇÝí ÔÎÕí - ÝÞØ ÈÑÇí ˜ÇÑÈÑ ÝÚáí " -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr " ÔÊíÈÇäí ÇÒ ÈÇíÇäí " -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&E ÝÚÇá äãæÏä ÔÊíÈÇäí ÇÒ ÑæäÏå ÈÇíÇäí ÔÏå " -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&D ÔäÇÓÇíí äæÚ ÈÇíÇäí ÇÒ Ñæí ÇãÖÇÁ ÑæäÏå " -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr " ÂãÇÑ åãÓäÌí / ÞíÇÓ " -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr " æÔå åÇ : " -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr " ÑæäÏå åÇ : " -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr " ãÊãÇíÒ" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr " ãÊä : " -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr " ÏæÇäí / ÈÇíäÇÑí " -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr " í˜ÊÇ " -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "  : " -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr " ÑÇÓÊ : " -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr " í˜ÓÇä " -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr " ÓÑÌãÚ : " -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr " ÈÓÊä " -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr " ÂËÇÑ / äÊÇíÌ " -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr " - ÂËÇÑ / äÊÇíÌ - " -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr " ÇäÊÎÇÈ ÕÝÍå ˜Ï ÈÑÇí " -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&F ÈÇѐÐÇÑí ÑæäÏå : " -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "&S ÐÎíÑå ÑæäÏå : " -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&U ÇÓÊÝÇÏå ÇÒ ÕÝÍå ˜Ï í˜ÓÇä ÈÑÇí åÑ Ïæ " -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&A Èå ˜ÇÑ ÈÓÊä " -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&C áÛæ " -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr " ÂÒãÇíÔ ÕÇÝí " -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr " ÂÒãÇíÔ ÕÇÝí ... " -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&E ãÊä ÑÇ æÇÑÏ äãÇííÏ ÊÇ ÂÒãÇíÔ ÔæÏ : " -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&F äÇ㠁æÔå " -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr " äÊíÌå : " -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&T ÂÒãÇíÔ " -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&C ÈÓÊä " -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&U ÇÓÊÝÇÏå ÇÒ ÑäåÇí ãÊä ÓÝÇÑÔí " -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr " ÑäåÇí ãÊä ÓÝÇÑÔí " -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr " ÝÇÕáå ÓÝíÏ : " -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr " ãÊä ãäÙã : " -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr " ÇäÊÎÇÈ : " -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr " ãÓíÑåÇ " -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&L  : " -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "&e ÝÞØ ÎæÇäÏäí " -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&R ÑÇÓÊ : " -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "&a ÝÞØ ÎæÇäÏäí " -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&F ÕÇÝí : " -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr " ÈÇÒ ˜ÑÏä ... " -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr " ÐÎíÑå ˜ÑÏä ... " -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "ÑæäÏå åÇí ÔÊíÈÇä " -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr " ÇíÌÇÏ ÑæäÏå åÇí ÔÊíÈÇä ÏÑ : " -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "&F ãÞÇíÓå æÔå " -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "&e ãÞÇíÓå ÑæäÏå " -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr " ÇíÌÇÏ ÑæäÏå åÇí ÔÊíÈÇä ÏÇÎá : " -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "&O æÔå ÑæäÏå ÇÕáí " -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&G æÔå ÔÊíÈÇä ÓÑÇÓÑí : " -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr " äÇ㠁ÑæäÏå ÔÊíÈÇä : " -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&A íæÓÊ ˜ÑÏä ÊæÓÚå .bak " -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "&p íæäÏ ãåÑ ÒãÇä " -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr " ÊÇííÏ ÑæäæÔÊ ÈÑÏÇÑí " -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr " ãæÑÏ ÑæäæÔÊ ÈÑÏÇÑí ÔæÏ¿ XXX " -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr " ÇÒ  " -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr " Èå ÑÇÓÊ " -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr " ÂÑí " -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr " ÎíÑ " -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr " æÕá ÔÏäíåÇ " -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "&E ÝÚÇá ÓÇÒí äÕÈ ÔÏäíåÇ " -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr " 혁Çэå ÓÇÒí æÓÊå " -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr " ÌÓÊÌæÑ " -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "&n ÝÚÇá ˜ÑÏä ÒíäÇä / ÝåÑÓÊ íÔÑÝÊå " -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "&A ÇÝÒæÏä Èå ÒíäÇä / ÝåÑÓÊ ãÊä" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr " æÔå " -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "&t ÊæÞÝ Ó ÇÒ äÎÓÊíä ÊÝÇæÊ" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "&o Ô㠁æÔí ÇÒ ÊÝÇæÊ ÒãÇäí ˜ãÊÑ ÇÒ 3 ËÇäíå " -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr " ÏæÇäí/ ÈÇíäÇÑí " -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "042904e8" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x429, 1256" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr " ãÔÇåÏå ÎØÇí äÇãÔÎÕ åäÇã ãÈÇÏÑÊ Èå ÈÇҘÑÏä ÑæäÏå ÑæŽå / ØÑÍ " -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr " ãÔÇåÏå ÎØÇí äÇãÔÎÕ åäÇã ãÈÇÏÑÊ Èå ÐÎíÑå ˜ÑÏä ÑæäÏå ÑæŽå / ØÑÍ " -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr " ÑæäÏå (ÑæŽå) ØÑÍ" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr " ÑæäÏå ÑæŽå / ØÑÍ ÈÇãæÝÞíÊ ÈÇÑ ÔÏ " -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr " ÑæäÏå ÑæŽå / ØÑÍ ÈÇãæÝÞíÊ ÐÎíÑå ÔÏ " -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2993,7 +3056,7 @@ msgstr "" " æíäãÑÌ.ãÞÇíÓå ÑæäÏå\n" " ãÞÇíÓå ÑæäÏå æíäãÑÌ" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3012,7 +3075,7 @@ msgstr "" " æíäãÑÌ.ãÞÇíÓå æÔå\n" " ãÞÇíÓå æÔå æíäãÑÌ" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3021,143 +3084,143 @@ msgstr "" " ÊæÓÚå ÏåäÏå Çä : \n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&A áÛæ " -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&R ˜æÔÔ ÏæÈÇÑå " -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&I Ô㠁æÔí " -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "&a Ô㠁æÔí ÇÒ åãå " -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Y Èáå " -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "&a åãí ÂÑí " -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&N ÎíÑ " -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "&l åãí ÎíÑ " -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&C ÇÏÇãå " -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&S ÑÔ " -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "&a ÑÔ ÇÒ åãí " -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "&m ÏæÈÇÑå Çíä íÇã ÑÇ äãÇíÔ äÏå " -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "&q ÏæÈÇÑå Çíä ÑÓÔ ÑÇ äÑÓ " -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr " ÈÇÒÈíäí æíÑÇíÔ " -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr " ÊÝÇæÊåÇ " -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr " Èå : " -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr " ÇÒ  : " -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr " Èå  : " -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr " ÇÒ ÑÇÓÊ : " -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr " Èå ÑÇÓÊ : " -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr " äÓÎå %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr " íæäí ˜Ï " -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "(%1) ÎíÇÑÇÊ " -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr " åã ǘäæä ÊãÇã ÌÚÈå åÇí íÇã ÏæÈÇÑå äãÇíÔ ÏÇÏå ãíÔæÏ. " -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3167,84 +3230,84 @@ msgstr "" " ÚÏÏ ãæÌæÏ ÏÑ ÈÎÔ ÇäÏÇÒå ÌåÔ ÏÑ ÓÊÑå Çí ˜å ÈÑÇí æíäãÑÌ ÞÇÈá ÞÈæá ÈÇÔÏ¡ äíÓÊ \n" " 1 - %1 áØÝÇ ãÞÇÏíÑ ÑæÈÑæ ÇÓÊÝÇÏå ÔæÏ : " -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr " ÈÇÒ " -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "ÈÑäÇãå åÇ |*.exe;*.bat;*.cmd|åãå ÑæäÏå åÇ (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr " åãå ÑæäÏå åÇ (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr " ÑæäÏå åÇí ÑæŽå æíäãÑÌ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr " ÑæäÏå åÇí ÎíÇÑÇÊ (*.ini)|*.ini|åãå ÑæäÏå åÇ (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, 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:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML ÑæäÏå åÇí (*.htm,*.html)|*.htm;*.html|åãå ÑæäÏå åÇ (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ÑæäÏå åÇí (*.xml)|*.xml|åãå ÑæäÏå åÇ (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr " äÇã " -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr " ãÍá " -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr " ÕÇÝíåÇ " -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr " ÔÑÍ " -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr " ÇäÊÎÇÈ äÇ㠁ÑæäÏå ÈÑÇí ÕÇÝí ÌÏíÏ " -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr " ÑæäÏå ÕÇÝíåÇ (*.flt)|*.flt|åãå ÑæäÏå åÇ (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3257,7 +3320,7 @@ msgstr "" " áØÝÇ ÑæäÏå ÑæÈÑæ Èå æÔå ÕÇÝíåÇí æíäãÑÌ (ÒíÑ) ÑæäæÔÊ ÈÑÏÇÑí ÔæÏ : %1 \n" "%2" -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3269,7 +3332,7 @@ msgstr "" "%1\n" " áØÝÇ ÇØãíäÇä ÍÇÕá ÔæÏ ˜å æÔå æÌæÏ ÏÇÑÏ æ ÞÇÈá äæÔÊä ÇÓÊ " -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3280,7 +3343,7 @@ msgstr "" "\n" " áØÝÇ ÏÑ ÎíÇÑÇÊ > ÓíÓÊ㠁æÔå ÕÇÝí ÑÇ ÇäÊÎÇÈ äãÇííÏ " -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3293,12 +3356,12 @@ msgstr "" "\n" "ãã˜ä ÇÓÊ ˜å ÑæäÏå ÝÞØ ÎæÇäÏäí ÈÇÔÏ¿ " -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr " ÊÚííä ÑæäÏå ÕÇÝí ÈÑÇí äÕÈ " -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3309,17 +3372,17 @@ msgstr "" "\n" " äãí ÊæÇä ÑæäÏå ÕÇÝí ÌÏíÏ ÑÇ Èå æÔå ÕÇÝí ÑæäæÔÊ ÈÑÏÇÑí äãæÏ " -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr " ÑæäÏå ÕÇÝí íÔ ÇÒ Çíä æÌæÏ ÏÇÑÏ. ÂíÇ ÕÇÝí ãæÌæÏ ÏæÈÇÑå äæíÓí ÔæÏ¿ " -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr " ÚÈÇÑÊ ãäÙã / ÞÇÚÏå ãäÏ " -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3330,173 +3393,173 @@ msgstr "" "\n" " ÇÑ äãí ÎæÇåíÏ ÊãÇã åãÓäÌíåÇí ÈÇÒÓÇÒí ÔæÏ¡ ãí ÊæÇäíÏ ÎíÑ ÑÇ ÇäÊÎÇÈ ˜ÑÏå æ åãÓäÌíåÇ ÑÇ ÈÚÏÇ ÈÇÒÓÇÒí äãÇííÏ " -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&P ãÓíÑ SS.EXE : " -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr " äÊÇíÌ åãÓäÌí æÔå åÇ " -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr " åãÓäÌí ÑæäÏå " -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "  ÈÏæä ÚäæÇä " -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr " ÑÇÓÊ ÈÏæä ÚäæÇä " -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr " ÑæäÏå ÏíÑÇä " -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr " ÑæäÏå ÎæÏã " -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr " ÎØ : %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr " íæäÏ ÒÏä " -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr " ÊÝÇæÊ %1 ÇÒ %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr " ÊÝÇæÊåÇí íÏÇ ÔÏå = %1" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr " í˜ ÊÝÇæÊ íÏÇ ÔÏ " #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr " ãæÑÏ %1 ÇÒ %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr " ãæÇÑÏ : %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr " ÇäÊÎÇÈ Ïæ æÔå íÇ ÑæäÏå ãæÌæÏ ÈÑÇí ãÞÇíÓå " -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr " ÇäÊÎÇÈ æÔå " -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr " ÇäÊÎÇÈ ˜ÑÏä Ïæ æÔå íÇ Ïæ ÑæäÏå ÈÑÇí ãÞÇíÓå " -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr " ãÓíÑ  æÌæÏ äÏÇÑÏ ! " -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr " ãÓíÑ ÑÇÓÊ æÌæÏ äÏÇÑÏ ! " -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr " åÑ Ïæ ãÓíÑ æÌæÏ äÏÇÑäÏ ! " -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr " Ïæ ÑæäÏå ÑÇ ÇäÊÎÇÈ äãÇííÏ ÊÇ ÇäÊÎÇÈ ÈÇҘääÏå ÈÓÊå ÝÚÇá ÑÏÏ " -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr " äãíÊæÇä æÔå æ ÑæäÏå ÑÇ ãÞÇíÓå ˜ÑÏ ! " -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr " ÑæäÏå ÑæÈÑæ íÏÇ äÔÏ : %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr " ÈÓÊå ÑæäÏå ÑæÈÑæ ÈÇÒ äÔÏ : %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3509,12 +3572,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr " äÇãæÝÞ ÈæÏä ÊÌÒíå æ ÊÍáíá ÑæäÏå ÊÚÇÑÖ " -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3525,27 +3588,27 @@ msgstr "" "%1\n" "í˜ ÑæäÏå ÊÚÇÑÖ¡ äãí ÈÇÔÏ " -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr " ÐÎíÑå ˜ÑÏä Èå ÕæÑÊ " -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr " ÂíÇ ÊÛííÑÇÊ ÏÑ %1 ÐÎíÑå ÔæÏ¿" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 ÈÕæÑÊ ÝÞØ ÎæÇäÏäí ÚáÇãÊ ÒÏå ÔÏå ÇÓÊ. ÂíÇ ãÇíá åÓÊíÏ ÑæäÏå ÝÞØ ÎæÇäÏäí ÈÇØá ÑÏÏ¿ - ÈÇ äÇã ÌÏíÏ ÐÎíÑå äÑÏÏ " -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr " ÎØÇ ÏÑ Êåíå ÑæäÏå ÔÊíÈÇä " -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3558,7 +3621,7 @@ msgstr "" "\n" " Èå åÑ ÍÇá ˜ÇÑ ÇÏÇãå íÇÈÏ¿ " -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3575,7 +3638,7 @@ msgstr "" "\t- í˜ äÇ㠁ÑæäÏå ãÊÝÇæÊ ÇÓÊÝÇÏå ˜äíÏ - ÊÇííÏ ÑÇ ÈÝÔÇÑíÏ \n" "\t- Úãá ÌÇÑí áÛæ ÔæÏ - áÛæ ÑÇ ÈÝÔÇÑíÏ ¿" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3590,7 +3653,7 @@ msgstr "" "\n" " ÂíÇ ãí ÎæÇåíÏ ˜å äÓÎå ÈÇ ÈÓÊå ÈÇÒÔÏå Èå ÕæÑÊ ÑæäÏå ÏíÑí ÐÎíÑå ÔæÏ¿ " -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3605,7 +3668,7 @@ msgstr "" "\n" " ÂíÇ ãí ÎæÇåíÏ ˜å äÓÎå ÈÇ ÈÓÊå ÈÇÒÔÏå Èå ÕæÑÊ ÑæäÏå ÏíÑí ÐÎíÑå ÔæÏ¿ " -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3620,7 +3683,7 @@ msgstr "" "\n" " ÑæäÏå ÊÛííÑ íÇÝÊå ÏæÈÇÑå äæíÓí ÔæÏ¿" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3629,7 +3692,7 @@ msgstr "" "%1\n" " ÈÕæÑÊ ÝÞØ ÎæÇäÏäí ÚáÇãÊ ÏÇÑ ÔÏå ÇÓÊ. ÂíÇ ãÇíá åÓÊíÏ ˜å ãæÑÏ ÝÞØ ÎæÇäÏäí ÈÇØá ÑÏÏ¿ " -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3644,22 +3707,22 @@ msgstr "" "\n" " ÂíÇ ãÇíá åÓÊíÏ ˜å ÑæäÏå ÏæÈÇÑå ÈÇѐíÑí ÔæÏ¿" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr " ÐÎíÑå ÑæäÏå  Èå ÕæÑÊ " -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr " ÐÎíÑå ÑæäÏå ÑÇÓÊ Èå ÕæÑÊ " -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3670,7 +3733,7 @@ msgstr "" "%1\n" " äǁÏíÏ ÔÏå ÇÓÊ. áØÝÇ í˜ ÑæäæÔÊ ÇÒ ÑæäÏå ÑÇ ÐÎíÑå äãÇííÏ ÊÇ ˜ÇÑ ÇÏÇãå íÇÈÏ " -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3681,42 +3744,42 @@ msgstr "" "\n" " ÇÓäÇÏ ÞÈá ÇÒ ÇÏÇãå ˜ÇÑ ÈÇÒÓÇÒí / ÊÇÒå ÔæäÏ " -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr " $/MyProject ÔãÇ ÈÇíÓÊí í˜ ãÓíÑ ÈÑÇí ÑæŽå ÓæÑÓ ÓíÝ ãÔÎÕ äãÇííÏ ÊÇ ˜ÇÑ ÇÏÇãå íÇÈÏ - ÈØæÑãËÇá" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr " ... VSS æÇÑÓí ÑæäÏå åÇ ÇÒ " -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr " ÏÑ ÒãÇäí ˜å ãÈÇÏÑÊ Èå æÇÑÓí ÑæäÏå ÑÏíÏ¡ äÓÎå ÐÇÑí ÓíÓÊã ÈÇ ÎØÇ ãæÇÌå ÔÏ. ÚÇÌÒ ÇÒ ÇÏÇãå ˜ÇÑ ... " -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr " ÎØÇ ÏÑ ÇÌÑÇí ÝÑãÇä äÓÎå ÐÇÑí ÓíÓÊã " -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr " æÔå ˜ÇÑí æ ã˜Çä ÑæäÏå ÌÇÑí ÊØÈíÞ äÏÇÑäÏ. ˜ÇÑ ÇÏÇãå íÇÈÏ¿ VSS " -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "VSS ÇíÇå(åÇí) ÏÇÏå íÏÇ äÔÏ ! " -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr " : VSS ÎØÇ ÇÒ " -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3727,7 +3790,7 @@ msgstr "" " áØÝÇ ãÔÎÕÇÊ í˜ÑÈäÏí äãÇíÔ ÇÓÊÝÇÏå ÔÏå¡ ÈÑÑÓí ÔæÏ \n" " ÏÓÊæÑÇáÚãá æÇÑÓí Èí ÇËÑ ÑÏÏ ¿" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3737,127 +3800,146 @@ msgstr "" " áØÝÇ ãÔÎÕÇÊ í˜ÑÈäÏí äãÇíÔ ÇÓÊÝÇÏå ÔÏå¡ ÈÑÑÓí ÔæÏ \n" " " -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr " åíí˜ " -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr " æíŽæÇá ÓæÑÓ ÓíÝ - äÓÎå Çííä ÊÑ ÇÒ 5.0 " -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr " æíŽæÇá ÓæÑÓ ÓíÝ - äÓÎå 5.0 æ ÈÇáÇÊÑ " -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr " ÊæÞÝ ÏÑ ÝÇÕáå ÓÝíÏ" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "ÊæÞÝ ÏÑ ÝÇÕáå ÓÝíÏ íÇ äÞØå / äÔÇä ÐÇÑì " -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr " ÑÇÓÊ Èå  - %1" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "  Èå ÑÇÓÊ - %1" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr " ÑÇÓÊ Èå  - %1 ÇÒ %2 " +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "  Èå ÑÇÓÊ - %1 ÇÒ %2 " +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "  Èå ÑÇÓÊ - %1" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "  Èå ... - %1" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr " ÑÇÓÊ Èå ... - %1" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "  Èå ... - %1 ÇÒ %2 " +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr " ÑÇÓÊ Èå ... - %1 ÇÒ %2 " +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "  - %1" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr " ÑÇÓÊ - %1" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr " åÑ Ïæ ÓãÊ - %1" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "  - %1 ÇÒ %2" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr " ÑÇÓÊ - %1 ÇÒ %2" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr " åÑ Ïæ ÓãÊ - %1 ÇÒ %2" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr " ØÑÝ  - ÇäÊÎÇÈ æÔå ãÞÕÏ : " -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr " ØÑÝ ÑÇÓÊ - ÇäÊÎÇÈ æÔå ãÞÕÏ : " -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "{ ÑæäÏå åÇí ÊÍÊ ÊÇËíÑ æÇÞÚ ÔÏå: %1 }" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "{ ÑæäÏå åÇí ÊÍÊ ÊÇËíÑ æÇÞÚ ÔÏå: %1 ÇÒ %2 }" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3868,17 +3950,17 @@ msgstr "" "\n" " ÑÇ ÍÐÝ äãÇííÏ %1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr " ÂíÇ ãØãÆä åÓÊíÏ ˜å ãíÎæÇåíÏ ÑæäæÔÊ ÈÑÏÇÑí äãÇííÏ ÇÒ : " -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr " ÝÞÑå ÑæäæÔÊ ÈÑÏÇÑí ÔæÏ¿ %d ÂíÇ ãØãÆä åÓÊíÏ ˜å ãí ÎæÇåíÏ ÇÒ " -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3896,502 +3978,502 @@ msgstr "" " íÏÇ äÔÏ \n" " áØÝÇ ãÞÇíÓå ÑÇ ÊÌÏíÏ äãÇííÏ " -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr " ÂíÇ ãØãÆä åÓÊíÏ ˜å ãíÎæÇåíÏ Çíä ÑÇ ÌÇÈÌÇ äãÇííÏ: " -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr " ãæÑÏ ÌÇÈÌÇ ÔæÏ¿ %d" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr " ÊÇííÏ ÌÇÈÌÇíí " -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr " ÇÌÑÇí äÇãæÝÞ æíÑÇÓÊÇÑ ÎÇÑÌí : %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr " ÈÇíÇäí ÈÇ ÞÇáÈ ÈäÏí äÇÔäÇÓ " -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr " äÇ㠁ÑæäÏå " -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr " äÊíÌå ãÞÇíÓå " -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr " ÊÇÑíÎ  " -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr " ÊÇÑíÎ ÑÇÓÊ " -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr " ÊæÓÚå " -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr " ÇäÏÇÒå  " -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr " ÇäÏÇÒå ÑÇÓÊ " -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr " ÓãÊ ÑÇÓÊ - ãÎÊÕÑ " -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr " ÓãÊ  - ãÎÊÕÑ " -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr " ÒãÇä ÇíÌÇÏ í " -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr " ÒãÇä ÇíÌÇÏ ÑÇÓÊí " -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr " ÑæäÏå ÌÏíÏÊÑ " -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr " äÓÎå ÑæäÏå  " -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr " äÓÎå ÑæäÏå ÑÇÓÊ " -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr " äÊíÌå ˜æÊÇå " -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr " ÎÕíÕå åÇí í " -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr " ÎÕíÕå åÇí ÑÇÓÊí " -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "  EOL " -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr " ÑÇÓÊ EOL " -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr " ˜ÏÈäÏí  " -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr " ˜ÏÈäÏí ÑÇÓÊ " -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr " ÊÝÇæÊ Ô㠁æÔí ÔÏå " -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr " äÇÊæÇä ÇÒ åãÓäÌí ÑæäÏå åÇÓÊ" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr " ãæÑÏ ÇäÕÑÇÝí " -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr " ÑæäÏå ÇÒ Þáã ÇÝÊÇÏå " -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr " æÔå ÇÒ Þáã ÇÝÊÇÏå " -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr " ÝÞØ  : %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr " ÝÞØ ÑÇÓÊ : %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr " ÑæäÏå åÇí ÏæÇäí / ÈÇíäÇÑí åãÓÇä åÓÊäÏ " -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr " ÑæäÏå åÇí ÏæÇäí / ÈÇíäÇÑí ãÊÝÇæÊ åÓÊäÏ " -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr " ÑæäÏå åÇ ãÊÝÇæÊ åÓÊäÏ " -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr " æÔå åÇ ãÊÝÇæÊ åÓÊäÏ " -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr " ÝÞØ  " -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr " ÝÞØ ÑÇÓÊ " -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr " ÎØÇ " -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr " ÑæäÏå åÇí ãÊäí åãÓÇä åÓÊäÏ " -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr " ÑæäÏå åÇí ãÊäí ãÊÝÇæÊ åÓÊäÏ " -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr " ÒãÇä ӁÑí ÔÏå - ãíáí ËÇäíå : %ld" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr " í˜ ãæÑÏ ÇäÊÎÇÈ ÔÏ " -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "ãæÇÑÏ ÇäÊÎÇÈ ÔÏå = %1" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr " äÇ㠁ÑæäÏå íÇ æÔå " -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr " äÇã ÒíсæÔå ãæÞÚí ˜å ÒíсæÔå åÇ ÔÇãá åÓÊäÏ " -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr " Ԙá ãÈÓæØ äÊÇíÌ åãÓäÌí / ãÞÇíÓå " -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr " ÊÇÑíÎ ÊÛííÑ ÓãÊ í " -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr " ÊÇÑíÎ ÊÛííÑ ÓãÊ ÑÇÓÊí " -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr " ÊæÓÚå ÑæäÏå " -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr " ÇäÏÇÒå ÑæäÏå  Èå ÈÇíÊ " -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr " ÇäÏÇÒå ÑæäÏå ÑÇÓÊ Èå ÈÇíÊ " -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr " ÇäÏÇÒå ÑæäÏå ÓãÊ  ÈÕæÑÊ ãÎÊÕÑ äãÇíÔ ÏÇÏå ãí ÔæÏ " -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr " ÇäÏÇÒå ÑæäÏå ÓãÊ ÑÇÓÊ ÈÕæÑÊ ãÎÊÕÑ äãÇíÔ ÏÇÏå ãí ÔæÏ " -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr " ÒãÇä ÇíÌÇÏ ØÑÝ  " -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr " ÒãÇä ÇíÌÇÏ ØÑÝ ÑÇÓÊ " -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr " ãí æíÏ ˜å ÊÇÑíÎ ÊÛííÑ ˜ÏÇã ÓãÊ ÌÏíÏÊÑ ÇÓÊ " -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr " äÇÑÔ ÑæäÏå ÓãÊ ¡ ÝÞØ ÈÑÇí ÈÑÎí ÇÒ ÇäæÇÚ ÑæäÏå åÇ " -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr " äÇÑÔ ÑæäÏå ÓãÊ ÑÇÓÊ¡ ÝÞØ ÈÑÇí ÈÑÎí ÇÒ ÇäæÇÚ ÑæäÏå åÇ " -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr " äÊíÌå åãÓäÌí ÈØæÑ ˜æÊÇå " -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr " ÎÕíÕå åÇí ÓãÊ  " -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr " ÎÕíÕå åÇí ÓãÊ ÑÇÓÊ " -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr " ÑæäÏå ÓãÊ  EOL äæÚ " -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr " ÑæäÏå ÓãÊ ÑÇÓÊ EOL äæÚ " -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr " ˜ÏÈäÏí ÓãÊ  " -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr " ˜ÏÈäÏí ÓãÊ ÑÇÓÊ " -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr " ÔãÇÑå ÊÝÇæÊåÇí Ô㠁æÔí ÔÏå ÏÑ ÑæäÏå. Çíä ÊÝÇæÊåÇ ÊæÓØ æíäãÑÌ Ô㠁æÔí ÔÏå ÇÓÊ æ ÞÇÈá íæäÏ ÒÏä äíÓÊ " -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr " ÔãÇÑå ÊÝÇæÊåÇ ÏÑ ÑæäÏå. Çíä ÔãÇÑå ÔÇãá ÊÝÇæÊåÇí Ô㠁æÔí ÔÏå äãí ÔæÏ " -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr " äãÇíÔ í˜ ÓÊÇÑå * ÏÑ ÕæÑÊí˜å ÑæäÏå ÏæÇäí / ÈÇíäÇÑí ÈÇÔÏ " -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr " åãÓäÌí %1 ÈÇ %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr " ÝåÑÓÊí ˜å ÈÇ ˜ÇãÇ ÌÏÇ ÔÏå ÈÇÔÏ " -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr " ÝåÑÓÊ ÌÏÇÔÏå ÈÇ ˜áíÏ ÌåÔ " -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr " ÓÇÏå HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr " ÓÇÏå XML " -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr " íÔ ÇÒ Çíä¡ ÑæäÏå ÒÇÑÔ æÌæÏ ÏÇÔÊå ÇÓÊ. ÂíÇ ãÇíáíÏ ˜å ÑæäÏå ÌÇíÒíä ÔæÏ ¿ " -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4400,32 +4482,32 @@ msgstr "" " ÎØÇ ÏÑ ÇíÌÇÏ ÒÇÑÔ : \n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr " ÒÇÑÔ ÈÇ ãæÝÞíÊ ÇíÌÇÏ ÔÏå ÇÓÊ " -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr " í˜ ÑæäÏå ÏÑ åÑ Ïæ ÊÇÈáæ ÈÇÒ ÔÏå ÇÓÊ" -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr " ÑæäÏå åÇí ÇäÊÎÇÈ ÔÏå åãÓÇä åÓÊäÏ " -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr " Èå åäÇã åãÓäÌí ÑæäÏå åÇ ÎØÇíí ÑÎ ÏÇÏ " -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr " ÑæäÏå åÇí ãæÞÊí ÑÇ äãí ÊæÇä ÇíÌÇÏ äãæÏ. ÊäÙíãÇÊ ãÓíÑ ãæÞÊ ÈÑÑÓí ÑÏÏ " -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4440,17 +4522,17 @@ msgstr "" "\n" "ÊæÌå: ÏÑ ÕæÑÊí˜å ãí ÎæÇåíÏ ÈÑÇí åãíÔå ÊãÇã ÇäæÇÚ ÚáÇãÊåÇí ÈÇҐÔÊ Èå ÓÑ ÓØÑ í˜ÓÇä ÏÑ äÙÑ ÑÝÊå ÔæäÏ¡ ÇäÊÎÇÈ \"äÇÏíÏå ÑÝÊä ÊÝÇæÊ ÚáÇãÊåÇí ÈÇҐÔÊ Èå ÓÑ ÓØÑ ...\" ÏÑ ÈÎÔ ãÞÇíÓå / åãÓäÌí äÌÑå ãÍÇæÑå ÎíÇÑÇÊ {ãæÌæÏ ÒíÑ æíÑÇíÔ>ÎíÇÑÇÊ} ÚáÇãÊ ÒÏå ÔæÏ " -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr " æÔå ÇäÊÎÇÈ ÔÏå æÌæÏ äÏÇÑÏ " -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr " äãí ÊæÇäÏ ÝÇíá ÏæÇäí / ÈÇíäÇÑí ÑÇ ÏÑ æíÑÇÓÊÇÑ ÈÇÒ äãÇíÏ " -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4465,7 +4547,7 @@ msgstr "" "%1\n" "Èå ÓãÊ ÏíÑ æ ÈÇÒÔÏä Çíä æÔå åÇ ¿ " -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4476,152 +4558,152 @@ msgstr "" " äãÇíÔ åÑ ÑæäÏå ÏÑ ÕÝÍå ˜Ï ÎæÏÔ Ìáæå ÈåÊÑí ÏÇÑÏ ÇãÇ ÑæäæÔÊ ÈÑÏÇÑí / íæäÏ Òäí ÎØÑäǘ ÎæÇåÏ ÈæÏ \n" " ÂíÇ ãÇíá åÓÊíÏ ÊÇ ÈÇ åÑ Ïæ ÑæäÏå Èå Ԙáí ˜å ÏÑ ÕÝÍå ˜Ï íÔ ÝÑÖ æíäÏæÒ ãí ÈÇÔÏ¡ ˜ÇÑ ÔæÏ - Çíäæäå ÊæÕíå ãíÔæÏ - ¿" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr " ÇØáÇÚÇÊ Èå Ïáíá ÎØÇåÇí ˜ÏÈäÏí ÇÒ ÏÓÊ ÑÝÊ : ÏÑ ÑæäÏå åÑ Ïæ ÓãÊ " -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr " ÈÏæä ÝÑÞ" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr " ÊÝÇæÊ ÎØ Èå ÎØ " -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr " ÑÔÊå {åÇí} ÌÇíÒíä ÔÏå : %1" -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr " äãí ÊæÇä ÑÔÊå ÑæÈÑæ ÑÇ íÏÇ ˜ÑÏ : \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr " åÇѐæÔ ã˜Çä " -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr " åÇѐæÔ ÊÝÇæÊ " -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr " ÑæäÏå æÕáå /˜Žäå ÈÇ ãæÝÞíÊ äæÔÊå ÔÏ " -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr " ãæÑÏ íÏÇ äÔÏ íÇ ÝåÑÓÊ äÔÏå ÇÓÊ ! -1" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr " ãæÑÏ íÏÇ äÔÏ íÇ ÝåÑÓÊ äÔÏå ÇÓÊ ! -2" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr " ÑæäÏå æÕáå / ˜Žäå ÏÑ ÍÇá ÍÇÖÑ ãæÌæÏ ãí ÈÇÔÏ. ÂíÇ ãí ÎæÇåíÏ ÊÇ ÈÇÒäæíÓí ÔæÏ¿ " -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "{ ÑæäÏå åÇí ÇäÊÎÇÈ ÔÏå: %1 }" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr " ÚÇÏí " -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr " ãÊä " -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr " 혁Çэå ÔÏå " -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "äãí ÊæÇäÏ ÏÑ ÑæäÏå 1% ÈäæíÓÏ " -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr " ãÓíÑ ÎÑæÌí ãÔÎÕ ÔÏå í˜ ãÓíÑ ãØáÞ äãí ÈÇÔÏ : %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr " í˜ ÑæäÏå ÎÑæÌí ÑÇ ãÔÎÕ äãÇííÏ " -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr " äãí ÊæÇä í˜ æÕáå / ˜Žäå ÑæäÏå ÇÒ ÑæäÏå åÇí ÏæÇäí / ÈÇíäÇÑí Êåíå äãæÏ " -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr " äãí ÊæÇä í˜ æÕáå / ˜Žäå ÑæäÏå ÇÒ ÝåÑÓÊåÇí ÑÇåäãÇ ÇíÌÇÏ äãæÏ " -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4632,12 +4714,12 @@ msgstr "" "\n" "ÇíÌÇÏ í˜ æÕáå / ˜Žäå äíÇÒãäÏ ÇíäÓÊ ˜å åí ÊÛííÑ ÐÎíÑå äÔÏå Çí ÏÑ ÑæäÏå åÇ æÌæÏ äÏÇÔÊå ÈÇÔÏ " -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr " æÔå æÌæÏ äÏÇÑÏ " -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4648,37 +4730,37 @@ msgstr "" " ÊãÇã ÇÌÒÇÁ ãæÑÏ äíÇÒ ÈÑÇí ÔÊíÈÇäí ÇÒ ÈÇíÇäí ÑÇ äãí ÊæÇä íÇÝÊ - Merge7z*.dll &/ 7-zip - \n" " ÈÑÇí ÇØáÇÚ ÈíÔÊÑ ÇÒ ÔÊíÈÇäí ÈÇíÇäí æ æäí ÝÚÇáÓÇÒí Âä¡ ˜ÊÇȍå ÑÇåäãÇ ÑÇ ÈÈíäíÏ" -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr " ÇäÊÎÇÈ ÑæäÏå ÈÑÇí ÕÏæÑ " -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr " ÇäÊÎÇÈ ÑæäÏå ÈÑÇí æÑæÏ " -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr " ÎíÇÑÇÊ ÇÒ ÑæäÏå æÇÑÏ ÔÏ " -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr " ÎíÇÑÇÊ Èå ÑæäÏå ÕÇÏÑ ÔÏ " -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr " æÑæÏ ÎíÇÑÇÊ ÇÒ ÑæäÏå äÇãæÝÞ ÈæÏ " -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr " äÇÑÔ ÎíÇÑÇÊ ÏÑ ÑæäÏå äÇãæÝÞ ÈæÏ " -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4689,247 +4771,247 @@ msgstr "" "\n" "ÂíÇ ãÇíá Èå ÇÏÇãå åÓÊíÏ ¿ " -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr " ãÎáæØ " -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr " äæÚ " -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr " ÈÇÒ ˜ääÏå ÈÓÊå " -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr " íÔ ÝÑÞ ÐÇÑ " -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "ÏÓÊ äæÔÊå ÈÑÇí æíÑÇÓÊÇÑ " -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr " ÈÇҘääÏå ÈÓÊå ÊØÈíÞ ÏÇÏå ÔÏå Ñæí åÑ Ïæ ÑæäÏå åÇ È˜ÇÑ ÈÓÊå ãí ÔæÏ " -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr " ÈÏæä íÔ ÝÑÞ ÐÇÑ - ÚÇÏí " -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr " æÕá ÔÏäíåÇí íÔäåÇÏí " -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr " ÓÇíÑ æÕá ÔÏäíåÇ " -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr " ÓÇÎÊ ÔÎÕí : %1 " -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr " ÞÑÇѐÇååÇí æÕá ÔÏäí åÇ" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr " .sct íÏÇ äÔÏ - ÏÓÊ äæÔÊå åÇ ÛíÑ ÝÚÇá ÔÏ WSH " -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "<å퍘ÏÇã>" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "<ÎæϘÇÑ>" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "&G ÈÑæ Èå ÎØ %1 " -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr " ÛíÑ ÝÚÇá " -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr " ÇÒ ÏÓʐÇå (ÓíÓÊã) ÑæäÏå åÇ " -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr " ÇÒ ÝåÑÓÊ ÂÎÑíä ÑæäÏå åÇ " -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr " ãÔÎÕ ä˜ÑÏä " -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr " ÏÓÊå " -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr " ÔíÆ Íãá ÔÏäí " -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr " ãäÇÈÚ " -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr " æÓÊå " -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po index ee5610d5b..36d850158 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -79,7 +79,7 @@ msgid "Cu&t" msgstr "&Wytnij" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Kopiuj" @@ -90,7 +90,7 @@ msgid "&Paste" msgstr "Wk&lej" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&PrzejdŸ do" @@ -101,22 +101,25 @@ msgid "Op&en" msgstr "&Otwórz" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "w za&rejestrowanej aplikacji" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "w &zewnêtrznym edytorze" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&w..." @@ -154,7 +157,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Powiêkszenie" @@ -166,8 +169,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Brak" @@ -184,49 +187,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Plik" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Nowy\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Otwórz...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Otwórz plik konfliktu" #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Otwórz projekt ...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Zapi&sz projekt..." @@ -238,274 +241,274 @@ msgstr "Ostatnie projekty" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< pusty >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "Zakoñcz" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Edycja" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Opcje..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Widok" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "Pasek &narzêdzi" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Ma³y" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Du¿y" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "Pasek s&tanu" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Pasek &kart" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Narzêdzia" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filtry..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Generuj ³atkê..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Wtyczki" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "&Rêczne ró¿nicowanie wstêpne" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "&Automatyczne ró¿nicowanie wstêpne" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "Rozpakowywanie &rêcznie" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "Rozpakowywanie &automatycznie" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Prze³aduj wtyczki" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&Okno" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Zamknij" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Zamknij &wszystkie" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Prze³¹cz &panel\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "P&oziomo" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "P&ionowo" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Kaskadowo" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Pomoc" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge - pomoc\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "&Konfiguracja" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "WinMerge - inf&ormacje..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Lewa tylko do &odczytu" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Prawa t&ylko do odczytu" @@ -516,7 +519,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Zaznacz &wszystkie\tCtrl+A" @@ -538,1751 +541,1811 @@ msgstr "Poka #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Poka¿ u&nikatowe po prawej" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Poka¿ po&miniête elementy" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Poka¿ pliki &binarne" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Poka¿ elementy u&kryte" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "Tryb &drzewa" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "Rozwiñ wszystkie podfoldery" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "Zwiñ wszystkie podfoldery" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Wybierz czcionkê..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Przywróæ domyœln¹ czcionkê" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Statystyki po&równania" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "O&dœwie¿\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Odœwie¿ zaznaczone\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Scal" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "&Porównaj\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Nastêpna ró¿nica\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Pop&rzednia ró¿nica\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "P&ierwsza ró¿nica\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Bie¿¹ca ró¿nica\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Os&tatnia ró¿nica\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopiuj na praw¹\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopiuj na lew¹\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Usuñ\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Dostosuj kolumny..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Utwórz &raport..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Zapisz\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Zapisz &lew¹" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Zapisz &praw¹" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Drukuj..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "&Ustawienia strony" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "&Podgl¹d wydruku" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Konwertuj koñce linii do" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "&Tryb scalania\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "&Kodowanie pliku" -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Cofnij\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Powtórz\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Wytnij\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopiuj\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "Wk&lej\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Zaznacz &ró¿nicê linii\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "W&yszukaj...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Zast¹p...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Zaawansowane" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopiuj z numerami wierszy\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "Za&k³adki" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Dodaj zak³adkê\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Nastêpna zak³adka\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Poprzednia zak³adka\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Wyczyœæ wszystkie zak³adki" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&IdŸ do...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "&Powiêksz\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "&Zmniejsz\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Rozmiar oryginalny\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Kolorowanie sk³adni" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "&Zablokuj panele" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "&Poka¿ bia³e znaki" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Poka¿ ró¿nice &wierszy" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Poka¿ &numery wierszy" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Poka¿ &marginesy" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "Za&wijaj wiersze" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Za&mieñ panele" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Panel &ró¿nic" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Panel &lokalizacji" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopiuj na prawo i przejdŸ dalej\tAlt+Ctrl+W prawo" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopiuj na lewo i przejdŸ dalej\tAlt+Ctrl+W lewo" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Kopiuj wszystko na praw¹" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Kopiuj wszystko na lew¹" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Ró¿nicowanie wstêpne" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Skrypty" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "&Porównaj" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&Lewa na praw¹" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "L&ewa do..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "&Prawa na lew¹" +msgid "Left to Right (%1 of %2)" +msgstr "Lewa na praw¹ (%1 z %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "Pra&wa do..." +msgid "Left to... (%1 of %2)" +msgstr "Lewa na... (%1 z %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "Prze&nieœ" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&Lewa do..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&Prawa do..." +msgid "Right to Left (%1 of %2)" +msgstr "Prawa na lew¹ (%1 z %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Prawa na... (%1 z %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "Prze&nieœ" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Usuñ" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&Lewa" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Prawa" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Obie" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Zmieñ &nazwê" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "U&kryj elementy" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "O&twórz lew¹" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Otwórz p&raw¹" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Kopiuj œ&cie¿ki" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&Lewa (%1 z %2)" +msgid "Left (%1 of %2)" +msgstr "Lewa (%1 z %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&Prawa (%1 z %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Prawa (%1 z %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Obie (%1 z %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Obie (%1 z %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Kopiuj &nazwy plików" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Spakuj" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&Lewa... (%1 z %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&Prawa... (%1 z %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Obie... (%1 z %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Ró¿nice... (%1 z %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "O&dœwie¿" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Menu pow³oki pliku po lewej" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Menu pow³oki pliku po prawej" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "Kopiuj &pe³n¹ œcie¿kê" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Kopiuj nazwê p&liku" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Ustawienia wstêpnego ró¿nicowania" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Bez ró¿nicowania wstêpnego" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Automatyczne ró¿nicowanie wstêpne" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "IdŸ &do ró¿nicy" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "Bez &przeniesionych bloków" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "W&szystkie przeniesione bloki" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Przeniesiony blok dla bie¿¹cej ró¿nicy" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "Bia³e &znaki" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Porów&naj" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "Po&miñ zmiany" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Pomiñ &wszystkie" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "Uwzglêdnij wielkoœæ &liter" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Ignoruj ró¿nice koñca wiersza (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "Metoda &porównania:" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Pe³na zawartoœæ" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Skrócona zawartoœæ" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Data modyfikacji" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Data modyfikacji i wielkoœæ" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Wielkoœæ" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "WinMerge - informacje" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(kompilacja prywatna)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "OdwiedŸ stronê domow¹ WinMerge!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Wspó³twórcy" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Wybierz pliki lub foldery..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Przegl¹daj..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "P&rzegl¹daj" -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Prz&egl¹daj..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Wybierz..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "Program &rozpakowuj¹cy:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "&Wybierz..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Uwzglêdnij podfoldery" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Stan:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Anuluj" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Pomoc" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Obiekty do porównania" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Baza danych:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "U¿ytkownik:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Has³o:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "£¹cze do projektu VSS" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Zastosuj do wszystkich" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "SprawdŸ" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Zapisz jako..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "System œledzenia wersji" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "Œledzenie &wersji:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "S&cie¿ka do cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Ogólne" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "PrzejdŸ automatycznie do pierwszej ró¿nicy" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Zam&knij okna klawiszem ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Automatycznie weryfikuj œcie¿ki w oknie otwierania plików" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Zezwól na uruchomienie tylko &jednej instancji programu" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Zapytaj przed zamykaniem wielu okien" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "Zapisz daty pliku przy porównywaniu" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Poka¿ okno \"Wybierz pliki lub foldery\" po uruchomieniu" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Autouzupe³nianie okna otwierania:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge pozwala ukryæ niektóre komunikaty. Naciœnij przycisk Resetuj, aby wyœwietlaæ wszystkie komunikaty." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Resetuj" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Wyszukaj" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "&Szukaj:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Dopasuj &ca³e s³owa" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Wielkoœæ &liter" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "Wyra¿enie ®ularne" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "Szukaj tylko do koñca pliku" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Nastêpny" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Zast¹p" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Z&ast¹p:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "Szukaj tylko do koñca pliku" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Zast¹p w" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&Zaznaczenie" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "Ca³y &plik" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Zast¹p" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "&Wszystkie" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "SprawdŸ" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Komentarze" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn po CheckOut" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Filtry wierszy" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "W³¹cz filtry linii" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Wyra¿enia regularne (1 na wiersz):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Nowy" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Edytuj" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Usuñ" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Kolory" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Ró¿nica:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Wybrana ró¿nica:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "T³o" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Usuniête" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Pominiêta ró¿nica:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Przeniesione:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Wybrane przeniesiono:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Ró¿nica-s³owo:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Wybrana ró¿nica s³owa:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Domyœlne" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "System" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Wyœlij usuniête pliki do &kosza" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "Zewnêtrzny &edytor:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Folder filtrów:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Folder plików tymczasowych" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "systemowy" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "w³asny folder" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Generuj ³atkê" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Plik&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Plik&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "Za&mieñ" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "Dodaj do &istniej¹cego pliku" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Wynik:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "&Przegl¹daj..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "St&yl:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Kontekst:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Pomiñ &bia³e znaki" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Uwzglêdnij wiersz &poleceñ" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Otwórz w &zewnêtrznym edytorze" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Wyœwietl kolumny" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "W &górê" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "W dó³" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Wybierz program rozpakowuj¹cy" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Program rozpakowuj¹cy:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Poka¿ wszystkie programy, nie sprawdzaj rozszerzenia" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Lista rozszerzeñ:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Opis:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Zatrzymaj" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Porównywanie elementów..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Porównano elementów:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Wszystkich:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "IdŸ do" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "&IdŸ do:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Plik" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Element docelowy" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "&Wiersz" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Ró¿nica" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&IdŸ do" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Porównaj" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Bia³e znaki" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Porównaj" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "Ignoruj &zmiany" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Ignoruj &wszystkie" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ignoruj ró¿nice pustych linii" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Ignoruj ró¿nice wielkoœci liter" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "W³¹cz &wykrywanie przeniesionych bloków" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "Dopasuj takie same linie" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Komentarze filtra" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Edytor" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "Podœwietlaj sk³adniê" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "Automatyczne &skanowanie" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "Zachowaj &oryginalne znaki koñca linii" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabulatory" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Rozmiar tabulatora:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "Wstawiaj tabulatory" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "Wstawiaj spacje" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Kolorowanie ró¿nic linii" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Poka¿ ró¿nice linii" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "Poziom &znaków" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "Poziom &s³ów:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "S³&owo ³amie znaki:" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Filtry plików" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Testuj" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Instaluj..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Nowy..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Edycja..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Usuñ..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Zapisz zmodyfikowane pliki?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Plik z lewej" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Zapisz zmiany" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Odrzuæ zmiany" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Plik z prawej" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "Zachowa&j zmiany" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Odr&zuæ zmiany" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "Odrzuæ &wszystkie" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Strona kodowa" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Domyœlna strona kodowa" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Wybierz domyœlne kodowanie dla otwieranych plików nie bêd¹cych plikami Unicode:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2291,692 +2354,692 @@ msgstr "" "Wykrywaj stonê kodow¹ dla plików: .html, .rc, .xml \n" "konieczny restart sesji" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Strona kodowa systemu" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Wed³ug interfejsu WinMerge" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Inna strona kodowa:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Opcje" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Kategorie" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importuj" -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Eksportuj" -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Okno dialogowe" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "S³owa kluczowe:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Nazwy funkcji:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Komentarze:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Liczby:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operatory:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "S³owa:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Preprocesor:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "U¿ytkownika 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "U¿ytkownika 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Pogrubienie" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Raport porównania folderów" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "&Plik raportu:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Przegl¹daj..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Styl:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopiuj do schowka" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Folder wspó³dzielony lub prywatny" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Jaki rodzaj filtra chcesz utworzyæ?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtr wspó³dzielony (dla wszystkich u¿ytkowników)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtr prywatny (tylko dla bie¿¹cego u¿ytkownika)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Wsparcie dla archiwów" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&W³¹cz wsparcie dla archiwów" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "Wy&krywaj typ archiwum z sygnatury pliku" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Statystyki porównania" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Foldery:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Pliki:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "ró¿nych" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Tekst:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binarne:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Unikalne" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Lewa:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Prawa:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Identyczne" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Wszystkich:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Zamknij" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Dzia³anie" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(dzia³anie)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Wybierz stronê kodow¹ dla" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&£adowanie pliku:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "&Zapisywanie pliku:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&U¿yj tej samej strony kodowej dla obu" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "Z&astosuj" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "A&nuluj" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Testuj filtr" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Testowanie filtra ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Podaj tekst do sprawdzenia:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "Nazwa &folderu" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Wynik:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Testuj" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Zamknij" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&U¿yj w³asnych kolorów tekstu" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Kolory tekstu u¿ytkownika" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Odstêp:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Czcionka regularna:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Zaznaczenie:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Œcie¿ki" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Lewa:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Ty&lko do odczytu" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Prawa:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Ty&lko do odczytu" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filtr:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Otwórz..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Zapisz..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Pliki kopii" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Twórz kopie plików dla:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Porównania &folderów" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Porównania &plików" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Pliki kopii zapasowych twórz w:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "Folder oryginalnego pliku" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&Globalny folder dla kopii:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Nazwa pliku kopii:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "Dod&aj rozszerzenie .bak" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "Dodaj czas utworzenia kopii" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "PotwierdŸ kopiowanie" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Czy na pewno skopiowaæ XXX elementów?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Z lewej" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "na praw¹" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Tak" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Nie" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Wtyczki" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "W³¹cz wtyczki" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Integracja z systemem" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Eksplorator" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "W³¹cz menu &zaawansowane" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "Dodaj do menu kontekstowego" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Folder" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "&Zatrzymaj po pierwszej ró¿nicy" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignoruj ró¿nice czasu mniejsze ni¿ 3 sekundy" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "&Uwzglêdnij unikaln¹ zawartoœæ podfolderów" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "Limit sz&ybkiego porównania (MB):" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binarne" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "041504e2" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x415, 1250" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Nieznany b³¹d podczas otwierania projektu" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Nieznany b³¹d podczas zapisu projektu" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Plik projektu" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Plik projektu za³adowano pomyœlnie." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Plik projektu zapisano pomyœlnie." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2995,7 +3058,7 @@ msgstr "" "WinMerge.FileCompare\n" "Porównanie plików WinMerge " -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3014,7 +3077,7 @@ msgstr "" "WinMerge.FolderCompare\n" "Porównanie folderów WinMerge" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3023,143 +3086,143 @@ msgstr "" "Twórcy:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 jest rozprowadzany BEZ JAKIEJKOLWIEK GWARANCJI. To jest darmowe oprogramowanie i mo¿na je redystrybuowaæ pod szczególnymi warunkami; w celu uzyskania szczegó³owych informacji zobacz Licencjê GNU General Public License w menu Pomoc." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Przerwij" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "P&onów" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Ignoruj" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Ignoruj &wszystkie" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Tak" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Tak na &wszystkie" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Nie" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Nie na w&szystkie" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Kontynuuj" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "Pom&iñ" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Pomiñ ws&zystkie" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Nie wyœwietlaj ponownie tego komunikatu." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Nie &pytaj ponownie." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "Sk³adnia" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Kontrola wersji" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Ró¿nice" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Z lewej:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "na lew¹:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Z prawej:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Na praw¹" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Wersja %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Opcje (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Wszystkie komunikaty zostan¹ ponownie wyœwietlone." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3170,84 +3233,84 @@ msgstr "" "\n" "Proszê u¿yæ wartoœci 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Otwórz" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programy|*.exe;*.bat;*.cmd|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Pliki projektów WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Pliki ustawieñ (*.ini)|*.ini|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Pliki Text (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Pliki HTML (*.htm,*.html)|*.htm;*.html|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Pliki XML (*.xml)|*.xml|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Nazwa" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "lokalizacja" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filtry" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Opis" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Wybierz nazwê dla nowego filtru" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtry plików(*.flt)|*.flt|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3260,7 +3323,7 @@ msgstr "" "Proszê skopiowaæ plik %1 do folderu WinMerge/Filters:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3273,7 +3336,7 @@ msgstr "" "\n" "Upewnij siê, ¿e folder taki istnieje i jest zapisywalny." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3284,7 +3347,7 @@ msgstr "" "\n" "Proszê wybraæ folder filtrów w opcje/System." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3297,12 +3360,12 @@ msgstr "" "\n" "Byæ mo¿e plik ten jest tylko do odczytu?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Lokalizuj plik fitra do instalacji" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3313,17 +3376,17 @@ msgstr "" "\n" "Nie mo¿na skopiowaæ pliku do foldera filtrów." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Plik filtra ju¿ istnieje. Czy nadpisaæ istniej¹cy plik?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Wyra¿enia regularne" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3334,173 +3397,173 @@ msgstr "" "\n" "Je¿eli nie chcesz odœwierzaæ okien porównañ teraz, wybierz Nie i odœwie¿ okna póŸniej." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "Œcie¿ka do SS.EXE" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Wyniki porównania folderów" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Porównywanie plików" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Lewy bez tytu³u" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Prawy bez tytu³u" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Ich plik" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Mój plik" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Linia: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Scal" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Ró¿nica %1 z %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "Znaleziono ró¿nic: %1" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "Znaleziono 1 ró¿nicê" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "Tylko odczyt" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Element %1 z %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Elementy: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Wybierz dwa istniej¹ce foldery lub pliki do porównania" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Wybór katalogu" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Wybierz dwa foldery lub pliki do porównania." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Lewa œcie¿ka nieprawid³owa!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Prawa œcie¿ka nieprawid³owa!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Obie œcie¿ki nieprawid³owe!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Wybierz dwa pliki, aby umo¿liwiæ wybór programu rozpakowuj¹cego." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Nie mo¿na porównaæ pliku i folderu!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Nie znaleziono pliku: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Plik nie rozpakowany: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3513,12 +3576,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "B³¹d parsowania pliku konflitku" -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3529,27 +3592,27 @@ msgstr "" "%1\n" "nie jest plikiem konfliktu" -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Zapisz jako" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Zapisaæ zmiany w %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 tylko do odczytu. Czy chcesz zachowaæ plik pod inn¹ nazw¹?" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "B³¹d przy tworzeniu kopii zapasowej pliku" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3562,7 +3625,7 @@ msgstr "" "\n" "Kontynuowaæ ?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3579,7 +3642,7 @@ msgstr "" "\t-u¿yæ innej nazwy pliku (wybierz Ok)\n" "\t-anulowaæ operacjê (wybierz Anuluj)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3594,7 +3657,7 @@ msgstr "" "\n" "Czy zachowaæ rozpakowan¹ wersjê w innym pliku?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3609,7 +3672,7 @@ msgstr "" "\n" "Czy zachowaæ rozpakowan¹ wersjê w innym pliku?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3624,7 +3687,7 @@ msgstr "" "\n" "Nadpisaæ zmieniony plik?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3633,7 +3696,7 @@ msgstr "" "%1\n" "jest oznaczony jako tylko do odczytu. Czy zignorowaæ status tylko do odczytu?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3648,22 +3711,22 @@ msgstr "" "\n" "Czy prze³adowaæ plik?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Zapisz lewy plik jako" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Zapisz prawy plik jako" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3674,7 +3737,7 @@ msgstr "" "%1\n" "zosta³ usuniêty. Aby kontynuowaæ proszê zapisaæ jego kopiê" -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3685,42 +3748,42 @@ msgstr "" "\n" "Przed kontynuacj¹ odœwie¿ dokumenty." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Musisz wskazaæ scie¿kê projektu SourceSafe aby kontynuowaæ (tj.: $/MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Pobie¿ pliki z VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "System œledzenia wersji zwróci³ b³¹d podczas próby pobrania pliku. Nie mo¿na kontynuowaæ..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "B³¹d wykonania polecenia systemu wersjonowania." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Katalog roboczy VSS oraz lokalizacja bie¿acego pliku nie zgadzaj¹ siê. Kontynuowaæ?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Nie znaleziono bazy VSS!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "B³¹d VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3731,7 +3794,7 @@ msgstr "" " Proszê sprawdziæ config_spec u¿ywanego widoku.\n" " Cofn¹æ operacjê checkout?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3740,127 +3803,146 @@ msgstr "" "System œledzenia wersji zwróci³ b³¹d podczas operacji uncheckout.\n" " Proszê sprawdziæ config_spec u¿ywanego widoku." -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Brak" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "(Visual SourceSafe (poni¿ej 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 i wy¿ej)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Zatrzymaj na przerwie" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Zatrzymaj na przerwie lub punktorze" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Prawa na lew¹ (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Lewa na praw¹ (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Prawa na lew¹ (%1 z %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Lewa na praw¹ (%1 z %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Lewa na praw¹ (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Lewa na... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Prawa na... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Lewa na... (%1 z %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Prawa na... (%1 z %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Lewa (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Prawa (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Obie (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Lewa (%1 z %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Prawa (%1 z %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Obie (%1 z %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Lewa strona - wybierz folder docelowy:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Prawa strona - wybierz folder docelowy:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 objêtych plików)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 z %2 objêtych plików)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3871,17 +3953,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Czy na pewno skopiowaæ:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Czy na pewno skopiowaæ %d elementów:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3900,502 +3982,502 @@ msgstr "" "\n" "Proszê odœwie¿yæ porównanie." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Czy na pewno przenieœæ:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Czy na pewno przenieœæ %d elementów:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Potwierdzenie przenoszenia" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nie mo¿na uruchomiæ zewnêtrznego edytora: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Nieznany format archiwum" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Plik" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Wynik porównania" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Data pliku po lewej" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Data pliku po prawej" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Rozszerzenie" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Rozmiar w lewym panelu" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Rozmiar w prawym panelu" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Rozmiar po prawej (krótki)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Rozmiar po lewej (krótki)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Czas utworzenia po lewej" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Czas utworzenia po prawej" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Nowszy plik" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Wersja pliku po lewej" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Wersja pliku po prawej" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Skrócony wynik" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Atrybuty po lewej" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Atrybuty pliku po prawej" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Lewe ZKL" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Prawe ZKL" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Lewe kodowanie" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Prawe kodowanie" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Ignorowane ró¿n." -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Nie mo¿na porównaæ plików" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Anulowany" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Plik pominiêty" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Folder pominiêty" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Tylko po lewej: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Tylko po prawej: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Pliki binarne s¹ identyczne" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Pliki binarne s¹ ró¿ne" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Pliki s¹ ró¿ne" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Foldery different" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Tylko po lewej" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Tylko po prawej" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "B³¹d" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Pliki tekstowe s¹ identyczne" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Pliki tekstowe s¹ ró¿ne" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Up³ynê³o: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "wybrano 1 element" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "wybrano %1 elementów" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Plik lub katalog." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nazwa podkatalogu, gdy podkatalogi s¹ przetwarzane." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Wynik porównania – wersja pe³na." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Data modyfikacji lewej strony." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Data modyfikacji prawej strony." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Rozszerzenie pliku." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Rozmiar lewego pliku w bajtach." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Rozmiar prawego pliku w bajtach." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Lewa wielkoœæ pliku skrócona." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Prawa wielkoœæ pliku skrócona." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Czas utworzenia lewej strony." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Czas utworzenia prawej strony." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Pokazuje, która strona zosta³a póŸniej zmodyfikowana." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Wersja pliku z lewej - tylko dla niektórych typów." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Wersja pliku z prawej - tylko dla niektórych typów." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Skrócony wynik porównania." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Atrybuty lewej strony." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Atrybuty prawej strony." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Typ znaków koñca linii z lewej" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Typ znaków koñca linii z prawej" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Kodowanie lewej strony." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Kodowanie prawej strony." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Liczba ró¿nic zignorowanych w pliku. Ró¿nice te zosta³y zignorowane przez WinMerge i nie mog¹ zostaæ po³¹czone." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Liczba ró¿nic w pliku. Liczba ta nie zawiera zignorowanych ró¿nic." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Pokazuje gwiazdkê (*) jeœli plik binarny." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Porównaj %1 z %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Lista z przecinkami" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Lista z tabulatorami" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Prosty HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Prosty XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Plik raportu ju¿ istnieje. Czy chcesz nadpisaæ istniej¹cy plik ?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4404,32 +4486,32 @@ msgstr "" "B³¹d przy tworzeniu raportu:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Raport zosta³ pomyœlnie utworzony." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Ten sam plik otwierany w obu panelach." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Wybrane pliki s¹ identyczne." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "B³¹d podczas porównywania plików." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Nie mo¿na utworzyæ plików tymczasowych. SprawdŸ ustawienie œcie¿ki tymczasowej." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4444,17 +4526,17 @@ msgstr "" "\n" "Uwaga: Jeœli odmienne znaki koñca linii maj¹ zawsze byæ traktowane jako równowa¿ne, ustaw opcjê 'Ignoruj ró¿nice koñca linii...' na zak³adce porównania w oknie opcji (dostêpne w Edycja/Opcje)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Wybrany folder jest nieprawid³owy." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Nie mo¿na otworzyæ w edytorze pliku binarnego." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4469,7 +4551,7 @@ msgstr "" "%1\n" "na drugiej stronie i otworzyæ te foldery?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4480,152 +4562,152 @@ msgstr "" "Wyœwietlanie ka¿dego pliku w odpowiedniej stronie kodowej da lepsze wyniki, ale scalenie/skopiowanie bêdzie niebezpieczne.\n" "Would you like to treat both files as being in the default windows codepage (recommended)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Utrata informacji z powodu b³êdów kodowania: oba pliki" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Brak ró¿nic" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Ró¿nice wierszy" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Zast¹piono %1 sekwencji znaków." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nie mo¿na znaleŸæ sekwencji znaków \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Okno lokacji" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Okno Diff" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Utworzono ³atkê.." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. element nie zosta³ znaleziony albo jest katalogiem!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. element nie zosta³ znaleziony albo jest katalogiem!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Plik patch ju¿ istnieje. Czy napisaæ plik?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[wybrano %1 plików]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normalny" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Kontekst" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Zunifikowany" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Nie mo¿na zapisaæ do pliku %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Wybrana œcie¿ka docelowa nie jest absolutna: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Wybierz plik docelowy" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nie mo¿na utworzyæ patcha z plików binarnych." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nie mo¿na utworzyæ patcha z katalogów." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4636,12 +4718,12 @@ msgstr "" "\n" "Tworzenie patcha wymaga zapisania wszystkich zmian w plikach." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Folder nie istnieje." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4652,37 +4734,37 @@ msgstr "" "Nie znaleziono komponentów (7-zip i/lub Merge7z*.dll) wymaganych do obs³ugi archiwów.\n" "Informacje o obs³udze archiwów zawiera podrêcznik." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Wybierz plik do eksportu" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Wybierz plik do importu" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Zaimportowano opcje z pliku." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Wyeksportowano opcje do pliku." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "B³¹d podczas importu opcji z pliku." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "B³¹d podczas eksportu opcji do pliku." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4693,247 +4775,247 @@ msgstr "" "\n" "Czy na pewno kontynuowaæ?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "£¹czone" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Typ" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Program rozpakowuj¹cy" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Ró¿nicowanie wstêpne" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Skrypt edytora" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Program rozpakowuj¹cy zostanie uruchomiony dla obu plików (jeden plik wymaga rozszerzenia)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Bez ró¿nicowania wstêpnego (normalne)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Sugerowane wtyczki" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Inne wtyczki" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Kompilacja prywatna: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Ustawienia wtyczki" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Nie znaleziono WSH – skrypty .sct wy³¹czone" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "&IdŸ do linii %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Wy³¹czone" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Z systemu plików" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Z listy MRU" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Bez podœwietlenia" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Zasoby" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index f004185f8..8af3027da 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -77,7 +77,7 @@ msgid "Cu&t" msgstr "Cor&tar" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "Co&piar" @@ -88,7 +88,7 @@ msgid "&Paste" msgstr "Co&lar" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&Ir para..." @@ -99,22 +99,25 @@ msgid "Op&en" msgstr "&Abrir" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "com a aplicação registada" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "com editor &externo" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "com..." @@ -152,7 +155,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "" @@ -164,8 +167,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "" @@ -182,49 +185,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Ficheiro" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Novo\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "" #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Abrir pro&jecto...\Ctrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "&Guardar projecto..." @@ -236,274 +239,274 @@ msgstr "" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Vazio >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "&Sair" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Editar" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Opções..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Ver" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "&Barra de ferramentas" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "Barra de esta&do" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Ferramentas" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "Filtros..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Gerar ficheiro patch..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "Plugins" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "E&xtracção manual" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "Extracção automática" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Recarregar plugins" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&Janela" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Fechar" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Fechar &Todos" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Mudar &Vista\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Ordenar &horizontalmente" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Ordenar &verticalmente" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "Cascata" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "A&juda" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "Acerca de &WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Ler apenas lado &esquerdo" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Ler apenas lado &direito" @@ -514,7 +517,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Seleccionar &tudo\tCtrl+A" @@ -536,4150 +539,4229 @@ msgstr "Mostrar itens #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostrar itens únicos do lado direito" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Mostrar itens ignorados" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Mostrar ficheiros &binários" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Mostrar itens ocultados" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Seleccionar &fonte..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Usar fonte pre&definida" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Comparar estatísticas" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "Actuali&zar\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Actualizar selecção\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "Combinar" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Comparar\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "Próxima diferença\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Diferença anterior\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Primeira diferença\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Diferença actual\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Última diferença\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copiar para o lado direito\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copiar para o lado esquerdo\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Eliminar\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "Personalizar colunas..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "&Gerar relatório..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Guardar\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Guardar lado esquerdo" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Guardar lado direito" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Imprimir..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Pré-&visualizar" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "Converter final de linhas para" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "Modo Combinar\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Desfazer\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Refazer\tCtrl+Z" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Copiar...\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Colar\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Seleccionar diferenças de linha\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Procurar...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Substituir...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Avançado" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "Copiar com nºs de linha\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&Marcadores" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Alternar marcadores\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "Próximo marcador\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Marcador anterior\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "Eliminar todos os marcadores" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Ir para...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Combinar" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "&Ver espaços" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Ver diferenças de linha" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Ver nºs de linha" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "Ajuste de linha" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Trocar janelas" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Janela de diferenças" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Janela de localização" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "C&opiar para a direita e avançar\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copiar para o lado esquerdo\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Copiar tudo para a direita" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "C&opiar tudo para a esquerda" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "Pré-diferenciar" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "Scripts" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Comparar" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "Da esquerda para a direita" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "Da esquerda para..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "Da direita para a esquerda" +msgid "Left to Right (%1 of %2)" +msgstr "Da esquerda para a direita (%1 de %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 +#, c-format +msgid "Left to... (%1 of %2)" +msgstr "Da esquerda para... (%1 de %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 #, c-format -msgid "R&ight to..." -msgstr "Da direita para..." +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "Mover" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "Da esquerda para..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 +#, c-format +msgid "Right to Left (%1 of %2)" +msgstr "Da direita para a esquerda (%1 de %2)" + +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Da direita para... (%1 de %2)" + +#: Merge.rc:629 #, c-format -msgid "&Right to..." -msgstr "Da direita para..." +msgid "&Move" +msgstr "Mover" -#: Merge.rc:628 +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "Eliminar" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "Esquerda" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "Direita" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "Ambos" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Renomear" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "Ocultar itens" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "Abrir esquerda" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Abrir direita" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Copiar localização" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" +msgid "Left (%1 of %2)" msgstr "Esquerda (%1 de 2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "Direito (%1 de 2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Direita (%1 de 2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 #, c-format -msgid "&Both (%1 of %2)" +msgid "Both (%1 of %2)" msgstr "Ambos (%1 de %2)" -#: Merge.rc:656 +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 +#, c-format +msgid "All (%1 of %2)" +msgstr "" + +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Co&piar localização" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "Esquerda... (%1 de %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "Direita... (%1 de %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "Ambos... (%1 de %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "Diferenças... (%1 de %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "Actualizar" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "Copiar localização completa" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Co&piar nome de ficheiro" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Definições de Pré-diferenciação" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "Não pré-diferenciar" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Pré-diferenciação manual" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Ir para diferença" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "Não mostrar blocos movidos" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "Todos os blocos movidos" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Bloco movido para a diferença actual" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "Espaços" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Comparar" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "Ignorar alterações" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Ignorar todos" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "Reconhecer maiúsculas/minúsculas" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Conteúdo essencial" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Data de modificação" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Data de modificação e tamanho" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Tamanho" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Acerca de WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visite o site de WinMerge!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Colaboradores" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Seleccione ficheiros ou arquivos" -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "Pesquisar..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Pesquisar..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Seleccionar..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "E&xtractor:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "Seleccionar..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "Incluir sub-ficheiros" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Estado:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Cancelar" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Ajuda" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Ficheiros ou arquivos a comparar" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Base de dados:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Projecto:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Utilizador:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Palavra-passe:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Hiperligação ao destino do projecto VSS" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Aplicar a todos os itens" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Guardar como..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Sistema de versão" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "Sistema de versão:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "Destino de cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Geral" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Ir automaticamente para a primeira diferença" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fechar janela com ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verificar automaticamente localização na janela de abertura" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Permitir apenas uma execução" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Auto-completar janela de abertura:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite ocultar mensagens comuns. Prima o botão Repor para visualizar novamente todas as mensagens." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Repor" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Localizar" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "Localizar:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Apenas palavras completas" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Reconhecer maiúsculas/minúsculas" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "Termo corrente" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "Não ultrapassar fim de ficheiro" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "Localizar próximo" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "OK" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Substituir" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Substituir por:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "Não ultrapassar fim de ficheiro" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Substituir em" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "Selecção" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "Ficheiro completo" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "Substituir" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Substituir todos" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Comentários" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Verificar depois de sair" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Filtros de linha" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Ignorar linhas com as seguintes características" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Termos correntes (um por linha):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Cores" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Diferença:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Diferença seleccionada:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Fundo" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Eliminado" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Diferença ignorada:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Movida:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Movida seleccionada:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Diferença de palavra:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Diferença de palavra seleccionada:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Predefinição" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Enviar ficheiros eliminados para a Reciclagem" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "com editor &externo:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "Arquivo do filtro:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Gerador de ficheiro patch" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Ficheiro&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Ficheiro&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "Trocar" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "Anexar a ficheiro existente" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "Resultado:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Pesquisar..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "Formato" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "Estilo:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "Contexto:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorar linhas em branco" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Incluir linha de comando" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir em editor externo" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Mostrar colunas" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Seleccionar extractor" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "E&xtractor de ficheiros:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Mostrar todos os extractores, não verificar extensões" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Lista de extensões:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Descrição:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Parar" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "A comparar itens..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Itens comparados:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Total de itens:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Ir para" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "Ir para:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Ficheiro" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Ir para" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "Linha" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "Diferença" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "Ir para" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Espaço" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "Comparar" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "Ignorar alteração" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Ignorar todas" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar linhas em branco" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Ignorar maiúsculas/minúsculas" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Activar detecção de bloco movido" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Filtrar comentários" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "Destacar sintaxe" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "Re-análise automática" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "Manter caracteres EOL originais" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabulações" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "Tamanho de tabs:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "Inserir tabulações" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "Inserir espaços" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Cores de diferença de linha" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Ver diferenças de linha" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "A nível do caracter" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "A nível da palavra:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Filtros de ficheiro" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Testar" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Novo..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Eliminar..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Guardar ficheiros modificados?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Ficheiro do lado esquerdo" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Guardar alterações" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "Rejeitar alterações" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Ficheiro do lado direito" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "Guardar alterações" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Rejeitar alterações" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Página de código" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Página de código predefinida" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Seleccionar a página de código predefinida quando carregar ficheiros non-Unicode:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Página de código do sistema" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "A mesma que o interface de utilizador do WinMerge" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Opções" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr "Categorias" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Diálogo" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Palavras-chave:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Nomes das funções:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Comentários:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Números:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Pré-processador:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Utilizador 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Utilizador 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Negrito" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Relatório de comparação de arquivos" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Ficheiro do relatório:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Pesquisar..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "Estilo:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "Copiar para a Área de Transferência" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Filtro partilhado ou privado" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Qual o tipo de filtro que deseja criar?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro partilhado (para todos os utilizadores deste computador)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro privado (apenas para o utilizador actual)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Suporte de arquivo" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "Activar suporte de arquivo" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "Detectar tipo de arquivo pela assinatura" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Comparar estatísticas" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Pastas:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Ficheiros:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Diferente" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binário:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Único" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Esquerda:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Direita:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Idêntico" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Fechar" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Afecta" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Afecta)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Seleccionar página de código para" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "Carregar &Ficheiro:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Guardar &Ficheiro:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "Utilizar a mesma página de código para ambos" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "Aplicar" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "Cancelar" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Testar filtro" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "A testar filtro ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "Inserir texto a testar:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "Nome do arquivo" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "Testar" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "Fechar" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "Utilizar cores de texto personalizadas" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Personalizar cores do texto" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Espaço:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Texto normal:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Selecção:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Destino" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "Esquerda:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Apenas de leitura" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "Direita:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Apenas de leitura" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "Filtro:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Guardar..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Comparação de arquivos" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Comparação de ficheiros" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Activar menu avançado" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Pasta" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "Parar após primeira diferença" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignorar diferenças de tempo inferiores a 3 segundos" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binário" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "081604e4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x816, 1252" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro desconhecido ao abrir projecto" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro desconhecido ao guardar projecto" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Projecto:" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Projecto carregado com sucesso." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Projecto guardado com sucesso." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "Abortar" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "Tentar novamente" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "Ignorar" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Ignorar todos" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "Sim" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Sim para todos" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "Não" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Não para todos" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "Continuar" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "Avançar" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Avançar todos" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Não voltar a exibir esta mensagem." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Não voltar a perguntar." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Controlo de versão" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Diferenças" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Versão %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Opções (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as mensagens estão novamente disponíveis." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1." msgstr "" -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os ficheiros (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Projectos WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Localização" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F]" -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Descrição" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Seleccionar nome de ficheiro para novo filtro" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Ficheiros de filtros (*.ini)|*.ini|Todos os ficheiros (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2." msgstr "" -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable." msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System." msgstr "" -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?" msgstr "" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Localizar filtro a instalar" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:2151 +#: Merge.rc:2172 #, 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:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Relatório de comparação de arquivos" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Comparação de ficheiros" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Sem título esquerda" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Sem título direita" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Linha: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Combinar" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Diferença %1 de %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 diferenças encontradas" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 diferença encontrada" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Item %1 de %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Item %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Seleccione dois arquivos ou ficheiros existentes para comparar" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Selecção de pasta" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Seleccione dois arquivos ou ficheiros para comparar." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "A pasta de destino da esquerda é inválido!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "A pasta de destino da direita é inválida!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Ambas as pastas de destino são inválidas!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Seleccione dois ficheiros para activar a selecção de extractor." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Impossível comparar ficheiro ou arquivo!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Ficheiro não encontrado: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Ficheiro não extraído: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "Impossível abrir ficheiro\n%1\n\n%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Guardar como" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Guardar alterações em %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 é apenas de leitura. Deseja substituir o ficheiro apenas de leitra ? (Não, para guardar com novo nome.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Erro ao criar cópia de segurança" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?" msgstr "Erro ao guardar ficheiro.\n%1\n%2\nDeseja:\n\t-usar um nome diferente para o ficheiro (Prima Ok)\n\t-abortar a acção actual (Prima Cancelar)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" msgstr "Plugin '%2' impossível comprimir as suas alterações no ficheiro esquerdo em '%1'.\n\nO ficheiro original não será alterado.\n\nDeseja guardar a versão não comprimida em outro ficheiro?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?" msgstr "Plugin '%2' impossível comprimir as suas alterações no ficheiro direito em '%1'.\n\nO ficheiro original não será alterado.\n\nDeseja guardar a versão não comprimida em outro ficheiro?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" msgstr "Outra aplicação actualizou o ficheiro\n%1\ndesde a incialização de WinMerge.\n\nSubstituir ficheiro modificado?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "%1\nis marked read-only. Would you like to override the read-only item?" msgstr "%1\né apenas de leitura. Deseja substituir o item apenas de leitura?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, 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:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Guardar ficheiro esquerdo como..." -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Guardar ficheiro direito como..." -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing." msgstr "Impossível combinar diferenças quando os documentos não estão sincronizados.\n\nActualizar documentos antes de continuar." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Tem de especificar o destino de um projecto SourceSafe para continuar (ex: $/OMeuProjecto)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Desproteger ficheiros de VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Sistema de versões apresentou erro ao tentar desproteger ficheiro. Impossível contiuar..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Erro ao executar comando do sistema de versões." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "O ficheiro de trabalho de VSS e o destino do ficheiro actual não coincidem. Continuar?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Base(s) de dados VSS não encontrada(s)!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Erro no VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "Versioning System returned an error while attempting to check in the file.\n Please, check config spec of used view.\n Undo checkout operation?" msgstr "O sistema de versões apresentou um erro ao tentar desproteger o ficheiro.\n Verifique a configuração da visualização utilizada.\n Anular a operação de desprotecção?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. " msgstr "O sistema de versões apresentou um erro ao tentar anular a desprotecção do ficheiro.\n Verifique a configuração da visualização utilizada." -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Nenhum" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (inferior a 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e superior)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Quebra de linha nos espaços" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Quebra de linha nos espaços ou pontuação" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Da direita para a esquerda (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Da esquerda para a direita (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Da direita para a esquerda (%1 de %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Da esquerda para a direita (%1 de %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Da esquerda para a direita (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Da esquerda para... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Da direita para... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Da esquerda para... (%1 de %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Da direita para... (%1 de %2)" +msgid "All to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" + +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Esquerda (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Direita (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Ambos (%1)" -#: Merge.rc:2292 +#: Merge.rc:2330 #, c-format -msgid "Left (%1 of %2)" -msgstr "Esquerda (%1 de 2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Direita (%1 de 2)" - -#: Merge.rc:2294 -#, c-format -msgid "Both (%1 of %2)" -msgstr "Ambos (%1 de %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Lado esquerdo - seleccione pasta de destino:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Lado direito - seleccione pasta de destino:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ficheiros afectados)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 ficheiros afectados)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "Tem certeza que deseja eliminar\n\n%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare." msgstr "" -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Erro ao executar editor externo: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Formato de arquivo desconhecido" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Nome do ficheiro" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Resultado da comparação" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Data da esquerda" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Data da direita" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Extensão" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Lado esquerdo" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Lado direito" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Lado direito (Curto)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Lado esquerdo (Curto)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Data de criação - Esq" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Data de criação - Dta" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Ficheiro mais recente" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Versão do ficheiro esquerdo" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Versão do ficheiro direito" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Resultado resumido" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Atributos esq" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Atributos dta" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "EOL esq" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "EOL dta" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Codificação esq" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Codificação dta" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Diferença ignorada." -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Impossível comparar ficheiros" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Item abortado" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Ficheiro omitido" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Arquivo omitido" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Os ficheiros binários são idênticos" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Os ficheiros binários são diferentes" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Os ficheiros são diferentes" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Apenas esquerda" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Apenas direita" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo decorrido: %Id ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 item seleccionado" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 itens seleccionado" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Nome do ficheiro ou pasta." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome de sub-ficheiro quando sub-ficheiros incluídos." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Resultado da comparação, forma extensa." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Data de modificação do lado esquerdo." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Data de modificação do lado direito." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Extensão do ficheiro." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Tamanho do ficheiro em bytes." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Tamanho do ficheiro direito em bytes." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Tamanho do ficheiro esquerdo abreviado." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Tamanho do ficheiro direito abreviado." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Data de criação do lado esquerdo." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Data de criação do lado direito." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Indica o lado com a data de modificação mais recente." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versão do ficheiro do lado esquerdo, apenas para alguns tipos de ficheiros." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versão do ficheiro do lado direito, apenas para alguns tipos de ficheiros." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Resultado resumido da comparação." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Atributos do lado esquerdo." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Atributos do lado direito." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Tipo de ficheiro EOL do lado esquerdo" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Tipo de ficheiro EOL do lado direito" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Codificação do lado esquerdo." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Codificação do lado direito." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Número de diferenças ignoradas no ficheiro. Estas diferenças são ignoradas pelo WinMerge e não podem ser combinadas." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Número de diferenças no ficheiro. Este número não inclui diferenças ignoradas." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Apresenta um asterisco (*) se ficheiro for binário." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Comparar %1 com %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Lista separada por vírgulas" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Lista separada por tabulações" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "HTML simples" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "HTML simples" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "Error creating the report:\n%1" msgstr "Erro ao criar relatório:\n%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "O relatório foi criado com sucesso." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "O mesmo ficheiro está aberto em ambas as janelas." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Os ficheiros seleccionados são idênticos." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Ocorreu um ero ao comparar os ficheiros." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Impossível criar ficheiros temporários. Verifique as suas definições de ficheiros temporários." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." msgstr "" -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "O arquivo seleccionado é inválido." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Impossível abrir ficheiro binário no editor." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?" msgstr "" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?" msgstr "Encontrados páginas de código diferentes nos ficheiros da esquerda (cp%d) e direita (cp%d). \nApresentar cada ficheiro na sua página de código terá melhor visualização, mas combinar/copiar poderá ser arriscado.\Deseja tratar os dois ficheiros como tendo as páginas de código predefinidas para as janelas?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informações perdidas devido a erros de codificação: ambos os ficheiros" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Sem diferenças" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Diferença de linha" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituída(s) %1 string(s)." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Imposível localizar string \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Janela de localização" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Janela de diferenças" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Ficheiro patch escrito com sucesso." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. item não encontrado ou é uma directoria!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. item não encontrado ou é uma directoria!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "O ficheiro patch já existe. Deseja substituí-lo?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 itens seleccionados]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Impossível escrever no ficheiro %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "A localização de destino não é uma localização absoluta: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Especifique o ficheiro de destino" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Impossível criar ficheiro patch a partir de ficheiros binários." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Impossível criar ficheiro patch a partir de directorias." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." msgstr "Por favor, guarde todos os ficheiros antes.\n\nCiar um ficheiro patch requer a inexistência de alterações por guardar nos ficheiros." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "O arquivo não existe." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "Archive support is not enabled.\nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it." msgstr "" -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Seleccione ficheiro a exportar" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Seleccione ficheiro a importar" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Opções importadas do ficheiro." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Opções exportadas para o ficheiro." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Importação de opções do ficheiro falhou." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Escrita de opções para o ficheiro falhou." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Misturado" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "O extractor adoptado aplica-se a ambos ficheiros (apenas um ficheiro necessita de extensão)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Não pré-diferenciar (normal)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Outros plugins" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Compilação privada: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Definições de plugin" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH não encontrado - scripts .sct desactivados" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "Ir para linha %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Desactivado" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Do sistema de ficheiros" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Da lista MRU" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po index a33221951..daef3b7a7 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -78,7 +78,7 @@ msgid "Cu&t" msgstr "&Taie" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Copie" @@ -89,7 +89,7 @@ msgid "&Paste" msgstr "Li&peºte" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&Mergi la..." @@ -100,22 +100,25 @@ msgid "Op&en" msgstr "D&eschide" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "cu aplicaþia în®istratã" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "cu editor &extern" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&cu..." @@ -153,7 +156,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "Mãrime te&xt" @@ -165,8 +168,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Deloc" @@ -183,49 +186,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Fiºier" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Nou\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "D&eschide...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "D&eschide fiºierul cu conflicte..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Deschide pro&iectul...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Sal&veazã proiectul..." @@ -237,274 +240,274 @@ msgstr "Proiecte recente" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Gol >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "Ieºir&e" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Editare" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Opþiuni..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Vizualizare" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "Barã de unel&te" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Mic" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "Ma&re" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "Barã de &stare" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, fuzzy, c-format msgid "Ta&b Bar" msgstr "&Bara de tab-uri" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "Unel&te" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filtre..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Genereazã petic..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Plug-in-uri" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "Dezarhivare &manualã" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "Dezarhivare &automatã" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Reîncarcã plug-in-urile" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "Ferea&stra" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "Închi&de" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Închid&e toate" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Schimbã &panou\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Alãturã &orizontal" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Alãturã &vertical" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Cascadã" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "A&jutor" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "Ajutor &WinMerge\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "C&onfigurare" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "Licenþa Publicã Generalã &GNU" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&Despre WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Stânga numai-citir&e" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Dreapta numa&i-citire" @@ -515,7 +518,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Selecte&azã tot\tCtrl+A" @@ -537,2441 +540,2501 @@ msgstr "Arat #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Aratã elementele unice d&in dreapta" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Aratã elementele omise" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Aratã fiºierele binare" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Aratã elementele ascunse" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Selecteazã &font..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Utilizeazã font im&plicit" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Statistici de compa&rare" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "Reîmpro&spãtare\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Reîmprospãtare selectate\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Fuziune" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&mparare\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "Urmãtoarea difere&nþã\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Anterioa&ra diferenþã\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Prima diferenþã\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Curenta diferenþã\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "U<ima diferenþã\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copie la d&reapta\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copi&e la stânga\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "ª&terge\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "Personalizare &coloane..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Generare &raport..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Salvare\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Sa&lvare stânga" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Salvare d&reapta" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "Ti&pãrire..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Aranjare în pa&ginã" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Pre&vizualizare tipãrire" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "Converteºte sfârºiturile de linie la" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "&Modul fuziune\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "Codar&e caractere fiºiere..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "An&uleazã\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Refã\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Taie\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Copie\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "Li&peºte\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Selecteazã &diferenþele pe linie\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Gãseºte...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Înlo&cuieºte...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Avansat" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copie cu numãrul de linie\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "Semn de &carte" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Basculeazã semn de carte\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "Urmãtorul sem&n de carte\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Anteriorul se&mn de carte\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "ªterge toate semnele de &carte" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Mer&gi la...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "&Mãreºte\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Micº&oreazã\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Evidenþiere sintaxã" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "B&locheazã panourile" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "Afiºeazã blanc&urile" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Afiºea&zã diferenþele pe linie" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Afiºeazã numãrul liniei" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Afiºeazã &marginile" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "Infãºoa&rã rândurile lungi" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Interschimbã p&anourile" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "&Panoul cu diferenþe" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Panoul cu lo&caþia" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "C&opiazã la dreapta ºi avanseazã\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copiazã la s&tânga ºi avanseazã\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Copiazã tot la dre&apta" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Copia&zã tot la stânga" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Prediferenþiator" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Script-uri" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Comp&arã" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "Stânga &la dreapta" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "Stâ&nga la..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "D&reapta la stânga" +msgid "Left to Right (%1 of %2)" +msgstr "De la stânga la dreapta (%1 din %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "D&reapta la..." +msgid "Left to... (%1 of %2)" +msgstr "Stânga la... (%1 din %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Mutã" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "Stâ&nga la..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "D&reapta la..." +msgid "Right to Left (%1 of %2)" +msgstr "De la dreapta la stânga (%1 din %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Dreapta la... (%1 din %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Mutã" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "ª&terge" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "Stâ&nga" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "D&reapta" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "Am&bele" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Rede&numeºte" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "Ascunde e&lementele" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "Deschide stâ&nga" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Deschide drea&pta" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Cop&ie cãile de fiºier" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "S&tânga (%1 din %2)" +msgid "Left (%1 of %2)" +msgstr "Stânga (%1 din %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "D&reapta (%1 din %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Dreapta (%1 din %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Ambele (%1 din %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "Am&bele (%1 din %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Copie numele de &fiºier" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "Arhivea&zã" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "Stân&ga... (%1 din %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "D&reapta... (%1 din %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "Am&bele... (%1 din %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Diferenþe... (%1 din %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Reîmprospãteazã" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Copie calea întreagã" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Copie numele de &fiºier" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Setãri prediferenþiator" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "Fãrã predifere&nþiator" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Auto prediferenþiator" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Mergi la difere&nþã" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "Fãrã blocuri &mutate" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "To&ate blocurile mutate" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Blocuri mutate pentru diferenþa &curentã" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "Blancur&i" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Com&parã" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "I&gnorã schimbãri" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Ig&norã tot" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "Senzi&tiv la tipul caracterelor" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rã diferenþele sfârºitului de linie (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Conþinut întreg" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Conþinut rapid" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Datã modificare" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Datã modificare ºi mãrime" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Mãrime" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Despre WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Build privat)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Viziteazã pagina de bazã WinMerge!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Contribuitori" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Selecteazã fiºiere sau directoare" -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "Rãsf&oieºte..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "&Rãsfoieºte..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Rã&sfoieºte..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Selecteazã..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "Dezarhiva&tor:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "&Selecteazã..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Include subdirectoare" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Stare:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Renunþã" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Ajutor" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Fiºiere sau directoare pentru comparare" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Baza de date:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Proiect:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Utilizator:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Parolã:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Legãtura cãtre proiectul VSS destinaþie" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Aplicã la toate elementele" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Extrage" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Salveazã ca..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Sistem de versionare" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "Sistem de &versionare:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "Ca&lea cãtre cleartool.exe" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "General" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "De&sfãºoarã automat la prima diferenþã" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Închide ferestrele cu tasta ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verificã automat cãile în dialogul de deschidere" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Permite rularea unei singure instanþe" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Întreabã înainte de a închide fereste multiple" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "Pãstreazã data ºi timpul fiºierului pentru compararea fiºierelor" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Auto-completare în dialogul de deschidere:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite ascunderea unor casete de mesaj. Apasã butonul Revenire pentru a face ca toate casetele de mesaj sã aparã din nou." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Revenire" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Gãseºte" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "Ce a&nume:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Potriveºte doar cu&vinte întregi" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Majuscule semnificative" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "&Expresie regulatã" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "Nu relua de la începutul fiºierului" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Gãseºte" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Înlocuieºte" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "C&u ce:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "Nu relua de la începutul &fiºierului" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Înlocuieºte în" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&Selecþie" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "Între&gul fiºier" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "Înlocuieº&te" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Înlocuieºte t&ot" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Extrage" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Comentarii" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Repune dupã extragere" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Filtre de linie" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Activeazã filtrele de linie" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Expresii regulate (câte una pe linie):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Nou" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Editeazã" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Înlãturã" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Culori" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Diferenþã:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Diferenþã selectatã:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Fundal" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "ªters" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Text" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Diferenþã ignoratã:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Mutat:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Selecþie mutatã:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Diferenþã cuvânt:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Diferenþã cuvânt selectatã:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Implicite" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Sistem" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Trimite fiºierele ºterse cãtre Recycle Bin" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "Editor &extern:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "Directorul cu &filtre:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Directorul cu fiºiere temporare" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "Direc&torul cu fiºiere temporare al sistemului" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "Director personali&zat:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Generator petice" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "&Fiºier 1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "F&iºier 2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "Interschim&bã" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "&Adaugã la fiºier existent" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Rezultat:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Rãsf&oieºte..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "S&til:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Context:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorã linii goal&e" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Inclu&de linia de comandã" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Deschide în editor e&xtern" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Afiºeazã coloanele" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Mutã mai s&us" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Mutã mai &jos" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Selecteazã dezarhivator" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Dezarhivator fiºiere:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Afiºeazã toate dezarhivatoarele, farã a verifica extensia" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Listã extensii:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Descriere:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Stop" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Comparare elemente..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Elemente comparate:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Elemente total:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Mergi la" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "&La:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Fiºier" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Anume" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "Li&nie" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Diferenþã" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Mergi la" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Comparare" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Blanc" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Comparã" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "&Ignorã schimbare" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "I&gnorã tot" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorã li&nii goale" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Ignorã minus&cule/majuscule" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Activea&zã detecþie blocuri mutate" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "Potriveºte linii si&milare" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Comentarii filtre" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "E&videnþiere sintaxã" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "Rescanare &automatã" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&Pãstreazã caracterele de SDL originale" -#: Merge.rc:1390 +#: Merge.rc:1411 #, fuzzy, c-format msgid "Tabs" msgstr "Tab-uri" -#: Merge.rc:1391 +#: Merge.rc:1412 #, fuzzy, c-format msgid "&Tab size:" msgstr "Mãrime &tab:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, fuzzy, c-format msgid "&Insert Tabs" msgstr "&Insereazã tab-uri" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "In&sereazã blancuri" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Colorarea diferenþelor pe linie" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Aratã diferenþele pe linie" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "La nivel de &caracter" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "La nivel de cu&vânt:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Filtre fiºiere" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Testeazã" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Instaleazã..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Nou..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Editeazã..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "ªterge..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Salvare fiºiere modificate?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Fiºier stânga" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Salveazã modificãrile" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "Renunþã la mo&dificãri" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Fiºier dreapta" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "S&alveazã modificãrile" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Renunþã la s&chimbãri" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Codare caractere" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Codare caractere implicitã" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecteazã codarea caracterelor folositã implicit la încãrcarea fiºierelor non-Unicode:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Codarea sistemului" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Conform cu interfaþa WinMerge" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Opþiuni" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr "Categorii" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importã..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Exportã..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Cuvinte cheie:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, fuzzy, c-format msgid "Function names:" msgstr "Nume de funcþii:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Comentarii:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Numere:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operatori:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "ªiruri de caractere:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Preprocesor:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Utilizator 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Utilizator 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Aldine" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Raport comparare directoare" -#: Merge.rc:1581 +#: Merge.rc:1602 #, fuzzy, c-format msgid "Report &File:" msgstr "&Fiºier raport:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Rãsfoieºte:" -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, fuzzy, c-format msgid "&Copy to Clipboard" msgstr "&Copie în memorie" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Filtru public sau privat" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Ce tip de filtru doriþi sã creaþi?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtru public (pentru toþi utilizatorii de pe maºina curentã)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtru privat (doar pentru utilizatorul curent)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Suport arhivare" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "Activ&eazã suportul pentru fiºierele arhivã" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detecteazã tipul arhivei dupã semnãtura fiºierului" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Statistici ale comparãrii" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Directoare:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Fiºiere:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Diferite" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Text:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binare:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Unice" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Stânga:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Dreapta:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Identice" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "În total:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Închide" -#: Merge.rc:1677 +#: Merge.rc:1698 #, fuzzy, c-format msgid "Affects" msgstr "Afecteazã" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, fuzzy, c-format msgid "(Affects)" msgstr "(Afecteazã)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Selecteazã codare caractere pentru" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "Încãrcare &fiºier:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "&Salvare fiºier:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "Aceeaºi codare caractere pentr&u ambele" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Aplicã" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Renunþã" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Testeazã filtru" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Testare filtru..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "Introduc&eþi textul pentru testare:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "Nu&me director" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Rezultat:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Testeazã" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "În&chide" -#: Merge.rc:1725 +#: Merge.rc:1746 #, fuzzy, c-format msgid "&Use customized text colors" msgstr "Foloseºte c&ulori ale textului personalizate" -#: Merge.rc:1728 +#: Merge.rc:1749 #, fuzzy, c-format msgid "Custom text colors" msgstr "Culori ale textului personalizate" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Blancuri:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Text normal:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Selecþie:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Cãi" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "Stân&ga:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Numai-citir&e" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "D&reapta:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Num&ai-citire" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filtru:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Deschide..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Salveazã..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Copii de siguranþã" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Creazã copii de siguranþã pentru:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Comparare &directoare" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Comparare fiºi&ere" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Creazã copii de siguranþã în:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "Directorul &original al fiºierului" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "Directorul de siguranþã &global:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Numele fiºierului de siguranþã:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&Adaugã extensia .bak" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "Adaugã timp" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Confirmã copierea" -#: Merge.rc:1806 +#: Merge.rc:1827 #, fuzzy, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Sunteþi sigur cã vreþi sã copiaþi XXX elemente?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "De la stânga" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "De la dreapta" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Da" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Nu" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Activeazã me&niul contextual avansat" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Director" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "Opreº&te dupã prima diferenþã" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orã diferenþe de timp mai mici de 3 secunde" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binar" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, fuzzy, c-format msgid "040904e4" msgstr "040904e4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, fuzzy, c-format msgid "0x409, 1252" msgstr "0x409, 1250" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Eroare necunoscutã la încercarea de deschidere a fiºierului proiect" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Eroare necunoscutã la încercarea de salvare a fiºierului proiect" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Fiºier proiect" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Fiºierul proiect a fost încãrcat cu succes" -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Fiºierul proiect a fost salvat cu succes" -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, fuzzy, c-format msgid "" "\n" @@ -2990,7 +3053,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge Comparare fiºiere" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3009,7 +3072,7 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Comparare directoare" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3018,143 +3081,143 @@ msgstr "" "Dezvoltatori:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 vine fãrã ABSOLUT NICIO GARANÞIE. Acesta este software liber ºi sunteþi invitaþi sã-l redistribuiþi sub anumite circumstanþe; vedeþi Licenþa Publicã Generalã GNU în meniul Ajutor pentru detalii." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "Re&nunþã" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Reîncearcã" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Ignorã" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Ignorã to&ate" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Da" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "D&a la toate" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Nu" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Nu la to&ate" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Continuã" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "O&mite" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Omite to&ate" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Nu afiºa acest &mesaj din nou." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Nu î&ntreba aceasta din nou." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Control versiuni" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Diferenþe" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Cãtre:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "De la stânga:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Cãtre stânga:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "De la dreapta:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Cãtre dreapta:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Versiune %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Opþiuni (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Toate casetele de mesaj vor fi de acum afiºate din nou." -#: Merge.rc:2084 +#: Merge.rc:2105 #, fuzzy, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3165,84 +3228,84 @@ msgstr "" "\n" "Vã rugãm folosiþi valorile 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Deschide" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programe|*.exe;*.bat;*.cmd|Toate fiºierele (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Toate fiºierele (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Fiºiere proiect WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Fiºiere opþiuni (*.ini)|*.ini|Toate fiºierele (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Fiºiere text (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Toate fiºierele (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Fiºiere HTML (*.htm,*.html)|*.htm;*.html|Toate fiºierele (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fiºiere XML (*.xml)|*.xml|Toate fiºierele (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Nume" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Locaþie" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filtre" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Descriere" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Selecteazã numele fiºierului pentru noul filtru" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Fiºiere filtru (*.flt)|*.flt|Toate fiºierele (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3255,7 +3318,7 @@ msgstr "" "Vã rugãm copiaþi fiºierul %1 în directorul WinMerge/Filters :\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3268,7 +3331,7 @@ msgstr "" "\n" "Vã rugãm verificaþi cã fiºierul existã ºi este editabil." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3279,7 +3342,7 @@ msgstr "" "\n" "Vã rugãm selectaþi directorul filtru în Opþiuni.../Sistem." -#: Merge.rc:2134 +#: Merge.rc:2155 #, fuzzy, c-format msgid "" "Failed to delete the filter file:\n" @@ -3292,12 +3355,12 @@ msgstr "" "\n" "Este posibil ca fiºierul sã nu poatã fi editat (numai-citire)?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Selectaþi fiºierul filtru pentru instalare" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3308,188 +3371,188 @@ msgstr "" "\n" "Nu s-a putut copia noul fiºier filtru în directorul filtru." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Fiºierul filtru deja existã. Suprascrie?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Expresie regulatã" -#: Merge.rc:2151 +#: Merge.rc:2172 #, 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:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Rezultate comparare directoare" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Comparare fiºiere" -#: Merge.rc:2166 +#: Merge.rc:2187 #, fuzzy, c-format msgid "Untitled left" msgstr "Nedenumit stânga" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, fuzzy, c-format msgid "Untitled right" msgstr "Nedenumit dreapta" -#: Merge.rc:2169 +#: Merge.rc:2190 #, fuzzy, c-format msgid "Theirs File" msgstr "Fiºierul lor" -#: Merge.rc:2170 +#: Merge.rc:2191 #, fuzzy, c-format msgid "Mine File" msgstr "Fiºierul meu" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Linie: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Fuziune" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Deferenþa %1 din %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 diferenþe gãsite" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "O diferenþã gãsitã" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, fuzzy, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Element %1 din %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Elemente: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selectaþi douã directoare sau fiºiere existente pentru comparare" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Selectare directoare" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Selectaþi douã directoare sau douã fiºiere pentru comparare." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Calea din stânga este nevalidã!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Calea din dreapta este nevalidã!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Ambele cãi sunt nevalide!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, fuzzy, c-format msgid "Choose two files to enable unpacker selection." msgstr "Alegeþi douã fiºiere pentru a activa selecþia cu dezarhivatorul." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Nu se poate compara un fiºier cu un director!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Fiºier negãsit: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Fiºier nedezarhivat: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3502,12 +3565,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Analizarea fiºierului de conflicte a eºuat." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3518,27 +3581,27 @@ msgstr "" "%1\n" "nu e un fiºier de conflicte." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Salveazã ca" -#: Merge.rc:2225 +#: Merge.rc:2246 #, fuzzy, c-format msgid "Save changes to %1?" msgstr "Salveazã schimbãrile în %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, fuzzy, 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 este marcat ca numai-citire. Doriþi suprascrierea fiºierului numai-citire? (Apãsaþi nu ca sã forþaþi redenumirea.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, fuzzy, c-format msgid "Error backing up file" msgstr "Eroare la salvarea copiei de siguranþã a fiºierului" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3551,7 +3614,7 @@ msgstr "" "\n" "Continuaþi oricum?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3568,7 +3631,7 @@ msgstr "" "\t- folosiþi un alt nume de fiºier (apãsaþi Ok)\n" "\t- renunþaþi la operaþia curentã (apãsaþi Renunþã)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3583,7 +3646,7 @@ msgstr "" "\n" "Doriþi sã salvaþi versiunea nearhivatã în alt fiºier?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3598,7 +3661,7 @@ msgstr "" "\n" "Doriþi sã salvaþi versiunea nearhivatã în alt fiºier?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3613,7 +3676,7 @@ msgstr "" "\n" "Suprascrieþi fiºierul modificat?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, fuzzy, c-format msgid "" "%1\n" @@ -3622,32 +3685,32 @@ msgstr "" "%1\n" "este marcat ca numai-citire. Doriþi sã suprascrieþi elementul numai-citire?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, 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:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Salveazã fiºierul din stânga ca" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Salveazã fiºierul din dreapta ca" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2245 +#: Merge.rc:2266 #, fuzzy, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3658,42 +3721,42 @@ msgstr "" "\n" "Reîmprospãtaþi documentele înainte de a continua." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Trebuie sã specificaþi calea unui proiect SourceSafe pentru a continua (ex.: $/MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Extrage fiºierele din VSS.." -#: Merge.rc:2253 +#: Merge.rc:2274 #, fuzzy, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Sistemul de versionare a returnat o eroare încercând sã extragã fiºierul. Imposibil de continuat..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Eroare la execuþia comenzii sistemului de versionare." -#: Merge.rc:2255 +#: Merge.rc:2276 #, fuzzy, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Directorul de lucru VSS ºi locaþia fiºierului curent nu se potrivesc. Continuaþi?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Nu s-a gãsit nicio bazã de date VSS!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Eroare de la VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, fuzzy, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3704,7 +3767,7 @@ msgstr "" " Vã rugãm, verificaþi specificaþiile scopului folosit.\n" " Anuleazã operaþia de extragere?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, fuzzy, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3713,127 +3776,146 @@ msgstr "" "Sistemul de versionare a returnat o eroare încercând sã anuleze extragerea fiºierului.\n" " Vã rugãm, verificaþi specificaþiile scopului folosit." -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Nici unul" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (mai vechi de 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 sau mai nou)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, fuzzy, c-format msgid "Break at whitespace" msgstr "Întrerupe la blanc" -#: Merge.rc:2270 +#: Merge.rc:2291 #, fuzzy, c-format msgid "Break at whitespace or punctuation" msgstr "Întrerupe la blanc sau semn de punctuaþie" -#: Merge.rc:2276 +#: Merge.rc:2297 #, fuzzy, c-format msgid "Right to Left (%1)" msgstr "De la dreapta la stânga (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 +#, c-format +msgid "Right to Middle (%1)" +msgstr "" + +#: Merge.rc:2299 +#, c-format +msgid "Middle to Left (%1)" +msgstr "" + +#: Merge.rc:2300 +#, c-format +msgid "Middle to Right (%1)" +msgstr "" + +#: Merge.rc:2301 #, fuzzy, c-format msgid "Left to Right (%1)" msgstr "De la stânga la dreapta (%1)" -#: Merge.rc:2278 -#, c-format -msgid "Right to Left (%1 of %2)" -msgstr "De la dreapta la stânga (%1 din %2)" - -#: Merge.rc:2279 +#: Merge.rc:2302 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "De la stânga la dreapta (%1 din %2)" +msgid "Left to Middle (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Stânga la... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Dreapta la... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Stânga la... (%1 din %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Dreapta la... (%1 din %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Stânga (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Dreapta (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Ambele (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Stânga (%1 din %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Dreapta (%1 din %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Ambele (%1 din %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Partea stângã - selectare director destinaþie:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Partea dreaptã - selectare director destinaþie:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 fiºiere afectate)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 din %2 fiºiere afectate)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3844,17 +3926,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Sunteþi sigur cã vreþi sã copiaþi:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Sunteþi sigur cã vreþi sã copiaþi %d elemente:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, fuzzy, c-format msgid "" "Operation aborted!\n" @@ -3873,502 +3955,502 @@ msgstr "" "\n" "Vã rugãm reîmprospãtaþi compararea." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Execuþia editorului extern a eºuat: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Format arhivã necunoscut" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Nume fiºier" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Rezultat comparare" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Datã stânga" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Datã dreapta" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Extensie" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Mãrime stânga" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Mãrime dreapta" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Mãrime dreapta (scurt)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Mãrime stânga (scurt)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, fuzzy, c-format msgid "Left Creation Time" msgstr "Timp creare stânga" -#: Merge.rc:2353 +#: Merge.rc:2397 #, fuzzy, c-format msgid "Right Creation Time" msgstr "Timp creare dreapta" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Fiºier mai nou" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Versiune fiºier stânga" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Versiune fiºier dreapta" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, fuzzy, c-format msgid "Short Result" msgstr "Rezultat scurt" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Atribute stânga" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Atribute dreapta" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, fuzzy, c-format msgid "Left EOL" msgstr "SDL stânga" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, fuzzy, c-format msgid "Right EOL" msgstr "SDL dreapta" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Set de caractere stânga" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Set de caractere dreapta" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, fuzzy, c-format msgid "Ignored Diff." msgstr "Diferenþe ignorate" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Imposibil de comparat fiºierele" -#: Merge.rc:2383 +#: Merge.rc:2427 #, fuzzy, c-format msgid "Item aborted" msgstr "Element întrerupt" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Fiºier omis" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Director omis" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Numai stânga: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Numai dreapta: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Fiºierele binare sunt identice" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Fiºierele binare sunt diferite" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Fiºierele sunt diferite" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Numai stânga" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Numai dreapta" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Eroare" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Timp scurs: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "Un element selectat" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 elemente selectate" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Nume de fiºier sau director." -#: Merge.rc:2423 +#: Merge.rc:2467 #, fuzzy, c-format msgid "Subfolder name when subfolders are included." msgstr "Nume de sub-director pentru când sub-directoarele sunt incluse." -#: Merge.rc:2424 +#: Merge.rc:2468 #, fuzzy, c-format msgid "Comparison result, long form." msgstr "Rezultate comparare, forma lungã." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Data modificãrii pãrþii stângi." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Data modificãrii pãrþii drepte." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Extensia fiºierului." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Dimensiune fiºier stânga în octeþi." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Dimensiune fiºier dreapta în octeþi." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Dimensiune fiºier stânga prescurtatã." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Dimensiune fiºier dreapta prescurtatã." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Timp creare stânga." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Timp creare dreapta." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Spune care parte are o datã a modificãrii mai recentã." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versiune fiºier stânga, numai pentru unele tipuri de fiºiere." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versiune fiºier dreapta, numai pentru unele tipuri de fiºiere." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, fuzzy, c-format msgid "Short comparison result." msgstr "Rezultat comparare pe scurt." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Atribute partea stângã." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Atribute partea dreaptã." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Tip SDL fiºier partea stângã." -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Tip SDL fiºier partea dreaptã." -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Set de caractere partea stângã." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Set de caractere partea dreaptã." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Numãr de diferenþe ignorate în fiºier. Aceste diferenþe sunt ignorate de WinMerge ºi nu pot fi fuzionate." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Numãr de diferenþe în fiºier. Acest numãr nu include diferenþele ignorate." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Aratã un asterisc (*) dacã fiºierul este binar." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Comparã %1 cu %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, fuzzy, c-format msgid "Comma-separated list" msgstr "Listã separatã-de-virgule" -#: Merge.rc:2472 +#: Merge.rc:2516 #, fuzzy, c-format msgid "Tab-separated list" msgstr "Listã separatã-de-tab-uri" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "HTML simplu" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "XML simplu" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Fiºierul raport existã deja. Doriþi sã suprascrieþi fiºierul existent?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4377,32 +4459,32 @@ msgstr "" "Eroare la creare raport:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Raportul a fost creat cu succes." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Acelaºi fiºier este deschis în ambele panouri." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Fiºierele selectate sunt identice." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "A fost întâlnitã o eroare în timpul comparãrii fiºierelor." -#: Merge.rc:2487 +#: Merge.rc:2531 #, fuzzy, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Fiºierele temporare nu au putut fi create. Verificaþi setarea cãii cãtre locaþia temporarã." -#: Merge.rc:2488 +#: Merge.rc:2532 #, fuzzy, c-format msgid "" "These files use different carriage return types.\n" @@ -4417,17 +4499,17 @@ msgstr "" "\n" "Notã: Dacã întotdeauna doriþi tratarea ca ºi echivalentã a tuturor caracterelor de sfârºit de linie (SDL), setaþi opþiunea 'Ignorã diferenþele de sfârºit de linie..' în fila Comparare a dialogului de opþiuni (disponibilã sub meniul Editare/Opþiuni)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Directorul selectat este invalid." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Nu se poate deschide în editor un fiºier binar." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4442,7 +4524,7 @@ msgstr "" "%1\n" "în partea cealaltã ºi sã deschideþi ambele directoare?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4453,152 +4535,152 @@ msgstr "" "Afiºarea în setul de caractere propriu este mai potrivitã dar fuziunea/copierea este periculoasã.\n" "Doriþi tratarea ambelor fiºiere ca ºi cum ar fi în setul de caractere implicit din Windows (recomandat)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Pierdere de informaþie datoritã incompatibilitãþii seturilor de caractere: ambele fiºiere" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Nicio diferenþã" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Diferenþã pe linie" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "S-a(u) înlocuit %1 ºir(uri)." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nu s-a gãsit ºirul \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, fuzzy, c-format msgid "Location Pane" msgstr "Panou locaþie" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Panou diferenþe" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Fiºierul petic a fost scris cu succes." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. elementul nu a fost gãsit sau este un director!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. elementul nu a fost gãsit sau este un director!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Fiºierul petic deja existã. Doriþi suprascrierea lui?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, fuzzy, c-format msgid "[%1 files selected]" msgstr "[%1 fiºier(e) selectat(e)]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Context" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Unificat" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Nu s-a reuºit scrierea în fiºierul %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, fuzzy, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Locaþia destinaþie nu este o cale absolutã: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Specificaþi un fiºier destinaþie" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nu s-a reuºit crearea unui fiºier petic din fiºiere binare." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nu s-a reuºit crearea unui fiºier petic din directoare." -#: Merge.rc:2559 +#: Merge.rc:2603 #, fuzzy, c-format msgid "" "Please save all files first.\n" @@ -4609,12 +4691,12 @@ msgstr "" "\n" "Crearea unui petic necesitã ca fiºierele sã nu aibã conþinut nesalvat." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Directorul nu existã." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4625,37 +4707,37 @@ msgstr "" "Componentele necesare (7-zip ºi/sau Merge7z*.dll) pentru dezarhivare nu au fost gãsite.\n" "Vedeþi manualul pentru mai multe informaþii despre suportul de dezarhivare ºi despre cum sã-l activaþi." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Selectaþi fiºierul pentru export" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Selectaþi fiºierul pentru import" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Opþiuni importate din fiºier." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Opþiuni exportate cãtre fiºier." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "A eºuat importul opþiunilor din fiºier." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "A eºuat scrierea opþiunilor cãtre fiºier." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4666,247 +4748,247 @@ msgstr "" "\n" "Doriþi sã continuaþi?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Amestecat" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Dezarhivatorul potrivit este aplicat la ambele fiºiere (este suficient ca doar un fiºier sã conþinã extensie)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Nu folosi prediferenþiatorul (normal)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Plug-in-uri recomandate" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Alte plug-in-uri" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Numãr de asamblare privat: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Setãri pentru plug-in-uri" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Nu s-a gãsit WSH - scripurile .sct sunt dezactivate" -#: Merge.rc:2650 +#: Merge.rc:2694 #, fuzzy, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, fuzzy, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "&Mergi la linia %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Inactiv" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Din sistemul de fiºiere" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Din lista de recent utilizate" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Resurse" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po index 671cc950f..bff31863e 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -80,7 +80,7 @@ msgid "Cu&t" msgstr "Âû&ðåçàòü" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Êîïèðîâàòü" @@ -91,7 +91,7 @@ msgid "&Paste" msgstr "&Âñòàâèòü" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "Ïåðåéòè ê ñòðîêå..." @@ -102,22 +102,25 @@ msgid "Op&en" msgstr "Îò&êðûòü" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "çàðåãèñòðèðîâàííûì ïðèëîæåíèåì" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "âíåøíèì ðåäàêòîðîì" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "ñ ïîìîùüþ..." @@ -155,7 +158,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Ìàñøòàá" @@ -167,8 +170,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Íåò" @@ -185,49 +188,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Ôàéë" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "Íîâûé\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Îòêðûòü...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Îòêðûòü ôàéë ñ êîíôëèêòàìè..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Îòêðûòü ïðîåêò...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Ñîõðàíèòü ïðîåêò..." @@ -239,274 +242,274 @@ msgstr " #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Íåò >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "Â&ûõîä" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Ïðàâêà" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Íàñòðîéêè..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Âèä" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "Ïà&íåëü èíñòðóìåíòîâ" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Ìàëåíüêèå çíà÷êè" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Áîëüøèå çíà÷êè" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "&Ñòðîêà ñîñòîÿíèÿ" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Ïàíåëü òàáîâ" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Èíñòðóìåíòû" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Ôèëüòðû..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Ñîçäàòü ïàò÷..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Äîïîëíåíèÿ" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "Ðàñïàêîâêà âðó÷íóþ" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "Ðàñïàêîâêà àâòîìàòè÷åñêè" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Ïåðåãðóçèòü âñå äîïîëíåíèÿ" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&Îêíî" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "Çàêðûòü" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Çàêðûòü âñå" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Ïåðåêëþ÷èòü &Îêíî\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Ðàçìåñòèòü &Ãîðèçîíòàëüíî" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Ðàçìåñòèòü &Âåðòèêàëüíî" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Êàñêàä" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Ïîìîùü" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "Ñïðàâêà &WinMerge\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "&Êîíôèãóðàöèÿ" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&Î ïðîãðàììå WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Ôàéë ñ&ëåâà òîëüêî äëÿ ÷òåíèÿ" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Ôàéë ñ&ïðàâà òîëüêî äëÿ ÷òåíèÿ" @@ -517,7 +520,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Â&ûáðàòü Âñå\tCtrl+A" @@ -539,1751 +542,1811 @@ msgstr " #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Óíèêàëüíûå ñïðàâà" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Ïðîïóùåííûå" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Áèíàðíûå ôàéëû" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Ñêðûòûå" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "Ðåæèì &äåðåâà" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "Ð&àçâåðíóòü âñå ïîäïàïêè" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "Ñ&âåðíóòü âñå ïîäïàïêè" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Âûáðàòü &Øðèôò..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Èñïîëüçîâàòü øðèôò ïî &óìîë÷àíèþ" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Ñðàâíèòü ñòàòèñòèêè" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "&Îáíîâèòü\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Îáíîâèòü &âûäåëåííûå\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Îáúåäèíåíèå" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Ñðàâíèòü\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Ñëåäóþùåå îòëè÷èå\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Ï&ðåäûäóùåå îòëè÷èå\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Ïåð&âîå îòëè÷èå\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Òåêóùåå îòëè÷èå\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Ïîñë&åäíåå îòëè÷èå\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Ñêîïèðîâàòü íà &ïðàâóþ ïàíåëü\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Ñêîïèðîâàòü íà &ëåâóþ ïàíåëü\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Óäàëèòü\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Íàñòðîèòü êîëîíêè..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Ñîçäàòü &îò÷åò..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Ñîõðàíèòü\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Ñîõðàíèòü ôàéë ñ&ëåâà" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Ñîõðàíèòü ôàéë ñ&ïðàâà" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Ïå÷àòü..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Ïàðàìåòðû ñòðàíèöû..." -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Ïðåäâàðèòåëüíûé ïðîñìîòð" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Çàìåíèòü ïåðåíîñû ñòðîê íà" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "Ðåæèì ñëèÿíèÿ\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "Êîäèðîâàíèå ôàéëà..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Îòìåíà\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Â&åðíóòü\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Âû&ðåçàòü\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Êîïèðîâàòü\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Âñòàâèòü\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Âûáðàòü îòëè÷èå\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Íàéòè...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Çàìåíèòü...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "&Äîïîëíèòåëüíî" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Êîïèðîâàòü ñ íóìåðàöèåé ñòðîê\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&Çàêëàäêè" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Çàêëàäêà\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Ñëåäóþùàÿ çàêëàäêà\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Ïðåäûäóùàÿ çàêëàäêà\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Óäàëèòü âñå çàêëàäêè" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Ïåðåéòè ê ñòðîêå...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Ïðèáëèçèòü\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Îòäàëèòü\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "Îáû÷íûé\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Ïîäñâåòêà ñèíòàêñèñà" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "Çàáëîêèðîâàòü ïàíåëè" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "Ïîêàçû&âàòü íåâèäèìûå" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Ïîêàçûâàòü îòëè÷èÿ â ñòðîêàõ" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Ïîêàçûâàòü íîìåðà ñòðîê" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Ïîêàçûâàòü ïîëÿ" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "Ïåðåíîñ ïî ñëîâàì" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Ïîìåíÿòü ïàíåëè ìåñòàìè" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Ïàíå&ëü ñðàâíåíèÿ" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Ïàíåëü ìåñòîïîëîæåíèé" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Ñêîïèðîâàòü íà ïðàâóþ ïàíåëü è ïåðåéòè ê ñëåäóþùåìó\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Ñêîïèðîâàòü íà ëåâóþ ïàíåëü è ïåðåéòè ê ñëåäóþùåìó\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Ñê&îïèðîâàòü âñå íà ïðàâóþ ïàíåëü" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Ñêîï&èðîâàòü âñå íà ëåâóþ ïàíåëü" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Ïðåäñðàâíåíèå" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Ñêðèïòû" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Ñ&ðàâíèòü" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "Ñëåâà íàïðàâî" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "Ñëåâà íà ..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "Ñïðàâà íàëåâî" +msgid "Left to Right (%1 of %2)" +msgstr "Ñëåâà íàïðàâî (%1 èç %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "Ñïðàâà íà ..." +msgid "Left to... (%1 of %2)" +msgstr "Ñëåâà íà... (%1 èç %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Ïåðåìåñòèòü" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&Ñëåâà â..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&Ñïðàâà â..." +msgid "Right to Left (%1 of %2)" +msgstr "Ñïðàâà íàëåâî (%1 èç %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Ñïðàâà íà... (%1 èç %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Ïåðåìåñòèòü" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "Óäàëèòü" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "Ñëåâà" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "Ñïðàâà" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "Îáà" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "&Ïåðåèìåíîâàòü" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Ñêðûòü" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "Îòêðûòü ëåâûé ôàéë" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Îòêðûòü ïðàâûé ôàéë" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Ñêîïèðîâàòü ïóòè" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "Ñ&ëåâà (%1 èç %2)" +msgid "Left (%1 of %2)" +msgstr "Ñëåâà (%1 èç %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "Ñ&ïðàâà (%1 èç %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Ñïðàâà (%1 èç %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Âìåñòå (%1 èç %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "Î&áà (%1 èç %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Ñêîïèðîâàòü &èìåíà ôàéëîâ" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Çààðõèâèðîâàòü" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "Ñ&ëåâà... (%1 èç %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "Ñ&ïðàâà... (%1 èç %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "Î&áà... (%1 èç %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "Òîëüêî &îòëè÷èÿ... (%1 èç %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Îáíîâèòü" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Ëåâîå ìåíþ îáîëî÷êè" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Ïðàâîå ìåíþ îáîëî÷êè" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "Ñêîïèðîâàòü ïîëíûé ïóòü" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Ñêîïèðîâàòü èìÿ ôàéëà" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Ïàðàìåòðû ïðåäñðàâíåíèÿ" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Íåò ïðåäñðàâíåíèÿ" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "&Àâòîïðåäñðàâíåíèå" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Ïåðåéòè ê &îòëè÷èþ" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Áåç ïåðåìåùåííûõ áëîêîâ" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Âñå ïåðåìåùåííûå áëîêè" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Ïåðåìåù. áëîê äëÿ &äàííîãî îòëè÷èÿ" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "Íåâèäèìûå" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Ñðàâíèòü" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "Èãíîðèðîâàòü èçìåíåíèÿ" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Èãíîðèðîâàòü âñå" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "×óâñòâèòåëüíîñòü ðåãèñòðà" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Èãíîðèðîâàòü ðàçíèöó â âîçâðàòàõ êàðåòêè (Win/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Ïîëíûé ïîèñê ïî ñîäåðæèìîìó" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Áûñòðûé ïîèñê ïî ñîäåðæèìîìó" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Ïî ðàçëè÷èÿì â äàòå" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Ïî äàòå èçìåíåíèÿ è ðàçìåðó" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Ïî ðàçìåðó" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Î ïðîãðàììå WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(×àñòíûé áèëä)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Ïîñåòèòå äîìàøíþþ ñòðàíèöó WinMerge !" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "ÎÊ" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Ó÷àñòíèêè" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Âûáåðèòå ôàéëû èëè ïàïêè..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Îáçîð..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "Îáçîð" -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Îáçîð..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Âûáðàòü..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Ðàñïàêîâùèê:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "Âûáðàòü..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Âêëþ÷àÿ ïîäïàïêè" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Ñòàòóñ:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Îòìåíà" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Ïîìîùü" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Ôàéëû èëè ïàïêè äëÿ ñðàâíåíèÿ" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Áàçà äàííûõ:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Ïðîåêò:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Ïîëüçîâàòåëü:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Ïàðîëü:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Ïóòü ê ïðîåêòó VSS" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Ïðèìåíèòü êî âñåì ýëåìåíòàì" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Âçÿòü ïîä êîíòðîëü" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Ñîõðàíèòü êàê..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Ñèñòåìà êîíòðîëÿ âåðñèé" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Ñèñòåìà êîíòðîëÿ âåðñèé:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Ïóòü ê cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Îñíîâíûå" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Àâòîìàòè÷åñêè &óñòàíîâèòü íà ïåðâîå îòëè÷èå" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Çà&êðûâàòü îêíà êëàâèøåé ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Àâòîìàòè÷åñêè ïðîâåðÿòü ïóòè â äèàëîãå îòðûòèÿ ôàéëîâ" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "&Ðàçðåøèòü çàïóñê òîëüêî îäíîé êîïèè" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Ñïðîñèòü ïåðåä çàêðûòèåì íåñêîëüêèõ îêîí" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "Ñîõðàíÿòü âðåìÿ ôàéëà ïðè ñðàâíåíèè" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Ïîêàçûâàòü äèàëîã \"Âûáðàòü ôàéëû èëè ïàïêè\" ïðè çàïóñêå" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Î&òêðûòü äèàëîã Àâòîäîïîëíåíèÿ:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge íå ïîêàçûâàåò íåêîòîðûå ñîîáùåíèÿ. Íàæìèòå Ñáðîñ, ÷òîáû ïîêàçûâàëèñü âñå ñîîáùåíèÿ." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Ñáðîñ" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Íàéòè" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "&Ïîèñê:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Èñêàòü ñëîâà &öåëèêîì" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Ó÷èòûâàòü &ðåãèñòð" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "Ðå&ãóëÿðíûå âûðàæåíèÿ" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "Í&å ïåðåíîñèòü â êîíöå ôàéëà" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Äàëåå" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Çàìåíà" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Çà&ìåíà: " -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "Íå îñòàíàâëèâàòüñÿ ïðè äîñòèæåíèè êîíöà ôàéëà" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Çàìåíèòü" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr " âû&äåëåííîì" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "Âî âñåì &ôàéëå" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Çàìåíèòü" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Ç&àìåíèòü âñå" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Ïðîâåðèòü" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Êîììåíòàðèè" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn ïîñëå checkout" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Ñòðîêîâûå ôèëüòðû" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Ðàçðåøèòü ñòðîêîâûå ôèëüòðû" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Ðåãóëÿðíûå âûðàæåíèÿ (îäíî íà ñòðîêó):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Íîâûé" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Ðåäàêòèðîâàòü" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Óäàëèòü" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Öâåòà" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Îòëè÷èå:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Âûäåëåííîå îòëè÷èå:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Ôîí" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Óäàëåííîå" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Òåêñò" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Èãíîðèðóåìûå îòëè÷èÿ:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Ïåðåìåùåííûå:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Âûáðàííûå ïåðåìåùåííûå:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Ñëîâàðíîå îòëè÷èå:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Âûäåëåííîå ñëîâàðíîå îòëè÷èå:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Ïî óìîë÷àíèþ" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Ñèñòåìà" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Ïîìåùàòü óäàëåííûå ôàéëû â êîðçèíó" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "Âíåøíèé ðåäàêòîð:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Ôèëüòðû:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Ïàïêà äëÿ âðåìåííûõ ôàéëîâ" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "Ñèñòåìíàÿ ïàïêà Temp" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "Ñîáñòâåííàÿ ïàïêà:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Ãåíåðàòîð ïàò÷åé" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Ôàéë 1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Ôàéë 2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "Ïîìåíÿòü" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "Äîáàâèòü â ñóùåñòâóþùèé ôàéë" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "Ðåçóëüòàò:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Îá&çîð..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "Ôîðìàò" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "Ñòèëü:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "Êîíòåêñò:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ïðîïóñêàòü ïóñòûå ñòðîêè" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Âêë&þ÷àÿ êîììàíäíóþ ñòðîêó" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Îòêðûòü âî âíåøåì ðåäàêòîðå" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Îòîáðàæàòü êîëîíêè" -#: Merge.rc:1289 +#: Merge.rc:1310 #, fuzzy, c-format msgid "Move &Up" msgstr "&Ââåðõ" -#: Merge.rc:1290 +#: Merge.rc:1311 #, fuzzy, c-format msgid "Move &Down" msgstr "Â&íèç" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Âûáîð ðàñïàêîâùèêà" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Ôàéë ðàñïàêîâùèêà:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Ïîêàçûâàòü âñå ðàñïàêîâùèêè, íå ïðîâåðÿÿ ðàñøèðåíèÿ" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Ñïèñîê ðàñøèðåíèé:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Îïèñàíèå:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Îñòàíîâèòü" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Èäåò ñðàâíåíèå..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Îáðàáîòàíî:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Âñåãî:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Ïåðåéòè" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "&Íà:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Ôàéë" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Íà ÷òî" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "&Ñòðîêó" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Îòëè÷èå" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "Ïåðåéò&è" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Ñðàâíåíèå" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Íåâèäèìûå" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "Ó÷èòûâàòü &íåâèäèìûå" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "Èãíîðèðîâàòü èçìåíåííûå íåâèäèìûå" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Èãíîðèðîâàòü &âñå íåâèäèìûå" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Èãíîðèðîâàòü ïóñò&ûå ëèíèè" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Èãíîðèðîâàòü ð&åãèñòð" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Îáíàðóæåíèå ïåðåìå&ùåííûõ áëîêîâ" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "Èñêàòü ïîõîæèå ñòðîêè" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Ôèëüòð êîììåíòàðèåâ" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Ðåäàêòîð" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "Ïîäñâå÷èâàòü ñèíòàêñèñ" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "Àâòî&ïåðåñêàíèðîâàíèå" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "Îðèãèíàëüíûå ñèìâîëû EOL" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Îòñòóïû" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "Ðàçìåð &îòñòóïà:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "&Òàáóëÿöèè" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "&Ïðîáåëû" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Ïîäñâåòêà îòëè÷èé â ñòðîêå" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Ïîêàçûâàòü îòëè÷èÿ â ñòðîêå" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "Ïîñèìâîëüíî" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "Ïî ñëîâàì:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Ôèëüòðû ôàéëîâ" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Òåñò" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Óñòàíîâèòü..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Íîâûé..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Èçìåíèòü..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Óäàëèòü..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Ñîõðàíèòü èçìåíåíèÿ â ôàéëàõ" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Ôàéë ñ ëåâîé ñòîðîíû" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Ñîõðàíèòü èçìåíåíèÿ" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Îòêëîíèòü èçìåíåíèÿ" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Ôàéë ñ ïðàâîé ñòîðîíû" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "Ñî&õðàíèòü èçìåíåíèÿ" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Î&òêëîíèòü èçìåíåíèÿ" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Êîäîâàÿ ñòðàíèöà" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Êîäîâàÿ ñòðàíèöà ïî óìîë÷àíèþ" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Âûáåðèòå êîäîâóþ ñòðàíèöó ïî óìîë÷àíèþ, äëÿ íå Þíèêîä-ôàéëîâ:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2292,692 +2355,692 @@ msgstr "" "Îïðåäåëÿòü êîäèðîâêó äëÿ ýòèõ ôàéëîâ: .html, .rc, .xml \n" "Íåîáõîäèì ïåðåçàïóñê ñåññèè" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Ñèñòåìíàÿ êîäîâàÿ ñòðàíèöà" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr " çàâèñèìîñòè îò èíòåðôåéñà ïîëüçîâàòåëÿ WinMerge" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Êîäèðîâêà ïîëüçîâàòåëÿ:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Íàñòðîéêà" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Êàòåãîðèè" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Èìïîðò..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Ýêñïîðò..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Äèàëîã" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Êëþ÷åâûå ñëîâà:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Èìåíà ôóíêöèé:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Êîììåíòàðèè:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "×èñëà:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Îïåðàòîðû:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Ñòðîêè:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Ïðåïðîöåññîð:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Ïîëüçîâàòåëü 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Ïîëüçîâàòåëü 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Æèðíûé" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Îò÷åò ñðàâíåíèÿ êàòàëîãîâ" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "&Ôàéë îò÷åòà:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Îáçîð..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Ñòèëü:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "Êîïèðîâàòü â áóôåð îáìåíà" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Îáùèå è ëè÷íûå ôèëüòðû" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Êàêîé òèï ôèëüòðà âû õîòèòå ñîçäàòü?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Îáùèé ôèëüòð (äëÿ âñåõ ïîëüçîâàòåëåé ýòîé ìàøèíû)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Ëè÷íûé ôèëüòð (òîëüêî äëÿ òåêóùåãî ïîëüçîâàòåëÿ)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Ïîääåðæêà àðõèâîâ" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Âêëþ÷èòü ïîääåðæêó àðõèâîâ" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Îïðåäåëÿòü òèï àðõèâà ïî ñèãíàòóðå/çàãîëîâêó ôàéëà" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Ñðàâíåíèå ñòàòèñòèêè" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Ïàïêè:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Ôàéëû:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Îòëè÷àþòñÿ" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Òåêñò:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Áèíàðíûå:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Óíèêàëüíûå" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Ñëåâà:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Ñïðàâà:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Îäèíàêîâûå" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Âñåãî:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Çàêðûòü" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Ïðèìåíèòü ê:" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(ïðèìåíèòü)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Âûáðàòü êîäîâóþ ñòðàíèöó äëÿ" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "Çàãðóçêà ôàéëà:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Ñîõðàíåíèå ôàéëà:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "Èñïîëüçîâàòü îäíó è òó æå êîäîâóþ ñòðàíèöó" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Ïðèìåíèòü" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Îòìåíà" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Òåñò ôèëüòðà" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Òåñòèðîâàòü ôèëüòð ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "Ââåäèòå òåñòîâûé òåêñò:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "Ïàïêà" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Ðåçóëüòàò:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Òåñòèðîâàòü" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Çàêðûòü" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "Èñïîëüçîâàòü îñîáûå öâåòà" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Íàñòðîèòü öâåòà" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Íåâèäèìûå:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Îáû÷íûé òåêñò:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Âûäåëåííûé òåêñò:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Ïóòè" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Ëåâûé:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Òîëüêî ÷òåíèå" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Ïðàâûé:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Òîëüêî ÷òåíèå" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Ôèëüòð:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Îòêðûòü..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Ñîõðàíèòü..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Ðåçåðâíûå êîïèè" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Ñîçäàòü ðåçåðâíûå ôàéëû â:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Ñðàâíåíèÿ &ïàïîê" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Ñðàâíåíèÿ &ôàéëîâ" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Ñîçäàòü ðåçåðâíûå ôàéëû:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "â ïàïêå ñ îðèãèíàëüíûì ôàéëîì" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "â îáùåé ïàïêå:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Èìÿ ðåçåðâíîãî ôàéëà:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&Äîáàâèòü ðàñøèðåíèå .bak" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "Äîáàâèòü äàòó" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Ïîäòâåðæäåíèÿ" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Âû äåéñòâèòåëüíî õîòèòå ñêîïèðîâàòü XXX ýëåìåíòîâ?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Ñëåâà" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Íàïðàâî" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Äà" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Íåò" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Äîïîëíåíèÿ" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "&Âêëþ÷èòü äîïîëíåíèÿ" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Èíòåãðàöèÿ â îáîëî÷êó" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Ïðîâîäíèê" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Â&êëþ÷èòü ðàñøèðåííîå ìåíþ" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "&Äîáàâèòü â êîíòåêñòíîå ìåíþ" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Êàòàëîã" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "&Îñòàíàâëèâàòüñÿ ïîñëå ïåðâîãî îòëè÷èÿ" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Èãíîðèðîâàòü ðàçíèöó âðåìåíè ìåíåå 3 ñåêóíä" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Äâîè÷íûé" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "041904e3" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x419, 1251" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Íåèçâåñòíàÿ îøèáêà ïðè îòêðûòèè ôàéëà ïðîåêòà" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Íåèçâåñòíàÿ îøèáêà ïðè ñîõðàíåíèè ôàéëà ïðîåêòà" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Ôàéë ïðîåêòà" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Ôàéë ïðîåêòà óñïåøíî çàãðóæåí." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Ôàéë ïðîåêòà óñïåøíî ñîõðàíåí." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2996,7 +3059,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge Ñðàâíåíèå Ôàéëîâ" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3015,7 +3078,7 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Ñðàâíåíèå Ïàïîê" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3024,143 +3087,143 @@ msgstr "" "Ðàçðàáîò÷èêè:\n" "Äèí Ãðèìì (Dean Grimm), Êðèñòèàí Ëèñò (Christian List), Êèììî Âàðèñ (Kimmo Varis), Éîõåí Òóõò (Jochen Tucht), Òèì Ãåðóíäò (Tim Gerundt), Òàêàøè Ñàâàíàêè (Takashi Sawanaki), Ãýë Õàììåð (Gal Hammer), Àëåêñàíäð Ñêèííåð (Alexander Skinner)" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 ïîñòàâëÿåòñÿ ÁÅÇ ÊÀÊÎÉ-ËÈÁÎ ÃÀÐÀÍÒÈÈ. Ýòî ñâîáîäíîå ÏÎ è ìû ïðèâåòñòâóåì åãî ðàñïðîñòðàíåíèå ñîãëàñíî íåêîòîðûõ óñëîâèé; îçíàêîìüòåñü ñ GNU General Public License â ìåíþ Ïîìîùü äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Ïðåðâàòü" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "Ïîâ&òîðèòü" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Èãíîðèðîâàòü" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Èãíîðèðîâàòü &âñå" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Äà" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Ä&à äëÿ âñåõ" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Íåò" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Íåò ä&ëÿ âñåõ" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "Ïðî&äîëæèòü" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "Ï&ðîïóñòèòü" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Ïðîï&óñòèòü âñå" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Íå ïîêàçûâàòü &áîëüøå ýòî ñîîáùåíèå" -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Íå çàäàâàòü &áîëüøå ýòîò âîïðîñ" -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Êîíòðîëü âåðñèé" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Îòëè÷èÿ" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Íà:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Ñëåâà:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Íàëåâî:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Ñïðàâà:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Íàïðàâî:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Âåðñèÿ %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Þíèêîä" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Íàñòðîéêè (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Òåïåðü âñå ñîîáùåíèÿ ñíîâà áóäóò îòîáðàæàòüñÿ" -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3171,84 +3234,84 @@ msgstr "" "\n" "Èñïîëüçóéòå çíà÷åíèÿ 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Îòêðûòü" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Ïðîãðàììû|*.exe;*.bat;*.cmd|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Ôàéëû ïðîåêòîâ WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Ôàéëû êîíôèãóðàöèè (*.ini)|*.ini|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, 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:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Ôàéëû HTML (*.htm,*.html)|*.htm;*.html|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Ôàéëû XML (*.xml)|*.xml|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Èìÿ" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Ìåñòîïîëîæåíèå" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Ôèëüòðû" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Îïèñàíèå" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Óêàæèòå èìÿ ôàéëà äëÿ íîâîãî ôèëüòðà" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Ôàéëû ôèëüòðîâ (*.flt)|*.flt|Âñå ôàéëû (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3261,7 +3324,7 @@ msgstr "" "Ñêîïèðóéòå ôàéë %1 â ïàïêó ñ ôèëüòðàìè:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3274,7 +3337,7 @@ msgstr "" "\n" "Óáåäèòåñü, ÷òî ïàïêà ñóùåñòâóåò è äîñòóïíà äëÿ çàïèñè." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3285,7 +3348,7 @@ msgstr "" "\n" "Óêàæèòå ïàïêó ñ ôèëüòðàìè íà âêëàäêå Ñèñòåìà â Íàñòðîéêàõ." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3298,12 +3361,12 @@ msgstr "" "\n" "Âîçìîæíî ôàéë èñïîëüçóåòñÿ." -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Óêàçàòü ôàéë ôèëüòðà" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3314,17 +3377,17 @@ msgstr "" "\n" "Íåâîçìîæíî ñêîïèðîâàòü ôàéë ôèëüòðà â ïàïêó ñ ôèëüòðàìè." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Ôèëüòð óæå ñóùåñòâóåò. Ïåðåçàïèñàòü?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Ðåãóëÿðíîå âûðàæåíèå" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3334,173 +3397,173 @@ msgstr "" "Ôèëüòðû áûëè îáíîâëåíû. Õîòèòå îáíîâèòü âñå îòêðûòûå ñðàâíèâàåìûå ïàïêè?\n" "Åñëè íå õîòèòå îáíîâëÿòü ñåé÷àñ, òî ìîæåòå íàæàòü \"Íåò\" è îáíîâèòü ïîçæå." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&Ïóòü ê SS.EXE:" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Ðåçóëüòàòû ñðàâíåíèÿ êàòàëîãîâ" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Ñðàâíåíèå ôàéëîâ" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Áåçûìÿííûé ñëåâà" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Áåçûìÿííûé ñïðàâà" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Èõ ôàéë" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Ìîé ôàéë" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Ñòðîêà: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Îáúåäèíåíèå" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Îòëè÷èå %1 èç %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 îòëè÷èé íàéäåíî" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "Íàéäåíî âñåãî îäíî îòëè÷èå" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Ýëåìåíò %1 èç %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Ýëåìåíòîâ: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Âûáåðèòå äâà ÑÓÙÅÑÒÂÓÞÙÈÕ êàòàëîãà èëè ôàéëà äëÿ ñðàâíåíèÿ" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Âûáîð êàòàëîãà" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Âûáåðèòå äëÿ ñðàâíåíèÿ äâà êàòàëîãà èëè ôàéëà" -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Ïóòü ñëåâà óêàçàí íåâåðíî" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Ïóòü ñïðàâà óêàçàí íåâåðíî" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Îáà ïóòè óêàçàíû íåâåðíî" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Âûáåðèòå äâà ôàéëà, ÷òîáû âêëþ÷èòü âûáîð ðàñïàêîâùèêà" -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Íåâîçìîæíî ñðàâíåíèå ôàéëà è êàòàëîãà!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Ôàéë íå íàéäåí: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Ôàéë íå ðàñïàêîâàí: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3513,12 +3576,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Îøèáêà ðàçáîðà ôàéëà êîíôëèêòîâ" -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3529,27 +3592,27 @@ msgstr "" "%1\n" "íå ÿâëÿåòñÿ ôàéëîì êîíôëèêòîâ" -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Ñîõðàíèòü êàê..." -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Ñîõðàíèòü èçìåíåíèÿ â %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 ïîìå÷åí êàê òîëüêî äëÿ ÷òåíèÿ. Ñîãëàñíû ëè âû çàìåíèòü ýòîò ôàéë ? (Íåò ïîçâîëÿåò çàäàòü íîâîå èìÿ ôàéëà)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Îøèáêà ñîçäàíèÿ ðåçåðâíîé êîïèè" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3562,7 +3625,7 @@ msgstr "" "\n" "Ïðîäîëæèòü â ëþáîì ñëó÷àå?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3579,7 +3642,7 @@ msgstr "" "\t-èñïîëüçîâàòü äðóãîå èìÿ ôàéëà (Íàæìèòå Ok)\n" "\t-îòìåíèòü òåêóùóþ îïåðàöèþ (Íàæìèòå Îòìåíà)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3594,7 +3657,7 @@ msgstr "" "\n" "Õîòèòå ñîõðàíèòü ðàñïàêîâàííóþ âåðñèþ â äðóãîé ôàéë?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3609,7 +3672,7 @@ msgstr "" "\n" "Õîòèòå ñîõðàíèòü ðàñïàêîâàííóþ âåðñèþ â äðóãîé ôàéë?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3624,14 +3687,14 @@ msgstr "" "\n" "Ïåðåçàïèñàòü èçìåíåííûé ôàéë?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" "is marked read-only. Would you like to override the read-only item?" msgstr "%1 ïîìå÷åí êàê òîëüêî äëÿ ÷òåíèÿ. Ñîãëàñíû ëè âû çàìåíèòü ýòîò ôàéë?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3646,22 +3709,22 @@ msgstr "" "\n" "Âû õîòèòå ïåðåçàãðóçèòü ôàéë?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Ñîõðàíèòü ôàéë ñëåâà êàê..." -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Ñîõðàíèòü ôàéë ñïðàâà êàê..." -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3672,7 +3735,7 @@ msgstr "" "%1\n" "óòðà÷åí. Ïîæàëóéñòà, ñîõðàíèòå êîïèþ ôàéëà, ÷òîáû ïðîäîëæèòü." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3683,42 +3746,42 @@ msgstr "" "\n" "Îáíîâèòå äîêóìåíòû ïåðåä ïðîäîëæåíèåì." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "×òîáû ïðîäîëæèòü, Âû äîëæíû óêàçàòü ïóòü ê ïðîåêòó SourceSafe (íàïðèìåð: $/MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Ïîëó÷àåì ôàéëû èç VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Ñèñòåìà êîíòðîëÿ âåðñèé âåðíóëà îøèáêó ïðè ïîïûòêå âçÿòü ôàéë ïîä êîíòðîëü. Íåò âîçìîæíîñòè ïðîäîëæàòü..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Îøèáêà âûïîëíåíèÿ ñèñòåìíîé êîìàíäû Ñèñòåìû êîíòðîëÿ âåðñèé." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Ðàáî÷àÿ ïàïêà VSS è ìåñòîïîëîæåíèå òåêóùåãî ôàéëà íå ñîâïàäàþò. Ïðîäîëæèòü ?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Íå íàéäåíà áàçà äàííûõ VSS!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Îøèáêà VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3729,7 +3792,7 @@ msgstr "" " Ïðîâåðüòå êîíôèãóðàöèþ.\n" " Ñäåëàòü îòêàò?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3738,127 +3801,146 @@ msgstr "" "VSS âåðíóëà îøèáêó ïðè ïîïûòêå îòêàòà èçìåíåíèé.\n" " Ïðîâåðüòå êîíôèãóðàöèþ. " -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Íåò" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (ìëàäøå, ÷åì 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 è âûøå)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Ðàçáèâàòü ïî íåâèäèìûì" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Ðàçáèâàòü ïî íåâèäèìûì è çíàêàì ïóíêòóàöèè" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Ñêîïèðîâàòü íà ëåâóþ ñòîðîíó %1 èç %2 âûáðàííûõ ýëåìåíòîâ" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Ñêîïèðîâàòü íà ïðàâóþ ñòîðîíó %1 èç %2 âûáðàííûõ ýëåìåíòîâ" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Ñïðàâà íàëåâî (%1 èç %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Ñëåâà íàïðàâî (%1 èç %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Ñêîïèðîâàòü íà ïðàâóþ ñòîðîíó %1 èç %2 âûáðàííûõ ýëåìåíòîâ" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Ñëåâà íà... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Ñïðàâà íà... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Ñëåâà íà... (%1 èç %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Ñïðàâà íà... (%1 èç %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Ñëåâà (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Óäàëèòü %1 èç %2 âûáðàííûõ ýëåìåíòîâ ñ ïðàâîé ñòîðîíû" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Óäàëèòü ñ îáåèõ ñòîðîí %1 èç %2 âûáðàííûõ ýëåìåíòîâ" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Ñëåâà (%1 èç %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Ñïðàâà (%1 èç %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Âìåñòå (%1 èç %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Ëåâàÿ ñòîðîíà - âûáîð ïàïêè íàçíà÷åíèÿ:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Ïðàâàÿ ñòîðîíà - âûáîð ïàïêè íàçíà÷åíèÿ:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ôàéëîâ îáðàáîòàíî)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 èç %2 ôàéëîâ îáðàáîòàíî)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3869,17 +3951,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Âû óâåðåíû, ÷òî õîòèòå ñêîïèðîâàòü:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Âû óâåðåíû, ÷òî õîòèòå ñêîïèðîâàòü %d ýëåìåíòîâ:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3898,502 +3980,502 @@ msgstr "" "\n" "Îáíîâèòå ñðàâíåíèå." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Óâåðåíû, ÷òî õîòèòå ïåðåìåñòèòü:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Óâåðåíû, ÷òî õîòèòå ïåðåìåñòèòü %d ýëåìåíòîâ:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Ïîäòâåðäèòå ïåðåìåùåíèå" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íåâîçìîæíî âûïîëíèòü %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Íåèçâåñòíûé ôîðìàò àðõèâà" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Èìÿ ôàéëà" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Ðåçóëüòàò ñðàâíåíèÿ" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Äàòà Ñëåâà" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Äàòà Ñïðàâà" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Ðàñøèðåíèå" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Ðàçìåð ñëåâà" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Ðàçìåð ñïðàâà" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Ðàçìåð ñïðàâà (ñîêð.)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Ðàçìåð ñëåâà (ñîêð.)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñëåâà" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñïðàâà" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Áîëåå íîâûé ôàéë" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Âåðñèÿ ôàéëà ñëåâà" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Âåðñèÿ ôàéëà ñïðàâà" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Óïðîùåííûé ðåçóëüòàò" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Àòðèáóòû ôàéëà ñëåâà" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Àòðèáóòû ôàéëà ñïðàâà" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Ëåâûé EOL" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Ïðàâûé EOL" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Êîäèðîâàíèå ôàéëà ñëåâà" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Êîäèðîâàíèå ôàéëà ñïðàâà" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Èãíîð. îòëè÷èÿ" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Íåâîçìîæíî ñðàâíèòü ôàéëû" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Ñðàâíåíèå ïðåðâàíî" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Ôàéë ïðîïóùåí" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Êàòàëîã ïðîïóùåí" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Òîëüêî ñëåâà: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Òîëüêî ñïðàâà: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Áèíàðíûå ôàéëû íå èìåþò îòëè÷èé" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Áèíàðíûå ôàéëû îòëè÷àþòñÿ" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Ôàéëû îòëè÷àþòñÿ" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Ïàïêè ðàçëè÷íû" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Òîëüêî ñëåâà" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Òîëüêî ñïðàâà" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Îøèáêà" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Òåêñòîâûå ôàéëû èäåíòè÷íû" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Òåêñòîâûå ôàéëû ðàçëè÷íû" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ïðîøëî âðåìåíè: %ld ìñ" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "Âûáðàí 1 ýëåìåíò" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "Âûáðàíî ýëåìåíòîâ: %1" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Èìÿ ôàéëà èëè êàòàëîãà" -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Èìåíà ïîäïàïîê, åñëè ïîäïàïêè âêëþ÷åíû" -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Ðåçóëüòàò ñðàâíåíèÿ, äëèííàÿ ôîðìà." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Âðåìÿ èçìåíåíèÿ ôàéëà ñëåâà" -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Âðåìÿ èçìåíåíèÿ ôàéëà ñïðàâà" -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Ðàñøèðåíèå ôàéëà" -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Ðàçìåð ôàéëà ñëåâà â áàéòàõ" -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Ðàçìåð ôàéëà ñïðàâà â áàéòàõ" -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Ðàçìåð ëåâîãî ôàéëà (ñîêð.)" -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Ðàçìåð ïðàâîãî ôàéëà (ñîêð.)" -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñëåâà" -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñïðàâà" -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Ïîêàçàòü ñ êàêîé èç ñòîðîí äàòà èçìåíåíèÿ ôàéëà íîâåå" -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Âåðñèÿ ôàéëà ñëåâà, òîëüêî äëÿ íåêîòîðûõ òèïîâ ôàéëîâ." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Âåðñèÿ ôàéëà ñïðàâà, òîëüêî äëÿ íåêîòîðûõ òèïîâ ôàéëîâ." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Ðåçóëüòàò áûñòðîãî ñðàâíåíèÿ" -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Àòðèáóòû ôàéëà ñëåâà" -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Àòðèáóòû ôàéëà ñïðàâà" -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Ìàðêåð êîíöà ñòðîêè äëÿ ëåâîãî ôàéëà" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Ìàðêåð êîíöà ñòðîêè äëÿ ïðàâîãî ôàéëà" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Êîäèðîâàíèå ôàéëà ñëåâà" -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Êîäèðîâàíèå ôàéëà ñïðàâà" -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Êîëè÷åñòâî èãíîðèðîâàííûõ îòëè÷èé â ôàéëå. Ýòè îòëè÷èÿ áûëè èãíîðèðîâàííû WinMerge è íå ìîãóò áûòü îáðàáîòàíû." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Êîëè÷åñòâî îòëè÷èé â ôàéëå. Ýòî ÷èñëî íå âêëþ÷àåò â ñåáÿ èãíîðèðîâàííûå îòëè÷èÿ." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ïîêàçàòü çâåçäî÷êó (*) åñëè ôàéë áèíàðíûé." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Ñðàâíèâàíèå %1 ñ %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Ñïèñîê ñ ðàçäåëÿþùèìè çàïÿòûìè" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Ñïèñîê ñ ðàçäåëÿþùèìè òàáóëÿòîðàìè" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Ïðîñòîé HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Ïðîñòîé XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Ôàéë îò÷åòà óæå ñóùåñòâóåò. Ïåðåçàïèñàòü??" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4402,32 +4484,32 @@ msgstr "" "Îøèáêà ïðè ñîçäàíèè îò÷åòà:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Îò÷åò óñïåøíî ñîçäàí" -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Íà îáîèõ ïàíåëÿõ îòêðûò îäèí è òîò æå ôàéë" -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Âûáðàííûå ôàéëû íå èìåþò îòëè÷èé" -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Ïðè ñðàâíåíèè ôàéëîâ ïðîèçîøëà îøèáêà." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Âðåìåííûå ôàéëû íå ìîãóò áûòü ñîçäàíû. Ïðîâåðüòå íàñòðîéêè ïóòåé äëÿ âðåìåííûõ ôàéëîâ" -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4442,17 +4524,17 @@ msgstr "" "\n" "Âíèìàíèå: Åñëè âàñ íå èíòåðåñóþò ðàçëè÷èÿ â EOL, óñòàíîâèòå îïöèþ 'Èãíîðèðîâàòü ðàçëè÷èÿ â EOL' íà âêëàäêå Ñðàâíåíèå â Íàñòðîéêàõ." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Íåâîçìîæíî îòêðûòü âûáðàííóþ ïàïêó." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Íåâîçìîæíî îòîáðàçèòü áèíàðíûé ôàéë â ðåäàêòîðå." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4467,7 +4549,7 @@ msgstr "" "%1\n" "íà äðóãîé ñòîðîíå è îáå îòêðûòü èõ?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4478,152 +4560,152 @@ msgstr "" "Êàæäûé èç ôàéëîâ ìîæåò áûòü îòîáðàæåí â ñâîåé êîäèðîâêå, íî èõ ñëèÿíèå èëè êîïèðîâàíèå ìîæåò ïîâðåäèòü èíôîðìàöèþ.\n" "Îòîáðàçèòü îáà ôàéëà â ñèñòåìíîé êîäèðîâêå (ðåêîìåíäóåòñÿ)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Èíôîðìàöèÿ ïîòåðÿíà èç-çà îøèáî÷íîé êîäèðîâêè: îáà ôàéëà" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Íåò îòëè÷èé" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Ñòðîêà îòëè÷èé" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Çàìåíåíî %1 ñòðîê." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Íåâîçìîæíî íàéòè ñòðîêó \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Ìåñòîïîëîæåíèÿ" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Îòëè÷èÿ" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Ïàò÷ óñïåøíî çàïèñàí." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Ýëåìåíò íå íàéäåí èëè ýòî êàòàëîã" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Ýëåìåíò íå íàéäåí èëè ýòî êàòàëîã" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Ïàò÷ óæå ñóùåñòâóåò. Õîòèòå ïåðåçàïèñàòü åãî ?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 ôàéëîâ âûáðàíî]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Íîðìàëüíûé" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Êîíòåêñò" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Óíèôèöèðîâàííûé" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Íåò âîçìîæíîñòè çàïèñàòü â ôàéë %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Óêàçàííûé ïóòü äëÿ âûâîäà íå ÿâëÿåòñÿ àáñîëþòíûì: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Óêàçàòü âûõîäíîé ôàéë" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Íåâîçìîæíî ñîçäàòü ïàò÷ èç áèíàðíûõ ôàéëîâ" -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Íåâîçìîæíî ñîçäàòü ïàò÷ èç êàòàëîãîâ" -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4634,12 +4716,12 @@ msgstr "" "\n" "Ñîçäàíèå ïàò÷à òðåáóåò ÷òîáû â ôàéëàõ íå áûëî íåñîõðàíåííûõ èçìåíåíèé" -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Ïàïêà íå ñóùåñòâóåò" -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4651,37 +4733,37 @@ msgstr "" "Íå íàéäåíû âñå íåîáõîäèìûå êîìïîíåíòû (7-zip è/èëè Merge7z*.dll) . \n" "Ïîñìîòðèòå èíñòðóêöèþ, ÷òî áû óçíàòü áîëüøå ïðî ïîääåðæêó àðõèâîâ è êàê åå âêëþ÷èòü." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Âûáðàòü ôàéë äëÿ ýêñïîðòà" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Âûáðàòü ôàéë äëÿ èìïîðòà" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Îïöèè, èìïîðòèðîâàííûå èç ôàéëà." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Îïöèè, ýêñïîðòèðóåìûå â ôàéë." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Îøèáêà èìïîðòà îïöèé èç ôàéëà." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Îøèáêà ýêñïîðòà îïöèé â ôàéë." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4692,247 +4774,247 @@ msgstr "" "\n" "Ïðîäîëæèòü?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Ñìåøàííûé" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Òèï" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Ðàñïàêîâùèê" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Ïðåäñðàâíåíèå" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Ðåäàêòîð ñêðèïòîâ" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Àâòîìàòè÷åñêèé ïîäîáîð ðàñïàêîâùèêà (óêàæèòå ðàñøèðåíèå õîòÿ áû ó îäíîãî èç ôàéëîâ)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Áåç ïðåäñðàâíåíèÿ (normal)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Ñîâåòóåìûå äîïîëíåíèÿ" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Äðóãèå äîïîëíåíèÿ" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "×àñòíûé áèëä: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Íàñòðîéêè äîïîëíåíèÿ" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH íå íàéäåí - .sct ñêðèïòû îòêëþ÷åíû" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "<Íåò>" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "<Àâòîìàòè÷åñêè>" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "Ïåðåéòè ê &ñòðîêå %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Îòêëþ÷åíî" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Êàê íà äèñêå" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Êàê â ñïèñêå íåäàâíèõ äîêóìåíòîâ" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Íåò âûäåëåííîãî" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Ðåñóðñû" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index 64ff1e9e7..606cee9ed 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -77,7 +77,7 @@ msgid "Cu&t" msgstr "Èñ&åöè" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Óìíîæè" @@ -88,7 +88,7 @@ msgid "&Paste" msgstr "&Íàëåïè" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&Èäè íà..." @@ -99,22 +99,25 @@ msgid "Op&en" msgstr "&Îòâîðè" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "ñà èíñ&òàëèðàíèì ïðîãðàìîì" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "ñà äð&óãèì óðåèâà÷åì" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&ñà" @@ -152,7 +155,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Ïîâåžà¼" @@ -164,8 +167,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Íèøòà" @@ -182,49 +185,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Äàòîòåêà" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Íîâà\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Óïîðåäè...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Îòâîðè ïðîáë&åìàòè÷íå..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Îòâîðè ïîðå&åœå...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Ñà÷ó&â༠ïîðååœå..." @@ -236,274 +239,274 @@ msgstr " #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Ïðàçàí >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "Èçëà&ç" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "Óð&åäè" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "Èçá&îð..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "Ïðè&êàç" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "&Òðàêà àëàòà" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Ìàëà" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Âåëèêà" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "&Ñòàòóñíà òðàêà" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Òðà&êà ¼åçè÷àêà" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "Àëàòêå" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Ôèëòåðè..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "Ñà÷óâ༠ðà&çëèêå..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "Äîäà&öè" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "&Ðàñïàêó¼ ðó÷íî" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "Ðàñïàêó¼ &àóòîìàòñêè" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "Ïîíîâî &ó÷èò༠äîäàòêå" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "Ïð&îçîð" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Çàòâîðè" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Çàòâîðè &ñâå" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Çàìåíè &òàáëå\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Ïðîçîðå &âîäîðàâíî" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Ïðîçîðå &óñïðàâíî" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "Ïðîçîðå ïîðå&àíî" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "Ïîìî&ž" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge Ïîìîž\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "&Ïîñòàâêå" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU ¼àâíà ëèöåíöà" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&Î WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Ñàìî çà ÷èòàœå - ë&åâà" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Ñàìî çà ÷èòàœå - ä&åñíà" @@ -514,7 +517,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Èçàáåðè &ñâå\tCtrl+A" @@ -536,1751 +539,1811 @@ msgstr " #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Ïðèêàæè äå&ñíî ¼åäèíñòâåíå ñòàâêå" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Ïðèêàæè &èçîñòàâšåíå ñòàâêå" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Ïðèêà&æè áèíàðíå äàòîòåêå" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Ïðèêàæè ñêðèâ&åíå ñòàâêå" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "&Ìîäåë ñòàáëà" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "Ïðî&øèðè ñâå ïîòôàñöèêëå" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "Çàòâîðè ñâå ïîòôàñöèêëå" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Èçàáåðè &ñëîâà..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Êîðèñòè ïîäðàçóìåâàíà ñëîâà" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Óïîðåäè ñòàòèñòèêó" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "Î&ñâåæè\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Îñâå&æè îäàáðàíî\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "Ïîðå&åœå" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "&Óïîðåäèòè\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Ñëåäåžà ðàçëèêà\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Ïðåòõîäíà ðàçëèêà\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Ïð&âà ðàçëèêà\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Òðåíóòíà ðàçëèêà\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Çàäœà ðàçëèêà\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Óìíîæè ó &äåñíó\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Óìíîæè ó ë&åâó\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Èçáðèøè\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "Ïîäåñè &ñòóáöå..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Íàï&ðàâè èçâåøòà¼..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Ñà÷óâà¼\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Ñà÷óâ༠&ëåâó" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Ñà÷óâ༠&äåñíó" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Îäøòàìïà¼..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Ïîäåñè ñ&òðàíèöó" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Ïðåãëåä ïðå øòàìïà&œà" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "Çàâðøè ðåä ïðåìà" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "&Íà÷èí ïîðååœà\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "Äå&êîäèðàœå äàòîòåêå..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "Îïî&çîâè\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Ïîíîâè\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Èñå&öè\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "Óìíî&æè\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Íàëåïè\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Èñòàêíè &ðàçëèêó ðåäà\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Ïðåòðàæ&è...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Çàìåíè...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Íàïðåäíî" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Óìíîæè ðåäîâå ñà áðî¼åâèìà\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "Ç&àáåëåøêå" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Çàìåíè çàáåëåøêå\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Ñëåäåžà çàáåëåøêà\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Ïðåòõîäíà çàáåëåøêà\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "Î÷èñòè ñâå çàáåëåøêå" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Èäè íà...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Óâå&žà¼\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Óìà&œè\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "Èçâîðíî\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Íàãëàñèòå ñêëîï ðå÷è" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "Çàêšó÷༠òàáëå" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "Ïðèêà&ç ðàçìàêà" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Ïðèêàç ðàçëè&÷èòèõ ðåäîâà" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Ïðèêàç áðî¼à ðå&äîâà" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Ïðèêàç èâè&öà" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "Çàâðøåòàê ðåäîâà" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Ç&àìåíè òàáëå" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "&Ðàçëèêà òàáëè" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Ïîëî&æ༠òàáëå" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Óìíîæè ó äåñí&î è íàñòàâè\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Óì&íîæè ó ëåâî è íàñòàâè\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Óìíî&æè ñâå ó äåñíî" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Óìíîæ&è ñâå ó ëåâî" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Äåôèíèñàíî ïîðååœå" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Ñêðèïòå " -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "&Óïîðåäè" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&Ëåâó ó äåñíî" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "Ë&åâà ó..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "&Äåñíà ó ëåâî" +msgid "Left to Right (%1 of %2)" +msgstr "Ëåâà ó äåñíî (%1 îä %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "Ä&åñíà ó..." +msgid "Left to... (%1 of %2)" +msgstr "Ëåâà ó... (%1 îä %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "Ïî&ìåðè" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&Ëåâà ó..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&Äåñíà ó..." +msgid "Right to Left (%1 of %2)" +msgstr "Äåñíà ó ëåâî (%1 îä %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Äåñíà ó... (%1 îä %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "Ïî&ìåðè" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Èçáðèøè" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&Ëåâà" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Äåñíà" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "Îáå " -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Ïðåèìå&íó¼" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Ñàêðè¼ ñòàâêå" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "&Îòâîðè ëåâó" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Îòâî&ðè äåñíó" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Óìíîæè ïóòà&œó" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&Ëåâà (%1 îä %2) " +msgid "Left (%1 of %2)" +msgstr "Ëåâà (%1 îä %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&Äåñíà (%1 îä %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Äåñíà (%1 îä %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Îáå(%1 îä %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "Î&áå (%1 îä %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Óìíîæè íàçèâå äàòîòåêà" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Çèï" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "Ëåâà...(%1 îä %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&Äåñíà...(%1 îä %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "Îáå...(%1 îä %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Ðàçëèêå...(%1 îä %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Îñâåæè" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Ëåâè èçáîðíèê /šóñêå/" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Äåñíè èçáîðíèê /šóñêå/" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Óìíîæè ïóòàœó" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Óìíîæè íà&çèâ äàòîòåêå" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Ñâî¼ñòâà äåôèíèñàíîã ïîðååœà" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "Íåìà äåôèíèñàíîã ïîðååœà" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Àóòîìàòñêè äåôèíèøè ïîðååœå" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Èäè &íà ðàçëèêó" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Íå ïðåìåøò༠ãðóïå" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "Ïðåìåñòè &ñâå ãðóïå" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Ïðåìåñòè òðåíóòíå ðàçëèêå &ãðóïå" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "Ð&àçìàê" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Ó&ïîðåäè" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "&Çàíåìàðè èçìåíå" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Çà&íåìàðè ñâå" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "Ïîäóäàðà&œå ñëîâà" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Çàíåìàðè &ðàçëèêå îçíàêà çàâðøåòêà ðåäà (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Öåî ñàäðæà¼" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Ñêðàžåíè ñàäðæà¼" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Äàòóì ïðîìåíå" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Èçìåœåí äàòóì è âåëè÷èíà" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Âåëè÷èíà" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Î WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Ëè÷íè èçðàäàê)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Ïîñåòèòå WinMerge-îâ ñà¼ò" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "Ó ðåäó" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Ñàðàäíèöè" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Èçàáåðè äàòîòåêå èëè ôàñöèêëå" -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Ïðåãëåäà¼..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "Ï&ðåãëåäà¼..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Ïð&åãëåäà¼..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Èçàáåðè..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Àðõèâåð:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "&Èçàáåðè..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "Óêšó÷è è ïîòôàñöèêëå" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Ñòàœå" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Îòêàæè" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Ïîìîž" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Óïîðåäè äàòîòåêå èëè ôàñöèêëå" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Áàçà ïîäàòàêà:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Ïîðååœå:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Êîðèñíèê:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Ëîçèíêà:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Âåçà äî îäðåäèøòà VSS ïðî¼åêòà" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Ïðèìåíè íà ñâå ñòàâêå" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Ïðîâåðà" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Ñà÷óâ༠êàî..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Èçäàœå ïðîãðàìà" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Èçáîð ïðîãðàìà" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Ïóòàœà äî cleartool.exe" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Îïøòè èçáîð" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Óâåê êðåíè îä &ïðâå ðàçëèêå" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Çàòâîðè ïð&îçîð ñà ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Ïðîâåðèòå ïóòàœå ó èçáîðíîì äè¼àëîãó " -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Äîçâîëè ñàìî ¼åäíó ïîêðåíóòó íàäëåæíîñò" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Óïèò༠&êàä çàòâàðàø âèøå ïðîçîðà" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "&Çàäðæè îçíàêå âðåìåíà è äàòóìà ó ïîðååœó " -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Ïðèêàæè \"Îäàáðàíå äàòîòåêå èëè ôàñöèêëå\" äè¼àëîã ïðè ïîêðåòàœó." -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Îòâîðè äè¼àëîã ñàìîäîâðøåœà" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge îìîãóžàâà ñêðèâàœå íåêèõ óîáè÷à¼åíèõ ïîðóêà.Ïðèòèñíèòå 'Ïî÷åòíè'äà ïîðóêå îïåò áóäó âèäšèâå" -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Ïî÷åòíè" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Íàè" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "Ïðåòðà&æè:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Óïîðåäè &öåî èçðàç" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Óïîðåäè ñòà&œå" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "Ïðàâèëàí èçðàç" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "Áåç ïðåë&îìà òåêñòà" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Íàè ñëåäåžå" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&Ó ðåäó" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Çàìåíè" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Çà&ìåíè ñà:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "&Áåç ïðåëîìà òåêñòà" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Çàìåíè ó" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "Èçàáðàíèì" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "Öåëî¼ äàò&îòåöè" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Çàìåíè" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Çàìåíè ñâ&å" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Ïðîâåðà" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Íàïîìåíå" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Ïðîâåðèòå ïîíîâî" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Ôèëòåð ðåäîâà" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Îìîãóžè ôèëòðèðàœå ðåäà" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Èñïðàâàí èçðàç (¼åäàí ïî ðåäó):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Íîâè" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Óðåäè" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Óêëîíè" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Áî¼å" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Ðàçëèêå" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Îáåëåæè ðàçëèêå" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Ïîçàäèíà" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Èçáðèñàíî" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Òåêñò" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Çàíåìàðè ðàçëèêå" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Ïðåìåøòåíî:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Ïðåìåøòàœå èçàáðàíîã" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Ðàçëè÷èòå ðå÷è:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Îäàáåðè ðàçëè÷èòå ðå÷è:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Ïîäðàçóìåâàíî" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Ñèñòåì" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Ïîøàšè èçáðè&ñàíî ó êîðïó" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "Ñïè óð&åèâà÷:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "Ôàñöèêëà ôèëòåðà:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Ôàñöèêëà ïðèâðåìåíèõ äàòîòåêà" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "Ïðèâðåìåíà ñèñòåìñêà ôàñöèêëà" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "Ïîäåøåíà ôàñöèêëà" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Ñòâîðåíå ðàçëèêå" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Äàòîòåêà&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Äàòîòåêà&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "&Çàìåíè" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "Ïðèêšó÷è ïîñòî¼åžî¼ äàòîòåöè" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Èçõîä:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Ïðå&ãëåäà¼..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Îáëèê" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "Íà&÷èí" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "Ó &îêâèðó" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Çàí&åìàðè ïðàçíå ðåäîâå" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Óêšó÷è íàðåäáåíè ðåä" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Îòâîðè ó äðóãîì óðå&èâà÷ó" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Ïðèêàæè ñòóáöå" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Ïîìåðè &ãîðå" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Ïîìåðè &äîëå" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Èçáîð àðõèâåðà" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Àðõèâåð äàòîòåêà" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Ïðèêàæè ñâå àðõèâåðå áåç ïðîâåðå íàñòàâêà" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Ïîïèñ íàñòàâàêà:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Îïèñ:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Ñòàíè" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Óïîðåèâàœå ñòàâêè..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Ïîðååœå ñòàâêè:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Óêóïíî ñòàâêè :" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Èäè íà" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "Èäè &íà:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Äàòîòåêà" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Ó äàòîòåöè" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "Ðå&ä" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "Ðàç&ëèêà" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Èäè íà" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Óïîðåèâàœå" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Ðàçìàê" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Óïîðåäè" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "Çàíåìàð&è ïðîìåíå" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Çàíå&ìàðè ñâå" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Çàíåìàðè ïðà&çíå ðåäîâå" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Çàíåìàðè ïîä&óäàðíîñò" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Îìîãóžè îòêðèâàœå ïðåìåøòåíèõ ãðóïà" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "Óïîðåäè ñëè÷íå ðåäîâå" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Ôèëòðèð༠íàïîìåíå" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Óðåèâà÷" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "Íàãëàñè ñêëîï ðå÷è" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "&Àóòîìàòñêè ïîíîâî ïðåòðàæè" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "Çàäð&æè èçâîðíî îçíà÷àâàœå êðà¼à ðåäà" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "£åçè÷öè" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "Âåëè÷èíà &¼åçè÷àêà" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "Óìåòíè ¼åçè÷êå" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "Óìåòíè ðàçìàê" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Îáî¼è ðàçëè÷èòå ðåäîâå " -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Ïðèêàç ðàçëè÷èòèõ ðåäîâà" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "Ðàíã &çíàêà" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "Ðàíã ðå&÷è:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Ôèëòåð äàòîòåêà" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Ïðîâåðà" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Èíñòàëèðà¼..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Íîâè..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Óðåäè..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Èçáðèøè..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Ñà÷óâ༠èçìåœåíó äàòîòåêó?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Ëåâà äàòîòåêà" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Ñà÷óâ༠ïðîìåíå" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Îäóñòàíè îä èçìåíà" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Äåñíà äàòîòåêà" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "Ñ&à÷óâ༠ïðîìåíå" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Îäóñ&òàíè îä èçìåíà" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Êîäíà ñòðàíèöà" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Ïîäðàçóìåâàíà êîäíà ñòðàíèöà" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Îäàáåðè ïîäðàçóìåâàíó êîäíó ñòðàíèöó êàä ó÷èòàíà Óíèêîä äàòîòåêà íè¼å ïðèõâàžåíà" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2289,692 +2352,692 @@ msgstr "" "Ä༠îáàâåøòåœà êîäíå ñòðàíå çà îâå äàòîòåêå:.html, .rc, .xml \n" " Íè¼å ïîòðåáíî ïîíîâî ïîêðåòàœå ñåñè¼å" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Êîäíà ñòðàíèöà ñèñòåìà" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Ïðåìà êîðèñíè÷êîì ñó÷åšó WinMerge-à" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Ïîäåøåíà êîäíà ñòðàíèöà" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Ïîñòàâêå" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr "Êàòåãîðè¼å" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Óâåçè..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Èçâåçè..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Ðàçãîâîð" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "ʚó÷íå ðå÷è:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Èìåíà ôóíêöè¼à:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Íàïîìåíå:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Áðî¼åâè:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Îïåðàòåðè:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Ïî¼ìîâè:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Ïðåòïðîöåñîð:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Êîðèñíèê 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Êîðèñíèê 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Ïîäåášàíî" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Èçâåøò༠óïîðååíèõ ôàñöèêëè" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Äàòîòåêà èçâå&øòà¼à:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Ïðåãëåä..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Íà÷èí" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "Ñà÷óâ༠ó îñòàâè" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Çà¼åäíè÷êè èëè ëè÷íè ôèëòåð" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Êî¼ó âðñòó ôèëòåðà æåëèòå äà èìàòå?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Çà¼åäíè÷êè ôèëòåð (çà ñâå êîðèñíèêå ðà÷óíàðà)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Ëè÷íè ôèëòåð (ñàìî çà òðåíóòíîã êîðèñíèêà)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Ðàä ñà àðõèâàìà" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Îìîãóžè ïîäðøêó àðõèâè" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "Îòêðè¼ âðñòó àðõèâå èç çàãëàâšà äàòîòåêå" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Óïîðåäíà ñòàòèñòèêà" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Ôàñöèêëå" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Äàòîòåêå" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Ðàçëèêà" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Òåêñò" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Áèíàðíè" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "£åäèíñòâåí" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Ëåâà:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Äåñíà:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Èñòå" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Óêóïíî:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Çàòâîðè" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Óñìåðèòå" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Óñìåðèòå)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Îäàáåðè êîäíó ñòðàíó çà" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "Ó&÷èòàâàœå äàòîòåêå:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Äàòîòåêà ¼å &ñà÷óâàíà:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "Êîðèñòè èñò&ó êîäíó ñòðàíó çà îáå" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "Ï&ðèìåíè" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "Îòêàæè" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Ïðîâåðà ôèëòåðà" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Ïðîâåðàâàœå ôèëòåðà..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "Óí&åñè òåêñò çà ïðîâåðó" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "Èìå &ôàñöèêëå" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Èñõîä:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Ïðîâåðà" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Çàòâîðè" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "Êîðèñòè æåšåíå áî¼å òåêñòà" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Æåšåíå áî¼å òåêñòà" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Ðàçìàê:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Ïðàâèëàí òåêñò:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Èçàáåðè:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Ïóòàœå" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Ëåâa:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Ñàìî çà ÷èòàœ&å" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Äåñía:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Ñ&àìî çà ÷èòàœå" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Ôèëòåð:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Îòâîðè..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Ñà÷óâà¼..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Ðåçåðâíå äàòîòåêå" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Íàïðàâè ðåçåðâíå äàòîòåêå ó:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Óïîðåäè &ôàñöèêëó" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Óïîð&åäè äàòîòåêå" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Íàïðàâè ðåçåðâíå äàòîòåêå ó:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "Èçâ&îðíà ôàñöèêëà äàòîòåêå" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "Îïøòà ðåçåðâíà ôàñöèêëà " -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Èìå ðåçåðâíå äàòîòåêå" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "Äîä&༠.bak íàñòàâàê" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "Äî&ä༠äàòóì/âðåìå" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Ïîòâðäè êîïèðàœå" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå êîïèðàòè XXX ñòàâêè" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Ñ ëåâà" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Ó äåñíî" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Äà" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Íå" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Äîäàöè" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "Îìîãóžè äîäàòê&å" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Èíòåãðèøè ó 'šóñêó'" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Èñòðàæèâà÷" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Îìîãóžè &íàïðåäíè èçáîð" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "Äîä༠ó 'èçáîðíè îêâèð'" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Ôàñöèêëà" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "Ñ&òàíè ïîñëå ïðâå ðàçëèêå" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Çàíåìàðè ðàçëèêå âðåìåíà ìàœå &îä 3 ñåêóíäå" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Áèíàðíè" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "041904e3" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x419, 1251" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Íåïîçíàòà ãðåøêà ïðè îòâàðàœó ïîðååœà" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Íåïîçíàòà ãðåøêà ïðè ïîêóøà¼ó ÷óâàœà ïîðååœà" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Ïîðååœå" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Ïîðååœå ¼å óñïåøíî ó÷èòàíî" -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Ïîðååœå ¼å óñïåøíî ñà÷óâàíî" -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2993,7 +3056,7 @@ msgstr "" "WinMerge.Óïîðåäè äàòîòåêó\n" "WinMerge óïîðåäè äàòîòåêó" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3012,7 +3075,7 @@ msgstr "" "WinMerge.Óïîðåäè ôàñöèêëó\n" "WinMerge óïîðåäè ôàñöèêëó" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3021,143 +3084,143 @@ msgstr "" "Ïðîãðàìåðè:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 ¼å ïðîãðàì ÁÅÇ ÃÀÐÀÍÖÈ£Å.Îâî ¼å áåñïëàòàí ïðîãðàì êî¼è ìîæåòå äàšå äåëèòè ïðåìà GNU ¼àâíî¼ ëèöåíöè êî¼ó ïîãëåäà¼òå ó äàòîòåöè /Ïîìîž/" -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Ïðåêèíè" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "Ï&îíîâè" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "Çàíåìàð&è" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Ç&àíåìàðè ñâå" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Äà" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Ä&à çà ñâå" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Íå" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Íå çà ñ&âå" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "Íàñòà&âè" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "Èçî&ñòàâè" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Èçîñò&àâè ñâå" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Íå ïðèêàçó¼ îâó ïîðóêó ïîíîâî" -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Íå ïèò༠ïîíîâî" -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Ïðîãðàìè" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Ðàçëèêå" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Äî:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Ñ ëåâà:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Ó ëåâî:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Ñ äåñíà:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Ó äåñíî:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Èçäàœå %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Óíèêîä" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Ïîñòàâêå (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Ïîíîâè ïðèêàç ñâèõ ïîðóêà" -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3168,84 +3231,84 @@ msgstr "" "\n" "Ìîëèìî êîðèñòèòå âðåäíîñòè 1 - %1" -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Îòâîðè" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Ïðîãðàìè |*.exe;*.bat;*.cmd|Ñâå äàòîòåêå (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Ñâå äàòîòåêå(*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge äàòîòåêå (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Ïîñòàâêå äàòîòåêà (*.ini)|*.ini|All Files (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, 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:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML äàòîòåêå (*.htm,*.html)|*.htm;*.html|Ñâå äàòîòåêå (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML äàòîòåêå (*.xml)|*.xml|Ñâå äàòîòåêå (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Èìå" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Ïîëîæà¼" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Ôèëòåðè" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F]" -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Îïèñ" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Èçàáåðè äàòîòåêó çà íîâè ôèëòåð" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Äàòîòåêà ôèëòåðà (*.flt)|*.flt|All Files (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3258,7 +3321,7 @@ msgstr "" "Ìîëèì óìíîæèòå äàòîòåêó %1 ó WinMerge/Ôèëòåð -ôàñöèêëó:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3271,7 +3334,7 @@ msgstr "" "\n" "Ìîëèì, ïðîâåðèòå äà ëè ïîñòî¼è ôàñöèêëà è œåíó äîñòóïíîñò" -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3282,7 +3345,7 @@ msgstr "" "\n" "Ìîëèì, èçàáåðèòå ôàñöèêëó ôèëòåðà ó /Ïîñòàâêå/Ñèñòåì/" -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3295,12 +3358,12 @@ msgstr "" "\n" "Ìîæäà ¼å äàòîòåêà ñàìî çà ÷èòàœå?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Ïðîíàè ôàñöèêëó ôèëòåðà çà èíñòàëàöè¼ó" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3311,17 +3374,17 @@ msgstr "" "\n" "Íå ìîãó óìíîæèòè íîâè ôèëòåð ó ôàñöèêëè ôèëòåðà" -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Ôèëòåð âåž ïîñòî¼è.Çàìåíè ïîñòî¼åžè ôèëòåð" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Ïðàâèëàí èçðàç" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3332,173 +3395,173 @@ msgstr "" "\n" "Àêî èçàáåðåòå /Íå/ òî ìîæåòå è êàñíè¼å óðàäèòè" -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&Ïóòàœà äî SS.EXE:" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Èñõîäè ïîðååœà ôàñöèêëè" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Óïîðåäè äàòîòåêå" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Íåèìåíîâàíà ëåâà" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Íåèìåíîâàíà äåñíà" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Œèõîâå äàòîòåêå" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Ìî¼å äàòîòåêå" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Ðåä: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Óïîðåäè" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Ðàçëèêå %1 îä %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "Íàåíî ðàçëèêà %1" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "Íàåíî ðàçëèêà 1" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Ñòàâêå %1 îä %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Ñòàâêå: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Îäàáåðè äâå ïîñòî¼åžå äàòîòåêå èëè ôàñöèêëå çà ïîðååœå" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Èçàáåðè ôàñöèêëó" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Îäàáåðè äâå ôàñöèêëå èëè äàòîòåêå çà ïîðååœå" -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Ëåâà ïóòàœà ¼å íåâàæåžà!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Äåñíà ïóòàœà ¼å íåâàæåžà!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Îáå ïóòàœå ñó íåâàæåžå!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Îäàáåðèòå äâå äàòîòåêå êî¼å ïðèõâàòà àðõèâåð" -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Íå ìîãó óïîðåäèòè äàòîòåêó è ôàñöèêëó!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Äàòîòåêà íè¼å ïðîíàåíà" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Äàòîòåêà íè¼å ðàñïàêîâàíà: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3511,12 +3574,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Íå ìîãó ðàø÷ëàíèòè ïðîáëåìàòè÷íó äàòîòåêó" -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3527,27 +3590,27 @@ msgstr "" "%1\n" "íè¼å ïðîáëåìàòè÷íà" -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Ñà÷óâ༠êàî" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Ñà÷óâ༠èçìåíå %1? " -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 ¼å îçíà÷åíà ñàìî çà ÷èòàœå.Æåëèòå ëè äà ¼å ïîíèøòèòå?(Íå, ñà÷óâàíà ¼å ïîä íîâèì èìåíîì)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Ãðåøêà ïðè ïðàâšåœó ðåçåðâíå äàòîòåêå" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3560,7 +3623,7 @@ msgstr "" "\n" "Íàñòàâèòe?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3577,7 +3640,7 @@ msgstr "" "\t-je çàïàìòèòå ïîä äðóãèì èìåíîì, ïðèòèñíèòå /Ó ðåäó/\n" "\t- èëè ïðèòèñíèòå /Èçàè/çà ïðåêèä ïîñòóïêà?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3592,7 +3655,7 @@ msgstr "" "\n" "Äà ëè æåëèòå äà ñà÷óâàòå íåðàñïàêîâàíî èçäàœå êàî äàòîòåêó?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3607,7 +3670,7 @@ msgstr "" "\n" "Äà ëè æåëèòå äà ñà÷óâàòå íåðàñïàêîâàíî èçäàœå êàî äàòîòåêó?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3622,7 +3685,7 @@ msgstr "" "\n" "Çàìåíèòå èçìåœåíó äàòîòåêó?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3631,7 +3694,7 @@ msgstr "" "%1\n" "¼å îçíà÷åíà ñàìî çà ÷èòàœå.Æåëèòå ëè äà ¼å çàìåíèòå?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3644,22 +3707,22 @@ msgstr "" "%1\n" "îä çàäœåã ïðåãëåäà WinMerge-à.Æåëèòå ëè ïîíîâî ó÷èòàòè äàòîòåêó?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Ñà÷óâ༠ëåâó äàòîòåêó êàî" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Ñà÷óâ༠äåñíó äàòîòåêó êàî" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3670,7 +3733,7 @@ msgstr "" "%1\n" "¼å íåñòàëà.Ìîëèìî Âàñ äà ñà÷óâàòå óìíîæåíó äàòîòåêó äà áèñòå íàñòàâèëè" -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3681,42 +3744,42 @@ msgstr "" "\n" "Îñâåæè äîêóìåíòå ïðå íàñòàâêà" -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Ìîðàòå îäðåäèòè ñèãóðíó èçâîðíó ïóòàœó àêî æåëèòå íàñòàâèòè (ie: $/MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Ïîâåðà äàòîòåêà íà VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Ñèñòåì ¼å ïîêàçàî ãðåøêó äîê ¼å ïîêóøàâàî äà ïðîâåðè äàòîòåêó.Íå ìîæå äà íàñòàâè..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Ãðåøêà ïðè èçâðøåœó ñèñòåìñêå íàðåäáå" -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ðàäíà ôàñöèêëa è ïîëîæ༠òðåíóòå äàòîòåêå ñå íå ïîêëàïà¼ó.Íàñòàâèòå?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Íåìà VSS áàçå ïîäàòàêà" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Ãðåøêà èç VSS" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3727,7 +3790,7 @@ msgstr "" "Ìîëèìî, ïîãëåäà¼òå ïîäåøåíîñò êîðèñíè÷êîã èçãëåäà.\n" "Îïîçîâè ïðîâåðó?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3736,127 +3799,146 @@ msgstr "" "Ñèñòåì ïðèêàçó¼å ãðåøêó äîê ïîêóøàâà äà îïîçîâå ïðîâåðó äàòîòåêå.\n" "Ìîëèìî, ïîãëåäà¼òå ïîäåøåíîñò êîðèñíè÷êîã èçãëåäà" -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Íèøòà" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (ìàœè îä 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 è âèøè)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Ñòàíè íà ðàçìàêó" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Ñòàíè íà ðàçìàêó èëè èíòåðïóêöè¼è" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Äåñíà ó ëåâî (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Ëåâà ó äåñíî (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Äåñíà ó ëåâî (%1 îä %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Ëåâà ó äåñíî (%1 îä %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Ëåâà ó äåñíî (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Ëåâà ó... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Äåñíà ó... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Ëåâà ó... (%1 îä %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Äåñíà ó... (%1 îä %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Ëåâà (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Äåñíà (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Îáå (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Ëåâà (%1 îä %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Äåñíà (%1 îä %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Îáå(%1 îä %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Ëåâà ñòðàíà - îäàáåðè ôàñöèêëó îäðåäèøòà:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Äåñíà ñòðàíà - îäàáåðè ôàñöèêëó îäðåäèøòà:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 óñìåðåíèõ äàòîòåêà)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 îä %2 óñìåðåíèõ äàòîòåêà)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3867,17 +3949,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà óìíîæèòå:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà óìíîæèòå %d ñòàâêè:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3896,502 +3978,502 @@ msgstr "" "\n" "Ìîëèì, îñâåæèòå ïîðååœå." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà ¼å ïðåìåñòèòå:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Äà ëè ñòå ñèãóðíè äà æåëèòå äà ïðåìåñòèòå %d ñòàâêè:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Ïîòâðäè ïðåìåøòà¼" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íè¼å óñïåëî ïîêðåòàœå äðóãîã óðåèâà÷à: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Íåïîçíàò îáëèê àðõèâå" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Èìå äàòîòåêå" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Ðåçóëòàò ïîðååœà" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Äàòóì ëåâî" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Äàòóì äåñíî" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Íàñòàâàê" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Âåëè÷èíà ëåâî" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Âåëè÷èíà äåñíî" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Âåëè÷èíà äåñíî (ñêðàžåíî)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Âåëè÷èíà ëåâî (ñêðàžåíî)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Âðåìå ñòâàðàœà ëåâå" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Âðåìå ñòâàðàœà äåñíå" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Íîâè¼à äàòîòåêà" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Èçäàœå ëåâå äàòîòåêå" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Èçäàœå äåñíå äàòîòåêå" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Ñêðàžåíè èñõîä" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Îñîáèíå ëåâå" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Îñîáèíå äåñíå" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Çàâðøåòàê ðåäà ëåâå äàòîòåêå" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Çàâðøåòàê ðåäà äåñíå äàòîòåêå" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Êîäèðàœå ëåâå" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Êîäèðàœå äåñíå" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Çàíåìàðè ðàçëèêå" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Íå ìîãó óïîðåäèòè äàòîòåêå" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Îäáà÷åíà ñòàâêà" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Èçîñòàâšåíà äàòîòåêà" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Èçîñòàâšåíà ôàñöèêëà" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Ñàìî ëåâà: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Ñàìî äåñíà: %" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Áèíàðíå äàòîòåêå ñó èñòå" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Áèíàðíå äàòîòåêå ñó ðàçëè÷èòå" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Äàòîòåêå ñó ðàçëè÷èòå" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Ôàñöèêëå ñó ðàçëè÷èòå" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Ñàìî ëåâà" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Ñàìî äåñíà" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Ãðåøêà" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Òåêñòîâè äàòîòåêà ñó èñòè" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Òåêñòîâè äàòîòåêà ñó ðàçëè÷èòè" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ïðîòåêëî âðåìå: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 ñòàâêà ¼å îäàáðàíà" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 ñòàâêà ¼å îäàáðàíà" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Èìå äàòîòåêå èëè ôàñöèêëå" -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Èìå ïîòôàñöèêëå êàä ñó ïîòôàñöèêëå óêšó÷åíå" -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Èçõîä ïîðååœà,äóæè îáëèê" -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Äàòóì ïðîìåíå ëåâå ñòðàíå" -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Äàòóì ïðîìåíå äåñíå ñòðàíå" -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "/Íàñòàâàê/ äàòîòåêå" -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Âåëè÷èíà ëåâå äàòîòåêå ó áà¼òèìà" -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Âåëè÷èíà äåñíå äàòîòåêå ó áà¼òèìà" -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Ñêðàžåíà ëåâà äàòîòåêà" -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Ñêðàžåíà äåñíà äàòîòåêà" -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Âðåìå ñòâàðàœà ëåâå ñòðàíå" -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Âðåìå ñòâàðàœà äåñíå ñòðàíå" -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Êî¼à ñòðàíà èìà íîâè¼è äàòóì ïðîìåíå" -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Èçäàœå íà ëåâî¼ ñòðàíè ¼å ñàìî çà íåêå âðñòå äàòîòåêå" -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Èçäàœå íà äåñíî¼ ñòðàíè ¼å ñàìî çà íåêå âðñòå äàòîòåêå" -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Êðàžè ðåçóëòàò ïîðååœà" -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Îñîáèíå ëåâå ñòðàíå" -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Îñîáèíå äåñíå ñòðàíå" -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Íà÷èí çàâðøåòêà ðåäà ëåâå äàòîòåêå" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Íà÷èí çàâðøåòêà ðåäà äåñíå äàòîòåêå" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Êîäèðàœå ëåâå ñòðàíå" -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Êîäèðàœå äåñíå ñòðàíå" -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Áðî¼ çàíåìàðåíèõ ðàçëèêà ó äàòîòåöè.Îâå ðàçëèêå ¼å çàíåìàðèî WinMerge è íå ìîãó áèòè îá¼åäèœåíå" -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Áðî¼ ðàçëèêà ó äàòîòåöè.Îâ༠áðî¼ íå óêšó÷ó¼å çàíåìàðåíå ðàçëèêå" -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ïðèêàçó¼å çâåçäèöó (*), àêî ¼å äàòîòåêà áèíàðíà" -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Óïîðåäè %1 ñà %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Ñïèñàê ¼å îäâî¼åí çàðåçîì" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Ñïèñàê ¼å îäâî¼åí ¼åçè÷êîì" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "£åäíîñòàâíè HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "£åäíîñòàâíè XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Äàòîòåêà èçâåøòà¼à âåž ïîñòî¼è.Äà ëè æåëèòå çàìåíèòè ïîñòî¼åžó äàòîòåêó" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4400,32 +4482,32 @@ msgstr "" "Ãðåøêà ïðè ïðàâšåœó èçâåøòà¼à:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Èçâåøò༠¼å óñïåøíî íàïðàâšåí" -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Èñòà äàòîòåêà ¼å îòâîðåíà ó îáå òàáëå" -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Èçàáðàíå äàòîòåêå ñó èñòå" -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Äîøëî ¼å äî ãðåøêå ïðè ïîðååœó" -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Ïðèâðåìåíà äàòîòåêà íå ìîæå áèòè ñòâîðåíà.Ïðîâåðèòå è ïîäåñèòå ïðèâðåìåíó ïóòàœó" -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4440,17 +4522,17 @@ msgstr "" "\n" "Íàïîìåíà:Æåëèòå ëè óâåê çàäðæàòè ðàçëè÷èòå ïðåëàñêà ó äðóãè ðåä, îäàáåðèòå 'Çàíåìàðè ðàçëè÷èòå ïðåëàñêå ó äðóãè ðåä..' ó äè¼àëîøêî¼ êàðòèöè ïîðååœå ïðîçîðà (Óðåèâàœå/Ïîñòàâêå)" -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Îäàáðàíà ôàñöèêëà ¼å íåóïîòðåášèâà" -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Íå ìîãó îòâîðèòè áèíàðíó äàòîòåêó ó óðåèâà÷ó" -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4465,7 +4547,7 @@ msgstr "" "%1\n" "íà äðóãî¼ ñòðàíè è îòâîðèòè ¼å?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4476,152 +4558,152 @@ msgstr "" "Ïðèêàç ñâàêå äàòîòåêå ó êîäíî¼ ñòðàíèöè ¼å áîšè àëè ñïà¼àœå/óìíîæàâàœå íîñè îïàñíîñò.\n" "Æåëèòå ëè äà óçìåòå îáå äàòîòåêå êàî ó ïîäðàçóìåâàíîì ïðîçîðó êîäíå ñòðàíèöå (ïðåïîðó÷åíî)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Ïîäàöè ñó èçãóášåíè çáîã ãðåøêå ïðè êîäèðàœó: îáå äàòîòåêå" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Íåìà ðàçëèêå" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Ðàçëè÷èòè ðåä" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Çàìåœåí %1 ïî¼àì(à)" -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Íå ìîãó íàžè ïî¼àì \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Ïîëîæ༠òàáëè" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Ðàçëè÷èòå òàáëå" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Äàòîòåêà ðàçëèêà ¼å óñïåøíî ñà÷óâàíà" -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ñòàâêà èëè ôàñöèêëà íè¼å ïðîíàåíà!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ñòàâêà èëè ôàñöèêëà íè¼å ïðîíàåíà!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Äàòîòåêà ðàçëèêà âåž ïîñòî¼è.Äà ëè æåëèòå äà je çàìåíèòå?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 îäàáðàíà äàòîòåêà" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Óîáè÷à¼åí" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Ó îêâèðó" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Îá¼åäèœåí" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Íå ìîãó ñà÷óâàòè ó äàòîòåöè %1" -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Íàâåäåíà èçëàçíà ïóòàœà íè¼å ïîòïóíà ïóòàœà: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Îäðåäèòå èçëàçíó äàòîòåêó" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Íå ìîæå ñòâîðèòè äàòîòåêó ðàçëèêà èç áèíàðíèõ äàòîòåêà" -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Íå ìîæå ïîïðàâèòè äàòîòåêó èç ôàñöèêëè" -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4632,12 +4714,12 @@ msgstr "" "\n" "Ñòâàðàœå äàòîòåêå ðàçëèêà çàõòåâà äà ïîñòî¼å ïðîìåíå êî¼å íèñó ñà÷óâàíå ó äàòîòåêàìà" -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Ôàñöèêëà íå ïîñòî¼è" -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4648,37 +4730,37 @@ msgstr "" "Ñâå ïîòðåáíå êîìïîíåíòå (7-zip è/èëè Merge7z*.dll)çà àðõèâó íå ìîãó áèòè íàåíå.\n" "Ïîãëåäà¼òå óïóòñòâî êàêî îìîãóžèòè ðàä ñà àðõèâàìà" -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Îäàáåðè äàòîòåêó çà èçâîç" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Îäàáåðè äàòîòåêó çà óâîç" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Óâîç ïîñòàâêè ó äàòîòåêó" -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Èçâîç ïîñòàâêè ó äàòîòåêó" -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Íè¼å óñïåî äà óâåçå ïîñòàâêå èç äàòîòåêå" -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Íè¼å óñïåî äà çàïàìòè ïîñòàâêå ó äàòîòåöè" -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4689,247 +4771,247 @@ msgstr "" "\n" "Äà ëè æåëèòå íàñòàâèòè?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Âðñòà" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Ðàñïàêèâàœå" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Äåôèíèñàíî ïîðååœå" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Óðåèâà÷ ðóêîïèñà" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Ïðèëàãîåíî ðàñïàêèâàœå žå ñå êîðèñòèòè çà îáå äàòîòåêå (¼åäíà äàòîòåêà òðåáà íàñòàâàê)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Íåìà äåôèíèñàíîã ïîðååœà (óîáè÷à¼åíî)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Ïðåïîðó÷åíè äîäàöè" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Îñòàëè äîäàöè" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Ëè÷íà èçðàäà: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Ïîäåøàâàœà äîäàòàêà" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH íè¼å íàåí - .sct ñêðèïòå ñó îíåìîãóžåíå" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "<Íèøòà>" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "<Àóòîìàòñêè>" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "È&äè íà ðåä %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Îíåìîãóžè" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Îä ñèñòåìà" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Èç MRU ñïèñêà" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Íè¼å îçíà÷åíî" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Ïðåíîñíè îá¼åêàò" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index 8abf201b9..3fcdbe0b2 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -78,7 +78,7 @@ msgid "Cu&t" msgstr "V&ystrihnú" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Kopírova" @@ -89,7 +89,7 @@ msgid "&Paste" msgstr "V&loži" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&Prejs na..." @@ -100,22 +100,25 @@ msgid "Op&en" msgstr "&Otvori" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "®istrovanou aplikáciou" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "&externým editorom" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "èí&m..." @@ -153,7 +156,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Priblíženie" @@ -165,8 +168,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "Ž&iadny" @@ -183,49 +186,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Súbor" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Nový\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Otvori...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "&Otvori konfliktný súbor..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "O&tvori projekt...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Uloži &projekt..." @@ -237,274 +240,274 @@ msgstr "Posledn #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Prázdne >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "&Koniec" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "Úpr&avy" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Nastavenia" #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Poh¾ad" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "&Panel nástrojov" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Malý" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Ve¾ký" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "&Stavový riadok" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Panel &záložiek" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Nástroje" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filtre..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Vytvori záplatu..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Zásuvné moduly" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "&Manuálne rozbalenie" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatické rozbalenie" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Znovu naèíta zásuvné moduly" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&Okno" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Zatvori" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Zatvori &všetky" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Zmeni &panel\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Dlaždice &vodorovne" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Dlaždice &zvisle" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Kaskáda" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "Po&moc" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "Pomocník &WinMerge\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&O aplikácii..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "¼&avý len na èítanie" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "&Pravý len na èítanie" @@ -515,7 +518,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Vybr&a všetko\tCtrl+A" @@ -537,2441 +540,2501 @@ msgstr "Zobrazi #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Zobrazi položky jedineèné vp&ravo" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Zobrazi pres&koèené položky" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Z&obrazi binárne súbory" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Zobrazi &skryté položky" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "&Zvoli písmo..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Použi základné písm&o" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Štatistika po&rovnania" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "&Obnovi\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "O&bnovi vybrané\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Zlúèi" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Po&rovna\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Nasledujúci rozdiel\tTAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Predchádzajúci rozdiel\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Pr&vý rozdiel\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuány rozdiel\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Posledný &rozdiel\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Skopírova v&pravo\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Skopírova &v¾avo\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Zmaza\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Prispôsobi ståpce..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Vystvori &správu..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Uloži\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Uloži ¾&avý" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Uloži &pravý" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Tlaèi..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Nastavenie s&tránky" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Náh¾ad p&red tlaèou" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Konvertova konce riadkov na" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "&Zluèovací režim\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "&Kódovanie súboru..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Vráti\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Opakova\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "V&ystrihnú\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopírova\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "V&loži\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Oznaèi roz&diel v riadku\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&H¾ada...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Nahradi...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Rozšírené" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopírova s èíslami riadkov\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&Záložky" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Prepnú záložku\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Ïalšia záložka\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Predošlá záložka\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Zmaza všetky záložky" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Prejs na...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "&Priblíži\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "&Oddiali\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normálna ve¾kos\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Zvýrazòovanie syntaxe" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "&Zamknú panely" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "&Zobrazi prázdne miesto" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Zobraz&i rozdiely riadkov" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Zobrazi èísla &riadkov" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Zobrazi &okraje" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "&Zalamova riadky" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "&Vymeni panely" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "&Panel s rozdielom" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "&Lokaèný panel" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopírova vpravo a ís ïalej\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopírova v¾avo a ís ïalej\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Kopírova všetko vpravo" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Kopírova všetko v¾avo" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Predspracovanie" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Skripty" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Porovn&a" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&¼avý s pravým" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "¼a&vý s..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "&Pravý s ¾avým" +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:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "P&avý s..." +msgid "Left to... (%1 of %2)" +msgstr "Z¾ava... (%1 z %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Presunú" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "¼&avý do..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&Pravý do..." +msgid "Right to Left (%1 of %2)" +msgstr "Sprava do¾ava (%1 z %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Sprava... (%1 z %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Presunú" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Zmaza" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "¼&avý" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Pravý" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Oba" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Preme&nova" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Skry položky" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "&Otvori ¾avý" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "O&tvori pravý" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Skopírova názvy &ciest" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&¼avý (%1 z %2)" +msgid "Left (%1 of %2)" +msgstr "¼avý (%1 z %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&pravý (%1 z %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Pravý (%1 z %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Oba (%1 z %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Oba (%1 z %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Skopírova názvy &súborov" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Zipova" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&¼avý... (%1 of %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&pravý... (%1 of %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Oba... (%1 of %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Rozdiely... (%1 of %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Obnovi" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Kopírova plnú cestu" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Kopírova názov &súboru" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Nastavenia preprocesora" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Bez preprocesora" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "&Auto preprocesor" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Ch&oï na rozdiel" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Bez presunutých blokov" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Všetky presunuté bloky" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Presunutý blok pre &aktuálny rozdiel" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "&Netlaèite¾né znaky:" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "&Porovna" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "I&gnorova zmeny" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Ig&norova všetko" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "&Zoh¾adòova ve¾kos písmen" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Plný obsah" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Rýchly obsah" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Dátum zmeny" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Dátum zmeny a ve¾kos" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Ve¾kos" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "O aplikácii" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Súkromné zostavenie)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Navštívte www stránku programu WinMerge!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Prispievatelia" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Výber súborov a adresárov..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Prechádza..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Preh¾adáva" -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "&Vybra..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Rozba¾ovací program:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "&Vybra..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Zahrnú podadresáre" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Stav:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Zruši" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Pomoc" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Súbory alebo adresáre pre porovnanie" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Databáza:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Používate¾:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Heslo:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Odkaz na Cie¾ový VSS projekt" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Použi na všetky položky" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Uloži ako..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Systém pre spávu verzií" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "Systém pre správu &verzií:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Cesta ku cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Hlavné nastavenia" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automatický &skok na prvý rozdiel" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Zat&vára okná klávesom ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Automaticky overova cestu v dialógu Otvori" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Um&ožni beh iba jednej inštancie" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "&Pýta sa pred zatvorením viacerých okien" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "&Zachováva èas súboru pri porovnaní" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&utomatické dopåòanie v dialógu Otvori:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge umožòuje zamedzi zobrazovaniu bežných správ. Stlaèením tlaèidla Reset sa znova správy zobrazia." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Reset" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "H¾ada" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "&H¾ada:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Iba celé &slová" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Rozlišuj &ve¾ké/malé" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "&Regulárny výraz" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "&Nezalamova koniec súboru" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Nájdi ïalší" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Nahradi" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Nahradi:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "&Nezalamova koniec súboru" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Nahradi vo" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "Výbere" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "Celom súbore" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "Nahraïi" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Nahraïi všetko" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Komentáre" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Check in po checkout-e" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Riadkové filtre" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Zapnú riadkové filtre" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulárne výrazy (jeden na riadok):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Nový" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Upravi" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Odstráni" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Farby" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Rozdiel:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Rozdiel vo výbere:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Pozadie" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Zmazané" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Text" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Ignorovaný rozdiel:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Presunutý:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Výber presunutý:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Rozdiel v slove:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Rozdiel vo vybranom slove:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Predvolené" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Systém" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Posiela zmazané súbory do koša" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&Externý editor:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "Adresár s &filtrami:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Generátor záplat" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Súbor&1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Súbor&2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "&Vymeni navzájom" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "&Rozšíri existujúci súbor" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Výsledok:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "&Prechádza..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Formát" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "Š&týl:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Kontext:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&ova prázdne riadky" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Zahrnú príkazový ria&dok" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Otvori v e&xternom editore" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Zobrazova ståpce" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Presunú &hore" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Presunú &dolu" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Vyber rozba¾ovací program" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Rozba¾ovací program:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Zobrazi všetky rozba¾ovacie programy, nekontrolova príponu" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Zoznam prípon:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Popis:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Zastavi" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Porovnávam položky..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Porovnaných položiek:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Položiek celkom:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Prejs na" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "Ch&oï na:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Súbor" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Prejs na..." -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "Riad&ok" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Rozdiel" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Prejs na" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Porovnávanie" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Netlaèite¾né znaky" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "Porovnáva &netlaèite¾né znaky" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "Ignorova &zmeny v prázdnom mieste" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Ignorova &celé prázdne miesto" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorova prázdne riad&ky" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Ignorova m&alé/VE¼KÉ" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Zapnú &detekciu pohyblivého bloku" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "&Podobné riadky ako zhodné" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Filtrova komentáre" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "Zvýrazòovanie syntaxe" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "Automatické p&reskenovanie" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&Zachováva pôvodné zakonèenie riadkov" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabulátory" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Nastavenie tabulátorov:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "Vklada tabulátory" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "Vklada medzery" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Farebné odlíšenie riadkových rozdielov" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Zobrazova riadkové rozdiely" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "Úroveò &znaku" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "Úroveò &slova:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Filtre súborov" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Testova" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Inštalova..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Nový..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Upravova..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Zmaza..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Uloži zmenené súbory?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Súbor na ¾avej strane" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Uloži zmeny" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Zahodi zmeny" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Súbor na pravej strane" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "U&loži zmeny" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Z&ahodi zmeny" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Kódová stránka" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Predvolená kódová stránka" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Zvo¾te predvolenú kódovú stránku, ktorá sa použije pri naèítaní ne-Unicode súborov:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Systémová kódová stránka" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Pod¾a používate¾ského rozhrania WinMerge" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Nastavenia" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Kategórie" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importova..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Exportova..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Dialóg" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "K¾úèové slová:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Názvy funkcií:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Komentáre:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Èísla:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operátory:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Reazce:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Preprocesor:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Používate¾ 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Používate¾ 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Hrubo" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Správa o porovnaní adresárov" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "&Súbor správy:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Preh¾adáva..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Štýl:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopírova do schránky" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Zdie¾aný alebo súkromný filter" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Aký typ filtra chcete vytvori?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Zdie¾aný filter (pre všetkých používate¾ov tohoto poèítaèa)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Súkromný filter (len pre aktuálneho používate¾a)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Podpora archívov" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Zapnú podporu archívov" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detekova typ archívu z hlavièky súboru" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Štatistika porovnania" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Adresáre:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Súbory:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Odlišné" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Text:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binárne:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Jedineèné" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "V¾avo:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Vpravo:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Identické" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Celkom:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Zatvori" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Ovplyvòuje" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Ovplyvòuje)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Zvo¾te kódovú stránku pre" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&Naèítanie súboru:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "&Ukladanie súboru:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&Použi pre obe rovnakú kódovú stránku" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Použi" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Zruši" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Test filtra" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Testujem filter ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Zadajte testovací reazec:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Názov adresára" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Výsledok:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Testova" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Zatvori" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&Používa štandardné farby textu" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Vlastné farby textu" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Netlaèite¾né znaky:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Bežný text:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Výber:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Cesty" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&¼avý:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "&Len na èítanie" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "P&ravý:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Len na èít&anie" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "Pr&ípony:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Otvori..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Uloži..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Záložné súbory" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Vytvára záložné súbory v:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Porovnávanie &adresárov" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Porovnávanie &súborov" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Vytvára záložné súbory do:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "Adresár &originálneho súboru" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&Globálny adresár pre zálohy:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Názov záložného súboru:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&Prida rozšírenie .bak" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "P&rida èasovú známku" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Potvrdi kopírovanie" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Ste si istý, že chcete skopírova XXX položiek?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Z¾ava" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Doprava" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Áno" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Nie" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Zap&nú rozšírenú ponuku" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Adresár" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "&Stop po prvom rozdiele" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orova èasové rozdiely menšie ako 3 sekundy" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binárny" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "041b04e2" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x41b, 1250" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "ROZ" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAPS" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "CEZ" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "ZÁZN" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Neznáma chyba pri pokuse otvori súbor projektu" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Neznáma chyba pri pokuse uloži súbor projektu" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Súbor projektu" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Súbor projektu úspešne naèítaný." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Súbor projektu úspešne uložený." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2983,7 +3046,7 @@ msgid "" "WinMerge File Compare" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -2995,148 +3058,148 @@ msgid "" "WinMerge Folder Compare" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Zruši" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Znova" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Ignorova" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Ignorova &všetky" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "Á&no" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Áno &pre všetky" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Nie" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Nie pre &všetky" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "Po&kraèova" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "Pre&skoèi" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Preskoèi vš&etky" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Už túto správu nezobrazova." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Už sa túto otázku nepýta." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Kontrola verzií" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Rozdiely" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Z¾ava:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Do¾ava:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Sprava:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Do¾ava:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Verzia %1 - Slovenský preklad" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Vlastnosti (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Znova sa zobrazujú všetky okná so správami." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3147,84 +3210,84 @@ msgstr "" "\n" "Použite hodnoty 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Otvori" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programy|*.exe;*.bat;*.cmd|Všetky súbory (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Všetky súbory (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge projekty (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Súbory s nastavením (*.ini)|*.ini|Všetky súbory (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, 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šetky súbory (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML súbory (*.htm,*.html)|*.htm;*.html|Všetky súbory (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML súbory (*.xml)|*.xml|Všetky súbory (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Názov" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Umiestnenie" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filtre" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Popis" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Zvo¾te názov súboru pre nový filter" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtre súborov (*.flt)|*.flt|Všetky súbory (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3237,7 +3300,7 @@ msgstr "" "Prosím, skopírujte súbor %1 do adresára WinMerge/Filters :\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3250,7 +3313,7 @@ msgstr "" "\n" "Prosím, uistite sa, že adresár existuje a dá sa doòho zapisova." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3261,7 +3324,7 @@ msgstr "" "\n" "Prosím, vyberte adresár pre filtre v dialógu Nastavienia/Systém." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3274,12 +3337,12 @@ msgstr "" "\n" "Možno je filter len na èítanie?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Nájs súbor filtra, ktorý sa nainštaluje" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3290,188 +3353,188 @@ msgstr "" "\n" "Nepodarilo sa skopírova nový súbor do adresára s filtrami." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filter už existuje. Prepísa existujúci filter?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Regulárny výraz" -#: Merge.rc:2151 +#: Merge.rc:2172 #, 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:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Výsledok porovnania adresárov" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Porovnávanie súborov" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Nepomenovaný ¾avý" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Nepomenovaný pravý" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Ich súbor" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Môj súbor" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Riadok: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Zlúèi" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Rozdiel %1 z %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "nájdených %1 rozdielov" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "nájdený jeden rozdiel" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "na èítanie" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Položka %1 of %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Položky: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, 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:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Výber adresára" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Vyberte dva adresáre na porovnanie." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "¼avá cesta je neplatná!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Pravá cesta je neplatná!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Obe cesty sú neplatné!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, 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:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Nemôžem porovna súbor a adresár!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Súbor nenájdený: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Súbor nerozbalený: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3484,12 +3547,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Nepodarilo sa spracova súbor konfliktov." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3500,27 +3563,27 @@ msgstr "" "%1\n" "nie je súbor konfliktov." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Uloži ako" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Uloži zmeny do %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 súbor len na èítanie? (Stlaète Nie ak ho chcete zapísa po novým názvom.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Chyba pri zálohovaní súboru" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3533,7 +3596,7 @@ msgstr "" "\n" "Pokraèova napriek tomu?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3550,7 +3613,7 @@ msgstr "" "\t-použi iný názov súbory (Stlaète Ok)\n" "\t-zruši prebiehajúcu operáciu (Stlaète Zruši)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3565,7 +3628,7 @@ msgstr "" "\n" "Želáte si uloži rozbalenú verziu do iného súboru?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3580,7 +3643,7 @@ msgstr "" "\n" "Želáte si uloži rozbalenú verziu do iného súboru?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3595,7 +3658,7 @@ msgstr "" "\n" "Prepísa zmenený súbor?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3604,32 +3667,32 @@ msgstr "" "%1\n" "je oznaèený len na èítanie. Želáte si prepísa položku len na èítanie?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, 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:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Uloži ¾avý súbor ako" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Uloži pravý súbor ako" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue." msgstr "" -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3640,42 +3703,42 @@ msgstr "" "\n" "Obnovte dokumenty, než budete pokraèova." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Musíte nastavi cestu k projektu SourceSafe (napr.: $/MojProjekt)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Checkout súborov z VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, 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 súbor. Nemožno pokraèova..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Chyba pri spúšaní príkazu zo Systému Verzií (CVS a pod)." -#: Merge.rc:2255 +#: Merge.rc:2276 #, 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?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Nebola nájdená databáza VSS!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Chyba VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3686,7 +3749,7 @@ msgstr "" " Prosím, skontrolujte konfiguráciu zvoleného poh¾adu.\n" " Vráti operáciu checkout?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3695,127 +3758,146 @@ msgstr "" "Systém pre správu verzií vrátil chybu pri pokuse vráti (checkout) súbor.\n" " Prosím, skontrolujte konfiguráciu zvoleného poh¾adu. " -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Žiadny" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (menšie ako 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 a vyššie)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Preruši na netlaèite¾nom znaku" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Preruši na netlaèite¾nom znaku alebo vetnej diakritike" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Kopíruj do ¾avej strany %1 z %2 vybraných položiek" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Kopíruj do pravej strany %1 z %2 vybraných položiek" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Sprava do¾ava (%1 z %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Z¾ava doprava (%1 z %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Kopíruj do pravej strany %1 z %2 vybraných položiek" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Z¾ava... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Sprava... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Z¾ava... (%1 z %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Sprava... (%1 z %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "¼avý (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Zmaž %1 z %2 vybraných položiek z pravej strany" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Zmaza z oboch strán %1 z %2 vybraných položiek" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "¼avý (%1 z %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Pravý (%1 z %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Oba (%1 z %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "¼avá strana - vyberte cie¾ový adresár:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Pravá strana - vyberte cie¾ový adresár:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ovplyvnených súborov)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 ovplyvnených súborov z %2)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3826,17 +3908,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Naozaj chcete skopírova:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Naozaj chcete skopírova %d položiek:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3855,502 +3937,502 @@ msgstr "" "\n" "Prosím, obnovte porovnanie." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nepodarilo sa spusti externý editor: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Neznámy formát archívu" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Názov súboru" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Výsledok porovnania" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Dátum v¾avo" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Dátum vpravo" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Prípona" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Ve¾kos v¾avo" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Ve¾kos vpravo" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Ve¾kos vpravo (krátka)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Ve¾kos v¾avo (krátka)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Èas vzniku v¾avo" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Èas vzniku vpravo" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Novší súbor" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Verzia súboru v¾avo" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Verzia súboru vpravo" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Krátky výsledok" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Atribúty v¾avo" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Atribúty vpravo" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Konce riadkov v¾avo" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Konce riadkov vpravo" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Kódovanie v¾avo" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Kódovanie vpravo" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Ignorovaný rozdiel" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Nemožno porovna súbory" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Položka zrušená" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Súbor preskoèený" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Adresár preskoèený" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Iba v¾avo: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Iba vpravo: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Binárne súbory sú identické" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Binárne súbory sú rozdielne" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Súbory sú rozdielne" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Iba v¾avo" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Iba vpravo" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Chyba" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Uplynulý èas: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "jedna vybraná položka" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 vybraných položiek" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Názov súboru alebo adresára." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Názov podadresára, keï obsahuje aj podadresáre." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Výsledok porovnania, dlhý tvar." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Dátum poslednej zmeny na ¾avej strane." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Dátum poslednej zmeny na pravej strane." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Prípona súboru." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Ve¾kos súboru na ¾avej strane v bajtoch." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Ve¾kos súboru na pravej strane v bajtoch." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Ve¾kos súboru na ¾avej strane skrátená." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Ve¾kos súboru na pravej strane skrátená." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Dátum vytvorenia na ¾avej strane." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Dátum vytvorenia na pravej strane." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "ktorý zo súborov má novší èas poslednej zmeny." -#: Merge.rc:2444 +#: Merge.rc:2488 #, 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:2445 +#: Merge.rc:2489 #, 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:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Krátky výsledok porovnania." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Atribúty na ¾avej strane." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Atribúty na pravej strane." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Typ zakonèenia riadka súboru na ¾avej strane" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Typ zakonèenia riadka súboru na pravej strane" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Kódovanie na ¾avej strane." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Kódovanie na pravej strane." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, 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." -#: Merge.rc:2463 +#: Merge.rc:2507 #, 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:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Zobrazí hviezdièku (*) ak je súbor binárny." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Porovna %1 s %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Zoznam oddelený èiarkami" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Zoznam oddelený tabulátormi" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Jednoduché HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Jednoduché XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Súbor so správou už existuje. Chcete prepísa existujúci súbor?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4359,32 +4441,32 @@ msgstr "" "Chyba pri vytváraní správy:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Správa bola úspešne vytvorená." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Rovnaký súbor je otvorený v boch paneloch." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Vybrané súbory sú rovnaké." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Poèas porovnávania sa vyskytla chyba." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Doèasné súobry nebolo možné vytvori. Skontrolujte nastavenie odkladacieho adresára." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4399,17 +4481,17 @@ msgstr "" "\n" "Pozn.: Ak chcete, aby som vždy považoval všetky zakonèenia riadkov za ekvivalentné, nastavte vo¾bu 'Ignorova rozdiely zakonèenia riadkov..' v záložke Porovnávanie dialógu Nastavenia (nájdete v Úpravy/Nastavenia)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Zvolený adresár je neplatný." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Nemôžem otvori binárny súbor v editore." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4424,7 +4506,7 @@ msgstr "" "%1\n" "na druhej strane a otvori tieto adresáre?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4435,152 +4517,152 @@ msgstr "" "Zobrazenie každého súboru v jeho kódovej stránke lepšie zobrazuje, ale zluèovanie/kopírovanie bude nebezpeèné.\n" "Chcete precova s oboma stránkami akoby boli v predvolenej kódovej stránke Windows (odporúèa sa)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, 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:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Bez rozdielu" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Rozdiely v riadkoch" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Nahradených %1 reazcov." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nemôžem nájs reazec \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Lokaèný panel" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Panel rozdielu" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Súbor so záplatou bol úspešne zapísaný." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. položka nenájdená alebo je to adresár!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. položka nenájdená alebo je to adresár!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Súbor so záplatou už existuje. Chcete ho prepísa?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 súbor zvolený]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normálny" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Kontextový" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Zjednotený" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Nedalo sa zapisova do súboru %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, 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:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "uveïte výstupný súbor" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nemohol som vytvori súbor so záplatou z binárnych súborov." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nemohol som vytvori súbor so záplatou z adresárov." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4591,12 +4673,12 @@ msgstr "" "\n" "vytvorenie záplaty vyžaduje, aby v súboroch neboli neuložené zmeny." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Adresár neexistuje." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4607,37 +4689,37 @@ msgstr "" "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ú v Príruèke." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Vyberte súbor pre export" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Vyberte súbor pre import" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Nastavenia importované zo súboru." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Options exportované do súboru." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Nepodarilo sa importova nastavenia zo súboru." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Nepodarilo sa zapísa nastavenia do súboru." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4648,247 +4730,247 @@ msgstr "" "\n" "Chcete pokraèova?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Zmiešaný" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Rozba¾ovací program sa použije na oba súbory (pri jednom súbore staèí prípona)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Bez predspracovania (bežné)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Odporúèané zásuvné moduly" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Iné zásuvné moduly" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Súkromné zostavenie: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Nastavenia zásuvných modulov" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH nenájdené - .sct skripty vypnuté" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "<Žiadny>" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "Ch&oï na riadok %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Vypnuté" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Zo súborového systému" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Zo zoznamu nedávno použitých" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Dávkový" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Zdroje" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index 8988fa583..d88c4a776 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -79,7 +79,7 @@ msgid "Cu&t" msgstr "Izrež&i" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Kopiraj" @@ -90,7 +90,7 @@ msgid "&Paste" msgstr "&Prilepi" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "Pojdi &na ..." @@ -101,22 +101,25 @@ msgid "Op&en" msgstr "&Odpri" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "Z re&gistrirano aplikacijo" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "Z &zunanjim urejevalnikom" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&z ..." @@ -154,7 +157,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "Po&veèaj" @@ -166,8 +169,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Brez" @@ -184,49 +187,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Datoteka" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Nova\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Odpri ... \tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Od&pri konfliktno datoteko ..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Odpri pro&jekt ... \tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "S&hrani projekt ..." @@ -238,274 +241,274 @@ msgstr "Nedavni projekti" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Prazno >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "I&zhod" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Uredi" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Možnosti ..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Pogled" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "&Orodna vrstica" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Male ikone" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Velike ikone" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "&Statusna vrstica" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Ta&bulatorska vrstica" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Orodja" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filtri ..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Generiraj datoteko s popravki ..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Razširitve" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "Roèe&n predpregled razlik" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "Sa&modejen predpregled razlik" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "&Roèno pretvarjanje" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "&Samodejno pretvarjanje" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Ponovno naloži razširitve" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&Okna" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "Z&apri" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Zapri &vse" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Preklopi &okvirja\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Vodoravna &okna" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "&Navpièna okna" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Kaskadna okna" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Pomoè" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge pomoè\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "&Nastavitve" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU Javna licenca" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&O programu WinMerge ..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "L&evo samo za branje" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "De&sno samo za branje" @@ -516,7 +519,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Oznaèi &vse\tCtrl+A" @@ -538,1753 +541,1813 @@ msgstr "Prika #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Prikaži d&esne unikatne predmete" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Prikaži &preskoèene predmete" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Prikaži &binarne datoteke" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Prikaži skri&te predmete" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "&Drevesni naèin" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "Ra&zširi vse podmape" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "S&krèi vse podmape" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Izberite &pisavo ..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Uporabite privzeto pi&savo" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "&Statistika primerjave" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "Osv&eži\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Osveži izbrano\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "Z&druži" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Pr&imerjaj\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Naslednja razlika\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Predhodna razlika\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Prva razlika\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Trenutna razlika\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Zadnja razlika\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopiraj &desno\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopiraj &levo\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Izbriši\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Prilagodi stolpce ..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Izdelaj &poroèilo ..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Shrani\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Shrani &levo datoteko" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Shrani &desno" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Natisni ..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Nastavitev &strani" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "&Predogled tiskanja" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Pretvori konce vrstice v" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "Združevalni naèin\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "De&kodiranje datoteke ..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "&Binarno" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Razveljavi\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Uveljavi\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Iz&reži\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopiraj\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Prilepi\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Izberi &razlièni vrstici\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Najdi ... \tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Zamen&jaj ... \tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Napredno" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopiraj z številkami vrstic\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&Zaznamki" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Zamenjaj zaznamke\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Naslednji zaznamek\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Prejšnji zaznamek\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Zbriši vse zaznamke" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Pojdi &na ... \tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Po&veèaj\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Poman&jšaj\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Izvorna velikost\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Oznaèevanje sintakse" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "Za&kleni okvirja" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "&Prikaži prazne znake" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Prikaži razl&ike vrstic" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Prikaži številke &vrstic" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Prikaži &robove" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "Pr&elomi vrstice" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Zam&enjaj okvirja" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Okvir &razlik" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "&Položajni okvir" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopiraj de&sno in nadaljuj\tAlt+Ctrl+desno" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopiraj le&vo in nadaljuj\tAlt+Ctrl+levo" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Kopiraj vse v des&no" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Kopiraj vse v &lev&o" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Predpregled razlik" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Skripte" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Prime&rjaj" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "Pri&merjaj kot" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&Iz leve na desno" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "Z l&evo na ..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "&Od Desne na levo" +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:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "Z d&esni na ..." +msgid "Left to... (%1 of %2)" +msgstr "Leva do ... (%1 od%2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Pre&makni" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&Z levi na ..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&Z desne na ..." +msgid "Right to Left (%1 of %2)" +msgstr "Z desne proti levi (%1 od %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Desna do ... (%1 od%2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Pre&makni" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Izbriši" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&levi okvir" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&desni okvir" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Oboje" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "P&reimenuj" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Skrij predmete" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "&Odpri levo" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Odpri desno" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Kopiraj &imena poti" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&Levo (%1 od %2)" +msgid "Left (%1 of %2)" +msgstr "Leva (%1 of %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&Desno (%1 od %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Desna (%1 of %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Obe (%1 of %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Oba (%1 od %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Kopiraj &imena datotek" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&Levo ... (%1 od %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&Desno ... (%1 od %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Oba ... (%1 od %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Razlike ... (%1 od %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Osveži" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Levi razširitveni meni" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Desni razširitveni meni" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Kopiraj polno pot" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Kopiraj &ime datoteke" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Nastavitve predpregleda razlik" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Brez predpregleda razlik" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Samodejen predpregled razlik" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Pojdi &na razliko" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Brez premaknjenih blokov" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Vsi premaknjeni bloki" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Premakni blok &za izbrano razliko" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "&Prazni znaki" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "&Primerjaj" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "Zanemari &spremembe" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Ignoriraj &vse" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "&Razlikuj m/v èrke" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "&Prezri razliènost tipa znakov za zakljuèke vrstic (EOL)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "&Metoda za primerjanje datotek" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Popolna vsebina" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Hitra vsebina" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Spremenjen datum" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Spremenjen datum in velikost" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Velikost" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "O orodju WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Zasebna gradnja)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Obišèi domaèo stran programa WinMerge!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "V redu" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Donatorji" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Izberite datoteke ali mape" -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Brskaj ..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "B&rskaj ..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Br&skaj" -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Izberi ..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Pretvornik:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "&Izberi ..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Vkljuèi podmape" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Preklièi" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Pomoè" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Datoteke ali mape za primerjavo" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Podatkovna baza:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Uporabnik:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Geslo:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Poveži z ciljem VSS projekta" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Uporabi na vseh predmetih" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Check Out" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Shrani kot ..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Versioning System" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Versioning System:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Pot do cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Splošno" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Samodejno &pojdi na prvo razliko" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Zapri okna s tipko &ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Samodejno preverjaj pot v odprtem dialogu" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Dovoli &samo en trenutno aktiven program za izvajanje" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "&Vprašaj pred zapiranjem veèkratnih oken" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "&Zadrži èas datoteke v primerjavi datoteke" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Prikaži pogovorno okno \"Izberite datoteke ali mape\" ob zagonu" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Samodejno &dopolnjevanje vrstice v Odprtem dialogu" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, 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:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Ponastavi" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Najdi" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "&Kaj naj išèem:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Ujemanje samo &celih besed" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Ujemanje z velikostjo èrk" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "&Regularni izraz" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "&Po koncu datoteke ne nadaljuj na zaèetku" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Najdi naslednje" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&V redu" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Zamenjaj" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Zamenjaj z:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "&Po koncu datoteke ne nadaljuj na zaèetku" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Zamenjaj v" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&Izbor" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "&Cela datoteka" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Zamenjaj" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Zamenjaj &vse" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "CheckOut" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Komentarji" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn po CheckOut-u" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Vrstièni filtri" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Omogoèi vrstiène filtre" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regularni izrazi (eden na vrstico): " -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Nova" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Uredi" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Odstrani" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Barve" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Razlike" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Izbrane razlike" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Ozadje" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Izbrisano" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Besedilo" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Zanemarjene razlike:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Premaknjeno:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Izbrano premaknjeno:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Besedne razlike:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Izbrane razlike besed:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Privzeto" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Sistem" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Premakni izbrisane datoteke v koš" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "&Zunanji urejevalnik:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Mapa filtrov:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Mapa za zaèasne datoteke" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "s&istemska mapa" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "mapa po meri" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Generator datotek s popravki ..." -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Datoteka&1" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Datoteka&2" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "&Zamenjaj" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "&Dodaj k obstojeèi datoteki" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Rezultat:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "&Brskaj ..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "St&il" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Vsebina" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "&Ignoriraj prazne vrstice" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "&Vkljuèi glavno vrstico" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Odpri v zunanjem urejevalniku" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Prikaži stolpce" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Premakni &gor" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Premakni &navzdol" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Izberite Pretvornik" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Pretvornik za datoteke:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Prikaži vse pretvornike, ne glede na konènico" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Popis konènic:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Opis:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Ustavi" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Primerjanje predmetov ..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Primerjanih predmetov:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Predmeti skupaj:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Pojdi na" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "Pojdi &na:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Datoteka" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Pojdi na" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "&Vrstica" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Razlika" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "Pojdi &na" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Primerjaj" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Prazen znak" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Primerjaj" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "&Ignoriraj spremembe" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Ig&noriraj vse" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ignoriraj prazne &vrstice" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Zanemari &velikost znakov" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Omogoèi &razlikovanje premaknjenih blokov" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "&Ujemanje enakih vrstic" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Komentarji filtrov" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Urejevalnik" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&Poudari skladnjo" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "&Samodejno ponovno iskanje" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "Obdrži izvorni tip znakov za konec vrstice (EOL)" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabulatorji" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&število presledkov, ki jih tabulator nadomesti" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "&Vstavi tabulatorje" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "&Vstavi presledke" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Obarvaj razlike v vrstici" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Poglej razlike vrstic na" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "&znakovnem nivoju" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "&besednem nivoju" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "&Znak za konec besede" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Datoteèni filtri" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Test" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Namesti ..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Nova ..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Uredi ..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Izbriši ..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Shrani spremenjene datoteke?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Leva stran datoteke" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Shrani spremembe" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Zavrži spremembe" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Desna stran datoteke" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "Shrani spremembe" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Zavrži spremembe" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "&Zavrži vse" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Kodna tabela" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Privzeta kodna tabela" -#: Merge.rc:1472 +#: Merge.rc:1493 #, 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:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2293,692 +2356,692 @@ msgstr "" "Zaznaj kodno tabelo za datoteke s konènico: .html, .rc, .xml \n" "(potreben je ponovni zagon seje)" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Sistemska kodna tabela" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Glede na WinMerge uporabniški vmesnik" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Kodna tabela po meri:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Možnosti" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr "Kategorije" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Uvozi ..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Izvozi ..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Kljuène Besede:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Imena funkcij:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Komentarji:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Številke:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operatorji:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Nizi:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Preprocesirano:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Uporabnik 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Uporabnik 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Krepko" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Poroèilo primerjanja datotek" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Poroèilna &datoteka:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Brskaj ..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopiraj v odložišèe" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Skupni ali zasebni filter" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Kateri tip filtra želite ustvariti" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Deljen filter (za vse uporabnike na tem raèunalniku)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Zasebni filter (samo za doloèene uporabnike)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Podpora arhivskim datotekam" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "Omogoèi delo z &arhivskimi datotekami" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Razberi tip arhivske datoteke iz podpisa datoteke" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Preimerjalna statistika" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Mape:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Datoteke:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Razlika" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Besedilo:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binarno:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Unikat" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Levo:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Desno:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Enako" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Celotno:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Zapri" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Spremeni" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Spremeni)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Izberi kodno tabelo datoteke za" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&nalaganje datoteke:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "&shranjevanje datoteke:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&Uporabi enako kodno tabelo za oboje" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Uporabi" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Preklièi" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Testni filter" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Testiranje filtra ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Vnos besedila za testiranje:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Ime mape" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Rezultat:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Test" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Zapri" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&Uporabi izbrane barve besedila" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Izbrane barve besedila" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Prazen znak:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Navadno besedilo:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Izbira:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Poti" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Levi okvir:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Samo za branje" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Desni okvir:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Samo za branje" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filter:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Odpri.." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Shrani" -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Arhivske datoteke" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Ustvari arhivske datoteke v:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "primerjava &map" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "primerjavi &datotek" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Ustvari arhivske datoteke v:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "&mapi izvorne datoteke" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&globalni arhivski mapi:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Naziv arhivske datoteke" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&Dodaj .bak konènico" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "&Dodaj datum in èas " -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Potrdi kopiranje" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Ali ste preprièani, da želite kopirati XXX predmete?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Z leve" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Na desno" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Da" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Ne" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Razširitve" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "&Omogoèi razširitve" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Integracija v lupino" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Explorer" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Omogoèi &napredni meni" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "&Dodaj k razširjenemu meniju" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Mapa" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "&Ustavi po prvi razliki" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "&Zanemari razlike manjše od 3 sekund" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "&Vkljuèi podmape ki obstajajo samo na eni strani" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "Omejitev za &hitro primerjavo (MB):" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binarno" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "040904e4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x407, 1250" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Neznana napaka pri odpiranju datoteke projekta" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Neznana napaka pri shranjevanju datoteke projekta" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Datoteka projekta" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Datoteka projekta uspešno naložena." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Datoteka projekta uspešno shranjena." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2997,7 +3060,7 @@ msgstr "" "WinMerge.Primerjava datotek\n" "WinMerge primerjava datotek" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3016,7 +3079,7 @@ msgstr "" "WinMerge.Primerjava map\n" "WinMerge primerjava map" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3025,143 +3088,143 @@ msgstr "" "Razvijalci:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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šli ste za njeno razširjanje pod doloèenimi pogoji, veè v GNU licenci v meniju Pomoè." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Prekini" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Poskusi ponovno" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Prezri" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Prezri &vse" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Da" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Da za &vse" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Ne" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Ne za &vse" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Nadaljuj" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Preskoèi" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Preskoèi &vse" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Tega sporoèila ne kaži veè." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Tega vprašanja ne postavi veè." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "Sintaksa" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Nadzor razlièic" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Razlike" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Na:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Iz leve:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Na levo:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Iz desne:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Na desno:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Razlièica %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Možnosti (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Vsa sporoèilna okna bodo sedaj ponovno prikazana " -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3173,84 +3236,84 @@ msgstr "" "\n" "Prosimo, uporabite vrednosti 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Odpri" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Izvedljive datoteke|*.exe;*.bat;*.cmd|Vse datoteke (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Vse datoteke (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Datoteke WinMerge projektov (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Datoteke nastavitev (*.ini)|*.ini|Vse datoteke (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, 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:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|Vse datoteke (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML datoteke (*.xml)|*.xml|Vse datoteke (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Ime" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Lokacija" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filtri" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Opis" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Izberite ime datoteke za nov filter" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Datoteke filtrov (*.flt)|*.flt|Vse datoteke (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3263,7 +3326,7 @@ msgstr "" "Prosimo, kopirajte datoteko %1 v \"WinMerge/Filters\" mapo:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3276,7 +3339,7 @@ msgstr "" "\n" "Prosim preverite, èe mapa obstaja in je zapisljiva." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3287,7 +3350,7 @@ msgstr "" "\n" "Prosim izberite filter mape v Možnosti/Sistem." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3300,12 +3363,12 @@ msgstr "" "\n" "Morda je datoteka zašèitena - samo za branje." -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Poišèi filter datoteko za namestitev" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3316,17 +3379,17 @@ msgstr "" "\n" "Ni mogoèe kopirati nove filter datoteke v filter mapo." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filter datoteka že obstaja. Prepišem obstojeèi filter." -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Regularni izraz" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3337,173 +3400,173 @@ msgstr "" "\n" "Èe jih ne želite osvežiti sedaj, lahko izberete Ne in osvežite primerjave kasneje." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&Pot do SS.EXE:" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Rezultati primerjanja map" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Primerjanje map" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Levi neimenovan" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Desni neimenovan" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Njihova datoteka" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Vaša datoteka" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Vrstica: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Združi" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Razlika %1 od %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 najdenih razlik" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 najdena razlika" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "SZB" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Predmet %1 od %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Predmetov: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Izberite dve obstojeèi mapi ali datoteki za primerjavo" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Izbira map" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Izberite dve mapi ali dve datoteki za primerjavo." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Leva pot je neveljavna!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Desna pot je neveljavna!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Obe poti sta neveljavni!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Izberite dve datoteki, da boste omogoèili izbiro pretvornika." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Ne morem primerjati datoteke in mape!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Datoteka ni najdena: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Datoteka ni pretvorjena: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3516,12 +3579,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Ne morem razèleniti konfliktne datoteke." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3532,27 +3595,27 @@ msgstr "" "%1\n" "ni konfliktna datoteka." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Shrani kot" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Shrani spremembe v %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 želite prepisati? ( Ne, za shranjevanje pod novim imenom)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Napaka pri shranjevanju arhiva" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3565,7 +3628,7 @@ msgstr "" "\n" "Vseeno nadaljujem?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3582,7 +3645,7 @@ msgstr "" "\t- uporabiti drugaèno ime datoteke (pritisnite V redu)\n" "\t- preklicati trenutno operacijo (pritisnite Preklièi)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3597,7 +3660,7 @@ msgstr "" "\n" "Ali želite shraniti nezapakirano razlièico v drugo datoteko?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3612,7 +3675,7 @@ msgstr "" "\n" "Ali želite shraniti nezapakirano razlièico v drugo datoteko?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3627,7 +3690,7 @@ msgstr "" "\n" "Prepiši spremenjeno datoteko?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3636,7 +3699,7 @@ msgstr "" "%1\n" "je oznaèena samo za branje. Ali jo kljub temu želite prepisati?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3651,22 +3714,22 @@ msgstr "" "\n" "Ali želite posodobljeno ponovno naložiti?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Shrani levo datoteko kot" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Shrani desno datoteko kot" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3677,7 +3740,7 @@ msgstr "" "%1\n" "ne najdem veè. Prosim shranite kopijo datoteke za nadaljevanje." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3688,42 +3751,42 @@ msgstr "" "\n" "Prosim, osvežite dokumente pred nadaljujete." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Navesti morate pot SourceSafe projekta èe želite nadaljevati (npr: $/MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "CheckOut datotek iz VSS ..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, 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šal dostopati do datoteke. Ni mogoèe nadaljevati ..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Napaka pri izvrševanju Versioning System ukaza." -#: Merge.rc:2255 +#: Merge.rc:2276 #, 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:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Ne morem najti VSS podatkovne baze!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Napaka od VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3734,7 +3797,7 @@ msgstr "" "Prosim preverite nastavitvene specifikacije uporabljenega pogleda.\n" "Zavrzi pregledno operacijo?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3743,127 +3806,146 @@ msgstr "" "Sistem za verzije vraèa napako med preverjanjem datoteke.\n" "Prosim preverite nastavitvene specifikacije uporabljenega pogleda" -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Brez" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (manjši od 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 in višji)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Prelom na praznem znaku" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Prelom na praznem znaku ali loèilu" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Z desne proti levi (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Z leve proti desni (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Z desne proti levi (%1 od %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Z leve proti desni (%1 od %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Z leve proti desni (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Leva do ... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Desna do ... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Leva do ... (%1 od%2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Desna do ... (%1 od%2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Leva (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Desna (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Obe (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Leva (%1 of %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Desna (%1 of %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Obe (%1 of %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Leva stran - izberite ciljno mapo:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Desna stran - izberite ciljno mapo:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 vpletenih datotek)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 of %2 vpletenih datotek)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3874,17 +3956,17 @@ msgstr "" "\n" "%1?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Ali ste preprièani da želite kopirati:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Ali ste preprièani, da želite kopirati %d predmetov:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3903,502 +3985,502 @@ msgstr "" "\n" "Prosim, osvežite primerjavo." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Ali ste preprièani, da želite premakniti:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Ali ste preprièani, da želite premakniti: %d predmetov" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Potrdi premik" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Ni bilo mogoèe zagnati zunanjega urejevalnika: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Nepoznan format arhiva" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Ime datoteke" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Rezultat primerjave" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Levi datum" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Desni datum" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Konènica" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Leva velikost" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Desna velikost" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Desna velikost (kratko)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Leva velikost (kratko)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Datum nastanka leve datoteke" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Datum nastanka desne datoteke" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Novejša datoteka" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Verzija leve datoteke" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Verzija desne datoteke" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Kratek rezultat" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Levi atributi" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Desni atributi" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Znake za konec vrstice (EOL) na levi datoteki" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Znake za konec vrstice (EOL) na desni datoteki" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Kodiranje levo" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Kodiranje desno" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Zanemarjene razlike." -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Nisem mogel primerjati datotek" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Pregled predmeta prekinjen" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Preskoèena datoteka" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Preskoèena mapa" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Samo leva: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Samo desna: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Binarni datoteki sta enaki" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Binarni datoteki sta razlièni" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Datoteki sta razlièni" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Mapi sta razlièni" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Samo leva" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Samo desna" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Napaka" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Tekstovni datoteki sta enaki" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Tekstovni datoteki sta razlièni" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Minilo je: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 predmet oznaèen" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 predmetov oznaèenih" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Ime datoteke ali mape" -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Imena podmap ko so vkljuèene podmape." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Rezultat primerjave, dolga oblika." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Datum spremembe datoteke na levi strani." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Datum spremembe datoteke na desni strani." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Datoteèna konènica." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Velikost leve datoteke v bajtih." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Velikost desne datoteke v bajtih." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Skrajšana velikost leve datoteke." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Skrajšana velikost desne datoteke." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Datum nastanka na levi strani." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Datum nastanka na desni strani." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Pove katera stran ni še nikoli modificirala datuma" -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verzija leve datoteke, samo za nekatere datoteène tipe." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verzija desne datoteke, samo za nekatere datoteène tipe." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Rezultat kratke primerjave." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Atributi leve strani." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Atributi desne strani." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Tip znakov za konec vrstice (EOL) na levi datoteki" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Tip znakov za konec vrstice (EOL) na desni datoteki" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Kodna stran leve strani." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Kodna stran desne strani." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Število ignoriranih razlik v datoteki. Te razlike program WinMerge ignorira in ne morejo biti združene." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Število razlik v datoteki. Ta številka ne vsebuje ignoriranih razlik." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Prikaže zvezdico (*) èe je datoteka binarna" -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Primerjaj %1 z %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Seznam, loèen z vejicami" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Seznam, loèen s tabulatorji" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Enostavni HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Enostavni XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Datoteka s poroèilom že obstaja. Ali jo želite prepisati?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4407,32 +4489,32 @@ msgstr "" "Napaka med ustvarjanjem poroèila:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Poroèilo je bilo uspešno izdelano." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Ista datoteka je odprta v obeh okvirih" -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Izbrani datoteki sta enaki." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Prišlo je do napake med primerjanjem datotek" -#: Merge.rc:2487 +#: Merge.rc:2531 #, 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šo pot zanje (PATH)." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4447,17 +4529,17 @@ msgstr "" "\n" "Opomba: Èe jih želite vedno obravnavati kot enake, nastavite možnost 'Prezri razliènost tipa znakov za zakljuèke vrstic (EOL)' na listièu Primerjave dialoga nastavitev (dostopen pod Urejanje/Nastavitve)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Izbrana mapa ni veljavna." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "V urejevalniku ne morem odpreti binarne datoteke." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4472,7 +4554,7 @@ msgstr "" "%1\n" "na drugi strani in jo odpreti?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4483,152 +4565,152 @@ msgstr "" "Prikaz posamezne datoteke v svoji kodni tabeli bo omogoèilo boljši prikaz, a združevanje/kopiranje bo nevarno.\n" "Ali želite obravnavati obe datoteki kot da sta v isti privzeti windows kodni tabeli (priporoèljivo)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informacija izgubljena pri kodiranju: Obe datatoteki" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Ni razlik" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Razlika v vrstici" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Zamenjan %1 niz(i)." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ne morem najti niza \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Položajni okvir" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Okvir razlik" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Datoteka s popravki je bila uspešno zapisana" -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. predmet ni najden ali pa je mapa" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. predmet ni najden ali pa je mapa" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Datoteka s popravki že obstaja. Jo želite prepisati?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 izbranih datotek]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normalno" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Pomen" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Poenoteno" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Ne morem pisati v datoteko %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Navedena izhodna pot ni absolutna pot: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Doloèite izhodno datoteko" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Iz binarnih datotek ne morem izdelati datoteke s popravki." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Iz map ne morem izdelati datoteke s popravki." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4639,12 +4721,12 @@ msgstr "" " \n" "Izdelava datoteke s popravki zahteva, da so vse datoteke predhodno shranjene." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Mapa ne obstaja" -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4655,37 +4737,37 @@ msgstr "" "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:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Izberite datoteko za izvoz" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Izberite datoteko za uvoz" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Možnosti uvožene iz datoteke" -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Možnosti izvožene v datoteko" -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Uvažanje možnosti iz datoteke ni uspelo" -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Izvažanje možnosti v datoteko ni uspelo" -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4696,247 +4778,247 @@ msgstr "" "\n" "Ali želite nadaljevati?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Mešano" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Tip" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Pretvornik" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Predpregled razlik" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Script urejevalnika" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, 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:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Brez predpregleda razlik (obièajno)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Priporoèene razširitve" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Ostale razširitve" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Zasebna gradnja:%1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Nastavitve razširitev" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ni najden - .sct skripte onemogoèene" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "Pojdi &na vrstico %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Onemogoèeno" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Iz datoteènega sistema" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "IZ MRU seznama" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Brez osvetljevanja" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Paket (Batch)" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Prenosni objekt" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Sredstva" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index cd20e4fef..374213d82 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -80,7 +80,7 @@ msgid "Cu&t" msgstr "Cor&tar" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Copiar" @@ -91,7 +91,7 @@ msgid "&Paste" msgstr "&Pegar" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "Ir &a..." @@ -102,22 +102,25 @@ msgid "Op&en" msgstr "A&brir" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "con la Aplicación &Registrada" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "con un Editor &Externo" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&con..." @@ -155,7 +158,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Zoom" @@ -167,8 +170,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Ninguno" @@ -185,49 +188,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Archivo" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Nuevo\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Abrir Archivo &Conflictivo..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Abrir Pro&yecto...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "&Guardar Proyecto..." @@ -239,274 +242,274 @@ msgstr "Proyectos recientes" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Vacío >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "&Salir" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Editar" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "Conf&iguración..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Ver" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "&Combinar" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Pequeño" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Grande" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "Barra de &estado" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "&Pestañas" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Herramientas" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filtros..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Crear corrección..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "Desempaquetado &manual" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "Desempaquetado &automático" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Recargar plugins" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "Ve&ntana" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Cerrar" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Cerrar &Todas" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Cambiar &Panel\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Ordenar &Horizontalmente" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Ordenar &Verticalmente" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Cascada" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "A&yuda" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "Ayuda de &WinMerge\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "C&onfiguración" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "Licencia Pública General &GNU" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&Acerca de WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "Lado i&zquierdo sólo lectura" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Lado d&erecho sólo lectura" @@ -517,7 +520,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "&Seleccionar todo\tCtrl+A" @@ -539,1751 +542,1811 @@ msgstr "Mostrar elementos #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostrar elementos únicos en lado &derecho" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Mostrar elementos i&gnorados" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "Mostrar archivos &binarios" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Mostrar elementos &ocultos" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "&Modo Árbol" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "E&xpandir Todas las Subcarpetas" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "&Contraer Todas las Subcarpetas" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Seleccionar &Fuente..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Usar F&uente del Siste&ma" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Estadísticas de &comparación" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "&Actualizar\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Actualizar seleccionados\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Combinar" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&mparar\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "Diferencia &siguiente\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Diferencia &anterior\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Primer diferencia\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Diferencia a&ctual\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Última diferencia\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copiar al lado De&recho\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copiar al lado Izqui&erdo\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Eliminar\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Personalizar columnas..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Generar Info&rme..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Guardar\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Guardar lado &Izquierdo" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Guardar lado &Derecho" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Imprimir..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Configurar &página" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "&Vista preliminar" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Convertir Saltos de Línea a" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "Modo &Combinación\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "Codi&ficación de archivo..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "Des&hacer\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Rehacer\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Cor&tar\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Copiar\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Pegar\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Seleccionar dif. de &línea\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Buscar...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "R&eemplazar...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "A&vanzado" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copiar con Números de Línea\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&Marcadores" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Al&ternar marcador\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "Marcador siguie&nte\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Marcador &anterior\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "Quitar todos los mar&cadores" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Ir a...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "A&cercar Zoom\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "A&lejar Zoom\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Seleccionar sintaxis" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "B&loquear paneles" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "Mostrar &espacios" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Mostrar diferencias de &línea" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Ver &números de línea" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Ver &márgenes" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "&Ajuste de línea" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "&Intercambiar paneles" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Panel de di&ferencias" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Panel de &posición" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Copiar al lado D&erecho y avanzar\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copiar al lado I&zquierdo y avanzar\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Copiar todas al lado De&recho" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Copiar todas al lado Iz&quierdo" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Precomparación" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "Scri&pts" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Com¶r" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&Izquierda a Derecha" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "I&zquierda a..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "&Derecha a Izquierda" +msgid "Left to Right (%1 of %2)" +msgstr "Lado izquierdo a lado derecho (%1 de %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "D&erecha a..." +msgid "Left to... (%1 of %2)" +msgstr "Lado izquierdo a... (%1 de %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Mover" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&Izquierda a..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&Derecha a..." +msgid "Right to Left (%1 of %2)" +msgstr "Lado derecho a lado izquierdo (%1 de %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Lado derecho a... (%1 de %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Mover" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Eliminar" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&Derecha" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Izquierda" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Ambos" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Re&nombrar" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Ocultar elementos" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "Abrir archivo &Izquierdo" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Abrir archivo &Derecho" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Copiar nombres de &ruta" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&Izquierda (%1 de %2)" +msgid "Left (%1 of %2)" +msgstr "Lado izquierdo (%1 de %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&Derecha (%1 de %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Lado derecho (%1 de %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Ambos lados (%1 de %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Ambos (%1 de %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Copiar nombres de &archivos" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&Izquierda... (%1 de %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "De&recha... (%1 de %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Ambos... (%1 de %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Diferencias... (%1 de %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "Actualiza&r" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Menú Izquierda" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Menú Derecha" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Copiar ruta completa" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Copiar &nombre de archivo" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Config. precomparación" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "Si&n precomparación" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Auto precomparación" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Ir a &diferencia" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&No mostrar bloques movidos" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "Most&ar todos los bloques movidos" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Mostrar bloques movidos desde la dif. a&ctual" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "Espacios en blanco" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Co&mparar" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "I&gnorar cambios" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Ig&norar todos" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "Coincidir MA&Y./min." -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rar saltos de línea diferentes (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Todo el contenido" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Contenido rápido" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Fecha de modificación" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Fecha de modificación y Tamaño" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Tamaño" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Acerca de WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Compilación Privada)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "¡Visite la Web de WinMerge!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "Aceptar" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Colaboradores" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Seleccione archivos o carpetas..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Examinar..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "Examina&r" -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Examinar..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Seleccionar..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "Desem&paq.:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "&Seleccionar..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Incluir subcarpetas" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Estado:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Cancelar" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Ayuda" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Archivos o Carpetas a Comparar" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Base de datos:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Proyecto:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Usuario:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Contraseña:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Enlazar a proyecto VSS destino" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Aplicar a todos los elementos" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Desproteger" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Guardar como..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Sistema de versionado" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "Sistema de &versionado:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Ruta a cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "General" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Mover&se automáticamente a la primer diferencia" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "C&errar ventanas con ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Comprobar rutas &automáticamente en la ventana de apertura" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Permitir s&olo una instancia en ejecución" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Preguntar al cerrar &múltiples ventanas" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "Mantener la hora en el archivo com¶do" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Mostrar \"Seleccione archivos o carpetas\" al Iniciar" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&uto-completar en diálogos de apertura:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite ocultar algunos mensajes comunes. Pulse Restablecer para hacer todos los mensajes visibles de nuevo." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Restablecer" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Buscar" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "&Buscar:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Sólo palabras &completas" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Coincidir &MAYÚSCULAS/minúsculas" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "E&xpresión regular" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "N&o sobrepasar fin de archivo" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "Buscar &sig." -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&Aceptar" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Reemplazar" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Reem&plazar con:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "&Detenerse al final del archivo" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Reemplazar en" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&Selección" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "T&odo el archivo" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Reemplazar" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Reempl. Tod&o" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Desproteger" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Comentarios" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Proteger después de desproteger" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Filtros de línea" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Permitir filtros de línea" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Expresiones regulares (una por línea):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Nuevo" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Editar" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Eliminar" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Colores" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Diferencia:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Diferencia seleccionada:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Fondo" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Eliminada" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Diferencia ignorada:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Movida:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Movida Seleccionada:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Diferencia de palabra:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Dif. de palabra sel.:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Predeterminada" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Enviar archivos eliminados a la Papelera de reciclaje." -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "Editor &externo:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Filtrar carpetas:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Carpeta de archivos temporarios" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "Carpeta temp del s&istema" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "Carpeta personal:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Generar corrección" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Archivo &1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Archivo &2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "&Intercambiar" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "&Anexar a archivo existente" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Resultado:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "E&xaminar..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "Es&tilo:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Contexto:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorar lín&eas en blanco" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Incluir línea de coman&do" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir en editor e&xterno" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Mostrar Columnas" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "&Arriba" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "A&bajo" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Seleccionar Desempaquetador" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Desempaquet.:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Mostrar todos los desempaquetadores, no comprobar exts." -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Extensiones:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Descripción:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Detener" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Comparando elementos..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Elementos comparados:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Total:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Ir a" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "Ir a:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Archivo" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Objetivo" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "Lí&nea" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Diferencia" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "Ir &a" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Espacios en blanco" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Comparar" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "&Ignorar cambios" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "I&gnorar todos" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar diferencias de líneas &vacías" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Ignorar MAYÚSCULAS/minús&culas" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Habilitar detecció&n de bloques movidos" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "Co&mbinar con líneas similares" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Filtrar comentarios" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "Seleccionar sinta&xis" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "&Actualización automática" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&Preservar caracteres EOL originales" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabulaciones" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Tamaño de tab.:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "&Insertar tabulaciones" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "Insertar e&spacios" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Coloración de las diferencias de línea" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Ver diferencias de línea" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "A nivel de &caracter" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "A nivel de &palabra:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Filtros de archivo" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Probar" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Nuevo..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Eliminar..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "¿Guardar archivos modificados?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Archivo en lado Izquierdo" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Guardar cambios" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Descartar cambios" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Archivo en lado Derecho" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "Gu&ardar cambios" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Des&cartar cambios" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Página de códigos" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Página de código predeterminada" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Seleccione la página de códigos predeterminada a utilizar cuando se carguen archivos no Unicode:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2292,692 +2355,692 @@ msgstr "" "Detectar página de códigos para éstos archivos : .html, .rc, .xml \n" "se necesita reiniciar" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Página de códigos del sistema" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "La misma que la interfaz de usuario de WinMerge" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Página de códigos:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Configuración" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Categorías" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Diálogo" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Palabras clave:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Nombres de función:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Comentarios:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Números:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Cadenas:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Preprocesar:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Usuario 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Usuario 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Negrita" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Informe de comparación de carpetas" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Archivo de In&forme:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Examinar..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "E&stilo:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Copiar al Portapapeles" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Filtro Compartido o Privado" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "¿Qué tipo de filtro quiere crear?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro compartido (para todos los usuarios de esta máquina)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro privado (solo para el usuario actual)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Soporte de Archivos" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "Habilitar soport&e de archivos" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detectar tipo de archivo por su firma" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Estadísticas de comparación" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Carpetas:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Archivos:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Diferentes" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binario:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Únicos" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Izquierda:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Derecha:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Iguales" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Cerrar" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Afectar" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Afectar)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Seleccione página de códigos para" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&Carga de archivos:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Guardado de archivo&s:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&Usar la misma página de códigos para ambos" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Aplicar" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Cancelar" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Prueba de filtro" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Probando filtro ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Texto a probar:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Nombre de carpeta" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Probar" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Cerrar" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&Usar colores personalizados para el texto" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Colores elegidos para texto normal" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Espacio:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Texto normal:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Selección:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Rutas" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Izquierda:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Sól&o lectura" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Derecha:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Só&lo lectura" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filtro:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Guardar..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Archivos de seguridad" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Crear archivos de seguridad en:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Comparación de &carpetas" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Comparación de &archivos" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Crear archivos de seguridad en:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "Carpeta del archivo &original" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "Carpeta de copia de se&guridad:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Nombre de archivo:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&Agregar extensión .bak" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "Agregar &fecha" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Confirmar copia" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "¿Está seguro que quiere copiar XXX elementos?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "De la Izquierda" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "A la Derecha" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Sí" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "No" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "&Habilitar plugins" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Integración" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Explorador" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Habilitar menú ava&nzado" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "&Agregar al menú contextual" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Carpeta" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "De&tener después de la primer diferencia" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orar diferencias de tiempo menores de 3 segundos." -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binario" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "0c0a04e4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0xc0a, 1252" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "MAY" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Error desconocido al intentar abrir el proyecto" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Error desconocido al intentar guardar el proyecto" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Archivo de Proyecto" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Archivo de proyecto cargado con éxito." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Archivo de proyecto guardado con éxito." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2996,7 +3059,7 @@ msgstr "" "WinMerge.CompararArchivo\n" "WinMerge CompararArchivo" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3015,7 +3078,7 @@ msgstr "" "WinMerge.CompararCarpeta\n" "Comparar Carpeta de WinMerge" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3024,143 +3087,143 @@ msgstr "" "Desarrolladores:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 no concede ABSOLUTAMENTE NINGUNA GARANTÍA. Es software libre, y puede ser redistribuido bajo ciertas reglas. Vea la Licencia Pública GNU en el menú Ayuda para más detalles." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Cancelar" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Reintentar" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Ignor&ar todos" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Sí" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Sí a to&do" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&No" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "No a &todo" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Omitir" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "O&mitir todos" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "No mostrar este &mensaje de nuevo." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "No &preguntar de nuevo." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Control de Versiones" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Diferencias" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "A:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "De la izquierda:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "A la izquierda:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "De la derecha:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "A la derecha:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Versión %1 - Español" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Configuración (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas las cajas de mensaje se mostrarán de nuevo." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3171,84 +3234,84 @@ msgstr "" "\n" "Por favor, utilice valores 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos los archivos (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos los archivos (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Archivos de Proyecto de WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Archivos de opciones (*.ini)|*.ini|Todos los archivos (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Archivos de texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos los archivos (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Archivos HTML (*.htm,*.html)|*.htm;*.html|Todos los archivos (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Archivos XML (*.xml)|*.xml|Todos los archivos (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Nombre" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Ubicación" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filtos" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Descripción" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Seleccione nombre de archivo para el nuevo filtro" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Archivo de filtros (*.flt)|*.flt|Todos los archivos(*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3261,7 +3324,7 @@ msgstr "" "Por favor copie el archivo %1 a la carpeta WinMerge/Filters:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3274,7 +3337,7 @@ msgstr "" "\n" "Por favor, compruebe que la carpeta existe y que tiene permisos de escritura en ella." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3285,7 +3348,7 @@ msgstr "" "\n" "Por favor, seleccione la carpeta de filtros en Configuración/Sistema." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3298,12 +3361,12 @@ msgstr "" "\n" "¿Quiza el archivo es de solo lectura?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Seleccione el archivo de filtros a instalar." -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3314,17 +3377,17 @@ msgstr "" "\n" "No se pudo copiar el archivo de filtros a la carpeta de filtros." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "El archivo de filtros ya existe. ¿Desea sobreescribirlo?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Expresión regular" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3335,173 +3398,173 @@ msgstr "" "\n" "Si no quiere actualizar todas las comparaciones puede elegir No y actualizar las comparaciones después." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "R&uta a SS.EXE:" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Resultado de la comparación de carpetas" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Comparación de archivos" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Sin título izquierda" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Sin título derecha" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Archivo externo" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Archivo interno" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Línea: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Combinar" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Diferencia %1 de %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 Diferencias encontradas" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 Diferencia encontrada" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "SL" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Archivo %1 de %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Elementos: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Seleccione dos carpetas o archivos existentes a comparar" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Selección de carpeta" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Seleccione dos carpetas o archivos a comparar." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "¡La ruta del lado Izquierdo no es válida!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "¡La ruta del lado Derecho no es válida!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "¡Ninguna ruta es válida!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Elija dos archivos para habilitar selección de desempaquetador." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "¡Imposible comparar un archivo y una carpeta!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Archivo no encontrado: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Archivo no desempaquetado: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3514,12 +3577,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Falló al corregir archivo conflictivo." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3530,27 +3593,27 @@ msgstr "" "%1\n" "no es conflictivo." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Guardar Como" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "¿Guardar los cambios a %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 es de sólo lectura. Desea sobreescribirlo de modos modos ? (No salvarlo con un nuevo nombre.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Error haciendo copia de seguridad del archivo" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3563,7 +3626,7 @@ msgstr "" "\n" "¿Continuar de todas formas?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3580,7 +3643,7 @@ msgstr "" "\t-usar un nombre diferente (Aceptar)\n" "\t-cancelar la operación (Cancelar)" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3595,7 +3658,7 @@ msgstr "" "\n" "¿Desea guardar la versión sin empaquetar en otro archivo?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3610,7 +3673,7 @@ msgstr "" "\n" "¿Desea guardar la versión sin empaquetar en otro archivo?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3625,7 +3688,7 @@ msgstr "" "\n" "¿Desea sobreescribir el archivo cambiado?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3634,7 +3697,7 @@ msgstr "" "%1\n" "es de sólo lectura. ¿Desea sobreescribirlo de todos modos?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3649,22 +3712,22 @@ msgstr "" "\n" "¿Desea recargar el archivo?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Guardar lado izquierdo como" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Guardar lado derecho como" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3675,7 +3738,7 @@ msgstr "" "%1\n" "ha desaparecido. Por favor, guarde una copia del archivo para continuar." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3686,42 +3749,42 @@ msgstr "" "\n" "Actualize los documentos antes de continuar." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Debe especificar la ruta del proyecto de SourceSafe para continuar (ej. $/MiProyecto)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Desproteger archivos de VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "El sistema de versionado devolvío un error mientras trataba de desproteger el archivo. Imposible continuar..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Error ejecutando el comando del sistema de versionado." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "La carpeta de trabajo de VSS y la ubicación del archivo actual no coinciden. ¿Continuar?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "¡No se encontraron base(s) de datos de VSS!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Error de VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3732,7 +3795,7 @@ msgstr "" " Por favor, compruebe la configuración de la vista utilizada.\n" " ¿Desea deshacer la desprotección?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3741,127 +3804,146 @@ msgstr "" "El sistema de versionado devolvió un error cuando se intentaba deshacer la desprotección del archivo.\n" " Por favor, compruebe la configuración de la vista utilizada. " -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Ninguno" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (menor que 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 y superior)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Detener en espacio en blanco" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Detener en espacio en blanco o puntuación" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Lado derecho a lado izquierdo (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Lado izquierdo a lado derecho (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Lado derecho a lado izquierdo (%1 de %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Lado izquierdo a lado derecho (%1 de %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Lado izquierdo a lado derecho (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Lado izquierdo a... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Lado derecho a... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Lado izquierdo a... (%1 de %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Lado derecho a... (%1 de %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Lado izquierdo (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Lado derecho (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Ambos lados (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Lado izquierdo (%1 de %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Lado derecho (%1 de %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Ambos lados (%1 de %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Izquierda - Seleccione carpeta destino:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Derecha - Seleccione carpeta destino:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Archivos Afectados)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 Archivos Afectados)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3872,17 +3954,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Está seguro de copiar:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Está seguro de copiar %d elementos:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3901,502 +3983,502 @@ msgstr "" "\n" "Por favor actualice la comparación." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Está seguro de mover:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Está seguro de mover %d elementos:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Confirmar Movimiento" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Error al ejecutar editor externo: %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Formato de archivo desconocido" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Nombre" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Resultado" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Fecha izq." -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Fecha dcha." -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Extensión" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Tamaño izq." -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Tamaño dcha." -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Tamaño dcha. (Corto)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Tamaño izq. (Corto)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Fecha de creacion izq." -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Fecha de creacion dcha." -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Archivo más reciente" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Versión archivo izq." -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Versión archivo dcha." -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Resultados abreviados" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Atributos izq." -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Atributos dcha." -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "EOL izq." -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "EOL dcha." -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Codificación izq." -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Codificación dcha." -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Difs. ignoradas" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "No se pueden comparar los archivos" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Elemento cancelado" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Archivo omitido" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Carpeta omitida" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Sólo Izquierda: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Sólo Derecha: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Los archivos binarios son iguales" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Los archivos binarios son diferentes" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Los archivos son diferentes" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Las carpetas son diferentes" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Sólo Izquierda" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Sólo Derecha" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Error" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Los archivos son iguales" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Los archivos son diferentes" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tiempo transcurrido: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 elemento seleccionado" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 elementos seleccionados" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Nombre de archivo o carpeta." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nombre de subcarpeta cuando se incluyen las subcarpetas." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Resultados de la comparacion, formato largo." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Fecha de modificación del archivo del lado izquierdo." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Fecha de modificación del archivo del lado derecho." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Extensión del archivo." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Tamaño del archivo del lado izquierdo en bytes." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Tamaño del archivo del lado derecho en bytes." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Tamaño del archivo del lado izquierdo abreviado." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Tamaño del archivo del lado derecho abreviado." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Fecha de creación del archivo del lado izquierdo." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Fecha de creación del archivo del lado derecho." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Indica que lado tiene la fecha de modificación más reciente." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versión del archivo del lado izquierdo, sólo para algunos tipos de archivo." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versión del archivo del lado derecho, sólo para algunos tipos de archivo." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Resultados de la comparación abreviados." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Attributos del archivo del lado izquierdo." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Attributos del archivo del lado derecho." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Tipo de EOL del archivo del lado izquierdo." -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Tipo de EOL del archivo del lado derecho." -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Codificación del lado izquierdo." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Codificación del lado derecho." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Número de diferencias ignoradas en el archivo. Estas diferencias son ignoradas por WinMerge y no se pueden combinar." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Número de diferencias en el archivo. Este número no incluye las diferencias ignoradas." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Muestra un asterisco (*) si el archivo es binario." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Comparar %1 con %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Lista separada por comas" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Lista separada por tabuladores" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "HTML Simple" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "XML Simple " -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "El archivo de informe ya existe. ¿Desea sobreescribir el archivo?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4405,32 +4487,32 @@ msgstr "" "Error al crear el informe:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "El informe se ha creado correctamente." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "El mismo archivo está abierto en ambos paneles." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Los archivos seleccionados son iguales" -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Ocurrió un error cuando se estaban comparando los archivos" -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Los archivos temporales no se pudieron crear. Compruebe su ruta para archivos temporales." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4445,17 +4527,17 @@ msgstr "" "\n" "Nota: si desea tratar siempre todos los tipos de saltos de línea como equivalentes, seleccione la opción 'Ignorar saltos de línea diferentes..' en la pestaña Comparar del dialogo Configuración (disponible en Editar/Configuración)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "La carpeta seleccionada no es válida." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "No se puede abrir un archivo binario en el editor." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4470,7 +4552,7 @@ msgstr "" "%1\n" "al otro lado y abrir éstas carpetas?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4481,152 +4563,152 @@ msgstr "" "Mostrar cada archivo en su página de códigos dará una mejor visualización, pero combinar/copiar sería peligroso.\n" "¿Le gustaría tratar ambos archivos con la página de códigos predeterminada de windows (recomendado)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Información perdida debido a errores de codificación: ambos archivos" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "No hay diferencia" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Diferencia de línea" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Reemplazada(s) %1 cadena(s)." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Imposible encontrar la cadena \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Panel de ubicación" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Panel de diferencias" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Archivo de corrección escrito correctamente." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ¡elemento no encontrado o es una carpeta!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ¡elemento no encontrado o es una carpeta!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "El archivo de corrección ya existe. ¿Desea sobreescribirlo?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 archivo(s) selecionado(s)]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "No se pudo escibir en el archivo %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "La ruta de salida especificada no es absoluta: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Especifique un archivo de salida" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "No se puede crear un archivo de corrección a partir de un archivo binario." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "No se puede crear un archivo de corrección a partir de una carpeta." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4637,12 +4719,12 @@ msgstr "" "\n" "Crear una corrección requiere que no haya cambios pendientes de ser guardados." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "La carpeta no existe." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4653,37 +4735,37 @@ msgstr "" "Los componentes necesarios(7-zip y/o Merge7z*.dll) para el archivo no están disponibles.\n" "Vea el manual para más información acerca del soporte de archivos y cómo habilitarlo." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Seleccione archivo a exportar" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Seleccione archivo a importar" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Configuración importada del archivo." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Configuración exportada al archivo." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Fallo al importar la configuración del archivo." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Fallo al exportar la configuración al archivo." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4694,247 +4776,247 @@ msgstr "" "\n" "¿Desea continuar?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Mezclado" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Tipo" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Descompactador" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Precomparación" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Editor de script" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "El desempaquetador elegido se aplica a ambos archivos (sólo un archivo necesita tener la extensión)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Sin precomparación (normal)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Otros plugins" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Compilación Privada: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Configuración de plugin" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH no encontrado - scripts .sct deshabilitados" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "Ir a &línea %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Deshabilitado" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Del sistema de archivos" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "De la lista MRU" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "No Seleccionado" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index 1e57533a8..275d12038 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -78,7 +78,7 @@ msgid "Cu&t" msgstr "&Klipp ut" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "K&opiera" @@ -89,7 +89,7 @@ msgid "&Paste" msgstr "K&listra in" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&Gå till..." @@ -100,22 +100,25 @@ msgid "Op&en" msgstr "Öp&pna" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "med &Registrerat program" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "med &Extern editor" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&med..." @@ -153,7 +156,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Zooma" @@ -165,8 +168,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Ingen" @@ -183,49 +186,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Arkiv" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Ny\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Öppna...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Öpp&na Konfliktfil..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Öppna Projekt...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Sp&ara Projekt..." @@ -237,274 +240,274 @@ msgstr "Tidigare Projekt" #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Inga >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "&Avsluta" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Redigera" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Inställningar..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Visa" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "&Verktygsrad" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Liten" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Stor" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "S&tatusfält" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Fi&lrad" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "Verkt&yg" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Filter..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Skapa patch..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "Ma&nuell Prediffer" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "A&utomatisk Prediffer" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "&Manuell Uppackning" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisk Uppackning" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "&Öppna Plugins igen" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "F&önster" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Stäng" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Stä&ng alla" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Växla fil\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "&Ordna horisontellt" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "O&rdna vertikalt" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Överlappande" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Hjälp" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge Hjälp\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "K&onfiguration" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "&Om WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "V&änster fil skrivskyddad" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Hö&ger fil skrivskyddad" @@ -515,7 +518,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Välj &allt\tCtrl+A" @@ -537,1751 +540,1811 @@ msgstr "Visa v& #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Visa h&ögerunika objekt" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Visa ö&verhoppade objekt" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "V&isa binära filer" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Visa dold&a objekt" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "Träd&mod" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "E&xpandera alla underkataloger" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "&Minimera alla underkataloger" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Välj tecken&snitt..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Använd standardtec&kensnitt" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Jämfö&rstatistik" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "&Uppdatera\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Uppdatera valda\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Jämför" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Jä&mför\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Nästa skillnad\tAlt+Ner" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Föregående skillnad\tAlt+Upp" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Fö&rsta skillnad\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuell skillnad\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Sista skillnad\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopiera till &höger\tAlt+Höger" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopiera till &vänster\tAlt+Vänster" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Ta bort\tDelete" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Anpassa kolumner..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Generera &rapport..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Spara\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Spara &Vänster fil" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Spara &Höger fil" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Skriv ut..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Utskrifts&format" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "Förhandsgranska u&tskrift" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "&Radslut (DOS, UNIX, MAC)" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "&Mergemod\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "&Filkodning..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Ångra\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Gör om\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Klipp ut\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "K&opiera\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "K&listra in\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Markera skillnad &på rad\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "S&ök...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Ersätt...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Avancerat" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopiera med radnummer\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "&Bokmärken" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Växla Bokmärke\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Nästa Bokmärke\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Tidigare Bokmärke\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Ta bort alla Bokmärken" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Gå till...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Zooma in\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Zooma ut\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Syntaxmarkering" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "&Lås placering" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "Visa &mellanslag" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Visa &radskillnader" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Visa rad&nummer" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Visa &marginaler" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "R&adbryt rader" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Vä&xla placering" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Skillnadsfält" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Skillnadsbild" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "K&opiera till höger och gå framåt\tAlt+Ctrl+Höger" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopiera &till vänster och gå framåt\tAlt+Ctrl+Vänster" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Kopiera allt &till höger" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Kopiera allt t&ill vänster" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Script" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Jäm&för" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&Vänster till höger" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "V&änster till..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "&Höger till vänster" +msgid "Left to Right (%1 of %2)" +msgstr "Vänster till höger (%1 av %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "H&öger till..." +msgid "Left to... (%1 of %2)" +msgstr "Vänster till... (%1 av %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Flytta" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&Vänster till..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&Höger till..." +msgid "Right to Left (%1 of %2)" +msgstr "Höger till vänster (%1 av %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Höger till... (%1 av %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Flytta" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Ta bort" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&Vänster" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Höger" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Båda" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Byt &namn" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Dölj filnamn" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "&Öppna vänster" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Ö&ppna höger" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Kop&iera Sökvägar" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "&Vänster (%1 av %2)" +msgid "Left (%1 of %2)" +msgstr "Vänster (%1 av %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&Höger (%1 av %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Höger (%1 av %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Båda (%1 av %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Båda (%1 av %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Kopiera &Filnamn" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "&Vänster... (%1 av %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&Höger... (%1 av %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Båda... (%1 av %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Skillnader... (%1 av %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Uppdatera" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Vänster Gränssnittsmeny" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Höger Gränssnittsmeny" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "Kopiera hela sökvägen" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Kopiera Filnamn" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Prediffer-inställningar" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Ingen Prediffer" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Automatisk Prediffer" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "G&å till skillnad" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Inga Flyttade Block" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Alla Flyttade Block" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Flyttat Block för &Aktuell Skillnad" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "&Mellanslag" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "&Jämför" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "Ignorera skillnader" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Ignorera alla" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "VERSAL/gemen-känslig" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rera skillnader i radslut (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "&Jämförelsemetod:" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Total jämförelse" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Snabb jämförelse" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Datum för förändring" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Ändrat Datum och Storlek" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Filstorlek" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Om WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Privat kompilering)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Besök WinMerges hemsida !" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Medarbetare" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Välj filer eller kataloger..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Bläddra..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "Bläddra..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Bläddra..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Välj..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Uppackare:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "Välj..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Inkludera Underkataloger" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Avbryt" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Hjälp" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Filer eller kataloger som skall jämföras" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Databas:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Användare:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Lösenord:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Länka till valt VSS-projekt" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Tillämpa på alla objekt" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Checka ut" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Spara som..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Versionsstyrningssystem" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Versionsstyrningssystem:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Sökväg till Cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Generellt" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Gå automati&skt till första skillnaden" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "St&äng fönster med ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verifiera sökvägar i Öppna-dialogen" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "&Tillåt bara en upplaga att köra" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Frå&ga när flera fönster stängs" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "&Bevara Filtidsuppgifter i Filjämförelse" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Visa \"Välj Filer eller Kataloger\" Dialogen vid Uppstart" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Ö&ppna-dialog Auto-Komplettera:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge tillåter att vissa meddelanderutor döljs. Klicka på Återställ-knappen för att göra alla meddelanderutor synliga igen." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Återställ" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Sök" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "S&ök efter:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Matcha &hela ord" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Mat&cha VERSALER och gemener" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "&Reguljärt uttryck" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "V&änd inte vid slutet av filen" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Sök nästa" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Ersätt" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Ersä&tt med:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "Vänd inte vid slutet av filen" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Ersätt i" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&Markering" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "He&la filen" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Ersätt" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Ersätt &alla" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Checka ut" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Kommentarer" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Checka in efter Checka ut" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Radfilter" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Använd Radfilter" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Reguljära uttryck (ett per rad):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Ny" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Ändra" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Ta bort" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Kulörer" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Skillnader:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Markerade skillnader:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Bakgrund" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Borttaget" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Text" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Ignorerad Skillnad:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Flyttad:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Markerad flyttad:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Ordskillnad:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Vald ordskillnad:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Standard" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "System" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Skicka borttagna filer till Papperskorgen" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "Extern Editor:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Filterkatalog:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Katalog för Temporära filer" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "S&ystemets temporära katalog" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "A&npassad katalog:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Patchgenerator" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Fil &1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Fil &2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "Byt" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "Lägg till i befintlig fil" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Resultat:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "B&läddra..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "T&yp:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "Samman&hang:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorera blanka rader" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Inklu&dera kommandorad" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "Öppna i Extern editor" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Visa kolumner" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Flytta &Upp" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Flytta &Ned" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Välj Uppackare" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Fil-uppackare:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Visa alla uppackare, kontrollera inte filsuffixet" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Filsuffixlista:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Beskrivning:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Stopp" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Jämför objekt..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Jämförda objekt:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Objekt totalt:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Gå till" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "G&å till:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Fil" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Gå till vad" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "Ra&d" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Skillnad" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Gå till" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Jämför" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Mellanslag" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "Jämför &mellanslag" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "&Ignorera mellanslagsskillnader " -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Ignorera &alla mellanslag" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorera blan&ka rader" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "&Ignorera VERSAL/gemen-skillnader" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "M&öjliggör detektion av flyttade textblock" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "&Matcha liknande rader" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Filterkommentarer" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "&Markera syntaxen" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "Automatisk &uppdatering" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "Bevara ursprungliga radslutstecken" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Tabbar" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Tabbsteg:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "Infoga tabbar" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "Infoga mellanslag" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Radskillnadskulörer" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Visa radskillnader" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "&Teckennivå" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "&Ordnivå:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "O&rdbrytningstecken:" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Filfilter" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Testa" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Installera..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Ny..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Redigera..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Ta bort..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Spara ändrade filer?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Vänster fil" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Spara ändringar" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Ignorera ändringar" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Höger fil" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "S¶ ändringar" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "Ign&orera ändringar" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "Ign&orera allt" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Codepage" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Standard Codepage" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Välj den Codepage som används som standard när icke-Unicodefiler öppnas:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2290,692 +2353,692 @@ msgstr "" "Detektera Codepage-info för dessa filer: .html, .rc, .xml \n" "behöver omstarta sessionen" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "System Codepage" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Enligt WinMerges användargränssnitt" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Anpassad Codepage:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Inställningar" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Kategorier" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Importera..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Exportera..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Nyckelord:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Funktionsnamn:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Kommentarer:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Nummer:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Operatorer:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Strängar:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Preprocessor:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Användare 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Användare 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Fet" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Rapport för Katalogjämförelse" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Rapport&fil:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Bläddra..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopiera till klippbordet" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Delat eller privat filter?" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Vilken typ av filter vill du skapa?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Delat filter (för alla användare på denna dator)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Privat filter (bara för den aktuella användaren)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Arkivstöd" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Aktivera arkivfilstöd" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detektera arkivtyp från filsignatur" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Jämförelsestatistik" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Kataloger:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Filer:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Olika" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Text:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Binär:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Unik" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Vänster:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Höger:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Identisk" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Totalt:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Stäng" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Påverkar" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Påverkar)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Välj Codepage för" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&Filöppnande:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Filsparande:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "&Använd samma Codepage för båda" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Verkställ" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Avbryt" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Testa Filter" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Testar filter ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "&Skriv in text att testa:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Katalognamn" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Resultat:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Testa" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Stäng" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "&Använd anpassade textkulörer" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Anpassade textkulörer" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Mellanslag:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Vanlig text:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Markering:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Sökvägar" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&Vänster:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Bara& läsbar" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Höger:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Bara& läsbar" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Filter:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Öppna..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Spara..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Backup på filer" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Skapa backupfiler i:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "&Jämför kataloger" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Jäm&för filer" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Skapa backupfiler i:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "&Originalfilens katalog" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&Global backupkatalog:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Backupfilnamn:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&Lägg till filsuffixet .bak" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "L&ägg till tidsmarkering" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Bekräfta kopiering" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Är du säker på att du vill kopiera XXX objekt?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Från vänster" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Till höger" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Ja" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Nej" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Plugins" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "&Starta Plugins" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Gränssnittsintegration" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Explorer" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "A&nvänd avancerad meny" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "&Lägg till i kontextmeny" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Katalog" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "S&toppa efter första skillnaden" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orera tidsskillnad mindre än 3 sekunder" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "&Inkludera unikt underkataloginnehåll" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "&Snabb maximal jämförelsestorlek (MB):" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binär" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "041d04e4" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x41d, 1252" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Okänt fel vid försök att öppna Projektfil" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Okänt fel vid försök att spara Projektfil" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Projektfil" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Projektfilen är framgångsrikt öppnad." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Projektfilen är framgångsrikt sparad." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2994,7 +3057,7 @@ msgstr "" "WinMerge.Filjämförelse\n" "WinMerge Filjämförelse" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3013,7 +3076,7 @@ msgstr "" "WinMerge.Katalogjämförelse\n" "WinMerge Katalogjämförelse" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3022,143 +3085,143 @@ msgstr "" "Utvecklare:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 kommer med ABSOLUT INGA GARANTIER. Detta är fri programvara och du är välkommen att vidaredistribuera den under vissa omständigheter; se GNU General Public License i Hjälpmenyn för detaljer." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Avbryt" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Försök igen" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Ignorera" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Ignorera &allt" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Ja till &allt" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Nej" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Nej till a&llt" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Fortsätt" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Skippa" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Skippa &allt" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Visa inte detta &meddelande igen." -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Fråga inte denna &fråga igen." -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "Syntax" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Versionskontroll" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Skillnader" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Till:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Från vänster:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Till vänster:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Från höger:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Till höger:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Version %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Egenskaper (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Alla meddelanderutor visas nu igen." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3169,84 +3232,84 @@ msgstr "" "\n" "Var god och använd värden från 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Öppna" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programfiler|*.exe;*.bat;*.cmd|Alla Filer (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alla filer (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projektfiler (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Inställningsfiler (*.ini)|*.ini|Alla Filer (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Text-filer (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alla filer (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-filer (*.htm,*.html)|*.htm;*.html|Alla filer (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-filer (*.xml)|*.xml|Alla filer (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Namn" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Sökväg" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Filter" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Beskrivning" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Välj filnamn för nytt filter" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filfilter (*.flt)|*.flt|Alla Filer (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3259,7 +3322,7 @@ msgstr "" "Var god och kopiera filen %1 till WinMerges Filterkatalog:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3272,7 +3335,7 @@ msgstr "" "\n" "Var god och verifiera att katalogen finns och att den är skrivbar." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3283,7 +3346,7 @@ msgstr "" "\n" "Var god och välj filterkatalog i Inställningar/System." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3296,12 +3359,12 @@ msgstr "" "\n" "Kanske är filen bara läsbar?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Ange sökväg för filterfil att installera" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3312,17 +3375,17 @@ msgstr "" "\n" "Kunde inte kopiera ny filterfil till filterkatalogen." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filterfilen är redan installerad. Vill du skriva över existerande filterfil?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Reguljärt uttryck" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3333,173 +3396,173 @@ msgstr "" "\n" "Om du inte vill uppdatera alla jämförelser nu kan du välja Nej och uppdatera jämförelser senare." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&Sökväg till SS.EXE" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Resultat för jämförda kataloger" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Filjämförelse" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Namnlös vänster" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Namnlös höger" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Deras fil" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Min fil" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Rad: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Mergemod" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Skillnad %1 av %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 skillnader funna" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 skillnad funnen" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 av %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Objekt: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Välj två existerande kataloger eller filer att jämföra" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Val av katalog" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Välj två kataloger eller två filer att jämföra." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Vänster sökväg är felaktig!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Höger sökväg är felaktig!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Båda sökvägarna är felaktiga!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Välj två filer för att starta valet av uppackare." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan inte jämföra en fil med en katalog!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Kan inte hitta: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Filen är inte uppackad: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3512,12 +3575,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Kunde inte tolka Konfliktfilen." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3528,27 +3591,27 @@ msgstr "" "%1\n" "är inte en Konfliktfil." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Spara som" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Spara ändringar i %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 är skrivskyddad. Vill du skriva över filen (välj Nej för att spara filen med ett annat namn)?" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Fel vid backup av filen" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3561,7 +3624,7 @@ msgstr "" "\n" "Vill du fortsätta i alla fall?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3578,7 +3641,7 @@ msgstr "" "\t-använda ett annat filnamn (Tryck Ok)\n" "\t-avbryta sparande av fil (Tryck Avbryt)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3593,7 +3656,7 @@ msgstr "" "\n" "Vill du spara den uppackade versionen till en annan fil?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3608,7 +3671,7 @@ msgstr "" "\n" "Vill du spara den uppackade versionen till en annan fil?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3623,7 +3686,7 @@ msgstr "" "\n" "Vill du skriva över den förändrade filen?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3632,7 +3695,7 @@ msgstr "" "%1\n" "är markerad bara läsbar. Vill du ändå ändra i den?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3647,22 +3710,22 @@ msgstr "" "\n" "Vill du öppna filen igen?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Spara vänster fil som" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Spara höger fil som" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3673,7 +3736,7 @@ msgstr "" "%1\n" "finns inte nu. Var god och spara en kopia av filen för att fortsätta." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3684,42 +3747,42 @@ msgstr "" "\n" "Uppdatera filerna innan du fortsätter." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Du måste ange sökvägen till ett SourceSafe-projekt för att fortsätta (t.ex.: $/MittProjekt)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Hämtar filer från VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Versionshanteringssystemet (VSS) returnerade ett fel under försöket att checka ut filen. Det går inte att fortsätta..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Fel vid utförande av kommando för versionshanteringssystem." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS-arbetskatalogen och läget på den aktuella filen matchar inte. Vill du fortsätta ändå?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS databas hittad!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Fel från VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3730,7 +3793,7 @@ msgstr "" " Var god och, kontrollera konfigurationsspecifikation på använd markering.\n" " Ångra checka ut åtgärd?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3739,127 +3802,146 @@ msgstr "" "Versionshanteringssystemet (VSS) returnerade ett fel under försöket att ångra checka ut av filen.\n" " Var god och, kontrollera konfigurationsspecifikation på använd markering. " -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Inget" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (lägre än 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 eller högre)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Radbryt på mellanslag" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Radbryt på mellanslag eller punkt" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Höger till vänster (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Vänster till höger (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Höger till vänster (%1 av %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Vänster till höger (%1 av %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Vänster till höger (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Vänster till... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Höger till... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Vänster till... (%1 av %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Höger till... (%1 av %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Vänster (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Höger (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Båda (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Vänster (%1 av %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Höger (%1 av %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Båda (%1 av %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Vänster sida - välj destinationskatalog:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Höger sida - välj destinationskatalog:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 filer påverkade)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 av %2 filer påverkade)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3871,17 +3953,17 @@ msgstr "" "%1\n" "?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Är du säker på att du vill kopiera:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Är du säker på att du vill kopiera %d objekt:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3900,502 +3982,502 @@ msgstr "" "\n" "Var god och uppdatera jämförelsen." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Är du säker att du vill flytta:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Är du säker att du vill flytta % objekt:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Bekräfta flyttning" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Kunde inte starta den externa editorn %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Okänt arkivformat" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Filnamn" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Resultat av jämförelsen" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Vänster datum" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Höger datum" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Filsuffix" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Vänster storlek" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Höger storlek" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Höger Filstorlek (Förkortad)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Vänster Filstorlek (Förkortad)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Vänster skapaddatum" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Höger skapaddatum" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Nyare filer" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Filversion på vänster fil" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Filversion på höger fil" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Vänster attribut" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Höger attribut" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Vänster radslutstyp" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Höger radslutstyp" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Vänster kodning" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Höger kodning" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Ignorerade skillnader" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Kan inte jämföra filerna" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Objekt avbrutet" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Hoppat över filen" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Hoppat över katalogen" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Bara vänster: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Bara höger: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "De binära filerna är identiska" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "De binära filerna är olika" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Filerna är olika" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Katalogerna är olika" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Endast vänster" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Endast höger" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Fel" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Textfilerna är identiska" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Textfilerna är olika" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Förfluten tid: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 objekt valt" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 objekt valda" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Filnamn eller katalognamn." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Underkatalognamn när underkataloger inkluderas." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Jämförelseresultat, lång version." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Vänster sidas ändringsdatum." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Höger sidas ändringsdatum." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Filsuffix." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Vänster fils storlek i bytes." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Höger fils storlek i bytes." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Vänster filstorlek är förkortad." -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Höger filstorlek är förkortad." -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Vänster sidas skapelsetid." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Höger sidas skapelsetid." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Visar vilken sida som har ett nyare ändringsdatum." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Vänster sidas filversion, bara för några filtyper." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Höger sidas filversion, bara för några filtyper." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Kortfattat jämförelseresultat." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Vänster sidas attribut." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Höger sidas attribut." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Vänster sidas filradslutstyp" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Höger sidas filradslutstyp" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Vänster sidas kodning." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Höger sidas kodning." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Antal ignorerade skillnader i filen. Dessa skillnader ignorerades av WinMerge och kan inte läggas samman." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Antal skillnader i filen. Detta antal inkluderar inte ignorerade skillnader." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Visar stjärna (*) om filen är binär." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Jämför %1 med %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Komma-separerad lista" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Tabb-separerad lista" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Enkel HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Enkel XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Rapportfilen finns redan. Vill du skriva över denna fil?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4404,32 +4486,32 @@ msgstr "" "Fel vid skapande av rapport:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Rapporten har skapats." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Samma fil är öppnad i vänster och höger panel." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "De valda filerna är identiska." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Ett fel inträffade under jämförelsen av filerna." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Temporära filer kunde inte skapas. Kontrollera inställningarna för dina temporära sökvägar." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4444,17 +4526,17 @@ msgstr "" "\n" "OBS: Om du alltid vill betrakta alla radslutstyper som likvärdiga, markera alternativet 'Ignorera skillnader i radslut (WINDOWS,UNIX,MAC)' i Jämför-fliken i Inställningar-dialogen (finns under Redigera/Inställningar)." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Den valda katalogen är ogiltig." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan inte öppna en binär fil för att editera." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4469,7 +4551,7 @@ msgstr "" "%1\n" "på andra sidan och öppna dessa kataloger?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4480,152 +4562,152 @@ msgstr "" "Att visa varje fil i dess egen Codepage ger en bättre visning men sammanfogning/kopierande blir farligt.\n" "Vi föreslår att du glömmer Codepage informationen. Önskar du detta ?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Information förlorades på grund av kodningsfel i: båda filerna" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Ingen skillnad" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Radskillnad" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Ersatt %1 sträng(ar)." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan inte hitta strängen \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Skillnadsfält" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Skillnadsbild" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Patchfilen sparad." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "Det gick inte att hitta första filen, eller så är det en katalog!" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "Det gick inte att hitta andra filen, eller så är det en katalog!" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Patchfilen finns redan. Vill du skriva över den?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 fil(er) valda]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Sammanhang" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Förenad" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Kunde inte spara filen %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Den specificerade resultatsökvägen är inte en absolut sökväg: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Välj ett filnamn för resultatet" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan inte skapa en patchfil från binära filer." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan inte skapa en patchfil från kataloger." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4636,12 +4718,12 @@ msgstr "" "\n" "Att skapa en patch kräver att det inte finns några osparade förändringar i filerna." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Katalogen finns inte." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4652,37 +4734,37 @@ msgstr "" "Alla krävda komponenter (7-zip och/eller Merge7z*.dll) för arkivstöd kan inte hittas.\n" "Se manualen för mer information om arkivstöd och hur man startar det." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Välj fil att exportera" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Välj fil att importera" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Inställningar importerades från filen." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Inställningar exporterades till filen." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Det gick inte att importera inställningar från filen." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Det gick inte att spara inställningar till filen." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4693,247 +4775,247 @@ msgstr "" "\n" "Vill du göra detta?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Blandad" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Typ" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Uppackare" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Prediffer" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Editorscript" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Den valda uppackaren används för båda filerna (bara en fil behöver ha filsuffixet)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Ingen prediffer (standard)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Föreslagna plugins" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Andra plugins" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Privat Kompilering: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Plugin-inställningar" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Windows Script Host ('wscript.exe') hittades inte - .sct script är avstängda" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "G&å till rad %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Avstängd" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Från Filsystem" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Från Senast Använda filer" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Ingen markering" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Portabelt Objekt" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Resurser" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index 27669dae2..95bd9a7f2 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -78,7 +78,7 @@ msgid "Cu&t" msgstr "&Kes" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "K&opyala" @@ -89,7 +89,7 @@ msgid "&Paste" msgstr "Ya&pýþtýr" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "&Git..." @@ -100,22 +100,25 @@ msgid "Op&en" msgstr "&Aç" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "Kayýtlý &Uygulama Ýle" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "Dýþ Düz&enleyici Ýle" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&Birlikte Aç..." @@ -153,7 +156,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "&Yakýnlaþtýr" @@ -165,8 +168,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "&Yok" @@ -183,49 +186,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Dosya" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "Ye&ni\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Aç...\tCtrl+A" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "Fark Dosyasýný &Aç..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Pro&je Aç...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Projeyi &Kaydet..." @@ -237,274 +240,274 @@ msgstr "Son Kullan #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Boþ >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "Çý&kýþ" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "Düz&en" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "A&yarlar..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "&Görünüm" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "&Araç Çubuðu" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "Küçük" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Büyük" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "&Durum Çubuðu" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "&Sekme Çubuðu" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Araçlar" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Süzgeçler..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "Ya&ma Oluþtur..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "&Eklentiler" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "&Elle Ayýkla" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "Kendiliðinden &Ayýkla" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "Eklentileri &Yeniden Yükle" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&Pencere" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Kapat" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "&Tümünü Kapat" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "&Panel Deðiþtir\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "&Yatay Döþe" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "&Dikey Döþe" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Basamakla" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "Ya&rdým" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge Yardýmý\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "&Yapýlandýrma" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU Genel Kamu Lisansý" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "WinMerge H&akkýnda..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "S&olu salt okunur yap" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "S&aðý salt okunur yap" @@ -515,7 +518,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "&Tümünü Seç\tCtrl+T" @@ -537,1091 +540,1157 @@ msgstr "Soldaki &E #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Saðdaki Eþsiz Ö&geleri Göster" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "A&tlanan Ögeleri Göster" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "&Binary Dosyalarý Göster" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Gizli Ög&eleri Göster" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "Aðaç Görünü&mü" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "Tüm Alt Klasörleri &Geniþlet" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "Tüm Alt Klasörleri &Daralt" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "&Yazý Tipini Seç..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "&Varsayýlan Yazý Tipini Kullan" -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Sayýsal Ve&rileri Karþýlaþtýr" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "&Yenile\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Seçiliyi &Yenile\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Birleþtir" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "&Karþýlaþtýr\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "So&nraki Fark\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Ön&ceki Fark\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Ýlk &Fark\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Ýmleç&teki Fark\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Son Fark\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "S&aða Kopyala\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "S&ola Kopyala\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Sil\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Sütunlarý Ayarla..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "&Rapor Hazýrla..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Kaydet\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "So&lu Kaydet " -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "&Saðý Kaydet" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Yazdýr..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "&Sayfa Yapýsý" -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "&Baský Önizleme" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "Satýr Sonlarýný Þuna &Dönüþtür" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "Birleþtir&me Kipi\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "&Dosya Kodlamasý..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Geri Al\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Yinele\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "K&es\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopyala\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "Ya&pýþtýr\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Sa&týr Farkýný Seç\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Bul...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Deðiþtir...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "Geliþmiþ" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "Satýr Numaralarý Ýle &Kopyala\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "Y&er Ýmleri" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Yer Ými Koy/Kaldýr\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "So&nraki Yer Ými\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Ön&ceki Yer Ými\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Tüm Yer Ýmlerini Sil" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Git...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "&Yakýnlaþtýr\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "&Uzaklaþtýr\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "Sözdizimi Vurgusu" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "Pane&lleri Kilitle" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "&Boþluklarý Göster" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Satýr &Farklýlýklarýný Göster" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Satýr &Numaralarýný Göster" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "&Sýnýrlarý Göster" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "Satýrlarý &Kaydýr" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Panellerin &Yerini Deðiþtir" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Fark &Penceresi" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Yer&leþim Penceresi" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Saða K&opyala ve Ýlerle\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Sola Ko&pyala ve Ýlerle\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Tümünü S&aða Kopyala" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Tümünü Sola Kop&yala" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "Ön &Fark" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "&Betikler" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "K&arþýlaþtýr" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "So&lu Saða" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "S&olu Þuraya..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "S&aðý Sola" +msgid "Left to Right (%1 of %2)" +msgstr "Soldakini Saða (%1 / %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "Saðý Þu&raya..." +msgid "Left to... (%1 of %2)" +msgstr "Soldakini þuraya... (%1 / %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Taþý" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "So&lu þuraya..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "Saðý þu&raya..." +msgid "Right to Left (%1 of %2)" +msgstr "Saðdakini Sola (%1 / %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Saðdakini þuraya... (%1 / %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Taþý" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Sil" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "So&l" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Sað" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Her Ýkisi" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "Ye&niden Adlandýr" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "Ögeleri &Gizle" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "S&ola Aç" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "&Saða Aç" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "&Yol Adlarýný Kopyala" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "So&ldaki (%2 ögenin %1 tanesi)" +msgid "Left (%1 of %2)" +msgstr "Soldakini (%1 / %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "&Saðdaki (%2 ögenin %1 tanesi)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Saðdakini (%1 / %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Her iki tarafta olaný da (%1 / %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "&Her Ýki Taraftaki (%2 ögenin %1 tanesi)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "&Dosya Adlarýný Kopyala" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "Sýkýþtýr (&Zip'le)" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "So&ldakini... (%2 ögenin %1 tanesi)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "&Saðdakini... (%2 ögenin %1 tanesi)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "&Her Ýki Taraftakini... (%2 ögenin %1 tanesi)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "&Farklý Olanlarý... (%2 ögenin %1 tanesi)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Yenile" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "Sol taraf sað týk menüsü" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Sað taraf sað týk menüsü" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "Tam Yolu &Kopyala" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "&Dosya Adýný Kopyala" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Ön Fark Ayarlarý" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "Ö&n fark yok" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "Kendiliðinden ön fark" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Fa&rka Git" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Taþýnan Blok Yok" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "T&aþýnan Bloklarýn Tümü" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Ýmleçteki Fark &Yerine Taþýnan Blok" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "&Boþluklar" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "&Karþýlaþtýr" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "Deðiþiklikleri &yok say" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Tümü&nü yok say" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "BÜYÜK-Küçük Harf Duyarlýlýðý" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Satý&r sonu farklýlýklarýný yok say (Windows/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Tüm Ýçerik" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Hýzlý Ýçerik" -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Deðiþtirilme Tarihi" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Deðiþtirilme Tarihi ve Boyutu" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Boyut" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "WinMerge Hakkýnda" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Özel Yapým)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "WinMerge Sitesini Ziyaret Edin!" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "Tamam" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Katkýda Bulunanlar" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Dosya veya Klasörleri Seç" -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "Gö&zat..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "Gö&zat..." -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Gö&zat..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Seç..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Ayýklayýcý:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "&Seç..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "A< Klasörleri Kat" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Durum:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Vazgeç" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Yardým" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Karþýlaþtýrýlacak Dosya veya Klasörler" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Veritabaný:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Proje:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Kullanýcý:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Parola:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Hedef VSS Projesine Baðlantý" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Tüm ögelere uygula" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Çýkýþ Denetimi" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Farklý Kaydet..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Sürümleme Sistemi" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Sürümleme Sistemi:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "'cleartool.exe' &yolu:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Genel" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Kendiliðinden ilk &farka git" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Pencereleri ESC ile &kapat" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "'&Aç' penceresindeki yollarý doðrula" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "Yalnýz bir tane &WinMerge çalýþsýn" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Bir kaç pencere &kapatýlýyorsa onay iste" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "Dosya karþýlaþtýrýrken dosya zamanýný &koru" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Açýlýþta \"Dosya veya Klasörleri Seç\" penceresini göster" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "'Aç' penceresini kendiliðinden doldur:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" @@ -1629,662 +1698,656 @@ msgstr "" "Tüm iletileri yeniden görünür yapmak için;\n" "'Sýfýrla' düðmesine basýn." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Sýfýrla" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Bul" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "&Bulunacak:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "&Tüm kelimeyi eþleþtir" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "BÜYÜK-Küçük &Harf Eþleþtir" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "Normal ifad&e" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "D&osyanýn sonuna kaydýrma!" -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "So&nrakini Bul" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&Tamam" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Deðiþtir" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Þununla &deðiþtir:" -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "&Dosyanýn sonuna kaydýrma!" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Burada Deðiþtir" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr "&Seçim" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr "Bütün D&osya" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Deðiþtir" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "&Tümünü Deðiþtir" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Çýkýþ Kontrolü" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Açýklamalar" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "Çýkýþ Kontrolünden Sonra Giriþ Kontrolü" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Satýr Süzgeçleri" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Satýr Süzgeçlerini Etkinleþtir" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Koþul Ýfadeleri (her satýra bir tane):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Yeni" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Düzenle" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Kaldýr" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Renkler" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "Farklýlýk:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "Seçili Farklýlýk:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Arka Plan" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Silinen" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Metin" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "Yok Sayýlan Farklýlýk:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Taþýnan:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "Seçili Taþýnan:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Sözcük Farklýlýðý:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "Seçili Sözcük Farklýlýðý:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Varsayýlan Ayarlar" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Sistem" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Silinen dosyalarý Geri Dönüþüm Kutusuna gönder" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "Dýþ Düz&enleyici:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "Süzgeç &klasörü:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Geçici dosya klasörü" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "&Sistemin geçici klasörü" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "&Benim seçeceðim klasör:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Yama Üreteci" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Dosya &1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Dosya &2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "Yer &Deðiþtir" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "V&arolan bir dosyaya ekle" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "&Sonuç:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Gö&zat..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "&Biçim" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "S&til:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "&Baðlam:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "&Boþ satýrlarý yok say" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Komu&t satýrýný kat" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "&Dýþ düzenleyici ile aç" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "Sütunlarý Göster" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "Y&ukarý Kaydýr" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Aþaðý Kay&dýr" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Ayýklayýcý Seç" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Dosya ayýklayýcý:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Uzantýya bakmadan tüm ayýklayýcýlarý göster" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Uzantý listesi:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Açýklama:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Dur" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Ögeler Karþýlaþtýrýlýyor..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Karþýlaþtýrýlan Ögeler:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Toplam Öge:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Git" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "&Git:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Dosya" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Þuna git" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "&Satýr" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&Farklýlýk" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "&Git" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Karþýlaþtýr" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Boþluk" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "&Karþýlaþtýr" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "&Deðiþikliði yok say" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Tümünü &yok say" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Boþ satýrlarý yo&k say" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "BÜYÜK-Küçük harf &umursama" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Taþý&nan blok algýlamasýný etkinleþtir" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "&Benzer satýrlarý eþleþtir" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Süzgeç Açýklamalarý" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Düzenleyici" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "Sözdizimi &vurgusu" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "Kendiliðinden yeniden t&ara" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "&Orijinal satýr sonu (SS) karakterlerini koru" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "Sekmeler" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "&Sekme aralýðý:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "Sekme &Olarak" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "&Boþluk Olarak" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "Satýr Farklýlýklarýný Renklendir" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Satýr Farklýlýklarýný Göster" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "&Karakter düzeyi" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "&Sözcük düzeyi:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Dosya Süzgeçleri" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Dene" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Yükle..." -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Yeni..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Düzenle..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Sil..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Dosya deðiþiklikleri kaydedilsin mi?" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Sol taraftaki dosya" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "Deðiþiklikleri &kaydet" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Deðiþiklikler iptal" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Sað taraftaki dosya" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "Deðiþiklikleri k&aydet" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "D&eðiþiklikleri kaydetme" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Kod Sayfasý" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Varsayýlan Kod Sayfasý" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Unicode olmayan dosyalar için kullanýlacak kod sayfasýný seçin:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2293,692 +2356,692 @@ msgstr "" "Þu dosyalar için kod sayfasý bilgisini algýla: .html, .rc, .xml \n" "oturumu yeniden baþlatmalýsýnýz" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Sistem Kod Sayfasý" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "WinMerge Kullanýcý Arayüzüne Göre" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Özel Kod Sayfasý:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Ayarlar" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Ayar Kategorileri" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "Al..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Ver..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "Ýletiþim" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Anahtar Kelimeler:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "Ýþlev Adlarý:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Açýklamalar:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "Rakamlar:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Ýþlemciler:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Dizgiler:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Öniþlemci:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Kullanýcý 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Kullanýcý 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Koyu" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Klasör Karþýlaþtýrma Raporu" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "Rapor &Dosyasý:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Gözat..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "Rapor &Türü:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "Panoya &Kopyala" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Ortak veya Özel Süzgeç" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "Ne tür süzgeç hazýrlamak istiyorsunuz?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Ortak Süzgeç (bilgisayardaki tüm kullanýcýlar için)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Özel Süzgeç (yalnýz þu anki kullanýcý için)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "Sýkýþtýrýlmýþ Dosya Desteði" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "Sýkýþtýrýlmýþ dosya d&esteðini etkinleþtir" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Dosya imzasýndan arþiv tipini algýla" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Ýstatistikleri Karþýlaþtýr" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Klasörler:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Dosyalar:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "Farklýlýk" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Metin:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Ýkili:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Eþsiz" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "Sol:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Sað:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Ayný" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Toplam:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Kapat" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Etkiler" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(Etkiler)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Þunun için Kod Sayfasý Seçin" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "&Dosya Yükleniyor:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Dosya &Kaydediliyor:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "Ýkisi için ayný kod sayfasýný k&ullan" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Uygula" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Vazgeç" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Süzgeci Sýna" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Süzgeç sýnanýyor..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "Sýnanacak m&etni yazýn:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "&Klasör Adý" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Sonuç:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Sýna" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Kapat" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "Özel metin renklerini k&ullan" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Özel metin renkleri" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Boþluk:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Normal metin:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "Seçim:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Yollar" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "So&l:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Salt &okunur" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Sað:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "S&alt okunur" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Süzgeç:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "Aç..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Kaydet..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Yedek Dosyalarý" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Þunlarý yedekle:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "&Klasör karþýlaþtýrmasý" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Dosya karþý&laþtýrmasý" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Yedekleri þunun içine oluþtur:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "&Orijinal dosyanýn klasörü" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "&Genel yedek klasörü:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "Yedek dosyasýnýn adýnýn:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "Sonun&a '.bak' uzantýsý ekle" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "Sonuna tarih da&mgasý ekle" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "Kopyayý Doðrula" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "XXX ögeyi kopyalamak istediðinize emin misiniz?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "Soldan" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Saða" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Evet" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "Hayýr" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Eklentiler" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "&Eklentileri etkinleþtir" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Windows Bütünleþmesi" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Sað týk menüsünde WinMerge görünsün" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Geliþmiþ Me&nüyü Aç" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "S&að týk menüsüne ekle" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Klasör" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "Ýlk fark&tan sonra dur" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "3 saniyeden az zaman farklarýný y&ok say" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Binary" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "041f04e6" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x41f, 1254" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Proje dosyasý açýlýrken bilinmeyen bir hata ile karþýlaþýldý" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Proje dosyasý kaydedilirken bilinmeyen bir hata ile karþýlaþýldý" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Proje Dosyasý" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Proje dosyasý yüklendi." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Proje dosyasý kaydedildi." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2997,7 +3060,7 @@ msgstr "" "WinMerge.DosyaKarþýlaþtýr\n" "WinMerge Dosya Karþýlaþtýr" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3016,7 +3079,7 @@ msgstr "" "WinMerge.KlasörKarþýlaþtýr\n" "WinMerge Klasör Karþýlaþtýr" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3025,143 +3088,143 @@ msgstr "" "Geliþtiriciler:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 size kesinlikle HÝÇBÝR GARANTÝ VERMEZ. Bu program, belirli þartlar altýnda serbestçe çoðaltýp daðýtabileceðiniz özgür bir yazýlýmdýr. Ayrýntýlar için yardým menüsündeki GNU Genel Kamu Lisansý'na bakýn." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Durdur" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "&Yeniden Dene" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Yok Say" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Tümünü yok s&ay" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Evet" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "&Tümüne Evet" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&Hayýr" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "Tü&müne Hayýr" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "&Devam" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "&Atla" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "&Tümünü Atla" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Bu Ýletiyi Yeniden Gösterme!" -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Bu soruyu bir &daha sorma!" -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Sürüm Denetimi" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "Farklar" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Kime:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Soldan:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "Sola:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Saðdan:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Saða:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "%1. Sürüm" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Ayarlar (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Tüm iletiler yeniden görünür oldu." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3172,84 +3235,84 @@ msgstr "" "\n" "Lütfen 1 - %1 arasýnda bir deðer yazýn." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "Aç" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programlar|*.exe;*.bat;*.cmd|Tüm Dosyalar (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Tüm Dosyalar (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Proje Dosyalarý (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Yapýlandýrma Dosyalarý (*.ini)|*.ini|Tüm Dosyalar (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Metin Dosyalarý (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tüm Dosyalar (*.*)|*.*||" -#: Merge.rc:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML Dosyalarý (*.htm,*.html)|*.htm;*.html|Tüm Dosyalar (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML Dosyalarý (*.xml)|*.xml|Tüm Dosyalar (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "Ad" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "Yer" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Süzgeçler" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Açýklama" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Yeni süzgeç için bir isim yazýn" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Dosya Süzgeçleri (*.flt)|*.flt|Tüm Dosyalar (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3262,7 +3325,7 @@ msgstr "" "Lütfen %1 dosyasýný, WinMerge/Filters klasörüne kopyalayýn:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3275,7 +3338,7 @@ msgstr "" "\n" "Klasörün var ve yazýlabilir olduðundan emin olun." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3286,7 +3349,7 @@ msgstr "" "\n" "Lütfen 'Ayarlar/Sistem' Ýçinden Filtre Klasörü Seçiniz." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3299,12 +3362,12 @@ msgstr "" "\n" "Dosya salt okunur olabilir mi?" -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Kurulacak süzgeç dosyasýný seçin" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3315,17 +3378,17 @@ msgstr "" "\n" "Yeni süzgeç dosyasý süzge klasörüne kopyalanamadý" -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Bu süzgeç zaten var. Üzerine yazýlsýn mý?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Koþul Ýfadesi" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3336,173 +3399,173 @@ msgstr "" "\n" "Þimdi istemezseniz, tüm karþýlaþtýrmalarý daha sonra da yenileyebilirsiniz." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "'SS.EXE' &yolu:" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Klasör Karþýlaþtýrma Sonuçlarý" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Dosya Karþýlaþtýrma" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Sol Adsýz" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Adsýz sað" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "Onlarýn Dosyasý" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "Benim Dosyam" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Satýr: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Birleþtir" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "Fark %1 / %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 Fark Bulundu" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "1 Fark Bulundu" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "SO" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Öge %1 / %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Ögeler: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Karþýlaþtýrmak için varolan iki klasör veya dosya seçin" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Klasör Seçimi" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Karþýlaþtýrýlacak iki klasör veya dosya seçin." -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Sol yol geçersiz!" -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Sað yol geçersiz!" -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Ýki yolda geçersiz!" -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Ayýklayýcý seçimini etkinleþtirmek için iki dosya seçin." -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Dosya ile klasör karþýlaþtýrýlamaz!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "%1 dosyasý bulunamadý" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "%1 dosyasý ayýklanamadý" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3515,12 +3578,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Fark dosyasý iþlenemedi." -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3531,27 +3594,27 @@ msgstr "" "dosyasý\n" "bir fark dosyasý deðil." -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Farklý Kaydet" -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "%1 içindeki deðiþiklikler kaydedilsin mi? " -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 salt okunur olarak iþaretli. Üzerine yazmak ister misiniz ? (Hayýr seçerseniz, yeni bir adla farklý kaydedebilirsiniz.)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Dosya yedekleme hatasý" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3564,7 +3627,7 @@ msgstr "" "\n" "Gene de devam edilsin mi?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3581,7 +3644,7 @@ msgstr "" "\t-farklý bir ad kullan (Tamam Týklayýn)\n" "\t-bu iþlemi iptal et? (Ýptal Týklayýn)" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3596,7 +3659,7 @@ msgstr "" "\n" "Ayýklanmýþ sürümü baþka bir dosyaya kaydetmek ister misiniz?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3611,7 +3674,7 @@ msgstr "" "\n" "Ayýklanmýþ sürümü baþka bir dosyaya kaydetmek ister misiniz?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3626,7 +3689,7 @@ msgstr "" "\n" "deðiþtirilmiþ dosyanýn üzerine yazýlsýn mý?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" @@ -3635,7 +3698,7 @@ msgstr "" "%1\n" "salt okunur olarak iþaretli. Üzerine yazmak istediðinize emin misiniz?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3650,22 +3713,22 @@ msgstr "" "\n" "Dosyayý yeniden yüklemek istiyor musunuz?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Sol Dosyayý Farklý Kaydet" -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Sað Dosyayý Farklý Kaydet" -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3676,7 +3739,7 @@ msgstr "" "dosyasý\n" "yok oldu. Devam etmek için dosyanýn bir kopyasýný kaydedin." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3687,42 +3750,42 @@ msgstr "" "\n" "Devam etmeden önce belgeleri yenileyin." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Devam etmek için bir SourceSafe projesi yolu belirtmelisiniz (örn: $/projem)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Dosyalarý VSS Projesinden Çýkart..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Dosya çýkýþý yapýlmak istenirken sürümleme sisteminde bir hata oluþtu. Devam edilemiyor..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Sürümleme sistemi komutu çalýþtýrýlýrken hata." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS çalýþma klasörü ile þu anki dosyanýn konumu eþleþmiyor. Devam edilsin mi?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "VSS veritabaný bulunamadý!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "VSS Kaynaklý Hata:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3733,7 +3796,7 @@ msgstr "" " Lütfen kullanýlan görünüm yapýlandýrmasýný denetleyin.\n" " Çýkýþ iþlemi geri alýnsýn mý?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3742,127 +3805,146 @@ msgstr "" "Dosya çýkýþý geri alýnmak istenirken sürümleme sisteminde bir hata oluþtu.\n" " Lütfen kullanýlan görünüm yapýlandýrmasýný denetleyin. " -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Yok" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0'dan önceki sürümler)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ve üstü)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Boþlukta dur" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Boþlukta veya noktalama iþaretinde dur" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Saðdakini Sola (%1)" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Soldakini Saða (%1)" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Saðdakini Sola (%1 / %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Soldakini Saða (%1 / %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Soldakini Saða (%1)" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Soldakini þuraya... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Saðdakini þuraya... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Soldakini þuraya... (%1 / %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Saðdakini þuraya... (%1 / %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "Soldakini (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Saðdakini (%1 tane)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Her ikisini de (%1 tane)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "Soldakini (%1 / %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Saðdakini (%1 / %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Her iki tarafta olaný da (%1 / %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "Sol tarafýn hedef klasörünü seç:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Sað tarafýn hedef klasörünü seç:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Dosya Etkilendi)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(Toplam %2 taneden %1 dosya etkilendi)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3873,17 +3955,17 @@ msgstr "" "\n" "%1" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Þunu kopyalamak istediðinizden emin misiniz:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "%d ögeyi kopyalamak istediðinize emin misiniz:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3902,502 +3984,502 @@ msgstr "" "\n" "Lütfen karþýlaþtýrmayý yenileyin." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Bunu taþýmak istediðinize emin misiniz:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "%d ögeyi taþýmak istediðinize emin misiniz:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "Taþýmayý Onayla" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "%1 dýþ düzenleyicisi çalýþtýrýlamadý" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Bilinmeyen sýkýþtýrma biçimi" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "Dosya Adý" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Karþýlaþtýrma sonucu" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Soldakinin Tarihi" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Saðdakinin Tarihi" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Uzantý" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Soldakinin Boyutu" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Saðdakinin Boyutu" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Saðdakinin Boyutu (Kýsa)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Soldakinin Boyutu (Kýsa)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "Soldakinin Oluþturulma Zamaný" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "Saðdakinin Oluþturulma Zamaný" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Daha Yeni Dosya" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Soldaki Dosya Sürümü" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Saðdaki Dosya Sürümü" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Özet Sonuç" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Soldakinin Öznitelikleri" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Saðdakinin Öznitelikleri" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "Sol Satýr Sonu" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Sað Satýr Sonu" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Soldaki Kodlama" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Saðdaki Kodlama" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Yok Sayýlan Farklýlýklar" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Dosyalar karþýlaþtýrýlamýyor" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Öge iptal edildi" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Dosya atlandý" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Klasör atlandý" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Yalnýz solda: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Yalnýz saðda: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Binary dosyalarý ayný" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Binary dosyalarý farklý" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Dosyalar farklý" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Klasörler farklý" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Yalnýz Soldaki" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Yalnýz Saðdaki" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Hata" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Metin dosyalarý ayný" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Metin dosyalarý farklý" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Geçen süre: %ld ms" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "1 öge seçildi" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "%1 öge seçildi" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "Dosya veya klasör adý." -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Alt klasörler katýldýðýnda alt klasör adý." -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Karþýlaþtýrma sonucu, uzun biçim." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "Soldakinin deðiþtirilme tarihi." -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "Saðdakinin deðiþtirilme tarihi." -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Dosya uzantýsý." -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Soldaki dosyanýn bayt olarak boyutu." -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Saðdaki dosyanýn bayt olarak boyutu." -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Soldaki dosyanýn kýsaca boyutu" -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Saðdaki dosyanýn kýsaca boyutu" -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "Sol tarafýn oluþturulma zamaný." -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "Sað tarafýn oluþturulma zamaný." -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Hangi tarafýn en son deðiþiklik tarihine sahip olduðunu söyler." -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Sol taraftaki dosya sürümü, yalnýz bazý dosya tipleri için." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Sað taraftaki dosya sürümü, yalnýz bazý dosya tipleri için." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Kýsa karþýlaþtýrma sonucu." -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Soldaki dosyanýn öznitelikleri." -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Saðdaki dosyanýn öznitelikleri." -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Soldaki dosyanýn satýr sonu tipi" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Soldaki dosyanýn satýr sonu tipi" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Sol tarafýn kodlamasý." -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Sol tarafýn kodlamasý." -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Dosyadaki yok sayýlan farklarýn sayýsý. Bu farklar WinMerge tarafýndan yok sayýldý ve birleþtirilemezler." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Dosyadaki farklarýn sayýsý. Bu sayýya yok sayýlan farklar katýlmamýþtýr." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Eðer dosya Binary ise yýldýz (*) iþareti koy." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "%1 ile %2 ögesini karþýlaþtýr" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Virgül ile ayrýlmýþ liste" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Sekme ile ayrýlmýþ liste" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Basit HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Basit XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Rapor dosyasý zaten var. Üzerine yazmak istiyor musunuz?" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4406,32 +4488,32 @@ msgstr "" "Rapor hazýrlanýrken hata oldu:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Rapor tamamlandý." -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Ýki panelde de ayný dosya açýldý." -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Seçili Dosyalar Birbiri Ýle Ayný." -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Dosyalar karþýlaþtýrýlýrken bir hata oluþtu." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Geçici klasör oluþturulamadý. Geçici klasör yolu ayarlarýnýzý denetleyin." -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4446,17 +4528,17 @@ msgstr "" "\n" "Not: Eðer genel olarak satýr sonu tiplerinin ayný kabul edilmesini istiyorsanýz, Düzen/Ayarlar menüsünden Karþýlaþtýr bölümüne giderek, 'Satýr Sonu Farklýlýklarýný Yok Say..' seçeneðini iþaretleyin." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Seçilen klasör geçersiz." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Bir binary dosyasý düzenleyicide açýlamaz." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4471,7 +4553,7 @@ msgstr "" "%1\n" "ve bu klasörleri açmak istiyor musunuz?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4482,152 +4564,152 @@ msgstr "" "Her dosyayý kendi kod sayfasýnda görüntülemek daha iyi bir görüntü saðlar ama birleþtirme/kopyalama riske girer.\n" "Her iki dosyayý da varsayýlan Windows kod sayfasýna sahipmiþ gibi iþlemek ister misiniz (önerilir)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Kodlama hatalarý yüzünden iki dosyada da bilgi kaybý" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Fark yok" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Satýr farký" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 metin deðiþtirildi." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Aradýðýnýz \"%s\" metni bulunamadý" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "Durum Penceresi" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "Fark Penceresi" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Yama dosyasý yazýldý." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. öge bulunamadý veya bir klasör" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. öge bulunamadý veya bir klasör" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Yama dosyasý zaten var. Üzerine yazmak istiyor musunuz?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 dosya seçildi]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Baðlam" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Birleþik" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "%1 dosyasýna yazýlamadý." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Belirtilen çýktý klasörü mutlak bir yol deðil: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Bir çýktý dosyasý belirtin" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Binary dosyalarýndan, yama dosyasý hazýrlanamaz." -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Klasörlerden yama dosyasý hazýrlanamaz." -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4638,12 +4720,12 @@ msgstr "" "\n" "Bir yama hazýrlamak, dosyalardaki deðiþikliklerin kaydedilmiþ olmasýný gerektirir." -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Klasör bulunamadý." -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4654,37 +4736,37 @@ msgstr "" "Sýkýþtýrýlmýþ dosya desteði için gereken hiç bir bileþen bulunamadý (7-zip ve/veya Merge7z*.dll).\n" "Sýkýþtýrýlmýþ dosya desteði ve nasýl etkinleþtirileceði ile ilgili ayrýntýlý bilgi için kullaným kitabýna bakýn." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Verilecek dosyayý seçin" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "alýnacak dosyayý seçin" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Ayarlar dosyadan alýndý." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Ayarlar dosyaya kaydedildi." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Ayarlar dosyadan alýnamadý." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Ayarlar dosyaya yazýlamadý." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4695,247 +4777,247 @@ msgstr "" "\n" "Devam etmek istiyor musunuz?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "Karma" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Tür" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Ayýklayýcý" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Ön Fark" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Düzenleyici betiði" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Uyarlanan ayýklayýcý iki dosyayada uygulandý (sadece bir dosya bu uzantýya gerek duyuyor)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Ön fark yok (Normal)" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Önerilen eklentiler" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "Diðer eklentiler" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Özel Yapým: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Eklenti Ayarlarý" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Windows Script Host bulunamadý - .sct betikleri devre dýþý" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "%1. &Satýra Git" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Devre dýþý" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "Dosya sisteminden" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "Sýk Kullanýlanlar Listesinden" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Vurgulama Yok" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index 0c0509725..935a3feea 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -79,7 +79,7 @@ msgid "Cu&t" msgstr "Âè&ð³çàòè" #: Merge.rc:85 -#: Merge.rc:616 +#: Merge.rc:617 #, c-format msgid "&Copy" msgstr "&Êîï³þâàòè" @@ -90,7 +90,7 @@ msgid "&Paste" msgstr "&Âñòàâèòè" #: Merge.rc:88 -#: Merge.rc:708 +#: Merge.rc:729 #, c-format msgid "&Goto..." msgstr "Ïåðåéòè äî ðÿäêà..." @@ -101,22 +101,25 @@ msgid "Op&en" msgstr "&³äêðèòè" #: Merge.rc:92 -#: Merge.rc:639 -#: Merge.rc:645 +#: Merge.rc:648 +#: Merge.rc:654 +#: Merge.rc:660 #, c-format msgid "with &Registered Application" msgstr "çà&ðåºñòðîâàíèì çàñòîñóíêîì" #: Merge.rc:93 -#: Merge.rc:640 -#: Merge.rc:646 +#: Merge.rc:649 +#: Merge.rc:655 +#: Merge.rc:661 #, c-format msgid "with &External Editor" msgstr "çî&âí³øí³ì ðåäàêòîðîì" #: Merge.rc:94 -#: Merge.rc:641 -#: Merge.rc:647 +#: Merge.rc:650 +#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "&with..." msgstr "&çà äîïîìîãîþ..." @@ -154,7 +157,7 @@ msgid "&Active Pane" msgstr "" #: Merge.rc:132 -#: Merge.rc:450 +#: Merge.rc:451 #, c-format msgid "&Zoom" msgstr "Ìà&ñøòàá" @@ -166,8 +169,8 @@ msgstr "" #: Merge.rc:143 #: Merge.rc:179 -#: Merge.rc:282 -#: Merge.rc:484 +#: Merge.rc:283 +#: Merge.rc:485 #, c-format msgid "&None" msgstr "Âèì&êíóòè" @@ -184,49 +187,49 @@ msgstr "" #: Merge.rc:153 #: Merge.rc:230 -#: Merge.rc:356 +#: Merge.rc:357 #, c-format msgid "&File" msgstr "&Ôàéë" #: Merge.rc:155 #: Merge.rc:232 -#: Merge.rc:358 +#: Merge.rc:359 #, c-format msgid "&New\tCtrl+N" msgstr "&Ñòâîðèòè\tCtrl+N" #: Merge.rc:156 #: Merge.rc:233 -#: Merge.rc:359 +#: Merge.rc:360 #, c-format msgid "New (&3 panes)" msgstr "" #: Merge.rc:157 #: Merge.rc:234 -#: Merge.rc:360 +#: Merge.rc:361 #, c-format msgid "&Open...\tCtrl+O" msgstr "&³äêðèòè...\tCtrl+O" #: Merge.rc:158 #: Merge.rc:235 -#: Merge.rc:361 +#: Merge.rc:362 #, c-format msgid "Op&en Conflict File..." msgstr "³äêðèòè ôàéë ç êîí&ôë³êòàìè..." #: Merge.rc:160 #: Merge.rc:237 -#: Merge.rc:363 +#: Merge.rc:364 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "³äêðèòè &ïðîåêò...\tCtrl+J" #: Merge.rc:161 #: Merge.rc:238 -#: Merge.rc:364 +#: Merge.rc:365 #, c-format msgid "Sa&ve Project..." msgstr "Ç&áåðåãòè ïðîåêò..." @@ -238,274 +241,274 @@ msgstr " #: Merge.rc:164 #: Merge.rc:249 -#: Merge.rc:408 +#: Merge.rc:409 #, c-format msgid "Recent F&iles Or Folders" msgstr "" #: Merge.rc:166 #: Merge.rc:251 -#: Merge.rc:410 -#: Merge.rc:570 -#: Merge.rc:2648 +#: Merge.rc:411 +#: Merge.rc:571 +#: Merge.rc:2692 #, c-format msgid "< Empty >" msgstr "< Íåìà >" #: Merge.rc:169 #: Merge.rc:254 -#: Merge.rc:413 +#: Merge.rc:414 #, c-format msgid "E&xit" msgstr "Â&èõ³ä" #: Merge.rc:171 #: Merge.rc:256 -#: Merge.rc:415 +#: Merge.rc:416 #, c-format msgid "&Edit" msgstr "&Ðåäàêö³ÿ" #: Merge.rc:173 #: Merge.rc:260 -#: Merge.rc:444 +#: Merge.rc:445 #, c-format msgid "&Options..." msgstr "&Íàëàøòóâàííÿ..." #: Merge.rc:175 #: Merge.rc:262 -#: Merge.rc:446 +#: Merge.rc:447 #, c-format msgid "&View" msgstr "Âè&ãëÿä" #: Merge.rc:177 -#: Merge.rc:280 -#: Merge.rc:482 +#: Merge.rc:281 +#: Merge.rc:483 #, c-format msgid "&Toolbar" msgstr "Ïàí&åëü ³íñòðóìåíò³â" #: Merge.rc:180 -#: Merge.rc:283 -#: Merge.rc:485 +#: Merge.rc:284 +#: Merge.rc:486 #, c-format msgid "&Small" msgstr "&Ìàëåíüê³ ï³êòîãðàìè" #: Merge.rc:181 -#: Merge.rc:284 -#: Merge.rc:486 +#: Merge.rc:285 +#: Merge.rc:487 #, c-format msgid "&Big" msgstr "&Âåëèê³ ï³êòîãðàìè" #: Merge.rc:183 -#: Merge.rc:286 -#: Merge.rc:488 +#: Merge.rc:287 +#: Merge.rc:489 #, c-format msgid "&Status Bar" msgstr "Ðÿ&äîê ñòàíó" #: Merge.rc:184 -#: Merge.rc:287 -#: Merge.rc:489 +#: Merge.rc:288 +#: Merge.rc:490 #, c-format msgid "Ta&b Bar" msgstr "Ïàíåëü &çàêëàäîê" #: Merge.rc:186 -#: Merge.rc:310 -#: Merge.rc:545 +#: Merge.rc:311 +#: Merge.rc:546 #, c-format msgid "&Tools" msgstr "&Ñåðâ³ñ" #: Merge.rc:188 -#: Merge.rc:313 -#: Merge.rc:547 +#: Merge.rc:314 +#: Merge.rc:548 #, c-format msgid "&Filters..." msgstr "&Ô³ëüòðè..." #: Merge.rc:189 -#: Merge.rc:314 -#: Merge.rc:548 +#: Merge.rc:315 +#: Merge.rc:549 #, c-format msgid "&Generate Patch..." msgstr "&Ñòâîðèòè ëàòêó..." #: Merge.rc:191 -#: Merge.rc:317 -#: Merge.rc:551 +#: Merge.rc:318 +#: Merge.rc:552 #, c-format msgid "&Plugins" msgstr "Äî&ïîâíåííÿ" #: Merge.rc:193 -#: Merge.rc:319 -#: Merge.rc:553 -#: Merge.rc:1829 +#: Merge.rc:320 +#: Merge.rc:554 +#: Merge.rc:1850 #, c-format msgid "P&lugin Settings..." msgstr "" #: Merge.rc:195 -#: Merge.rc:321 -#: Merge.rc:555 +#: Merge.rc:322 +#: Merge.rc:556 #, c-format msgid "Ma&nual Prediffer" msgstr "Ðó÷íèé øàáëîí ðîçá³æíîñòåé" #: Merge.rc:196 -#: Merge.rc:322 -#: Merge.rc:556 +#: Merge.rc:323 +#: Merge.rc:557 #, c-format msgid "A&utomatic Prediffer" msgstr "Àâòîìàòè÷íèé øàáëîí ðîçá³æíîñòåé" #: Merge.rc:198 -#: Merge.rc:324 -#: Merge.rc:558 +#: Merge.rc:325 +#: Merge.rc:559 #, c-format msgid "&Manual Unpacking" msgstr "Ðîçïàêóâàííÿ &âðó÷íó" #: Merge.rc:199 -#: Merge.rc:325 -#: Merge.rc:559 +#: Merge.rc:326 +#: Merge.rc:560 #, c-format msgid "&Automatic Unpacking" msgstr "&Àâòîìàòè÷íå ðîçïàêóâàííÿ" #: Merge.rc:201 -#: Merge.rc:327 -#: Merge.rc:561 -#: Merge.rc:1901 +#: Merge.rc:328 +#: Merge.rc:562 +#: Merge.rc:1922 #, c-format msgid "&Edit with Unpacker..." msgstr "" #: Merge.rc:203 -#: Merge.rc:329 -#: Merge.rc:573 +#: Merge.rc:330 +#: Merge.rc:574 #, c-format msgid "&Reload plugins" msgstr "Ïåðåçàâàíòàæèòè âñ³ &äîïîâíåííÿ" #: Merge.rc:205 -#: Merge.rc:331 -#: Merge.rc:575 +#: Merge.rc:332 +#: Merge.rc:576 #, c-format msgid "&Window" msgstr "&³êíî" #: Merge.rc:207 -#: Merge.rc:333 -#: Merge.rc:577 +#: Merge.rc:334 +#: Merge.rc:578 #, c-format msgid "Cl&ose" msgstr "&Çàêðèòè" #: Merge.rc:208 -#: Merge.rc:334 -#: Merge.rc:578 +#: Merge.rc:335 +#: Merge.rc:579 #, c-format msgid "Clo&se All" msgstr "Çà&êðèòè âñå" #: Merge.rc:210 -#: Merge.rc:336 -#: Merge.rc:580 +#: Merge.rc:337 +#: Merge.rc:581 #, c-format msgid "Change &Pane\tF6" msgstr "Ïåðåìêíóòè â&³êíî\tF6" #: Merge.rc:212 -#: Merge.rc:338 -#: Merge.rc:582 +#: Merge.rc:339 +#: Merge.rc:583 #, c-format msgid "Tile &Horizontally" msgstr "Ðîçì³ñòèòè &ãîðèçîíòàëüíî" #: Merge.rc:213 -#: Merge.rc:339 -#: Merge.rc:583 +#: Merge.rc:340 +#: Merge.rc:584 #, c-format msgid "Tile &Vertically" msgstr "Ðîçì³ñòèòè &âåðòèêàëüíî" #: Merge.rc:214 -#: Merge.rc:340 -#: Merge.rc:584 +#: Merge.rc:341 +#: Merge.rc:585 #, c-format msgid "&Cascade" msgstr "&Êàñêàä" #: Merge.rc:216 -#: Merge.rc:342 -#: Merge.rc:586 -#: Merge.rc:2032 +#: Merge.rc:343 +#: Merge.rc:587 +#: Merge.rc:2053 #, c-format msgid "&Help" msgstr "&Äîâ³äêà" #: Merge.rc:218 -#: Merge.rc:344 -#: Merge.rc:588 +#: Merge.rc:345 +#: Merge.rc:589 #, c-format msgid "&WinMerge Help\tF1" msgstr "&Äîâ³äêà WinMerge\tF1" #: Merge.rc:220 -#: Merge.rc:346 -#: Merge.rc:590 +#: Merge.rc:347 +#: Merge.rc:591 #, c-format msgid "&Check For Updates" msgstr "" #: Merge.rc:221 -#: Merge.rc:347 -#: Merge.rc:591 +#: Merge.rc:348 +#: Merge.rc:592 #, c-format msgid "C&onfiguration" msgstr "&Íàëàøòóâàííÿ" #: Merge.rc:223 -#: Merge.rc:349 -#: Merge.rc:593 +#: Merge.rc:350 +#: Merge.rc:594 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" #: Merge.rc:224 -#: Merge.rc:350 -#: Merge.rc:594 +#: Merge.rc:351 +#: Merge.rc:595 #, c-format msgid "&About WinMerge..." msgstr "Ïðî ïðî&ãðàìó WinMerge..." #: Merge.rc:240 -#: Merge.rc:384 +#: Merge.rc:385 #, c-format msgid "&Read-only" msgstr "" #: Merge.rc:242 -#: Merge.rc:386 +#: Merge.rc:387 #, c-format msgid "L&eft Read-only" msgstr "&Ôàéë çë³âà ëèøå äëÿ ÷èòàííÿ" #: Merge.rc:243 -#: Merge.rc:387 +#: Merge.rc:388 #, c-format msgid "M&iddle Read-only" msgstr "" #: Merge.rc:244 -#: Merge.rc:388 +#: Merge.rc:389 #, c-format msgid "Ri&ght Read-only" msgstr "Ô&àéë ñïðàâà ëèøå äëÿ ÷èòàííÿ" @@ -516,7 +519,7 @@ msgid "File En&coding..." msgstr "" #: Merge.rc:258 -#: Merge.rc:425 +#: Merge.rc:426 #, c-format msgid "Select &All\tCtrl+A" msgstr "Â&èáðàòè âñå\tCtrl+A" @@ -538,1751 +541,1811 @@ msgstr " #: Merge.rc:267 #, c-format +msgid "Show Midd&le Unique Items" +msgstr "" + +#: Merge.rc:268 +#, c-format msgid "Show Ri&ght Unique Items" msgstr "Óí³êàëüí³ ïðàâîðó÷" -#: Merge.rc:268 +#: Merge.rc:269 #, c-format msgid "Show S&kipped Items" msgstr "Ïðîïó&ùåí³" -#: Merge.rc:269 +#: Merge.rc:270 #, c-format msgid "S&how Binary Files" msgstr "&Á³íàðí³ ôàéëè" -#: Merge.rc:271 +#: Merge.rc:272 #, c-format msgid "Show Hidd&en Items" msgstr "Ñ&õîâàí³" -#: Merge.rc:273 +#: Merge.rc:274 #, c-format msgid "Tree &Mode" msgstr "Ðåæèì &äåðåâà" -#: Merge.rc:274 +#: Merge.rc:275 #, c-format msgid "E&xpand All Subfolders" msgstr "&Ðîçãîðíóòè âñ³ ï³äòêè" -#: Merge.rc:275 +#: Merge.rc:276 #, c-format msgid "&Collapse All Subfolders" msgstr "&Çãîðíóòè âñ³ ï³äòåêè" -#: Merge.rc:277 -#: Merge.rc:448 +#: Merge.rc:278 +#: Merge.rc:449 #, c-format msgid "Select &Font..." msgstr "Âèáðàòè &øðèôò..." -#: Merge.rc:278 -#: Merge.rc:449 +#: Merge.rc:279 +#: Merge.rc:450 #, c-format msgid "Use Default F&ont" msgstr "Âèêîðèñòîâóâàòè &çâè÷àéíèé øðèôò " -#: Merge.rc:289 +#: Merge.rc:290 #, c-format msgid "Compa&re Statistics" msgstr "Ïîð³âíÿòè ñòàòèñòèêè" -#: Merge.rc:291 -#: Merge.rc:493 +#: Merge.rc:292 +#: Merge.rc:494 #, c-format msgid "Refre&sh\tF5" msgstr "&Ïîíîâèòè\tF5" -#: Merge.rc:292 +#: Merge.rc:293 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Ïîíîâèòè &âèáðàí³\tCtrl+F5" -#: Merge.rc:294 -#: Merge.rc:495 +#: Merge.rc:295 +#: Merge.rc:496 #, c-format msgid "&Merge" msgstr "&Îá'ºäíàííÿ" -#: Merge.rc:296 +#: Merge.rc:297 #, c-format msgid "Co&mpare\tEnter" msgstr "Ïî&ð³âíÿòè\tEnter" -#: Merge.rc:298 -#: Merge.rc:497 +#: Merge.rc:299 +#: Merge.rc:498 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Íàñòóïíà â³äì³íí³ñòü\tAlt+Down" -#: Merge.rc:299 -#: Merge.rc:498 +#: Merge.rc:300 +#: Merge.rc:499 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Ï&îïåðåäíÿ â³äì³íí³ñòü\tAlt+Up" -#: Merge.rc:301 -#: Merge.rc:524 +#: Merge.rc:302 +#: Merge.rc:525 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Ïåð&øà â³äì³íí³ñòü\tAlt+Home" -#: Merge.rc:302 -#: Merge.rc:525 +#: Merge.rc:303 +#: Merge.rc:526 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Ïîòî÷íà â³äì³íí³ñòü\tAlt+Enter" -#: Merge.rc:303 -#: Merge.rc:526 +#: Merge.rc:304 +#: Merge.rc:527 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Îñò&àííÿ â³äì³íí³ñòü\tAlt+End" -#: Merge.rc:305 -#: Merge.rc:528 +#: Merge.rc:306 +#: Merge.rc:529 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Ñêîï³þâàòè íà ïðà&âó ïàíåëü\tAlt+Right" -#: Merge.rc:306 -#: Merge.rc:529 +#: Merge.rc:307 +#: Merge.rc:530 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Ñêîï³þâàòè íà &ë³âó ïàíåëü\tAlt+Left" -#: Merge.rc:308 +#: Merge.rc:309 #, c-format msgid "&Delete\tDel" msgstr "&Âèëó÷èòè\tDel" -#: Merge.rc:312 -#: Merge.rc:680 +#: Merge.rc:313 +#: Merge.rc:701 #, c-format msgid "&Customize Columns..." msgstr "&Íàëàøòóâàòè ñòîâï÷èêè..." -#: Merge.rc:315 -#: Merge.rc:549 +#: Merge.rc:316 +#: Merge.rc:550 #, c-format msgid "Generate &Report..." msgstr "Ñòâîðèòè &çâ³ò..." -#: Merge.rc:366 +#: Merge.rc:367 #, c-format msgid "&Save\tCtrl+S" msgstr "&Çáåðåãòè\tCtrl+S" -#: Merge.rc:367 +#: Merge.rc:368 #, c-format msgid "Sav&e" msgstr "" -#: Merge.rc:369 +#: Merge.rc:370 #, c-format msgid "Save &Left" msgstr "Çá&åðåãòè ôàéë çë³âà" -#: Merge.rc:370 +#: Merge.rc:371 #, c-format msgid "Save &Middle" msgstr "" -#: Merge.rc:371 +#: Merge.rc:372 #, c-format msgid "Save &Right" msgstr "Çáå&ðåãòè ôàéë ñïðàâà" -#: Merge.rc:373 +#: Merge.rc:374 #, c-format msgid "Save &As" msgstr "" -#: Merge.rc:375 +#: Merge.rc:376 #, c-format msgid "Save &Left As..." msgstr "" -#: Merge.rc:376 +#: Merge.rc:377 #, c-format msgid "Save &Middle As..." msgstr "" -#: Merge.rc:377 +#: Merge.rc:378 #, c-format msgid "Save &Right As..." msgstr "" -#: Merge.rc:380 +#: Merge.rc:381 #, c-format msgid "&Print..." msgstr "&Äðóê..." -#: Merge.rc:381 +#: Merge.rc:382 #, c-format msgid "Page Se&tup" msgstr "Ïàðà&ìåòðè ñòîð³íêè..." -#: Merge.rc:382 +#: Merge.rc:383 #, c-format msgid "Print Previe&w" msgstr "&Ïîïåðåäí³é ïåðåãëÿä" -#: Merge.rc:391 +#: Merge.rc:392 #, c-format msgid "&Convert Line Endings to" msgstr "Çàì³íèòè ïåðåíåñåííÿ &ðÿäê³â íà" -#: Merge.rc:398 +#: Merge.rc:399 #, c-format msgid "&Merge Mode\tF9" msgstr "Ðåæèì &çëèòòÿ\tF9" -#: Merge.rc:400 +#: Merge.rc:401 #, c-format msgid "Re&load\tCtrl+F5" msgstr "" -#: Merge.rc:401 -#: Merge.rc:1900 +#: Merge.rc:402 +#: Merge.rc:1921 #, c-format msgid "&File Encoding..." msgstr "&Êîäóâàííÿ ôàéëó..." -#: Merge.rc:402 +#: Merge.rc:403 #, c-format msgid "Recompare As" msgstr "" -#: Merge.rc:404 -#: Merge.rc:612 +#: Merge.rc:405 +#: Merge.rc:613 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:405 -#: Merge.rc:613 +#: Merge.rc:406 +#: Merge.rc:614 #, c-format msgid "&Binary" msgstr "" -#: Merge.rc:417 +#: Merge.rc:418 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Ñêàñóâàòè\tCtrl+Z" -#: Merge.rc:418 +#: Merge.rc:419 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Ïîâ&åðíóòè\tCtrl+Y" -#: Merge.rc:420 +#: Merge.rc:421 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Âè&ð³çàòè\tCtrl+X" -#: Merge.rc:421 +#: Merge.rc:422 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Êîï³þâàòè\tCtrl+C" -#: Merge.rc:422 +#: Merge.rc:423 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Âñòàâèòè\tCtrl+V" -#: Merge.rc:424 +#: Merge.rc:425 #, c-format msgid "Select Line &Difference\tF4" msgstr "Âèáðàòè â³ä&ì³íí³ñòü\tF4" -#: Merge.rc:427 +#: Merge.rc:428 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Çíà&éòè...\tCtrl+F" -#: Merge.rc:428 +#: Merge.rc:429 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Çàì³íèòè...\tCtrl+H" -#: Merge.rc:430 +#: Merge.rc:431 #, c-format msgid "Advanced" msgstr "&Äîäàòêîâî" -#: Merge.rc:432 +#: Merge.rc:433 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Êîï³þâàòè ç íóìåðàö³ºþ ðÿäê³â\tCtrl+Shift+C" -#: Merge.rc:435 +#: Merge.rc:436 #, c-format msgid "&Bookmarks" msgstr "Ç&àêëàäêè" -#: Merge.rc:437 +#: Merge.rc:438 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Çàêëàäêà\tCtrl+F2" -#: Merge.rc:438 +#: Merge.rc:439 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Íàñòóïíà çàêëàäêà\tF2" -#: Merge.rc:439 +#: Merge.rc:440 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Ïîïåðåäíÿ çàêëàäêà\tShift+F2" -#: Merge.rc:440 +#: Merge.rc:441 #, c-format msgid "&Clear All Bookmarks" msgstr "&Âèëó÷èòè âñ³ çàêëàäêè" -#: Merge.rc:442 +#: Merge.rc:443 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Ïåðåéòè äî ðÿäêà...\tCtrl+G" -#: Merge.rc:452 +#: Merge.rc:453 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Íà&áëèçèòè\tCtrl++" -#: Merge.rc:453 +#: Merge.rc:454 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "³ä&äàëèòè\tCtrl+-" #. Zoom to normal -#: Merge.rc:454 +#: Merge.rc:455 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Çâè÷àéíèé\tCtrl+*" -#: Merge.rc:456 +#: Merge.rc:457 #, c-format msgid "Syntax Highlight" msgstr "ϳäñâ³÷óâàííÿ ñèíòàêñèñó" -#: Merge.rc:461 +#: Merge.rc:462 #, c-format msgid "&Diff Context" msgstr "" -#: Merge.rc:463 +#: Merge.rc:464 +#: Merge.rc:641 #, c-format msgid "&All" msgstr "" -#: Merge.rc:472 +#: Merge.rc:473 #, c-format msgid "&Lock Panes" msgstr "Çà&áëîêóâàòè ïàíåë³" -#: Merge.rc:473 +#: Merge.rc:474 #, c-format msgid "&View Whitespace" msgstr "Ïîêàçó&âàòè ïðîïóñêè" -#: Merge.rc:474 +#: Merge.rc:475 #, c-format msgid "Vie&w Line Differences" msgstr "Ïîêàçóâàòè â³äì³ííîñò³ â ðÿäêàõ" -#: Merge.rc:475 +#: Merge.rc:476 #, c-format msgid "View Line &Numbers" msgstr "Ïîêàçóâàòè &íîìåðà ðÿäê³â" -#: Merge.rc:476 +#: Merge.rc:477 #, c-format msgid "View &Margins" msgstr "Ïîêàçóâàòè ï&îëÿ" -#: Merge.rc:477 +#: Merge.rc:478 #, c-format msgid "W&rap Lines" msgstr "Ïåðåíîñèòè çà &ñëîâàìè" -#: Merge.rc:479 +#: Merge.rc:480 #, c-format msgid "Sw&ap Panes" msgstr "Ïîì&³íÿòè ïàíåë³ ì³ñöÿìè" -#: Merge.rc:480 +#: Merge.rc:481 #, c-format msgid "Split V&ertically" msgstr "" -#: Merge.rc:490 +#: Merge.rc:491 #, c-format msgid "Diff &Pane" msgstr "Ïàíå&ëü ïîð³âíÿííÿ" -#: Merge.rc:491 +#: Merge.rc:492 #, c-format msgid "Lo&cation Pane" msgstr "Ïàíåëü ì³ñöü &ðîçòàøóâàííÿ" -#: Merge.rc:500 +#: Merge.rc:501 #, c-format msgid "Ne&xt Conflict\tAlt+Shift+Down" msgstr "" -#: Merge.rc:501 +#: Merge.rc:502 #, c-format msgid "Pre&vious Conflict\tAlt+Shift+Up" msgstr "" -#: Merge.rc:503 +#: Merge.rc:504 #, c-format msgid "A&dvanced" msgstr "" -#: Merge.rc:505 +#: Merge.rc:506 #, c-format msgid "Next Difference Between Left and Middle\tAlt+1" msgstr "" -#: Merge.rc:506 +#: Merge.rc:507 #, c-format msgid "Previous Difference Between Left And Middle\tAlt+Shift+1" msgstr "" -#: Merge.rc:508 +#: Merge.rc:509 #, c-format msgid "Next Difference Between Left and Right\tAlt+2" msgstr "" -#: Merge.rc:509 +#: Merge.rc:510 #, c-format msgid "Previous Difference Between Left And Right\tAlt+Shift+2" msgstr "" -#: Merge.rc:511 +#: Merge.rc:512 #, c-format msgid "Next Difference Between Middle and Right\tAlt+3" msgstr "" -#: Merge.rc:512 +#: Merge.rc:513 #, c-format msgid "Previous Difference Between Middle And Right\tAlt+Shift+3" msgstr "" -#: Merge.rc:514 +#: Merge.rc:515 #, c-format msgid "Next Left Only Difference\tAlt+7" msgstr "" -#: Merge.rc:515 +#: Merge.rc:516 #, c-format msgid "Previous Left Only Difference\tAlt+Shift+7" msgstr "" -#: Merge.rc:517 +#: Merge.rc:518 #, c-format msgid "Next Middle Only Difference\tAlt+8" msgstr "" -#: Merge.rc:518 +#: Merge.rc:519 #, c-format msgid "Previous Middle Only Difference\tAlt+Shift+8" msgstr "" -#: Merge.rc:520 +#: Merge.rc:521 #, c-format msgid "Next Right Only Difference\tAlt+9" msgstr "" -#: Merge.rc:521 +#: Merge.rc:522 #, c-format msgid "Previous Right Only Difference\tAlt+Shift+9" msgstr "" -#: Merge.rc:531 +#: Merge.rc:532 #, c-format msgid "Copy from Left\tAlt+Shift+Right" msgstr "" -#: Merge.rc:532 +#: Merge.rc:533 #, c-format msgid "Copy from Right\tAlt+Shift+Left" msgstr "" -#: Merge.rc:534 +#: Merge.rc:535 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Ñêîï³þâàòè íà ïðàâó ïàíåëü ³ ïåðåéòè äî íàñòóïíî¿\tAlt+Ctrl+Right" -#: Merge.rc:535 +#: Merge.rc:536 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Ñêîï³þâàòè íà ë³âó ïàíåëü ³ ïåðåéòè äî íàñòóïíî¿\tAlt+Ctrl+Left" -#: Merge.rc:537 +#: Merge.rc:538 #, c-format msgid "Copy &All to Right" msgstr "Ñêîï³þâàòè âñå íà ïðàâó ïàíåë&ü" -#: Merge.rc:538 +#: Merge.rc:539 #, c-format msgid "Cop&y All to Left" msgstr "Ñêîï³&þâàòè âñå íà ë³âó ïàíåëü" -#: Merge.rc:540 +#: Merge.rc:541 #, c-format msgid "A&uto Merge\tAlt+Ctrl+M" msgstr "" -#: Merge.rc:542 +#: Merge.rc:543 #, c-format msgid "Add &Synchronization Point\tAlt+S" msgstr "" -#: Merge.rc:543 +#: Merge.rc:544 #, c-format msgid "Clear Sync&hronization Points" msgstr "" -#: Merge.rc:563 +#: Merge.rc:564 #, c-format msgid "&Prediffer" msgstr "&Ïîïåðåäíº ïîð³âíÿííÿ" -#: Merge.rc:568 +#: Merge.rc:569 #, c-format msgid "&Scripts" msgstr "Ñ&öåíàð³¿" -#: Merge.rc:602 +#: Merge.rc:603 #, c-format msgid "Comp&are" msgstr "Ïî&ð³âíÿòè" -#: Merge.rc:603 +#: Merge.rc:604 #, c-format msgid "Compare Non-hor&izontally" msgstr "" -#: Merge.rc:605 +#: Merge.rc:606 #, c-format msgid "First &left item with second left item" msgstr "" -#: Merge.rc:606 +#: Merge.rc:607 #, c-format msgid "First &right item with second right item" msgstr "" -#: Merge.rc:607 +#: Merge.rc:608 #, c-format msgid "&First left item with second right item" msgstr "" -#: Merge.rc:608 +#: Merge.rc:609 #, c-format msgid "&Second left item with first right item" msgstr "" -#: Merge.rc:610 +#: Merge.rc:611 #, c-format msgid "Co&mpare As" msgstr "" -#: Merge.rc:618 -#, c-format -msgid "&Left to Right" -msgstr "&Çë³âà ïðàâîðó÷" - #: Merge.rc:619 +#: Merge.rc:2308 #, c-format -msgid "L&eft to..." -msgstr "Ë&³âîðó÷ íà ..." +msgid "Left to Middle (%1 of %2)" +msgstr "" #: Merge.rc:620 +#: Merge.rc:2307 #, c-format -msgid "&Right to Left" -msgstr "&Ñïðàâà ë³âîðó÷" +msgid "Left to Right (%1 of %2)" +msgstr "Çë³âà ïðàâîðó÷ (%1 ç %2)" #: Merge.rc:621 +#: Merge.rc:631 +#: Merge.rc:685 +#: Merge.rc:2315 +#: Merge.rc:2339 #, c-format -msgid "R&ight to..." -msgstr "Ï&ðàâîðó÷ íà ..." +msgid "Left to... (%1 of %2)" +msgstr "Çë³âà... (%1 ç %2)" + +#: Merge.rc:622 +#: Merge.rc:2305 +#, c-format +msgid "Middle to Left (%1 of %2)" +msgstr "" #: Merge.rc:623 +#: Merge.rc:2306 #, c-format -msgid "&Move" -msgstr "&Ïåðåì³ñòèòè" +msgid "Middle to Right (%1 of %2)" +msgstr "" + +#: Merge.rc:624 +#: Merge.rc:632 +#: Merge.rc:686 +#: Merge.rc:2316 +#: Merge.rc:2340 +#, c-format +msgid "Middle to... (%1 of %2)" +msgstr "" #: Merge.rc:625 +#: Merge.rc:2304 #, c-format -msgid "&Left to..." -msgstr "&˳âîðó÷ â..." +msgid "Right to Middle (%1 of %2)" +msgstr "" #: Merge.rc:626 +#: Merge.rc:2303 #, c-format -msgid "&Right to..." -msgstr "&Ïðàâîðó÷ â..." +msgid "Right to Left (%1 of %2)" +msgstr "Ñïðàâà ë³âîðó÷ (%1 ç %2)" -#: Merge.rc:628 +#: Merge.rc:627 +#: Merge.rc:633 +#: Merge.rc:687 +#: Merge.rc:2317 +#: Merge.rc:2341 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Ñïðàâà... (%1 ç %2)" + +#: Merge.rc:629 +#, c-format +msgid "&Move" +msgstr "&Ïåðåì³ñòèòè" + +#: Merge.rc:635 #, c-format msgid "&Delete" msgstr "&Âèëó÷èòè" -#: Merge.rc:630 -#: Merge.rc:1343 -#: Merge.rc:1678 +#: Merge.rc:637 +#: Merge.rc:1364 +#: Merge.rc:1699 #, c-format msgid "&Left" msgstr "&˳âîðó÷" -#: Merge.rc:631 -#: Merge.rc:1347 -#: Merge.rc:1684 +#: Merge.rc:638 +#: Merge.rc:1366 +#: Merge.rc:1702 +#, c-format +msgid "&Middle" +msgstr "" + +#: Merge.rc:639 +#: Merge.rc:1368 +#: Merge.rc:1705 #, c-format msgid "&Right" msgstr "&Ïðàâîðó÷" -#: Merge.rc:632 +#: Merge.rc:640 #, c-format msgid "&Both" msgstr "&Îáèäâà" -#: Merge.rc:634 +#: Merge.rc:643 #, c-format msgid "Re&name" msgstr "&Ïåðåéìåíóâàòè" -#: Merge.rc:635 +#: Merge.rc:644 #, c-format msgid "&Hide Items" msgstr "&Ñõîâàòè" -#: Merge.rc:637 +#: Merge.rc:646 #, c-format msgid "&Open Left" msgstr "&³äêðèòè ë³âèé ôàéë" -#: Merge.rc:643 +#: Merge.rc:652 +#, c-format +msgid "Open Midd&le" +msgstr "" + +#: Merge.rc:658 #, c-format msgid "O&pen Right" msgstr "Â&³äêðèòè ïðàâèé ôàéë" -#: Merge.rc:650 +#: Merge.rc:665 #, c-format msgid "Cop&y Pathnames" msgstr "Ñêîï³þâàòè &øëÿõè" -#: Merge.rc:652 -#: Merge.rc:659 +#: Merge.rc:667 +#: Merge.rc:676 +#: Merge.rc:2331 #, c-format -msgid "&Left (%1 of %2)" -msgstr "Ç&ë³âà (%1 ç %2)" +msgid "Left (%1 of %2)" +msgstr "˳âîðó÷ (%1 ç %2)" -#: Merge.rc:653 -#: Merge.rc:660 +#: Merge.rc:668 +#: Merge.rc:677 +#: Merge.rc:2332 #, c-format -msgid "&Right (%1 of %2)" -msgstr "Ñ&ïðàâà (%1 ç %2)" +msgid "Middle (%1 of %2)" +msgstr "" -#: Merge.rc:654 -#: Merge.rc:661 +#: Merge.rc:669 +#: Merge.rc:678 +#: Merge.rc:2333 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Ïðàâîðó÷ (%1 ç %2)" + +#: Merge.rc:670 +#: Merge.rc:679 +#: Merge.rc:2334 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Ðàçîì (%1 ç %2)" + +#: Merge.rc:671 +#: Merge.rc:680 +#: Merge.rc:2335 #, c-format -msgid "&Both (%1 of %2)" -msgstr "Î&áèäâà (%1 ç %2)" +msgid "All (%1 of %2)" +msgstr "" -#: Merge.rc:656 +#: Merge.rc:673 #, c-format msgid "Copy &Filenames" msgstr "Ñêîï³þâàòè &³ìåíà ôàéë³â" -#: Merge.rc:657 +#: Merge.rc:674 #, c-format msgid "Copy Items To Clip&board" msgstr "" -#: Merge.rc:664 +#: Merge.rc:683 #, c-format msgid "&Zip" msgstr "&Çààðõ³âóâàòè" -#: Merge.rc:666 -#, c-format -msgid "&Left... (%1 of %2)" -msgstr "Ç&ë³âà... (%1 ç %2)" - -#: Merge.rc:667 +#: Merge.rc:688 +#: Merge.rc:2318 #, c-format -msgid "&Right... (%1 of %2)" -msgstr "Ñ&ïðàâà... (%1 ç %2)" +msgid "Both to... (%1 of %2)" +msgstr "" -#: Merge.rc:668 +#: Merge.rc:689 +#: Merge.rc:2319 #, c-format -msgid "&Both... (%1 of %2)" -msgstr "Î&áèäâà... (%1 ç %2)" +msgid "All to... (%1 of %2)" +msgstr "" -#: Merge.rc:669 +#: Merge.rc:690 +#: Merge.rc:2320 #, c-format -msgid "&Differences... (%1 of %2)" -msgstr "Ëèøå &â³äì³ííîñò³... (%1 ç %2)" +msgid "Differences to... (%1 of %2)" +msgstr "" -#: Merge.rc:672 +#: Merge.rc:693 #, c-format msgid "&Refresh" msgstr "&Ïîíîâèòè" -#: Merge.rc:674 +#: Merge.rc:695 #, c-format msgid "Left Shell menu" msgstr "˳âå ìåíþ îáîëîíêè" -#: Merge.rc:675 +#: Merge.rc:696 #, c-format msgid "Middle Shell menu" msgstr "" -#: Merge.rc:676 +#: Merge.rc:697 #, c-format msgid "Right Shell menu" msgstr "Ïðàâå ìåíþ îáîëîíêè" -#: Merge.rc:688 +#: Merge.rc:709 #, c-format msgid "Copy" msgstr "" -#: Merge.rc:689 +#: Merge.rc:710 #, c-format msgid "&Copy Full Path" msgstr "&Ñêîï³þâàòè ïîâíèé øëÿõ" -#: Merge.rc:690 +#: Merge.rc:711 #, c-format msgid "Copy &Filename" msgstr "Ñêîï³þâàòè &³ì'ÿ ôàéëó" -#: Merge.rc:696 +#: Merge.rc:717 #, c-format msgid "Prediffer Settings" msgstr "Ïàðàìåòðè ïîïåðåäíüîãî ïîð³âíÿííÿ" -#: Merge.rc:698 +#: Merge.rc:719 #, c-format msgid "&No prediffer" msgstr "&Íåìà ïîïåðåäíüîãî ïîð³âíÿííÿ" -#: Merge.rc:699 +#: Merge.rc:720 #, c-format msgid "Auto prediffer" msgstr "&Àâòîìàòè÷íå ïîïåðåäíº ïîð³âíÿííÿ" -#: Merge.rc:707 +#: Merge.rc:728 #, c-format msgid "G&oto Diff" msgstr "Ïåðåéòè äî &â³äì³ííîñò³" -#: Merge.rc:710 +#: Merge.rc:731 #, c-format msgid "&No Moved Blocks" msgstr "&Áåç ïåðåì³ùåíèõ áëîê³â" -#: Merge.rc:711 +#: Merge.rc:732 #, c-format msgid "&All Moved Blocks" msgstr "&Âñ³ ïåðåì³ùåí³ áëîêè" -#: Merge.rc:712 +#: Merge.rc:733 #, c-format msgid "Moved Block for &Current Diff" msgstr "Ïåðåì³ù. áëîê äëÿ &ö³º¿ â³äì³ííîñò³" -#: Merge.rc:720 -#: Merge.rc:1242 +#: Merge.rc:741 +#: Merge.rc:1263 #, c-format msgid "W&hitespaces" msgstr "Ïðîïóñêè" -#: Merge.rc:722 -#: Merge.rc:1243 +#: Merge.rc:743 +#: Merge.rc:1264 #, c-format msgid "Com&pare" msgstr "Ïîð³âíÿòè" -#: Merge.rc:723 -#: Merge.rc:1245 +#: Merge.rc:744 +#: Merge.rc:1266 #, c-format msgid "I&gnore changes" msgstr "Íåõòóâàòè çì³íàìè" -#: Merge.rc:724 -#: Merge.rc:1247 +#: Merge.rc:745 +#: Merge.rc:1268 #, c-format msgid "Ig&nore all" msgstr "Íåõòóâàòè âñþäè" -#: Merge.rc:726 -#: Merge.rc:1251 +#: Merge.rc:747 +#: Merge.rc:1272 #, c-format msgid "Case sensi&tive" msgstr "×óòëèâ³ñòü ðåã³ñòðó" -#: Merge.rc:727 -#: Merge.rc:1253 -#: Merge.rc:1369 +#: Merge.rc:748 +#: Merge.rc:1274 +#: Merge.rc:1390 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Íåõòóâàòè ð³çíèöåþ â ê³íöÿõ ðÿäê³â (Win/Unix/Mac)" -#: Merge.rc:728 -#: Merge.rc:1853 +#: Merge.rc:749 +#: Merge.rc:1874 #, c-format msgid "&Compare method:" msgstr "" -#: Merge.rc:730 -#: Merge.rc:2109 +#: Merge.rc:751 +#: Merge.rc:2130 #, c-format msgid "Full Contents" msgstr "Ïîâíèé ïîøóê çà âì³ñòîì" -#: Merge.rc:731 -#: Merge.rc:2110 +#: Merge.rc:752 +#: Merge.rc:2131 #, c-format msgid "Quick Contents" msgstr "Øâèäêèé ïîøóê çà âì³ñòîì " -#: Merge.rc:732 -#: Merge.rc:2111 +#: Merge.rc:753 +#: Merge.rc:2132 #, c-format msgid "Binary Contents" msgstr "" -#: Merge.rc:733 -#: Merge.rc:2112 +#: Merge.rc:754 +#: Merge.rc:2133 #, c-format msgid "Modified Date" msgstr "Çà ðîçõîäæåííÿìè â äàò³" -#: Merge.rc:734 -#: Merge.rc:2113 +#: Merge.rc:755 +#: Merge.rc:2134 #, c-format msgid "Modified Date and Size" msgstr "Çà äàòîþ çì³íè ³ ðîçì³ðó" -#: Merge.rc:735 -#: Merge.rc:2114 +#: Merge.rc:756 +#: Merge.rc:2135 #, c-format msgid "Size" msgstr "Çà ðîçì³ðîì" -#: Merge.rc:829 +#: Merge.rc:850 #, c-format msgid "About WinMerge" msgstr "Ïðî ïðîãðàìó WinMerge" -#: Merge.rc:835 +#: Merge.rc:856 #, c-format msgid "(Private Build)" msgstr "(Ïðèâàòíèé á³ëä)" -#: Merge.rc:836 +#: Merge.rc:857 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "³äâ³äàéòå äîìàøíþ ñòîð³íêó WinMerge !" -#: Merge.rc:838 -#: Merge.rc:876 -#: Merge.rc:1261 -#: Merge.rc:1293 -#: Merge.rc:1303 -#: Merge.rc:1462 -#: Merge.rc:1498 -#: Merge.rc:1592 -#: Merge.rc:1607 -#: Merge.rc:1830 -#: Merge.rc:1899 +#: Merge.rc:859 +#: Merge.rc:897 +#: Merge.rc:1282 +#: Merge.rc:1314 +#: Merge.rc:1324 +#: Merge.rc:1483 +#: Merge.rc:1519 +#: Merge.rc:1613 +#: Merge.rc:1628 +#: Merge.rc:1851 +#: Merge.rc:1920 #, c-format msgid "OK" msgstr "Ãàðàçä" -#: Merge.rc:839 +#: Merge.rc:860 #, c-format msgid "Contributors" msgstr "Àâòîðè" -#: Merge.rc:844 +#: Merge.rc:865 #, c-format msgid "Select Files or Folders" msgstr "Âèáåð³òü ôàéëè àáî òåêè..." -#: Merge.rc:852 -#: Merge.rc:920 -#: Merge.rc:1201 -#: Merge.rc:1223 +#: Merge.rc:873 +#: Merge.rc:941 +#: Merge.rc:1222 +#: Merge.rc:1244 #, c-format msgid "&Browse..." msgstr "&Ïåðåãëÿä..." -#: Merge.rc:858 -#: Merge.rc:1204 +#: Merge.rc:879 +#: Merge.rc:1225 #, c-format msgid "B&rowse..." msgstr "Ïåðåãëÿäàííÿ " -#: Merge.rc:859 +#: Merge.rc:880 #, c-format msgid "&3(Optional):" msgstr "" -#: Merge.rc:864 -#: Merge.rc:1211 -#: Merge.rc:1227 +#: Merge.rc:885 +#: Merge.rc:1232 +#: Merge.rc:1248 #, c-format msgid "Br&owse..." msgstr "Ïåðåãëÿäàííÿ ..." -#: Merge.rc:865 +#: Merge.rc:886 #, c-format msgid "Fi<er:" msgstr "" -#: Merge.rc:868 -#: Merge.rc:1768 +#: Merge.rc:889 +#: Merge.rc:1789 #, c-format msgid "Select..." msgstr "Âèáðàòè..." -#: Merge.rc:869 +#: Merge.rc:890 #, c-format msgid "&Unpacker:" msgstr "&Ðîçïàêóâàëüíèê:" -#: Merge.rc:872 +#: Merge.rc:893 #, c-format msgid "&Select..." msgstr "Âèáðàòè..." -#: Merge.rc:873 -#: Merge.rc:1769 +#: Merge.rc:894 +#: Merge.rc:1790 #, c-format msgid "&Include Subfolders" msgstr "&Âðàõîâóþ÷è ï³äòåêè" -#: Merge.rc:875 +#: Merge.rc:896 #, c-format msgid "Status:" msgstr "Ñòàòóñ:" -#: Merge.rc:877 -#: Merge.rc:907 -#: Merge.rc:982 -#: Merge.rc:1001 -#: Merge.rc:1033 -#: Merge.rc:1043 -#: Merge.rc:1262 -#: Merge.rc:1294 -#: Merge.rc:1304 -#: Merge.rc:1355 -#: Merge.rc:1463 -#: Merge.rc:1499 -#: Merge.rc:1593 -#: Merge.rc:1608 -#: Merge.rc:1831 +#: Merge.rc:898 +#: Merge.rc:928 +#: Merge.rc:1003 +#: Merge.rc:1022 +#: Merge.rc:1054 +#: Merge.rc:1064 +#: Merge.rc:1283 +#: Merge.rc:1315 +#: Merge.rc:1325 +#: Merge.rc:1376 +#: Merge.rc:1484 +#: Merge.rc:1520 +#: Merge.rc:1614 +#: Merge.rc:1629 +#: Merge.rc:1852 #, c-format msgid "Cancel" msgstr "Ñêàñóâàòè" -#: Merge.rc:878 -#: Merge.rc:1500 +#: Merge.rc:899 +#: Merge.rc:1521 #, c-format msgid "Help" msgstr "Äîâ³äêà" -#: Merge.rc:879 +#: Merge.rc:900 #, c-format msgid "Files or Folders to Compare" msgstr "Ôàéëè àáî òåêè äëÿ ïîð³âíÿííÿ" -#: Merge.rc:891 +#: Merge.rc:912 #, c-format msgid "Database:" msgstr "Áàçà äàíèõ:" -#: Merge.rc:894 +#: Merge.rc:915 #, c-format msgid "Project:" msgstr "Ïðîåêò:" -#: Merge.rc:897 +#: Merge.rc:918 #, c-format msgid "User:" msgstr "Êîðèñòóâà÷:" -#: Merge.rc:899 +#: Merge.rc:920 #, c-format msgid "Password:" msgstr "Ïàðîëü:" -#: Merge.rc:901 +#: Merge.rc:922 #, c-format msgid "Link to Destination VSS project" msgstr "Øëÿõ äî ïðîåêòó VSS" -#: Merge.rc:903 -#: Merge.rc:1048 +#: Merge.rc:924 +#: Merge.rc:1069 #, c-format msgid "Apply to all items" msgstr "Çàñòîñóâàòè äî âñ³õ åëåìåíò³â" -#: Merge.rc:905 +#: Merge.rc:926 #, c-format msgid "Check Out" msgstr "Âçÿòè ï³ä êîíòðîëü" -#: Merge.rc:906 -#: Merge.rc:1044 +#: Merge.rc:927 +#: Merge.rc:1065 #, c-format msgid "Save As..." msgstr "Çáåðåãòè ÿê..." -#: Merge.rc:912 +#: Merge.rc:933 #, c-format msgid "Versioning System" msgstr "Ñèñòåìà êîíòðîëþ âåðñ³é" -#: Merge.rc:915 +#: Merge.rc:936 #, c-format msgid "&Versioning System:" msgstr "&Ñèñòåìà êîíòðîëþ âåðñ³é:" -#: Merge.rc:918 -#: Merge.rc:2157 +#: Merge.rc:939 +#: Merge.rc:2178 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Øëÿõ äî cleartool.exe:" -#: Merge.rc:925 -#: Merge.rc:2040 -#: Merge.rc:2053 +#: Merge.rc:946 +#: Merge.rc:2061 +#: Merge.rc:2074 #, c-format msgid "General" msgstr "Îñíîâí³" -#: Merge.rc:928 +#: Merge.rc:949 #, c-format msgid "Automatically &scroll to first difference" msgstr "Àâòîìàòè÷íî &ïåðåì³ñòèòè äî ïåðøî¿ â³äì³ííîñò³" -#: Merge.rc:931 +#: Merge.rc:952 #, c-format msgid "Cl&ose windows with ESC" msgstr "Çà&êðèâàòè â³êíà êëàâ³øåþ ESC" -#: Merge.rc:933 +#: Merge.rc:954 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Àâòîìàòè÷íî ïåðåâ³ðÿòè øëÿõè â ä³àëîç³ â³äêðèòòÿ ôàéë³â" -#: Merge.rc:936 +#: Merge.rc:957 #, c-format msgid "All&ow only one instance to run" msgstr "&Äîçâîëèòè çàïóñê ëèøå îäí³º¿ êîﳿ" -#: Merge.rc:938 +#: Merge.rc:959 #, c-format msgid "As&k when closing multiple windows" msgstr "Çàïèòàòè ïåðåä çàêðèòòÿì äåê³ëüêîõ â³êîí" -#: Merge.rc:940 +#: Merge.rc:961 #, c-format msgid "&Preserve file time in file compare" msgstr "Çáåð³ãàòè ÷àñ ôàéëó ïðè ïîð³âíÿíí³" -#: Merge.rc:943 +#: Merge.rc:964 #, c-format msgid "Show \"Select Files or Folders\" Dialog on Startup" msgstr "Ïîêàçóâàòè ïðè çàïóñêó ä³àëîã âèáîðó ôàéë³â òà òåê" -#: Merge.rc:945 +#: Merge.rc:966 #, c-format msgid "Close \"Select Files or Folders\" Dialog on clicking OK button" msgstr "" -#: Merge.rc:947 +#: Merge.rc:968 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "ijàëîã Àâòîìàòè÷íîãî äîïîâíåííÿ:" -#: Merge.rc:950 +#: Merge.rc:971 #, c-format msgid "Language:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:974 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge íå ïîêàçóº äåÿê³ ïîâ³äîìëåííÿ. Íàòèñí³òü Ñêèíóòè, ùîá äåìîíñòðóâàëèñÿ âñ³ ïîâ³äîìëåííÿ." -#: Merge.rc:955 +#: Merge.rc:976 #, c-format msgid "Reset" msgstr "Ñêèíóòè" -#: Merge.rc:962 -#: Merge.rc:988 +#: Merge.rc:983 +#: Merge.rc:1009 #, c-format msgid "Find" msgstr "Çíàéòè" -#: Merge.rc:965 -#: Merge.rc:991 -#: Merge.rc:1010 +#: Merge.rc:986 +#: Merge.rc:1012 +#: Merge.rc:1031 #, c-format msgid "Fi&nd what:" msgstr "&Ïîøóê:" -#: Merge.rc:968 -#: Merge.rc:994 -#: Merge.rc:1016 +#: Merge.rc:989 +#: Merge.rc:1015 +#: Merge.rc:1037 #, c-format msgid "Match &whole word only" msgstr "Âèêîíàòè ïîøóê ñëîâà &ö³ëêîì" -#: Merge.rc:970 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:991 +#: Merge.rc:1017 +#: Merge.rc:1039 #, c-format msgid "Match &case" msgstr "Âðàõîâóâàòè &ðåã³ñòð" -#: Merge.rc:972 -#: Merge.rc:998 -#: Merge.rc:1020 +#: Merge.rc:993 +#: Merge.rc:1019 +#: Merge.rc:1041 #, c-format msgid "Regular &expression" msgstr "Ðå&ãóëÿðí³ âèðàçè" -#: Merge.rc:974 +#: Merge.rc:995 #, c-format msgid "D&on't wrap end of file" msgstr "Í&å çóïèíÿòèñÿ ïðè äîñÿãíåíí³ ê³íöÿ ôàéëó " -#: Merge.rc:977 +#: Merge.rc:998 #, c-format msgid "&Don't close this dialog box" msgstr "" -#: Merge.rc:980 +#: Merge.rc:1001 #, c-format msgid "Find &Prev" msgstr "" -#: Merge.rc:981 -#: Merge.rc:1030 +#: Merge.rc:1002 +#: Merge.rc:1051 #, c-format msgid "&Find Next" msgstr "&Äàë³" -#: Merge.rc:1000 -#: Merge.rc:2014 +#: Merge.rc:1021 +#: Merge.rc:2035 #, c-format msgid "&Ok" msgstr "&OÊ" -#: Merge.rc:1007 +#: Merge.rc:1028 #, c-format msgid "Replace" msgstr "Çàì³íà" -#: Merge.rc:1013 +#: Merge.rc:1034 #, c-format msgid "Re&place with:" msgstr "Çà&ì³íà: " -#: Merge.rc:1022 +#: Merge.rc:1043 #, c-format msgid "&Don't wrap end of file" msgstr "Íå çóïèíÿòèñÿ ïðè äîñÿãíåíí³ ê³íöÿ ôàéëó" -#: Merge.rc:1025 +#: Merge.rc:1046 #, c-format msgid "Replace in" msgstr "Çàì³íèòè" -#: Merge.rc:1026 +#: Merge.rc:1047 #, c-format msgid "&Selection" msgstr " â³&äçíà÷åíîìó" -#: Merge.rc:1028 +#: Merge.rc:1049 #, c-format msgid "Wh&ole file" msgstr " âñüîìó &ôàéë³" -#: Merge.rc:1031 +#: Merge.rc:1052 #, c-format msgid "&Replace" msgstr "&Çàì³íèòè" -#: Merge.rc:1032 +#: Merge.rc:1053 #, c-format msgid "Replace &All" msgstr "Ç&àì³íèòè âñþäè" -#: Merge.rc:1042 +#: Merge.rc:1063 #, c-format msgid "CheckOut" msgstr "Ïåðåâ³ðèòè" -#: Merge.rc:1047 -#: Merge.rc:1373 +#: Merge.rc:1068 +#: Merge.rc:1394 #, c-format msgid "Comments" msgstr "Êîìåíòàð³" -#: Merge.rc:1050 +#: Merge.rc:1071 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn ï³ñëÿ checkout" -#: Merge.rc:1056 +#: Merge.rc:1077 #, c-format msgid "Linefilters" msgstr "Ô³ëüòðè ðÿäê³â" -#: Merge.rc:1059 +#: Merge.rc:1080 #, c-format msgid "Enable Line Filters" msgstr "Äîçâîëèòè ô³ëüòðè ðÿäê³â" -#: Merge.rc:1062 +#: Merge.rc:1083 #, c-format msgid "Regular Expressions (one per line):" msgstr "Ðåãóëÿðí³ âèðàçè (îäèí íà ðÿäîê):" -#: Merge.rc:1067 +#: Merge.rc:1088 #, c-format msgid "New" msgstr "Ñòâîðèòè" -#: Merge.rc:1068 +#: Merge.rc:1089 #, c-format msgid "Edit" msgstr "Ðåäàêö³ÿ" -#: Merge.rc:1069 +#: Merge.rc:1090 #, c-format msgid "Remove" msgstr "Âèëó÷èòè" -#: Merge.rc:1074 -#: Merge.rc:2043 +#: Merge.rc:1095 +#: Merge.rc:2064 #, c-format msgid "Colors" msgstr "Êîëüîðè" -#: Merge.rc:1077 +#: Merge.rc:1098 #, c-format msgid "Difference:" msgstr "³äì³íí³ñòü:" -#: Merge.rc:1081 +#: Merge.rc:1102 #, c-format msgid "Selected Difference:" msgstr "³äçíà÷åíà â³äì³íí³ñòü:" -#: Merge.rc:1085 -#: Merge.rc:1733 +#: Merge.rc:1106 +#: Merge.rc:1754 #, c-format msgid "Background" msgstr "Òëî" -#: Merge.rc:1086 +#: Merge.rc:1107 #, c-format msgid "Deleted" msgstr "Âèëó÷åí³" -#: Merge.rc:1103 -#: Merge.rc:1526 -#: Merge.rc:1734 -#: Merge.rc:2044 +#: Merge.rc:1124 +#: Merge.rc:1547 +#: Merge.rc:1755 +#: Merge.rc:2065 #, c-format msgid "Text" msgstr "Òåêñò" -#: Merge.rc:1107 +#: Merge.rc:1128 #, c-format msgid "Ignored Difference:" msgstr "²ãíîðîâàí³ â³äì³ííîñò³:" -#: Merge.rc:1119 +#: Merge.rc:1140 #, c-format msgid "Moved:" msgstr "Ïåðåì³ùåí³:" -#: Merge.rc:1131 +#: Merge.rc:1152 #, c-format msgid "Selected Moved:" msgstr "³äçíà÷åí³ ïåðåì³ùåí³:" -#: Merge.rc:1140 +#: Merge.rc:1161 #, c-format msgid "Same As The Next(3 panes):" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1173 #, c-format msgid "Same As The Next(Selected):" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1185 #, c-format msgid "Word Difference:" msgstr "Ñëîâíèêîâà â³äì³íí³ñòü:" -#: Merge.rc:1176 +#: Merge.rc:1197 #, c-format msgid "Selected Word Diff:" msgstr "³äçíà÷åíà ñëîâíèêîâà â³äì³íí³ñòü:" -#: Merge.rc:1189 -#: Merge.rc:1260 -#: Merge.rc:1292 -#: Merge.rc:1376 -#: Merge.rc:1572 -#: Merge.rc:1867 -#: Merge.rc:1881 -#: Merge.rc:1891 +#: Merge.rc:1210 +#: Merge.rc:1281 +#: Merge.rc:1313 +#: Merge.rc:1397 +#: Merge.rc:1593 +#: Merge.rc:1888 +#: Merge.rc:1902 +#: Merge.rc:1912 #, c-format msgid "Defaults" msgstr "Çâè÷àéí³ ïàðàìåòðè" -#: Merge.rc:1194 -#: Merge.rc:2046 +#: Merge.rc:1215 +#: Merge.rc:2067 #, c-format msgid "System" msgstr "Ñèñòåìà" -#: Merge.rc:1197 +#: Merge.rc:1218 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Ïåðåì³ùóâàòè âèëó÷åí³ ôàéëè äî êîøèêà" -#: Merge.rc:1199 +#: Merge.rc:1220 #, c-format msgid "&External editor:" msgstr "Çîâí³øí³é ðåäàêòîð:" -#: Merge.rc:1202 +#: Merge.rc:1223 #, c-format msgid "&Filter folder:" msgstr "&Ô³ëüòðè:" -#: Merge.rc:1205 +#: Merge.rc:1226 #, c-format msgid "Temporary files folder" msgstr "Òåêà äëÿ òèì÷àñîâèõ ôàéë³â" -#: Merge.rc:1206 +#: Merge.rc:1227 #, c-format msgid "S&ystem's temp folder" msgstr "Ñèñòåìíà òåêà Temp" -#: Merge.rc:1208 +#: Merge.rc:1229 #, c-format msgid "C&ustom folder:" msgstr "Âëàñíà òåêà:" -#: Merge.rc:1217 +#: Merge.rc:1238 #, c-format msgid "Patch Generator" msgstr "Ãåíåðàòîð ëàòîê" -#: Merge.rc:1220 +#: Merge.rc:1241 #, c-format msgid "File&1:" msgstr "Ôàéë 1:" -#: Merge.rc:1224 +#: Merge.rc:1245 #, c-format msgid "File&2:" msgstr "Ôàéë 2:" -#: Merge.rc:1228 +#: Merge.rc:1249 #, c-format msgid "&Swap" msgstr "Ïîì³íÿòè" -#: Merge.rc:1229 +#: Merge.rc:1250 #, c-format msgid "&Append to existing file" msgstr "Äîäàòè â ³ñíóþ÷èé ôàéë" -#: Merge.rc:1231 +#: Merge.rc:1252 #, c-format msgid "&Result:" msgstr "Ðåçóëüòàò:" -#: Merge.rc:1234 +#: Merge.rc:1255 #, c-format msgid "Bro&wse..." msgstr "Ïåðå&ãëÿä..." -#: Merge.rc:1235 +#: Merge.rc:1256 #, c-format msgid "&Format" msgstr "Ôîðìàò" -#: Merge.rc:1236 +#: Merge.rc:1257 #, c-format msgid "St&yle:" msgstr "Ñòèëü:" -#: Merge.rc:1239 +#: Merge.rc:1260 #, c-format msgid "&Context:" msgstr "Êîíòåêñò:" -#: Merge.rc:1249 +#: Merge.rc:1270 #, c-format msgid "Ignor&e blank lines" msgstr "Ïðîïóñêàòè ïîðîæí³ ðÿäêè" -#: Merge.rc:1256 +#: Merge.rc:1277 #, c-format msgid "Inclu&de command line" msgstr "Ââ³ì&êíóòè êîìàíäíèé ðÿäîê" -#: Merge.rc:1258 +#: Merge.rc:1279 #, c-format msgid "Open to e&xternal editor" msgstr "³äêðèòè ó çîâí³øíüîìó ðåäàêòîð³" -#: Merge.rc:1283 +#: Merge.rc:1304 #, c-format msgid "Display Columns" msgstr "³äîáðàæàòè ñòîâï÷èêè" -#: Merge.rc:1289 +#: Merge.rc:1310 #, c-format msgid "Move &Up" msgstr "&Âãîðó" -#: Merge.rc:1290 +#: Merge.rc:1311 #, c-format msgid "Move &Down" msgstr "Â&íèç" -#: Merge.rc:1300 +#: Merge.rc:1321 #, c-format msgid "Select Unpacker" msgstr "Âèá³ð ðîçïàêóâàëüíèêà" -#: Merge.rc:1305 +#: Merge.rc:1326 #, c-format msgid "File unpacker:" msgstr "Ôàéë ðîçïàêóâàëüíèêà:" -#: Merge.rc:1308 +#: Merge.rc:1329 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Ïîêàçóâàòè âñ³ ðîçïàêóâàëüíèêè, íå ïåðåâ³ðÿþ÷è ðîçøèðåííÿ" -#: Merge.rc:1311 +#: Merge.rc:1332 #, c-format msgid "Extensions list:" msgstr "Ñïèñîê ðîçøèðåíü:" -#: Merge.rc:1312 +#: Merge.rc:1333 #, c-format msgid "Description:" msgstr "Îïèñ:" -#: Merge.rc:1323 +#: Merge.rc:1344 #, c-format msgid "Stop" msgstr "Çóïèíèòè" -#: Merge.rc:1328 +#: Merge.rc:1349 #, c-format msgid "Comparing items..." msgstr "Òðèâຠïîð³âíÿííÿ..." -#: Merge.rc:1329 +#: Merge.rc:1350 #, c-format msgid "Items compared:" msgstr "Îïðàöüîâàíèõ:" -#: Merge.rc:1330 +#: Merge.rc:1351 #, c-format msgid "Items total:" msgstr "Âñüîãî:" -#: Merge.rc:1337 +#: Merge.rc:1358 #, c-format msgid "Go To" msgstr "Ïåðåéòè" -#: Merge.rc:1340 +#: Merge.rc:1361 #, c-format msgid "G&oto:" msgstr "&Äî:" -#: Merge.rc:1342 +#: Merge.rc:1363 #, c-format msgid "File" msgstr "Ôàéë" -#: Merge.rc:1345 -#: Merge.rc:1681 -#, c-format -msgid "&Middle" -msgstr "" - -#: Merge.rc:1349 +#: Merge.rc:1370 #, c-format msgid "Goto what" msgstr "Äî ÷îãî" -#: Merge.rc:1350 +#: Merge.rc:1371 #, c-format msgid "Li&ne" msgstr "&Ðÿäîê" -#: Merge.rc:1352 +#: Merge.rc:1373 #, c-format msgid "&Difference" msgstr "&³äì³íí³ñòü" -#: Merge.rc:1354 +#: Merge.rc:1375 #, c-format msgid "&Go To" msgstr "Ïåðåéò&è" -#: Merge.rc:1360 -#: Merge.rc:2041 +#: Merge.rc:1381 +#: Merge.rc:2062 #, c-format msgid "Compare" msgstr "Ïîð³âíÿííÿ" -#: Merge.rc:1363 +#: Merge.rc:1384 #, c-format msgid "Whitespace" msgstr "Ïðîïóñêè" -#: Merge.rc:1364 +#: Merge.rc:1385 #, c-format msgid "&Compare" msgstr "Âðàõîâóâàòè &ïðîïóñêè" -#: Merge.rc:1365 +#: Merge.rc:1386 #, c-format msgid "&Ignore change" msgstr "Íåõòóâàòè çì³íåíèìè ïðîïóñêàìè" -#: Merge.rc:1366 +#: Merge.rc:1387 #, c-format msgid "I&gnore all" msgstr "Íåõòóâàòè &âñ³ìà ïðîïóñêàìè" -#: Merge.rc:1367 +#: Merge.rc:1388 #, c-format msgid "Ignore blan&k lines" msgstr "Íåõòóâàòè ïîðîæí³ìè &ë³í³ÿìè" -#: Merge.rc:1368 +#: Merge.rc:1389 #, c-format msgid "Ignore &case" msgstr "Íåõòóâàòè ð&åã³ñòð" -#: Merge.rc:1371 +#: Merge.rc:1392 #, c-format msgid "E&nable moved block detection" msgstr "Âèÿâëåííÿ ïåðåì³&ùåíèõ áëîê³â" -#: Merge.rc:1372 +#: Merge.rc:1393 #, c-format msgid "&Match similar lines" msgstr "Âèêîíàòè ïîøóê ñõîæèõ ðÿäê³â" -#: Merge.rc:1374 +#: Merge.rc:1395 #, c-format msgid "Filter Comments" msgstr "Ô³ëüòð êîìåíòàð³â" -#: Merge.rc:1381 -#: Merge.rc:2042 +#: Merge.rc:1402 +#: Merge.rc:2063 #, c-format msgid "Editor" msgstr "Ðåäàêòîð" -#: Merge.rc:1384 +#: Merge.rc:1405 #, c-format msgid "&Highlight syntax" msgstr "ϳäñâ³÷óâàòè ñèíòàêñèñ" -#: Merge.rc:1386 +#: Merge.rc:1407 #, c-format msgid "&Automatic rescan" msgstr "Àâòîìàòè÷íå &ïåðåñêàíóâàííÿ" -#: Merge.rc:1388 +#: Merge.rc:1409 #, c-format msgid "&Preserve original EOL chars" msgstr "Îðèã³íàëüí³ ñèìâîëè çàê³í÷åííÿ ðÿäêà" -#: Merge.rc:1390 +#: Merge.rc:1411 #, c-format msgid "Tabs" msgstr "³äñòóïè" -#: Merge.rc:1391 +#: Merge.rc:1412 #, c-format msgid "&Tab size:" msgstr "Ðîçì³ð &â³äñòóïó:" -#: Merge.rc:1394 +#: Merge.rc:1415 #, c-format msgid "&Insert Tabs" msgstr "&Òàáóëÿö³¿" -#: Merge.rc:1396 +#: Merge.rc:1417 #, c-format msgid "Insert &Spaces" msgstr "&Ïðîïóñêè" -#: Merge.rc:1398 +#: Merge.rc:1419 #, c-format msgid "Line Difference Coloring" msgstr "ϳäñâ³÷óâàííÿ â³äì³ííîñòåé ó ðÿäêó" -#: Merge.rc:1400 +#: Merge.rc:1421 #, c-format msgid "View line differences" msgstr "Ïîêàçóâàòè â³äì³ííîñò³ â ðÿäêó" -#: Merge.rc:1402 +#: Merge.rc:1423 #, c-format msgid "&Character level" msgstr "Çà ñèìâîëàìè" -#: Merge.rc:1404 +#: Merge.rc:1425 #, c-format msgid "&Word-level:" msgstr "Çà ñëîâàìè:" -#: Merge.rc:1408 +#: Merge.rc:1429 #, c-format msgid "W&ord break characters:" msgstr "Ñèìâîëè, ÿêèììè ðîçáèâàþòüñÿ ñëîâà" -#: Merge.rc:1421 +#: Merge.rc:1442 #, c-format msgid "Filefilters" msgstr "Ô³ëüòðè ôàéë³â" -#: Merge.rc:1427 +#: Merge.rc:1448 #, c-format msgid "Test" msgstr "Âèïðîáóâàòè" -#: Merge.rc:1428 +#: Merge.rc:1449 #, c-format msgid "Install..." msgstr "Âñòàíîâèòè" -#: Merge.rc:1429 +#: Merge.rc:1450 #, c-format msgid "New..." msgstr "Ñòâîðèòè..." -#: Merge.rc:1430 +#: Merge.rc:1451 #, c-format msgid "Edit..." msgstr "Çì³íèòè..." -#: Merge.rc:1431 +#: Merge.rc:1452 #, c-format msgid "Delete..." msgstr "Âèëó÷èòè..." -#: Merge.rc:1437 +#: Merge.rc:1458 #, c-format msgid "Save modified files?" msgstr "Çáåðåãòè çì³íè ó ôàéëàõ" -#: Merge.rc:1440 +#: Merge.rc:1461 #, c-format msgid "Left side file" msgstr "Ôàéë ç ë³âî¿ ñòîðîíè" -#: Merge.rc:1443 +#: Merge.rc:1464 #, c-format msgid "&Save changes" msgstr "&Çáåðåãòè çì³íè" -#: Merge.rc:1445 +#: Merge.rc:1466 #, c-format msgid "&Discard changes" msgstr "&Ñêàñóâàòè çì³íè" -#: Merge.rc:1447 +#: Merge.rc:1468 #, c-format msgid "Middle side file" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1471 #, c-format msgid "Sa&ve changes" msgstr "" -#: Merge.rc:1452 +#: Merge.rc:1473 #, c-format msgid "Disca&rd changes" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1475 #, c-format msgid "Right side file" msgstr "Ôàéë ç ïðàâî¿ ñòîðîíè" -#: Merge.rc:1457 +#: Merge.rc:1478 #, c-format msgid "S&ave changes" msgstr "Ç&áåðåãòè çì³íè" -#: Merge.rc:1459 +#: Merge.rc:1480 #, c-format msgid "Dis&card changes" msgstr "³&äõèëèòè çì³íè" -#: Merge.rc:1461 +#: Merge.rc:1482 #, c-format msgid "Disca&rd All" msgstr "Ñêàñó&âàòè âñå" -#: Merge.rc:1468 -#: Merge.rc:1674 -#: Merge.rc:2048 +#: Merge.rc:1489 +#: Merge.rc:1695 +#: Merge.rc:2069 #, c-format msgid "Codepage" msgstr "Ñòîð³íêà êîäóâàííÿ" -#: Merge.rc:1471 +#: Merge.rc:1492 #, c-format msgid "Default Codepage" msgstr "Çâè÷àéíà ñòîð³íêà êîäóâàííÿ" -#: Merge.rc:1472 +#: Merge.rc:1493 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Âèáåð³òü çâè÷àéíó ñòîð³íêó êîäóâàííÿ äëÿ íå Þí³êîäíèõ ôàéë³â:" -#: Merge.rc:1474 +#: Merge.rc:1495 #, c-format msgid "" "Detect codepage info for these files: .html, .rc, .xml \n" @@ -2291,692 +2354,692 @@ msgstr "" "Âèÿâëåííÿ ³íôîðìàö³¿ ïðî êîäîâó ñòîð³íêó äëÿ ôàéë³â\n" " .html, .rc, .xml âèìàãຠïåðåçàïóñêó" -#: Merge.rc:1477 +#: Merge.rc:1498 #, c-format msgid "Detect codepage for text files using mlang.dll\nneed to restart session" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1503 #, c-format msgid "System codepage" msgstr "Ñèñòåìíà ñòîð³íêà êîäóâàííÿ" -#: Merge.rc:1484 +#: Merge.rc:1505 #, c-format msgid "According to WinMerge User Interface" msgstr "Çàëåæíî â³ä ³íòåðôåéñó êîðèñòóâà÷à WinMerge" -#: Merge.rc:1486 +#: Merge.rc:1507 #, c-format msgid "Custom codepage:" msgstr "Êîäîâà ñòîð³íêà êîðèñòóâà÷à:" -#: Merge.rc:1495 +#: Merge.rc:1516 #, c-format msgid "Options" msgstr "Íàëàøòóâàííÿ" -#: Merge.rc:1506 +#: Merge.rc:1527 #, c-format msgid " Categories" msgstr " Êàòåãîð³¿" -#: Merge.rc:1508 +#: Merge.rc:1529 #, c-format msgid "Import..." msgstr "²ìïîðò..." -#: Merge.rc:1509 +#: Merge.rc:1530 #, c-format msgid "Export..." msgstr "Åêñïîðò..." -#: Merge.rc:1514 -#: Merge.rc:1722 +#: Merge.rc:1535 +#: Merge.rc:1743 #, c-format msgid "Dialog" msgstr "ijàëîã" -#: Merge.rc:1517 +#: Merge.rc:1538 #, c-format msgid "Keywords:" msgstr "Êëþ÷îâ³ ñëîâà:" -#: Merge.rc:1518 +#: Merge.rc:1539 #, c-format msgid "Function names:" msgstr "²ìåíà ôóíêö³é:" -#: Merge.rc:1519 +#: Merge.rc:1540 #, c-format msgid "Comments:" msgstr "Êîìåíòàð³:" -#: Merge.rc:1520 +#: Merge.rc:1541 #, c-format msgid "Numbers:" msgstr "×èñëà:" -#: Merge.rc:1521 +#: Merge.rc:1542 #, c-format msgid "Operators:" msgstr "Îïåðàòîðè:" -#: Merge.rc:1522 +#: Merge.rc:1543 #, c-format msgid "Strings:" msgstr "Ðÿäêè:" -#: Merge.rc:1523 +#: Merge.rc:1544 #, c-format msgid "Preprocessor:" msgstr "Ïîïåðåä. îáðàõ.:" -#: Merge.rc:1524 +#: Merge.rc:1545 #, c-format msgid "User 1:" msgstr "Êîðèñòóâà÷ 1:" -#: Merge.rc:1525 +#: Merge.rc:1546 #, c-format msgid "User 2:" msgstr "Êîðèñòóâà÷ 2:" -#: Merge.rc:1530 -#: Merge.rc:1535 -#: Merge.rc:1540 -#: Merge.rc:1545 -#: Merge.rc:1550 -#: Merge.rc:1555 -#: Merge.rc:1560 -#: Merge.rc:1565 -#: Merge.rc:1570 +#: Merge.rc:1551 +#: Merge.rc:1556 +#: Merge.rc:1561 +#: Merge.rc:1566 +#: Merge.rc:1571 +#: Merge.rc:1576 +#: Merge.rc:1581 +#: Merge.rc:1586 +#: Merge.rc:1591 #, c-format msgid "Bold" msgstr "Ãðóáèé" -#: Merge.rc:1578 +#: Merge.rc:1599 #, c-format msgid "Folder Compare Report" msgstr "Çâ³ò ïîð³âíÿííÿ òåê" -#: Merge.rc:1581 +#: Merge.rc:1602 #, c-format msgid "Report &File:" msgstr "&Ôàéë çâ³òó:" -#: Merge.rc:1584 -#: Merge.rc:1760 -#: Merge.rc:1764 -#: Merge.rc:1791 +#: Merge.rc:1605 +#: Merge.rc:1781 +#: Merge.rc:1785 +#: Merge.rc:1812 #, c-format msgid "Browse..." msgstr "Ïåðåãëÿä ..." -#: Merge.rc:1585 +#: Merge.rc:1606 #, c-format msgid "&Style:" msgstr "&Ñòèëü:" -#: Merge.rc:1588 +#: Merge.rc:1609 #, c-format msgid "&Include File Compare Report" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1611 #, c-format msgid "&Copy to Clipboard" msgstr "Êîï³þâàòè â áóôåð îáì³íó" -#: Merge.rc:1598 +#: Merge.rc:1619 #, c-format msgid "Shared or Private Filter" msgstr "Çàãàëüí³ ³ îñîáèñò³ ô³ëüòðè" -#: Merge.rc:1601 +#: Merge.rc:1622 #, c-format msgid "Which type of filter do you want to create?" msgstr "ßêèé òèï ô³ëüòðó âè õî÷åòå ñòâîðèòè?" -#: Merge.rc:1603 +#: Merge.rc:1624 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Çàãàëüíèé ô³ëüòð (äëÿ âñ³õ êîðèñòóâà÷³â öüîãî ÏÊ)" -#: Merge.rc:1605 +#: Merge.rc:1626 #, c-format msgid "Private Filter (only for current user)" msgstr "Îñîáèñòèé ô³ëüòð (ëèøå äëÿ ïîòî÷íîãî êîðèñòóâà÷à)" -#: Merge.rc:1613 -#: Merge.rc:2049 +#: Merge.rc:1634 +#: Merge.rc:2070 #, c-format msgid "Archive Support" msgstr "ϳäòðèìêà àðõ³â³â" -#: Merge.rc:1616 +#: Merge.rc:1637 #, c-format msgid "&Enable archive file support" msgstr "&Ââ³ìêíóòè ï³äòðèìêó àðõ³â³â" -#: Merge.rc:1618 +#: Merge.rc:1639 #, c-format msgid "&Detect archive type from file signature" msgstr "&Âèçíà÷àòè òèï àðõ³âó çà ñèãíàòóðîþ àáî çàãîëîâêîì ôàéëó" -#: Merge.rc:1626 +#: Merge.rc:1647 #, c-format msgid "Compare Statistics" msgstr "Ïîð³âíÿííÿ ñòàòèñòèêè" -#: Merge.rc:1629 +#: Merge.rc:1650 #, c-format msgid "Folders:" msgstr "Òåêè:" -#: Merge.rc:1630 +#: Merge.rc:1651 #, c-format msgid "Files:" msgstr "Ôàéëè:" -#: Merge.rc:1631 -#: Merge.rc:2401 +#: Merge.rc:1652 +#: Merge.rc:2445 #, c-format msgid "Different" msgstr "³äð³çíÿþòüñÿ" -#: Merge.rc:1632 +#: Merge.rc:1653 #, c-format msgid "Text:" msgstr "Òåêñò:" -#: Merge.rc:1635 -#: Merge.rc:1659 +#: Merge.rc:1656 +#: Merge.rc:1680 #, c-format msgid "Binary:" msgstr "Á³íàðí³:" -#: Merge.rc:1638 +#: Merge.rc:1659 #, c-format msgid "Unique" msgstr "Óí³êàëüí³" -#: Merge.rc:1639 +#: Merge.rc:1660 #, c-format msgid "Left:" msgstr "˳âîðó÷:" -#: Merge.rc:1644 +#: Merge.rc:1665 #, c-format msgid "Middle:" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1670 #, c-format msgid "Right:" msgstr "Ïðàâîðó÷:" -#: Merge.rc:1654 -#: Merge.rc:2391 +#: Merge.rc:1675 +#: Merge.rc:2435 #, c-format msgid "Identical" msgstr "Îäíàêîâ³" -#: Merge.rc:1663 +#: Merge.rc:1684 #, c-format msgid "Total:" msgstr "Âñüîãî:" -#: Merge.rc:1668 +#: Merge.rc:1689 #, c-format msgid "Close" msgstr "Çàêðèòè" -#: Merge.rc:1677 +#: Merge.rc:1698 #, c-format msgid "Affects" msgstr "Çàñòîñóâàòè äî:" -#: Merge.rc:1680 -#: Merge.rc:1683 -#: Merge.rc:1686 +#: Merge.rc:1701 +#: Merge.rc:1704 +#: Merge.rc:1707 #, c-format msgid "(Affects)" msgstr "(çàñòîñóâàòè)" -#: Merge.rc:1687 +#: Merge.rc:1708 #, c-format msgid "Select Codepage for" msgstr "Âèáðàòè ñòîð³íêó êîäóâàííÿ äëÿ" -#: Merge.rc:1688 +#: Merge.rc:1709 #, c-format msgid "&File Loading:" msgstr "Çàâàíò. ôàéëó:" -#: Merge.rc:1691 +#: Merge.rc:1712 #, c-format msgid "File &Saving:" msgstr "Çáåðåæåííÿ ôàéëó:" -#: Merge.rc:1694 +#: Merge.rc:1715 #, c-format msgid "&Use same codepage for both" msgstr "Âèêîðèñòàòè òó ñàìó ñòîð³íêó êîäóâàííÿ" -#: Merge.rc:1697 +#: Merge.rc:1718 #, c-format msgid "&Apply" msgstr "&Çàñòîñóâàòè" -#: Merge.rc:1698 -#: Merge.rc:2015 +#: Merge.rc:1719 +#: Merge.rc:2036 #, c-format msgid "&Cancel" msgstr "&Ñêàñóâàòè" -#: Merge.rc:1703 +#: Merge.rc:1724 #, c-format msgid "Test Filter" msgstr "Âèïðîáóâàííÿ ô³ëüòðà" -#: Merge.rc:1706 +#: Merge.rc:1727 #, c-format msgid "Testing filter ..." msgstr "Âèïðîáóâàòè ô³ëüòð ..." -#: Merge.rc:1708 +#: Merge.rc:1729 #, c-format msgid "&Enter text to test:" msgstr "Âêàæ³òü òåêñò äëÿ âèïðîáóâàííÿ:" -#: Merge.rc:1710 +#: Merge.rc:1731 #, c-format msgid "&Folder Name" msgstr "Òåêà" -#: Merge.rc:1712 +#: Merge.rc:1733 #, c-format msgid "Result:" msgstr "Ðåçóëüòàò:" -#: Merge.rc:1716 +#: Merge.rc:1737 #, c-format msgid "&Test" msgstr "&Âèïðîáóâàòè" -#: Merge.rc:1717 +#: Merge.rc:1738 #, c-format msgid "&Close" msgstr "&Çàêðèòè" -#: Merge.rc:1725 +#: Merge.rc:1746 #, c-format msgid "&Use customized text colors" msgstr "Âèêîðèñòàòè îñîáëèâ³ êîëüîðè" -#: Merge.rc:1728 +#: Merge.rc:1749 #, c-format msgid "Custom text colors" msgstr "Íàëàøòóâàòè êîëüîðè" -#: Merge.rc:1730 +#: Merge.rc:1751 #, c-format msgid "Whitespace:" msgstr "Ïðîïóñêè:" -#: Merge.rc:1731 +#: Merge.rc:1752 #, c-format msgid "Regular text:" msgstr "Çâè÷àéíèé òåêñò:" -#: Merge.rc:1732 +#: Merge.rc:1753 #, c-format msgid "Selection:" msgstr "³äçíà÷. òåêñò:" -#: Merge.rc:1755 +#: Merge.rc:1776 #, c-format msgid "Paths" msgstr "Øëÿõè" -#: Merge.rc:1758 +#: Merge.rc:1779 #, c-format msgid "&Left:" msgstr "&˳âèé:" -#: Merge.rc:1761 +#: Merge.rc:1782 #, c-format msgid "R&ead-only" msgstr "Ëèøå ÷èòàííÿ" -#: Merge.rc:1762 +#: Merge.rc:1783 #, c-format msgid "&Right:" msgstr "&Ïðàâèé:" -#: Merge.rc:1765 +#: Merge.rc:1786 #, c-format msgid "Re&ad-only" msgstr "Ëèøå ÷èòàííÿ" -#: Merge.rc:1766 +#: Merge.rc:1787 #, c-format msgid "&Filter:" msgstr "&Ô³ëüòð:" -#: Merge.rc:1771 +#: Merge.rc:1792 #, c-format msgid "Open..." msgstr "³äêðèòè..." -#: Merge.rc:1772 +#: Merge.rc:1793 #, c-format msgid "Save..." msgstr "Çáåðåãòè..." -#: Merge.rc:1777 -#: Merge.rc:2050 +#: Merge.rc:1798 +#: Merge.rc:2071 #, c-format msgid "Backup Files" msgstr "Ðåçåðâí³ êîﳿ" -#: Merge.rc:1780 +#: Merge.rc:1801 #, c-format msgid "Create backup files in:" msgstr "Ñòâîðèòè ðåçåðâí³ ôàéëè äëÿ:" -#: Merge.rc:1781 +#: Merge.rc:1802 #, c-format msgid "&Folder compare" msgstr "Ïîð³âíÿííÿ &òåê" -#: Merge.rc:1783 +#: Merge.rc:1804 #, c-format msgid "Fil&e compare" msgstr "Ïîð³âíÿííÿ &ôàéë³â" -#: Merge.rc:1785 +#: Merge.rc:1806 #, c-format msgid "Create backup files into:" msgstr "Ñòâîðèòè ðåçåðâí³ ôàéëè:" -#: Merge.rc:1786 +#: Merge.rc:1807 #, c-format msgid "&Original file's folder" msgstr "â òåö³ ç &îðèã³íàëüíèì ôàéëîì" -#: Merge.rc:1788 +#: Merge.rc:1809 #, c-format msgid "&Global backup folder:" msgstr "â &çàãàëüí³é òåö³:" -#: Merge.rc:1792 +#: Merge.rc:1813 #, c-format msgid "Backup filename:" msgstr "²ì'ÿ ðåçåðâíîãî ôàéëó:" -#: Merge.rc:1793 +#: Merge.rc:1814 #, c-format msgid "&Append .bak -extension" msgstr "&Äîäàòè ðîçøèðåííÿ .bak" -#: Merge.rc:1795 +#: Merge.rc:1816 #, c-format msgid "A&ppend timestamp" msgstr "Äîäàòè äàòó" -#: Merge.rc:1802 -#: Merge.rc:2314 +#: Merge.rc:1823 +#: Merge.rc:2358 #, c-format msgid "Confirm Copy" msgstr "ϳäòâåðäæåííÿ" -#: Merge.rc:1806 +#: Merge.rc:1827 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Âè ä³éñíî õî÷åòå ñêîï³þâàòè XXX åëåìåíòè?" -#: Merge.rc:1808 +#: Merge.rc:1829 #, c-format msgid "From left" msgstr "˳âîðó÷" -#: Merge.rc:1811 +#: Merge.rc:1832 #, c-format msgid "To right" msgstr "Ïðàâîðó÷" -#: Merge.rc:1814 +#: Merge.rc:1835 #, c-format msgid "Yes" msgstr "Òàê" -#: Merge.rc:1815 +#: Merge.rc:1836 #, c-format msgid "No" msgstr "ͳ" -#: Merge.rc:1821 +#: Merge.rc:1842 #, c-format msgid "Plugins" msgstr "Äîïîâíåííÿ" -#: Merge.rc:1824 +#: Merge.rc:1845 #, c-format msgid "&Enable plugins" msgstr "&Ââ³ìêíóòè äîïîâíåííÿ" -#: Merge.rc:1836 -#: Merge.rc:2051 +#: Merge.rc:1857 +#: Merge.rc:2072 #, c-format msgid "Shell Integration" msgstr "Âæèâëåííÿ â îáîëîíêó" -#: Merge.rc:1839 +#: Merge.rc:1860 #, c-format msgid "Explorer" msgstr "Ïðîâ³äíèê" -#: Merge.rc:1840 +#: Merge.rc:1861 #, c-format msgid "E&nable advanced menu" msgstr "Â&â³ìêíóòè ðîçøèðåíå ìåíþ" -#: Merge.rc:1842 +#: Merge.rc:1863 #, c-format msgid "&Add to context menu" msgstr "&Äîäàòè äî êîíòåêñòíîãî ìåíþ" -#: Merge.rc:1844 +#: Merge.rc:1865 #, c-format msgid "&Register shell extension" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1866 #, c-format msgid "&Unregister shell extension" msgstr "" -#: Merge.rc:1850 -#: Merge.rc:2054 -#: Merge.rc:2335 +#: Merge.rc:1871 +#: Merge.rc:2075 +#: Merge.rc:2379 #, c-format msgid "Folder" msgstr "Òåêà" -#: Merge.rc:1855 +#: Merge.rc:1876 #, c-format msgid "S&top after first difference" msgstr "&Çóïèíÿòèñÿ ï³ñëÿ ïåðøî¿ â³äì³ííîñò³" -#: Merge.rc:1857 +#: Merge.rc:1878 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Íåõòóâàòè ð³çíèöåþ ÷àñó, ìåíøîþ 3 ñåêóíä" -#: Merge.rc:1859 +#: Merge.rc:1880 #, c-format msgid "&Include unique subfolders contents" msgstr "" -#: Merge.rc:1861 +#: Merge.rc:1882 #, c-format msgid "&Automatically expand all subfolders" msgstr "" -#: Merge.rc:1863 +#: Merge.rc:1884 #, c-format msgid "Ignore &Reparse Points" msgstr "" -#: Merge.rc:1865 +#: Merge.rc:1886 #, c-format msgid "&Quick compare limit (MB):" msgstr "" -#: Merge.rc:1872 -#: Merge.rc:2056 -#: Merge.rc:2376 -#: Merge.rc:2582 +#: Merge.rc:1893 +#: Merge.rc:2077 +#: Merge.rc:2420 +#: Merge.rc:2626 #, c-format msgid "Binary" msgstr "Á³íàðíèé" -#: Merge.rc:1875 +#: Merge.rc:1896 #, c-format msgid "Binary File &Patterns:" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1898 #, c-format msgid "Frhed settings" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1899 #, c-format msgid "View &Settings..." msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1900 #, c-format msgid "&Binary Mode..." msgstr "" -#: Merge.rc:1880 +#: Merge.rc:1901 #, c-format msgid "&Character Set..." msgstr "" -#: Merge.rc:1886 -#: Merge.rc:2055 +#: Merge.rc:1907 +#: Merge.rc:2076 #, c-format msgid "Image" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1910 #, c-format msgid "Image File &Patterns:" msgstr "" -#: Merge.rc:1902 +#: Merge.rc:1923 #, c-format msgid "&Hex View" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1927 +#: Merge.rc:1948 #, c-format msgid "040904e4" msgstr "042204e3" #. VarFileInfo.Translation -#: Merge.rc:1943 +#: Merge.rc:1964 #, c-format msgid "0x409, 1252" msgstr "0x422, 1251" -#: Merge.rc:1963 +#: Merge.rc:1984 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1964 +#: Merge.rc:1985 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1965 +#: Merge.rc:1986 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1966 +#: Merge.rc:1987 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1967 +#: Merge.rc:1988 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1968 +#: Merge.rc:1989 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1974 +#: Merge.rc:1995 #, c-format msgid "\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1996 #, c-format msgid "\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1997 #, c-format msgid "\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1982 +#: Merge.rc:2003 #, c-format msgid "Unknown error attempting to open project file" msgstr "Íåâ³äîìà ïîìèëêà ïðè â³äêðèòò³ ôàéëó ïðîåêòó" -#: Merge.rc:1983 +#: Merge.rc:2004 #, c-format msgid "Unknown error attempting to save project file" msgstr "Íåâ³äîìà ïîìèëêà ïðè çáåðåæåíí³ ôàéëó ïðîåêòó" -#: Merge.rc:1984 +#: Merge.rc:2005 #, c-format msgid "Project File" msgstr "Ôàéë ïðîåêòó" -#: Merge.rc:1985 +#: Merge.rc:2006 #, c-format msgid "Project file successfully loaded." msgstr "Ôàéë ïðîåêòó óñï³øíî çàâàíòàæåíèé." -#: Merge.rc:1986 +#: Merge.rc:2007 #, c-format msgid "Project file successfully saved." msgstr "Ôàéë ïðîåêòó óñï³øíî çáåðåæåíèé." -#: Merge.rc:1992 +#: Merge.rc:2013 #, c-format msgid "\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1993 +#: Merge.rc:2014 #, c-format msgid "\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:2000 +#: Merge.rc:2021 #, c-format msgid "" "\n" @@ -2995,7 +3058,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge Ïîð³âíÿííÿ ôàéë³â" -#: Merge.rc:2001 +#: Merge.rc:2022 #, c-format msgid "" "\n" @@ -3014,7 +3077,7 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Ïîð³âíÿííÿ òåê" -#: Merge.rc:2007 +#: Merge.rc:2028 #, c-format msgid "" "Developers:\n" @@ -3023,143 +3086,143 @@ msgstr "" "Ðîçðîáíèêè:\n" "ijí Ãð³ì (Dean Grimm), Êð³ñò³àí ˳ñò (Christian List), ʳìî Âàð³ñ (Kimmo Varis), Éîõåí Òóõò (Jochen Tucht), Ò³ì Ãåðóíäò (Tim Gerundt), Òàêàø³ Ñàâàíàê³ (Takashi Sawanaki), Ãåë Õàìåð (Gal Hammer), Îëåêñàíäð Ñê³ííåð (Alexander Skinner)" -#: Merge.rc:2008 +#: Merge.rc:2029 #, 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 ïîñòàâëÿºòüñÿ ÁÅÇ ÁÓÄÜ-ßÊί ÃÀÐÀÍÒ²¯. Öå â³ëüíå ÏÎ ³ ìè ïðèâ³òàºìî éîãî ïîøèðåííÿ çã³äíî äåÿêèõ óìîâ; îçíàéîìòåñÿ ç GNU General Public License â ìåíþ Äîâ³äêà äëÿ äîêëàäí³øî¿ ³íôîðìàö³¿." -#: Merge.rc:2016 +#: Merge.rc:2037 #, c-format msgid "&Abort" msgstr "&Ïåðåðâàòè" -#: Merge.rc:2017 +#: Merge.rc:2038 #, c-format msgid "&Retry" msgstr "Ïîâ&òîðþâàòè" -#: Merge.rc:2018 +#: Merge.rc:2039 #, c-format msgid "&Ignore" msgstr "&Íåõòóâàòè" -#: Merge.rc:2019 +#: Merge.rc:2040 #, c-format msgid "Ignore &all" msgstr "Íåõòóâàòè &âñ³ì" -#: Merge.rc:2020 +#: Merge.rc:2041 #, c-format msgid "&Yes" msgstr "&Òàê" -#: Merge.rc:2026 +#: Merge.rc:2047 #, c-format msgid "Yes to &all" msgstr "Ò&àê äëÿ âñ³õ" -#: Merge.rc:2027 +#: Merge.rc:2048 #, c-format msgid "&No" msgstr "&ͳ" -#: Merge.rc:2028 +#: Merge.rc:2049 #, c-format msgid "No to a&ll" msgstr "ͳ ä&ëÿ âñ³õ" -#: Merge.rc:2029 +#: Merge.rc:2050 #, c-format msgid "&Continue" msgstr "Ïðî&äîâæèòè" -#: Merge.rc:2030 +#: Merge.rc:2051 #, c-format msgid "&Skip" msgstr "Ï&ðîïóñòèòè" -#: Merge.rc:2031 +#: Merge.rc:2052 #, c-format msgid "Skip &all" msgstr "Ïðîï&óñòèòè âñå" -#: Merge.rc:2033 +#: Merge.rc:2054 #, c-format msgid "Don't display this &message again." msgstr "Íå ïîêàçóâàòè &öå ïîâ³äîìëåííÿ çíîâó " -#: Merge.rc:2034 +#: Merge.rc:2055 #, c-format msgid "Don't ask this &question again." msgstr "Íå çàäàâàòè &öå çàïèòàííÿ çíîâó" -#: Merge.rc:2045 +#: Merge.rc:2066 #, c-format msgid "Syntax" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2068 #, c-format msgid "Version Control" msgstr "Êîíòðîëü âåðñ³é" -#: Merge.rc:2052 -#: Merge.rc:2375 +#: Merge.rc:2073 +#: Merge.rc:2419 #, c-format msgid "Differences" msgstr "³äì³ííîñò³" -#: Merge.rc:2063 +#: Merge.rc:2084 #, c-format msgid "To:" msgstr "Íà:" -#: Merge.rc:2064 +#: Merge.rc:2085 #, c-format msgid "From left:" msgstr "Çë³âà:" -#: Merge.rc:2065 +#: Merge.rc:2086 #, c-format msgid "To left:" msgstr "˳âîðó÷:" -#: Merge.rc:2066 +#: Merge.rc:2087 #, c-format msgid "From right:" msgstr "Ñïðàâà:" -#: Merge.rc:2067 +#: Merge.rc:2088 #, c-format msgid "To right:" msgstr "Ïðàâîðó÷:" -#: Merge.rc:2073 +#: Merge.rc:2094 #, c-format msgid "Version %1" msgstr "Âåðñ³ÿ %1" -#: Merge.rc:2074 +#: Merge.rc:2095 #, c-format msgid "Unicode" msgstr "Þí³êîä" -#: Merge.rc:2075 +#: Merge.rc:2096 #, c-format msgid "X64" msgstr "X64" -#: Merge.rc:2081 +#: Merge.rc:2102 #, c-format msgid "Options (%1)" msgstr "Íàëàøòóâàííÿ (%1)" -#: Merge.rc:2082 +#: Merge.rc:2103 #, c-format msgid "All message boxes are now displayed again." msgstr "Òåïåð âñ³ ïîâ³äîìëåííÿ çíîâó â³äîáðàæàòèìóòüñÿ." -#: Merge.rc:2084 +#: Merge.rc:2105 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3170,84 +3233,84 @@ msgstr "" "\n" "Âèêîðèñòàéòå çíà÷åííÿ 1 - %1." -#: Merge.rc:2090 +#: Merge.rc:2111 #, c-format msgid "Open" msgstr "³äêðèòè" -#: Merge.rc:2091 +#: Merge.rc:2112 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Ïðîãðàìè|*.exe;*.bat;*.cmd|Âñ³ ôàéëè (*.*)|*.*||" -#: Merge.rc:2092 +#: Merge.rc:2113 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Âñ³ ôàéëè (*.*)|*.*||" -#: Merge.rc:2093 +#: Merge.rc:2114 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Ôàéëè ïðîåêò³â WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:2095 +#: Merge.rc:2116 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Ôàéëè êîíô³ãóðàö³¿ (*.ini)|*.ini|Âñ³ ôàéëè (*.*)|*.*||" -#: Merge.rc:2101 +#: Merge.rc:2122 #, 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:2102 +#: Merge.rc:2123 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Ôàéëè HTML (*.htm,*.html)|*.htm;*.html|Âñ³ ôàéëè (*.*)|*.*||" -#: Merge.rc:2103 +#: Merge.rc:2124 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Ôàéëè XML (*.xml)|*.xml|Âñ³ ôàéëè (*.*)|*.*||" -#: Merge.rc:2120 -#: Merge.rc:2591 +#: Merge.rc:2141 +#: Merge.rc:2635 #, c-format msgid "Name" msgstr "²ì'ÿ" -#: Merge.rc:2121 +#: Merge.rc:2142 #, c-format msgid "Location" msgstr "̳ñöå ðîçòàøóâàííÿ" -#: Merge.rc:2122 +#: Merge.rc:2143 #, c-format msgid "Filters" msgstr "Ô³ëüòðè" -#: Merge.rc:2123 +#: Merge.rc:2144 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:2124 -#: Merge.rc:2593 +#: Merge.rc:2145 +#: Merge.rc:2637 #, c-format msgid "Description" msgstr "Îïèñ" -#: Merge.rc:2125 +#: Merge.rc:2146 #, c-format msgid "Select filename for new filter" msgstr "Âêàæ³òü ³ì'ÿ ôàéëó äëÿ íîâîãî ô³ëüòðà" -#: Merge.rc:2126 +#: Merge.rc:2147 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Ôàéëè ô³ëüòð³â (*.flt)|*.flt|Âñ³ ôàéëè (*.*)|*.*||" -#: Merge.rc:2128 +#: Merge.rc:2149 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3260,7 +3323,7 @@ msgstr "" "Ñêîï³þéòå ôàéë %1 ó òåêó ç ô³ëüòðàìè:\n" "%2." -#: Merge.rc:2130 +#: Merge.rc:2151 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3273,7 +3336,7 @@ msgstr "" "\n" "Ïåðåêîíàéòåñÿ, ùî òåêà ³ñíóº ³ äîñòóïíà äëÿ çàïèñóâàííÿ." -#: Merge.rc:2132 +#: Merge.rc:2153 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3284,7 +3347,7 @@ msgstr "" "\n" "Âêàæ³òü òåêó ç ô³ëüòðàìè íà âêëàäö³ Ñèñòåìà â Íàëàøòóâàííÿõ." -#: Merge.rc:2134 +#: Merge.rc:2155 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3297,12 +3360,12 @@ msgstr "" "\n" "Ìîæëèâî ôàéë âèêîðèñòîâóºòüñÿ." -#: Merge.rc:2135 +#: Merge.rc:2156 #, c-format msgid "Locate filter file to install" msgstr "Âêàçàòè ôàéë ô³ëüòðà" -#: Merge.rc:2137 +#: Merge.rc:2158 #, c-format msgid "" "Installing filter file failed.\n" @@ -3313,17 +3376,17 @@ msgstr "" "\n" "Íåìîæëèâî ñêîï³þâàòè ôàéë ô³ëüòðà â òåêó ç ô³ëüòðàìè." -#: Merge.rc:2139 +#: Merge.rc:2160 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Ô³ëüòð óæå ³ñíóº. Ïåðåçàïèñàòè?" -#: Merge.rc:2145 +#: Merge.rc:2166 #, c-format msgid "Regular expression" msgstr "Ðåãóëÿðíèé âèðàç" -#: Merge.rc:2151 +#: Merge.rc:2172 #, c-format msgid "" "Filters were updated. Do you want to refresh all open folder compares?\n" @@ -3334,173 +3397,173 @@ msgstr "" "\n" "ßêùî âè íå õî÷åòå ïîíîâëþâàòè âñ³ ïîð³âíÿííÿ çàðàç, Âè ìîæåòå âèáðàòè ͳ ³ ïîíîâèòè ¿õ çãîäîì." -#: Merge.rc:2158 +#: Merge.rc:2179 #, c-format msgid "&Path to SS.EXE:" msgstr "&Øëÿõ äî SS.EXE:" -#: Merge.rc:2164 +#: Merge.rc:2185 #, c-format msgid "Folder Comparison Results" msgstr "Ðåçóëüòàòè ïîð³âíÿííÿ òåê" -#: Merge.rc:2165 +#: Merge.rc:2186 #, c-format msgid "File Comparison" msgstr "Ïîð³âíÿííÿ ôàéë³â" -#: Merge.rc:2166 +#: Merge.rc:2187 #, c-format msgid "Untitled left" msgstr "Áåç³ìåííèé ë³âîðó÷" -#: Merge.rc:2167 +#: Merge.rc:2188 #, c-format msgid "Untitled middle" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2189 #, c-format msgid "Untitled right" msgstr "Áåç³ìåííèé ïðàâîðó÷" -#: Merge.rc:2169 +#: Merge.rc:2190 #, c-format msgid "Theirs File" msgstr "¯õé ôàéë" -#: Merge.rc:2170 +#: Merge.rc:2191 #, c-format msgid "Mine File" msgstr "̳é ôàéë" -#: Merge.rc:2176 +#: Merge.rc:2197 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2198 #, c-format msgid "Line: %s" msgstr "Ðÿäîê: %s" -#: Merge.rc:2178 +#: Merge.rc:2199 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2200 #, c-format msgid "Merge" msgstr "Îá'ºäíàííÿ" -#: Merge.rc:2180 +#: Merge.rc:2201 #, c-format msgid "Difference %1 of %2" msgstr "³äì³íí³ñòü %1 ç %2" -#: Merge.rc:2181 +#: Merge.rc:2202 #, c-format msgid "%1 Differences Found" msgstr "%1 â³äì³ííîñòåé çíàéøëîñÿ" -#: Merge.rc:2182 +#: Merge.rc:2203 #, c-format msgid "1 Difference Found" msgstr "Çíàéäåíà âñüîãî îäíà â³äì³íí³ñòü" #. Abbreviation from "Read Only" -#: Merge.rc:2183 +#: Merge.rc:2204 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2189 +#: Merge.rc:2210 #, c-format msgid "Item %1 of %2" msgstr "Åëåìåíò %1 ç %2" -#: Merge.rc:2190 +#: Merge.rc:2211 #, c-format msgid "Items: %1" msgstr "Åëåìåíò³â: %1" -#: Merge.rc:2196 +#: Merge.rc:2217 #, c-format msgid "Select two existing folders or files to compare" msgstr "Âèáåð³òü äâ³ ²ÑÍÓÞײ òåêè àáî ôàéëè äëÿ ïîð³âíÿííÿ" -#: Merge.rc:2197 +#: Merge.rc:2218 #, c-format msgid "Folder Selection" msgstr "Âèá³ð òåêè" -#: Merge.rc:2198 +#: Merge.rc:2219 #, c-format msgid "Select two folders or two files to compare." msgstr "Âèáåð³òü äëÿ ïîð³âíÿííÿ äâ³ òåêè àáî ôàéëè" -#: Merge.rc:2199 +#: Merge.rc:2220 #, c-format msgid "Left path is invalid!" msgstr "Øëÿõ çë³âà çàçíà÷åíèé íåïðàâèëüíî " -#: Merge.rc:2200 +#: Merge.rc:2221 #, c-format msgid "Middle path is invalid!" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2222 #, c-format msgid "Right path is invalid!" msgstr "Øëÿõ ñïðàâà çàçíà÷åíèé íåïðàâèëüíî " -#: Merge.rc:2202 +#: Merge.rc:2223 #, c-format msgid "Both paths are invalid!" msgstr "Îáèäâà øëÿõè çàçíà÷åí³ íåïðàâèëüíî " -#: Merge.rc:2203 +#: Merge.rc:2224 #, c-format msgid "Left and middle path is invalid!" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2225 #, c-format msgid "Left and right path is invalid!" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2226 #, c-format msgid "Middle and right path is invalid!" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2227 #, c-format msgid "All paths are invalid!" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2228 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Âèáåð³òü äâà ôàéëè, ùîá ââ³ìêíóòè âèá³ð ðîçïàêóâàëüíèêà" -#: Merge.rc:2208 +#: Merge.rc:2229 #, c-format msgid "Cannot compare file and folder!" msgstr "Íåìîæëèâå ïîð³âíÿííÿ ôàéëó ³ òåêè!" -#: Merge.rc:2214 +#: Merge.rc:2235 #, c-format msgid "File not found: %1" msgstr "Ôàéë íå çíàéäåíèé: %1" -#: Merge.rc:2215 +#: Merge.rc:2236 #, c-format msgid "File not unpacked: %1" msgstr "Ôàéë íå ðîçïàêîâàíèé: %1" -#: Merge.rc:2216 +#: Merge.rc:2237 #, c-format msgid "" "Cannot open file\n" @@ -3513,12 +3576,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2217 +#: Merge.rc:2238 #, c-format msgid "Failed to parse conflict file." msgstr "Ïîìèëêà ðîçáèðàííÿ ôàéëó êîíôë³êò³â" -#: Merge.rc:2218 +#: Merge.rc:2239 #, c-format msgid "" "The file\n" @@ -3529,27 +3592,27 @@ msgstr "" "%1\n" "íå º ôàéëîì êîíôë³êò³â" -#: Merge.rc:2224 +#: Merge.rc:2245 #, c-format msgid "Save As" msgstr "Çáåðåãòè ÿê..." -#: Merge.rc:2225 +#: Merge.rc:2246 #, c-format msgid "Save changes to %1?" msgstr "Çáåðåãòè çì³íè â %1?" -#: Merge.rc:2226 +#: Merge.rc:2247 #, 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 ïîçíà÷åíèé ÿê ëèøå äëÿ ÷èòàííÿ. ×è çãîäí³ âè çàì³íèòè öåé ôàéë ? (Íå äîçâîëÿº âêàçàòè íîâå ³ì'ÿ ôàéëó)" -#: Merge.rc:2227 +#: Merge.rc:2248 #, c-format msgid "Error backing up file" msgstr "Ïîìèëêà ñòâîðåííÿ ðåçåðâíî¿ êîﳿ" -#: Merge.rc:2229 +#: Merge.rc:2250 #, c-format msgid "" "Unable to backup original file:\n" @@ -3562,7 +3625,7 @@ msgstr "" "\n" "Ïðîäîâæèòè â áóäü-ÿêîìó âèïàäêó?" -#: Merge.rc:2230 +#: Merge.rc:2251 #, c-format msgid "" "Saving file failed.\n" @@ -3579,7 +3642,7 @@ msgstr "" "\t-âèêîðèñòàòè ³íøå ³ì'ÿ ôàéëó (Íàòèñí³òü OÊ)\n" "\t-ñêàñóâàòè ïîòî÷íó îïåðàö³þ (Íàòèñí³òü Ñêàñóâàòè)?" -#: Merge.rc:2231 +#: Merge.rc:2252 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3594,7 +3657,7 @@ msgstr "" "\n" "Õî÷åòå çáåðåãòè ðîçïàêîâàíó âåðñ³þ â ³íøèé ôàéë?" -#: Merge.rc:2232 +#: Merge.rc:2253 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3609,7 +3672,7 @@ msgstr "" "\n" "Õî÷åòå çáåðåãòè ðîçïàêîâàíó âåðñ³þ â ³íøèé ôàéë?" -#: Merge.rc:2233 +#: Merge.rc:2254 #, c-format msgid "" "Another application has updated file\n" @@ -3624,14 +3687,14 @@ msgstr "" "\n" "Ïåðåçàïèñàòè çì³íåíèé ôàéë?" -#: Merge.rc:2234 +#: Merge.rc:2255 #, c-format msgid "" "%1\n" "is marked read-only. Would you like to override the read-only item?" msgstr "%1 ïîçíà÷åíèé ÿê ëèøå äëÿ ÷èòàííÿ. ×è çãîäí³ âè çàì³íèòè öåé ôàéë?" -#: Merge.rc:2235 +#: Merge.rc:2256 #, c-format msgid "" "Another application has updated file\n" @@ -3646,22 +3709,22 @@ msgstr "" "\n" "Âè õî÷åòå ïåðåçàâàíòàæèòè ôàéë?" -#: Merge.rc:2236 +#: Merge.rc:2257 #, c-format msgid "Save Left File As" msgstr "Çáåðåãòè ôàéë ë³âîðó÷ ÿê..." -#: Merge.rc:2237 +#: Merge.rc:2258 #, c-format msgid "Save Middle File As" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2259 #, c-format msgid "Save Right File As" msgstr "Çáåðåãòè ôàéë ïðàâîðó÷ ÿê..." -#: Merge.rc:2239 +#: Merge.rc:2260 #, c-format msgid "" "The file\n" @@ -3672,7 +3735,7 @@ msgstr "" "%1\n" "âèëó÷àºòüñÿ. Çáåðåæ³òü êîï³þ ôàéëó äëÿ ïðîäîâæåííÿ." -#: Merge.rc:2245 +#: Merge.rc:2266 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3683,42 +3746,42 @@ msgstr "" "\n" "Îíîâ³òü äîêóìåíòè ïåðåä ïðîäîâæåííÿì." -#: Merge.rc:2251 +#: Merge.rc:2272 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Ùîá ïðîäîâæèòè, Âè ìàºòå âêàçàòè øëÿõ äî ïðîåêòó SourceSafe (íàïðèêëàä: $/MyProject)" -#: Merge.rc:2252 +#: Merge.rc:2273 #, c-format msgid "Checkout files from VSS..." msgstr "Îòðèìóºìî ôàéëè ç VSS..." -#: Merge.rc:2253 +#: Merge.rc:2274 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Ñèñòåìà êîíòðîëþ âåðñ³é âèÿâèëà ïîìèëêó ïðè ñïðîá³ âçÿòè ôàéë ï³ä êîíòðîëü. Íåìà ìîæëèâîñò³ ïðîäîâæóâàòè..." -#: Merge.rc:2254 +#: Merge.rc:2275 #, c-format msgid "Error executing versioning system command." msgstr "Ïîìèëêà âèêîíàííÿ ñèñòåìíî¿ êîìàíäè Ñèñòåìè êîíòðîëþ âåðñ³é." -#: Merge.rc:2255 +#: Merge.rc:2276 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Ðîáî÷à òåêà VSS ³ ðîçòàøóâàííÿ ì³ñöå ïîòî÷íîãî ôàéëó íå ñï³âïàäàþòü. Ïðîäîâæèòè ?" -#: Merge.rc:2256 +#: Merge.rc:2277 #, c-format msgid "No VSS database(s) found!" msgstr "Íå çíàéäåíà áàçà äàíèõ VSS!" -#: Merge.rc:2257 +#: Merge.rc:2278 #, c-format msgid "Error from VSS:" msgstr "Ïîìèëêà VSS:" -#: Merge.rc:2258 +#: Merge.rc:2279 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3729,7 +3792,7 @@ msgstr "" " Ïåðåâ³ðòå íàëàøòóâàííÿ.\n" " Ñêàñóâàòè ä³þ?" -#: Merge.rc:2259 +#: Merge.rc:2280 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3738,127 +3801,146 @@ msgstr "" "VSS çíàéøëà ïîìèëêó ïðè ñïðîá³ ñêàñóâàííÿ 䳿.\n" "Ïåðåâ³ðòå íàëàøòóâàííÿ. " -#: Merge.rc:2265 -#: Merge.rc:2586 +#: Merge.rc:2286 +#: Merge.rc:2630 #, c-format msgid "None" msgstr "Íåìà" -#: Merge.rc:2266 +#: Merge.rc:2287 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (ìåíøå, í³æ 5.0)" -#: Merge.rc:2267 +#: Merge.rc:2288 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ³ âèùå)" -#: Merge.rc:2269 +#: Merge.rc:2290 #, c-format msgid "Break at whitespace" msgstr "Ðîçáèâàòè çà ïðîïóñêàìè" -#: Merge.rc:2270 +#: Merge.rc:2291 #, c-format msgid "Break at whitespace or punctuation" msgstr "Ðîçáèâàòè çà ïðîïóñêàìè ³ ñèìâîëàìè ïóíêòóàö³¿" -#: Merge.rc:2276 +#: Merge.rc:2297 #, c-format msgid "Right to Left (%1)" msgstr "Ñêîï³þâàòè íà ë³âó ñòîðîíó %1 ç %2 âèáðàíèõ åëåìåíò³â" -#: Merge.rc:2277 +#: Merge.rc:2298 #, c-format -msgid "Left to Right (%1)" -msgstr "Ñêîï³þâàòè íà ïðàâó ñòîðîíó %1 ç %2 âèáðàíèõ åëåìåíò³â" +msgid "Right to Middle (%1)" +msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2299 #, c-format -msgid "Right to Left (%1 of %2)" -msgstr "Ñïðàâà ë³âîðó÷ (%1 ç %2)" +msgid "Middle to Left (%1)" +msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2300 #, c-format -msgid "Left to Right (%1 of %2)" -msgstr "Çë³âà ïðàâîðó÷ (%1 ç %2)" +msgid "Middle to Right (%1)" +msgstr "" -#: Merge.rc:2280 -#: Merge.rc:2295 +#: Merge.rc:2301 +#, c-format +msgid "Left to Right (%1)" +msgstr "Ñêîï³þâàòè íà ïðàâó ñòîðîíó %1 ç %2 âèáðàíèõ åëåìåíò³â" + +#: Merge.rc:2302 +#, c-format +msgid "Left to Middle (%1)" +msgstr "" + +#: Merge.rc:2309 +#: Merge.rc:2336 #, c-format msgid "Left to... (%1)" msgstr "Çë³âà... (%1)" -#: Merge.rc:2281 -#: Merge.rc:2296 +#: Merge.rc:2310 +#: Merge.rc:2337 +#, c-format +msgid "Middle to... (%1)" +msgstr "" + +#: Merge.rc:2311 +#: Merge.rc:2338 #, c-format msgid "Right to... (%1)" msgstr "Ñïðàâà... (%1)" -#: Merge.rc:2282 -#: Merge.rc:2297 +#: Merge.rc:2312 #, c-format -msgid "Left to... (%1 of %2)" -msgstr "Çë³âà... (%1 ç %2)" +msgid "Both to... (%1)" +msgstr "" -#: Merge.rc:2283 -#: Merge.rc:2298 +#: Merge.rc:2313 #, c-format -msgid "Right to... (%1 of %2)" -msgstr "Ñïðàâà... (%1 ç %2)" +msgid "All to... (%1)" +msgstr "" + +#: Merge.rc:2314 +#, c-format +msgid "Differences to... (%1)" +msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2326 #, c-format msgid "Left (%1)" msgstr "˳âîðó÷ (%1)" -#: Merge.rc:2290 +#: Merge.rc:2327 +#, c-format +msgid "Middle (%1)" +msgstr "" + +#: Merge.rc:2328 #, c-format msgid "Right (%1)" msgstr "Ïðàâîðó÷ (%1)" -#: Merge.rc:2291 +#: Merge.rc:2329 #, c-format msgid "Both (%1)" msgstr "Îáèäâà (%1)" -#: Merge.rc:2292 -#, c-format -msgid "Left (%1 of %2)" -msgstr "˳âîðó÷ (%1 ç %2)" - -#: Merge.rc:2293 -#, c-format -msgid "Right (%1 of %2)" -msgstr "Ïðàâîðó÷ (%1 ç %2)" - -#: Merge.rc:2294 +#: Merge.rc:2330 #, c-format -msgid "Both (%1 of %2)" -msgstr "Ðàçîì (%1 ç %2)" +msgid "All (%1)" +msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2342 #, c-format msgid "Left side - select destination folder:" msgstr "˳âà ñòîðîíà - âèá³ð òåêè ïðèçíà÷åííÿ:" -#: Merge.rc:2300 +#: Merge.rc:2343 +#, c-format +msgid "Middle side - select destination folder:" +msgstr "" + +#: Merge.rc:2344 #, c-format msgid "Right side - select destination folder:" msgstr "Ïðàâà ñòîðîíà - âèá³ð òåêè ïðèçíà÷åííÿ:" -#: Merge.rc:2301 +#: Merge.rc:2345 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ôàéë³â îïðàöüîâàí³)" -#: Merge.rc:2302 +#: Merge.rc:2346 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 ç %2 ôàéë³â îïðàöüîâàí³)" -#: Merge.rc:2308 +#: Merge.rc:2352 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3869,17 +3951,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2309 +#: Merge.rc:2353 #, c-format msgid "Are you sure you want to copy:" msgstr "Âè âïåâíåí³, ùî õî÷åòå ñêîï³þâàòè:" -#: Merge.rc:2310 +#: Merge.rc:2354 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Âè âïåâíåí³, ùî õî÷åòå ñêîï³þâàòè %d åëåìåíò³â:" -#: Merge.rc:2311 +#: Merge.rc:2355 #, c-format msgid "" "Operation aborted!\n" @@ -3898,502 +3980,502 @@ msgstr "" "\n" "Îíîâ³òü ïîð³âíÿííÿ." -#: Merge.rc:2312 +#: Merge.rc:2356 #, c-format msgid "Are you sure you want to move:" msgstr "Âè ä³éñíî õî÷åòå ïåðåì³ñòèòè:" -#: Merge.rc:2313 +#: Merge.rc:2357 #, c-format msgid "Are you sure you want to move %d items:" msgstr "Âè ä³éñíî õî÷åòå ïåðåì³ñòèòè %d åëåìåíò³â:" -#: Merge.rc:2315 +#: Merge.rc:2359 #, c-format msgid "Confirm Move" msgstr "ϳäòâåðäæåííÿ ïåðåì³ùåííÿ" -#: Merge.rc:2316 +#: Merge.rc:2360 #, 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:2322 +#: Merge.rc:2366 #, c-format msgid "Failed to execute external editor: %1" msgstr "Íåìîæëèâî âèêîíàòè %1" -#: Merge.rc:2328 +#: Merge.rc:2372 #, c-format msgid "Unknown archive format" msgstr "Íåâ³äîìèé ôîðìàò àðõ³âó" -#: Merge.rc:2334 +#: Merge.rc:2378 #, c-format msgid "Filename" msgstr "²ì'ÿ ôàéëó" -#: Merge.rc:2336 +#: Merge.rc:2380 #, c-format msgid "Comparison result" msgstr "Ðåçóëüòàò ïîð³âíÿííÿ" -#: Merge.rc:2337 +#: Merge.rc:2381 #, c-format msgid "Left Date" msgstr "Äàòà ë³âîðó÷" -#: Merge.rc:2338 +#: Merge.rc:2382 #, c-format msgid "Right Date" msgstr "Äàòà ïðàâîðó÷" -#: Merge.rc:2339 +#: Merge.rc:2383 #, c-format msgid "Middle Date" msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2384 #, c-format msgid "Extension" msgstr "Ðîçøèðåííÿ" -#: Merge.rc:2341 +#: Merge.rc:2385 #, c-format msgid "Left Size" msgstr "Ðîçì³ð ë³âîðó÷" -#: Merge.rc:2342 +#: Merge.rc:2386 #, c-format msgid "Right Size" msgstr "Ðîçì³ð ïðàâîðó÷" -#: Merge.rc:2343 +#: Merge.rc:2387 #, c-format msgid "Middle Size" msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2388 #, c-format msgid "Right Size (Short)" msgstr "Ðîçì³ð ïðàâîðó÷ (ñêîð.)" -#: Merge.rc:2345 +#: Merge.rc:2389 #, c-format msgid "Left Size (Short)" msgstr "Ðîçì³ð ë³âîðó÷ (ñêîð.)" -#: Merge.rc:2346 +#: Merge.rc:2390 #, c-format msgid "Middle Size (Short)" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2396 #, c-format msgid "Left Creation Time" msgstr "×àñ ñòâîðåííÿ ôàéëó ë³âîðó÷" -#: Merge.rc:2353 +#: Merge.rc:2397 #, c-format msgid "Right Creation Time" msgstr "×àñ ñòâîðåííÿ ôàéëó ïðàâîðó÷" -#: Merge.rc:2354 +#: Merge.rc:2398 #, c-format msgid "Middle Creation Time" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2399 #, c-format msgid "Newer File" msgstr "Íîâ³øèé ôàéë" -#: Merge.rc:2356 +#: Merge.rc:2400 #, c-format msgid "Left File Version" msgstr "Âåðñ³ÿ ôàéëó ë³âîðó÷" -#: Merge.rc:2357 +#: Merge.rc:2401 #, c-format msgid "Right File Version" msgstr "Âåðñ³ÿ ôàéëó ïðàâîðó÷" -#: Merge.rc:2358 +#: Merge.rc:2402 #, c-format msgid "Middle File Version" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2403 #, c-format msgid "Short Result" msgstr "Ñïðîùåíèé ðåçóëüòàò" -#: Merge.rc:2360 +#: Merge.rc:2404 #, c-format msgid "Left Attributes" msgstr "Àòðèáóòè ôàéëó ë³âîðó÷" -#: Merge.rc:2361 +#: Merge.rc:2405 #, c-format msgid "Right Attributes" msgstr "Àòðèáóòè ôàéëó ïðàâîðó÷" -#: Merge.rc:2362 +#: Merge.rc:2406 #, c-format msgid "Middle Attributes" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2407 #, c-format msgid "Left EOL" msgstr "˳âå çàê³í÷åííÿ ðÿäêà" -#: Merge.rc:2364 +#: Merge.rc:2408 #, c-format msgid "Middle EOL" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2409 #, c-format msgid "Right EOL" msgstr "Ïðàâå çàê³í÷åííÿ ðÿäêà" -#: Merge.rc:2371 +#: Merge.rc:2415 #, c-format msgid "Left Encoding" msgstr "Êîäóâàííÿ ôàéëó ë³âîðó÷" -#: Merge.rc:2372 +#: Merge.rc:2416 #, c-format msgid "Right Encoding" msgstr "Êîäóâàííÿ ôàéëó ïðàâîðó÷" -#: Merge.rc:2373 +#: Merge.rc:2417 #, c-format msgid "Middle Encoding" msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2418 #, c-format msgid "Ignored Diff." msgstr "Çíåõ. â³äì³ííîñò³" -#: Merge.rc:2382 +#: Merge.rc:2426 #, c-format msgid "Unable to compare files" msgstr "Íåìîæëèâî ïîð³âíÿòè ôàéëè" -#: Merge.rc:2383 +#: Merge.rc:2427 #, c-format msgid "Item aborted" msgstr "Ïîð³âíÿííÿ ïåðåðâàíå" -#: Merge.rc:2384 +#: Merge.rc:2428 #, c-format msgid "File skipped" msgstr "Ôàéë ïðîïóùåíèé" -#: Merge.rc:2385 +#: Merge.rc:2429 #, c-format msgid "Folder skipped" msgstr "Òåêà ïðîïóùåíà" -#: Merge.rc:2386 +#: Merge.rc:2430 #, c-format msgid "Left only: %1" msgstr "Ëèøå ë³âîðó÷: %1" -#: Merge.rc:2387 +#: Merge.rc:2431 #, c-format msgid "Middle only: %1" msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2432 #, c-format msgid "Right only: %1" msgstr "Ëèøå ïðàâîðó÷: %1" -#: Merge.rc:2389 +#: Merge.rc:2433 #, c-format msgid "Does not exist in %1" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2434 #, c-format msgid "Binary files are identical" msgstr "Á³íàðí³ ôàéëè íå ìàþòü â³äì³ííîñòåé" -#: Merge.rc:2392 +#: Merge.rc:2436 #, c-format msgid "Binary files are different" msgstr "Á³íàðí³ ôàéëè â³äð³çíÿþòüñÿ" -#: Merge.rc:2393 +#: Merge.rc:2437 #, c-format msgid "Files are different" msgstr "Ôàéëè â³äð³çíÿþòüñÿ" -#: Merge.rc:2394 +#: Merge.rc:2438 #, c-format msgid "Folders are different" msgstr "Òåêè ð³çí³" -#: Merge.rc:2395 +#: Merge.rc:2439 #, c-format msgid "Left Only" msgstr "Ëèøå ë³âîðó÷" -#: Merge.rc:2396 +#: Merge.rc:2440 #, c-format msgid "Right Only" msgstr "Ëèøå ïðàâîðó÷" -#: Merge.rc:2397 +#: Merge.rc:2441 #, c-format msgid "Middle Only" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2442 #, c-format msgid "No item in left" msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2443 #, c-format msgid "No item in right" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2444 #, c-format msgid "No item in middle" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2446 #, c-format msgid "Error" msgstr "Ïîìèëêà" -#: Merge.rc:2403 +#: Merge.rc:2447 #, c-format msgid "Text files are identical" msgstr "Òåêñòîâ³ ôàéëè îäíàêîâ³" -#: Merge.rc:2408 +#: Merge.rc:2452 #, c-format msgid "Text files are different" msgstr "Òåêñòîâ³ ôàéëè ð³çí³" -#: Merge.rc:2414 +#: Merge.rc:2458 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ïðîéøëî ÷àñó: %ld ìñ" -#: Merge.rc:2415 +#: Merge.rc:2459 #, c-format msgid "1 item selected" msgstr "Âèáðàíèé 1 åëåìåíò" -#: Merge.rc:2416 +#: Merge.rc:2460 #, c-format msgid "%1 items selected" msgstr "Âèáðàí³ åëåìåíòè: %1" -#: Merge.rc:2422 +#: Merge.rc:2466 #, c-format msgid "Filename or folder name." msgstr "²ì'ÿ ôàéëó àáî òåêè" -#: Merge.rc:2423 +#: Merge.rc:2467 #, c-format msgid "Subfolder name when subfolders are included." msgstr "²ìåíà ï³äòåê, ÿêùî ï³äòåêè âêëþ÷åí³" -#: Merge.rc:2424 +#: Merge.rc:2468 #, c-format msgid "Comparison result, long form." msgstr "Ðåçóëüòàò ïîð³âíÿííÿ, äîâãà ôîðìà." -#: Merge.rc:2425 +#: Merge.rc:2469 #, c-format msgid "Left side modification date." msgstr "×àñ çì³íè ôàéëó ë³âîðó÷" -#: Merge.rc:2426 +#: Merge.rc:2470 #, c-format msgid "Right side modification date." msgstr "×àñ çì³íè ôàéëó ïðàâîðó÷" -#: Merge.rc:2427 +#: Merge.rc:2471 #, c-format msgid "Middle side modification date." msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2472 #, c-format msgid "File's extension." msgstr "Ðîçøèðåííÿ ôàéëó" -#: Merge.rc:2429 +#: Merge.rc:2473 #, c-format msgid "Left file size in bytes." msgstr "Ðîçì³ð ôàéëó ë³âîðó÷ ó áàéòàõ" -#: Merge.rc:2430 +#: Merge.rc:2474 #, c-format msgid "Right file size in bytes." msgstr "Ðîçì³ð ôàéëó ïðàâîðó÷ ó áàéòàõ" -#: Merge.rc:2431 +#: Merge.rc:2475 #, c-format msgid "Middle file size in bytes." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2476 #, c-format msgid "Left file size abbreviated." msgstr "Ðîçì³ð ë³âîãî ôàéëó (ñêîð.)" -#: Merge.rc:2433 +#: Merge.rc:2477 #, c-format msgid "Right file size abbreviated." msgstr "Ðîçì³ð ïðàâîãî ôàéëó (ñêîð.)" -#: Merge.rc:2434 +#: Merge.rc:2478 #, c-format msgid "Middle file size abbreviated." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2484 #, c-format msgid "Left side creation time." msgstr "×àñ ñòâîðåííÿ ôàéëó ë³âîðó÷" -#: Merge.rc:2441 +#: Merge.rc:2485 #, c-format msgid "Right side creation time." msgstr "×àñ ñòâîðåííÿ ôàéëó ïðàâîðó÷" -#: Merge.rc:2442 +#: Merge.rc:2486 #, c-format msgid "Middle side creation time." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2487 #, c-format msgid "Tells which side has newer modification date." msgstr "Ïîêàçàòè, ç ÿêî¿ ç³ ñòîð³í äàòà çì³íè ôàéëó íîâ³øà" -#: Merge.rc:2444 +#: Merge.rc:2488 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Âåðñ³ÿ ôàéëó ë³âîðó÷, ëèøå äëÿ äåÿêèõ òèï³â ôàéë³â." -#: Merge.rc:2445 +#: Merge.rc:2489 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Âåðñ³ÿ ôàéëó ïðàâîðó÷, ëèøå äëÿ äåÿêèõ òèï³â ôàéë³â." -#: Merge.rc:2446 +#: Merge.rc:2490 #, c-format msgid "Middle side file version, only for some filetypes." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2491 #, c-format msgid "Short comparison result." msgstr "Ðåçóëüòàò øâèäêîãî ïîð³âíÿííÿ" -#: Merge.rc:2448 +#: Merge.rc:2492 #, c-format msgid "Left side attributes." msgstr "Àòðèáóòè ôàéëó ë³âîðó÷" -#: Merge.rc:2449 +#: Merge.rc:2493 #, c-format msgid "Right side attributes." msgstr "Àòðèáóòè ôàéëó ïðàâîðó÷" -#: Merge.rc:2450 +#: Merge.rc:2494 #, c-format msgid "Middle side attributes." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2495 #, c-format msgid "Left side file EOL type" msgstr "Ïîçíà÷êà çàê³í÷åííÿ ðÿäêà äëÿ ë³âîãî ôàéëó" -#: Merge.rc:2452 +#: Merge.rc:2496 #, c-format msgid "Right side file EOL type" msgstr "Ïîçíà÷êà çàê³í÷åííÿ ðÿäêà äëÿ ïðàâîãî ôàéëó" -#: Merge.rc:2453 +#: Merge.rc:2497 #, c-format msgid "Middle side file EOL type" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2503 #, c-format msgid "Left side encoding." msgstr "Êîäóâàííÿ ôàéëó ë³âîðó÷" -#: Merge.rc:2460 +#: Merge.rc:2504 #, c-format msgid "Right side encoding." msgstr "Êîäóâàííÿ ôàéëó ïðàâîðó÷" -#: Merge.rc:2461 +#: Merge.rc:2505 #, c-format msgid "Middle side encoding." msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2506 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "ʳëüê³ñòü ³ãíîðîâàíèõ â³äì³ííîñòåé ó ôàéë³. Ö³ â³äì³ííîñò³ áóëè ³ãíîðîâàí³ WinMerge ³ íå ìîæóòü áóòè îïðàöüîâàí³." -#: Merge.rc:2463 +#: Merge.rc:2507 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "ʳëüê³ñòü â³äì³ííîñòåé ó ôàéë³. ²ãíîðîâàí³ â³äì³ííîñò³ íå âðàõîâàí³." -#: Merge.rc:2464 +#: Merge.rc:2508 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Ïîêàçàòè ç³ðî÷êó (*) ÿêùî ôàéë á³íàðíèé." -#: Merge.rc:2470 +#: Merge.rc:2514 #, c-format msgid "Compare %1 with %2" msgstr "Ïîð³âíÿííÿ %1 ç %2" -#: Merge.rc:2471 +#: Merge.rc:2515 #, c-format msgid "Comma-separated list" msgstr "Ñïèñîê, ðîçä³ëåíèé êîìàìè" -#: Merge.rc:2472 +#: Merge.rc:2516 #, c-format msgid "Tab-separated list" msgstr "Ñïèñîê, ðîçä³ëåíèé òàáóëÿòîðàìè" -#: Merge.rc:2473 +#: Merge.rc:2517 #, c-format msgid "Simple HTML" msgstr "Ïðîñòèé HTML" -#: Merge.rc:2474 +#: Merge.rc:2518 #, c-format msgid "Simple XML" msgstr "Ïðîñòèé XML" -#: Merge.rc:2476 +#: Merge.rc:2520 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Ôàéë çâ³òó âæå ³ñíóº. Ïåðåçàïèñàòè??" -#: Merge.rc:2477 +#: Merge.rc:2521 #, c-format msgid "" "Error creating the report:\n" @@ -4402,32 +4484,32 @@ msgstr "" "Ïîìèëêà ïðè ñòâîðåíí³ çâ³òó:\n" "%1" -#: Merge.rc:2478 +#: Merge.rc:2522 #, c-format msgid "The report has been created successfully." msgstr "Çâ³ò óñï³øíî ñòâîðåíèé" -#: Merge.rc:2484 +#: Merge.rc:2528 #, c-format msgid "The same file is opened in both panels." msgstr "Íà îáîõ ïàíåëÿõ â³äêðèòèé òîé ñàìèé ôàéë" -#: Merge.rc:2485 +#: Merge.rc:2529 #, c-format msgid "The selected files are identical." msgstr "Âèáðàí³ ôàéëè íå ìàþòü â³äì³ííîñòåé" -#: Merge.rc:2486 +#: Merge.rc:2530 #, c-format msgid "An error occurred while comparing the files." msgstr "Ïðè ïîð³âíÿíí³ ôàéë³â âèíèêëà ïîìèëêà." -#: Merge.rc:2487 +#: Merge.rc:2531 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Òèì÷àñîâ³ ôàéëè íå ìîæóòü áóòè ñòâîðåí³. Ïåðåâ³ðòå íàëàøòóâàííÿ øëÿõ³â äëÿ òèì÷àñîâèõ ôàéë³â" -#: Merge.rc:2488 +#: Merge.rc:2532 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4442,17 +4524,17 @@ msgstr "" "\n" "Óâàãà: ßêùî âàñ íå ö³êàâëÿòü ðîçõîäæåííÿ â çàê³í÷åííÿõ ðÿäêà, íàëàøòóéòå îïö³þ 'Íåõòóâàòè ð³çíèöåþ â çàê³í÷åííÿõ ðÿäê³â' íà âêëàäö³ Ïîð³âíÿííÿ â Íàëàøòóâàííÿõ." -#: Merge.rc:2489 +#: Merge.rc:2533 #, c-format msgid "The selected folder is invalid." msgstr "Íåìîæëèâî â³äêðèòè âèáðàíó òåêó." -#: Merge.rc:2490 +#: Merge.rc:2534 #, c-format msgid "Cannot open a binary file to editor." msgstr "Íåìîæëèâî â³äêðèòè á³íàðíèé ôàéë ó ðåäàêòîð³." -#: Merge.rc:2491 +#: Merge.rc:2535 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4467,7 +4549,7 @@ msgstr "" "%1\n" "ç ³íøî¿ ñòîðîíè ³ â³äêðèòè îáèäâ³?" -#: Merge.rc:2497 +#: Merge.rc:2541 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4478,152 +4560,152 @@ msgstr "" "Êîæíèé ç ôàéë³â ìîæå áóòè ïîêàçàíèé â ñâîºìó êîäóâàíí³, àëå ¿õíº çëèòòÿ àáî êîï³þâàííÿ ìîæå ïîøêîäèòè ³íôîðìàö³þ.\n" "Ïîêàçàòè îáèäâà ôàéëè â ñèñòåìíîìó êîäóâàíí³ (ðåêîìåíäóºòüñÿ)?" -#: Merge.rc:2498 +#: Merge.rc:2542 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "²íôîðìàö³ÿ âòðà÷åíà ÷åðåç ïîìèëêîâå êîäóâàííÿ: îáèäâà ôàéëè" -#: Merge.rc:2499 +#: Merge.rc:2543 #, c-format msgid "Information lost due to encoding errors: first file" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2544 #, c-format msgid "Information lost due to encoding errors: second file" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2545 #, c-format msgid "Information lost due to encoding errors: third file" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2551 #, c-format msgid "No difference" msgstr "Íåìà â³äì³ííîñòåé" -#: Merge.rc:2508 +#: Merge.rc:2552 #, c-format msgid "Line difference" msgstr "Ðÿäîê â³äì³ííîñòåé" -#: Merge.rc:2514 +#: Merge.rc:2558 #, c-format msgid "Replaced %1 string(s)." msgstr "Çàì³íåíî %1 ðÿäê³â." -#: Merge.rc:2515 +#: Merge.rc:2559 #, c-format msgid "Cannot find string \"%s\"" msgstr "Íå âäàëîñÿ çíàéòè ðÿäîê \"%s\"" -#: Merge.rc:2521 +#: Merge.rc:2565 #, c-format msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2572 #, c-format msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2573 #, c-format msgid "The change of codepage has been merged" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2574 #, c-format msgid "The changes of codepage are conflicting" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2575 #, c-format msgid "The change of EOL has been merged" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2576 #, c-format msgid "The changes of EOL are conflicting" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2582 #, c-format msgid "Location Pane" msgstr "̳ñöÿ ðîçòàøóâàííÿ" -#: Merge.rc:2539 +#: Merge.rc:2583 #, c-format msgid "Diff Pane" msgstr "³äì³ííîñò³" -#: Merge.rc:2545 +#: Merge.rc:2589 #, c-format msgid "Patch file successfully written." msgstr "Ëàòêà óñï³øíî çàïèñàíà." -#: Merge.rc:2546 +#: Merge.rc:2590 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Åëåìåíò íå çíàéäåíèé àáî öå òåêà" -#: Merge.rc:2547 +#: Merge.rc:2591 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Åëåìåíò íå çíàéäåíèé àáî öå òåêà" -#: Merge.rc:2548 +#: Merge.rc:2592 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Ëàòêà âæå ³ñíóº. Õî÷åòå ïåðåçàïèñàòè ¿¿?" -#: Merge.rc:2549 +#: Merge.rc:2593 #, c-format msgid "[%1 files selected]" msgstr "[%1 ôàéë³â âèáðàí³]" -#: Merge.rc:2550 +#: Merge.rc:2594 #, c-format msgid "Normal" msgstr "Íîðìàëüíèé" -#: Merge.rc:2551 +#: Merge.rc:2595 #, c-format msgid "Context" msgstr "Êîíòåêñò" -#: Merge.rc:2552 +#: Merge.rc:2596 #, c-format msgid "Unified" msgstr "Óí³ô³êîâàíèé" -#: Merge.rc:2554 +#: Merge.rc:2598 #, c-format msgid "Could not write to file %1." msgstr "Íåìà ìîæëèâîñò³ çàïèñàòè ó ôàéë %1." -#: Merge.rc:2555 +#: Merge.rc:2599 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Çàçíà÷åíèé øëÿõ äëÿ ê³íöåâîãî ôàéëó íå º àáñîëþòíèì: %1" -#: Merge.rc:2556 +#: Merge.rc:2600 #, c-format msgid "Specify an output file" msgstr "Âêàçàòè ê³íöåâèé ôàéë" -#: Merge.rc:2557 +#: Merge.rc:2601 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Íåìîæëèâî ñòâîðèòè ëàòêó ç á³íàðíèõ ôàéë³â" -#: Merge.rc:2558 +#: Merge.rc:2602 #, c-format msgid "Cannot create a patch file from directories." msgstr "Íåìîæëèâî ñòâîðèòè ëàòêó ç òåê" -#: Merge.rc:2559 +#: Merge.rc:2603 #, c-format msgid "" "Please save all files first.\n" @@ -4634,12 +4716,12 @@ msgstr "" "\n" "Ñòâîðåííÿ ëàòêè âèìàãàº, ùîá â ôàéëàõ íå áóëî íå çáåðåæåíèõ çì³í" -#: Merge.rc:2560 +#: Merge.rc:2604 #, c-format msgid "Folder does not exist." msgstr "Òåêà íå ³ñíóº" -#: Merge.rc:2565 +#: Merge.rc:2609 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4651,37 +4733,37 @@ msgstr "" "Íå çíàéäåí³ âñ³ íåîáõ³äí³ êîìïîíåíòè (7-zip ³/àáî Merge7z*.dll) . \n" "Ïîäèâ³òüñÿ ³íñòðóêö³þ, ùîá äîâ³äàòèñÿ á³ëüøå ïðî ï³äòðèìêó àðõ³â³â ³ ÿê ¿¿ ââ³ìêíóòè." -#: Merge.rc:2566 +#: Merge.rc:2610 #, c-format msgid "Select file for export" msgstr "Âèáðàòè ôàéë äëÿ åêñïîðòó" -#: Merge.rc:2567 +#: Merge.rc:2611 #, c-format msgid "Select file for import" msgstr "Âèáðàòè ôàéë äëÿ ³ìïîðòó" -#: Merge.rc:2568 +#: Merge.rc:2612 #, c-format msgid "Options imported from the file." msgstr "Îïö³¿, ³ìïîðòîâàí³ ç ôàéëó." -#: Merge.rc:2569 +#: Merge.rc:2613 #, c-format msgid "Options exported to the file." msgstr "Îïö³¿, åêñïîðòîâàí³ â ôàéë." -#: Merge.rc:2570 +#: Merge.rc:2614 #, c-format msgid "Failed to import options from the file." msgstr "Ïîìèëêà ³ìïîðòó îïö³é ç ôàéëó." -#: Merge.rc:2571 +#: Merge.rc:2615 #, c-format msgid "Failed to write options to the file." msgstr "Ïîìèëêà åêñïîðòó îïö³é â ôàéë." -#: Merge.rc:2572 +#: Merge.rc:2616 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4692,247 +4774,247 @@ msgstr "" "\n" "Ïðîäîâæèòè?" -#: Merge.rc:2581 +#: Merge.rc:2625 #, c-format msgid "Mixed" msgstr "̳øàíèé" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Type" msgstr "Òèï" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "Unpacker" msgstr "Ðîçïàêóâàëüíèê" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Prediffer" msgstr "Íåõòóâà÷" -#: Merge.rc:2596 +#: Merge.rc:2640 #, c-format msgid "Editor script" msgstr "Ñöåíàð³é ðåäàêòîðà" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "\nDifference in the Current Line" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "\nRefresh (F5)" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2655 #, c-format msgid "\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2656 #, c-format msgid "\nPrevious Conflict (Alt+Shift+Up)" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2657 #, c-format msgid "\nNext Conflict (Alt+Shift+Down)" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2658 #, c-format msgid "\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2659 #, c-format msgid "\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "\nAll Right" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2666 #, c-format msgid "\nAll Left" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2667 #, c-format msgid "\nAuto Merge (Ctrl+Alt+M)" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Àâòîìàòè÷íèé ï³äá³ð ðîçïàêóâàëüíèêà (âêàæ³òü ðîçøèðåííÿ õî÷à á îäíîãî ç ôàéë³â)" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "No prediffer (normal)" msgstr "Áåç ïîïåðåäíüîãî ïîð³âíÿííÿ" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Suggested plugins" msgstr "Ðåêîìåíäîâàí³ äîïîâíåííÿ" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Other plugins" msgstr "²íø³ äîïîâíåííÿ" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Private Build: %1" msgstr "Ïðèâàòíèé á³ëä: %1" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Your software is up to date" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, 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:2641 +#: Merge.rc:2685 #, c-format msgid "Failed to download latest version information" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Plugin Settings" msgstr "Íàëàøòóâàííÿ äîïîâíåííÿ" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH íå çíàéäåíèé - .sct ñöåíà𳿠âèìêíóò³" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" msgstr "<Íåìà>" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" msgstr "<Àâòîìàòè÷íî>" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "G&oto Line %1" msgstr "Ïåðåéòè äî &ðÿäêà %1" -#: Merge.rc:2663 +#: Merge.rc:2707 #, c-format msgid "Disabled" msgstr "Âèìêíóòèé" -#: Merge.rc:2664 +#: Merge.rc:2708 #, c-format msgid "From file system" msgstr "ßê íà äèñêó" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "From MRU list" msgstr "ßê â ñïèñêó íåùîäàâí³õ äîêóìåíò³â" -#: Merge.rc:2671 +#: Merge.rc:2715 #, c-format msgid "No Highlighting" msgstr "Íå ï³äñâ³÷óâàòè" -#: Merge.rc:2674 +#: Merge.rc:2718 #, c-format msgid "Batch" msgstr "Áåò÷" -#: Merge.rc:2690 +#: Merge.rc:2734 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2694 +#: Merge.rc:2738 #, c-format msgid "Resources" msgstr "Ðåñóðñè" -#: Merge.rc:2697 +#: Merge.rc:2741 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2708 +#: Merge.rc:2752 #, c-format msgid "Close &Left Tabs" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2753 #, c-format msgid "Close R&ight Tabs" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2754 #, c-format msgid "Close &Other Tabs" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2755 #, c-format msgid "Enable &Auto Max Width" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2760 #, c-format msgid "&Image" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2765 #, c-format msgid "frhed(http://frhed.sourceforge.net/) not installed" msgstr "" -- 2.11.0